~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-aports] [PATCH v2] main/dhcpcd-dbus: main/dhcpcd-dbus: upgrade to 0.6.1

Details
Message ID
<1454067581-22412-1-git-send-email-valery.kartel@gmail.com>
Sender timestamp
1454067581
DKIM signature
missing
Download raw message
Patch: +36 -9
---
 main/dhcpcd-dbus/APKBUILD         | 24 +++++++++++++++---------
 main/dhcpcd-dbus/strverscmp.patch | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 main/dhcpcd-dbus/strverscmp.patch

diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index da90f90..e2bb496 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -1,7 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
pkgname=dhcpcd-dbus
pkgver=0.6.0
pkgrel=1
pkgver=0.6.1
pkgrel=0
pkgdesc="DBUS binding to dhcpcd"
url="http://roy.marples.name/projects/dhcpcd-dbus"
arch="all"
@@ -11,7 +12,9 @@ makedepends="dbus-dev"
install=
subpackages=
source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2
	fix-includes.patch"
	fix-includes.patch
	strverscmp.patch
	"

_builddir="$srcdir/$pkgname-$pkgver"

@@ -41,9 +44,12 @@ package() {
	make DESTDIR="$pkgdir" install
}

md5sums="4fd43b0f0ca7c0e65f95a0b2846b37b7  dhcpcd-dbus-0.6.0.tar.bz2
7b418d583fc1ddb203fbcdcec3b94931  fix-includes.patch"
sha256sums="b14190fb7dcd0642fa747fd286462e80ba4d1f44ba32a761af979c2101b6fb81  dhcpcd-dbus-0.6.0.tar.bz2
f81fea89c922c25cc97729beceea59d8166331c79c1b47534c679a3567f8247f  fix-includes.patch"
sha512sums="a50b5cd01ccd94048a34f08b507bfeb92113e2ff45714fef64c16a8317806876cea1737fbde0eb8ebe1ffd0e41bd33fd94b5448fd7cb2f10043fcbbafbedc964  dhcpcd-dbus-0.6.0.tar.bz2
88fbce9783a61f319a7464ab15ae8689126b04759835d23ca155f00103117b1d155c7d845781420440f740632807e0d34be8b2e0cfd18950df853d8a1a6ad882  fix-includes.patch"
md5sums="3e0762be2f2336dceebaa319f388c8dd  dhcpcd-dbus-0.6.1.tar.bz2
7b418d583fc1ddb203fbcdcec3b94931  fix-includes.patch
142317002d3bb1044fd9cb0ee4353482  strverscmp.patch"
sha256sums="cdb03f21fa2d37be8804d3aba80012ad0735131e263f05bc44c36f5f13d70a06  dhcpcd-dbus-0.6.1.tar.bz2
f81fea89c922c25cc97729beceea59d8166331c79c1b47534c679a3567f8247f  fix-includes.patch
0c604b09423d7013e183b0d4ba0a7871a6d3d4b83fc30910bf7955372cdf650c  strverscmp.patch"
sha512sums="ec110654115afedead094c6766877e7b3f5facbfec6778590d8aa3ceef777b183754fc077a10cf5c16b39c03e42d5948abd7c21e1d8a2d7fa376ec229bd75e6a  dhcpcd-dbus-0.6.1.tar.bz2
88fbce9783a61f319a7464ab15ae8689126b04759835d23ca155f00103117b1d155c7d845781420440f740632807e0d34be8b2e0cfd18950df853d8a1a6ad882  fix-includes.patch
f394c9ca2490f4450585966c7aad94bb9378341af15636ad2272996a671e44a312c543ff749a6afc960c14dc42de6ebfeb21122534577149ce0594f2338ab410  strverscmp.patch"
diff --git a/main/dhcpcd-dbus/strverscmp.patch b/main/dhcpcd-dbus/strverscmp.patch
new file mode 100644
index 0000000..70507b7
--- /dev/null
+++ b/main/dhcpcd-dbus/strverscmp.patch
@@ -0,0 +1,21 @@
--- 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:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20160202154240.3ce73b7d@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1454067581-22412-1-git-send-email-valery.kartel@gmail.com> (view parent)
Sender timestamp
1454424160
DKIM signature
missing
Download raw message
On Fri, 29 Jan 2016 13:39:41 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>  main/dhcpcd-dbus/APKBUILD         | 24 +++++++++++++++---------
>  main/dhcpcd-dbus/strverscmp.patch | 21 +++++++++++++++++++++
>  2 files changed, 36 insertions(+), 9 deletions(-)
>  create mode 100644 main/dhcpcd-dbus/strverscmp.patch
> 
...

> +++ b/main/dhcpcd-dbus/strverscmp.patch
> @@ -0,0 +1,21 @@
> +--- 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
> ++*/

This does not look like the correct fix. What does upstream say about
this?

-nc

> + 
> + void
> + dhcpcd_init(_unused void *data)

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)