]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blame - src/patches/vdr/vdr-2.4.1_replace_stime.patch
freeradius: Depend on samba again
[people/pmueller/ipfire-2.x.git] / src / patches / vdr / vdr-2.4.1_replace_stime.patch
CommitLineData
b6632b76
AF
1From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001
2From: Manuel Reimer <manuel.reimer@gmx.de>
3Date: Sat, 14 Dec 2019 12:01:13 +0100
4Subject: [PATCH 1/2] Replace obsolete stime() function with clock_settime()
5
6---
7 eit.c | 4 +++-
8 1 file changed, 3 insertions(+), 1 deletion(-)
9
10diff --git a/eit.c b/eit.c
11index 50d8229..82294dc 100644
12--- a/eit.c
13+++ b/eit.c
14@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
15 if (abs(diff) > MAX_TIME_DIFF) {
16 mutex.Lock();
17 if (abs(diff) > MAX_ADJ_DIFF) {
18- if (stime(&dvbtim) == 0)
19+ timespec ts = {0};
20+ ts.tv_sec = dvbtim;
21+ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
22 isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
23 else
24 esyslog("ERROR while setting system time: %m");
25
26From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001
27From: Manuel Reimer <manuel.reimer@gmx.de>
28Date: Sun, 15 Dec 2019 11:26:42 +0100
29Subject: [PATCH 2/2] Fix "struct timespec has more than one member" warning
30
31---
32 eit.c | 2 +-
33 1 file changed, 1 insertion(+), 1 deletion(-)
34
35diff --git a/eit.c b/eit.c
36index 82294dc..098e627 100644
37--- a/eit.c
38+++ b/eit.c
39@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data)
40 if (abs(diff) > MAX_TIME_DIFF) {
41 mutex.Lock();
42 if (abs(diff) > MAX_ADJ_DIFF) {
43- timespec ts = {0};
44+ timespec ts = {};
45 ts.tv_sec = dvbtim;
46 if (clock_settime(CLOCK_REALTIME, &ts) == 0)
47 isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);