summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/chkconfig
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/chkconfig')
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch33
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb4
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
new file mode 100644
index 0000000000..96d1938791
--- /dev/null
+++ b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
@@ -0,0 +1,33 @@
1caddr_t is a legacy BSD type which was rejected by the POSIX standard.
2Use void * instead.
3
4sys/unitstd.h is not needed and moreover its not available on all C library
5implementations e.g. musl
6
7Upstream-Status: Pending
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Index: chkconfig-1.3.58/alternatives.c
10===================================================================
11--- chkconfig-1.3.58.orig/alternatives.c
12+++ chkconfig-1.3.58/alternatives.c
13@@ -22,7 +22,6 @@
14 #include <stdio.h>
15 #include <string.h>
16 #include <sys/stat.h>
17-#include <sys/unistd.h>
18 #include <unistd.h>
19
20 #define FLAGS_TEST (1 << 0)
21Index: chkconfig-1.3.58/leveldb.c
22===================================================================
23--- chkconfig-1.3.58.orig/leveldb.c
24+++ chkconfig-1.3.58/leveldb.c
25@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name
26 fstat(fd, &sb);
27
28 bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
29- if (bufstart == ((caddr_t) -1)) {
30+ if (bufstart == ((void*) -1)) {
31 close(fd);
32 return -1;
33 }
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 488847ac40..e8390264ce 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -16,7 +16,9 @@ PROVIDES += "virtual/update-alternatives"
16 16
17PR = "r7" 17PR = "r7"
18 18
19SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2" 19SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2 \
20 file://replace_caddr_t.patch \
21 "
20 22
21SRC_URI[md5sum] = "c2039ca67f2749fe0c06ef7c6f8ee246" 23SRC_URI[md5sum] = "c2039ca67f2749fe0c06ef7c6f8ee246"
22SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f18271211de68" 24SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f18271211de68"