aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/206-compensate_time_change.patch
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-10-10 21:53:38 +0200
committerHans Dedecker <dedeckeh@gmail.com>2019-10-10 22:37:10 +0200
commitf8b58757d0e17560a1ccee29e94783f2d3cefb1e (patch)
treed3a4d8163c0535a1f18f736537aec02be9545f34 /package/network/services/ppp/patches/206-compensate_time_change.patch
parent46a129194de0f9e2f71b6526634569e1ec802504 (diff)
downloadupstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.tar.gz
upstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.tar.bz2
upstream-f8b58757d0e17560a1ccee29e94783f2d3cefb1e.zip
ppp: update to version 2.4.7.git-2019-10-04
0d004db Revert "pppd: Include time.h before using time_t" e400854 pppdump: Eliminate printf format warning by using %zd 7f2f0de pppd: Refactor setjmp/longjmp with pipe pair in event wait loop 4e71317 make: Avoid using host include for cross-compiling 3202f89 pppoe: Remove the use of cdefs d8e8d7a pppd: Remove unused rcsid variables 486f854 pppd: Fix GLIBC version test for non-glibc toolchains b6cd558 pppd: Include time.h before using time_t ef8ec11 radius: Fix compiler warning f6330ec magic: Remove K&R style of arguments 347904e Add Submitting-patches.md Remove patches 130-no_cdefs_h.patch, 131-missing_prototype_macro.patch, 132-fix_linux_includes.patch as fixed upstream Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/services/ppp/patches/206-compensate_time_change.patch')
-rw-r--r--package/network/services/ppp/patches/206-compensate_time_change.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/ppp/patches/206-compensate_time_change.patch b/package/network/services/ppp/patches/206-compensate_time_change.patch
index bd259b97dc..1f6b6ba44c 100644
--- a/package/network/services/ppp/patches/206-compensate_time_change.patch
+++ b/package/network/services/ppp/patches/206-compensate_time_change.patch
@@ -13,7 +13,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
--- a/pppd/main.c
+++ b/pppd/main.c
-@@ -90,6 +90,7 @@
+@@ -89,6 +89,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -21,7 +21,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
#include "pppd.h"
#include "magic.h"
-@@ -228,6 +229,7 @@ static struct subprocess *children;
+@@ -226,6 +227,7 @@ static struct subprocess *children;
/* Prototypes for procedures local to this file. */
@@ -29,7 +29,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
static void setup_signals __P((void));
static void create_pidfile __P((int pid));
static void create_linkpidfile __P((int pid));
-@@ -527,6 +529,7 @@ main(argc, argv)
+@@ -525,6 +527,7 @@ main(argc, argv)
info("Starting link");
}
@@ -37,7 +37,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
gettimeofday(&start_time, NULL);
script_unsetenv("CONNECT_TIME");
script_unsetenv("BYTES_SENT");
-@@ -1262,6 +1265,36 @@ struct callout {
+@@ -1270,6 +1273,36 @@ struct callout {
static struct callout *callout = NULL; /* Callout list */
static struct timeval timenow; /* Current time */
@@ -74,7 +74,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
/*
* timeout - Schedule a timeout.
-@@ -1332,6 +1365,8 @@ calltimeout()
+@@ -1340,6 +1373,8 @@ calltimeout()
{
struct callout *p;
@@ -83,7 +83,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
while (callout != NULL) {
p = callout;
-@@ -1359,6 +1394,8 @@ timeleft(tvp)
+@@ -1367,6 +1402,8 @@ timeleft(tvp)
{
if (callout == NULL)
return NULL;