isc-dhcp: fix build

Alexander Pyhalov

2020-01-23 b843bbdabe2d9034265a289d4783316af2542495

isc-dhcp: fix build

 components/network/isc-dhcp/Makefile

@@ -28,6 +28,7 @@

COMPONENT_NAME=        isc-dhcp
COMPONENT_VERSION=    4.4.2
COMPONENT_REVISION=    1
IPS_COMPONENT_VERSION=    4.4.2.0.0
COMPONENT_FMRI=        service/network/dhcp/isc-dhcp
COMPONENT_SUMMARY=    ISC DHCP Server and Relay Agent
@@ -63,11 +64,10 @@
CONFIGURE_OPTIONS  +=    --enable-ipv4-pktinfo
CONFIGURE_OPTIONS  +=    --srcdir=$(BUILD_DIR_$(BITS))

build:        $(BUILD_64) ;\
        cd $(BUILD_DIR_64)/keama && $(MAKE)
COMPONENT_POST_BUILD_ACTION = $(MAKE) -C $(BUILD_DIR_64)/keama
COMPONENT_POST_INSTALL_ACTION = $(MAKE) -C $(BUILD_DIR_64)/keama DESTDIR=$(PROTO_DIR) install

install:    build $(INSTALL_64) $(PROTO_DIR)/dhcpd.leases ;\
        cd $(BUILD_DIR_64)/keama && $(MAKE) DESTDIR=$(PROTO_DIR) install
install:    build $(INSTALL_64) $(PROTO_DIR)/dhcpd.leases

$(PROTO_DIR)/dhcpd.leases:    $(INSTALL_64)
    $(TOUCH) $@

 components/network/isc-dhcp/patches/004-errno.patch

New file
@@ -0,0 +1,75 @@
https://gitlab.isc.org/isc-projects/dhcp/issues/83

--- dhcp-4.4.2/keama/keama.c.1    2020-01-23 11:45:09.902945953 +0000
+++ dhcp-4.4.2/keama/keama.c    2020-01-23 11:45:21.227152034 +0000
@@ -21,9 +21,9 @@
  *
  */
 
-#include <sys/errno.h>
 #include <arpa/inet.h>
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff -ur dhcp-4.4.2-1/keama/confparse.c dhcp-4.4.2/keama/confparse.c
--- dhcp-4.4.2-1/keama/confparse.c    2020-01-23 11:52:07.125812139 +0000
+++ dhcp-4.4.2/keama/confparse.c    2020-01-23 11:53:01.302995421 +0000
@@ -25,10 +25,10 @@
 
 #include "keama.h"
 
-#include <sys/errno.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <time.h>
 #include <stdlib.h>
diff -ur dhcp-4.4.2-1/keama/eval.c dhcp-4.4.2/keama/eval.c
--- dhcp-4.4.2-1/keama/eval.c    2020-01-23 11:52:07.074672343 +0000
+++ dhcp-4.4.2/keama/eval.c    2020-01-23 11:53:16.607161657 +0000
@@ -23,10 +23,10 @@
 
 #include "keama.h"
 
-#include <sys/errno.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>
diff -ur dhcp-4.4.2-1/keama/print.c dhcp-4.4.2/keama/print.c
--- dhcp-4.4.2-1/keama/print.c    2020-01-23 11:52:07.074901688 +0000
+++ dhcp-4.4.2/keama/print.c    2020-01-23 11:52:38.214309421 +0000
@@ -23,10 +23,10 @@
 
 #include "keama.h"
 
-#include <sys/errno.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>
diff -ur dhcp-4.4.2-1/keama/reduce.c dhcp-4.4.2/keama/reduce.c
--- dhcp-4.4.2-1/keama/reduce.c    2020-01-23 11:52:07.075218446 +0000
+++ dhcp-4.4.2/keama/reduce.c    2020-01-23 11:52:26.230241016 +0000
@@ -23,10 +23,10 @@
 
 #include "keama.h"
 
-#include <sys/errno.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>