commit c151d88a343c71f2e0fbe6afda95ee8c9b041e5e Author: CentOS Sources Date: Tue Nov 5 14:44:09 2019 -0500 import git-2.18.1-4.el8 diff --git a/.git.metadata b/.git.metadata new file mode 100644 index 0000000..42df035 --- /dev/null +++ b/.git.metadata @@ -0,0 +1,2 @@ +c57084d534cc259c14371a4dbdaf0119933d8f41 SOURCES/git-2.18.1.tar.xz +097b8da13939ac9f51f97a5659184c1d96fb0973 SOURCES/gpgkey-junio.asc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d32ef2a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/git-2.18.1.tar.xz +SOURCES/gpgkey-junio.asc diff --git a/SOURCES/0001-Switch-git-instaweb-default-to-apache.patch b/SOURCES/0001-Switch-git-instaweb-default-to-apache.patch new file mode 100644 index 0000000..6d9d21c --- /dev/null +++ b/SOURCES/0001-Switch-git-instaweb-default-to-apache.patch @@ -0,0 +1,43 @@ +From aebe9c096f7150eee901fcc59036a89c54c26a0b Mon Sep 17 00:00:00 2001 +From: Sebastian Kisela +Date: Mon, 16 Jul 2018 08:54:00 +0200 +Subject: [PATCH] Switch instaweb default HTTP daemon to httpd + +--- + git-instaweb.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/git-instaweb.sh b/git-instaweb.sh +index 47e38f3..e089f0d 100755 +--- a/git-instaweb.sh ++++ b/git-instaweb.sh +@@ -36,7 +36,7 @@ conf="$GIT_DIR/gitweb/httpd.conf" + # Defaults: + + # if installed, it doesn't need further configuration (module_path) +-test -z "$httpd" && httpd='lighttpd -f' ++test -z "$httpd" && httpd='httpd -f' + + # Default is @@GITWEBDIR@@ + test -z "$root" && root='@@GITWEBDIR@@' +@@ -332,6 +332,8 @@ apache2_conf () { + module_path="/usr/lib/httpd/modules" + test -d "/usr/lib/apache2/modules" && + module_path="/usr/lib/apache2/modules" ++ test -d "/etc/httpd/modules" && ++ module_path="/etc/httpd/modules" + fi + bind= + test x"$local" = xtrue && bind='127.0.0.1:' +@@ -356,7 +358,7 @@ EOF + break + fi + done +- for mod in mime dir env log_config authz_core ++ for mod in mime dir env log_config authz_core unixd + do + if test -e $module_path/mod_${mod}.so + then +-- +2.14.4 + diff --git a/SOURCES/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch b/SOURCES/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch new file mode 100644 index 0000000..6d36fe5 --- /dev/null +++ b/SOURCES/0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch @@ -0,0 +1,99 @@ +From 5be233541a4fc2e395087fe51a30a3664165e8bc Mon Sep 17 00:00:00 2001 +From: Phillip Wood +Date: Fri, 1 Jun 2018 18:46:44 +0100 +Subject: [PATCH] add -p: fix counting empty context lines in edited patches + +recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p: +calculate offset delta for edited patches", 2018-03-05) required all +context lines to start with a space, empty lines are not counted. This +was intended to avoid any recounting problems if the user had +introduced empty lines at the end when editing the patch. However this +introduced a regression into 'git add -p' as it seems it is common for +editors to strip the trailing whitespace from empty context lines when +patches are edited thereby introducing empty lines that should be +counted. 'git apply' knows how to deal with such empty lines and POSIX +states that whether or not there is an space on an empty context line +is implementation defined [1]. + +Fix the regression by counting lines consist solely of a newline as +well as lines starting with a space as context lines and add a test to +prevent future regressions. + +[1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/diff.html + +Reported-by: Mahmoud Al-Qudsi +Reported-by: Oliver Joseph Ash +Reported-by: Jeff Felchner +Signed-off-by: Phillip Wood +--- + git-add--interactive.perl | 2 +- + t/t3701-add-interactive.sh | 43 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 1 deletion(-) + +diff --git a/git-add--interactive.perl b/git-add--interactive.perl +index c1f52e457f..befbe8c749 100755 +--- a/git-add--interactive.perl ++++ b/git-add--interactive.perl +@@ -1055,7 +1055,7 @@ sub recount_edited_hunk { + $o_cnt++; + } elsif ($mode eq '+') { + $n_cnt++; +- } elsif ($mode eq ' ') { ++ } elsif ($mode eq ' ' or $_ eq "\n") { + $o_cnt++; + $n_cnt++; + } +diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh +index b170fb02b8..3e9139dca8 100755 +--- a/t/t3701-add-interactive.sh ++++ b/t/t3701-add-interactive.sh +@@ -175,6 +175,49 @@ test_expect_success 'real edit works' ' + diff_cmp expected output + ' + ++test_expect_success 'setup file' ' ++ test_write_lines a "" b "" c >file && ++ git add file && ++ test_write_lines a "" d "" c >file ++' ++ ++test_expect_success 'setup patch' ' ++ SP=" " && ++ NULL="" && ++ cat >patch <<-EOF ++ @@ -1,4 +1,4 @@ ++ a ++ $NULL ++ -b ++ +f ++ $SP ++ c ++ EOF ++' ++ ++test_expect_success 'setup expected' ' ++ cat >expected <<-EOF ++ diff --git a/file b/file ++ index b5dd6c9..f910ae9 100644 ++ --- a/file ++ +++ b/file ++ @@ -1,5 +1,5 @@ ++ a ++ $SP ++ -f ++ +d ++ $SP ++ c ++ EOF ++' ++ ++test_expect_success 'edit can strip spaces from empty context lines' ' ++ test_write_lines e n q | git add -p 2>error && ++ test_must_be_empty error && ++ git diff >output && ++ diff_cmp expected output ++' ++ + test_expect_success 'skip files similarly as commit -a' ' + git reset && + echo file >.gitignore && diff --git a/SOURCES/0001-config-document-value-2-for-protocol.version.patch b/SOURCES/0001-config-document-value-2-for-protocol.version.patch new file mode 100644 index 0000000..cc17108 --- /dev/null +++ b/SOURCES/0001-config-document-value-2-for-protocol.version.patch @@ -0,0 +1,32 @@ +From db2d36fad8b6b495a5064ea89d3bed1a48841ba9 Mon Sep 17 00:00:00 2001 +From: Brandon Williams +Date: Mon, 10 Sep 2018 14:21:57 -0700 +Subject: [PATCH] config: document value 2 for protocol.version + +Update the config documentation to note the value `2` as an acceptable +value for the protocol.version config. + +Signed-off-by: Brandon Williams +Signed-off-by: Josh Steadmon +Reviewed-by: Jonathan Nieder +Signed-off-by: Junio C Hamano +--- + Documentation/config.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/config.txt b/Documentation/config.txt +index 64c1dbba94..5105a39e98 100644 +--- a/Documentation/config.txt ++++ b/Documentation/config.txt +@@ -2587,6 +2587,8 @@ protocol.version:: + * `1` - the original wire protocol with the addition of a version string + in the initial response from the server. + ++* `2` - link:technical/protocol-v2.html[wire protocol version 2]. ++ + -- + + pull.ff:: +-- +2.14.4 + diff --git a/SOURCES/0001-run-command-mark-path-lookup-errors-with-ENOENT.patch b/SOURCES/0001-run-command-mark-path-lookup-errors-with-ENOENT.patch new file mode 100644 index 0000000..5206d68 --- /dev/null +++ b/SOURCES/0001-run-command-mark-path-lookup-errors-with-ENOENT.patch @@ -0,0 +1,135 @@ +From 1e1167f676252c220fbee6038715157c457c7d2f Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Wed, 24 Oct 2018 03:38:00 -0400 +Subject: [PATCH] run-command: mark path lookup errors with ENOENT + +Since commit e3a434468f (run-command: use the +async-signal-safe execv instead of execvp, 2017-04-19), +prepare_cmd() does its own PATH lookup for any commands we +run (on non-Windows platforms). + +However, its logic does not match the old execvp call when +we fail to find a matching entry in the PATH. Instead of +feeding the name directly to execv, execvp would consider +that an ENOENT error. By continuing and passing the name +directly to execv, we effectively behave as if "." was +included at the end of the PATH. This can have confusing and +even dangerous results. + +The fix itself is pretty straight-forward. There's a new +test in t0061 to cover this explicitly, and I've also added +a duplicate of the ENOENT test to ensure that we return the +correct errno for this case. + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + run-command.c | 21 +++++++++++++++++---- + t/t0061-run-command.sh | 13 ++++++++++++- + 2 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/run-command.c b/run-command.c +index 84b883c213..d679cc267c 100644 +--- a/run-command.c ++++ b/run-command.c +@@ -380,7 +380,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr) + set_error_routine(old_errfn); + } + +-static void prepare_cmd(struct argv_array *out, const struct child_process *cmd) ++static int prepare_cmd(struct argv_array *out, const struct child_process *cmd) + { + if (!cmd->argv[0]) + BUG("command is empty"); +@@ -403,16 +403,22 @@ static void prepare_cmd(struct argv_array *out, const struct child_process *cmd) + /* + * If there are no '/' characters in the command then perform a path + * lookup and use the resolved path as the command to exec. If there +- * are no '/' characters or if the command wasn't found in the path, +- * have exec attempt to invoke the command directly. ++ * are '/' characters, we have exec attempt to invoke the command ++ * directly. + */ + if (!strchr(out->argv[1], '/')) { + char *program = locate_in_PATH(out->argv[1]); + if (program) { + free((char *)out->argv[1]); + out->argv[1] = program; ++ } else { ++ argv_array_clear(out); ++ errno = ENOENT; ++ return -1; + } + } ++ ++ return 0; + } + + static char **prep_childenv(const char *const *deltaenv) +@@ -719,6 +725,12 @@ int start_command(struct child_process *cmd) + struct child_err cerr; + struct atfork_state as; + ++ if (prepare_cmd(&argv, cmd) < 0) { ++ failed_errno = errno; ++ cmd->pid = -1; ++ goto end_of_spawn; ++ } ++ + if (pipe(notify_pipe)) + notify_pipe[0] = notify_pipe[1] = -1; + +@@ -729,7 +741,6 @@ int start_command(struct child_process *cmd) + set_cloexec(null_fd); + } + +- prepare_cmd(&argv, cmd); + childenv = prep_childenv(cmd->env); + atfork_prepare(&as); + +@@ -857,6 +868,8 @@ int start_command(struct child_process *cmd) + argv_array_clear(&argv); + free(childenv); + } ++end_of_spawn: ++ + #else + { + int fhin = 0, fhout = 1, fherr = 2; +diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh +index c887ed5b45..b9cfc03a53 100755 +--- a/t/t0061-run-command.sh ++++ b/t/t0061-run-command.sh +@@ -13,10 +13,14 @@ cat >hello-script <<-EOF + EOF + >empty + +-test_expect_success 'start_command reports ENOENT' ' ++test_expect_success 'start_command reports ENOENT (slash)' ' + test-tool run-command start-command-ENOENT ./does-not-exist + ' + ++test_expect_success 'start_command reports ENOENT (no slash)' ' ++ test-tool run-command start-command-ENOENT does-not-exist ++' ++ + test_expect_success 'run_command can run a command' ' + cat hello-script >hello.sh && + chmod +x hello.sh && +@@ -26,6 +30,13 @@ test_expect_success 'run_command can run a command' ' + test_cmp empty err + ' + ++test_expect_success 'run_command is restricted to PATH' ' ++ write_script should-not-run <<-\EOF && ++ echo yikes ++ EOF ++ test_must_fail test-tool run-command run-command should-not-run ++' ++ + test_expect_success !MINGW 'run_command can run a script without a #! line' ' + cat >hello <<-\EOF && + cat hello-script +-- +2.14.4 + diff --git a/SOURCES/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch b/SOURCES/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch new file mode 100644 index 0000000..7cc468b --- /dev/null +++ b/SOURCES/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch @@ -0,0 +1,34 @@ +From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Fri, 7 Sep 2018 19:22:05 -0400 +Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output +used in the 'cookies stored in http.cookiefile when http.savecookies +set' test before comparing it to the expected cookies. + +¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support + creation-time attribute for cookies", 2018-08-28) + +Signed-off-by: Todd Zullinger +Signed-off-by: Junio C Hamano +--- + t/t5551-http-fetch-smart.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh +index 771f36f9ff473..538656bfef09b 100755 +--- a/t/t5551-http-fetch-smart.sh ++++ b/t/t5551-http-fetch-smart.sh +@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set + git config http.cookiefile cookies.txt && + git config http.savecookies true && + git ls-remote $HTTPD_URL/smart_cookies/repo.git master && +- tail -3 cookies.txt >cookies_tail.txt && ++ tail -3 cookies.txt | sort >cookies_tail.txt && + test_cmp expect_cookies.txt cookies_tail.txt + ' + diff --git a/SOURCES/git-1.8-gitweb-home-link.patch b/SOURCES/git-1.8-gitweb-home-link.patch new file mode 100644 index 0000000..aeb29e0 --- /dev/null +++ b/SOURCES/git-1.8-gitweb-home-link.patch @@ -0,0 +1,12 @@ +diff -up git-1.8.4.2/gitweb/gitweb.perl.orig git-1.8.4.2/gitweb/gitweb.perl +--- git-1.8.4.2/gitweb/gitweb.perl.orig 2013-10-28 14:17:38.000000000 -0400 ++++ git-1.8.4.2/gitweb/gitweb.perl 2013-10-29 16:49:07.302747507 -0400 +@@ -83,7 +83,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # extra breadcrumbs preceding the home link + our @extra_breadcrumbs = (); diff --git a/SOURCES/git-2.18.1-core-crypto-hmac.patch b/SOURCES/git-2.18.1-core-crypto-hmac.patch new file mode 100644 index 0000000..a1c8d7f --- /dev/null +++ b/SOURCES/git-2.18.1-core-crypto-hmac.patch @@ -0,0 +1,70 @@ +diff -ru git-2.18.1/builtin/receive-pack.c git-2.18.1_patched/builtin/receive-pack.c +--- git-2.18.1/builtin/receive-pack.c 2018-09-27 22:44:44.000000000 +0200 ++++ git-2.18.1_patched/builtin/receive-pack.c 2019-06-11 11:19:52.887797134 +0200 +@@ -26,6 +26,8 @@ + #include "oidset.h" + #include "packfile.h" + #include "protocol.h" ++#include ++#include + + static const char * const receive_pack_usage[] = { + N_("git receive-pack "), +@@ -419,43 +421,11 @@ + + #define HMAC_BLOCK_SIZE 64 + +-static void hmac_sha1(unsigned char *out, ++static inline void hmac_sha1(unsigned char *out, + const char *key_in, size_t key_len, + const char *text, size_t text_len) + { +- unsigned char key[HMAC_BLOCK_SIZE]; +- unsigned char k_ipad[HMAC_BLOCK_SIZE]; +- unsigned char k_opad[HMAC_BLOCK_SIZE]; +- int i; +- git_SHA_CTX ctx; +- +- /* RFC 2104 2. (1) */ +- memset(key, '\0', HMAC_BLOCK_SIZE); +- if (HMAC_BLOCK_SIZE < key_len) { +- git_SHA1_Init(&ctx); +- git_SHA1_Update(&ctx, key_in, key_len); +- git_SHA1_Final(key, &ctx); +- } else { +- memcpy(key, key_in, key_len); +- } +- +- /* RFC 2104 2. (2) & (5) */ +- for (i = 0; i < sizeof(key); i++) { +- k_ipad[i] = key[i] ^ 0x36; +- k_opad[i] = key[i] ^ 0x5c; +- } +- +- /* RFC 2104 2. (3) & (4) */ +- git_SHA1_Init(&ctx); +- git_SHA1_Update(&ctx, k_ipad, sizeof(k_ipad)); +- git_SHA1_Update(&ctx, text, text_len); +- git_SHA1_Final(out, &ctx); +- +- /* RFC 2104 2. (6) & (7) */ +- git_SHA1_Init(&ctx); +- git_SHA1_Update(&ctx, k_opad, sizeof(k_opad)); +- git_SHA1_Update(&ctx, out, GIT_SHA1_RAWSZ); +- git_SHA1_Final(out, &ctx); ++ HMAC(EVP_sha1(), key_in, key_len, text, text_len, out, NULL); + } + + static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) +diff -ru git-2.18.1/Makefile git-2.18.1_patched/Makefile +--- git-2.18.1/Makefile 2018-09-27 22:44:44.000000000 +0200 ++++ git-2.18.1_patched/Makefile 2019-06-10 17:28:26.137986964 +0200 +@@ -1721,6 +1721,8 @@ + BASIC_CFLAGS += -DHAVE_GETDELIM + endif + ++EXTLIBS += -lcrypto ++ + ifneq ($(PROCFS_EXECUTABLE_PATH),) + procfs_executable_path_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH)) + BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"' diff --git a/SOURCES/git-2.18.1.tar.sign b/SOURCES/git-2.18.1.tar.sign new file mode 100644 index 0000000..d2d8e10 Binary files /dev/null and b/SOURCES/git-2.18.1.tar.sign differ diff --git a/SOURCES/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch b/SOURCES/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch new file mode 100644 index 0000000..37a22dd --- /dev/null +++ b/SOURCES/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -0,0 +1,26 @@ +From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 23 Mar 2009 00:03:36 -0400 +Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output + +Signed-off-by: Todd Zullinger +--- + git-cvsimport.perl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-cvsimport.perl b/git-cvsimport.perl +index e439202..d020f1a 100755 +--- a/git-cvsimport.perl ++++ b/git-cvsimport.perl +@@ -952,7 +952,7 @@ while () { + } elsif (/^-+$/) { # end of unknown-line processing + $state = 1; + } elsif ($state != 11) { # ignore stuff when skipping +- print STDERR "* UNKNOWN LINE * $_\n"; ++ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /; + } + } + commit() if $branch and $state != 11; +-- +1.6.2.2 + diff --git a/SOURCES/git-gui.desktop b/SOURCES/git-gui.desktop new file mode 100644 index 0000000..f74f066 --- /dev/null +++ b/SOURCES/git-gui.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Git GUI +GenericName=Git GUI +Comment=A graphical interface to Git +Exec=git gui +Icon=/usr/share/git-gui/lib/git-gui.ico +Terminal=false +Type=Application +Categories=Development; diff --git a/SOURCES/git.socket b/SOURCES/git.socket new file mode 100644 index 0000000..3dec01d --- /dev/null +++ b/SOURCES/git.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Activation Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/SOURCES/git.xinetd.in b/SOURCES/git.xinetd.in new file mode 100644 index 0000000..d4ca95d --- /dev/null +++ b/SOURCES/git.xinetd.in @@ -0,0 +1,14 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using \ +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = @GITEXECDIR@/git-daemon + server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +} diff --git a/SOURCES/git@.service.in b/SOURCES/git@.service.in new file mode 100644 index 0000000..7abcfeb --- /dev/null +++ b/SOURCES/git@.service.in @@ -0,0 +1,10 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) + +[Service] +User=nobody +ExecStart=-@GITEXECDIR@/git-daemon --base-path=@BASE_PATH@ --export-all \ + --user-path=public_git --inetd --log-destination=stderr --verbose +StandardInput=socket +StandardError=journal diff --git a/SOURCES/gitweb-httpd.conf b/SOURCES/gitweb-httpd.conf new file mode 100644 index 0000000..4f4eac7 --- /dev/null +++ b/SOURCES/gitweb-httpd.conf @@ -0,0 +1,7 @@ +Alias /git /var/www/git + + + Options +ExecCGI + AddHandler cgi-script .cgi + DirectoryIndex gitweb.cgi + diff --git a/SOURCES/gitweb.conf.in b/SOURCES/gitweb.conf.in new file mode 100644 index 0000000..c04a96b --- /dev/null +++ b/SOURCES/gitweb.conf.in @@ -0,0 +1,53 @@ +# The gitweb config file is a fragment of perl code. You can set variables +# using "our $variable = value"; text from "#" character until the end of a +# line is ignored. See perlsyn(1) man page for details. +# +# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for +# more details and available configuration variables. + +# Set the path to git projects. This is an absolute filesystem path which will +# be prepended to the project path. +#our $projectroot = "@PROJECTROOT@"; + +# Set the list of git base URLs used for URL to where fetch project from, i.e. +# the full URL is "$git_base_url/$project". By default this is empty +#our @git_base_url_list = qw(git://git.example.com +# ssh://git.example.com@PROJECTROOT@); + +# Enable the 'blame' blob view, showing the last commit that modified +# each line in the file. This can be very CPU-intensive. Disabled by default +#$feature{'blame'}{'default'} = [1]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.blame = 0|1; +#$feature{'blame'}{'override'} = 1; + +# Disable the 'snapshot' link, providing a compressed archive of any tree. This +# can potentially generate high traffic if you have large project. Enabled for +# .tar.gz snapshots by default. +# +# Value is a list of formats defined in %known_snapshot_formats that you wish +# to offer. +#$feature{'snapshot'}{'default'} = []; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable) +#$feature{'snapshot'}{'override'} = 1; + +# Disable grep search, which will list the files in currently selected tree +# containing the given string. This can be potentially CPU-intensive, of +# course. Enabled by default. +#$feature{'grep'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.grep = 0|1; +#$feature{'grep'}{'override'} = 1; + +# Disable the pickaxe search, which will list the commits that modified a given +# string in a file. This can be practical and quite faster alternative to +# 'blame', but still potentially CPU-intensive. Enabled by default. +#$feature{'pickaxe'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.pickaxe = 0|1; +#$feature{'pickaxe'}{'override'} = 1; diff --git a/SOURCES/print-failed-test-output b/SOURCES/print-failed-test-output new file mode 100644 index 0000000..68fa9ee --- /dev/null +++ b/SOURCES/print-failed-test-output @@ -0,0 +1,13 @@ +#!/bin/bash + +shopt -s failglob + +# Print output from failing tests +dashes=$(printf "%80s" '' | tr ' ' '-') +for exit_file in t/test-results/*.exit; do + [ "$(cat "$exit_file")" -eq 0 ] && continue + out_file="${exit_file%exit}out" + printf '\n%s\n%s\n%s\n' "$dashes" "$out_file" "$dashes" + cat "$out_file" +done +exit 1 diff --git a/SPECS/git.spec b/SPECS/git.spec new file mode 100644 index 0000000..00698f8 --- /dev/null +++ b/SPECS/git.spec @@ -0,0 +1,2321 @@ +%{?scl:%scl_package git} +%{!?scl:%global pkg_name %{name}} +# Pass --without docs to rpmbuild if you don't want the documentation +%bcond_without docs + +%if 0%{?scl:1} +%global httpdconfdir /opt/rh/httpd24/root/etc/httpd/conf.d +%global appdesktopdir %{_root_datadir}/applications +# Build and link files with httpd24-libcurl +# See rhscl commit f70137d3d3 +%global cpath_dir /opt/rh/%{scl_httpd}/root%{_root_includedir} +%global libcurl_devel %{?scl_prefix_httpd}libcurl-devel +%else +%global appdesktopdir %{_datadir}/applications +%global httpdconfdir %{_sysconfdir}/httpd/conf.d +%global libcurl_devel libcurl-devel +%endif + +%global gitexecdir %{_libexecdir}/git-core + +# Settings for Fedora +%if 0%{?fedora} +# linkchecker is not available on EL +%bcond_without linkcheck +%else +%bcond_with linkcheck +%endif + +# Settings for Fedora > 29 and EL > 7 +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 +%bcond_with python2 +%else +%bcond_without python2 +%endif + +# Settings for Fedora >= 29 and EL > 7 +%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 +%global gitweb_httpd_conf gitweb.conf +%else +%global gitweb_httpd_conf git.conf +%endif + +# Settings for Fedora and EL > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 +%bcond_without python3 +%global use_perl_generators 1 +%global use_perl_interpreter 1 +%else +%bcond_with python3 +%global use_perl_generators 0 +%global use_perl_interpreter 0 +%endif + +# Settings for Fedora and EL >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global bashcomp_pkgconfig 1 +%global bashcompdir %{?scl:%_scl_root}%(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) +%global emacs_filesystem 1 +%global libsecret 1 +%global use_new_rpm_filters 1 +%global use_systemd 1 +%else +%global bashcomp_pkgconfig 0 +%global bashcompdir %{_sysconfdir}/bash_completion.d +%global bashcomproot %{bashcompdir} +%global emacs_filesystem 0 +%global libsecret 0 +%global use_new_rpm_filters 0 +%global use_systemd 0 +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%endif + +# Allow cvs subpackage to be toggled via --with/--without +# Disable cvs subpackage by default on EL > 7 +%if 0%{?rhel} > 7 +%bcond_with cvs +%else +%bcond_without cvs +%endif + +# Allow p4 subpackage to be toggled via --with/--without +# Disable by default if we lack python2 support +%if ! %{with python2} +%bcond_with p4 +%else +%bcond_without p4 +%endif + +# Hardening flags for EL-7 +%if 0%{?rhel} == 7 +%global _hardened_build 1 +%endif + +# Hardening flags for EL-6 +%if 0%{?rhel} == 6 +%global optflags %{optflags} -fPIC -pie +%global __global_ldflags -Wl,-z,relro -Wl,-z,now +%endif + +# Define for release candidates +#global rcrev .rc0 + +Name: %{?scl_prefix}git +Version: 2.18.1 +Release: 4%{?rcrev}%{?dist} +Summary: Fast Version Control System +License: GPLv2 +URL: https://git-scm.com/ +Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{pkg_name}-%{version}%{?rcrev}.tar.xz +Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{pkg_name}-%{version}%{?rcrev}.tar.sign + +# Junio C Hamano's key is used to sign git releases, it can be found in the +# junio-gpg-pub tag within git. +# +# (Note that the tagged blob in git contains a version of the key with an +# expired signing subkey. The subkey expiration has been extended on the +# public keyservers, but the blob in git has not been updated.) +# +# https://git.kernel.org/cgit/git/git.git/tag/?h=junio-gpg-pub +# https://git.kernel.org/cgit/git/git.git/blob/?h=junio-gpg-pub&id=7214aea37915ee2c4f6369eb9dea520aec7d855b +Source9: gpgkey-junio.asc + +# Local sources begin at 10 to allow for additional future upstream sources +Source11: git.xinetd.in +Source12: git-gui.desktop +Source13: gitweb-httpd.conf +Source14: gitweb.conf.in +Source15: git@.service.in +Source16: git.socket + +# Script to print test failure output (used in %%check) +Source99: print-failed-test-output + +Patch0: git-1.8-gitweb-home-link.patch +# https://bugzilla.redhat.com/490602 +Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# https://github.com/gitster/git/commit/f2cb01d35 +# https://public-inbox.org/git/20180601174644.13055-1-phillip.wood@talktalk.net/ +Patch2: 0001-add-p-fix-counting-empty-context-lines-in-edited-pat.patch +Patch3: 0001-Switch-git-instaweb-default-to-apache.patch +# curl-7.61.1 changes cookie sort order +# https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/ +# https://github.com/git/git/commit/f5b2c9c98e.patch +Patch4: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch +Patch5: 0001-config-document-value-2-for-protocol.version.patch +# CVE-2018-19486 +# https://bugzilla.redhat.com/1653143 +# https://github.com/git/git/commit/321fd82389.patch +Patch7: 0001-run-command-mark-path-lookup-errors-with-ENOENT.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1619113 +Patch8: git-2.18.1-core-crypto-hmac.patch + +%if %{with docs} +BuildRequires: asciidoc >= 8.4.1 +BuildRequires: xmlto +%if %{with linkcheck} +BuildRequires: linkchecker +%endif +%endif +BuildRequires: desktop-file-utils +BuildRequires: emacs +BuildRequires: expat-devel +BuildRequires: findutils +BuildRequires: gawk +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: gnupg2 +BuildRequires: %{libcurl_devel} +%if %{libsecret} +BuildRequires: libsecret-devel +%endif +BuildRequires: make +BuildRequires: openssl-devel +BuildRequires: pcre2-devel +BuildRequires: perl(Error) +BuildRequires: perl(Test) +%if %{use_perl_generators} +BuildRequires: perl-generators +%endif +%if %{use_perl_interpreter} +BuildRequires: perl-interpreter +%else +BuildRequires: perl +%endif +%if %{bashcomp_pkgconfig} +BuildRequires: pkgconfig(bash-completion) +%endif +BuildRequires: sed +%if %{use_systemd} +# For macros +BuildRequires: systemd +%endif +%{?scl:Requires:%scl_runtime} +BuildRequires: tcl +BuildRequires: tk +BuildRequires: zlib-devel >= 1.2 + +# Test suite requirements +BuildRequires: acl +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 +# see bz1491151 +# Needed by t5540-http-push-webdav.sh +BuildRequires: apr-util-bdb +%endif +BuildRequires: bash +%if %{with cvs} +BuildRequires: cvs +BuildRequires: cvsps +%endif +BuildRequires: gnupg +%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) +BuildRequires: highlight +%endif +BuildRequires: httpd +%if 0%{?fedora} && %{_arch} != s390x +BuildRequires: jgit +%endif +BuildRequires: mod_dav_svn +BuildRequires: pcre +BuildRequires: perl(App::Prove) +BuildRequires: perl(CGI) +BuildRequires: perl(CGI::Carp) +BuildRequires: perl(CGI::Util) +BuildRequires: perl(DBD::SQLite) +BuildRequires: perl(Digest::MD5) +BuildRequires: perl(HTTP::Date) +BuildRequires: perl(IO::Pty) +BuildRequires: perl(Mail::Address) +BuildRequires: perl(Memoize) +BuildRequires: perl(Test::More) +BuildRequires: perl(Time::HiRes) +%if %{with python2} +BuildRequires: python2-devel +%endif +%if %{with python3} +BuildRequires: python3-devel +%endif +BuildRequires: subversion +BuildRequires: subversion-perl +BuildRequires: time + +Requires: %{?scl_prefix}git-core = %{version}-%{release} +Requires: %{?scl_prefix}git-core-doc = %{version}-%{release} +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) +%endif +Requires: %{?scl_prefix}perl-Git = %{version}-%{release} + +%if %{emacs_filesystem} +Requires: emacs-filesystem >= %{_emacs_version} +%endif + +# Obsolete gnome-keyring credential helper (remove in Fedora 29) +Obsoletes: %{?scl_prefix}git-gnome-keyring < 2.11.1-4 + +%description +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +The git rpm installs common set of tools which are usually using with +small amount of dependencies. To install all git packages, including +tools for integrating with other SCMs, install the git-all meta-package. + +%package all +Summary: Meta-package to pull in all git tools +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +%if %{with cvs} +Requires: %{?scl_prefix}git-cvs = %{version}-%{release} +%endif +Requires: %{?scl_prefix}git-email = %{version}-%{release} +Requires: %{?scl_prefix}git-gui = %{version}-%{release} +%if %{with p4} +Requires: %{?scl_prefix}git-p4 = %{version}-%{release} +%endif +Requires: %{?scl_prefix}git-subtree = %{version}-%{release} +Requires: %{?scl_prefix}git-svn = %{version}-%{release} +Requires: %{?scl_prefix}git-instaweb = %{version}-%{release} +Requires: %{?scl_prefix}gitk = %{version}-%{release} +Requires: %{?scl_prefix}perl-Git = %{version}-%{release} +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) +%endif +%if ! %{emacs_filesystem} +Requires: %{?scl_prefix}emacs-git = %{version}-%{release} +%endif +%description all +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +This is a dummy package which brings in all subpackages. + +%package core +Summary: Core package of git with minimal functionality +%{?scl:Requires:%scl_runtime} +Requires: less +Requires: openssh-clients +Requires: zlib >= 1.2 +%description core +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +The git-core rpm installs really the core tools with minimal +dependencies. Install git package for common set of tools. +To install all git packages, including tools for integrating with +other SCMs, install the git-all meta-package. + +%package core-doc +Summary: Documentation files for git-core +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git-core = %{version}-%{release} +%description core-doc +Documentation files for git-core package including man pages. + +%if %{with cvs} +%package cvs +Summary: Git tools for importing CVS repositories +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: cvs +Requires: cvsps +Requires: perl(DBD::SQLite) +%description cvs +%{summary}. +%endif + +%package daemon +Summary: Git protocol daemon +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git-core = %{version}-%{release} +%if %{use_systemd} +Requires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +Requires: xinetd +%endif +%description daemon +The git daemon for supporting git:// access to git repositories + +%package email +Summary: Git tools for sending patches via email +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: perl(Authen::SASL) +Requires: perl(Net::SMTP::SSL) +%description email +%{summary}. + +%if ! %{emacs_filesystem} +%package -n emacs-git +Summary: Git version control system support for Emacs +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +BuildArch: noarch +Requires: emacs(bin) >= %{_emacs_version} +Obsoletes: emacs-git-el < 2.18.0-0.0 +Provides: emacs-git-el = %{version}-%{release} +%description -n emacs-git +%{summary}. +%endif + +%package -n %{?scl_prefix}gitk +Summary: Git repository browser +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: tk >= 8.4 +%description -n %{?scl_prefix}gitk +%{summary}. + +%package -n %{?scl_prefix}gitweb +Summary: Simple web interface to git repositories +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +%description -n %{?scl_prefix}gitweb +%{summary}. + +%package gui +Summary: Graphical interface to Git +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}gitk = %{version}-%{release} +Requires: tk >= 8.4 +%description gui +%{summary}. + +%if %{with p4} +%package p4 +Summary: Git tools for working with Perforce depots +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +BuildRequires: python2-devel +Requires: %{?scl_prefix}git = %{version}-%{release} +%description p4 +%{summary}. +%endif + +%package -n %{?scl_prefix}perl-Git +Summary: Perl interface to Git +BuildArch: noarch +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%description -n %{?scl_prefix}perl-Git +%{summary}. + +%package -n %{?scl_prefix}perl-Git-SVN +Summary: Perl interface to Git::SVN +BuildArch: noarch +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%description -n %{?scl_prefix}perl-Git-SVN +%{summary}. + +%package subtree +Summary: Git tools to merge and split repositories +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git-core = %{version}-%{release} +%description subtree +Git subtrees allow subprojects to be included within a subdirectory +of the main project, optionally including the subproject's entire +history. + +%package svn +Summary: Git tools for interacting with Subversion repositories +%{?scl:Requires:%scl_runtime} +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: perl(Digest::MD5) +%if ! %{defined perl_bootstrap} +Requires: perl(Term::ReadKey) +%endif +Requires: subversion +%description svn +%{summary}. + +%package instaweb +Summary: Repository browser in gitweb +Group: Development/Tools +Requires: %{?scl_prefix}git = %{version}-%{release} +Requires: %{?scl_prefix}gitweb = %{version}-%{release} +Requires: httpd + +%description instaweb +A simple script to set up gitweb and a web server for browsing the local repository. + +%prep +# Verify GPG signatures +gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings +key="%{SOURCE9}" +src="%{SOURCE0}" +# Ignore noisy output from GnuPG 2.0, used on EL <= 7 +# https://bugs.gnupg.org/gnupg/issue1555 +gpg2 --dearmor --quiet --batch --yes $key >/dev/null +# Upstream signs the uncompressed tarballs +tar=${src/%.xz/} +xz -dc $src > $tar +gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg $tar.sign $tar +rm -rf "$tar" "$gpghome" # Cleanup tar files and tmp gpg home dir + +# Ensure a blank line follows autosetup, el6 chokes otherwise +# https://bugzilla.redhat.com/1310704 +%autosetup -p1 -n %{pkg_name}-%{version}%{?rcrev} + +# Install print-failed-test-output script +install -p -m 755 %{SOURCE99} print-failed-test-output + +# Remove git-archimport from command list +sed -i '/^git-archimport/d' command-list.txt + +%if ! %{with cvs} +# Remove git-cvs* from command list +sed -i '/^git-cvs/d' command-list.txt +%endif + +%if ! %{with p4} +# Remove git-p4 from command list +sed -i '/^git-p4/d' command-list.txt +%endif + +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +cat << \EOF > config.mak +V = 1 +CFLAGS = %{optflags} +LDFLAGS = %{__global_ldflags} +LIBS = ${LIBS} +NEEDS_CRYPTO_WITH_SSL = 1 +USE_LIBPCRE = 1 +ETC_GITCONFIG = %{_sysconfdir}/gitconfig +INSTALL_SYMLINKS = 1 +GITWEB_PROJECTROOT = %{_localstatedir}/lib/git +GNU_ROFF = 1 +NO_PERL_CPAN_FALLBACKS = 1 +%if %{with python2} +PYTHON_PATH = %{__python2} +%else +NO_PYTHON = 1 +%endif +htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +prefix = %{_prefix} +perllibdir = %{?scl:%{_scl_root}}%{perl_vendorlib} +gitwebdir = %{_localstatedir}/www/git + +# Test options +DEFAULT_TEST_TARGET = prove +GIT_PROVE_OPTS = --verbose --normalize %{?_smp_mflags} +GIT_TEST_OPTS = -x --verbose-log +TEST_SHELL_PATH = /bin/bash +EOF + +# Filter bogus perl requires +# packed-refs comes from a comment in contrib/hooks/update-paranoid +%if %{use_new_rpm_filters} +%{?perl_default_filter} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\) +%if ! %{defined perl_bootstrap} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\) +%endif +%else +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(packed-refs)/d' +EOF + +%global __perl_requires %{_builddir}/%{name}-%{version}%{?rcrev}/%{name}-req +chmod +x %{__perl_requires} +%endif + +# Remove Git::LoadCPAN to ensure we use only system perl modules. This also +# allows the dependencies to be automatically processed by rpm. +rm -rf perl/Git/LoadCPAN{.pm,/} +grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' + +%build +%{?scl:scl enable %{scl_httpd} - << "EOF"} +%{?scl:export CPATH="%{cpath_dir}:${CPATH}"} +# asciidoc writes a timestamp to files it produces, based on the last +# modified date of the source file, but is sensible to the timezone. +# This makes the results differ according to the timezone of the build machine +# and spurious changes will be seen. +# Set the timezone to UTC as a workaround. +# https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc +TZ=UTC %make_build all %{?with_docs:doc} + +TZ=UTC %make_build -C contrib/contacts/ all %{?with_docs:doc} + +%if %{libsecret} +%make_build -C contrib/credential/libsecret/ +%endif + +%make_build -C contrib/diff-highlight/ + +TZ=UTC %make_build -C contrib/subtree/ all %{?with_docs:doc} + +# Fix shebang in a few places to silence rpmlint complaints +# +# The multimail hook is installed with git. Use python3 to avoid an +# unnecessary python2 dependency. +%if %{with python2} +sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ + contrib/fast-import/import-zips.py \ + contrib/hg-to-git/hg-to-git.py \ + contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive.example \ + contrib/svn-fe/svnrdump_sim.py +%endif +%if %{with python3} +sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ + contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive.example +%endif +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl_httpd} - << "EOF"} +%{?scl:export CPATH="%{cpath_dir}:${CPATH}"} +%make_install %{?with_docs:install-doc} +%{?scl:EOF} + +%make_install -C contrib/contacts %{?with_docs:install-doc} + +%global elispdir %{_emacs_sitelispdir}/git +pushd contrib/emacs >/dev/null +for el in *.el ; do + # Note: No byte-compiling is done. These .el files are one-line stubs + # which only serve to point users to better alternatives. + install -Dpm 644 $el %{buildroot}%{elispdir}/$el + rm -f $el # clean up to avoid cruft in git-core-doc +done +popd >/dev/null + +%if %{libsecret} +install -pm 755 contrib/credential/libsecret/git-credential-libsecret \ + %{buildroot}%{gitexecdir} +%endif +install -pm 755 contrib/credential/netrc/git-credential-netrc \ + %{buildroot}%{gitexecdir} + +%make_install -C contrib/subtree %{?with_docs:install-doc} + +mkdir -p %{buildroot}%{httpdconfdir} +mkdir -p %{buildroot}%{_sysconfdir} +install -pm 0644 %{SOURCE13} %{buildroot}%{httpdconfdir}/%{?scl_prefix}%{gitweb_httpd_conf} +sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \ + %{SOURCE14} > %{buildroot}%{_sysconfdir}/%{gitweb_httpd_conf} + +# install contrib/diff-highlight and clean up to avoid cruft in git-core-doc +install -Dpm 0755 contrib/diff-highlight/diff-highlight \ + %{buildroot}%{_datadir}/git-core/contrib/diff-highlight +rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} + +# Clean up contrib/subtree to avoid cruft in the git-core-doc docdir +# Move git-subtree.txt to Documentation so it can be installed later in docdir +mv contrib/subtree/git-subtree.txt Documentation/ +rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree{,.{1,html,sh,txt,xml}},t} + +# git-archimport is not supported +find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' + +%if ! %{with cvs} +# Remove git-cvs* and gitcvs* +find %{buildroot} Documentation \( -type f -o -type l \) \ + \( -name 'git-cvs*' -o -name 'gitcvs*' \) -exec rm -f {} ';' +%endif + +%if ! %{with p4} +# Remove git-p4* and mergetools/p4merge +find %{buildroot} Documentation -type f -name 'git-p4*' -exec rm -f {} ';' +rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge +%endif + +exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge|instaweb" +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files +(find %{buildroot}%{?scl:%{_scl_root}}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files +(find %{buildroot}%{?scl:%{_scl_root}}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files +# Split out Git::SVN files +grep Git/SVN perl-git-files > perl-git-svn-files +sed -i "/Git\/SVN/ d" perl-git-files +%if %{with docs} +(find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files +%else +rm -rf %{buildroot}%{_mandir} +%endif + +mkdir -p %{buildroot}%{_localstatedir}/lib/git +%if %{use_systemd} +install -Dp -m 0644 %{SOURCE16} %{buildroot}%{_unitdir}/%{?scl_prefix}git.socket +perl -p \ + -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ + -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ + %{SOURCE15} > %{buildroot}%{_unitdir}/%{?scl_prefix}git@.service +%else +mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d +perl -p \ + -e "s|\@GITEXECDIR\@|%{gitexecdir}|g;" \ + -e "s|\@BASE_PATH\@|%{_localstatedir}/lib/git|g;" \ + %{SOURCE11} > %{buildroot}%{_sysconfdir}/xinetd.d/%{?scl_prefix}git +%endif + +# Setup bash completion +install -Dpm 644 contrib/completion/git-completion.bash %{buildroot}%{bashcompdir}/git +ln -s git %{buildroot}%{bashcompdir}/gitk + +# Install tcsh completion +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-completion.tcsh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + +# Drop .py extension from git_multimail to avoid byte-compiling +mv contrib/hooks/multimail/git_multimail{.py,} + +# Move contrib/hooks out of %%docdir +mkdir -p %{buildroot}%{_datadir}/git-core/contrib +mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib +pushd contrib > /dev/null +ln -s ../../../git-core/contrib/hooks +popd > /dev/null + +# Install git-prompt.sh +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-prompt.sh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + +# install git-gui .desktop file +desktop-file-install --dir=%{buildroot}%{appdesktopdir} %{?scl:--vendor=%{?scl_name}} %{SOURCE12} + +# find translations +%find_lang %{pkg_name} %{pkg_name}.lang +cat %{pkg_name}.lang >> bin-man-doc-files + +# quiet some rpmlint complaints +chmod -R g-w %{buildroot} +chmod a-x %{buildroot}%{gitexecdir}/git-mergetool--lib +# These files probably are not needed +find . -regex '.*/\.\(git\(attributes\|ignore\)\|perlcriticrc\)' -delete +chmod a-x Documentation/technical/api-index.sh +find contrib -type f -print0 | xargs -r0 chmod -x + +# Split core files +not_core_re="git-(add--interactive|contacts|credential-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" +grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core +touch man-doc-files-core +%if %{with docs} +grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core +%endif +grep -E "$not_core_re" bin-man-doc-files > bin-man-doc-git-files + +##### DOC +# place doc files into %%{_pkgdocdir} and split them into expected packages +# contrib +not_core_doc_re="(git-(cvs|gui|citool|daemon|subtree))|p4|svn|email|gitk|gitweb" +mkdir -p %{buildroot}%{_pkgdocdir}/ +cp -pr README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ +# Remove contrib/ files/dirs which have nothing useful for documentation +rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential,svn-fe}/ +cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb +cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb + +%if %{with docs} +cp -pr Documentation/*.html Documentation/docbook-xsl.css %{buildroot}%{_pkgdocdir}/ +cp -pr Documentation/{howto,technical} %{buildroot}%{_pkgdocdir}/ +find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \ + |grep -o "%{_pkgdocdir}.*$" >> man-doc-files-core +%endif + +{ + find %{buildroot}%{_pkgdocdir} -type f -maxdepth 1 \ + | grep -o "%{_pkgdocdir}.*$" \ + | grep -vE "$not_core_doc_re" + find %{buildroot}%{_pkgdocdir}/{contrib,RelNotes} -type f \ + | grep -o "%{_pkgdocdir}.*$" + find %{buildroot}%{_pkgdocdir} -type d | grep -o "%{_pkgdocdir}.*$" \ + | sed "s/^/\%dir /" +} >> man-doc-files-core +##### #DOC + +%check +%if %{with docs} && %{with linkcheck} +# Test links in HTML documentation +find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker +%endif + +# Tests to skip on all releases and architectures +GIT_SKIP_TESTS="" + +%ifarch aarch64 %{arm} %{power64} +# Skip tests which fail on aarch64, arm, and ppc +# +# The following 2 tests use run_with_limited_cmdline, which calls ulimit -s 128 +# to limit the maximum stack size. +# t5541.33 'push 2000 tags over http' +# t5551.25 'clone the 2,000 tag repo to check OS command line overflow' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.33 t5551.25" +%endif + +%ifarch %{power64} +# Skip tests which fail on ppc +# +# t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails. +# The port it uses (9115) is already in use. It is unclear if this is +# due to an issue in the test suite or a conflict with some other process on +# the build host. It only appears to occur on ppc-arches. +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115" +%endif + +export GIT_SKIP_TESTS + +# Set LANG so various UTF-8 tests are run +export LANG=en_US.UTF-8 + +# Explicitly enable tests which may be skipped opportunistically +# (Check for variables set via test_tristate in the test suite) +export GIT_SVN_TEST_HTTPD=true +export GIT_TEST_GIT_DAEMON=true +export GIT_TEST_HTTPD=true +export GIT_TEST_SVNSERVE=true + +# Run the tests +# check source files with hardcoded content - it's more for reminder +# when new collection will be added in future +%if 0%{?scl:1} + # scl enable is required to use + grep -q "^Exec=/usr/bin/scl enable %{scl}" %{buildroot}%{appdesktopdir}/*git-gui.desktop + %if 0%{?use_systemd} + grep -q "^ExecStart=-/usr/bin/scl enable %{scl}" %{buildroot}%{_unitdir}/%{?scl_prefix}git@.service + %endif + + # and should be used correct paths - check at least that rh-gitXX is in path + grep -q "^Icon.*%{scl}" %{buildroot}%{appdesktopdir}/*git-gui.desktop + grep "%{_localstatedir}/www/git" %{buildroot}%{httpdconfdir}/%{?scl_prefix}%{gitweb_httpd_conf} + %if 0%{?use_systemd} + grep -qe "-- .*%{scl}" %{buildroot}%{_unitdir}/%{?scl_prefix}git@.service + %endif + + # check Name/GenericName that contains rh-GitXX (with current XX, e.g. 29) + grep -qi "^Name=%{scl}" %{buildroot}%{appdesktopdir}/*git-gui.desktop + grep -qi "^GenericName=%{scl}" %{buildroot}%{appdesktopdir}/*git-gui.desktop + +%endif +%{?scl:scl enable %{scl_httpd} - << "EOF"} +make test || ./print-failed-test-output +%{?scl:EOF} + +%if %{use_systemd} +%post daemon +%systemd_post %{?scl_prefix}git@.service + +%preun daemon +%systemd_preun %{?scl_prefix}git@.service + +%postun daemon +%systemd_postun_with_restart %{?scl_prefix}git@.service +%endif + +%files -f bin-man-doc-git-files +%if %{emacs_filesystem} +%{elispdir} +%endif +%{_datadir}/git-core/contrib/diff-highlight +%{_datadir}/git-core/contrib/hooks/multimail +%{_datadir}/git-core/contrib/hooks/update-paranoid +%{_datadir}/git-core/contrib/hooks/setgitperms.perl +%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample +%{_datadir}/git-core/templates/hooks/pre-rebase.sample +%{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample + +%files all +# No files for you! + +%files core -f bin-files-core +#NOTE: this is only use of the %%doc macro in this spec file and should not +# be used elsewhere +%{!?_licensedir:%global license %doc} +%license COPYING +# exclude is best way here because of troubles with symlinks inside git-core/ +%exclude %{_datadir}/git-core/contrib/diff-highlight +%exclude %{_datadir}/git-core/contrib/hooks/multimail +%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid +%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl +%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample +%exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample +%exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample +%{bashcomproot} +%{_datadir}/git-core/ + +%files core-doc -f man-doc-files-core +%if 0%{?rhel} && 0%{?rhel} <= 7 +# .py files are only bytecompiled on EL <= 7 +%exclude %{_pkgdocdir}/contrib/*/*.py[co] +%endif +%{_pkgdocdir}/contrib/hooks + +%if %{with cvs} +%files cvs +%{_pkgdocdir}/*git-cvs*.txt +%{_bindir}/git-cvsserver +%{gitexecdir}/*cvs* +%{?with_docs:%{_mandir}/man1/*cvs*.1*} +%{?with_docs:%{_pkgdocdir}/*git-cvs*.html} +%endif + +%files daemon +%{_pkgdocdir}/git-daemon*.txt +%if %{use_systemd} +%{_unitdir}/%{?scl_prefix}git.socket +%{_unitdir}/%{?scl_prefix}git@.service +%else +%config(noreplace)%{_sysconfdir}/xinetd.d/%{?scl_prefix}git +%endif +%{gitexecdir}/git-daemon +%{_localstatedir}/lib/git +%{?with_docs:%{_mandir}/man1/git-daemon*.1*} +%{?with_docs:%{_pkgdocdir}/git-daemon*.html} + +%if ! %{emacs_filesystem} +%files -n %{?scl_prefix}emacs-git +%{_pkgdocdir}/contrib/emacs/README +%{elispdir} +%endif + +%files email +%{_pkgdocdir}/*email*.txt +%{gitexecdir}/*email* +%{?with_docs:%{_mandir}/man1/*email*.1*} +%{?with_docs:%{_pkgdocdir}/*email*.html} + +%files -n %{?scl_prefix}gitk +%{_pkgdocdir}/*gitk*.txt +%{_bindir}/*gitk* +%{_datadir}/gitk +%{?with_docs:%{_mandir}/man1/*gitk*.1*} +%{?with_docs:%{_pkgdocdir}/*gitk*.html} + +%files -n %{?scl_prefix}gitweb +%{_pkgdocdir}/*.gitweb +%{_pkgdocdir}/gitweb*.txt +%{?with_docs:%{_pkgdocdir}/gitweb*.html} +%config(noreplace)%{_sysconfdir}/%{gitweb_httpd_conf} +%config(noreplace)%{httpdconfdir}/%{?scl_prefix}%{gitweb_httpd_conf} +%{_localstatedir}/www/git/ + +%files gui +%{gitexecdir}/git-gui* +%{gitexecdir}/git-citool +%{appdesktopdir}/*git-gui.desktop +%{_datadir}/git-gui/ +%{_pkgdocdir}/git-gui.txt +%{_pkgdocdir}/git-citool.txt +%{?with_docs:%{_mandir}/man1/git-gui.1*} +%{?with_docs:%{_pkgdocdir}/git-gui.html} +%{?with_docs:%{_mandir}/man1/git-citool.1*} +%{?with_docs:%{_pkgdocdir}/git-citool.html} + +%if %{with p4} +%files p4 +%{gitexecdir}/*p4* +%{gitexecdir}/mergetools/p4merge +%{_pkgdocdir}/*p4*.txt +%{?with_docs:%{_mandir}/man1/*p4*.1*} +%{?with_docs:%{_pkgdocdir}/*p4*.html} +%endif + +%files -n %{?scl_prefix}perl-Git -f perl-git-files +%{?with_docs:%{_mandir}/man3/Git.3pm*} + +%files -n %{?scl_prefix}perl-Git-SVN -f perl-git-svn-files + +%files subtree +%{gitexecdir}/git-subtree +%{_pkgdocdir}/git-subtree.txt +%{?with_docs:%{_mandir}/man1/git-subtree.1*} +%{?with_docs:%{_pkgdocdir}/git-subtree.html} + +%files svn +%{gitexecdir}/git-remote-testsvn +%{gitexecdir}/git-svn +%{_pkgdocdir}/git-svn.txt +%{?with_docs:%{_mandir}/man1/git-svn.1*} +%{?with_docs:%{_pkgdocdir}/git-svn.html} + +%files instaweb +%defattr(-,root,root) +%{gitexecdir}/git-instaweb +%{_pkgdocdir}/git-instaweb.txt +%{?with_docs:%{_mandir}/man1/git-instaweb.1*} +%{?with_docs:%{_pkgdocdir}/git-instaweb.html} + +%changelog +* Tue Jun 11 2019 Marcel Plch - 2.18.1-4 +- Use HMAC from libcrypto instead of git's implementation +- Resolves: rhbz#1619113 + +* Tue Dec 11 2018 Pavel Cahyna - 2.18.1-3 +- apply upstream run-command PATH fix (CVE-2018-19486) +- config: document value 2 for protocol.version (upstream patch) + +* Thu Oct 11 2018 Pavel Cahyna - 2.18.1-2 +- Fix build when apr-util does not pull in apr-util-bdb, adapt the existing Fedora condition. + Problem caused by changes in #1633973 and #1491151. +- Fix builds without docs and without cvs and/or p4 (from skisela) +- Fix smart-http test due to changes in cookie sort order in curl-7.61.1 + +* Wed Oct 10 2018 Pavel Cahyna - 2.18.1-1 +- Update to release 2.18.1, fixes CVE-2018-17456: arbitrary code execution via .gitmodules + +* Thu Aug 2 2018 Pavel Cahyna - 2.18.0-6 +- use the same spec file as for SCL (rhscl-3.2-rh-git218-rhel-7) + +* Thu Jul 19 2018 Sebastian Kisela - 2.18.0-5 +- Add %%{?scl_prefix} macros for services + desktop files. +- Add tests, checking hardcoded content of dist git sources, +written by pstodulk. +- Make git-gui.desktop, git@.service and gitweb-httpd.conf content +point to the correct scl paths. +- Move instaweb to separate subpackage +- Switch instaweb default HTTP daemon to httpd +- Use the correct apache module directory in instaweb. +- Build docs with TZ=UTC to make results deterministic. + Inspired by https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc + +* Tue Jul 17 2018 Sebastian Kisela - 2.18.0-4 +- Fix %%{perllibdir} path +- %%{perllibdir} now points to where perl-git modules are installed. + This was introduced in fedora commit: + f3c13faa206935a844e09c7dc9d78d6325100ced. + +* Tue Jul 17 2018 Sebastian Kisela - 2.18.0-3 +- Initial rhscl-3.2-rh-git218 commit +- Add %{scl*} macros to the spec file. + +* Wed Jul 11 2018 Pavel Cahyna - 2.18.0-3 +- Disable link checking on RHEL again (partially reverts 2.17.0-3) + +* Mon Jun 25 2018 Pavel Cahyna - 2.18.0-2 +- Fix build --without cvs + +* Wed Jun 20 2018 Todd Zullinger - 2.18.0-1 +- Update to 2.18.0 + +* Tue Jun 19 2018 Miro Hrončok - 2.18.0-0.3.rc2 +- Rebuilt for Python 3.7 + +* Wed Jun 13 2018 Todd Zullinger - 2.18.0-0.2.rc2 +- Update to 2.18.0-rc2 +- Apply upstream zlib buffer handling patch (#1582555) + +* Wed Jun 06 2018 Todd Zullinger +- Include git-contacts, SubmittingPatches suggests it to users +- Build git-subtree docs in %%build + +* Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 +- Update to 2.18.0-rc1 +- Drop flaky & out-of-place netrc credential helper tests + +* Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 +- add -p: fix counting empty context lines in edited patches + +* Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 +- Update to 2.18.0-rc0 +- Use new INSTALL_SYMLINKS setting + +* Wed May 30 2018 Todd Zullinger - 2.17.1-3 +- Use %%apply_patch for aarch64 zlib patch, return to %%autosetup +- Disable jgit tests on s390x, they're unreliable +- Use %%make_build and %%make_install + +* Tue May 29 2018 Todd Zullinger - 2.17.1-2 +- packfile: Correct zlib buffer handling (#1582555) + +* Tue May 29 2018 Todd Zullinger - 2.17.1-1 +- Update to 2.17.1 (CVE-2018-11233, CVE-2018-11235) + +* Thu May 24 2018 Todd Zullinger - 2.17.0-4 +- Fix segfault in rev-parse with invalid input (#1581678) +- Move TEST_SHELL_PATH setting to config.mak + +* Mon Apr 16 2018 Todd Zullinger - 2.17.0-3 +- Move linkcheck macro to existing fedora/rhel > 7 block +- Re-enable t5000-tar-tree.sh test on f28 + +* Fri Apr 13 2018 Pavel Cahyna +- Use BuildRequires: perl-interpreter per the packaging guidelines +- Update conditions for future RHEL + +* Tue Apr 10 2018 Todd Zullinger - 2.17.0-2 +- Require perl-generators on EL > 7 + +* Mon Apr 09 2018 Todd Zullinger +- daemon: use --log-destination=stderr with systemd +- daemon: fix condition for redirecting stderr +- git-svn: avoid uninitialized value warning + +* Sun Apr 08 2018 Todd Zullinger +- Clean up redundant and unneeded Requires + +* Sat Apr 07 2018 Todd Zullinger +- Remove Git::LoadCPAN to ensure we use only system perl modules + +* Mon Apr 02 2018 Todd Zullinger +- Allow git-p4 subpackage to be toggled via --with/--without +- Use %%bcond_(with|without) to enable/disable python3 +- Add support for disabling python2 + +* Mon Apr 02 2018 Todd Zullinger - 2.17.0-1 +- Update to 2.17.0 + +* Wed Mar 28 2018 Todd Zullinger - 2.17.0-0.2.rc2 +- Update to 2.17.0-rc2 + +* Tue Mar 27 2018 Todd Zullinger +- Allow cvs subpackage to be toggled via --with/--without + +* Tue Mar 27 2018 Joe Orton +- Disable CVS support on EL > 7 + +* Tue Mar 27 2018 Todd Zullinger - 2.17.0-0.1.rc1.2 +- Add missing perl(Mail::Address) requirement (#1561086) + +* Thu Mar 22 2018 Todd Zullinger - 2.17.0-0.1.rc1.1 +- Drop .py extension from contrib/hooks/multimail/git_multimail.py +- Remove unnecessary "chmod +x contrib/hooks/*" + +* Wed Mar 21 2018 Todd Zullinger - 2.17.0-0.1.rc1 +- Update to 2.17.0-rc1 + +* Fri Mar 16 2018 Todd Zullinger +- Add findutils BuildRequires, improve 'find | xargs' calls + +* Thu Mar 15 2018 Todd Zullinger - 2.17.0-0.0.rc0 +- Update to 2.17.0-rc0 +- Adjust for simplified perl install +- Require git-core rather than git for git-daemon +- Rename gitweb httpd config file +- Install contrib/diff-highlight (#1550251) + +* Thu Mar 15 2018 Todd Zullinger +- Use symlinks instead of hardlinks for installed binaries + +* Fri Feb 23 2018 Todd Zullinger +- Improve hardening flags for EL-6 & EL-7 + +* Fri Feb 16 2018 Todd Zullinger - 2.16.2-1 +- Update to 2.16.2 +- Add gawk, gcc, make, and sed BuildRequires + +* Wed Feb 07 2018 Todd Zullinger - 2.16.1-3 +- Order %%files and %%packages sections by name +- Remove obsolete %%defattr +- Don't package contrib/svn-fe in %%doc +- Split git-subtree into a separate package + +* Wed Feb 07 2018 Fedora Release Engineering - 2.16.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Todd Zullinger - 2.16.1-2 +- git-svn: avoid segfaults in 'git svn branch', re-enable t9128, t9141, and + t9167 +- Drop obsolete BuildRoot, Group, %%clean, and buildroot cleanup + +* Mon Jan 22 2018 Todd Zullinger - 2.16.1-1 +- Update to 2.16.1 +- Avoid python dependency in git-core (#1536471) + +* Thu Jan 18 2018 Todd Zullinger - 2.16.0-1 +- Update to 2.16.0 +- Use 'prove' as test harness, enable shell tracing +- Disable t5000-tar-tree.sh on x86 in f28 + +* Fri Jan 12 2018 Todd Zullinger +- Add %%{emacs_filesystem} to simplify emacs support +- Use .in template for git@.service to ensure paths are substituted + +* Thu Jan 11 2018 Todd Zullinger +- Update BuildRequires for tests + +* Mon Jan 08 2018 Todd Zullinger +- Avoid excluding non-existent .py[co] files in %%doc +- Remove obsolete gnome-keyring credential helper + +* Sun Jan 07 2018 Todd Zullinger +- Explicitly enable tests which may be skipped opportunistically + +* Sat Dec 30 2017 Todd Zullinger +- Fix perl requires filtering on EL-6 + +* Thu Nov 30 2017 Todd Zullinger - 2.15.1-3 +- Include verbose logs in build output for 'make test' failures +- Use %%autosetup macro to unpack and patch source +- Remove second make invocation for doc build/install +- Fix builds using '--without docs' +- Mark git-core-docs sub-package noarch +- Avoid failures in svnserve tests when run in parallel +- Run tests in parallel by default on Fedora +- Skip 'git svn branch' tests which fail intermittently +- Re-enable grep tests on s390x + +* Wed Nov 29 2017 Todd Zullinger - 2.15.1-2 +- Fix debuginfo for gnome-keyring and libsecret credential helpers + +* Tue Nov 28 2017 Todd Zullinger - 2.15.1-1 +- Update to 2.15.1 + +* Tue Nov 21 2017 Todd Zullinger +- Add tcl/tk BuildRequires +- Enable support for release candidate builds + +* Tue Nov 07 2017 Todd Zullinger - 2.15.0-2 +- Fix git-clone memory exhaustion (CVE-2017-15298) + Resolves: #1510455, #1510457 +- Disable cross-directory hardlinks +- Drop ancient obsoletes for git and git-arch +- Update summary/description of numerous subpackages +- Fix shebang in a few places to silence rpmlint complaints +- Fix t9020-remote-svn failure when setting PYTHON_PATH +- Rename %%gitcoredir to %%gitexecdir; upstream uses the latter +- Move commands which no longer require perl into git-core +- Move filter-branch out of core, it needs perl now +- Improve test suite coverage + +* Mon Oct 30 2017 Todd Zullinger - 2.15.0-1 +- Update to 2.15.0 + +* Mon Oct 23 2017 Todd Zullinger - 2.14.3-1 +- Update to 2.14.3 + +* Tue Sep 26 2017 Todd Zullinger - 2.14.2-2 +- Update to 2.14.2 + +* Thu Aug 10 2017 Todd Zullinger - 2.14.1-2 +- Rebuild for rpm-4.14 bug (#1480407) + +* Thu Aug 10 2017 Todd Zullinger - 2.14.1-1 +- Update to 2.14.1 (resolves CVE-2017-1000117) + +* Tue Aug 08 2017 Iryna Shcherbina - 2.14.0-2 +- Add a build-time dependency on python2-devel for p4 + Resolves: #1479713 +- Skip all grep tests on s390x for now because it failes intermittently + +* Fri Aug 04 2017 Todd Zullinger - 2.14.0-1 +- Update to 2.14.0 +- Use pcre2 library +- git-p4: explicitly require python2 + +* Tue Aug 01 2017 Todd Zullinger - 2.13.4-1 +- Update to 2.13.4 +- Remove EL-5 and old Fedora conditionals + +* Sun Jul 30 2017 Florian Weimer - 2.13.3-3 +- Rebuild with binutils fix for ppc64le (#1475636) + +* Thu Jul 20 2017 Petr Stodulka - 2.13.3-2 +- Move documentation files from all subpackages into the %%{_pkgdocdir} + directory, so links inside doc and man files are correct + Resolves: #1357438 +- Quiet a few rpmlint complaints regarding hidden files in contrib dir +- Remove explicit libcurl requirement from git-core + +* Thu Jul 13 2017 Gwyn Ciesla - 2.13.3-1 +- Update to 2.13.3 + +* Sun Jun 25 2017 Todd Zullinger - 2.13.2-1 +- Update to 2.13.2 +- Skip grep tests which fail intermittently on s390x + +* Wed Jun 07 2017 Jitka Plesnikova - 2.13.1-2 +- Perl 5.26 re-rebuild of bootstrapped packages + +* Mon Jun 05 2017 Todd Zullinger - 2.13.1-1 +- Update to 2.13.1 + +* Sun Jun 04 2017 Jitka Plesnikova - 2.13.0-3 +- Perl 5.26 rebuild + +* Wed May 17 2017 Todd Zullinger - 2.13.0-2 +- Use default, collision-detecting SHA1 implementation + +* Tue May 09 2017 Todd Zullinger - 2.13.0-1 +- Update to 2.13.0 (resolves CVE-2017-8386) + +* Wed Mar 29 2017 Gwyn Ciesla - 2.12.2-1 +- Update to 2.12.2 + +* Tue Mar 21 2017 Gwyn Ciesla - 2.12.1-1 +- Update to 2.12.1 + +* Mon Feb 27 2017 Jon Ciesla - 2.12.0-1 +- Update to 2.12.0 + +* Fri Feb 17 2017 Petr Stodulka - 2.11.1-3 +- remove non-ASCII characters from description and title of packages +- fix requiremets +- fix spec to be compatible for other systems +- remove deprecated credential-gnome-keyring + +* Fri Feb 17 2017 Todd Zullinger - 2.11.1-3 +- Remove unnecessary rsync requirement from git-core +- Move gnome-keyring credential helper from git-core to git +- Enable libsecret credential helper +- Run git test suite +- Use %%{_mandir} in git/git-core file list filters +- Fix version of emacs-git and emacs-git-el provides +- Clean up contrib/{credential,subtree} to avoid cruft in git-core-doc +- Fix a number of macro-in-comment warnings from rpmlint + +* Fri Feb 10 2017 Fedora Release Engineering - 2.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 03 2017 Jon Ciesla - 2.11.1-1 +- Update to 2.11.1 + +* Wed Nov 30 2016 Jon Ciesla - 2.11.0-1 +- Update to 2.11.0 + +* Mon Oct 31 2016 Jon Ciesla - 2.10.2-1 +- Update to 2.10.2 + +* Tue Oct 04 2016 Jon Ciesla - 2.10.1-1 +- Update to 2.10.1 + +* Sat Sep 03 2016 Todd Zullinger - 2.10.0-1 +- Update to 2.10.0 + +* Mon Aug 15 2016 Jon Ciesla - 2.9.3-1 +- Update to 2.9.3. + +* Fri Jul 15 2016 Jon Ciesla - 2.9.2-1 +- Update to 2.9.2. + +* Tue Jul 12 2016 Jon Ciesla - 2.9.1-1 +- Update to 2.9.1. + +* Tue Jun 14 2016 Jon Ciesla - 2.9.0-1 +- Update to 2.9.0. + +* Wed Jun 08 2016 Jon Ciesla - 2.8.4-1 +- Update to 2.8.4. + +* Fri May 20 2016 Jitka Plesnikova - 2.8.3-2 +- Perl 5.24 rebuild + +* Thu May 19 2016 Todd Zullinger - 2.8.3-1 +- Update to 2.8.3 + +* Thu May 19 2016 Jitka Plesnikova - 2.8.2-5 +- Perl 5.24 re-rebuild of bootstrapped packages + +* Wed May 18 2016 Todd Zullinger - 2.8.2-4 +- Use perl(MOD::NAME) format for perl-DBD-SQLite and perl-Digest-MD5 deps +- Define __global_ldflags on EL < 7 (#1337137) + +* Wed May 18 2016 Jitka Plesnikova - 2.8.2-3 +- Perl 5.24 re-rebuild of bootstrapped packages + +* Sun May 15 2016 Jitka Plesnikova - 2.8.2-2 +- Perl 5.24 rebuild + +* Fri Apr 29 2016 Todd Zullinger - 2.8.2-1 +- Update to 2.8.2 + +* Mon Apr 11 2016 Todd Zullinger - 2.8.1-3 +- Set LDFLAGS for hardened builds (#1289728) + +* Wed Apr 06 2016 Paolo Bonzini - 2.8.1-2 +- Install git-credentials-netrc (#1303358) + +* Tue Apr 05 2016 Jon Ciesla - 2.8.1-1 +- Update to 2.8.1. + +* Tue Mar 29 2016 Neal Gompa - 2.8.0-1 +- Update to 2.8.0 +- Use license macro for COPYING + +* Sun Mar 27 2016 Todd Zullinger - 2.7.4-2 +- Use https for URL / Source and smaller tar.xz files +- Check upstream GPG signatures in %%prep + +* Tue Mar 22 2016 Konrad Scherer +- Workaround missing git subtree documentation in prebuilt docs (bug 1320210) +- Only add git-cvsserver binary once if the core dir matches the bin dir as it + does on el5 (bug 1320210) + +* Tue Mar 22 2016 Todd Zullinger +- Conditionalize bash-completion pkg-config usage for EL <= 6 (bug 1320210) + +* Fri Mar 18 2016 David Woodhouse - 2.7.4-1 +- Update to 2.7.4 (for CVE-2016-2315, CVE-2016-2324) + Resolves: #1318220 + +* Mon Mar 14 2016 Jon Ciesla - 2.7.3-1 +- Update to 2.7.3. + +* Tue Feb 23 2016 Jon Ciesla - 2.7.2-1 +- Update to 2.7.2. + +* Sat Feb 06 2016 Jon Ciesla - 2.7.1-1 +- Update to 2.7.1. + +* Thu Feb 04 2016 Petr Stodulka - 2.7.0-3 +- remove all '.gitignore' files from packages + +* Wed Feb 03 2016 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 05 2016 Jon Ciesla - 2.7.0-1 +- Update to 2.7.0. +- Infinite loop patch appears obsolete. + +* Wed Dec 09 2015 Jon Ciesla - 2.6.4-1 +- Update to 2.6.4. + +* Fri Nov 27 2015 Petr Stodulka - 2.6.3-2 +- found 2 perl scripts in git-core, move them to git package + (#1284688) + +* Fri Nov 06 2015 Jon Ciesla - 2.6.3-1 +- Update to 2.6.3. + +* Tue Nov 03 2015 Petr Stodulka - 2.6.2-2 +- provides failback for the macro _pkgdocdir (#1277550) + +* Sat Oct 17 2015 Jon Ciesla - 2.6.2-1 +- Update to 2.6.2. + +* Tue Oct 06 2015 Jon Ciesla - 2.6.1-1 +- Update to 2.6.1. + +* Tue Sep 29 2015 Jon Ciesla - 2.6.0-1 +- Update to 2.6.0. + +* Fri Sep 18 2015 Jon Ciesla - 2.5.3-1 +- Update to 2.5.3. + +* Fri Sep 11 2015 Jon Ciesla - 2.5.2-1 +- Update to 2.5.2. + +* Sat Aug 29 2015 Petr Stodulka - 2.5.1-1 +- Update to 2.5.1 + +* Tue Jul 28 2015 Jon Ciesla - 2.5.0-1 +- Update to 2.5.0. + +* Thu Jul 16 2015 Petr Stodulka - 2.4.6-1 +- New upstream release 2.4.6 + +* Tue Jul 7 2015 Jonathan Underwood - 2.4.5-2 +- Comply with modern Emacs packaging guidelines on recent Fedora + No longer split out emacs-git and emacs-git-el sub-packages on recent Fedora + Require emacs-filesystem on recent Fedora (#1234552) + +* Fri Jun 26 2015 Jon Ciesla - 2.4.5-1 +- Update to 2.4.5. + +* Mon Jun 22 2015 Petr Stodulka - 2.4.4-2 +- git-svn - added requires for perl-Digest-MD5 (#1218176) +- solve troubles with infinite loop due to broken symlink (probably + shouldn't be problem here, but it's reproducible manually) + (#1204193) + +* Tue Jun 16 2015 Jon Ciesla - 2.4.4-1 +- Update to 2.4.4. + +* Wed Jun 10 2015 Jitka Plesnikova - 2.4.3-4 +- Perl 5.22 re-rebuild of bootstrapped packages + +* Tue Jun 09 2015 Jitka Plesnikova - 2.4.3-3 +- Perl 5.22 rebuild + +* Mon Jun 08 2015 Petr Stodulka - 2.4.3-2 +- separate documentation files from git-core package to git-core-doc + including core man pages + +* Sat Jun 06 2015 Jon Ciesla - 2.4.3-1 +- Update to 2.4.3. + +* Fri Jun 05 2015 Jitka Plesnikova +- Perl 5.22 rebuild + +* Wed Jun 03 2015 Petr Stodulka - 2.4.2-2 +- split create subpackage git-core (perl-less) from git package +- git package requires git-core and it has same tool set as + before +- relevant docs are part of git-core package too +- removed proved and obsoletes in git for git-core + +* Tue May 26 2015 Jon Ciesla - 2.4.2-1 +- Update to 2.4.2. + +* Thu May 14 2015 Jon Ciesla - 2.4.1-1 +- Update to 2.4.1. + +* Fri May 01 2015 Jon Ciesla - 2.4.0-1 +- Update to 2.4.0. + +* Tue Apr 28 2015 Jon Ciesla - 2.3.7-1 +- Update to 2.3.7. + +* Wed Apr 22 2015 Jon Ciesla - 2.3.6-1 +- Update to 2.3.6. + +* Mon Apr 06 2015 Jon Ciesla - 2.3.5-1 +- Update to 2.3.5. + +* Tue Mar 24 2015 Petr Stodulka - 2.3.4-1 +- Update to 2.3.4. + +* Mon Mar 16 2015 Jon Ciesla - 2.3.3-1 +- Update to 2.3.3. + +* Mon Mar 09 2015 Jon Ciesla - 2.3.2-1 +- Update to 2.3.2. + +* Fri Feb 27 2015 Jon Ciesla - 2.3.1-1 +- Update to 2.3.1. + +* Sat Feb 21 2015 Till Maas - 2.3.0-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Fri Feb 06 2015 Jon Ciesla - 2.3.0-1 +- Update to 2.3.0. + +* Tue Jan 27 2015 Ville Skyttä - 2.2.2-2 +- Install bash completion to %%{_datadir}/bash-completion/completions + +* Fri Jan 23 2015 Jon Ciesla - 2.2.2-1 +- Update to 2.2.2. + +* Thu Jan 08 2015 Jon Ciesla - 2.2.1-1 +- Update to 2.2.1. + +* Thu Dec 11 2014 Petr Stodulka - 2.2.0-3 +- removed subpackage git-hg which is replaced by git-remote-hg from + separated package + +* Fri Nov 28 2014 Petr Stodulka - 2.2.0-2 +- removed subpackage git-bzr which is replaced by git-remote-bzr from + separated package + +* Fri Nov 28 2014 Petr Stodulka - 2.2.0-1 +- 2.2.0 + +* Fri Oct 24 2014 Pierre-Yves Chibon - 2.1.0-5 +- Rename the git.service into git@.service fixing + https://bugzilla.redhat.com/980574 + +* Mon Sep 08 2014 Jitka Plesnikova - 2.1.0-4 +- Perl 5.20 re-rebuild of bootstrapped packages + +* Thu Aug 28 2014 Jitka Plesnikova - 2.1.0-3 +- Perl 5.20 rebuild + +* Tue Aug 26 2014 Jitka Plesnikova - 2.1.0-2 +- Disable requires perl(Term::ReadKey) when perl bootstraping + +* Mon Aug 18 2014 Ondrej Oprala - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 31 2014 Ondrej Oprala - 2.0.0-4 +- Change source URLs, as googlecode doesn't have up-to-date tarballs + +* Tue Jun 10 2014 Ondrej Oprala - 2.0.0-3 +- Conditionalize an ancient obsolete + +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Ondrej Oprala - 2.0.0-1 +- Update to 2.0.0 + +* Mon May 19 2014 Jon Ciesla - 1.9.3-1 +- Update to 1.9.3 + +* Mon Feb 17 2014 Ondrej Oprala - 1.9.0-1 +- Update to 1.9.0 + +* Thu Jan 16 2014 Todd Zullinger - 1.8.5.3-2 +- Drop unused python DESTIR patch +- Consolidate settings for Fedora 19+ and EL 7+ +- Use new rpm filtering on Fedora 19+ and EL 7+ +- Rebuild with file-5.14-14 (#1026760) + +* Thu Jan 16 2014 Ondrej Oprala - 1.8.5.3-1 +* Update to 1.8.5.3 + +* Wed Dec 18 2013 Ondrej Oprala - 1.8.5.2-1 +* Update to 1.8.5.2 + +* Wed Nov 13 2013 Ville Skyttä - 1.8.4.2-2 +- Fix htmldir when doc dir is unversioned (#993779). + +* Tue Oct 29 2013 Todd Zullinger - 1.8.4.2-1 +- Update to 1.8.4.2 (#1024497) + +* Sat Oct 05 2013 Todd Zullinger +- Add mercurial version requirement to git-hg, for those rebuilding on EL + +* Sat Aug 03 2013 Fedora Release Engineering - 1.8.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 15 2013 Petr Pisar - 1.8.3.1-2 +- Perl 5.18 rebuild + +* Fri Jun 14 2013 Todd Zullinger - 1.8.3.1-1 +- Update to 1.8.3.1 +- Add bzr and hg subpackages, thanks to Michael Scherer (#974800) + +* Mon May 13 2013 Jon Ciesla - 1.8.2.1-4 +- Fix typo introduced in 1.8.2-3, fixed desktop tag. + +* Wed May 1 2013 Tom Callaway - 1.8.2.1-3 +- conditionalize systemd vs xinetd +- cleanup systemd handling (it was not quite right in -2) + +* Tue Apr 30 2013 Tom Callaway - 1.8.2.1-2 +- switch to systemd instead of xinetd (bz 737183) + +* Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 +- Update to 1.8.2.1 +- Exclude optional perl(YAML::Any) dependency on EL-5 + +* Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 +- Drop desktop vendor tag for >= f19. + +* Wed Mar 27 2013 Todd Zullinger - 1.8.2-2 +- Require perl(Term::ReadKey) for git add --interactive (#928328) +- Drop DESTDIR from python instlibdir +- Fix bogus changelog dates + +* Tue Mar 19 2013 Adam Tkac - 1.8.2-1 +- update to 1.8.2 +- 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch has been merged + +* Tue Feb 26 2013 Todd Zullinger - 1.8.1.4-2 +- Update asciidoc requirements, drop unsupported ASCIIDOC7 +- Define GNU_ROFF to force ASCII apostrophes in manpages (so copy/paste works) +- Install tcsh completion (requires manual setup by users) +- Clean up dist conditionals, don't pretend to support EL-4 builds +- Use prebuilt documentation on EL-5, where asciidoc is too old +- Respect gitexecdir variable in git-subtree install + +* Wed Feb 20 2013 Adam Tkac - 1.8.1.4-1 +- update to 1.8.1.4 + +* Wed Jan 30 2013 Adam Tkac - 1.8.1.2-1 +- update to 1.8.1.2 +- own directories which should be owned (#902517) + +* Thu Jan 03 2013 Adam Tkac - 1.8.1-1 +- update to 1.8.1 +- build git-svn as arch subpkg due to new git-remote-testsvn binary + +* Tue Dec 11 2012 Adam Tkac - 1.8.0.2-1 +- update to 1.8.0.2 + +* Thu Dec 06 2012 Adam Tkac - 1.8.0.1-2 +- don't install some unneeded credential-gnome-keyring stuff + +* Thu Nov 29 2012 Adam Tkac - 1.8.0.1-1 +- update to 1.8.0.1 +- include git-subtree in git rpm (#864651) + +* Mon Oct 29 2012 Adam Tkac - 1.8.0-1 +- update to 1.8.0 +- include git-credential-gnome-keyring helper in git pkg +- 0001-cvsimport-strip-all-inappropriate-tag-strings.patch was merged + +* Thu Oct 25 2012 Adam Tkac - 1.7.12.1-2 +- move git-prompt.sh into usr/share/git-core/contrib/completion (#854061) + +* Thu Sep 27 2012 Adam Tkac - 1.7.12.1-1 +- update to 1.7.12.1 +- cvsimport should skip more characters (#850640) + +* Thu Aug 23 2012 Todd Zullinger - 1.7.12-2 +- Install git-prompt.sh which provides __git_ps1() + +* Wed Aug 22 2012 Adam Tkac - 1.7.12-1 +- update to 1.7.12 + +* Wed Aug 15 2012 Todd Zullinger - 1.7.11.5-1 +- Update to 1.7.11.5 +- Add git-p4 subpackage (#844008) + +* Tue Aug 07 2012 Adam Tkac - 1.7.11.4-1 +- update to 1.7.11.4 + +* Fri Jul 27 2012 Fedora Release Engineering - 1.7.11.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 25 2012 Todd Zullinger - 1.7.11.2-2 +- Split perl(Git::SVN) into its own package (#843182) + +* Mon Jul 16 2012 Adam Tkac - 1.7.11.2-1 +- update to 1.7.11.2 + +* Thu Jun 28 2012 Petr Pisar - 1.7.10.4-2 +- Perl 5.16 rebuild + +* Fri Jun 15 2012 Adam Tkac - 1.7.10.4-1 +- update to 1.7.10.4 + +* Thu Jun 07 2012 Petr Pisar - 1.7.10.2-2 +- Perl 5.16 rebuild + +* Mon May 14 2012 Adam Tkac - 1.7.10.2-1 +- update to 1.7.10.2 + +* Thu May 03 2012 Adam Tkac - 1.7.10.1-1 +- update to 1.7.10.1 + +* Tue Apr 10 2012 Adam Tkac - 1.7.10-1 +- update to 1.7.10 + +* Fri Mar 30 2012 Adam Tkac - 1.7.9.5-1 +- update to 1.7.9.5 + +* Thu Mar 08 2012 Adam Tkac - 1.7.9.3-1 +- update to 1.7.9.3 + +* Wed Feb 15 2012 Todd Zullinger - 1.7.9.1-1 +- Update to 1.7.9.1 +- Fix EPEL builds (rpm doesn't accept multiple -f options in %%files) + +* Fri Feb 10 2012 Petr Pisar - 1.7.9-2 +- Rebuild against PCRE 8.30 + +* Mon Jan 30 2012 Adam Tkac - 1.7.9-1 +- update to 1.7.9 + +* Thu Jan 19 2012 Adam Tkac - 1.7.8.4-1 +- update to 1.7.8.4 + +* Thu Jan 12 2012 Adam Tkac - 1.7.8.3-1 +- update to 1.7.8.3 + +* Mon Jan 02 2012 Adam Tkac - 1.7.8.2-1 +- update to 1.7.8.2 + +* Fri Dec 23 2011 Adam Tkac - 1.7.8.1-1 +- update to 1.7.8.1 + +* Wed Dec 07 2011 Adam Tkac - 1.7.8-1 +- update to 1.7.8 + +* Tue Nov 29 2011 Adam Tkac - 1.7.7.4-1 +- update to 1.7.7.4 + +* Thu Nov 10 2011 Adam Tkac - 1.7.7.3-1 +- update to 1.7.7.3 + +* Mon Nov 07 2011 Adam Tkac - 1.7.7.2-1 +- update to 1.7.7.2 + +* Tue Nov 01 2011 Adam Tkac - 1.7.7.1-1 +- update to 1.7.7.1 + +* Wed Oct 26 2011 Fedora Release Engineering - 1.7.7-2 +- Rebuilt for glibc bug#747377 + +* Thu Oct 20 2011 Adam Tkac - 1.7.7-1 +- update to 1.7.7 + - git-1.6-update-contrib-hooks-path.patch is no longer needed + +* Mon Sep 26 2011 Adam Tkac - 1.7.6.4-1 +- update to 1.7.6.4 + +* Wed Sep 07 2011 Todd Zullinger - 1.7.6.2-1 +- Update to 1.7.6.2 +- Fixes incompatibility caused by git push --quiet fix + http://thread.gmane.org/gmane.comp.version-control.git/180652 + +* Mon Aug 29 2011 Todd Zullinger - 1.7.6.1-2 +- Build with PCRE support (#734269) + +* Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 +- Update to 1.7.6.1 +- Include gpg signature for tarball in SRPM + +* Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 +- Fix git push --quiet, thanks to Clemens Buchacher (#725593) +- Obsolete git-arch as needed + +* Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 +- Drop git-arch on fedora >= 16, the tla package has been retired +- Rework most spec file dist conditionals to make future changes easier + +* Thu Jul 21 2011 Petr Sabata - 1.7.6-3 +- Perl mass rebuild + +* Wed Jul 20 2011 Petr Sabata - 1.7.6-2 +- Perl mass rebuild + +* Wed Jun 29 2011 Adam Tkac - 1.7.6-1 +- update to 1.7.6 + +* Mon Jun 20 2011 Marcela Mašláňová - 1.7.5.4-2 +- Perl mass rebuild + +* Thu Jun 09 2011 Adam Tkac - 1.7.5.4-1 +- update to 1.7.5.4 + +* Tue May 24 2011 Adam Tkac - 1.7.5.2-1 +- update to 1.7.5.2 + +* Thu May 05 2011 Adam Tkac - 1.7.5.1-1 +- update to 1.7.5.1 + +* Wed Apr 27 2011 Adam Tkac - 1.7.5-1 +- update to 1.7.5 + +* Mon Apr 11 2011 Adam Tkac - 1.7.4.4-1 +- update to 1.7.4.4 + +* Mon Mar 28 2011 Adam Tkac - 1.7.4.2-1 +- update to 1.7.4.2 +- move man3/Git.3pm file to perl-Git subpkg (#664889) +- add perl-DBD-SQLite dependency to git-cvs (#602410) + +* Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 +- Update to 1.7.4.1 +- Clean up documentation settings (the defaults changed in 1.7.4) +- Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing + +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 31 2011 Adam Tkac - 1.7.4-1 +- update to 1.7.4 + +* Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 +- update to 1.7.3.5 + +* Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 +- update to 1.7.3.4 + +* Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 +- update to 1.7.3.3 + +* Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 +- update to 1.7.3.2 + +* Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 +- update to 1.7.3.1 + +* Wed Sep 29 2010 jkeating - 1.7.3-3 +- Rebuilt for gcc bug 634757 + +* Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 +- Ensure the release notes are included in %%doc + +* Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 +- Update to 1.7.3 + +* Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 +- update to 1.7.2.3 + +* Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 +- update to 1.7.2.2 + +* Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 +- cherry-pick: "Do not unquote + into ' ' in URLs" + +* Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 +- Update to git-1.7.2.1 + +* Thu Jul 22 2010 Adam Tkac - 1.7.2-1 +- update to 1.7.2 + +* Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 +- update to 1.7.1.1 + +* Fri Jun 25 2010 Adam Tkac - 1.7.1-2 +- rebuild against new perl + +* Tue May 04 2010 Todd Zullinger - 1.7.1-1 +- git-1.7.1 +- Fix conditionals for EL-6 +- Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood + - Place elisp source files in separate emacs-git-el package + - Place git support files in own directory under site-lisp + - Use Emacs packaging macros + +* Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 +- Mass rebuild with perl-5.12.0 + +* Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 +- git-1.7.0.1 + +* Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 +- git-1.7.0 +- Link imap-send with libcrypto (#565147) +- Disable building of unused python remote helper libs + +* Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 +- git-1.6.6.1 +- Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) +- Make %%{_var}/lib/git the default gitweb projectroot (#556299) +- Include gitweb/INSTALL file as documentation, the gitweb README refers to it +- Ship a short example gitweb config file (%%{_sysconfdir}/gitweb.conf) +- Remove long fixed xinetd IPv6 workaround on Fedora (#557528) +- Install missing gitweb.js (#558740) + +* Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 +- git-1.6.6 + +* Fri Dec 11 2009 Todd Zullinger - 1.6.5.6-1 +- git-1.6.5.6 + +* Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 +- git-1.6.5.5 + +* Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 +- rebuild against perl 5.10.1 + +* Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 +- git-1.6.5.3 +- Only BR perl(Error) on Fedora and RHEL >= 5 +- Use config.mak to set build options +- Improve compatibility with EPEL +- Replace $RPM_BUILD_ROOT with %%{buildroot} +- Fix Obsoletes for those rebuilding on EL-4 + +* Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 +- git-1.6.5.2 +- Drop asciidoc --unsafe option, it should not be needed anymore +- Don't use install -t/-T, they're not compatible with older coreutils +- Don't use -perm /a+x with find, it's incompatible with older findutils + +* Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 +- git-1.6.5.1 + +* Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 +- git-1.6.5 + +* Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 +- git-1.6.5.rc2 +- Enable Linus' block-sha1 implementation + +* Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 +- git-1.6.4.4 + +* Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 +- git-1.6.4.3 + +* Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 +- git-1.6.4.2 + +* Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 +- git-1.6.4.1 + +* Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 +- rebuilt with new openssl + +* Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 +- git-1.6.4 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 +- git-1.6.3.3 +- Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) +- Fix rpmlint warnings about Summary and git-mergetool--lib missing shebang + +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 +- Temporarily disable asciidoc's safe mode until bug 506953 is fixed + +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 +- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) + +* Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 +- git-1.6.3.2 +- Require emacs >= 22.2 for emacs support (bug 495312) +- Add a .desktop file for git-gui (bug 498801) +- Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, + the sed hack to fix bug 485161 should no longer be needed +- Escape newline in git-daemon xinetd description (bug 502393) +- Add xinetd to git-daemon Requires (bug 504105) +- Organize BuildRequires/Requires, drop redundant expat Requires +- Only build noarch subpackages on Fedora >= 10 +- Only build emacs and arch subpackages on Fedora +- Handle curl/libcurl naming for EPEL and Fedora + +* Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 +- git-1.6.2.2 +- Include contrib/ dir in %%doc (bug 492490) +- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) +- Ignore Branches output from cvsps-2.2b1 (bug 490602) +- Remove shebang from bash-completion script +- Include README in gitweb subpackage + +* Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 +- git-1.6.2 +- Include contrib/emacs/README in emacs subpackage +- Drop upstreamed git-web--browse patch + +* Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 +- Require perl(Authen::SASL) in git-email (bug 483062) +- Build many of the subpackages as noarch +- Update URL field + +* Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 +- git-1.6.1.3 +- Set htmldir so "git help -w " works +- Patch git-web--browse to not use "/sbin/start" to browse +- Include git-daemon documentation in the git-daemon package + +* Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 +- git-1.6.1.2 + +* Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 +- git-1.6.1.1 +- Make compile more verbose + +* Fri Jan 16 2009 Tomas Mraz 1.6.1-2 +- rebuild with new openssl + +* Sat Jan 03 2009 Todd Zullinger 1.6.1-1 +- Install git-* commands in %%{_libexecdir}/git-core, the upstream default +- Remove libcurl from Requires, rpm will pick this up automatically +- Consolidate build/install options in %%make_git (Roland McGrath) +- Include DirectoryIndex in gitweb httpd-config (bug 471692) +- Define DOCBOOK_XSL_172 to fix minor manpage issues +- Rename %%{_var}/lib/git-daemon to %%{_var}/lib/git +- Preserve timestamps on installed files +- Quiet some rpmlint complaints +- Use macros more consistently + +* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 +- git-1.6.0.6 +- Fixes a local privilege escalation bug in gitweb + (http://article.gmane.org/gmane.comp.version-control.git/103624) +- Add gitk Requires to git-gui (bug 476308) + +* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 +- git-1.6.0.5 + +* Mon Nov 17 2008 Seth Vidal +- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance + +* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 +- git-1.6.0.4 + +* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 +- git-1.6.0.3 +- Drop curl requirement in favor of libcurl (bug 449388) +- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) + +* Thu Aug 28 2008 James Bowes 1.6.0.1-1 +- git-1.6.0.1 + +* Thu Jul 24 2008 James Bowes 1.5.6-4 +- git-1.5.6.4 + +* Thu Jun 19 2008 James Bowes 1.5.6-1 +- git-1.5.6 + +* Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 +- use tar.bz2 instead of tar.gz + +* Wed May 28 2008 James Bowes 1.5.5.3-1 +- git-1.5.5.3 + +* Mon May 26 2008 James Bowes 1.5.5.2-1 +- git-1.5.5.2 + +* Mon Apr 21 2008 James Bowes 1.5.5.1-1 +- git-1.5.5.1 + +* Wed Apr 09 2008 James Bowes 1.5.5-1 +- git-1.5.5 + +* Fri Apr 04 2008 James Bowes 1.5.4.5-3 +- Remove the last two requires on git-core. + +* Wed Apr 02 2008 James Bowes 1.5.4.5-2 +- Remove a patch that's already upstream. + +* Fri Mar 28 2008 James Bowes 1.5.4.5-1 +- git-1.5.4.5 + +* Wed Mar 26 2008 James Bowes 1.5.4.4-4 +- Own /etc/bash_completion.d in case bash-completion isn't installed. + +* Tue Mar 25 2008 James Bowes 1.5.4.4-3 +- Include the sample hooks from contrib/hooks as docs (bug 321151). +- Install the bash completion script from contrib (bug 433255). +- Include the html docs in the 'core' package again (bug 434271). + +* Wed Mar 19 2008 James Bowes 1.5.4.4-2 +- Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 + +* Thu Mar 13 2008 James Bowes 1.5.4.4-1 +- git-1.5.4.4 + +* Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 +- rebuild for new perl (again) + +* Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 +- Do not silently overwrite /etc/httpd/conf.d/git.conf + +* Sat Feb 23 2008 James Bowes 1.5.4.3-1 +- git-1.5.4.3 +- Include Kristian Høgsberg's changes to rename git-core to + git and git to git-all. + +* Sun Feb 17 2008 James Bowes 1.5.4.2-1 +- git-1.5.4.2 + +* Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 +- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have + gitweb rss feeds point be commitdiffs instead of commit + +* Sun Feb 10 2008 James Bowes 1.5.4.1-1 +- git-1.5.4.1 + +* Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 +- rebuild for new perl + +* Sun Feb 03 2008 James Bowes 1.5.4-1 +- Add BuidRequires on gettext. + +* Sat Feb 02 2008 James Bowes 1.5.4-1 +- git-1.5.4 + +* Tue Jan 08 2008 James Bowes 1.5.3.8-1 +- git-1.5.3.8 + +* Fri Dec 21 2007 James Bowes 1.5.3.7-2 +- Have git metapackage require explicit versions (bug 247214) + +* Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 +- git-1.5.3.7 + +* Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 +- git-1.5.3.6 +- git-core requires perl(Error) (bug 367861) +- git-svn requires perl(Term:ReadKey) (bug 261361) +- git-email requires perl-Git (bug 333061) + +* Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 +- git-Perl requires Error package + +* Tue Oct 09 2007 James Bowes 1.5.3.4-1 +- git-1.5.3.4 + +* Sun Sep 30 2007 James Bowes 1.5.3.3-1 +- git-1.5.3.3 + +* Wed Sep 26 2007 James Bowes 1.5.3.2-1 +- git-1.5.3.2 + +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 +- Include git-gui and git-citool docs + +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 +- git-1.5.3.1-1 + +* Thu Aug 23 2007 James Bowes 1.5.2.5-1 +- git-1.5.2.5-1 + +* Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 +- git-1.5.2.4-1 + +* Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 +- Add git-daemon and gitweb packages + +* Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 +- Add emacs-git package (#235431) + +* Mon Jun 18 2007 James Bowes 1.5.2.2-1 +- git-1.5.2.2 + +* Fri Jun 08 2007 James Bowes 1.5.2.1-1 +- git-1.5.2.1 + +* Sun May 13 2007 Quy Tonthat +- Added lib files for git-gui +- Added Documentation/technical (As needed by Git Users Manual) + +* Tue May 8 2007 Quy Tonthat +- Added howto files + +* Fri Mar 30 2007 Chris Wright 1.5.0.6-1 +- git-1.5.0.6 + +* Mon Mar 19 2007 Chris Wright 1.5.0.5-1 +- git-1.5.0.5 + +* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 +- git-1.5.0.3 + +* Fri Mar 2 2007 Chris Wright 1.5.0.2-2 +- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) + +* Mon Feb 26 2007 Chris Wright 1.5.0.2-1 +- git-1.5.0.2 + +* Tue Feb 13 2007 Nicolas Pitre +- Update core package description (Git isn't as stupid as it used to be) + +* Mon Feb 12 2007 Junio C Hamano +- Add git-gui and git-citool. + +* Sun Dec 10 2006 Chris Wright 1.4.4.2-2 +- no need to install manpages executable (bz 216790) +- use bytes for git-cvsserver + +* Sun Dec 10 2006 Chris Wright 1.4.4.2-1 +- git-1.4.4.2 + +* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 +- rebuild against the new curl + +* Tue Oct 17 2006 Chris Wright 1.4.2.4-1 +- git-1.4.2.4 + +* Wed Oct 4 2006 Chris Wright 1.4.2.3-1 +- git-1.4.2.3 + +* Fri Sep 22 2006 Chris Wright 1.4.2.1-1 +- git-1.4.2.1 + +* Mon Sep 11 2006 Chris Wright 1.4.2-1 +- git-1.4.2 + +* Thu Jul 6 2006 Chris Wright 1.4.1-1 +- git-1.4.1 + +* Tue Jun 13 2006 Chris Wright 1.4.0-1 +- git-1.4.0 + +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + +* Fri Apr 28 2006 Chris Wright 1.3.1-1 +- git-1.3.1 + +* Wed Apr 19 2006 Chris Wright 1.3.0-1 +- git-1.3.0 + +* Mon Apr 10 2006 Chris Wright 1.2.6-1 +- git-1.2.6 + +* Wed Apr 5 2006 Chris Wright 1.2.5-1 +- git-1.2.5 + +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + +* Wed Feb 22 2006 Chris Wright 1.2.3-1 +- git-1.2.3 + +* Tue Feb 21 2006 Chris Wright 1.2.2-1 +- git-1.2.2 + +* Thu Feb 16 2006 Chris Wright 1.2.1-1 +- git-1.2.1 + +* Mon Feb 13 2006 Chris Wright 1.2.0-1 +- git-1.2.0 + +* Wed Feb 1 2006 Chris Wright 1.1.6-1 +- git-1.1.6 + +* Tue Jan 24 2006 Chris Wright 1.1.4-1 +- git-1.1.4 + +* Sun Jan 15 2006 Chris Wright 1.1.2-1 +- git-1.1.2 + +* Tue Jan 10 2006 Chris Wright 1.1.1-1 +- git-1.1.1 + +* Tue Jan 10 2006 Chris Wright 1.1.0-1 +- Update to latest git-1.1.0 (drop git-email for now) +- Now creates multiple packages: +- git-core, git-svn, git-cvs, git-arch, gitk + +* Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 +- Change subpackage names to git- instead of git-core- +- Create empty root package which brings in all subpackages +- Rename git-tk -> gitk + +* Thu Nov 10 2005 Chris Wright 0.99.9g-1 +- zlib dependency fix +- Minor cleanups from split +- Move arch import to separate package as well + +* Tue Sep 27 2005 Jim Radford +- Move programs with non-standard dependencies (svn, cvs, email) + into separate packages + +* Tue Sep 27 2005 H. Peter Anvin +- parallelize build +- COPTS -> CFLAGS + +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + +* Fri Sep 16 2005 Horst H. von Brand +- Linus noticed that less is required, added to the dependencies + +* Sun Sep 11 2005 Horst H. von Brand +- Updated dependencies +- Don't assume manpages are gzipped + +* Thu Aug 18 2005 Chris Wright 0.99.4-4 +- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires +- use RPM_OPT_FLAGS in spec file, drop patch0 + +* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 +- use dist tag to differentiate between branches +- use rpm optflags by default (patch0) +- own %%{_datadir}/git-core/ + +* Mon Aug 15 2005 Chris Wright +- update spec file to fix Buildroot, Requires, and drop Vendor + +* Sun Aug 07 2005 Horst H. von Brand +- Redid the description +- Cut overlong make line, loosened changelog a bit +- I think Junio (or perhaps OSDL?) should be vendor... + +* Thu Jul 14 2005 Eric Biederman +- Add the man pages, and the --without docs build option + +* Thu Jul 7 2005 Chris Wright +- initial git spec file