16555453 proftpd build fails if LOGNAME not in environment
16940924 svc:/network/ftp:default shouldn't depend explicitly on network/physical
--- a/components/proftpd/Makefile Mon Aug 05 13:49:09 2013 -0700
+++ b/components/proftpd/Makefile Mon Aug 05 23:00:35 2013 +0200
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -58,7 +58,7 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) -I/usr/include/kerberosv5 -DHAVE_KRB5_H=1 -DKRB5_DLLIMP= -DHAVE__GETGRPSBYMEMBER"
# Force immediate binding because of chroot().
CONFIGURE_OPTIONS += LDFLAGS="-z guidance=nolazyload -z nolazyload -lbsm"
-CONFIGURE_OPTIONS += install_user=$(LOGNAME)
+CONFIGURE_OPTIONS += install_user=`id -nu`
CONFIGURE_OPTIONS += install_group=`groups | cut -f 1 -d ' '`
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS += --localstatedir=/var/run
--- a/components/proftpd/ftp.xml Mon Aug 05 13:49:09 2013 -0700
+++ b/components/proftpd/ftp.xml Mon Aug 05 23:00:35 2013 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
CDDL HEADER START
@@ -35,19 +35,14 @@
<single_instance/>
- <dependency name='net-loopback' grouping='require_any'
- restart_on='none' type='service'>
- <service_fmri value='svc:/network/loopback' />
- </dependency>
-
<dependency name='net-service' grouping='require_all'
restart_on='none' type='service'>
<service_fmri value='svc:/network/service'/>
</dependency>
- <dependency name='net-physical' grouping='require_all'
+ <dependency name='network' grouping='require_all'
restart_on='none' type='service'>
- <service_fmri value='svc:/network/physical' />
+ <service_fmri value='svc:/milestone/network'/>
</dependency>
<dependency name='filesystem-local' grouping='require_all'