diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-01 09:57:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-01 09:57:09 +0000 |
| commit | 559097dd9c9c6ca1b6e5e97a77f501e13c16727c (patch) | |
| tree | 2a6a5afcf9faa5d1cd99440de256a5b3b9e649bf /main/dhcpcd/fix-includes.patch | |
| parent | 4440a1c08d02ede1440b091f9234ac4ba1757f81 (diff) | |
| download | aports-559097dd9c9c6ca1b6e5e97a77f501e13c16727c.tar.bz2 aports-559097dd9c9c6ca1b6e5e97a77f501e13c16727c.tar.xz | |
main/dhcpcd: upgrade to 6.3.2
Diffstat (limited to 'main/dhcpcd/fix-includes.patch')
| -rw-r--r-- | main/dhcpcd/fix-includes.patch | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/main/dhcpcd/fix-includes.patch b/main/dhcpcd/fix-includes.patch index 602825d4f..555778b6a 100644 --- a/main/dhcpcd/fix-includes.patch +++ b/main/dhcpcd/fix-includes.patch @@ -1,16 +1,7 @@ ---- dhcpcd-6.1.0.orig/common.c -+++ dhcpcd-6.1.0/common.c -@@ -30,8 +30,6 @@ - # define _GNU_SOURCE - #endif - --#include <sys/cdefs.h> -- - #ifdef __APPLE__ - # include <mach/mach_time.h> - # include <mach/kern_return.h> ---- dhcpcd-6.1.0.orig/dhcp6.c -+++ dhcpcd-6.1.0/dhcp6.c +diff --git a/dhcp6.c b/dhcp6.c +index 9c1fbec..5a8b94a 100644 +--- a/dhcp6.c ++++ b/dhcp6.c @@ -31,10 +31,6 @@ #include <sys/utsname.h> @@ -22,18 +13,38 @@ #include <ctype.h> #include <errno.h> ---- dhcpcd-6.1.0.orig/dhcpcd.c -+++ dhcpcd-6.1.0/dhcpcd.c -@@ -48,6 +48,7 @@ - #include <string.h> +diff --git a/dhcpcd.c b/dhcpcd.c +index 64758e5..652313e 100644 +--- a/dhcpcd.c ++++ b/dhcpcd.c +@@ -48,6 +48,7 @@ const char dhcpcd_copyright[] = "Copyright (c) 2006-2014 Roy Marples"; #include <syslog.h> #include <unistd.h> -+#include <fcntl.h> #include <time.h> ++#include <fcntl.h> + #include "config.h" #include "arp.h" ---- dhcpcd-6.1.0.orig/ipv6nd.c -+++ dhcpcd-6.1.0/ipv6nd.c +diff --git a/ipv6.h b/ipv6.h +index 4a89d85..a04fa5a 100644 +--- a/ipv6.h ++++ b/ipv6.h +@@ -33,11 +33,6 @@ + + #include <netinet/in.h> + +-#ifdef __linux__ +-# define _LINUX_IN6_H +-# include <linux/ipv6.h> +-#endif +- + #include "dhcpcd.h" + + #define ALLROUTERS "ff02::2" +diff --git a/ipv6nd.c b/ipv6nd.c +index a755fe8..b747fbd 100644 +--- a/ipv6nd.c ++++ b/ipv6nd.c @@ -33,11 +33,6 @@ #include <netinet/ip6.h> #include <netinet/icmp6.h> @@ -44,5 +55,5 @@ -#endif - #include <errno.h> + #include <fcntl.h> #include <stddef.h> - #include <stdlib.h> |