Subject: [alpine-aports] [PATCH] main/dhcpcd-dbus: cleanups in patches, add dbus as dependency

From: Valery Kartel <[email-masked]>
Date: Tue, 2 Feb 2016 17:30:19 +0200

---
 main/dhcpcd-dbus/APKBUILD           | 23 +++++++++--------------
 main/dhcpcd-dbus/fix-dhcpcd.patch   | 22 ++++++++++++++++++++++
 main/dhcpcd-dbus/fix-includes.patch | 22 ----------------------
 main/dhcpcd-dbus/strverscmp.patch   | 21 ---------------------
 4 files changed, 31 insertions(+), 57 deletions(-)
 create mode 100644 main/dhcpcd-dbus/fix-dhcpcd.patch
 delete mode 100644 main/dhcpcd-dbus/fix-includes.patch
 delete mode 100644 main/dhcpcd-dbus/strverscmp.patch

diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index 0ad5238..eed0ea0 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -2,22 +2,19 @@
 # Contributor: Valery Kartel <[email-masked]>
 pkgname=dhcpcd-dbus
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="DBUS binding to dhcpcd"
 url="http://roy.marples.name/projects/dhcpcd-dbus"
 arch="all"
 license="BSD"
-depends=""
+depends="dbus"
 makedepends="dbus-dev"
 install=
 subpackages=
-source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2
-	fix-includes.patch
-	strverscmp.patch
-	"
-
-_builddir="$srcdir/$pkgname-$pkgver"
+source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
+	fix-dhcpcd.patch"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
@@ -33,6 +30,7 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--rundir=/run \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/$pkgname \
 		|| return 1
@@ -45,11 +43,8 @@ package() {
 }
 
 md5sums="3e0762be2f2336dceebaa319f388c8dd  dhcpcd-dbus-0.6.1.tar.bz2
-7b418d583fc1ddb203fbcdcec3b94931  fix-includes.patch
-142317002d3bb1044fd9cb0ee4353482  strverscmp.patch"
+75fa69816c4e4c70ac3215096dd02d6c  fix-dhcpcd.patch"
 sha256sums="cdb03f21fa2d37be8804d3aba80012ad0735131e263f05bc44c36f5f13d70a06  dhcpcd-dbus-0.6.1.tar.bz2
-f81fea89c922c25cc97729beceea59d8166331c79c1b47534c679a3567f8247f  fix-includes.patch
-0c604b09423d7013e183b0d4ba0a7871a6d3d4b83fc30910bf7955372cdf650c  strverscmp.patch"
+51c693f0f4d31627cb2001c4d2b644ad57de2cdbd52d8d6d30f93f27537787bd  fix-dhcpcd.patch"
 sha512sums="ec110654115afedead094c6766877e7b3f5facbfec6778590d8aa3ceef777b183754fc077a10cf5c16b39c03e42d5948abd7c21e1d8a2d7fa376ec229bd75e6a  dhcpcd-dbus-0.6.1.tar.bz2
-88fbce9783a61f319a7464ab15ae8689126b04759835d23ca155f00103117b1d155c7d845781420440f740632807e0d34be8b2e0cfd18950df853d8a1a6ad882  fix-includes.patch
-f394c9ca2490f4450585966c7aad94bb9378341af15636ad2272996a671e44a312c543ff749a6afc960c14dc42de6ebfeb21122534577149ce0594f2338ab410  strverscmp.patch"
+89667704e357efc904ad16e2485bc35e7d99b1c978407db6363a207ade5d0bc68f7165d7a2a352bbba4e53812b3584c23fe6e5b0f981aa6333ec4eae27748d73  fix-dhcpcd.patch"
diff --git a/main/dhcpcd-dbus/fix-dhcpcd.patch b/main/dhcpcd-dbus/fix-dhcpcd.patch
new file mode 100644
index 0000000..13e4f51
--- /dev/null
+++ b/main/dhcpcd-dbus/fix-dhcpcd.patch
@@ -0,0 +1,22 @@
+--- a/dhcpcd.c
++++ b/dhcpcd.c
+@@ -664,7 +664,7 @@
+ 	return list;
+ }
+ 
+-#ifndef __GLIBC__
++#ifndef _GNU_SOURCE
+ /* Good enough for our needs */
+ static int
+ strverscmp(const char *s1, const char *s2)
+--- a/dhcpcd.h
++++ b/dhcpcd.h
+@@ -28,6 +28,8 @@
+ #ifndef DHCPCD_H
+ #define DHCPCD_H
+ 
++#include <sys/types.h>
++
+ extern char *dhcpcd_version;
+ extern const char *dhcpcd_status;
+ 
diff --git a/main/dhcpcd-dbus/fix-includes.patch b/main/dhcpcd-dbus/fix-includes.patch
deleted file mode 100644
index 3449261..0000000
--- a/main/dhcpcd-dbus/fix-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dhcpcd-dbus-0.6.0.orig/dhcpcd.h
-+++ dhcpcd-dbus-0.6.0/dhcpcd.h
-@@ -28,6 +28,8 @@
- #ifndef DHCPCD_H
- #define DHCPCD_H
- 
-+#include <sys/types.h>
-+
- extern char *dhcpcd_version;
- extern const char *dhcpcd_status;
- 
---- dhcpcd-dbus-0.6.0.orig/eloop.h
-+++ dhcpcd-dbus-0.6.0/eloop.h
-@@ -28,7 +28,7 @@
- #ifndef ELOOP_H
- #define ELOOP_H
- 
--#include <time.h>
-+#include <sys/time.h>
- 
- int add_event(int, void (*)(void *), void *);
- int add_event_flags(int, int, void (*)(int, void *), void *);
diff --git a/main/dhcpcd-dbus/strverscmp.patch b/main/dhcpcd-dbus/strverscmp.patch
deleted file mode 100644
index 70507b7..0000000
--- a/main/dhcpcd-dbus/strverscmp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- old/dhcpcd.c
-+++ new/dhcpcd.c
-@@ -664,8 +664,7 @@
- 	return list;
- }
- 
--#ifndef __GLIBC__
--/* Good enough for our needs */
-+/*
- static int
- strverscmp(const char *s1, const char *s2)
- {
-@@ -687,7 +686,7 @@
- 		return r;
- 	return s1part - s2part;
- }
--#endif
-+*/
- 
- void
- dhcpcd_init(_unused void *data)
-- 
2.7.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---