--- old/usr/src/cmd/boot/scripts/root_archive.ksh	Mon Sep  8 17:33:18 2014
+++ new/usr/src/cmd/boot/scripts/root_archive.ksh	Mon Sep  8 17:33:18 2014
@@ -22,7 +22,6 @@
 
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
 #
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 
--- old/usr/src/lib/libumem_trampoline/Makefile	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,50 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2012 Joyent, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.lib
-
-SUBDIRS=	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-all	:= TARGET= all
-clean	:= TARGET= clean
-clobber	:= TARGET= clobber
-install	:= TARGET= install
-lint	:= TARGET= lint
-
-.KEEP_STATE:
-
-all clean clobber install lint: $(SUBDIRS)
-
-install_h: $(ROOTHDRS)
-
-check: $(CHECKHDRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-include ../Makefile.targ
--- old/usr/src/lib/libumem_trampoline/Makefile.com	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,49 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2012 Joyent, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-LIBRARY = libumem_trampoline.a
-VERS    = .1
-OBJECTS = trampoline.o
-
-include ../../Makefile.lib
-
-# install this library in the root filesystem
-include ../../Makefile.rootfs
-
-LIBS =		$(DYNLIB) $(LINTLIB)
-
-SRCDIR =	../common
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
-
-CFLAGS +=	$(CCVERBOSE)
-
-.KEEP_STATE:
-
-all:		$(LIBS)
-
-lint:		lintcheck
-
-include ../../Makefile.targ
--- old/usr/src/lib/libumem_trampoline/amd64/Makefile	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2012 (c) Joyent, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- old/usr/src/lib/libumem_trampoline/common/llib-lumem_trampoline	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,28 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright (c) 2012 Joyent, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
--- old/usr/src/lib/libumem_trampoline/common/mapfile-vers	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,62 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2012, Joyent, Inc.  All rights reserved.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-$mapfile_version 2
-
-#
-# The BSS must me executable for ptcumem to work properly. If it is not,
-# programs will get a SEGV. For more information read section of 8 libumem's big
-# theory statement in lib/libumem/common/umem.c.
-#
-LOAD_SEGMENT bss {
-	FLAGS = READ WRITE EXECUTE;
-};
-
-SYMBOL_VERSION SUNWprivate_1.1 {
-    global:
-	la_version;
-	la_objopen;
-$if _ELF32
-	la_symbind32;	
-$endif
-$if _ELF64
-	la_symbind64;
-$endif
-    local:
-	*;
-};
--- old/usr/src/lib/libumem_trampoline/common/trampoline.c	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,166 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright (c) 2012 Joyent, Inc.  All rights reserved.
- */
-
-/*
- * This is a local link auditing library for libumem(3LIB). It provides a means
- * for us to implement the per-thread caching component of libumem. When any
- * binary or library attempts to bind to libumem's malloc and free symbols we
- * instead point them to a private buffer in our own BSS. Our mapfile ensures
- * that this BSS is readable, writeable, and executable. By default these
- * private buffers contain a jmp instruction to the original libumem malloc and
- * free.
- *
- * When libumem tries to generate its assembly, we key off of private symbol
- * names and replace their values with pointers to our values. For more
- * information on this process, see section 8 of the big theory statement for
- * libumem in lib/libumem/common/umem.c.
- *
- * Note that this is very x86 specific currently. This includes x86 instructions
- * and making assumptions about alignment of variables, see the lint warnings.
- * By the current construction, SPARC is basically a no-op.
- */
-#include <dlfcn.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <libelf.h>
-#include <link.h>
-
-#if defined(__i386) || defined(__amd64)
-#define	LIBUMEM_TRAMPOLINE_JMP32	0xe9
-#endif	/* defined(__i386) || defined(__amd64) */
-
-/*
- * This is our malloc trampoline.  We give it the name "malloc" to make it
- * appear somewhat like malloc.
- */
-static uint8_t malloc[4096];
-static uint8_t free[4096];
-static size_t msize = sizeof (malloc);
-static size_t fsize = sizeof (free);
-
-/*
- * We don't want to link against libc, so we define our own versions of the
- * string functions as necessary.
- */
-static int
-la_strcmp(const char *s1, const char *s2)
-{
-	if (s1 == s2)
-		return (0);
-	while (*s1 == *s2++)
-		if (*s1++ == '\0')
-			return (0);
-
-	return (*(unsigned char *)s1 - *(unsigned char *)--s2);
-}
-
-static char *
-la_strrchr(char *str, char c)
-{
-	char *r;
-
-	r = NULL;
-	do {
-		if (*str == c)
-			r = str;
-	} while (*str++);
-	return (r);
-}
-
-/*ARGSUSED*/
-uint_t
-la_version(uint_t version)
-{
-	return (LAV_CURRENT);
-}
-
-/*ARGSUSED*/
-uint_t
-la_objopen(Link_map *lmp, Lmid_t lmid, uintptr_t *cookie)
-{
-#if defined(__i386) || defined(__amd64)
-	char *objname;
-
-	if ((objname = la_strrchr(lmp->l_name, '/')) == NULL ||
-	    *(++objname) == '\0')
-		objname = lmp->l_name;
-
-	if (la_strcmp(objname, "libumem.so.1") == 0 ||
-	    la_strcmp(objname, "libumem.so") == 0)
-		return (LA_FLG_BINDFROM | LA_FLG_BINDTO);
-#endif	/* defined(__i386) || defined(__amd64) */
-
-	return (0);
-}
-
-#if defined(_LP64)
-/*ARGSUSED*/
-uintptr_t
-la_symbind64(Elf64_Sym *symp, uint_t symndx, uintptr_t *refcook,
-    uintptr_t *defcook, uint_t *sb_flags, char const *sym_name)
-#else
-/*ARGSUSED*/
-uintptr_t
-la_symbind32(Elf32_Sym *symp, uint_t symndx, uintptr_t *refcook,
-    uintptr_t *defcook, uint_t *sb_flags)
-#endif
-{
-#if defined(__i386) || defined(__amd64)
-	int i = 0;
-
-#if !defined(_LP64)
-	char const *sym_name = (char const *) symp->st_name;
-#endif
-
-	if (la_strcmp(sym_name, "malloc") == 0) {
-		if (malloc[i] == '\0') {
-			malloc[i++] = LIBUMEM_TRAMPOLINE_JMP32;
-			/*LINTED E_BAD_PTR_CAST_ALIGN*/
-			*(uint32_t *)&malloc[i] = (uint32_t)(symp->st_value -
-			    (uintptr_t)&malloc[i + sizeof (uint32_t)]);
-		}
-
-		return ((uintptr_t)malloc);
-	} else if (la_strcmp(sym_name, "free") == 0) {
-		if (free[i] == '\0') {
-			free[i++] = LIBUMEM_TRAMPOLINE_JMP32;
-			/*LINTED E_BAD_PTR_CAST_ALIGN*/
-			*(uint32_t *)&free[i] = (uint32_t)(symp->st_value -
-			    (uintptr_t)&free[i + sizeof (uint32_t)]);
-		}
-
-		return ((uintptr_t)free);
-	} else if (la_strcmp(sym_name, "umem_genasm_mptr") == 0) {
-		return ((uintptr_t)malloc);
-	} else if (la_strcmp(sym_name, "umem_genasm_msize") == 0) {
-		return ((uintptr_t)&msize);
-	} else if (la_strcmp(sym_name, "umem_genasm_fptr") == 0) {
-		return ((uintptr_t)free);
-	} else if (la_strcmp(sym_name, "umem_genasm_fsize") == 0) {
-		return ((uintptr_t)&fsize);
-	} else {
-		return (symp->st_value);
-	}
-#endif	/* defined(__i386) || defined(__amd64) */
-}
--- old/usr/src/lib/libumem_trampoline/i386/Makefile	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2012 (c) Joyent, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- old/usr/src/lib/libumem_trampoline/sparc/Makefile	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2012 (c) Joyent, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
--- old/usr/src/lib/libumem_trampoline/sparcv9/Makefile	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,29 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2012 (c) Joyent, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
--- old/usr/src/man/man4/Makefile	Mon Sep  8 17:33:18 2014
+++ new/usr/src/man/man4/Makefile	Mon Sep  8 17:33:18 2014
@@ -114,7 +114,6 @@
 		mech.4				\
 		meddb.4				\
 		mnttab.4			\
-		mod_ipp.4			\
 		mpapi.conf.4			\
 		nca.if.4			\
 		ncad_addr.4			\
--- old/usr/src/man/man4/mod_ipp.4	Mon Sep  8 17:33:18 2014
+++ /dev/null	Mon Sep  8 17:31:35 2014
@@ -1,396 +0,0 @@
-'\" te
-.\" Copyright (c) 2003, Sun Microsystems, Inc.
-.\" All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MOD_IPP 4 "Nov 26, 2003"
-.SH NAME
-mod_ipp \- Embedded Internet Print Protocol (IPP) listener for the Apache HTTP
-server
-.SH SYNOPSIS
-.LP
-.nf
-\fB/usr/apache/libexec/mod_ipp.so\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBmod_ipp\fR module implements RFCs 2910 and 2911 to provide an IPP
-handling service for the Apache HTTP server. When loaded on the Apache server,
-\fBmod_ipp\fR processes all HTTP requests with MIME types of
-\fBapplication/ipp\fR. The \fBmod_ipp\fR module also processes additional
-configuration directives to enable or disable portions of the protocol support.
-.SS "Using Configuration Directives"
-.sp
-.LP
-The following is a list of configuration directives that apply to the Apache
-IPP Listening service:
-.RS +4
-.TP
-.ie t \(bu
-.el o
-ipp-conformance (\fIautomatic\fR|\fI1.0\fR|\fI1.1\fR)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-ipp-operation (\fIoperation\fR) (\fBenable\fR|\fBdisable\fR)
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fBenable\fR|\fBdisable\fR
-.sp
-The values \fBtrue\fR, \fByes\fR, \fBon\fR, \fBenable\fR are considered to be
-synonymous and will enable support for the named operation. All other values
-will disable support for the named operation.
-.RE
-.RE
-.SS "Operations"
-.sp
-.LP
-The following is a list of IPP handling service operations:
-.sp
-.ne 2
-.na
-\fB\fBprint-job\fR\fR
-.ad
-.RS 26n
-This operation is a required IPP operation that allows client systems to submit
-a print job with a single document embedded in the data stream. This operation
-is primarily used from the IPP support Microsoft has provided for its Windows
-(9X/ME/NT/2K/XP).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBprint-uri\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to submit a print
-job with a reference (URL) for a single document. This operation is currently
-not supported by the \fBmod_ipp\fR Apache Module.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBvalidate-job\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to simulate the
-submission of a print job to verify that the server is capable of handling the
-job. This operation is supported by \fBmod_ipp\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBcreate-job\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to submit a print
-job. The operation is used with the \fBsend-document\fR and \fBsend-uri\fR
-operations.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBget-jobs\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to retrieve a list
-of print jobs from the print service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBget-printer-attributes\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to retrieve
-attributes from the print service that describes the named printer object.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBpause-printer\fR\fR
-.ad
-.RS 26n
-This an optional IPP operation that allows client systems to stop job
-processing on the named print queue.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBresume-printer\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to resume job
-processing on the named print queue.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBpurge-jobs\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to cancel all
-print jobs on the named print queue.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBsend-document\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to add documents to
-print jobs created with the \fBcreate-job\fR operation, but not yet submitted.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBsend-uri\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows a client system to add a document
-reference (URI) to a print job created with the \fBcreate-job\fR operation, but
-not yet submitted. This operation is currently not supported by the
-\fBmod_ipp\fR Apache Module.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBcancel-job\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to cancel print
-jobs.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBget-job-attributes\fR\fR
-.ad
-.RS 26n
-This is a required IPP operation that allows client systems to retrieve
-attributes that describe a print job from the print service.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBhold-job\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to hold print
-jobs.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBrelease-job\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to release print
-jobs.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBrestart-job\fR\fR
-.ad
-.RS 26n
-This is an optional IPP operation that allows client systems to restart print
-jobs.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBall\fR\fR
-.ad
-.RS 26n
-This is a place holder for enabling or disabling support for all IPP operations
-implemented by the \fBmod_ipp\fR Apache module.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBrequired\fR\fR
-.ad
-.RS 26n
-This is a place holder for enabling or disabling support for the required IPP
-operations implemented by the \fBmod_ipp\fR Apache module.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRUsing a Configuration File to Start a Standalone Apache Server
-.sp
-.LP
-The following configuration file can be used to start a standalone Apache
-server to respond to IPP request sent to port 631.
-
-.sp
-.in +2
-.nf
-ServerType standalone
-ServerRoot "/usr/apache"
-PidFile /var/run/httpd-standalone-ipp.pid
-ErrorLog /var/lp/logs/ipp-errors
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-MinSpareServers 1
-MaxSpareServers 3
-StartServers 1
-MaxClients 150
-MaxRequestsPerChild 0
-
-LoadModule ipp_module libexec/mod_ipp.so
-
-ClearModuleList
-AddModule mod_ipp.c
-AddModule mod_so.c
-
-Port 631
-
-User lp
-Group lp
-
-ServerAdmin lp@localhost
-DefaultType application/ipp
-
-<IFModule mod_app>
-        <Location />
-               ipp-operation all on
-        </Location>
-</IFModule mod_app>
-.fi
-.in -2
-
-.sp
-.LP
-A more restrictive configuration might include the following parameters:
-
-.sp
-.in +2
-.nf
-<IFModule mod_app>
-        <Location />
-               ipp-operation all offn
-               ipp-operation required on
-        </Location>
-</IFModule mod_app>
-.fi
-.in -2
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) or descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	External
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBman\fR(1), \fBcatman\fR(1M), \fBattributes\fR(5)
-.sp
-.LP
-Herriot, R., Ed., Butler, S., Moore, P., Turner, R., Wenn, J. \fIRFC 2910,
-Internet Printing Protocol/1.1: Encoding and Transport\fR. Network Working
-Group. September 2000.
-.sp
-.LP
-Hastings, T., Ed., Herriot, R., deBry, R., Isaacson, S., Powell, P. \fIRFC
-2911, Internet Printing Protocol/1.1: Model and Semantics\fR. Network Working
-Group. September 2000.
-.sp
-.LP
-http://www.apache.org
-.SH NOTES
-.sp
-.LP
-Configuration file directives are processed in the order listed in the config
-file. The default behavior is to enable support for all operations implemented
-in the \fBmod_ipp\fR Apache module.
-.sp
-.LP
-Since the Apache IPP listening service implements some capabilities that are
-more of operator features, it may not be desirable to enable all IPP operations
-without requiring user authentication on the Apache listening service.
-.sp
-.LP
-The following is an example of a more reasonable configuration for Apache IPP
-servers without user authentication enabled:
-.sp
-.in +2
-.nf
-ipp-operations  all      disabled
-ipp-operations  required enabled
-.fi
-.in -2
-
-.sp
-.LP
-The printers and jobs available under this service can be accessed using URIs
-of the following form:
-.sp
-.in +2
-.nf
-printer:
-                 http://server[:port]/printers/{queue}
-                 ipp://server[:port]/printers/{queue}
-job:
-                 http://server[:port]/printers/{queue}/{job-id}
-                 ipp://server[:port]/printers/{queue}/{job-id}
-.fi
-.in -2
-
-.sp
-.LP
-631 is the default IPP port and implied when the URI scheme is \fBipp\fR.
-However, some client implementations do not recognize the \fBipp\fR URI scheme
-and require \fBhttp://server:631/...\fR instead. For example, Microsoft's IPP
-client implementation does not recognize the \fBipp\fR scheme.
-.sp
-.LP
-In addition to the documentation and man pages included with Solaris, more
-information is available at http://www.apache.org
-.sp
-.LP
-The \fBhttpd\fR(8) man page and other Apache man pages are provided with the
-programming modules. To view the Apache manual pages with the man command, add
-\fB/usr/apache/man\fR to the \fBMANPATH\fR environment variable. See
-\fBman\fR(1) for  more information. Running \fBcatman\fR(1M) on the Apache
-manual pages is not supported.
--- old/usr/src/pkg/manifests/library-print-open-printing-ipp.mf	Mon Sep  8 17:33:18 2014
+++ new/usr/src/pkg/manifests/library-print-open-printing-ipp.mf	Mon Sep  8 17:33:18 2014
@@ -39,7 +39,6 @@
 dir path=usr/share/man/man4
 file path=usr/lib/print/libhttp-core.so.1
 file path=usr/lib/print/psm-ipp.so.1
-file path=usr/share/man/man4/mod_ipp.4
 legacy pkg=SUNWpsm-ipp \
     desc="Client side support for communicating with IPP based print servers" \
     name="FSG Open Printing API IPP Print Service Module" \
--- old/usr/src/tools/Makefile.python	Mon Sep  8 17:33:18 2014
+++ new/usr/src/tools/Makefile.python	Mon Sep  8 17:33:18 2014
@@ -21,7 +21,6 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
 #
 
 #
--- old/usr/src/tools/Makefile.tools	Mon Sep  8 17:33:19 2014
+++ new/usr/src/tools/Makefile.tools	Mon Sep  8 17:33:19 2014
@@ -20,7 +20,6 @@
 #
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
 #
 # Definitions common to tool source.
 #
--- old/usr/src/uts/common/fs/zfs/zfs_zone.c	Mon Sep  8 17:33:19 2014
+++ new/usr/src/uts/common/fs/zfs/zfs_zone.c	Mon Sep  8 17:33:19 2014
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2014, Joyent, Inc. All rights reserved.
  */
 
 /*
@@ -1141,10 +1141,10 @@
 	if (zp->io_type == ZIO_TYPE_IOCTL)
 		return;
 
-	if ((zonep = zone_find_by_id(zp->io_zoneid)) == NULL)
+	if (zp->io_dispatched == 0)
 		return;
 
-	if (zp->io_dispatched == 0)
+	if ((zonep = zone_find_by_id(zp->io_zoneid)) == NULL)
 		return;
 
 	now = gethrtime();
--- old/usr/src/uts/common/inet/ip/ip_tunables.c	Mon Sep  8 17:33:19 2014
+++ new/usr/src/uts/common/inet/ip/ip_tunables.c	Mon Sep  8 17:33:19 2014
@@ -20,7 +20,6 @@
  */
 /*
  * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
