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 | |
| parent | 4440a1c08d02ede1440b091f9234ac4ba1757f81 (diff) | |
| download | aports-559097dd9c9c6ca1b6e5e97a77f501e13c16727c.tar.bz2 aports-559097dd9c9c6ca1b6e5e97a77f501e13c16727c.tar.xz | |
main/dhcpcd: upgrade to 6.3.2
| -rw-r--r-- | main/dhcpcd/APKBUILD | 18 | ||||
| -rw-r--r-- | main/dhcpcd/fix-includes.patch | 53 |
2 files changed, 41 insertions, 30 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index bc6803943..f4010df3c 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=6.2.1 -pkgrel=2 +pkgver=6.3.2 +pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" arch="all" @@ -12,8 +12,8 @@ makedepends= install= subpackages="$pkgname-doc" source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 - fix-includes.patch busybox-logger.patch + fix-includes.patch dhcpcd.initd" prepare() { @@ -44,15 +44,15 @@ package() { install -Dm755 "$srcdir"/dhcpcd.initd "$pkgdir"/etc/init.d/dhcpcd } -md5sums="214483a069b5e8b3b96371755eaa1b18 dhcpcd-6.2.1.tar.bz2 -c5d3c2f281e877e83b0dba3b51136276 fix-includes.patch +md5sums="bb7d8e8533161fbe0eee3b8830fdbdf4 dhcpcd-6.3.2.tar.bz2 ee37c1f2b73055e6cf127fc8e581af87 busybox-logger.patch +6f5f2e7df22f09b0ef8f3ff05fe87151 fix-includes.patch ecbd807cf3f87d7c5b6095bf63f26894 dhcpcd.initd" -sha256sums="eaad7790c22e328616c1d47417832d7f6c8715b32d1b49aa5282d60ff91f42bf dhcpcd-6.2.1.tar.bz2 -18dfb95088bafc86603d8a8df1d21d8ebd24fdddf9a7517e50744f8bd1023f95 fix-includes.patch +sha256sums="b69c1ef06a92f327993ee1cc4cfd9145c296aa1ac6070ba2f9ac74931b2f55ec dhcpcd-6.3.2.tar.bz2 a590961c9e53829a9d33ae458fc4c4b68880f5b2b972c3a78c60a947b8c56fb5 busybox-logger.patch +fd7aae982ee22b6e22bbeb4fa4e8a5694ed68eac64b2cfc52a6f2c97ddd60049 fix-includes.patch 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 dhcpcd.initd" -sha512sums="0b3db1011e4e427d5c781dafb20e5541da486126e27cc1f018b825c8e2c21bf911f714f0663b6ee813888a558a006b4bddbbdfd7a91a73b17b0d09c53243541d dhcpcd-6.2.1.tar.bz2 -63315419049b6de0177ba355f74576bb0ba7ae12cc4db52a477c3b2d51502535666d83895eeb442f212cd89f8f9046fcad90d6a0d50a79a7027efb3fab0ee852 fix-includes.patch +sha512sums="fa5d3287e658064df39c426eaa960567d916dd8241be6b69315f5fa39bdf51c97fbd306222b3e062fa83ec54acd63481bac4c3f52a2f2e5e2a077c76e0bb4326 dhcpcd-6.3.2.tar.bz2 35960cc9197750890d1a8540eb920e6c0544295993044718aa5309303e29eb2c7622eee74f742861cf446d88c7b80b5ea104f3f6bcc3e9daa5be59237a962971 busybox-logger.patch +d21e431f723537061e0787f461eaeed2f02384653dd82d89cd53163ea0b616f11a2d2b1a4013bd1a5682c6c6f4c24d1f42d1201ad5a63be007b26923d884b7dd fix-includes.patch 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 dhcpcd.initd" 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> |