dhcpagent (2.10-2) unstable; urgency=low

* Renamed source package to dhcpagent
  * Build dhcpagent as well
  * Fix package description

dhcpagent/debian/changelog

@@ -0,0 +1,13 @@
+dhcpagent (2.10-2) unstable; urgency=low
+
+  * Renamed source package to dhcpagent
+  * Build dhcpagent as well
+  * Fix package description
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 23 Feb 2013 21:22:20 +0000
+
+libdhcpagent (2.10-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 23 Feb 2013 17:37:49 +0000

dhcpagent/debian/control

@@ -1,4 +1,4 @@
-Source: libdhcpagent
+Source: dhcpagent
 Section: libs
 Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
@@ -6,6 +6,9 @@ Build-Depends:
  dh-illumos,
  gcc-multilib,
  illumos-source-2.10,
+ libdevinfo-dev,
+ libnvpair-dev,
+ libinetutil1-dev,
  libcontract-dev , lib32contract-dev [illumos-amd64] , 
  libdhcputil-dev , lib32dhcputil-dev [illumos-amd64] , 
  libdlpi1-dev    , lib32dlpi1-dev [illumos-amd64]    , 
@@ -15,13 +18,33 @@ Build-Depends:
 Standards-Version: 3.9.3
 Homepage: https://www.illumos.org
 
+Package: dhcpagent
+Section: admin
+Priority: important
+Architecture: illumos-any
+Replaces: illumos-net-tools (<< 2.10)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Dynamic Host Configuration Protocol (DHCP) client daemon
+ This package contains dhcpagent binary.
+ .
+ dhcpagent implements the client half of the Dynamic Host Configuration
+ Protocol (DHCP).
+ .
+ The dhcpagent daemon obtains configuration parameters for the client (local)
+ machine's network interfaces from a DHCP server. These parameters may include
+ a lease on an IP address, which gives the client machine use of the address
+ for the period of the lease, which may be infinite. If the client wishes to
+ use the IP address for a period longer than the lease, it must negotiate
+ an extension using DHCP. For this reason, dhcpagent must run as a daemon,
+ terminating only when the client machine powers down.
+
 Package: libdhcpagent1
 Section: libs
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: illumos-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: library to handle DHCP options
+Description: DHCP agent communication library
  This package contains libdhcpagent shared library.
  .
  The libdhcpagent library is used to perform interprocess communication with
@@ -34,7 +57,7 @@ Section: libdevel
 Architecture: illumos-any
 Provides: libdhcpagent-dev
 Depends: libdhcpagent1 (= ${binary:Version}), ${misc:Depends}, libdhcputil-dev
-Description: library to handle DHCP options (development files)
+Description: DHCP agent communication library (development files)
  This package contains the header files and symlinks needed
  to compile applications that use libdhcpagent.
  .
@@ -48,7 +71,7 @@ Section: libs
 Priority: standard
 Architecture: illumos-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: library to handle DHCP options (32 bit)
+Description: DHCP agent communication library (32 bit)
  This package contains libdhcpagent shared library.
  .
  The libdhcpagent library is used to perform interprocess communication with
@@ -65,7 +88,7 @@ Architecture: illumos-amd64
 Provides: lib32dhcpagent-dev
 Depends: lib32dhcpagent1 (= ${binary:Version}), libdhcpagent1-dev (= ${binary:Version}),
  ${misc:Depends}
-Description: library to handle DHCP options (32-bit development files)
+Description: DHCP agent communication library (32-bit development files)
  This package contains files needed to compile
  32-bit applications that use libdhcpagent.
  .

dhcpagent/debian/dhcpagent.dirs

@@ -0,0 +1 @@
+/etc/dhcp

dhcpagent/debian/dhcpagent.install

@@ -0,0 +1,2 @@
+sbin/dhcpagent
+etc/default/dhcpagent

dhcpagent/debian/dhcpagent.manpages

@@ -0,0 +1 @@
+usr/src/man/man1m/dhcpagent.1m

dhcpagent/debian/patches/dhcpagent.patch

@@ -0,0 +1,61 @@
+Index: dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/agent.c
+===================================================================
+--- dhcpagent.orig/usr/src/cmd/cmd-inet/sbin/dhcpagent/agent.c	2012-10-08 00:25:23.000000000 +0000
++++ dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/agent.c	2013-02-23 21:04:35.913024904 +0000
+@@ -420,7 +420,7 @@
+ 	}
+ 
+ 	if (iu_register_event(eh, client_fd, POLLIN, ipc_event,
+-	    (void *)is_priv) == -1) {
++	    (void *)(intptr_t)is_priv) == -1) {
+ 		dhcpmsg(MSG_ERROR, "accept_event: cannot register ipc socket "
+ 		    "for callback");
+ 	}
+@@ -443,7 +443,8 @@
+ {
+ 	ipc_action_t		ia, *iap;
+ 	dhcp_smach_t		*dsmp;
+-	int			error, is_priv = (int)arg;
++	int			error;
++    int is_priv = (intptr_t)arg;
+ 	const char		*ifname;
+ 	boolean_t		isv6;
+ 	boolean_t		dsm_created = B_FALSE;
+Index: dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c
+===================================================================
+--- dhcpagent.orig/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c	2012-10-08 00:25:23.000000000 +0000
++++ dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c	2013-02-23 21:12:39.567464411 +0000
+@@ -983,7 +983,7 @@
+ 	boolean_t	isv6 = (fd == v6_sock_fd);
+ 	struct sockaddr_in sin;
+ 	const char	*reason;
+-	size_t		sinlen = sizeof (sin);
++	socklen_t	sinlen = sizeof (sin);
+ 	int		sock;
+ 
+ 	plp = recv_pkt(fd, get_max_mtu(isv6), isv6);
+Index: dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/states.c
+===================================================================
+--- dhcpagent.orig/usr/src/cmd/cmd-inet/sbin/dhcpagent/states.c	2012-10-08 00:25:23.000000000 +0000
++++ dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/states.c	2013-02-23 21:13:08.772559541 +0000
+@@ -30,6 +30,7 @@
+ #include <search.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+Index: dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
+===================================================================
+--- dhcpagent.orig/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	2012-10-08 00:25:23.000000000 +0000
++++ dhcpagent/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile	2013-02-23 21:14:27.207775057 +0000
+@@ -45,7 +45,7 @@
+ #
+ 
+ CPPFLAGS  += -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+-LDLIBS    += -lxnet -lnvpair -ldhcpagent -ldhcputil -linetutil -ldevinfo -ldlpi
++LDLIBS    += -lsocket -lnsl -lnvpair -ldhcpagent -ldhcputil -linetutil -ldevinfo -ldlpi
+ 
+ # Disable warnings that affect all XPG applications.
+ LINTFLAGS += -erroff=E_INCONS_ARG_DECL2 -erroff=E_INCONS_VAL_TYPE_DECL2

dhcpagent/debian/patches/series

@@ -1,2 +1,3 @@
 libdhcpagent-time.h.patch
 libdhcpagent-add-amd64.patch
+dhcpagent.patch

dhcpagent/debian/rules

@@ -11,12 +11,15 @@ libdhcpagent \
 # Order is important:
 libs := $(libs_headers) \
 
+cmd := cmd-inet/sbin/dhcpagent
 
 unpack: unpack-stamp
 unpack-stamp:
 	dh_testdir
 	dh_illumos_gate --build \
-		$(libs:%=usr/src/lib/%)
+		$(libs:%=usr/src/lib/%) \
+		$(cmd:%=usr/src/cmd/%) \
+		usr/src/man/man1m/dhcpagent.1m
 
 	# Not used and buggy:
 	echo > usr/src/Makefile.msg.targ
@@ -35,6 +38,8 @@ unpatch:
 
 dirs-stamp:
 	. usr/env.sh; mkdir -p \
+		debian/tmp/etc/default \
+		debian/tmp/sbin \
 		debian/tmp/usr/include \
 		debian/tmp$$DEB_LIBDIR_32 \
 		debian/tmp$$DEB_LIBDIR_64 \
@@ -65,6 +70,7 @@ install-stamp: build-stamp
 build build-arch build-indep: build-stamp
 build-stamp: patch-stamp dirs-stamp headers-stamp
 	dh_illumos_make $(libs:%=usr/src/lib/%)
+	dh_illumos_make --native $(cmd:%=usr/src/cmd/%)
 	touch $@
 
 binary binary-arch binary-indep: binary-stamp

libdhcpagent/debian/changelog

@@ -1,5 +0,0 @@
-libdhcpagent (2.10-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Igor Pashev <pashev.igor@gmail.com>  Sat, 23 Feb 2013 17:37:49 +0000