chkconfig: Avoid using caddr_t

(From OE-Core rev: 52658750ffb40386b7677de0330c1ab147e8679b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2016-01-08 09:01:33 +00:00 committed by Richard Purdie
parent b2aca09363
commit f294813dfe
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,33 @@
caddr_t is a legacy BSD type which was rejected by the POSIX standard.
Use void * instead.
sys/unitstd.h is not needed and moreover its not available on all C library
implementations e.g. musl
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: chkconfig-1.3.58/alternatives.c
===================================================================
--- chkconfig-1.3.58.orig/alternatives.c
+++ chkconfig-1.3.58/alternatives.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/unistd.h>
#include <unistd.h>
#define FLAGS_TEST (1 << 0)
Index: chkconfig-1.3.58/leveldb.c
===================================================================
--- chkconfig-1.3.58.orig/leveldb.c
+++ chkconfig-1.3.58/leveldb.c
@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name
fstat(fd, &sb);
bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
- if (bufstart == ((caddr_t) -1)) {
+ if (bufstart == ((void*) -1)) {
close(fd);
return -1;
}

View File

@ -16,7 +16,9 @@ PROVIDES += "virtual/update-alternatives"
PR = "r7"
SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2 \
file://replace_caddr_t.patch \
"
SRC_URI[md5sum] = "c2039ca67f2749fe0c06ef7c6f8ee246"
SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f18271211de68"