Skip to content

Commit

Permalink
Updated git from 2.46.2 to 2.47.0
Browse files Browse the repository at this point in the history
  • Loading branch information
craigcomstock committed Oct 8, 2024
1 parent 72bea9a commit 7574a15
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
5 changes: 4 additions & 1 deletion deps-packaging/git/cfbuild-git.spec
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
commit ca41a29b8bb19f0240eac0f872a7b958fb1f5f19
Author: Patrick Steinhardt <[email protected]>
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)
2 changes: 2 additions & 0 deletions deps-packaging/git/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230 git-2.46.0.tar.gz
a84a7917e0ab608312834413f01fc01edc7844f9f9002ba69f3b4f4bcb8d937a git-2.47.0.tar.gz

0 comments on commit 7574a15

Please sign in to comment.