From 83fe097e2777248fada02d5189659126fe6ef193 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 Nov 2014 17:19:23 +0100 Subject: [PATCH] dhcpcd: update to 6.6.2; my patch for musl was pulled in. --- srcpkgs/dhcpcd/patches/musl.patch | 142 ------------------------------ srcpkgs/dhcpcd/template | 6 +- 2 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 srcpkgs/dhcpcd/patches/musl.patch diff --git a/srcpkgs/dhcpcd/patches/musl.patch b/srcpkgs/dhcpcd/patches/musl.patch deleted file mode 100644 index 311e80a4bb..0000000000 --- a/srcpkgs/dhcpcd/patches/musl.patch +++ /dev/null @@ -1,142 +0,0 @@ -Patch for musl: - -- no sys/queue.h, use compat/queue.h by including config.h -- do not include sys/cdefs.h, include it only for linux if __GLIBC__ is defined. - ---- compat/queue.h.orig 2014-11-10 15:54:07.744929227 +0100 -+++ compat/queue.h 2014-11-10 15:54:14.071992172 +0100 -@@ -34,7 +34,6 @@ - #ifndef COMPAT_QUEUE_H - #define COMPAT_QUEUE_H - --#include - /* - * Tail queue definitions. - */ ---- ipv6nd.h.orig 2014-11-10 16:06:24.642349623 +0100 -+++ ipv6nd.h 2014-11-10 16:07:35.347079022 +0100 -@@ -28,10 +28,9 @@ - #ifndef IPV6ND_H - #define IPV6ND_H - --#include -- - #include - -+#include "config.h" - #include "dhcpcd.h" - #include "ipv6.h" - ---- ipv6.h.orig 2014-11-10 16:08:03.514369511 +0100 -+++ ipv6.h 2014-11-10 16:08:27.211613861 +0100 -@@ -28,7 +28,6 @@ - #ifndef IPV6_H - #define IPV6_H - --#include - #include - - #include -@@ -38,6 +37,7 @@ - # include - #endif - -+#include "config.h" - #include "dhcpcd.h" - - #define ALLROUTERS "ff02::2" ---- ipv4.c.orig 2014-11-10 16:08:42.210768503 +0100 -+++ ipv4.c 2014-11-10 16:08:49.946848257 +0100 -@@ -25,7 +25,6 @@ - * SUCH DAMAGE. - */ - --#include - #include - #include - ---- if-options.c.orig 2014-11-10 16:09:05.972013455 +0100 -+++ if-options.c 2014-11-10 16:09:11.684072335 +0100 -@@ -29,7 +29,6 @@ - - #include - #include --#include - - #include - ---- eloop.c.orig 2014-11-10 16:09:31.579277397 +0100 -+++ eloop.c 2014-11-10 16:09:41.386378472 +0100 -@@ -28,7 +28,6 @@ - /* Needed for ppoll(2) */ - #define _GNU_SOURCE - --#include - #include - - #include -@@ -38,6 +37,7 @@ - #include - #include - -+#include "config.h" - #include "common.h" - #include "dhcpcd.h" - #include "eloop.h" ---- dhcpcd.h.orig 2014-11-10 16:10:00.467575110 +0100 -+++ dhcpcd.h 2014-11-10 16:10:09.882672127 +0100 -@@ -28,10 +28,10 @@ - #ifndef DHCPCD_H - #define DHCPCD_H - --#include - #include - #include - -+#include "config.h" - #include "defs.h" - #include "control.h" - #include "if-options.h" ---- dhcpcd.c.orig 2014-11-10 16:10:26.435842686 +0100 -+++ dhcpcd.c 2014-11-10 16:10:32.467904833 +0100 -@@ -30,7 +30,6 @@ const char dhcpcd_copyright[] = "Copyrig - #define _WITH_DPRINTF /* Stop FreeBSD bitching */ - - #include --#include - #include - #include - #include ---- auth.h.orig 2014-11-10 16:10:49.572081045 +0100 -+++ auth.h 2014-11-10 16:11:07.123261845 +0100 -@@ -28,7 +28,7 @@ - #ifndef AUTH_H - #define AUTH_H - --#include -+#include "config.h" - - #define DHCPCD_AUTH_SEND (1 << 0) - #define DHCPCD_AUTH_REQUIRE (1 << 1) ---- auth.c.orig 2014-11-10 16:11:28.427481277 +0100 -+++ auth.c 2014-11-10 16:11:33.107529478 +0100 -@@ -26,7 +26,6 @@ - */ - - #include --#include - #include - #include - #include ---- common.c.orig 2014-11-10 16:12:10.283912320 +0100 -+++ common.c 2014-11-10 16:21:45.141810097 +0100 -@@ -31,7 +31,9 @@ - #endif - - #ifndef __sun -+# if !defined(__linux__) || (defined(__linux__) && defined(__GLIBC__)) - # include -+# endif - #endif - - #ifdef __APPLE__ diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 05ac09e115..8a8c0af029 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=6.6.1 -revision=3 +version=6.6.2 +revision=1 lib32disabled=yes build_options="systemd" build_style=configure @@ -14,7 +14,7 @@ maintainer="Juan RP " license="2-clause-BSD" homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" -checksum=5d6a15fa064a91761601142232f23edb09b570555c3386e6d766759d78b8e1fe +checksum=879c81febafc95ed9353909b719af765e9925c6cb06226b79da6c0dd176fe89f pre_install() { # make wpa_supplicant log to syslog rather than stdout