summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-24 12:58:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-24 12:58:11 +0000
commit2d21e431c0ea156a0fb7cb53612ee1baa1142e69 (patch)
tree84d53e6faa37009b0e7c862e7ef7a756fc78bbfe /main
parent1b8c60badd924a55980c3d6f296a402e8e64155f (diff)
downloadaports-2d21e431c0ea156a0fb7cb53612ee1baa1142e69.tar.bz2
aports-2d21e431c0ea156a0fb7cb53612ee1baa1142e69.tar.xz
main/dhcpcd: make it work with busybox logger
busybox logger does not implement -i so we simply drop that option.
Diffstat (limited to 'main')
-rw-r--r--main/dhcpcd/APKBUILD6
-rw-r--r--main/dhcpcd/busybox-logger.patch11
2 files changed, 16 insertions, 1 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index e4ae94f48..bc6803943 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
pkgver=6.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="RFC2131 compliant DHCP client"
url="http://roy.marples.name/projects/dhcpcd/"
arch="all"
@@ -13,6 +13,7 @@ install=
subpackages="$pkgname-doc"
source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
fix-includes.patch
+ busybox-logger.patch
dhcpcd.initd"
prepare() {
@@ -45,10 +46,13 @@ package() {
md5sums="214483a069b5e8b3b96371755eaa1b18 dhcpcd-6.2.1.tar.bz2
c5d3c2f281e877e83b0dba3b51136276 fix-includes.patch
+ee37c1f2b73055e6cf127fc8e581af87 busybox-logger.patch
ecbd807cf3f87d7c5b6095bf63f26894 dhcpcd.initd"
sha256sums="eaad7790c22e328616c1d47417832d7f6c8715b32d1b49aa5282d60ff91f42bf dhcpcd-6.2.1.tar.bz2
18dfb95088bafc86603d8a8df1d21d8ebd24fdddf9a7517e50744f8bd1023f95 fix-includes.patch
+a590961c9e53829a9d33ae458fc4c4b68880f5b2b972c3a78c60a947b8c56fb5 busybox-logger.patch
72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 dhcpcd.initd"
sha512sums="0b3db1011e4e427d5c781dafb20e5541da486126e27cc1f018b825c8e2c21bf911f714f0663b6ee813888a558a006b4bddbbdfd7a91a73b17b0d09c53243541d dhcpcd-6.2.1.tar.bz2
63315419049b6de0177ba355f74576bb0ba7ae12cc4db52a477c3b2d51502535666d83895eeb442f212cd89f8f9046fcad90d6a0d50a79a7027efb3fab0ee852 fix-includes.patch
+35960cc9197750890d1a8540eb920e6c0544295993044718aa5309303e29eb2c7622eee74f742861cf446d88c7b80b5ea104f3f6bcc3e9daa5be59237a962971 busybox-logger.patch
0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 dhcpcd.initd"
diff --git a/main/dhcpcd/busybox-logger.patch b/main/dhcpcd/busybox-logger.patch
new file mode 100644
index 000000000..dca78b00f
--- /dev/null
+++ b/main/dhcpcd/busybox-logger.patch
@@ -0,0 +1,11 @@
+--- ./dhcpcd-run-hooks.in.orig
++++ ./dhcpcd-run-hooks.in
+@@ -149,7 +149,7 @@
+ [ -n "$lvl" ] && shift
+ if [ -n "$*" ]; then
+ if type logger >/dev/null 2>&1; then
+- logger -t dhcpcd -p daemon."$lvl" -is "$interface: $*"
++ logger -t dhcpcd -p daemon."$lvl" -s "$interface: $*"
+ fi
+ fi
+ }