summaryrefslogtreecommitdiff
path: root/package/ppp/patches/patch-pppd_main_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/ppp/patches/patch-pppd_main_c
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/ppp/patches/patch-pppd_main_c')
-rw-r--r--package/ppp/patches/patch-pppd_main_c14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/ppp/patches/patch-pppd_main_c b/package/ppp/patches/patch-pppd_main_c
index 22e6a64..630420d 100644
--- a/package/ppp/patches/patch-pppd_main_c
+++ b/package/ppp/patches/patch-pppd_main_c
@@ -1,5 +1,5 @@
---- ppp-2.4.4.orig/pppd/main.c 2006-06-04 05:52:50.000000000 +0200
-+++ ppp-2.4.4/pppd/main.c 2009-06-05 19:12:00.000000000 +0200
+--- ppp-2.4.5.orig/pppd/main.c 2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/pppd/main.c 2011-01-16 15:51:05.000000000 +0100
@@ -90,6 +90,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -8,7 +8,7 @@
#include "pppd.h"
#include "magic.h"
-@@ -227,6 +228,7 @@ static struct subprocess *children;
+@@ -228,6 +229,7 @@ static struct subprocess *children;
/* Prototypes for procedures local to this file. */
@@ -16,7 +16,7 @@
static void setup_signals __P((void));
static void create_pidfile __P((int pid));
static void create_linkpidfile __P((int pid));
-@@ -529,6 +531,7 @@ main(argc, argv)
+@@ -530,6 +532,7 @@ main(argc, argv)
info("Starting link");
}
@@ -24,7 +24,7 @@
gettimeofday(&start_time, NULL);
script_unsetenv("CONNECT_TIME");
script_unsetenv("BYTES_SENT");
-@@ -1262,6 +1265,36 @@ struct callout {
+@@ -1263,6 +1266,36 @@ struct callout {
static struct callout *callout = NULL; /* Callout list */
static struct timeval timenow; /* Current time */
@@ -61,7 +61,7 @@
/*
* timeout - Schedule a timeout.
-@@ -1332,6 +1365,8 @@ calltimeout()
+@@ -1333,6 +1366,8 @@ calltimeout()
{
struct callout *p;
@@ -70,7 +70,7 @@
while (callout != NULL) {
p = callout;
-@@ -1359,6 +1394,8 @@ timeleft(tvp)
+@@ -1360,6 +1395,8 @@ timeleft(tvp)
{
if (callout == NULL)
return NULL;