diff -pruN 1:2.51.0-1/debian/changelog 1:2.51.0-1ubuntu1/debian/changelog --- 1:2.51.0-1/debian/changelog 2025-08-26 14:36:40.000000000 +0000 +++ 1:2.51.0-1ubuntu1/debian/changelog 2025-08-28 07:15:03.000000000 +0000 @@ -1,3 +1,12 @@ +git (1:2.51.0-1ubuntu1) questing; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Thu, 28 Aug 2025 09:15:03 +0200 + git (1:2.51.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.51.0.adoc). @@ -8,6 +17,22 @@ git (1:2.51.0-1) unstable; urgency=low -- Jonathan Nieder Tue, 26 Aug 2025 16:36:40 +0200 +git (1:2.50.1-0.1ubuntu2) questing; urgency=medium + + * Enable again full tests + + -- Gianfranco Costamagna Wed, 20 Aug 2025 23:24:28 +0200 + +git (1:2.50.1-0.1ubuntu1) questing; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + - ignore some tests + + -- Gianfranco Costamagna Fri, 01 Aug 2025 13:53:32 +0200 + git (1:2.50.1-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -25,6 +50,71 @@ git (1:2.50.1-0.1) unstable; urgency=med -- Adrian Bunk Tue, 29 Jul 2025 20:54:28 +0300 +git (1:2.50.0-1ubuntu6) questing; urgency=medium + + * Ignore again some tests + + -- Gianfranco Costamagna Tue, 22 Jul 2025 11:00:49 +0200 + +git (1:2.50.0-1ubuntu4) questing; urgency=medium + + * Revert Disable some tests for now (See lp: 2115804), related + to coreutils + + -- Gianfranco Costamagna Mon, 14 Jul 2025 12:01:03 +0200 + +git (1:2.50.0-1ubuntu3) questing; urgency=medium + + * SECURITY UPDATE: Code execution and file manipulation when cloning + malicious repositories. + - debian/patches/CVE-2025-27613.patch: Add argument sanitizing and replace + command instances with safe versions in gitk-git/gitk. + - debian/patches/CVE-2025-27614.patch: Remove escape_filter_paths and wrap + concat instances with list in gitk-git/gitk. + - CVE-2025-27613 + - CVE-2025-27614 + * SECURITY UPDATE: File overwrite when editing a file in a malicious + directory in an untrusted repository. + - debian/patches/CVE-2025-46835-pre1.patch: Remove windows specific code + in git-gui/git-gui.sh. + - debian/patches/CVE-2025-46835.patch: Add argument sanitizing, replace + command instances with safe versions, and wrap instances with list in + git-gui/git-gui.sh and other files in git-gui directory. + - CVE-2025-46835 + * SECURITY UPDATE: Unintentional script execution due to improperly stripped + carriage return. + - debian/patches/CVE-2025-48384.patch: Add carriage return checks in + config.c. + - CVE-2025-48384 + * SECURITY UPDATE: Protocol injection potentially leading to arbitrary code + execution. + - debian/patches/CVE-2025-48385.patch: Add URI and filename checks in + bundle-uri.c. + - CVE-2025-48385 + * SECURITY UPDATE: Buffer overflow. + - debian/patches/CVE-2025-48386.patch: Add target_append function and + change wcsncat calls to target_append in + contrib/credential/wincred/git-credential-wincred.c. + - CVE-2025-48386 + + -- Hlib Korzhynskyy Tue, 08 Jul 2025 15:34:40 -0230 + +git (1:2.50.0-1ubuntu2) questing; urgency=medium + + * Disable some tests for now (See lp: 2115804), related + to coreutils + + -- Gianfranco Costamagna Thu, 03 Jul 2025 12:08:50 +0200 + +git (1:2.50.0-1ubuntu1) questing; urgency=low + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Wed, 02 Jul 2025 09:29:48 +0200 + git (1:2.50.0-1) unstable; urgency=medium * new upstream release (see RelNotes/2.50.0.adoc). @@ -61,6 +151,16 @@ git (1:2.49.0-1) unstable; urgency=low -- Jonathan Nieder Sat, 15 Mar 2025 18:48:53 +0100 +git (1:2.48.1-0ubuntu1) plucky; urgency=medium + + * New upstream release. + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Simon Quigley Mon, 10 Feb 2025 22:31:34 -0600 + git (1:2.47.2-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -69,6 +169,15 @@ git (1:2.47.2-0.1) unstable; urgency=med -- Salvatore Bonaccorso Sun, 19 Jan 2025 09:06:17 +0100 +git (1:2.47.1-1ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Simon Quigley Thu, 02 Jan 2025 16:13:14 -0600 + git (1:2.47.1-1) unstable; urgency=low * new upstream release (see RelNotes/2.46.0.txt, RelNotes/2.47.0.txt). @@ -88,6 +197,15 @@ git (1:2.45.2-1.3) unstable; urgency=med -- Chris Hofstaedtler Sun, 22 Dec 2024 16:52:50 +0100 +git (1:2.45.2-1.2ubuntu1) plucky; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Sat, 09 Nov 2024 20:13:05 +0100 + git (1:2.45.2-1.2) unstable; urgency=medium * Non-maintainer upload. @@ -97,6 +215,15 @@ git (1:2.45.2-1.2) unstable; urgency=med -- Chris Hofstaedtler Fri, 08 Nov 2024 17:57:18 +0100 +git (1:2.45.2-1.1ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Wed, 30 Oct 2024 09:42:35 +0100 + git (1:2.45.2-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -107,6 +234,15 @@ git (1:2.45.2-1.1) unstable; urgency=med -- Chris Hofstaedtler Sun, 13 Oct 2024 14:16:01 +0200 +git (1:2.45.2-1ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Tue, 18 Jun 2024 20:12:14 +0200 + git (1:2.45.2-1) unstable; urgency=low * new upstream point release (see RelNotes/2.45.2.txt). @@ -114,6 +250,15 @@ git (1:2.45.2-1) unstable; urgency=low -- Jonathan Nieder Sun, 16 Jun 2024 15:40:09 +0000 +git (1:2.45.1-1ubuntu1) oracular; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Wed, 29 May 2024 08:10:33 +0200 + git (1:2.45.1-1) unstable; urgency=medium * new upstream release (see RelNotes/2.44.0.txt, RelNotes/2.45.0.txt). @@ -126,18 +271,89 @@ git (1:2.45.1-1) unstable; urgency=mediu -- Jonathan Nieder Mon, 20 May 2024 03:36:58 +0000 +git (1:2.43.0-1ubuntu7) noble; urgency=high + + * No change rebuild against libcurl3t64-gnutls. + + -- Julian Andres Klode Mon, 08 Apr 2024 16:39:51 +0200 + +git (1:2.43.0-1ubuntu6) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 00:07:01 +0000 + +git (1:2.43.0-1ubuntu5) noble; urgency=medium + + * Run tests again. + + -- Matthias Klose Sat, 16 Mar 2024 13:18:21 +0100 + +git (1:2.43.0-1ubuntu3) noble; urgency=medium + + * Don't run tests for a first build against libcurl3t64-gnutls. + + -- Matthias Klose Sat, 16 Mar 2024 13:17:23 +0100 + +git (1:2.43.0-1ubuntu2) noble; urgency=medium + + * No-change rebuild against libcurl3t64-gnutls + + -- Steve Langasek Sat, 16 Mar 2024 06:55:53 +0000 + +git (1:2.43.0-1ubuntu1) noble; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Simon Quigley Tue, 28 Nov 2023 10:42:23 -0600 + git (1:2.43.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.43.0.txt). -- Jonathan Nieder Sun, 26 Nov 2023 17:32:42 -0800 +git (1:2.42.0-1ubuntu1) noble; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Sun, 19 Nov 2023 21:12:39 -0800 + git (1:2.42.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.41.0.txt, RelNotes/2.42.0.txt). -- Jonathan Nieder Wed, 27 Sep 2023 09:55:42 -0700 +git (1:2.40.1-1ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + * Dropped changes, included upstream: + - debian/patches/CVE-2023_25652_25815_29007/0022-*.patch: apply + --reject overwriting existing .rej symlink if it exists in apply.c, + t/t4115-apply-symlink.sh. + - debian/patches/CVE-2023_25652_25815_29007/0024-*patch: + avoid using gettext if the locale dir is not present in + gettext.c. + - debian/patches/CVE-2023_25652_25815_29007/0025-*.patch: avoid + fixed-sized buffer when renaming/deleting a section in config.c, + t/t1300-config.sh. + - debian/patches/CVE-2023_25652_25815_29007/0026-*.patch: avoid + integer truncation in copy_or_rename_section_in_file() in config.c. + - debian/patches/CVE-2023_25652_25815_29007/0027-*.patch: disallow + overly-long lines in copy_or_rename_section_in_file in config.c. + + -- Steve Langasek Thu, 18 May 2023 10:40:53 -0700 + git (1:2.40.1-1) unstable; urgency=medium * new upstream point release (see RelNotes/2.40.1.txt; addresses @@ -161,6 +377,39 @@ git (1:2.39.2-1.1) unstable; urgency=med -- Matthew Vernon Tue, 28 Feb 2023 09:25:32 +0000 +git (1:2.39.2-1ubuntu1.1) lunar-security; urgency=medium + + * SECURITY UPDATE: Overwriting path + - debian/patches/CVE-2023_25652_25815_29007/0022-*.patch: apply + --reject overwriting existing .rej symlink if it exists in apply.c, + t/t4115-apply-symlink.sh. + - CVE-2023-25652 + * SECURITY UPDATE: Malicious placement of crafted messages + - debian/patches/CVE-2023_25652_25815_29007/0024-*patch: + avoid using gettext if the locale dir is not present in + gettext.c. + - CVE-2023-25815 + * SECURITY UPDATE: Arbitrary configuration injection + - debian/patches/CVE-2023_25652_25815_29007/0025-*.patch: avoid + fixed-sized buffer when renaming/deleting a section in config.c, + t/t1300-config.sh. + - debian/patches/CVE-2023_25652_25815_29007/0026-*.patch: avoid + integer truncation in copy_or_rename_section_in_file() in config.c. + - debian/patches/CVE-2023_25652_25815_29007/0027-*.patch: disallow + overly-long lines in copy_or_rename_section_in_file in config.c. + - CVE-2023-29007 + + -- Leonidas Da Silva Barbosa Mon, 24 Apr 2023 13:01:23 -0300 + +git (1:2.39.2-1ubuntu1) lunar; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Marc Deslauriers Fri, 17 Feb 2023 10:52:54 -0500 + git (1:2.39.2-1) unstable; urgency=medium * new upstream point release (see RelNotes/2.39.2.txt). Addresses @@ -168,6 +417,15 @@ git (1:2.39.2-1) unstable; urgency=mediu -- Jonathan Nieder Wed, 15 Feb 2023 17:08:12 -0800 +git (1:2.39.1-0.1ubuntu1) lunar; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Simon Quigley Sat, 11 Feb 2023 14:55:51 -0600 + git (1:2.39.1-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -182,6 +440,22 @@ git (1:2.39.0-1) unstable; urgency=low -- Jonathan Nieder Mon, 12 Dec 2022 12:53:44 -0800 +git (1:2.38.1-1ubuntu2) lunar; urgency=medium + + * d/p/fix-cpuinfo-regexp.patch: fix cpuinfo regexp to accomodate the + way s390x shows it (LP: #1997475) + + -- Andreas Hasenack Tue, 22 Nov 2022 14:25:40 -0300 + +git (1:2.38.1-1ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Mon, 07 Nov 2022 15:50:56 -0800 + git (1:2.38.1-1) unstable; urgency=medium * new upstream release (closes: #1022046; see RelNotes/2.38.0.txt, @@ -203,6 +477,30 @@ git (1:2.38.1-1) unstable; urgency=mediu -- Jonathan Nieder Mon, 31 Oct 2022 18:32:00 -0700 +git (1:2.37.2-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + * Dropped changes, included upstream: + - debian/patches/CVE-2022-29187-1.patch: adds test to + regression git needs safe.directory when using sudo in + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-2.patch: avoid failing dir ownership + checks if running privileged in git-compat-util.h, + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-3.patch: add negative tests + and allow git init to mostly work under sudo in + t/lib-sudo.sh b/t/lib-sudo.sh. + - debian/patches/CVE-2022-29187-4.patch: allow root + to access both SUDO_UID and root owned in git-compat-util.h, + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-6.patch: tighten ownership checks + post CVE-2022-24765 in setup.c. + + -- Steve Langasek Tue, 16 Aug 2022 11:34:06 -0700 + git (1:2.37.2-1) unstable; urgency=low * new upstream release (closes: #1016723; see RelNotes/2.37.0.txt, @@ -210,6 +508,36 @@ git (1:2.37.2-1) unstable; urgency=low -- Jonathan Nieder Fri, 12 Aug 2022 19:27:24 -0700 +git (1:2.36.1-1ubuntu2) kinetic; urgency=medium + + * SECURITY UPDATE: Potential arbitrary code execution + - debian/patches/CVE-2022-29187-1.patch: adds test to + regression git needs safe.directory when using sudo in + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-2.patch: avoid failing dir ownership + checks if running privileged in git-compat-util.h, + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-3.patch: add negative tests + and allow git init to mostly work under sudo in + t/lib-sudo.sh b/t/lib-sudo.sh. + - debian/patches/CVE-2022-29187-4.patch: allow root + to access both SUDO_UID and root owned in git-compat-util.h, + t/t0034-root-safe-directory.sh. + - debian/patches/CVE-2022-29187-6.patch: tighten ownership checks + post CVE-2022-24765 in setup.c. + - CVE-2022-29187 + + -- Leonidas Da Silva Barbosa Thu, 14 Jul 2022 15:05:33 -0300 + +git (1:2.36.1-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Gianfranco Costamagna Mon, 23 May 2022 12:09:08 +0200 + git (1:2.36.1-1) unstable; urgency=low * new upstream point release (closes: #1010720; see @@ -246,6 +574,38 @@ git (1:2.35.1-1) unstable; urgency=low -- Jonathan Nieder Mon, 14 Feb 2022 08:24:39 -0800 +git (1:2.34.1-1ubuntu1.2) jammy; urgency=medium + + * SECURITY REGRESSION: Previous update was incomplete causing regressions + and not correctly fixing the issue. + - debian/patches/CVE-2022-24765-5.patch: fix safe.directory + key not being checked in setup.c. + - debian/patches/CVE-2022-24765-6.patch: + opt-out of check with safe.directory=* in setup.c. (LP: #1970260) + + -- Leonidas Da Silva Barbosa Mon, 25 Apr 2022 20:14:03 -0300 + +git (1:2.34.1-1ubuntu1.1) jammy-security; urgency=medium + + * SECURITY UPDATE: Run commands in diff users + - debian/patches/CVE-2022-24765-*.patch: fix GIT_CEILING_DIRECTORIES; add + an owner check for the top-level-directory; add a function to + determine whether a path is owned by the current user in patch.c, + t/t0060-path-utils.sh, setup.c, compat/mingw.c, compat/mingw.h, + git-compat-util.h. + - CVE-2022-24765 + + -- Leonidas Da Silva Barbosa Fri, 08 Apr 2022 08:43:25 -0300 + +git (1:2.34.1-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Julian Andres Klode Mon, 24 Jan 2022 16:50:15 +0100 + git (1:2.34.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.34.1.txt). @@ -258,6 +618,16 @@ git (1:2.34.0-1) unstable; urgency=low -- Jonathan Nieder Sat, 20 Nov 2021 13:14:45 -0800 +git (1:2.33.1-1ubuntu1) jammy; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Julian Andres Klode Mon, 15 Nov 2021 11:34:24 +0100 + git (1:2.33.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.33.1.txt). @@ -270,6 +640,15 @@ git (1:2.33.0-1) unstable; urgency=low -- Jonathan Nieder Mon, 16 Aug 2021 17:54:01 -0700 +git (1:2.32.0-1ubuntu1) impish; urgency=medium + + * Merge with Debian; remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Heinrich Schuchardt Mon, 09 Aug 2021 14:29:27 +0200 + git (1:2.32.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.32.0.txt). @@ -292,6 +671,15 @@ git (1:2.32.0~rc0-1) unstable; urgency=l -- Jonathan Nieder Thu, 20 May 2021 13:20:15 -0700 +git (1:2.31.1-1ubuntu1) impish; urgency=medium + + * Merge with Debian; remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Matthias Klose Mon, 17 May 2021 13:12:10 +0200 + git (1:2.31.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.31.1.txt). @@ -312,18 +700,45 @@ git (1:2.31.0-1) unstable; urgency=low -- Jonathan Nieder Mon, 15 Mar 2021 19:32:17 -0700 +git (1:2.30.2-1ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Matthias Klose Wed, 10 Mar 2021 16:06:22 +0100 + git (1:2.30.2-1) unstable; urgency=medium * new upstream point release (see RelNotes/2.30.2.txt). -- Jonathan Nieder Tue, 09 Mar 2021 17:45:38 -0800 +git (1:2.30.1-1ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Matthias Klose Thu, 04 Mar 2021 12:34:54 +0100 + git (1:2.30.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.30.1.txt). -- Jonathan Nieder Tue, 16 Feb 2021 21:55:22 -0800 +git (1:2.30.0-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Wed, 06 Jan 2021 16:47:23 -0800 + git (1:2.30.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.30.0.txt). @@ -342,6 +757,15 @@ git (1:2.30.0~rc1-1) unstable; urgency=l -- Jonathan Nieder Mon, 21 Dec 2020 13:58:04 -0800 +git (1:2.29.2-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Thu, 05 Nov 2020 15:57:05 -0800 + git (1:2.29.2-1) unstable; urgency=low * new upstream point release (see RelNotes/2.29.2.txt). @@ -363,6 +787,15 @@ git (1:2.29.1-1) unstable; urgency=low -- Jonathan Nieder Mon, 26 Oct 2020 17:25:55 -0700 +git (1:2.28.0-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Sat, 24 Oct 2020 17:30:59 -0700 + git (1:2.28.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.28.0.txt). @@ -387,6 +820,15 @@ git (1:2.28.0~rc0-1) unstable; urgency=l -- Jonathan Nieder Mon, 13 Jul 2020 15:03:55 -0700 +git (1:2.27.0-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Tue, 09 Jun 2020 13:50:43 -0700 + git (1:2.27.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.27.0.txt). @@ -399,6 +841,16 @@ git (1:2.27.0~rc2-1) unstable; urgency=l -- Jonathan Nieder Tue, 26 May 2020 14:27:25 -0700 +git (1:2.27.0~rc0-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + * Drop security update patches, included upstream. + + -- Steve Langasek Wed, 20 May 2020 16:48:49 -0700 + git (1:2.27.0~rc0-1) unstable; urgency=low * new upstream release candidate (see RelNotes/2.27.0.txt). @@ -476,6 +928,59 @@ git (1:2.26.0~rc2-1) unstable; urgency=l -- Jonathan Nieder Mon, 16 Mar 2020 21:17:23 -0700 +git (1:2.25.1-1ubuntu3) focal; urgency=medium + + * SECURITY UPDATE: credential helper issue with missing host or scheme + - debian/patches/CVE-2020-11008-1.patch: make "quit" helper more + realistic in t/t0300-credentials.sh. + - debian/patches/CVE-2020-11008-2.patch: use more realistic inputs in + t/t0300-credentials.sh. + - debian/patches/CVE-2020-11008-3.patch: parse URL without host as + empty host, not unset in credential.c, http.c, + t/t0300-credentials.sh. + - debian/patches/CVE-2020-11008-4.patch: refuse to operate when missing + host or protocol in credential.c, t/t0300-credentials.sh. + - debian/patches/CVE-2020-11008-5.patch: convert gitmodules url to URL + passed to curl in fsck.c, t/t7416-submodule-dash-url.sh. + - debian/patches/CVE-2020-11008-6.patch: die() when parsing invalid + urls in credential.c, t/t0300-credentials.sh. + - debian/patches/CVE-2020-11008-7.patch: treat URL without scheme as + invalid in credential.c, fsck.c, t/t5550-http-fetch-dumb.sh, + t/t7416-submodule-dash-url.sh. + - debian/patches/CVE-2020-11008-8.patch: treat URL with empty scheme as + invalid in credential.c, t/t5550-http-fetch-dumb.sh, + t/t7416-submodule-dash-url.sh. + - debian/patches/CVE-2020-11008-9.patch: reject URL with empty host in + .gitmodules in fsck.c, t/t7416-submodule-dash-url.sh. + - CVE-2020-11008 + + -- Marc Deslauriers Mon, 20 Apr 2020 11:50:03 -0400 + +git (1:2.25.1-1ubuntu2) focal; urgency=medium + + * SECURITY UPDATE: credential helper issue with newlines in URL + - debian/patches/CVE-2020-5260-1.patch: avoid writing values with + newlines in credential.c, t/t0300-credentials.sh. + - debian/patches/CVE-2020-5260-2.patch: use test_i18ncmp to check + stderr in t/lib-credential.sh. + - debian/patches/CVE-2020-5260-3.patch: detect unrepresentable values + when parsing urls in credential.c, credential.h, + t/t0300-credentials.sh. + - debian/patches/CVE-2020-5260-4.patch: detect gitmodules URLs with + embedded newlines in fsck.c, t/t7416-submodule-dash-url.sh. + - CVE-2020-5260 + + -- Marc Deslauriers Tue, 14 Apr 2020 08:31:47 -0400 + +git (1:2.25.1-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Steve Langasek Thu, 20 Feb 2020 14:55:13 -0800 + git (1:2.25.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.25.1.txt). @@ -490,6 +995,15 @@ git (1:2.25.1-1) unstable; urgency=low -- Jonathan Nieder Tue, 18 Feb 2020 17:26:36 -0800 +git (1:2.25.0-1ubuntu1) focal; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + - Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + + -- Marc Deslauriers Thu, 30 Jan 2020 13:20:28 -0500 + git (1:2.25.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.25.0.txt). @@ -541,6 +1055,47 @@ git (1:2.24.0-2) unstable; urgency=high -- Jonathan Nieder Mon, 09 Dec 2019 06:20:25 +0000 +git (1:2.24.0-1ubuntu2) focal; urgency=medium + + * Don't build-depend on subversion on i386, it is not reasonable to + support on the partial arch. + * Set PYTHON_PATH=/usr/bin/python2 and build-depend on python2 not python. + + -- Steve Langasek Mon, 13 Jan 2020 07:04:49 -0800 + +git (1:2.24.0-1ubuntu1) focal; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + + -- Colin Watson Wed, 13 Nov 2019 11:51:13 +0000 + +git (1:2.24.1-1) unstable; urgency=low + + * update to use upstream tarball for 2.24.1. + + -- Jonathan Nieder Tue, 10 Dec 2019 13:21:59 -0800 + +git (1:2.24.0-2) unstable; urgency=high + + * new upstream point release (see RelNotes/2.24.1.txt). + * Addresses the security issues CVE-2019-1348, CVE-2019-1349, + CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, + CVE-2019-1354, and CVE-2019-1387. + + Credit for finding these vulnerabilities goes to Microsoft + Security Response Center, in particular to Nicolas Joly. Fixes + were provided by Jeff King and Johannes Schindelin with help + from Garima Singh. + + * Addresses CVE-2019-19604, arbitrary code execution via the + "update" field in .gitmodules. + + Credit for finding this vulnerability goes to Joern + Schneeweisz from GitLab. + + -- Jonathan Nieder Mon, 09 Dec 2019 06:20:25 +0000 + git (1:2.24.0-1) unstable; urgency=medium * new upstream release (see RelNotes/2.24.0.txt). @@ -592,6 +1147,15 @@ git (1:2.22.0-1) unstable; urgency=low -- Jonathan Nieder Mon, 08 Jul 2019 10:50:51 -0700 +git (1:2.20.1-2ubuntu1) disco; urgency=medium + + * Merge with Debian; remaining change: + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + * Dropped change: + - Build against pcre3 (pcre2 is now in main) (LP: #1792544) + + -- Jeremy Bicha Wed, 23 Jan 2019 11:30:48 -0500 + git (1:2.20.1-2) unstable; urgency=low * package git-gui: actually Suggests: meld for mergetool support; @@ -644,6 +1208,16 @@ git (1:2.19.2-1) unstable; urgency=high -- Jonathan Nieder Thu, 22 Nov 2018 14:48:49 -0800 +git (1:2.19.1-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian; remaining changes: + - debian/control: build against pcre v3 only + - debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + + -- Jeremy Bicha Fri, 05 Oct 2018 18:15:54 -0400 + git (1:2.19.1-1) unstable; urgency=high * new upstream point release (see RelNotes/2.19.1.txt, @@ -651,6 +1225,16 @@ git (1:2.19.1-1) unstable; urgency=high -- Jonathan Nieder Fri, 05 Oct 2018 10:10:45 -0700 +git (1:2.19.0-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian; remaining changes: + - debian/control: build against pcre v3 only + - debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + - Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + + -- Jeremy Bicha Fri, 28 Sep 2018 23:11:09 -0400 + git (1:2.19.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.19.0.txt). @@ -707,6 +1291,21 @@ git (1:2.18.0~rc2-1) unstable; urgency=l -- Jonathan Nieder Mon, 18 Jun 2018 09:19:59 -0700 +git (1:2.17.1-1ubuntu2) cosmic; urgency=medium + + * Build diff-highlight in the contrib dir (closes: #868871, LP: #1713690) + + -- Adam Conrad Thu, 20 Sep 2018 03:34:49 -0600 + +git (1:2.17.1-1ubuntu1) cosmic; urgency=medium + + * Merge with Debian; remaining changes: + - debian/control: build against pcre v3 only + - debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + + -- Matthias Klose Thu, 31 May 2018 16:56:17 +0200 + git (1:2.17.1-1) unstable; urgency=high * new upstream point release to fix CVE-2018-11235, arbitary code @@ -714,6 +1313,15 @@ git (1:2.17.1-1) unstable; urgency=high -- Jonathan Nieder Mon, 28 May 2018 17:37:54 -0700 +git (1:2.17.0-1ubuntu1) bionic; urgency=medium + + * Merge with Debian; remaining changes: + - debian/control: build against pcre v3 only + - debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + + -- Matthias Klose Fri, 06 Apr 2018 16:38:28 +0200 + git (1:2.17.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.17.0.txt). @@ -767,6 +1375,27 @@ git (1:2.15.1-2) unstable; urgency=low -- Jonathan Nieder Mon, 18 Dec 2017 09:45:31 -0800 +git (1:2.15.1-1ubuntu2) bionic; urgency=medium + + * debian/gitweb.apache2: use lynx instead of the deprecated transitional + lynx-cur package. + + -- Łukasz 'sil2100' Zemczak Thu, 14 Dec 2017 19:51:49 +0100 + +git (1:2.15.1-1ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. LP: #1729075. + * Remaining changes: + - debian/control: build against pcre v3 only + - debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + * Dropped changes, included upstream: + - debian/patches/git-branch-fix-regressions.patch: Fix branch renaming + not updating HEADs correctly. + - SECURITY UPDATE: Git cvsserver OS Command Injection + + -- Steve Langasek Fri, 08 Dec 2017 15:28:09 -0800 + git (1:2.15.1-1) unstable; urgency=low * new upstream point release (see RelNotes/2.15.1.txt). @@ -836,6 +1465,34 @@ git (1:2.14.1-2) unstable; urgency=low -- Jonathan Nieder Mon, 14 Aug 2017 12:14:32 -0700 +git (1:2.14.1-1ubuntu4) artful; urgency=high + + * SECURITY UPDATE: Git cvsserver OS Command Injection (LP: #1719740) + - shell-drop-git-cvsserver-support-by-default.diff + - cvsserver-use-safe_pipe_capture.diff + - cvsimport-shell-quote-variable-used-in-backticks.diff + - archimport-use-safe_pipe_capture-for-user-input.diff + - CVE-2017-14867 + + -- Simon Quigley Tue, 26 Sep 2017 19:11:26 -0500 + +git (1:2.14.1-1ubuntu3) artful; urgency=medium + + * debian/patches/git-branch-fix-regressions.patch: Fix branch renaming + not updating HEADs correctly. Thanks to Nguyễn Thái Ngọc Duy + . Closes LP: #1712694. + + -- Nishanth Aravamudan Thu, 24 Aug 2017 10:56:07 -0700 + +git (1:2.14.1-1ubuntu2) artful; urgency=medium + + * Merge from debian. Remaining changes: + - debian/control: build against pcre v3 only + * debian/rules: s390x libpcre3 library has JIT disabled, set + NO_LIBPCRE1_JIT on that arch to stop the build from failing. + + -- Steve Beattie Mon, 14 Aug 2017 16:44:53 -0700 + git (1:2.14.1-1) unstable; urgency=high * new upstream point release to fix CVE-2017-1000117, arbitrary @@ -843,6 +1500,14 @@ git (1:2.14.1-1) unstable; urgency=high -- Jonathan Nieder Thu, 10 Aug 2017 09:16:20 -0700 +git (1:2.14.0-1ubuntu1) artful; urgency=medium + + * Build against pcre v3 only, as that is the only on in + main. Non-deterministic builds w.r.t. library ABI dependencies are + bad. + + -- Dimitri John Ledkov Tue, 08 Aug 2017 16:29:42 -0400 + git (1:2.14.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.14.0.txt). @@ -1394,7 +2059,6 @@ git (1:1.8.5~rc2-1) experimental; urgenc -- Jonathan Nieder Wed, 13 Nov 2013 16:12:29 -0800 - git (1:1.8.4.4-1) unstable; urgency=low * new upstream point release. @@ -4496,3 +5160,4 @@ git-core (0.99-0) unstable; urgency=low * Initial deb package support -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 + diff -pruN 1:2.51.0-1/debian/control 1:2.51.0-1ubuntu1/debian/control --- 1:2.51.0-1/debian/control 2025-08-26 14:34:30.000000000 +0000 +++ 1:2.51.0-1ubuntu1/debian/control 2025-08-28 07:15:03.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Anders Kaseorg