From 6d8b3756ea5a3dbad04f489d927143a27fd5dd21 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 5 Jan 2021 18:22:15 +0100 Subject: [PATCH] git: fix config directory patch some tests depend on awk --- dev-vcs/git/git-2.30.0.recipe | 24 ++++++------ dev-vcs/git/patches/git-2.30.0.patchset | 52 +++++++++++-------------- 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dev-vcs/git/git-2.30.0.recipe b/dev-vcs/git/git-2.30.0.recipe index ec1893c89..be21561b0 100644 --- a/dev-vcs/git/git-2.30.0.recipe +++ b/dev-vcs/git/git-2.30.0.recipe @@ -10,7 +10,7 @@ workflows." HOMEPAGE="https://git-scm.com/" COPYRIGHT="2005-2020 Git Authors (see git web site for list)" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.xz" CHECKSUM_SHA256="55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19" SOURCE_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.xz" @@ -106,6 +106,7 @@ REQUIRES_svn=" " BUILD_REQUIRES=" + cmd:cmp cmd:man cmd:nano cmd:perl @@ -133,6 +134,7 @@ BUILD_PREREQUIRES=" TEST_REQUIRES=" cmd:diff + cmd:gawk " makeGit() @@ -246,19 +248,19 @@ INSTALL() TEST() { # x86_64 -#failed test(s): t0001 t0005 t0006 t0090 t0210 t0211 t0301 t0302 t0410 t1013 t1060 t1091 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1510 t1512 t2013 t2400 t2403 t2405 t3007 t3200 t3203 t3205 t3206 t3420 t3426 t3512 t3513 t3600 t3701 t3903 t3906 t3920 t4014 t4015 t4027 t4034 t4059 t4060 t4064 t4067 t4137 t4202 t4207 t4208 t4214 t4215 t4255 t5000 t5003 t5300 t5310 t5317 t5318 t5322 t5409 t5410 t5411 t5505 t5509 t5510 t5516 t5525 t5526 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5814 t5815 t6006 t6008 t6041 t6112 t6120 t6134 t6300 t6416 t6437 t6438 t6500 t7001 t7003 t7004 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7406 t7407 t7408 t7409 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7420 t7421 t7506 t7507 t7508 t7601 t7610 t7700 t7701 t7800 t7810 t7814 t8001 t8012 t9300 t9304 t9350 t9351 t9902 -#fixed 2 -#success 20393 -#failed 1353 -#broken 235 +#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t5000 t5300 t5506 t5521 t5562 t5604 t5605 t5702 t5814 t7060 t7300 t7415 t7701 t7800 t9300 +#fixed 1 +#success 21670 +#failed 78 +#broken 236 #total 22417 # x86_gcc2 -#failed test(s): t0001 t0005 t0006 t0090 t0210 t0211 t0301 t0302 t0410 t1013 t1060 t1091 t1100 t1300 t1305 t1306 t1308 t1309 t1400 t1500 t1510 t1512 t2013 t2400 t2403 t2405 t3007 t3200 t3203 t3205 t3206 t3420 t3426 t3512 t3513 t3600 t3701 t3903 t3906 t3920 t4014 t4015 t4027 t4034 t4059 t4060 t4064 t4067 t4137 t4202 t4207 t4208 t4214 t4215 t4255 t5003 t5300 t5310 t5317 t5318 t5322 t5409 t5410 t5411 t5500 t5505 t5509 t5510 t5516 t5525 t5526 t5528 t5533 t5545 t5562 t5572 t5601 t5604 t5605 t5614 t5616 t5617 t5702 t5811 t5814 t5815 t6006 t6008 t6041 t6112 t6120 t6134 t6300 t6416 t6437 t6438 t6500 t7001 t7003 t7004 t7060 t7064 t7112 t7300 t7400 t7401 t7403 t7406 t7407 t7408 t7409 t7411 t7412 t7413 t7414 t7415 t7416 t7417 t7418 t7419 t7420 t7421 t7506 t7507 t7508 t7601 t7610 t7700 t7701 t7800 t7810 t7814 t8001 t8012 t9300 t9304 t9350 t9351 t9902 -#fixed 2 -#success 20383 -#failed 1358 -#broken 235 +#failed test(s): t0005 t0006 t0210 t0211 t0301 t0302 t1060 t1100 t1300 t1306 t1308 t1309 t2400 t3903 t4014 t5150 t5300 t5400 t5516 t5528 t5531 t5562 t5604 t5605 t5702 t5814 t6430 t7060 t7300 t7409 t7415 t7701 t7800 t9300 +#fixed 1 +#success 21651 +#failed 90 +#broken 236 #total 22417 cat << DONE diff --git a/dev-vcs/git/patches/git-2.30.0.patchset b/dev-vcs/git/patches/git-2.30.0.patchset index 378c3966a..f346db5e5 100644 --- a/dev-vcs/git/patches/git-2.30.0.patchset +++ b/dev-vcs/git/patches/git-2.30.0.patchset @@ -1,4 +1,4 @@ -From 1c74acedb8f0c4682a3e889cf23b43cde4b5f5a3 Mon Sep 17 00:00:00 2001 +From f1fc231c2e257a644cacd9a9f6311ea59b8f178d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -21,10 +21,10 @@ index ae15253..b074d1a 100755 init_browser_path $i if type "$browser_path" > /dev/null 2>&1; then -- -2.28.0 +2.30.0 -From aa131000e2bb5119015c0cdabeb026c03de8e659 Mon Sep 17 00:00:00 2001 +From bfb2c3b810c8235348c02afb82dbd8253058270d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 19 Jan 2015 15:37:16 -0500 Subject: On Haiku use the user settings directory instead of HOME @@ -67,45 +67,39 @@ index 7b385e5..f0669d6 100644 home = getenv("HOME"); if (home) -- -2.28.0 +2.30.0 -From b9658a023ab00baaabde5fb9a6eba55293b0a34b Mon Sep 17 00:00:00 2001 +From 1a25c7c85ac35a748b8bccb64862f2c0c88f92e5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 19 Jan 2015 15:50:09 -0500 Subject: Ensure config-directory exists before using it. diff --git a/config.c b/config.c -index 1137bd7..6dd4b41 100644 +index 1137bd7..14cd935 100644 --- a/config.c +++ b/config.c -@@ -2761,6 +2761,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, - int ret; - struct lock_file lock = LOCK_INIT; - char *filename_buf = NULL; -+ char *config_dir = NULL; - char *contents = NULL; - size_t contents_sz; - struct config_store_data store; -@@ -2777,6 +2778,12 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, +@@ -2777,6 +2777,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, if (!config_filename) config_filename = filename_buf = git_pathdup("config"); -+ config_dir = xstrdup(config_filename); -+ * find_last_dir_sep(config_dir) = '\0'; -+ if (access(config_dir, F_OK) != 0) -+ mkdir(config_dir, 0755); -+ free(config_dir); ++ if (find_last_dir_sep(config_filename) != NULL) { ++ char *config_dir = xstrdup(config_filename); ++ * find_last_dir_sep(config_dir) = '\0'; ++ if (access(config_dir, F_OK) != 0) ++ mkdir(config_dir, 0755); ++ free(config_dir); ++ } + /* * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- -2.28.0 +2.30.0 -From 2af7a649faab7562fee5cd32de2a4e8e522b5c1b Mon Sep 17 00:00:00 2001 +From b4d5770706a101133ca8b32350c39e8bd3c133e6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 14 Feb 2016 10:32:12 +0100 Subject: Move credential cache to the config directory. @@ -126,10 +120,10 @@ index 9b3f709..893db81 100644 socket = xstrfmt("%s/socket", old_dir); else -- -2.28.0 +2.30.0 -From 0663035df5770c9cb2edc3c6f7578bfc38e5ef49 Mon Sep 17 00:00:00 2001 +From 9460278c9eeefb9400ed24b214da394e7310eb51 Mon Sep 17 00:00:00 2001 From: sfanxiang Date: Mon, 1 Jan 2018 13:26:28 +0000 Subject: builtin: config: use xdg_config even if it does not exist @@ -169,10 +163,10 @@ index f71fa39..0843a19 100644 } else if (use_system_config) { -- -2.28.0 +2.30.0 -From 68029054d6d00db50c422d37284246908a493e26 Mon Sep 17 00:00:00 2001 +From b8d68d0d6336135fdc4c37351c369b4c5c90197c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 18 Nov 2018 11:56:26 +0100 Subject: Fix detection of Haiku for git web browse @@ -196,10 +190,10 @@ index b074d1a..0f95000 100755 fi -- -2.28.0 +2.30.0 -From 97dfbc1daa64c44975dc8617eacdf5a7688dcbc6 Mon Sep 17 00:00:00 2001 +From 3e184bad49786c265d2826bb5c34986ed2f2e483 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Nov 2019 21:46:54 +0100 Subject: ignore test failures. @@ -219,5 +213,5 @@ index 882d26e..3252f7f 100644 pre-clean: $(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)' -- -2.28.0 +2.30.0