Hi,
Patch to update to latest release. Security advisory:
http://seclists.org/oss-sec/2017/q3/att-534/git_cvsserver.txt
make test looks sorta good:
fixed 2
success 16200
failed 0
broken 221
total 16602
(in the current version I have 'broken 222')
I'll look into a patch for -stable.
naddy, sthen you're in cc because I can smell the lock from here.
Comments? OK?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.179
diff -u -p -r1.179 Makefile
--- Makefile 11 Aug 2017 12:37:04 -0000 1.179
+++ Makefile 26 Sep 2017 21:15:41 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.14.1
+V = 2.14.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.136
diff -u -p -r1.136 distinfo
--- distinfo 11 Aug 2017 12:37:04 -0000 1.136
+++ distinfo 26 Sep 2017 21:15:41 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.14.1.tar.gz) = AZJTSbloOUDlOmIe5I3Z2aw/nlnAeYBrWDIcLPhaRGQ=
-SHA256 (git-manpages-2.14.1.tar.gz) = jFgQzmXUTNMzMn06EVxbRicSovgSJdFC4HvYia2NwOA=
-SIZE (git-2.14.1.tar.gz) = 6987933
-SIZE (git-manpages-2.14.1.tar.gz) = 665202
+SHA256 (git-2.14.2.tar.gz) = oDoSMx1Pmw9xcz259H4SMtTdzgDn8qbiD27JoZzl/2E=
+SHA256 (git-manpages-2.14.2.tar.gz) = kFwKVUoWeq1l9T5HZAFXzrFKeYv+zI6W2PneWtyxNec=
+SIZE (git-2.14.2.tar.gz) = 7001045
+SIZE (git-manpages-2.14.2.tar.gz) = 666468
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 patch-Makefile
--- patches/patch-Makefile 5 Aug 2017 19:09:05 -0000 1.72
+++ patches/patch-Makefile 26 Sep 2017 21:15:41 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.72 2017/08/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -2411,7 +2411,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2410,7 +2410,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.28
diff -u -p -r1.28 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 4 Dec 2016 15:29:46 -0000 1.28
+++ patches/patch-gitweb_gitweb_perl 26 Sep 2017 21:15:41 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.2
This prevents the following error: '-T and -B not implemented on filehandles'
---- gitweb/gitweb.perl.orig Tue Nov 29 22:06:51 2016
-+++ gitweb/gitweb.perl Fri Dec 2 16:09:37 2016
-@@ -7003,7 +7003,7 @@ sub git_blob_plain {
+Index: gitweb/gitweb.perl
+--- gitweb/gitweb.perl.orig
++++ gitweb/gitweb.perl
+@@ -7005,7 +7005,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -13,7 +14,7 @@ This prevents the following error: '-T a
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -7065,7 +7065,7 @@ sub git_blob {
+@@ -7067,7 +7067,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t0001-init_sh
===================================================================
RCS file: patches/patch-t_t0001-init_sh
diff -N patches/patch-t_t0001-init_sh
--- patches/patch-t_t0001-init_sh 10 Aug 2017 09:11:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-$OpenBSD: patch-t_t0001-init_sh,v 1.2 2017/08/10 09:11:07 dcoppa Exp $
-
-commit bed67874e235e8f128607728f9a03c71e92cb955
-Author: Rene Scharfe <l....@web.de>
-Date: Mon Aug 7 13:04:18 2017 +0200
-
-t0001: skip test with restrictive permissions if getpwd(3) respects them
-
-The sub-test "init in long base path" in t0001 checks the ability to
-handle long base paths with restrictive permissions (--x). On OpenBSD
-getcwd(3) fails in that case even for short paths. Check the two
-aspects separately by trying to use a long base path both with and
-without execute-only permissions. Only attempt the former if we know
-that getcwd(3) doesn't care.
-
-Original-patch-by: David Coppa <dco...@openbsd.org>
-Reported-by: Aevar Arnfjoro Bjarmason <ava...@gmail.com>
-Signed-off-by: Rene Scharfe <l....@web.de>
-Signed-off-by: Junio C Hamano <gits...@pobox.com>
-
-Index: t/t0001-init.sh
---- t/t0001-init.sh.orig
-+++ t/t0001-init.sh
-@@ -315,18 +315,44 @@ test_expect_success 'init with separate gitdir' '
- test_path_is_dir realgitdir/refs
- '
-
--test_expect_success 'init in long base path' '
-+test_lazy_prereq GETCWD_IGNORES_PERMS '
-+ base=GETCWD_TEST_BASE_DIR &&
-+ mkdir -p $base/dir &&
-+ chmod 100 $base ||
-+ error "bug in test script: cannot prepare $base"
-+
-+ (cd $base/dir && /bin/pwd -P)
-+ status=$?
-+
-+ chmod 700 $base &&
-+ rm -rf $base ||
-+ error "bug in test script: cannot clean $base"
-+ return $status
-+'
-+
-+check_long_base_path () {
- # exceed initial buffer size of strbuf_getcwd()
- component=123456789abcdef &&
- test_when_finished "chmod 0700 $component; rm -rf $component" &&
- p31=$component/$component &&
- p127=$p31/$p31/$p31/$p31 &&
- mkdir -p $p127 &&
-- chmod 0111 $component &&
-+ if test $# = 1
-+ then
-+ chmod $1 $component
-+ fi &&
- (
- cd $p127 &&
- git init newdir
- )
-+}
-+
-+test_expect_success 'init in long base path' '
-+ check_long_base_path
-+'
-+
-+test_expect_success GETCWD_IGNORES_PERMS 'init in long restricted base path' '
-+ check_long_base_path 0111
- '
-
- test_expect_success 're-init on .git file' '
Index: patches/patch-t_t4062-diff-pickaxe_sh
===================================================================
RCS file: patches/patch-t_t4062-diff-pickaxe_sh
diff -N patches/patch-t_t4062-diff-pickaxe_sh
--- patches/patch-t_t4062-diff-pickaxe_sh 10 Aug 2017 09:11:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-t_t4062-diff-pickaxe_sh,v 1.2 2017/08/10 09:11:07 dcoppa Exp $
-
-commit 4c7fda8fc1d67481100b8d4e39f9ff6ff878639e
-Author: Rene Scharfe <l....@web.de>
-Date: Wed Aug 9 16:15:10 2017 +0200
-
-t4062: use less than 256 repetitions in regex
-
-OpenBSD's regex library has a repetition limit (RE_DUP_MAX) of 255.
-That's the minimum acceptable value according to POSIX. In t4062 we use
-4096 repetitions in the test "-G matches", though, causing it to fail.
-Combine two repetition operators, both less than 256, to arrive at 4096
-zeros instead of using a single one, to fix the test on OpenBSD.
-
-Original-patch-by: David Coppa <dco...@openbsd.org>
-Signed-off-by: Rene Scharfe <l....@web.de>
-Signed-off-by: Junio C Hamano <gits...@pobox.com>
-
-Index: t/t4062-diff-pickaxe.sh
---- t/t4062-diff-pickaxe.sh.orig
-+++ t/t4062-diff-pickaxe.sh
-@@ -14,8 +14,10 @@ test_expect_success setup '
- test_tick &&
- git commit -m "A 4k file"
- '
-+
-+# OpenBSD only supports up to 255 repetitions, so repeat twice for 64*64=4096.
- test_expect_success '-G matches' '
-- git diff --name-only -G "^0{4096}$" HEAD^ >out &&
-+ git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
- test 4096-zeroes.txt = "$(cat out)"
- '
-
Index: patches/patch-t_t7004-tag_sh
===================================================================
RCS file: patches/patch-t_t7004-tag_sh
diff -N patches/patch-t_t7004-tag_sh
--- patches/patch-t_t7004-tag_sh 10 Aug 2017 09:11:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-t_t7004-tag_sh,v 1.2 2017/08/10 09:11:07 dcoppa Exp $
-
-commit dff2813391d720e1739d1d83a84ba38b1d4ad615
-Author: Aevar Arnfjoro Bjarmason <ava...@gmail.com>
-Date: Sun Aug 6 23:38:50 2017 +0000
-
-tests: don't give unportable ">" to "test" built-in, use -gt
-
-Change an argument to test_line_count (which'll ultimately be turned
-into a "test" expression) to use "-gt" instead of ">" for an
-arithmetic test.
-
-This broken on e.g. OpenBSD as of v2.13.0 with my commit
-ac3f5a3468 ("ref-filter: add --no-contains option to
-tag/branch/for-each-ref", 2017-03-24).
-
-Signed-off-by: Aevar Arnfjoro Bjarmason <ava...@gmail.com>
-Signed-off-by: Junio C Hamano <gits...@pobox.com>
-
-Index: t/t7004-tag.sh
---- t/t7004-tag.sh.orig
-+++ t/t7004-tag.sh
-@@ -1887,7 +1887,7 @@ EOF"
- run_with_limited_stack git tag --contains HEAD >actual &&
- test_cmp expect actual &&
- run_with_limited_stack git tag --no-contains HEAD >actual &&
-- test_line_count ">" 10 actual
-+ test_line_count "-gt" 10 actual
- '
-
- test_expect_success '--format should list tags as per format given' '
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.21
diff -u -p -r1.21 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 5 Aug 2017 19:09:05 -0000 1.21
+++ patches/patch-t_test-lib_sh 26 Sep 2017 21:15:41 -0000
@@ -20,7 +20,7 @@ Index: t/test-lib.sh
# if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -1013,6 +1018,15 @@ case $uname_s in
+@@ -1010,6 +1015,15 @@ case $uname_s in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
