diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-06-02 00:12:34 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-06-02 00:25:08 +0200 |
| commit | cdfc6788a9fc7c0a4b90ab92ab302e0a2506cc54 (patch) | |
| tree | e3d639073593ddd7e9a3100d57c8a56bf011d660 /package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch | |
| parent | 9e20cc56b9a7244b14a5aa8d807148a619339103 (diff) | |
| download | upstream-cdfc6788a9fc7c0a4b90ab92ab302e0a2506cc54.tar.gz upstream-cdfc6788a9fc7c0a4b90ab92ab302e0a2506cc54.tar.bz2 upstream-cdfc6788a9fc7c0a4b90ab92ab302e0a2506cc54.zip | |
dnsmasq: bump to 2.77
This is a cumulative backport of multiple dnsmasq update commits in master.
Drops three LEDE specific patches which are included upstream and another
patch which became obsolete. Remaining LEDE specific patches are rebased.
Fixes FS#766 - Intermittent SIGSEGV crash of dnsmasq-full.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch index ca5a806696..2f854d490b 100644 --- a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch +++ b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch @@ -35,13 +35,13 @@ Signed-off-by: Steven Barth <steven@midlink.org> + if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0) { /* time already OK, update timestamp, and do key checking from the start. */ - if (utime(daemon->timestamp_file, NULL) == -1) + if (utimes(daemon->timestamp_file, NULL) == -1) @@ -493,7 +500,7 @@ int setup_timestamp(void) close(fd); -- timestamp_time = timbuf.actime = timbuf.modtime = 1420070400; /* 1-1-2015 */ -+ timestamp_time = timbuf.actime = timbuf.modtime = base; - if (utime(daemon->timestamp_file, &timbuf) == 0) - goto check_and_exit; - } +- timestamp_time = 1420070400; /* 1-1-2015 */ ++ timestamp_time = base; /* 1-1-2015 */ + tv[0].tv_sec = tv[1].tv_sec = timestamp_time; + tv[0].tv_usec = tv[1].tv_usec = 0; + if (utimes(daemon->timestamp_file, tv) == 0) |