diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index aedb7c1f7..30ee850c0 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,10 +1,11 @@ -%define git_version 2.46.0 +%define git_version 2.47.0 Summary: CFEngine Build Automation -- git Name: cfbuild-git Version: %{version} Release: 1 Source0: git-%{git_version}.tar.gz +Patch0: clar-stop-passing-timezone-to-gettimeofday.patch License: MIT Group: Other Url: http://example.com/ @@ -18,6 +19,8 @@ AutoReqProv: no mkdir -p %{_builddir} %setup -q -n git-%{git_version} +%patch0 -p0 + ./configure --prefix=%{prefix} --with-openssl=%{prefix} --without-iconv --with-gitconfig=%{prefix}/config/gitconfig --with-gitattributes=%{prefix}/config/gitattributes --with-zlib=%{prefix} --with-curl=%{prefix} --libexecdir=%{prefix}/lib --with-python=%{prefix}/bin/python %build diff --git a/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch b/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch new file mode 100644 index 000000000..0c5da058a --- /dev/null +++ b/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch @@ -0,0 +1,28 @@ +commit ca41a29b8bb19f0240eac0f872a7b958fb1f5f19 +Author: Patrick Steinhardt +Date: Thu Sep 5 08:04:37 2024 +0200 + + clar: stop passing a timezone to gettimeofday(3P) + + According to gettimeofday(3P), passing a non-NULL timezone pointer to + the function is unspecified behaviour. This is also being warned about + by compilers when compiling with strict C90 standard and without most of + the extensions. + + Adapt the code accordingly. + +diff --git t/unit-tests/clar.c t/unit-tests/clar.c +index cef0f02..e593bb1 100644 +--- t/unit-tests/clar/clar.c ++++ t/unit-tests/clar/clar.c +@@ -271,9 +271,7 @@ static double clar_time_diff(clar_time *start, clar_time *end) + + static void clar_time_now(clar_time *out) + { +- struct timezone tz; +- +- gettimeofday(out, &tz); ++ gettimeofday(out, NULL); + } + + static double clar_time_diff(clar_time *start, clar_time *end) diff --git a/deps-packaging/git/debian/rules b/deps-packaging/git/debian/rules index a69615d76..cf03d7206 100755 --- a/deps-packaging/git/debian/rules +++ b/deps-packaging/git/debian/rules @@ -12,6 +12,8 @@ build: build-stamp build-stamp: dh_testdir + patch -p0 -i clar-stop-passing-timezone-to-gettimeofday.patch + ./configure --prefix=$(PREFIX) --with-openssl=$(PREFIX) --without-iconv --with-gitconfig=$(PREFIX)/config/gitconfig --with-gitattributes=$(PREFIX)/config/gitattributes --with-zlib=$(PREFIX) --with-curl=$(PREFIX) --libexecdir=$(PREFIX)/lib make CURL_LDFLAGS="-lcurl" diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index 8b69417db..843306091 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230 git-2.46.0.tar.gz +a84a7917e0ab608312834413f01fc01edc7844f9f9002ba69f3b4f4bcb8d937a git-2.47.0.tar.gz