diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/dhcpcd/APKBUILD | 20 | ||||
| -rw-r--r-- | main/dhcpcd/fix-caddr_t.patch | 13 | ||||
| -rw-r--r-- | main/dhcpcd/fix-includes.patch | 59 | ||||
| -rw-r--r-- | main/dhcpcd/u_char.patch | 11 |
4 files changed, 19 insertions, 84 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 98d8fa1474..bc0807cce7 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=6.4.4 +pkgver=6.4.7 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" @@ -13,8 +13,7 @@ install= subpackages="$pkgname-doc" source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2 busybox-logger.patch - fix-includes.patch - fix-caddr_t.patch + u_char.patch dhcpcd.initd" prepare() { @@ -44,18 +43,15 @@ package() { install -Dm755 "$srcdir"/dhcpcd.initd "$pkgdir"/etc/init.d/dhcpcd } -md5sums="8550f040075e447a0555e896e4dfc948 dhcpcd-6.4.4.tar.bz2 +md5sums="b2289237a5b666a11178a9517c3f1240 dhcpcd-6.4.7.tar.bz2 ee37c1f2b73055e6cf127fc8e581af87 busybox-logger.patch -6f5f2e7df22f09b0ef8f3ff05fe87151 fix-includes.patch -247992cddc9fa9088d84a3f500674d1b fix-caddr_t.patch +38f6b6e4e2932159ad05b500ab94fb90 u_char.patch ecbd807cf3f87d7c5b6095bf63f26894 dhcpcd.initd" -sha256sums="2317126a5d640442c689522a579563df8055f22433c27ee86874a368a20b6a82 dhcpcd-6.4.4.tar.bz2 +sha256sums="bb0880968671436b2cf85dcda4d4cf9b9e25045a274832bf18e28534bb25e187 dhcpcd-6.4.7.tar.bz2 a590961c9e53829a9d33ae458fc4c4b68880f5b2b972c3a78c60a947b8c56fb5 busybox-logger.patch -fd7aae982ee22b6e22bbeb4fa4e8a5694ed68eac64b2cfc52a6f2c97ddd60049 fix-includes.patch -ef861dad9bc5149b33987e3023a435733a859d12dda0118d42b5ef63a8930f20 fix-caddr_t.patch +d303acd612c8f0c5d9aae7514670366b1a3f47a8aecbfa30dd299d13ecbf19cd u_char.patch 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 dhcpcd.initd" -sha512sums="db89d2635d154483753b60313679afe976c7c68f48f31984eb359282f183637c33623bc2364dd09b2d8f52024d92c3d4bb8458bd1ed796ab155909da774dc317 dhcpcd-6.4.4.tar.bz2 +sha512sums="cccf5ef0e025f56f87f530ddcf518f550bf3ffa662bc7514f4cedf92a6f01bdfd7d87d4e41cad3c41d1c99a307eda2e8663344ca403fc8c23043ef1fc0f0298a dhcpcd-6.4.7.tar.bz2 35960cc9197750890d1a8540eb920e6c0544295993044718aa5309303e29eb2c7622eee74f742861cf446d88c7b80b5ea104f3f6bcc3e9daa5be59237a962971 busybox-logger.patch -d21e431f723537061e0787f461eaeed2f02384653dd82d89cd53163ea0b616f11a2d2b1a4013bd1a5682c6c6f4c24d1f42d1201ad5a63be007b26923d884b7dd fix-includes.patch -afe7bb9c1a592c7268bce1544bf8c106e7c6db721ba98bd3f4e67753eca35183b48ec01b677e0edfd781e8ccff3cb095ec7ab2774cadbd397063e33497f86ad6 fix-caddr_t.patch +638c200f0876766dec007b5c70617c1c92e6076aa2f6047fb08a0884eac13801c1a12c455aa710a364c0b2e93d40619d533fa0bf7896af26307bad5b00f3501c u_char.patch 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 dhcpcd.initd" diff --git a/main/dhcpcd/fix-caddr_t.patch b/main/dhcpcd/fix-caddr_t.patch deleted file mode 100644 index 2fa00a9bd6..0000000000 --- a/main/dhcpcd/fix-caddr_t.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./dhcp6.c.orig -+++ ./dhcp6.c -@@ -835,8 +835,8 @@ - - ctx = ifp->ctx->ipv6; - dst.sin6_scope_id = ifp->index; -- ctx->sndhdr.msg_name = (caddr_t)&dst; -- ctx->sndhdr.msg_iov[0].iov_base = (caddr_t)state->send; -+ ctx->sndhdr.msg_name = (void *)&dst; -+ ctx->sndhdr.msg_iov[0].iov_base = (void *)state->send; - ctx->sndhdr.msg_iov[0].iov_len = state->send_len; - - /* Set the outbound interface */ diff --git a/main/dhcpcd/fix-includes.patch b/main/dhcpcd/fix-includes.patch deleted file mode 100644 index 555778b6a7..0000000000 --- a/main/dhcpcd/fix-includes.patch +++ /dev/null @@ -1,59 +0,0 @@ -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> - - #include <netinet/in.h> --#ifdef __linux__ --# define _LINUX_IN6_H --# include <linux/ipv6.h> --#endif - - #include <ctype.h> - #include <errno.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 <time.h> -+#include <fcntl.h> - - #include "config.h" - #include "arp.h" -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> - --#ifdef __linux__ --# define _LINUX_IN6_H --# include <linux/ipv6.h> --#endif -- - #include <errno.h> - #include <fcntl.h> - #include <stddef.h> diff --git a/main/dhcpcd/u_char.patch b/main/dhcpcd/u_char.patch new file mode 100644 index 0000000000..131ee5a29f --- /dev/null +++ b/main/dhcpcd/u_char.patch @@ -0,0 +1,11 @@ +--- ./compat/svis.c.orig ++++ ./compat/svis.c +@@ -71,7 +71,7 @@ + #undef BELL + #define BELL '\a' + +-#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') ++#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') + #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') + + /* |