Skip to content

Commit c23de11

Browse files
oetikeroetiker
authored
Merge pull request #413 from citrus-it/git
git: update to 2.15.1
2 parents 028edb8 + 06171a4 commit c23de11

File tree

3 files changed

+63
-58
lines changed

3 files changed

+63
-58
lines changed

‎build/git/build.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,21 @@
2828
. ../../lib/functions.sh
2929

3030
PROG=git
31-
VER=2.15.0
31+
VER=2.15.1
3232
PKG=developer/versioning/git
33-
SUMMARY="$PROG - a free and open source, distributed version control system"
33+
SUMMARY="$PROG - distributed version control system"
3434
DESC="$SUMMARY"
3535

3636
BUILD_DEPENDS_IPS="compatibility/ucb developer/build/autoconf archiver/gnu-tar"
3737

3838
# For inet_ntop which isn't detected properly in the configure script
3939
LDFLAGS="-lnsl"
40-
CFLAGS64="$CFLAGS64 -I/usr/include/amd64"
41-
# Explicitly call out python version to make future python version bumps
42-
# smoother.
43-
CONFIGURE_OPTS="--without-tcltk
44-
--with-python=/usr/bin/python2.7
40+
CFLAGS64+=" -I/usr/include/amd64"
41+
CONFIGURE_OPTS="
42+
--without-tcltk
4543
--with-curl=/usr
46-
--with-openssl=/usr"
44+
--with-openssl=/usr
45+
"
4746

4847
save_function configure32 configure32_orig
4948
configure32() {
@@ -59,7 +58,7 @@ configure64() {
5958

6059
install_man() {
6160
logmsg "Fetching and installing pre-built man pages"
62-
if [[ ! -f ${TMPDIR}/${PROG}-manpages-${VER}.tar.xz ]]; then
61+
if [ ! -f ${TMPDIR}/${PROG}-manpages-${VER}.tar.xz ]; then
6362
pushd $TMPDIR > /dev/null
6463
get_resource $PROG/${PROG}-manpages-${VER}.tar.xz || \
6564
logerr "--- Failed to fetch tarball"
@@ -72,6 +71,11 @@ install_man() {
7271
popd > /dev/null
7372
}
7473

74+
TESTSUITE_SED="
75+
/test_submodule/s/:.*//
76+
/I18N/s/I18N .*/I18N/
77+
"
78+
7579
init
7680
download_source $PROG $PROG $VER
7781
patch_source

‎build/git/testsuite.log

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ ok 40 # skip .git hidden (missing MINGW)
123123
ok 41 # skip bare git dir not hidden (missing MINGW)
124124
ok 42 - remote init from does not use config from cwd
125125
ok 43 - re-init from a linked worktree
126-
# passed all 43 test(s)
127-
1..43
126+
ok 44 # skip redirect std handles (missing MINGW)
127+
# passed all 44 test(s)
128+
1..44
128129
*** t0002-gitfile.sh ***
129130
ok 1 - initial setup
130131
ok 2 - bad setup: invalid .git file format
@@ -2576,42 +2577,42 @@ ok 149 - git-path GIT_COMMON_DIR=bar hooks/me => bar/hooks/me
25762577
ok 150 - git-path GIT_COMMON_DIR=bar config => bar/config
25772578
ok 151 - git-path GIT_COMMON_DIR=bar packed-refs => bar/packed-refs
25782579
ok 152 - git-path GIT_COMMON_DIR=bar shallow => bar/shallow
2579-
ok 153 - test_submodule_relative_url: ../ ../foo ../submodule => ../../submodule
2580-
ok 154 - test_submodule_relative_url: ../ ../foo/bar ../submodule => ../../foo/submodule
2581-
ok 155 - test_submodule_relative_url: ../ ../foo/submodule ../submodule => ../../foo/submodule
2582-
ok 156 - test_submodule_relative_url: ../ ./foo ../submodule => ../submodule
2583-
ok 157 - test_submodule_relative_url: ../ ./foo/bar ../submodule => ../foo/submodule
2584-
ok 158 - test_submodule_relative_url: ../../../ ../foo/bar ../sub/a/b/c => ../../../../foo/sub/a/b/c
2585-
ok 159 - test_submodule_relative_url: ../ /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/addtest ../repo => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/repo
2586-
ok 160 - test_submodule_relative_url: ../ foo/bar ../submodule => ../foo/submodule
2587-
ok 161 - test_submodule_relative_url: ../ foo ../submodule => ../submodule
2588-
ok 162 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c => ../foo/sub/a/b/c
2589-
ok 163 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c/ => ../foo/sub/a/b/c
2590-
ok 164 - test_submodule_relative_url: (null) ../foo/bar/ ../sub/a/b/c => ../foo/sub/a/b/c
2591-
ok 165 - test_submodule_relative_url: (null) ../foo/bar ../submodule => ../foo/submodule
2592-
ok 166 - test_submodule_relative_url: (null) ../foo/submodule ../submodule => ../foo/submodule
2593-
ok 167 - test_submodule_relative_url: (null) ../foo ../submodule => ../submodule
2594-
ok 168 - test_submodule_relative_url: (null) ./foo/bar ../submodule => foo/submodule
2595-
ok 169 - test_submodule_relative_url: (null) ./foo ../submodule => submodule
2596-
ok 170 - test_submodule_relative_url: (null) //somewhere else/repo ../subrepo => //somewhere else/subrepo
2597-
ok 171 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/subsuper_update_r ../subsubsuper_update_r => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/subsubsuper_update_r
2598-
ok 172 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/super_update_r2 ../subsuper_update_r => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/subsuper_update_r
2599-
ok 173 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/. ../. => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/.
2600-
ok 174 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils ./. => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/.
2601-
ok 175 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/addtest ../repo => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/repo
2602-
ok 176 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils ./å äö => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/å äö
2603-
ok 177 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/. ../submodule => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/submodule
2604-
ok 178 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/submodule ../submodule => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/submodule
2605-
ok 179 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/home2/../remote ../bundle1 => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/home2/../bundle1
2606-
ok 180 - test_submodule_relative_url: (null) /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/submodule_update_repo ./. => /tmp/build_hadfl/git-2.15.0/t/trash directory.t0060-path-utils/submodule_update_repo/.
2607-
ok 181 - test_submodule_relative_url: (null) file:///tmp/repo ../subrepo => file:///tmp/subrepo
2608-
ok 182 - test_submodule_relative_url: (null) foo/bar ../submodule => foo/submodule
2609-
ok 183 - test_submodule_relative_url: (null) foo ../submodule => submodule
2610-
ok 184 - test_submodule_relative_url: (null) helper:://hostname/repo ../subrepo => helper:://hostname/subrepo
2611-
ok 185 - test_submodule_relative_url: (null) ssh://hostname/repo ../subrepo => ssh://hostname/subrepo
2612-
ok 186 - test_submodule_relative_url: (null) ssh://hostname:22/repo ../subrepo => ssh://hostname:22/subrepo
2613-
ok 187 - test_submodule_relative_url: (null) user@host:path/to/repo ../subrepo => user@host:path/to/subrepo
2614-
ok 188 - test_submodule_relative_url: (null) user@host:repo ../subrepo => user@host:subrepo
2580+
ok 153 - test_submodule_relative_url
2581+
ok 154 - test_submodule_relative_url
2582+
ok 155 - test_submodule_relative_url
2583+
ok 156 - test_submodule_relative_url
2584+
ok 157 - test_submodule_relative_url
2585+
ok 158 - test_submodule_relative_url
2586+
ok 159 - test_submodule_relative_url
2587+
ok 160 - test_submodule_relative_url
2588+
ok 161 - test_submodule_relative_url
2589+
ok 162 - test_submodule_relative_url
2590+
ok 163 - test_submodule_relative_url
2591+
ok 164 - test_submodule_relative_url
2592+
ok 165 - test_submodule_relative_url
2593+
ok 166 - test_submodule_relative_url
2594+
ok 167 - test_submodule_relative_url
2595+
ok 168 - test_submodule_relative_url
2596+
ok 169 - test_submodule_relative_url
2597+
ok 170 - test_submodule_relative_url
2598+
ok 171 - test_submodule_relative_url
2599+
ok 172 - test_submodule_relative_url
2600+
ok 173 - test_submodule_relative_url
2601+
ok 174 - test_submodule_relative_url
2602+
ok 175 - test_submodule_relative_url
2603+
ok 176 - test_submodule_relative_url
2604+
ok 177 - test_submodule_relative_url
2605+
ok 178 - test_submodule_relative_url
2606+
ok 179 - test_submodule_relative_url
2607+
ok 180 - test_submodule_relative_url
2608+
ok 181 - test_submodule_relative_url
2609+
ok 182 - test_submodule_relative_url
2610+
ok 183 - test_submodule_relative_url
2611+
ok 184 - test_submodule_relative_url
2612+
ok 185 - test_submodule_relative_url
2613+
ok 186 - test_submodule_relative_url
2614+
ok 187 - test_submodule_relative_url
2615+
ok 188 - test_submodule_relative_url
26152616
# passed all 188 test(s)
26162617
1..188
26172618
*** t0061-run-command.sh ***
@@ -2778,23 +2779,23 @@ ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with
27782779
*** t0202-gettext-perl.sh ***
27792780
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
27802781
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
2781-
# run 0: Perl Git::I18N API (perl /tmp/build_hadfl/git-2.15.0/t/t0202/test.pl)
2782+
# run 0: Perl Git::I18N
27822783
1..13
2783-
ok 1 - Testing Git::I18N with NO Perl gettext library
2784-
ok 2 - Git::I18N is located at /tmp/build_hadfl/git-2.15.0/t/../perl/blib/lib/Git/I18N.pm
2785-
ok 3 - sanity: Git::I18N has 3 export(s)
2786-
ok 4 - sanity: Git::I18N exports everything by default
2784+
ok 1 - Testing Git::I18N
2785+
ok 2 - Git::I18N
2786+
ok 3 - sanity: Git::I18N
2787+
ok 4 - sanity: Git::I18N
27872788
ok 5 - sanity: __n has a $$$ prototype
2788-
ok 6 - sanity: N__ has a $ prototype
2789-
ok 7 - sanity: __ has a $ prototype
2789+
ok 6 - sanity: __ has a $ prototype
2790+
ok 7 - sanity: N__ has a $ prototype
27902791
ok 8 - Passing a string through __() in the C locale works
27912792
ok 9 - Get singular string through __n() in C locale
27922793
ok 10 - Get plural string through __n() in C locale
27932794
ok 11 - Passing a string through N__() in the C locale works
27942795
ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
27952796
ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
2796-
# test_external test Perl Git::I18N API was ok
2797-
# test_external_without_stderr test no stderr: Perl Git::I18N API was ok
2797+
# test_external test Perl Git::I18N
2798+
# test_external_without_stderr test no stderr: Perl Git::I18N
27982799
*** t0203-gettext-setlocale-sanity.sh ***
27992800
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
28002801
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
@@ -2827,4 +2828,4 @@ ok 8 - gettext.c: git init UTF-8 -> ISO-8859-1
28272828
1..8
28282829
gmake[2]: *** [Makefile:49: t0204-gettext-reencode-sanity.sh] Error 1
28292830
gmake[1]: *** [Makefile:36: test] Error 2
2830-
gmake: *** [Makefile:2439: test] Error 2
2831+
gmake: *** [Makefile:2440: test] Error 2

‎doc/packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
| developer/macro/gnu-m4 | 1.4.18 | http://git.savannah.gnu.org/cgit/m4.git/refs/tags
2424
| developer/parser/bison | 3.0.4 | https://git.savannah.gnu.org/cgit/bison.git/refs/tags
2525
| developer/pkg-config | 0.29.2 | https://pkg-config.freedesktop.org/releases
26-
| developer/versioning/git | 2.15.0 | https://www.kernel.org/pub/software/scm/git
26+
| developer/versioning/git | 2.15.1 | https://www.kernel.org/pub/software/scm/git
2727
| developer/versioning/mercurial | 4.4.1 | https://www.mercurial-scm.org/release/?M=D
2828
| driver/tuntap | 1.3.3 | https://github.com/kaizawa/tuntap/releases
2929
| editor/vim | 8.0.586 | http://ftp.vim.org/pub/vim/unix

0 commit comments

Comments
 (0)