ipadm (4.3+1) unstable; urgency=medium

  * New upstream snapshot
  * Refreshed patches
  * Use dh_smf
  * Added filesystem/root dependency to network/ip-interface-management
    (ipmgmtd-depends-on-rootfs.patch)

7 files changed, 68 insertions, 34 deletions

diff --git a/ipadm/debian/changelog b/ipadm/debian/changelog
index 7793a51..6a0fc49 100644
--- a/ipadm/debian/changelog
+++ b/ipadm/debian/changelog
@@ -1,3 +1,13 @@
+ipadm (4.3+1) unstable; urgency=medium
+
+  * New upstream snapshot
+  * Refreshed patches
+  * Use dh_smf
+  * Added filesystem/root dependency to network/ip-interface-management
+    (ipmgmtd-depends-on-rootfs.patch)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 17 Jun 2014 19:33:25 +0400
+
 ipadm (2.10-3) unstable; urgency=low
 
   * Fixed segfault in ipmgmtd on amd64 due to strcmp()
diff --git a/ipadm/debian/control b/ipadm/debian/control
index f79def1..af4fee0 100644
--- a/ipadm/debian/control
+++ b/ipadm/debian/control
@@ -4,8 +4,9 @@ Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
+ dh-smf,
  gcc-multilib [illumos-amd64],
- illumos-source-2.10,
+ illumos-source-4.3,
  libdhcpagent1-dev , lib32dhcpagent1-dev [illumos-amd64] , 
  libdladm1-dev     , lib32dladm1-dev [illumos-amd64]     , 
  libdlpi1-dev      , lib32dlpi1-dev [illumos-amd64]      , 
diff --git a/ipadm/debian/ipadm.postinst b/ipadm/debian/ipadm.postinst
index 499c3c2..c28c503 100644
--- a/ipadm/debian/ipadm.postinst
+++ b/ipadm/debian/ipadm.postinst
@@ -25,5 +25,7 @@ if [ "$1" = configure ]; then
     configure
 fi
 
+#DEBHELPER#
+
 exit 0
 
diff --git a/ipadm/debian/patches/ipmgmtd-depends-on-rootfs.patch b/ipadm/debian/patches/ipmgmtd-depends-on-rootfs.patch
new file mode 100644
index 0000000..ad5cbec
--- /dev/null
+++ b/ipadm/debian/patches/ipmgmtd-depends-on-rootfs.patch
@@ -0,0 +1,19 @@
+Index: ipadm/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml
+===================================================================
+--- ipadm.orig/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml	2014-03-01 16:17:50.000000000 +0400
++++ ipadm/usr/src/cmd/cmd-inet/lib/ipmgmtd/network-ipmgmt.xml	2014-06-17 19:32:00.511609718 +0400
+@@ -40,6 +40,14 @@
+ 
+ 	<single_instance />
+ 
++	<dependency
++		name='rootfs'
++		grouping='require_all'
++		restart_on='none'
++		type='service'>
++		<service_fmri value='svc:/system/filesystem/root' />
++	</dependency>
++
+ 	<dependent name='ipmgmt-loopback'
+ 		grouping='require_all'
+ 		restart_on='none'>
diff --git a/ipadm/debian/patches/libipadm-pointers.patch b/ipadm/debian/patches/libipadm-pointers.patch
index 9ef9389..aae44d9 100644
--- a/ipadm/debian/patches/libipadm-pointers.patch
+++ b/ipadm/debian/patches/libipadm-pointers.patch
@@ -1,9 +1,9 @@
 Description: use size_t to fix 64-bit compilation
 Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
 ===================================================================
---- ipadm.orig/usr/src/lib/libipadm/common/ipadm_prop.c	2012-10-08 00:25:39.000000000 +0000
-+++ ipadm/usr/src/lib/libipadm/common/ipadm_prop.c	2013-03-08 21:31:01.610678671 +0000
-@@ -365,7 +365,7 @@
+--- ipadm.orig/usr/src/lib/libipadm/common/ipadm_prop.c	2014-06-17 11:28:36.601771053 +0400
++++ ipadm/usr/src/lib/libipadm/common/ipadm_prop.c	2014-06-17 11:28:43.551784467 +0400
+@@ -382,7 +382,7 @@
  	/* to reset MTU first retrieve the default MTU and then set it */
  	if (flags & IPADM_OPT_DEFAULT) {
  		ipadm_status_t	status;
@@ -12,7 +12,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  
  		status = i_ipadm_get_prop(iph, arg, pdp, val, &size,
  		    proto, MOD_PROP_DEFAULT);
-@@ -522,7 +522,7 @@
+@@ -539,7 +539,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_hostmodel(ipadm_handle_t iph, const void *arg,
@@ -21,7 +21,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	ip_hostmodel_t hostmodel;
-@@ -739,11 +739,12 @@
+@@ -756,11 +756,12 @@
  /* ARGSUSED */
  ipadm_status_t
  i_ipadm_get_ecnsack(ipadm_handle_t iph, const void *arg,
@@ -36,7 +36,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  
  	switch (valtype) {
  	case MOD_PROP_POSSIBLE:
-@@ -798,7 +799,7 @@
+@@ -815,7 +816,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_forwarding(ipadm_handle_t iph, const void *arg,
@@ -45,7 +45,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	const char	*ifname = arg;
-@@ -836,7 +837,7 @@
+@@ -853,7 +854,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_mtu(ipadm_handle_t iph, const void *arg,
@@ -54,7 +54,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	struct lifreq	lifr;
-@@ -875,7 +876,7 @@
+@@ -892,7 +893,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_metric(ipadm_handle_t iph, const void *arg,
@@ -63,7 +63,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	struct lifreq	lifr;
-@@ -915,7 +916,7 @@
+@@ -932,7 +933,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_usesrc(ipadm_handle_t iph, const void *arg,
@@ -72,7 +72,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	struct lifreq	lifr;
-@@ -961,7 +962,7 @@
+@@ -978,7 +979,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_ifprop_flags(ipadm_handle_t iph, const void *arg,
@@ -81,7 +81,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	uint64_t 	intf_flags;
-@@ -1022,7 +1023,7 @@
+@@ -1039,7 +1040,7 @@
  }
  
  static void
@@ -90,7 +90,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  {
  	uint_t perm = atoi(buf);
  
-@@ -1034,7 +1035,7 @@
+@@ -1051,7 +1052,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_prop(ipadm_handle_t iph, const void *arg,
@@ -99,7 +99,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	ipadm_status_t	status = IPADM_SUCCESS;
-@@ -1142,7 +1143,7 @@
+@@ -1159,7 +1160,7 @@
   */
  static ipadm_status_t
  i_ipadm_getprop_common(ipadm_handle_t iph, const char *ifname,
@@ -108,7 +108,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
      uint_t valtype)
  {
  	ipadm_status_t		status = IPADM_SUCCESS;
-@@ -1223,7 +1224,7 @@
+@@ -1240,7 +1241,7 @@
   */
  ipadm_status_t
  ipadm_get_prop(ipadm_handle_t iph, const char *pname, char *buf,
@@ -117,7 +117,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  {
  	/*
  	 * validate the arguments of the function.
-@@ -1247,7 +1248,7 @@
+@@ -1264,7 +1265,7 @@
   */
  ipadm_status_t
  ipadm_get_ifprop(ipadm_handle_t iph, const char *ifname, const char *pname,
@@ -126,7 +126,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  {
  	/* validate the arguments of the function. */
  	if (iph == NULL || pname == NULL || buf == NULL ||
-@@ -1599,7 +1600,7 @@
+@@ -1616,7 +1617,7 @@
  /* ARGSUSED */
  ipadm_status_t
  i_ipadm_get_onoff(ipadm_handle_t iph, const void *arg, ipadm_prop_desc_t *dp,
@@ -135,7 +135,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  {
  	(void) snprintf(buf, *bufsize, "%s,%s", IPADM_ONSTR, IPADM_OFFSTR);
  	return (IPADM_SUCCESS);
-@@ -1610,7 +1611,7 @@
+@@ -1627,7 +1628,7 @@
   */
  ipadm_status_t
  i_ipadm_get_persist_propval(ipadm_handle_t iph, ipadm_prop_desc_t *pdp,
@@ -146,8 +146,8 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_prop.c
  	ipmgmt_getprop_rval_t	rval, *rvalp;
 Index: ipadm/usr/src/lib/libipadm/common/libipadm.h
 ===================================================================
---- ipadm.orig/usr/src/lib/libipadm/common/libipadm.h	2012-10-08 00:25:40.000000000 +0000
-+++ ipadm/usr/src/lib/libipadm/common/libipadm.h	2013-03-08 21:31:01.613585145 +0000
+--- ipadm.orig/usr/src/lib/libipadm/common/libipadm.h	2014-06-17 11:28:36.601711158 +0400
++++ ipadm/usr/src/lib/libipadm/common/libipadm.h	2014-06-17 11:28:43.553198692 +0400
 @@ -330,19 +330,19 @@
  extern ipadm_status_t	ipadm_set_ifprop(ipadm_handle_t, const char *,
  			    const char *, const char *, uint_t, uint_t);
@@ -173,9 +173,9 @@ Index: ipadm/usr/src/lib/libipadm/common/libipadm.h
   * miscellaneous helper functions.
 Index: ipadm/usr/src/lib/libipadm/common/libipadm_impl.h
 ===================================================================
---- ipadm.orig/usr/src/lib/libipadm/common/libipadm_impl.h	2012-10-08 00:25:40.000000000 +0000
-+++ ipadm/usr/src/lib/libipadm/common/libipadm_impl.h	2013-03-08 21:31:01.615909606 +0000
-@@ -114,7 +114,7 @@
+--- ipadm.orig/usr/src/lib/libipadm/common/libipadm_impl.h	2014-06-17 11:28:36.601841295 +0400
++++ ipadm/usr/src/lib/libipadm/common/libipadm_impl.h	2014-06-17 11:28:43.554623149 +0400
+@@ -115,7 +115,7 @@
  
  /* property get() callback */
  typedef ipadm_status_t	ipadm_pd_getf_t(ipadm_handle_t, const void *,
@@ -184,7 +184,7 @@ Index: ipadm/usr/src/lib/libipadm/common/libipadm_impl.h
  
  struct ipadm_prop_desc {
  	char		*ipd_name;	/* property name */
-@@ -177,7 +177,7 @@
+@@ -179,7 +179,7 @@
  			    ipadm_prop_desc_t *, const char *, const void *,
  			    uint_t);
  extern ipadm_status_t	i_ipadm_get_persist_propval(ipadm_handle_t,
@@ -195,9 +195,9 @@ Index: ipadm/usr/src/lib/libipadm/common/libipadm_impl.h
  /* ipadm_addr.c */
 Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
 ===================================================================
---- ipadm.orig/usr/src/lib/libipadm/common/ipadm_addr.c	2012-10-08 00:25:39.000000000 +0000
-+++ ipadm/usr/src/lib/libipadm/common/ipadm_addr.c	2013-03-08 21:39:05.164509858 +0000
-@@ -143,7 +143,7 @@
+--- ipadm.orig/usr/src/lib/libipadm/common/ipadm_addr.c	2014-06-17 11:28:36.601813121 +0400
++++ ipadm/usr/src/lib/libipadm/common/ipadm_addr.c	2014-06-17 11:28:43.560592586 +0400
+@@ -144,7 +144,7 @@
   * set() and/or get() callback functions.
   */
  static ipadm_status_t
@@ -206,7 +206,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
  {
  	uint_t	perm;
  	size_t	nbytes;
-@@ -1046,7 +1046,7 @@
+@@ -1047,7 +1047,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_broadcast(ipadm_handle_t iph, const void *arg,
@@ -215,7 +215,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
      uint_t valtype)
  {
  	struct sockaddr_in	*sin;
-@@ -1075,7 +1075,7 @@
+@@ -1076,7 +1076,7 @@
  		uint_t			plen;
  		in_addr_t		addr, maddr;
  		char			val[MAXPROPVALLEN];
@@ -224,7 +224,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
  		ipadm_status_t		status;
  		int			err;
  		struct sockaddr_in	*sin;
-@@ -1163,7 +1163,7 @@
+@@ -1164,7 +1164,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_prefixlen(ipadm_handle_t iph, const void *arg,
@@ -233,7 +233,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
      uint_t valtype)
  {
  	struct lifreq	lifr;
-@@ -1256,7 +1256,7 @@
+@@ -1257,7 +1257,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_addr_flag(ipadm_handle_t iph, const void *arg,
@@ -242,7 +242,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
      uint_t valtype)
  {
  	boolean_t	on = B_FALSE;
-@@ -1315,7 +1315,7 @@
+@@ -1316,7 +1316,7 @@
  /* ARGSUSED */
  static ipadm_status_t
  i_ipadm_get_zone(ipadm_handle_t iph, const void *arg,
@@ -251,7 +251,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
      uint_t valtype)
  {
  	struct lifreq	lifr;
-@@ -1388,7 +1388,7 @@
+@@ -1391,7 +1391,7 @@
   */
  ipadm_status_t
  ipadm_get_addrprop(ipadm_handle_t iph, const char *pname, char *buf,
@@ -260,7 +260,7 @@ Index: ipadm/usr/src/lib/libipadm/common/ipadm_addr.c
  {
  	struct ipadm_addrobj_s	ipaddr;
  	ipadm_status_t		status = IPADM_SUCCESS;
-@@ -1468,7 +1468,7 @@
+@@ -1471,7 +1471,7 @@
  	sa_family_t		af;
  	ipadm_prop_desc_t	*pdp = NULL;
  	char			defbuf[MAXPROPVALLEN];
diff --git a/ipadm/debian/patches/series b/ipadm/debian/patches/series
index 0e8e480..f57af6d 100644
--- a/ipadm/debian/patches/series
+++ b/ipadm/debian/patches/series
@@ -5,3 +5,4 @@ ipadm-no-libxnet.patch
 ipmgmtd-install.patch
 illumos-815-Need-ipadm-1M-manual-page.patch
 ipmgmtd-segfault.patch
+ipmgmtd-depends-on-rootfs.patch
diff --git a/ipadm/debian/rules b/ipadm/debian/rules
index 2a88c4f..d1857dc 100755
--- a/ipadm/debian/rules
+++ b/ipadm/debian/rules
@@ -94,6 +94,7 @@ binary-stamp: install-stamp
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -- -c4
+	dh_smf
 	dh_installdeb
 	dh_shlibdeps
 	dh_strip -pipadm --dbg-package=ipadm-dbg