Mercurial Mercurial > sustaining > oi_151a > sfw-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import sfw build 159 sfwnv_159
authorCyril Plisko <cyril.plisko@grigale.com>
Tue, 08 Feb 2011 00:26:18 -0800
changeset 66 f9848e44a68b
parent 65 f2d1eb7d29c8
child 67 5cd965ad33e3
Import sfw build 159 Bugs Fixed ---------- 6927296 HPLIP should deliver hpcac 6954260 Update hplip to V3.10.9 6998845 snmpd does not process duplicate interface containers 7005980 qperf: sdp_bw/sdp_lat doesn't work 7006326 Update S-Lang to version 2.2.3 7010789 install-proto is not treating /usr/bin/env scripts as executables 7010960 libcups segfaults for firefox when accessing libssl and cannot print 7012702 set_nodedesc.sh has issues for node description with spaces
usr/src/cmd/cups/Patches/15-thread-safety-removal.patch file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/METADATA file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/Patches/01-build.patch file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/Patches/02_HPCupsFilter.cpp.patch file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/Patches/03_ErnieFilter.cpp.patch file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/hplip-3.10.9.tar.gz file | annotate | diff | comparison | revisions
usr/src/cmd/hplip/hplip-3.9.8.tar.gz file | annotate | diff | comparison | revisions
usr/src/cmd/net-snmp/Patches/019.6998845.container.patch file | annotate | diff | comparison | revisions
usr/src/cmd/ofusr/infiniband-diags/solaris_set_nodedesc.c file | annotate | diff | comparison | revisions
usr/src/cmd/ofusr/qperf/base.patch file | annotate | diff | comparison | revisions
usr/src/cmd/vim/runtime.patch file | annotate | diff | comparison | revisions
usr/src/lib/slang/METADATA file | annotate | diff | comparison | revisions
usr/src/lib/slang/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/lib/slang/slang-2.2.2.tar.bz2 file | annotate | diff | comparison | revisions
usr/src/lib/slang/slang-2.2.3.tar.bz2 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWhpijs/pkginfo.tmpl file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWhpijs/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslang/copyright file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslang/pkginfo.tmpl file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslang/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslang/prototype_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslang/prototype_sparc file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslangr/copyright file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl file | annotate | diff | comparison | revisions
usr/src/tools/install-proto.pl file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/Patches/15-thread-safety-removal.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -0,0 +1,244 @@
+--- cups/http-private.h.orig	Tue Jan 11 03:25:59 2011
++++ cups/http-private.h	Tue Jan 11 03:26:21 2011
+@@ -98,7 +98,6 @@
+  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
+  */
+ #    include <gnutls/gnutls.h>
+-#    include <gcrypt.h>
+ 
+ typedef struct
+ {
+--- scheduler/main.c.orig	Tue Jan 11 03:26:50 2011
++++ scheduler/main.c	Tue Jan 11 03:27:08 2011
+@@ -549,8 +549,6 @@
+   * Startup the server...
+   */
+ 
+-  httpInitialize();
+-
+   cupsdStartServer();
+ 
+  /*
+--- scheduler/server.c.orig	Tue Jan 11 03:27:36 2011
++++ scheduler/server.c	Tue Jan 11 03:32:26 2011
+@@ -44,7 +44,41 @@
+ void
+ cupsdStartServer(void)
+ {
++#ifdef HAVE_LIBSSL
++  int			i;		/* Looping var */
++  struct timeval	curtime;	/* Current time in microseconds */
++  unsigned char		data[1024];	/* Seed data */
++#endif /* HAVE_LIBSSL */
++
++#ifdef HAVE_LIBSSL
+  /*
++  * Initialize the encryption libraries...
++  */
++
++  SSL_library_init();
++  SSL_load_error_strings();
++
++ /*
++  * Using the current time is a dubious random seed, but on some systems
++  * it is the best we can do (on others, this seed isn't even used...)
++  */
++
++  gettimeofday(&curtime, NULL);
++  srand(curtime.tv_sec + curtime.tv_usec);
++
++  for (i = 0; i < sizeof(data); i ++)
++	data[i] = rand(); /* Yes, this is a poor source of random data... */
++
++  RAND_seed(&data, sizeof(data));
++#elif defined(HAVE_GNUTLS)
++ /*
++  * Initialize the encryption libraries...
++  */
++
++  gnutls_global_init();
++#endif /* HAVE_LIBSSL */
++
++ /*
+   * Create the default security profile...
+   */
+ 
+--- cups/http.c.orig	Wed Jan 12 01:52:14 2011
++++ cups/http.c	Wed Jan 12 02:01:58 2011
+@@ -83,12 +83,10 @@
+  *   http_debug_hex()     - Do a hex dump of a buffer.
+  *   http_field()         - Return the field index for a field name.
+  *   http_read_ssl()      - Read from a SSL/TLS connection.
+- *   http_locking_cb()    - Lock/unlock a thread's mutex.
+  *   http_send()          - Send a request with all fields and the trailing
+  *                          blank line.
+  *   http_setup_ssl()     - Set up SSL/TLS support on a connection.
+  *   http_shutdown_ssl()  - Shut down SSL/TLS on a connection.
+- *   http_threadid_cb()   - Return the current thread ID.
+  *   http_upgrade()       - Force upgrade to TLS encryption.
+  *   http_write()         - Write a buffer to a HTTP connection.
+  *   http_write_chunk()   - Write a chunked buffer.
+@@ -147,18 +145,6 @@
+ static int		http_upgrade(http_t *http);
+ static int		http_write_ssl(http_t *http, const char *buf, int len);
+ 
+-#  ifdef HAVE_GNUTLS
+-#    ifdef HAVE_PTHREAD_H
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-#    endif /* HAVE_PTHREAD_H */
+-
+-#  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+-static pthread_mutex_t	*http_locks;	/* OpenSSL lock mutexes */
+-
+-static void		http_locking_cb(int mode, int type, const char *file,
+-					int line);
+-static unsigned long	http_threadid_cb(void);
+-#  endif /* HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
+ 
+ 
+@@ -1220,22 +1206,20 @@
+ void
+ httpInitialize(void)
+ {
+-  static int	initialized = 0;	/* Have we been called before? */
+-#ifdef WIN32
+-  WSADATA	winsockdata;		/* WinSock data */
+-#endif /* WIN32 */
+ #ifdef HAVE_LIBSSL
++  #ifndef WIN32
++  struct timeval	curtime;	/* Current time in microseconds */
++  #endif /* !WIN32 */
+   int		i;			/* Looping var */
+   unsigned char	data[1024];		/* Seed data */
+ #endif /* HAVE_LIBSSL */
+ 
+-
+-  if (initialized)
+-    return;
+-
+ #ifdef WIN32
+-  WSAStartup(MAKEWORD(2,2), &winsockdata);
++  WSADATA	winsockdata;	/* WinSock data */
+ 
++  static int	initialized = 0;/* Has WinSock been initialized? */
++  if (!initialized)
++	WSAStartup(MAKEWORD(1,1), &winsockdata);
+ #elif !defined(SO_NOSIGPIPE)
+  /*
+   * Ignore SIGPIPE signals...
+@@ -1258,56 +1242,30 @@
+ #endif /* WIN32 */
+ 
+ #ifdef HAVE_GNUTLS
+- /*
+-  * Make sure we handle threading properly...
+-  */
+ 
+-#  ifdef HAVE_PTHREAD_H
+-  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+-#  endif /* HAVE_PTHREAD_H */
+-
+- /*
+-  * Initialize GNU TLS...
+-  */
+-
+   gnutls_global_init();
++#endif /* HAVE_GNUTLS */
+ 
+-#elif defined(HAVE_LIBSSL)
+- /*
+-  * Initialize OpenSSL...
+-  */
+-
++#ifdef HAVE_LIBSSL
+   SSL_load_error_strings();
+   SSL_library_init();
+ 
+  /*
+-  * Set the threading callbacks...
+-  */
+-
+-#  ifdef HAVE_PTHREAD_H
+-  http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t));
+-
+-  for (i = 0; i < CRYPTO_num_locks(); i ++)
+-    pthread_mutex_init(http_locks + i, NULL);
+-
+-  CRYPTO_set_id_callback(http_threadid_cb);
+-  CRYPTO_set_locking_callback(http_locking_cb);
+-#  endif /* HAVE_PTHREAD_H */
+-
+- /*
+   * Using the current time is a dubious random seed, but on some systems
+   * it is the best we can do (on others, this seed isn't even used...)
+   */
+ 
+-  CUPS_SRAND(time(NULL));
++#ifdef WIN32
++#else
++  gettimeofday(&curtime, NULL);
++  srand(curtime.tv_sec + curtime.tv_usec);
++#endif /* WIN32 */
+ 
+   for (i = 0; i < sizeof(data); i ++)
+-    data[i] = CUPS_RAND();
++    data[i] = rand();
+ 
+   RAND_seed(data, sizeof(data));
+-#endif /* HAVE_GNUTLS */
+-
+-  initialized = 1;
++#endif /* HAVE_LIBSSL */
+ }
+ 
+ 
+@@ -2865,27 +2823,7 @@
+ }
+ #endif /* HAVE_SSL */
+ 
+-
+-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+ /*
+- * 'http_locking_cb()' - Lock/unlock a thread's mutex.
+- */
+-
+-static void
+-http_locking_cb(int        mode,	/* I - Lock mode */
+-		int        type,	/* I - Lock type */
+-		const char *file,	/* I - Source file */
+-		int        line)	/* I - Line number */
+-{
+-  if (mode & CRYPTO_LOCK)
+-    pthread_mutex_lock(http_locks + type);
+-  else
+-    pthread_mutex_unlock(http_locks + type);
+-}
+-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+-
+-
+-/*
+  * 'http_send()' - Send a request with all fields and the trailing blank line.
+  */
+ 
+@@ -3255,20 +3193,6 @@
+ }
+ #endif /* HAVE_SSL */
+ 
+-
+-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
+-/*
+- * 'http_threadid_cb()' - Return the current thread ID.
+- */
+-
+-static unsigned long			/* O - Thread ID */
+-http_threadid_cb(void)
+-{
+-  return ((unsigned long)pthread_self());
+-}
+-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
+-
+-
+ #ifdef HAVE_SSL
+ /*
+  * 'http_upgrade()' - Force upgrade to TLS encryption.
--- a/usr/src/cmd/hplip/METADATA	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/hplip/METADATA	Tue Feb 08 00:26:18 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             hplip
-VERSION:          3.9.8
+VERSION:          3.10.9
 DESCRIPTION:      HP Linux Imaging and Printing
 LICENSE:          GPLv2, MIT, BSD
 PACKAGE:          SUNWhpijs
 PROJECT_URL:      http://hplip.sf.net/
-SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-3.9.8.tar.gz
+SOURCE_DOWNLOAD:  http://sourceforge.net/projects/hplip/files/hplip/3.10.9/hplip-3.10.9.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/print/hplip
 OSR:              8784
--- a/usr/src/cmd/hplip/Makefile.sfw	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/hplip/Makefile.sfw	Tue Feb 08 00:26:18 2011 -0800
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.3	09/10/08 SMI"
+#ident	"@(#)Makefile.sfw	1.4	11/01/21 SMI"
 
 include ../Makefile.cmd
 # include ../Makefile.cmd.64
@@ -67,7 +66,7 @@
 TARGET_ENV += 	CXX="$(CCC)"
 TARGET_ENV += 	CXXLD="$(CXXLD)"
 TARGET_ENV += 	CPPFLAGS="$(CPPFLAGS)"
-TARGET_ENV += 	LD_OPTIONS="$(LDLIBS) $(LDFLAGS)"
+TARGET_ENV += 	LD_OPTIONS="$(LDLIBS) $(LDFLAGS) -lnsl"
 TARGET_ENV += 	PATH="$(SRC)/tools:$(SFW_PATH)"
 TARGET_ENV += 	MAKE="$(CCSMAKE)"
 
@@ -128,7 +127,11 @@
 		IPATH="/usr/share/ppd/SUNWhpijs/" \
 		$(KSH93) ../foomatic-ppd/cache.ksh)
 
-install-protofix:	install-target $(ROOTPPDCACHE)
+install-hpcac:
+	# Copy hpcac to cups filter
+	$(INSTALL_PROTO) $(VER)/prnt/filters/hpcac $(ROOT)/usr/lib/cups/filter/hpcac 
+
+install-protofix:	install-target $(ROOTPPDCACHE) install-hpcac
 	# apply the file attributes from the packaging
 	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
 		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
--- a/usr/src/cmd/hplip/Patches/01-build.patch	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/hplip/Patches/01-build.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -1,5 +1,5 @@
---- hplip-3.9.8-orig/scan/sane/scl.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/scl.c	Fri Sep  4 01:06:47 2009
+--- hplip-3.10.9-orig/scan/sane/scl.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/scl.c	Fri Sep  4 01:06:47 2009
 @@ -160,7 +160,7 @@
  
  }
@@ -36,8 +36,8 @@
  {
      char rbuf[256];
      int len, stat;
---- hplip-3.9.8-orig/scan/sane/xml.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/xml.c	Fri Sep  4 01:07:00 2009
+--- hplip-3.10.9-orig/scan/sane/xml.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/xml.c	Fri Sep  4 01:07:00 2009
 @@ -32,7 +32,7 @@
  #include <string.h>
  #include <stdlib.h>
@@ -65,8 +65,8 @@
  {
     int i=0, j=0, dd=0, lf=0;
  
---- hplip-3.9.8-orig/scan/sane/mfpdtf.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/mfpdtf.h	Fri Sep  4 01:05:54 2009
+--- hplip-3.10.9-orig/scan/sane/mfpdtf.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/mfpdtf.h	Fri Sep  4 01:05:54 2009
 @@ -243,18 +243,18 @@
          } __attribute__(( packed) ) array;
  } __attribute__(( packed) );
@@ -106,8 +106,8 @@
 +int read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout);
  
  #endif  // _MFPDTF_H
---- hplip-3.9.8-orig/scan/sane/io.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/io.c	Fri Sep  4 01:04:50 2009
+--- hplip-3.10.9-orig/scan/sane/io.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/io.c	Fri Sep  4 01:04:50 2009
 @@ -43,7 +43,7 @@
  DBusError dbus_err;
  DBusConnection * dbus_conn;
@@ -149,8 +149,8 @@
  {
     int n, len, size, total=0;
     enum HPMUD_RESULT stat;
---- hplip-3.9.8-orig/scan/sane/common.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/common.c	Fri Sep  4 01:04:05 2009
+--- hplip-3.10.9-orig/scan/sane/common.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/common.c	Fri Sep  4 01:04:05 2009
 @@ -35,7 +35,7 @@
  #define DEBUG_NOT_STATIC
  #include "sanei_debug.h"
@@ -259,8 +259,8 @@
  {
      int i;
      for( i = 0; i < MAX_LIST_SIZE - 1; i++ )
---- hplip-3.9.8-orig/scan/sane/pml.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/pml.c	Fri Sep  4 01:06:11 2009
+--- hplip-3.10.9-orig/scan/sane/pml.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/pml.c	Fri Sep  4 01:06:11 2009
 @@ -36,7 +36,7 @@
  #define DEBUG_DECLARE_ONLY
  #include "sanei_debug.h"
@@ -363,8 +363,8 @@
  {
     int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0;
  
---- hplip-3.9.8-orig/scan/sane/hpaio.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/hpaio.c	Fri Sep  4 01:04:29 2009
+--- hplip-3.10.9-orig/scan/sane/hpaio.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/hpaio.c	Fri Sep  4 01:04:29 2009
 @@ -324,7 +324,7 @@
      return NULL;
  }
@@ -383,8 +383,8 @@
  {
  //BREAKPOINT;
      
---- hplip-3.9.8-orig/scan/sane/xml.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/xml.h	Fri Sep  4 01:07:05 2009
+--- hplip-3.10.9-orig/scan/sane/xml.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/xml.h	Fri Sep  4 01:07:05 2009
 @@ -27,10 +27,10 @@
  #ifndef _MXML_H
  #define _MXML_H
@@ -399,8 +399,8 @@
 +int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail);
  
  #endif  // _MXML_H
---- hplip-3.9.8-orig/scan/sane/scl.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/scl.h	Fri Sep  4 01:06:54 2009
+--- hplip-3.10.9-orig/scan/sane/scl.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/scl.h	Fri Sep  4 01:06:54 2009
 @@ -176,8 +176,8 @@
  //#define LEN_SCL_BUFFER 1024
  #define LEN_SCL_BUFFER    256 /* Increase if reading binary data. */
@@ -423,8 +423,8 @@
  
  #endif
  
---- hplip-3.9.8-orig/scan/sane/hpaio.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/hpaio.h	Fri Sep  4 01:04:35 2009
+--- hplip-3.10.9-orig/scan/sane/hpaio.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/hpaio.h	Fri Sep  4 01:04:35 2009
 @@ -271,8 +271,8 @@
      } \
    } while(0)
@@ -436,8 +436,8 @@
  void sane_hpaio_cancel(SANE_Handle handle);
  
  #endif
---- hplip-3.9.8-orig/scan/sane/mfpdtf.c	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/mfpdtf.c	Fri Sep  4 01:05:16 2009
+--- hplip-3.10.9-orig/scan/sane/mfpdtf.c	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/mfpdtf.c	Fri Sep  4 01:05:16 2009
 @@ -56,7 +56,7 @@
      return seconds;
  }
@@ -549,8 +549,8 @@
  {
     MFPDTF_FIXED_HEADER *phd = (MFPDTF_FIXED_HEADER *)buf;
     int size, bsize=0, len;
---- hplip-3.9.8-orig/scan/sane/io.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/io.h	Fri Sep  4 01:04:55 2009
+--- hplip-3.10.9-orig/scan/sane/io.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/io.h	Fri Sep  4 01:04:55 2009
 @@ -31,9 +31,9 @@
  #include "sane.h"
  #include "hpmud.h"
@@ -564,8 +564,8 @@
  
  #define EVENT_START_SCAN_JOB 2000
  #define EVENT_END_SCAN_JOB 2001
---- hplip-3.9.8-orig/scan/sane/common.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/common.h	Fri Sep  4 01:04:21 2009
+--- hplip-3.10.9-orig/scan/sane/common.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/common.h	Fri Sep  4 01:04:21 2009
 @@ -169,19 +169,19 @@
      pXform++; \
    } while(0)
@@ -599,8 +599,8 @@
 +int StrListAdd( const char ** list, char * s );
  
  #endif
---- hplip-3.9.8-orig/scan/sane/pml.h	Tue Aug  4 16:36:06 2009
-+++ hplip-3.9.8/scan/sane/pml.h	Fri Sep  4 01:06:24 2009
+--- hplip-3.10.9-orig/scan/sane/pml.h	Tue Aug  4 16:36:06 2009
++++ hplip-3.10.9/scan/sane/pml.h	Fri Sep  4 01:06:24 2009
 @@ -159,15 +159,15 @@
          unsigned char   y[4];
  } __attribute__(( packed));
@@ -638,8 +638,8 @@
 +int pml_cancel(struct hpaioScanner_s *hpaio);
  
  #endif // _PML_H
---- hplip-3.9.8-orig/io/hpmud/pp.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/pp.h	Fri Sep  4 00:51:13 2009
+--- hplip-3.10.9-orig/io/hpmud/pp.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/pp.h	Fri Sep  4 00:51:13 2009
 @@ -76,25 +76,25 @@
  struct _mud_device;
  struct _mud_channel;
@@ -682,8 +682,8 @@
  
  #endif // _PP_H
  
---- hplip-3.9.8-orig/io/hpmud/jd.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/jd.c	Fri Sep  4 00:55:15 2009
+--- hplip-3.10.9-orig/io/hpmud/jd.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/jd.c	Fri Sep  4 00:55:15 2009
 @@ -34,7 +34,7 @@
  #include "hpmud.h"
  #include "hpmudi.h"
@@ -808,8 +808,8 @@
  {
     mud_device *pd = &msp->device[pc->dindex];
     int len=0;
---- hplip-3.9.8-orig/io/hpmud/dot4.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/dot4.c	Fri Sep  4 00:48:13 2009
+--- hplip-3.10.9-orig/io/hpmud/dot4.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/dot4.c	Fri Sep  4 00:48:13 2009
 @@ -150,7 +150,7 @@
  }
  
@@ -900,8 +900,8 @@
  {
     mud_device *pd = &msp->device[pc->dindex];
     unsigned char buf[HPMUD_BUFFER_SIZE];
---- hplip-3.9.8-orig/io/hpmud/pml.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/pml.c	Fri Sep  4 00:54:19 2009
+--- hplip-3.10.9-orig/io/hpmud/pml.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/pml.c	Fri Sep  4 00:54:19 2009
 @@ -210,7 +210,7 @@
     return len;
  }
@@ -927,8 +927,8 @@
  {
     BUG("no JetDirect support enabled\n");
     return 0;
---- hplip-3.9.8-orig/io/hpmud/musb.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/musb.c	Fri Sep  4 00:54:08 2009
+--- hplip-3.10.9-orig/io/hpmud/musb.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/musb.c	Fri Sep  4 00:54:08 2009
 @@ -27,7 +27,7 @@
  #include "hpmud.h"
  #include "hpmudi.h"
@@ -1163,8 +1163,8 @@
  {
     struct usb_bus *bus;
     struct usb_device *dev;
---- hplip-3.9.8-orig/io/hpmud/hpmud.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/hpmud.c	Fri Sep  4 00:59:28 2009
+--- hplip-3.10.9-orig/io/hpmud/hpmud.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/hpmud.c	Fri Sep  4 00:59:28 2009
 @@ -27,13 +27,13 @@
  #include "hpmudi.h"
  
@@ -1227,8 +1227,8 @@
  {
     enum HPMUD_RESULT stat;
  
---- hplip-3.9.8-orig/io/hpmud/mlc.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/mlc.h	Fri Sep  4 00:57:55 2009
+--- hplip-3.10.9-orig/io/hpmud/mlc.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/mlc.h	Fri Sep  4 00:57:55 2009
 @@ -134,17 +134,17 @@
  struct _mud_device;
  struct _mud_channel;
@@ -1258,8 +1258,8 @@
  
  #endif // _MLC_H
  
---- hplip-3.9.8-orig/io/hpmud/hpmudi.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/hpmudi.h	Fri Sep  4 00:59:05 2009
+--- hplip-3.10.9-orig/io/hpmud/hpmudi.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/hpmudi.h	Fri Sep  4 00:59:05 2009
 @@ -190,18 +190,18 @@
     pthread_mutex_t mutex;  
  } mud_session;
@@ -1290,8 +1290,8 @@
  
  #endif // _HPMUDI_H
  
---- hplip-3.9.8-orig/io/hpmud/dot4.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/dot4.h	Fri Sep  4 00:50:05 2009
+--- hplip-3.10.9-orig/io/hpmud/dot4.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/dot4.h	Fri Sep  4 00:50:05 2009
 @@ -172,16 +172,16 @@
  typedef DOT4CloseChannelReply DOT4CreditReply;
  typedef DOT4Exit DOT4GetSocket;
@@ -1319,8 +1319,8 @@
  
  #endif // _DOT4_H
  
---- hplip-3.9.8-orig/io/hpmud/pp.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/pp.c	Fri Sep  4 00:51:58 2009
+--- hplip-3.10.9-orig/io/hpmud/pp.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/pp.c	Fri Sep  4 00:51:58 2009
 @@ -29,7 +29,7 @@
  #include "hpmud.h"
  #include "hpmudi.h"
@@ -1465,8 +1465,8 @@
  {
     struct hpmud_model_attributes ma;
     char dev[HPMUD_LINE_SIZE];
---- hplip-3.9.8-orig/io/hpmud/jd.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/jd.h	Fri Sep  4 00:58:24 2009
+--- hplip-3.10.9-orig/io/hpmud/jd.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/jd.h	Fri Sep  4 00:58:24 2009
 @@ -34,23 +34,23 @@
  struct _mud_device;
  struct _mud_channel;
@@ -1505,8 +1505,8 @@
  
  #endif // _JD_H
  
---- hplip-3.9.8-orig/io/hpmud/mlc.c	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/mlc.c	Fri Sep  4 00:55:47 2009
+--- hplip-3.10.9-orig/io/hpmud/mlc.c	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/mlc.c	Fri Sep  4 00:55:47 2009
 @@ -26,7 +26,7 @@
  #include "hpmud.h"
  #include "hpmudi.h"
@@ -1606,8 +1606,8 @@
  {
     mud_device *pd = &msp->device[pc->dindex];
     unsigned char buf[HPMUD_BUFFER_SIZE];
---- hplip-3.9.8-orig/io/hpmud/pml.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/pml.h	Fri Sep  4 00:53:19 2009
+--- hplip-3.10.9-orig/io/hpmud/pml.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/pml.h	Fri Sep  4 00:53:19 2009
 @@ -71,7 +71,7 @@
     PML_DT_UNKNOWN = 0xff
  };
@@ -1617,8 +1617,8 @@
  
  #endif // _PML_H
  
---- hplip-3.9.8-orig/io/hpmud/musb.h	Tue Aug  4 16:37:25 2009
-+++ hplip-3.9.8/io/hpmud/musb.h	Fri Sep  4 00:53:13 2009
+--- hplip-3.10.9-orig/io/hpmud/musb.h	Tue Aug  4 16:37:25 2009
++++ hplip-3.10.9/io/hpmud/musb.h	Fri Sep  4 00:53:13 2009
 @@ -80,38 +80,38 @@
  struct _mud_device;
  struct _mud_channel;
@@ -1684,8 +1684,8 @@
  
  #endif // _MUSB_H
  
---- hplip-3.9.8/prnt/hpijs/hpijsfax.cpp.orig	Thu Oct  1 14:09:21 2009
-+++ hplip-3.9.8/prnt/hpijs/hpijsfax.cpp	Thu Oct  1 14:09:39 2009
+--- hplip-3.10.9/prnt/hpijs/hpijsfax.cpp.orig	Thu Oct  1 14:09:21 2009
++++ hplip-3.10.9/prnt/hpijs/hpijsfax.cpp	Thu Oct  1 14:09:39 2009
 @@ -587,7 +587,7 @@
  		ijs_server_done (ctx);
  	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/hplip/Patches/02_HPCupsFilter.cpp.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -0,0 +1,11 @@
+--- hplip-3.10.9-orig/prnt/hpcups/HPCupsFilter.cpp	Tue Dec 21 02:30:42 2010
++++ hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp	Tue Dec 21 02:31:05 2010
+@@ -35,6 +35,8 @@
+ #include <time.h>
+ #include <sys/timeb.h>
+ 
++extern "C" int getdomainname(char*, int);
++
+ #define HP_FILE_VERSION_STR    "03.09.08.0"
+ 
+ static HPCupsFilter    filter;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/hplip/Patches/03_ErnieFilter.cpp.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -0,0 +1,11 @@
+--- hplip-3.10.9/prnt/hpcups/ErnieFilter.cpp.orig	Mon Dec 27 00:02:08 2010
++++ hplip-3.10.9/prnt/hpcups/ErnieFilter.cpp	Mon Dec 27 00:03:19 2010
+@@ -50,6 +50,8 @@
+ #include "ErnieFilter.h"
+ 
+ 
++extern "C" double ceil(double);
++
+ #if defined(__APPLE__) || defined(__linux)
+ #include <math.h>
+ #endif
Binary file usr/src/cmd/hplip/hplip-3.10.9.tar.gz has changed
Binary file usr/src/cmd/hplip/hplip-3.9.8.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/Patches/019.6998845.container.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -0,0 +1,314 @@
+--- net-snmp/include/net-snmp/library/container.h	Mon Dec  5 00:13:04 2005
++++ net-snmp/include/net-snmp/library/container.h	Fri Jan 14 17:35:37 2011
+@@ -31,8 +31,16 @@
+     struct netsnmp_container_s; /** forward declare */
+ 
+     /*
+-     * function returning an int for an operation on a container
++     * function for performing an operation on a container which
++     * returns (maybe the same) container.
+      */
++
++    typedef struct netsnmp_container_s* (netsnmp_container_mod_op)
++      (struct netsnmp_container_s *, void *context, u_int flags);
++
++    /*
++     * function for setting an option on a container
++     */
+     typedef int (netsnmp_container_option)(struct netsnmp_container_s *,
+                                            int set, u_int flags);
+ 
+@@ -192,6 +200,14 @@
+        netsnmp_container_op    *insert_filter;
+ 
+        /*
++	* OPTIONAL function to duplicate a container. Defaults to a shallow
++	* copy. Only the specified container is copied (i.e. sub-containers
++	* not included).
++	*/
++
++       netsnmp_container_mod_op *duplicate;
++
++       /*
+         * function to compare two object stored in the container.
+         *
+         * Returns:
+@@ -219,11 +235,16 @@
+ 
+        /*
+         * sort count, for iterators to track (insert/delete
+-        * bumps coutner, invalidates iterator
++        * bumps counter, invalidates iterator)
+         */
+        u_long                          sync;
+ 
+        /*
++	* flags
++	*/
++       u_int                           flags;
++
++       /*
+         * containers can contain other containers (additional indexes)
+         */
+        struct netsnmp_container_s *next, *prev;
+@@ -288,15 +309,15 @@
+ #define CONTAINER_SET_OPTIONS(x,o,rc)  do {                             \
+         if (NULL==(x)->options)                                         \
+             rc = -1;                                                    \
+-        else                                                            \
++        else {                                                          \
+             rc = (x)->options(x, 1, o);                                 \
++	     if (rc != -1 )						\
++		(x)->flags |= o;                                        \
++	}								\
+     } while(0)
+ 
+ #define CONTAINER_CHECK_OPTION(x,o,rc)    do {                          \
+-        if (NULL==(x)->options)                                         \
+-            rc = -1;                                                    \
+-        else                                                            \
+-            rc = (x)->options(x,0, o);                                  \
++	rc = x->flags & 0;                                              \
+     } while(0)
+ 
+ 
+@@ -335,6 +356,12 @@
+     int CONTAINER_REMOVE(netsnmp_container *x, const void *k);
+ 
+     /*
++     * duplicate container
++     */
++    netsnmp_container *CONTAINER_DUP(netsnmp_container *x, void *ctx,
++		u_int flags); 
++
++    /*
+      * clear all containers. When clearing the *first* container, and
+      * *only* the first container, call the function f for each item.
+      * After calling this function, all containers should be empty.
+@@ -364,7 +391,7 @@
+                 continue;
+             rc2 = x->insert(x,k);
+             if (rc2) {
+-                snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
++                snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
+                          x->container_name ? x->container_name : "", rc2);
+                 rc = rc2;
+             }
+@@ -402,6 +429,22 @@
+      * container.c. If you change one, change them both.
+      */
+     NETSNMP_STATIC_INLINE /* gcc docs recommend static w/inline */
++    netsnmp_container *CONTAINER_DUP(netsnmp_container *x, void *ctx,
++    		u_int flags)
++    {
++      if (NULL == x->duplicate) {
++    	snmp_log(LOG_ERR, "container '%s' does not support duplicate\n",
++    		x->container_name ? x->container_name : "");
++    	return NULL;
++      }
++      return x->duplicate(x, ctx, flags);
++    }
++
++    /*------------------------------------------------------------------
++     * These functions should EXACTLY match the function version in
++     * container.c. If you change one, change them both.
++     */
++    NETSNMP_STATIC_INLINE /* gcc docs recommend static w/inline */ 
+     int CONTAINER_FREE(netsnmp_container *x)
+     {
+ 	int  rc2, rc = 0;
+@@ -474,6 +517,10 @@
+     }
+ 
+ #endif
++
++    /** Duplicate container meta-data. */
++    int netsnmp_container_data_dup(netsnmp_container *dup,
++    	netsnmp_container *c); 
+     
+     /*************************************************************************
+      *
+--- net-snmp/snmplib/container_binary_array.c	Wed Aug 23 21:23:22 2006
++++ net-snmp/snmplib/container_binary_array.c	Fri Jan 14 17:35:37 2011
+@@ -36,7 +36,6 @@
+ typedef struct binary_array_table_s {
+     size_t                     max_size;   /* Size of the current data table */
+     size_t                     count;      /* Index of the next free entry */
+-    u_int                      flags;      /* flags */
+     int                        dirty;
+     int                        data_size;  /* Size of an individual entry */
+     void                     **data;       /* The table itself */
+@@ -99,7 +98,7 @@
+     netsnmp_assert(t!=NULL);
+     netsnmp_assert(c->compare!=NULL);
+ 
+-    if (t->flags & CONTAINER_KEY_UNSORTED)
++    if (c->flags & CONTAINER_KEY_UNSORTED)
+         return 0;
+ 
+     if (t->dirty) {
+@@ -204,11 +203,16 @@
+ int
+ netsnmp_binary_array_options_set(netsnmp_container *c, int set, u_int flags)
+ {
+-    binary_array_table *t = (binary_array_table*)c->container_data;
+-    if (set)
+-        t->flags = flags;
++#define BA_FLAGS (CONTAINER_KEY_ALLOW_DUPLICATES|CONTAINER_KEY_UNSORTED)
++
++    if (set) {
++    	if ((flags & BA_FLAGS) == flags)
++    		c->flags = flags;
++    	else
++    		flags = (u_int)-1; /* unsupported flag */
++    }
+     else
+-        return ((t->flags & flags) == flags);
++    	return ((c->flags & flags) == flags); 
+     return flags;
+ }
+ 
+@@ -371,7 +375,7 @@
+     /*
+      * check for duplicates
+      */
+-    if (! (t->flags & CONTAINER_KEY_ALLOW_DUPLICATES)) {
++    if (! (c->flags & CONTAINER_KEY_ALLOW_DUPLICATES)) {
+         new_data = netsnmp_binary_array_get(c, entry, 1);
+         if (NULL != new_data) {
+             DEBUGMSGTL(("container","not inserting duplicate key\n"));
+@@ -579,6 +583,56 @@
+     return va;
+ }
+ 
++static netsnmp_container *
++_ba_duplicate(netsnmp_container *c, void *ctx, u_int flags)
++{
++    netsnmp_container *dup;
++    binary_array_table *dupt, *t;
++
++    if (flags) {
++        snmp_log(LOG_ERR, "binary arry duplicate does not supprt flags yet\n");
++        return NULL;
++    }
++
++    dup = netsnmp_container_get_binary_array();
++    if (NULL == dup) {
++        snmp_log(LOG_ERR," no memory for binary array duplicate\n");
++        return NULL;
++    }
++    /*
++     * deal with container stuff
++     */
++    if (netsnmp_container_data_dup(dup, c) != 0) {
++        netsnmp_binary_array_release(dup);
++        return NULL;
++    }
++
++    /*
++     * deal with data
++     */
++    dupt = (binary_array_table*)dup->container_data;
++    t = (binary_array_table*)c->container_data;
++
++    dupt->max_size = t->max_size;
++    dupt->count = t->count;
++    dupt->dirty = t->dirty;
++    dupt->data_size = t->data_size;
++
++    /*
++     * shallow copy
++     */
++    dupt->data = (void**) calloc(dupt->max_size, dupt->data_size);
++    if (NULL == dupt->data) {
++        snmp_log(LOG_ERR, "no memory for binary array duplicate\n");
++        netsnmp_binary_array_release(dup);
++        return NULL;
++    }
++
++    memcpy(dupt->data, t->data, dupt->max_size * dupt->data_size);
++    
++    return dup;
++}
++
+ netsnmp_container *
+ netsnmp_container_get_binary_array(void)
+ {
+@@ -592,7 +646,11 @@
+     }
+ 
+     c->container_data = netsnmp_binary_array_initialize();
+-        
++
++    /*
++     * NOTE: CHANGES HERE MUST BE DUPLICATED IN duplicate AS WELL!!
++     */
++
+     c->get_size = _ba_size;
+     c->init = NULL;
+     c->cfree = _ba_free;
+@@ -604,6 +662,7 @@
+     c->get_iterator = _ba_iterator_get;
+     c->for_each = _ba_for_each;
+     c->clear = _ba_clear;
++    c->duplicate = _ba_duplicate;
+         
+     return c;
+ }
+--- net-snmp/snmplib/container.c	Fri Aug 25 15:11:06 2006
++++ net-snmp/snmplib/container.c	Fri Jan 14 17:35:37 2011
+@@ -278,7 +278,7 @@
+             continue;
+         rc2 = x->insert(x,k);
+         if (rc2) {
+-            snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
++            snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
+                      x->container_name ? x->container_name : "", rc2);
+             rc = rc2;
+         }
+@@ -311,6 +311,20 @@
+ }
+ 
+ /*------------------------------------------------------------------
++ * These functions should EXACTLY match the function version in
++ * container.c. If you change one, change them both.
++ */
++netsnmp_container *CONTAINER_DUP(netsnmp_container *x, void *ctx, u_int flags)
++{
++    if (NULL == x->duplicate) {
++        snmp_log(LOG_ERR, "container '%s' does not support duplicate\n",
++                 x->container_name ? x->container_name : "");
++        return NULL;
++    }
++    return x->duplicate(x, ctx, flags);
++}
++
++/*------------------------------------------------------------------
+  * These functions should EXACTLY match the inline version in
+  * container.h. If you change one, change them both.
+  */
+@@ -408,6 +422,24 @@
+     c->find = fnd;
+ }
+ 
++int
++netsnmp_container_data_dup(netsnmp_container *dup, netsnmp_container *c)
++{
++    if (!dup || !c)
++        return -1;
++
++    if (c->container_name)
++        dup->container_name = strdup(c->container_name);
++    dup->compare = c->compare;
++    dup->ncompare = c->ncompare;
++    dup->release = c->release;
++    dup->insert_filter = c->insert_filter;
++    dup->sync = c->sync;
++    dup->flags = c->flags;
++
++    return 0;
++}
++
+ /*------------------------------------------------------------------
+  *
+  * simple comparison routines
--- a/usr/src/cmd/ofusr/infiniband-diags/solaris_set_nodedesc.c	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/ofusr/infiniband-diags/solaris_set_nodedesc.c	Tue Feb 08 00:26:18 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -35,6 +35,8 @@
  */
 #if defined(__SVR4) && defined(__sun)
 
+#pragma ident	"@(#)solaris_set_nodedesc.c	1.2	11/01/25 SMI"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -140,7 +142,7 @@
 	for (i = 0; i < num_devices; ++i) {
 		int	j;
 
-		dev_guid = (uint64_t) ntohll(ibv_get_device_guid(dev_list[i]));
+		dev_guid = (uint64_t)ntohll(ibv_get_device_guid(dev_list[i]));
 		dev_name = (char *)ibv_get_device_name(dev_list[i]);
 		dev_name_len = strlen(dev_name) + 1;
 		for (j = 0; j < nd_read_info_cnt; j++) {
@@ -188,7 +190,8 @@
 		childnode = di_child_node(hcanode);
 		while (childnode != DI_NODE_NIL) {
 			if (di_prop_lookup_int64(DDI_DEV_T_ANY,
-			    childnode, "hca-guid", (int64_t **)&hca_guid) != 1) {
+			    childnode, "hca-guid",
+			    (int64_t **)&hca_guid) != 1) {
 				childnode = di_sibling_node(childnode);
 				continue;
 			} else {
@@ -267,7 +270,8 @@
 		childnode = di_child_node(hcanode);
 		while (childnode != DI_NODE_NIL) {
 			if (di_prop_lookup_int64(DDI_DEV_T_ANY,
-			    childnode, "hca-guid", (int64_t **)&hca_guid) != 1) {
+			    childnode, "hca-guid",
+			    (int64_t **)&hca_guid) != 1) {
 				childnode = di_sibling_node(childnode);
 				continue;
 			} else {
@@ -302,13 +306,13 @@
 		strncpy(nodedesc_ioctl.node_desc_str, desc_str, 64);
 		if (update_flag & NODEDESC_UPDATE_STRING)
 			nodedesc_ioctl.node_desc_update_flag =
-				TAVOR_NODEDESC_UPDATE_STRING;
+			    TAVOR_NODEDESC_UPDATE_STRING;
 		else if (update_flag & NODEDESC_UPDATE_HCA_STRING)
 			nodedesc_ioctl.node_desc_update_flag =
-				TAVOR_NODEDESC_UPDATE_HCA_STRING;
+			    TAVOR_NODEDESC_UPDATE_HCA_STRING;
 		else {
 			IBERROR("Invalid option");
-			exit (-1);
+			exit(-1);
 		}
 		if ((rc = ioctl(devfd, TAVOR_IOCTL_SET_NODEDESC,
 		    (void *)&nodedesc_ioctl)) != 0) {
@@ -320,13 +324,13 @@
 		strncpy(nodedesc_ioctl.node_desc_str, desc_str, 64);
 		if (update_flag & NODEDESC_UPDATE_STRING)
 			nodedesc_ioctl.node_desc_update_flag =
-				HERMON_NODEDESC_UPDATE_STRING;
+			    HERMON_NODEDESC_UPDATE_STRING;
 		else if (update_flag & NODEDESC_UPDATE_HCA_STRING)
 			nodedesc_ioctl.node_desc_update_flag =
-				HERMON_NODEDESC_UPDATE_HCA_STRING;
+			    HERMON_NODEDESC_UPDATE_HCA_STRING;
 		else {
 			IBERROR("Invalid option");
-			exit (-1);
+			exit(-1);
 		}
 		if ((rc = ioctl(devfd, HERMON_IOCTL_SET_NODEDESC,
 		    (void *)&nodedesc_ioctl)) != 0) {
@@ -352,7 +356,6 @@
 	for (i = 0; ib_hca_driver_list[i]; i++)
 		do_driver_read_ioctl(ib_hca_driver_list[i]);
 	di_fini(di_rootnode);
-	return;
 }
 
 static int
@@ -401,6 +404,67 @@
 	fprintf(stderr, "\t\t %s [-v]\n", basename);
 }
 
+/*
+ * Return the Node descriptor string by concatinating
+ * many substrings. The first substring is "optarg" and
+ * the index of the last sub-string is "optind".
+ *
+ * For common nodedescription, add a space at the end,
+ * if there is none.
+ */
+static char *
+nodedesc_substr_cat(char **argv, int argc, boolean_t space_at_end)
+{
+	int	i, start_opt, end_opt;
+	char	*nodedesc_str;
+
+	/* Get the index for first sub-string. */
+	for (start_opt = 0, i = optind; i; i--) {
+		if (argv[i] == NULL)
+			continue;
+
+		if (strcmp(argv[i], optarg) == 0) {
+			start_opt = i;
+			break;
+		}
+	}
+	if (start_opt == 0)
+		return (NULL);
+
+	/* Get the index for last sub-string */
+	for (end_opt = 0, i = optind; i <= argc; i++) {
+		if (i == argc || argv[i][0] == '-') {
+			end_opt = i - 1;
+			break;
+		}
+	}
+	if (end_opt == 0)
+		return (NULL);
+
+	nodedesc_str = malloc(64);
+	strncpy(nodedesc_str, optarg, 64);
+	start_opt++;
+
+	/*
+	 * strcat a space string and then strcat the
+	 * next sub-string.
+	 */
+	for (i = start_opt; i <= end_opt; i++) {
+		strncat(nodedesc_str, " ", 64);
+		strncat(nodedesc_str, argv[i], 64);
+	}
+
+	/*
+	 * Add a space at the end, if the caller has set
+	 * space_at_end and the nodedesc string doesn't
+	 * contain a space at the end.
+	 */
+	if (space_at_end == B_TRUE &&
+	    nodedesc_str[strlen(nodedesc_str)] != ' ')
+		strncat(nodedesc_str, " ", 64);
+	return (nodedesc_str);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -430,18 +494,28 @@
 			break;
 		switch (ch) {
 		case 'N':
-			nodedesc = optarg;
+			nodedesc = nodedesc_substr_cat(argv, argc, B_TRUE);
+			if (!nodedesc) {
+				usage();
+				rc = -1;
+				goto free_and_ret;
+			}
 			update_flag |= NODEDESC_UPDATE_STRING;
 			break;
 		case 'H':
-			hcadesc = optarg;
+			hcadesc = nodedesc_substr_cat(argv, argc, B_FALSE);
+			if (!hcadesc) {
+				usage();
+				rc = -1;
+				goto free_and_ret;
+			}
 			update_flag |= NODEDESC_UPDATE_HCA_STRING;
 			break;
 		case 'G':
 			guid_inited = B_TRUE;
 			hca_guid = (uint64_t)strtoull(optarg, 0, 0);
 			break;
-		case 'v' : 
+		case 'v' :
 			update_flag |= NODEDESC_READ;
 			break;
 		case 'd':
@@ -449,14 +523,16 @@
 			break;
 		default:
 			usage();
-			break;
+			rc = -1;
+			goto free_and_ret;
 		}
 	}
 
 	if (update_flag & NODEDESC_READ) {
 		if (nodedesc || hcadesc || guid_inited == B_TRUE) {
 			usage();
-			exit(1);
+			rc = -1;
+			goto free_and_ret;
 		}
 
 		read_nodedesc();
@@ -468,7 +544,8 @@
 	if (hcadesc && guid_inited == B_FALSE) {
 		IBERROR("No GUID specified for HCA Node descriptor");
 		usage();
-		exit (-1);
+		rc = -1;
+		goto free_and_ret;
 	}
 
 	if (nodedesc) {
@@ -477,16 +554,18 @@
 		if (rc) {
 			IBERROR("write common node descriptor "
 			    "failed");
-			return (rc);
+			rc = -1;
+			goto free_and_ret;
 		}
-	}		
+	}
 
 	if (hcadesc) {
 		rc = update_nodedesc(NULL, hcadesc, hca_guid,
 		    NODEDESC_UPDATE_HCA_STRING);
 		if (rc) {
 			IBERROR("update_hca_noddesc failed");
-			exit (-1);
+			rc = -1;
+			goto free_and_ret;
 		}
 		return (0);
 	}
@@ -496,12 +575,20 @@
 		if (uname(&uts_name) < 0) {
 			IBERROR("Node descriptor unspecified"
 			    "& uts_name failed");
-			exit(-1);
+			rc = -1;
+			goto free_and_ret;
 		}
 		nodedesc = (char *)uts_name.nodename;
 	}
 
 	rc = update_nodedesc(nodedesc, NULL, 0, NODEDESC_UPDATE_STRING);
+
+free_and_ret:
+	if (nodedesc)
+		free(nodedesc);
+	if (hcadesc)
+		free(hcadesc);
+
 	return (rc);
 }
 
--- a/usr/src/cmd/ofusr/qperf/base.patch	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/ofusr/qperf/base.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -11,6 +11,23 @@
  
  
  /*
+@@ -707,10 +709,16 @@
+     ailist = getaddrinfo_port(serverflag ? 0 : ServerName, port, &hints);
+     for (aip = ailist; aip; aip = aip->ai_next) {
+         if (kind == K_SDP) {
++#if (defined(__SVR4) && defined(__sun))
++		aip->ai_family = AF_INET;
++		aip->ai_socktype = SOCK_STREAM;
++		aip->ai_protocol = PROTO_SDP;
++#else
+             if (aip->ai_family == AF_INET || aip->ai_family == AF_INET6)
+                 aip->ai_family = AF_INET_SDP;
+             else
+                 aip->ai_family = 0;
++#endif 
+         } else if (kind == K_SCTP) {
+             if (aip->ai_protocol == IPPROTO_TCP)
+                 aip->ai_protocol = IPPROTO_SCTP;
 diff -r -u /tmp/730054/qperf-0.4.6/src/qperf.c qperf-0.4.6/src/qperf.c
 --- /tmp/730054/qperf-0.4.6/src/qperf.c	Mon Aug 31 00:00:40 2009
 +++ qperf-0.4.6/src/qperf.c	Mon Nov  8 11:10:17 2010
--- a/usr/src/cmd/vim/runtime.patch	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/cmd/vim/runtime.patch	Tue Feb 08 00:26:18 2011 -0800
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \11/01/18*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \11/01/31*\\a[%*\\d]:\ Entering\ directory\ `%f',
 diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
 --- runtime.patched/compiler/jikes.vim	2004-06-07 07:32:36.000000000 -0700
 +++ runtime/compiler/jikes.vim	2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/lib/slang/METADATA	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/lib/slang/METADATA	Tue Feb 08 00:26:18 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             slang
-VERSION:          2.2.2
+VERSION:          2.2.3
 DESCRIPTION:      Library designed to allow a developer to create robust multi-platform software
 LICENSE:          GPLv2
 PACKAGE:          SUNWslang SUNWslangr
-PROJECT_URL:      http://www.s-lang.org/
-SOURCE_DOWNLOAD:  ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.2.tar.bz2
+PROJECT_URL:      http://www.jedsoft.org/slang/
+SOURCE_DOWNLOAD:  ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.3.tar.bz2
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/slang
 OSR:              9851
--- a/usr/src/lib/slang/Makefile.sfw	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/lib/slang/Makefile.sfw	Tue Feb 08 00:26:18 2011 -0800
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-
-#ident	"@(#)Makefile.sfw	1.3	10/03/16 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.4	11/01/11 SMI"
+#
 
 include ../Makefile.lib
 
@@ -32,51 +31,49 @@
 # Macros
 #
 
-VER = $(COMPONENT_VERSION:sh)
 PROJECT = $(COMPONENT_NAME:sh)
-PROD = $(PROJECT)-$(VER)
-PROD64 = $(PROD)-64
+VER = $(PROJECT)-$(COMPONENT_VERSION:sh)
+VER64 = $(VER)-64
 PKG = library/slang
-BZFILE = $(PROD).tar.bz2
-
-POST_PROCESS_BIN = $(SRC)/tools/post_process \
-	$(ROOTBIN)/slsh
-
-POST_PROCESS_LIB32 = $(SRC)/tools/post_process_so \
-	$(ROOTLIB)/libslang.so.$(VER) \
-	$(ROOTLIB)/slang/v2/modules/*.so
-
-POST_PROCESS_LIB64 = $(SRC)/tools/post_process_so \
-	$(ROOTLIB64)/libslang.so.$(VER) \
-	$(ROOTLIB64)/slang/v2/modules/*.so
+TARBALL = $(COMPONENT_ARCHIVE:sh)
 
 POST_PROCESS_MAN = $(SRC)/tools/sunman \
 	-n "$(PROJECT)" -p "$(PKG)" -s Volatile \
-	$(ROOTMAN1)/slsh.1
+	"$(ROOTMAN1)/slsh.1"
 
 # Options for configure script
+CONFIGURE_OPTIONS += $(SFW_ENV)
+CONFIGURE_OPTIONS += INSTALL="$(INSTALL)"
 CONFIGURE_OPTIONS += --sysconfdir=$(CFGETC)/slsh
 CONFIGURE_OPTIONS += --with-pcre="$(ROOT)$(CFGPREFIX)"
 CONFIGURE_OPTIONS += --with-pcreinc="$(ROOTINCLUDE)/pcre"
 CONFIGURE_OPTIONS += --with-z="$(ROOT)$(CFGPREFIX)"
 
+CONFIGURE_OPTIONS32 = $(CONFIGURE_OPTIONS)
+CONFIGURE_OPTIONS32 += CC="$(CC)"
+CONFIGURE_OPTIONS32 += CFLAGS="$(CFLAGS) $(C99_DISABLE) $(XREGSFLAG)"
+CONFIGURE_OPTIONS32 += LDFLAGS="$(LDFLAGS.lib) -M $(SRC)/cmd/mapfile_noexstk -z ignore"
+
+CONFIGURE_OPTIONS64 = $(CONFIGURE_OPTIONS)
+CONFIGURE_OPTIONS64 += --libdir=$(CFGLIB64)
+CONFIGURE_OPTIONS64 += CC="$(CC64)"
+CONFIGURE_OPTIONS64 += CFLAGS="$(CFLAGS64) $(C99_DISABLE) $(XREGSFLAG)"
+CONFIGURE_OPTIONS64 += LDFLAGS="$(CFLAGS64) $(LDFLAGS.lib) -M $(SRC)/cmd/mapfile_noexstk -z ignore"
+
+# Environment for target install (required by install-proto and friends)
+INSTALL_ENV = SRC="$(SRC)"
+INSTALL_ENV += ROOT="$(ROOT)"
+
 #
 # Targets
 #
 
 all: all32 all64
 
-$(PROD)/configure $(PROD64)/configure: $(BZFILE)
-	$(MKDIR) -p tmp
-	/usr/bin/bzcat $^ | (cd tmp; $(TAR) xopf -)
-	$(MV) tmp/$(PROD) $(@D)
-	$(RMDIR) tmp
-	$(TOUCH) $@
-
 install: install32 install64
 
 clean:
-	-rm -rf $(PROD) $(PROD64)
+	-rm -rf $(VER) $(VER64)
 
 install_h:
 
@@ -84,52 +81,42 @@
 # Targets (32-bit)
 #
 
-$(PROD)/config.status: $(PROD)/configure
-	(cd $(PROD); env - ./configure \
-	    $(CONFIGURE_OPTIONS) \
-	    CC="$(CC)" \
-	    CFLAGS="$(CFLAGS) $(C99_DISABLE) $(XREGSFLAG)" \
-	    LDFLAGS="$(LDFLAGS.lib) \
-		-M $(SRC)/cmd/mapfile_noexstk \
-		-z ignore" \
-	    MAKE=$(CCSMAKE))
+$(VER)/config.status: $(VER)/configure
+	(cd $(VER); env - \
+	    CONFIG_SHELL=$(CONFIG_SHELL) \
+	    $(CONFIG_SHELL) ./configure $(CONFIGURE_OPTIONS32))
 
-all32: $(PROD)/config.status
-	(cd $(PROD); env - $(CCSMAKE) MAKE=$(CCSMAKE))
+all32: $(VER)/config.status
+	(cd $(VER); env - $(SFW_MAKE))
+
+$(VER)/configure: $(VER)/$(SFW_STAMP_UNPACKED)
+	$(TOUCH) $@
 
 install32: all32
-	(cd $(PROD); env - $(CCSMAKE) -e install \
-	    MAKE=$(CCSMAKE) \
+	(cd $(VER); env - $(INSTALL_ENV) $(SFW_MAKE) install \
 	    DESTDIR="$(ROOT)")
-	$(POST_PROCESS_BIN)
-	$(POST_PROCESS_LIB32)
 	$(POST_PROCESS_MAN)
 
 #
 # Targets (64-bit)
 #
 
-$(PROD64)/config.status: $(PROD64)/configure
-	(cd $(PROD64); env - ./configure \
-	    $(CONFIGURE_OPTIONS) \
-	    --libdir=$(CFGLIB64) \
-	    CC="$(CC64)" \
-	    CFLAGS="$(CFLAGS64) $(C99_DISABLE) $(XREGSFLAG)" \
-	    LDFLAGS="$(CFLAGS64) $(LDFLAGS.lib) \
-		-M $(SRC)/cmd/mapfile_noexstk \
-		-z ignore" \
-	    MAKE=$(CCSMAKE))
+$(VER64)/config.status: $(VER64)/configure
+	(cd $(VER64); env - \
+	    CONFIG_SHELL=$(CONFIG_SHELL) \
+	    $(CONFIG_SHELL) ./configure $(CONFIGURE_OPTIONS64))
 
-all64: $(PROD64)/config.status
-	(cd $(PROD64); env - $(CCSMAKE) MAKE=$(CCSMAKE))
+all64: $(VER64)/config.status
+	(cd $(VER64); env - $(SFW_MAKE))
+
+$(VER64)/configure: $(VER64)/$(SFW_STAMP_UNPACKED)
+	$(TOUCH) $@
 
 install64: all64
-	(cd $(PROD64); env - $(CCSMAKE) -e install \
-	    MAKE=$(CCSMAKE) \
+	(cd $(VER64); env - $(SFW_MAKE) install \
 	    DESTDIR="`/bin/pwd`/.install")
 	$(MKDIR) -p $(ROOTLIB64)
-	(cd $(PROD64)/.install/$(CFGLIB64); $(TAR) cpf - .) | \
+	(cd $(VER64)/.install/$(CFGLIB64); $(TAR) cpf - .) | \
 	    (cd $(ROOTLIB64); $(TAR) xpf -)
-	$(POST_PROCESS_LIB64)
 
 include ../Makefile.targ
Binary file usr/src/lib/slang/slang-2.2.2.tar.bz2 has changed
Binary file usr/src/lib/slang/slang-2.2.3.tar.bz2 has changed
--- a/usr/src/pkgdefs/SUNWhpijs/pkginfo.tmpl	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWhpijs/pkginfo.tmpl	Tue Feb 08 00:26:18 2011 -0800
@@ -19,16 +19,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)pkginfo.tmpl	1.8	10/07/22 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	11/01/21 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
 # and package architecture.
 #
 PKG="SUNWhpijs"
-NAME="hpijs - HP InkJet Server (from HPLIP 3.9.8)"
+NAME="hpijs - HP InkJet Server (from HPLIP 3.10.9)"
 ARCH="ISA"
 VERSION="SFWVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="hpijs - HP InkJet Server (from HPLIP 3.9.8)"
+DESC="hpijs - HP InkJet Server (from HPLIP 3.10.9)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWhpijs/prototype_com	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWhpijs/prototype_com	Tue Feb 08 00:26:18 2011 -0800
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.8	09/10/08 SMI"
+#ident	"@(#)prototype_com	1.9	11/01/21 SMI"
 #
 
 i pkginfo
@@ -117,6 +116,14 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz 0444 root bin
@@ -182,17 +189,32 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-cp1160-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_4020ps-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500mfp.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520mfp-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520ps-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_44in-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_44in-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770_postscript-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1200_postscript-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1100-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1120-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1125-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1200c-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1220c-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1280-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600c-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cm-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cn-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3320-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3325-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3420-hpijs.ppd.gz 0444 root bin
@@ -324,17 +346,20 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d730-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2200_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2400_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f300_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4200_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4210_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4213_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4400_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4500_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f735-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-dj350-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-dj450-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-envy_100_d410_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1000-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1005_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1010-hpijs.ppd.gz 0444 root bin
@@ -409,13 +434,10 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3055-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3100-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3150-hpijs.ppd.gz 0444 root bin
-f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz 0444 root bin
-f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200-ps.ppd.gz 0444 root bin
-f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200_series-ps.ppd.gz 0444 root bin
-f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200se-hpijs.ppd.gz 0444 root bin
-f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200se-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3330-hpijs.ppd.gz 0444 root bin
@@ -534,6 +556,7 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz 0444 root bin
@@ -605,17 +628,32 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-ps.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-ps.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4000_k210-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4105-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4115_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4200_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4255-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4300_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4400_k410-hpijs.ppd.gz 0444 root bin 
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_k710-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_5100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_5105-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110-hpijs.ppd.gz 0444 root bin
@@ -630,11 +668,15 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_6300_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709a-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709n-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7200_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7300_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7400_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_7500_e910-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_d_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_g55-hpijs.ppd.gz 0444 root bin
@@ -663,6 +705,7 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5300-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5400-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k550-hpijs.ppd.gz 0444 root bin
@@ -748,8 +791,13 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a610_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a620_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a630_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a640_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a710_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a820_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b010_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a-m-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b110_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b8500_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c309a_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c3100_series-hpijs.ppd.gz 0444 root bin
@@ -771,6 +819,7 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7200_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c8100_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d110_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5060_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5100_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5300_series-hpijs.ppd.gz 0444 root bin
@@ -781,11 +830,18 @@
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7300_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7400_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7500_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1000-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1100-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b210_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c310_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c410_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz 0444 root bin
+f none usr/share/ppd/SUNWhpijs/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-psc_1000_series-hpijs.ppd.gz 0444 root bin
 f none usr/share/ppd/SUNWhpijs/HP/hp-psc_1100_series-hpijs.ppd.gz 0444 root bin
@@ -831,8 +887,10 @@
 d none usr/lib/cups/backend 0755 root bin
 f none usr/lib/cups/backend/hp 0555 root bin
 d none usr/lib/cups/filter 0755 root bin
+f none usr/lib/cups/filter/hpcac 0555 root bin
 f none usr/lib/cups/filter/hpcups 0555 root bin
 f none usr/lib/cups/filter/hpcupsfax 0555 root bin
+f none usr/lib/cups/filter/pstotiff 0555 root bin
 s none usr/lib/libhpip.so=libhpip.so.0.0.1
 s none usr/lib/libhpip.so.0=libhpip.so.0.0.1
 f none usr/lib/libhpip.so.0.0.1 0555 root bin
@@ -896,6 +954,7 @@
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm3530_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm4730_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6030_mfp-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6040_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6049_mfp-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1514n-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1515n-ps.ppd.gz 0444 root bin
@@ -907,10 +966,24 @@
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3505-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3525-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4005-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4020_series-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4520_series-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225n-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225dn-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp6015-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-designjet_4020ps-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_4500ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_4500mfp.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-designjet_4520mfp-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-designjet_4520ps-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t770_postscript-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t770ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_44in-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_24in-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_44in-ps.ppd.gz 0444 root bin
+f none usr/share/cups/model/SUNWhplip/hp-designjet_t1200_postscript-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_1200-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_1200n-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_1220-ps.ppd.gz 0444 root bin
@@ -937,10 +1010,7 @@
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3030-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3050-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3052-ps.ppd.gz 0444 root bin
-f none usr/share/cups/model/SUNWhplip/hp-laserjet_3200-ps.ppd.gz 0444 root bin
-f none usr/share/cups/model/SUNWhplip/hp-laserjet_3200_series-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3200m-ps.ppd.gz 0444 root bin
-f none usr/share/cups/model/SUNWhplip/hp-laserjet_3200se-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3300_3310_3320-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3380-ps.ppd.gz 0444 root bin
 f none usr/share/cups/model/SUNWhplip/hp-laserjet_3390-ps.ppd.gz 0444 root bin
@@ -1029,40 +1099,40 @@
 
 # Common files
 d none usr/share/doc 0755 root other
-d none usr/share/doc/hplip-3.9.8 0755 root bin
-f none usr/share/doc/hplip-3.9.8/COPYING 0444 root bin
-f none usr/share/doc/hplip-3.9.8/README_LIBJPG 0444 root bin
-f none usr/share/doc/hplip-3.9.8/commandline.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/copying.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/copyright 0444 root bin
-f none usr/share/doc/hplip-3.9.8/devicemanager.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/faxtrouble.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/gettinghelp.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/hpscan.html 0444 root bin
-d none usr/share/doc/hplip-3.9.8/images 0755 root bin
-f none usr/share/doc/hplip-3.9.8/images/favicon.ico 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/print.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_actions.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_fax.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_print_control.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_print_settings.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_status.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/toolbox_supplies.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/images/xsane.png 0444 root bin
-f none usr/share/doc/hplip-3.9.8/index.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/mainttask.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/plugins.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/print.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/printing.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/printoptions.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/printtroubleshooting.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/scanning.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/scantrouble.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/sendfax.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/setup.html 0444 root bin
-d none usr/share/doc/hplip-3.9.8/styles 0755 root bin
-f none usr/share/doc/hplip-3.9.8/styles/css.css 0444 root bin
-f none usr/share/doc/hplip-3.9.8/systray.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/troubleshooting.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/uninstalling.html 0444 root bin
-f none usr/share/doc/hplip-3.9.8/upgrading.html 0444 root bin
+d none usr/share/doc/hplip-3.10.9 0755 root bin
+f none usr/share/doc/hplip-3.10.9/COPYING 0444 root bin
+f none usr/share/doc/hplip-3.10.9/README_LIBJPG 0444 root bin
+f none usr/share/doc/hplip-3.10.9/commandline.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/copying.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/copyright 0444 root bin
+f none usr/share/doc/hplip-3.10.9/devicemanager.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/faxtrouble.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/gettinghelp.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/hpscan.html 0444 root bin
+d none usr/share/doc/hplip-3.10.9/images 0755 root bin
+f none usr/share/doc/hplip-3.10.9/images/favicon.ico 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/print.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_actions.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_fax.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_print_control.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_print_settings.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_status.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/toolbox_supplies.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/images/xsane.png 0444 root bin
+f none usr/share/doc/hplip-3.10.9/index.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/mainttask.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/plugins.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/print.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/printing.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/printoptions.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/printtroubleshooting.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/scanning.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/scantrouble.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/sendfax.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/setup.html 0444 root bin
+d none usr/share/doc/hplip-3.10.9/styles 0755 root bin
+f none usr/share/doc/hplip-3.10.9/styles/css.css 0444 root bin
+f none usr/share/doc/hplip-3.10.9/systray.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/troubleshooting.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/uninstalling.html 0444 root bin
+f none usr/share/doc/hplip-3.10.9/upgrading.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWslang/copyright	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslang/copyright	Tue Feb 08 00:26:18 2011 -0800
@@ -317,7 +317,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
--- a/usr/src/pkgdefs/SUNWslang/pkginfo.tmpl	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslang/pkginfo.tmpl	Tue Feb 08 00:26:18 2011 -0800
@@ -20,10 +20,10 @@
 #
 
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.3	10/07/22 SMI"
+#ident	"@(#)pkginfo.tmpl	1.4	11/01/11 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="S-Lang Library (2.2.2)"
+DESC="S-Lang Library (2.2.3)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWslang/prototype_com	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslang/prototype_com	Tue Feb 08 00:26:18 2011 -0800
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)prototype_com	1.2	09/12/19 SMI"
+#ident	"@(#)prototype_com	1.3	11/01/11 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -47,19 +46,20 @@
 
 d none usr 755 root sys
 d none usr/bin 0755 root bin
-f none usr/bin/slsh 0755 root bin
+f none usr/bin/slsh 0555 root bin
 d none usr/include 0755 root bin
 f none usr/include/slang.h 0644 root bin
 f none usr/include/slcurses.h 0644 root bin
 d none usr/lib 0755 root bin
-f none usr/lib/libslang.so.2.2.2 0644 root bin
-s none usr/lib/libslang.so.2=libslang.so.2.2.2
-s none usr/lib/libslang.so=libslang.so.2.2.2
+f none usr/lib/libslang.so.2.2.3 0644 root bin
+s none usr/lib/libslang.so.2=libslang.so.2.2.3
+s none usr/lib/libslang.so=libslang.so.2.2.3
 d none usr/lib/pkgconfig 0755 root other
 f none usr/lib/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/slang 0755 root bin
 d none usr/lib/slang/v2 0755 root bin
 d none usr/lib/slang/v2/modules 0755 root bin
+f none usr/lib/slang/v2/modules/csv-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/fcntl-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/iconv-module.so 0644 root bin
@@ -104,6 +104,7 @@
 f none usr/share/slsh/autoload.sl 0644 root bin
 d none usr/share/slsh/cmaps 0755 root bin
 f none usr/share/slsh/cmaps/cool.map 0644 root bin
+f none usr/share/slsh/cmaps/coolwarm.map 0644 root bin
 f none usr/share/slsh/cmaps/copper.map 0644 root bin
 f none usr/share/slsh/cmaps/drywet.map 0644 root bin
 f none usr/share/slsh/cmaps/ds9b.map 0644 root bin
@@ -126,12 +127,14 @@
 f none usr/share/slsh/cmaps/topo.map 0644 root bin
 f none usr/share/slsh/cmaps/wysiwyg.map 0644 root bin
 f none usr/share/slsh/cmdopt.sl 0644 root bin
+f none usr/share/slsh/csv.sl 0644 root bin
 f none usr/share/slsh/fcntl.sl 0644 root bin
 f none usr/share/slsh/fork.sl 0644 root bin
 f none usr/share/slsh/glob.sl 0644 root bin
 d none usr/share/slsh/help 0755 root bin
 f none usr/share/slsh/help/arrayfuns.hlp 0644 root bin
 f none usr/share/slsh/help/cmdopt.hlp 0644 root bin
+f none usr/share/slsh/help/csvfuns.hlp 0644 root bin
 f none usr/share/slsh/help/forkfuns.hlp 0644 root bin
 f none usr/share/slsh/help/glob.hlp 0644 root bin
 f none usr/share/slsh/help/onigfuns.hlp 0644 root bin
@@ -143,6 +146,8 @@
 f none usr/share/slsh/help/randfuns.hlp 0644 root bin
 f none usr/share/slsh/help/readascii.hlp 0644 root bin
 f none usr/share/slsh/help/require.hlp 0644 root bin
+f none usr/share/slsh/help/setfuns.hlp 0644 root bin
+f none usr/share/slsh/help/slsmg.hlp 0644 root bin
 f none usr/share/slsh/help/sockfuns.hlp 0644 root bin
 f none usr/share/slsh/help/structfuns.hlp 0644 root bin
 f none usr/share/slsh/iconv.sl 0644 root bin
@@ -159,17 +164,20 @@
 d none usr/share/slsh/rline 0755 root bin
 f none usr/share/slsh/rline/complete.sl 0644 root bin
 f none usr/share/slsh/rline/editfuns.sl 0644 root bin
+f none usr/share/slsh/rline/editor.sl 0644 root bin
 f none usr/share/slsh/rline/emacskeys.sl 0644 root bin
 f none usr/share/slsh/rline/history.sl 0644 root bin
+f none usr/share/slsh/rline/histsrch.sl 0644 root bin
 f none usr/share/slsh/rline/slrline.rc 0644 root bin
 f none usr/share/slsh/rline/vikeys.sl 0644 root bin
 d none usr/share/slsh/scripts 0755 root bin
-f none usr/share/slsh/scripts/jpegsize 0755 root bin
-f none usr/share/slsh/scripts/lsrpm 0755 root bin
-f none usr/share/slsh/scripts/sldb 0755 root bin
-f none usr/share/slsh/scripts/slprof 0755 root bin
-f none usr/share/slsh/scripts/svnsh 0755 root bin
+f none usr/share/slsh/scripts/jpegsize 0555 root bin
+f none usr/share/slsh/scripts/lsrpm 0555 root bin
+f none usr/share/slsh/scripts/sldb 0555 root bin
+f none usr/share/slsh/scripts/slprof 0555 root bin
+f none usr/share/slsh/scripts/svnsh 0555 root bin
 f none usr/share/slsh/select.sl 0644 root bin
+f none usr/share/slsh/setfuns.sl 0644 root bin
 f none usr/share/slsh/sldb.sl 0644 root bin
 f none usr/share/slsh/sldbcore.sl 0644 root bin
 f none usr/share/slsh/sldbsock.sl 0644 root bin
--- a/usr/src/pkgdefs/SUNWslang/prototype_i386	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslang/prototype_i386	Tue Feb 08 00:26:18 2011 -0800
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)prototype_i386	1.2	09/12/19 SMI"
+#ident	"@(#)prototype_i386	1.3	11/01/11 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -42,14 +41,15 @@
 !include prototype_com
 
 d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libslang.so.2.2.2 0644 root bin
-s none usr/lib/amd64/libslang.so.2=libslang.so.2.2.2
-s none usr/lib/amd64/libslang.so=libslang.so.2.2.2
+f none usr/lib/amd64/libslang.so.2.2.3 0644 root bin
+s none usr/lib/amd64/libslang.so.2=libslang.so.2.2.3
+s none usr/lib/amd64/libslang.so=libslang.so.2.2.3
 d none usr/lib/amd64/pkgconfig 0755 root other
 f none usr/lib/amd64/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/amd64/slang 0755 root bin
 d none usr/lib/amd64/slang/v2 0755 root bin
 d none usr/lib/amd64/slang/v2/modules 0755 root bin
+f none usr/lib/amd64/slang/v2/modules/csv-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/fcntl-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/iconv-module.so 0644 root bin
--- a/usr/src/pkgdefs/SUNWslang/prototype_sparc	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslang/prototype_sparc	Tue Feb 08 00:26:18 2011 -0800
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)prototype_sparc	1.2	09/12/19 SMI"
+#ident	"@(#)prototype_sparc	1.3	11/01/11 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -42,14 +41,15 @@
 !include prototype_com
 
 d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/libslang.so.2.2.2 0644 root bin
-s none usr/lib/sparcv9/libslang.so.2=libslang.so.2.2.2
-s none usr/lib/sparcv9/libslang.so=libslang.so.2.2.2
+f none usr/lib/sparcv9/libslang.so.2.2.3 0644 root bin
+s none usr/lib/sparcv9/libslang.so.2=libslang.so.2.2.3
+s none usr/lib/sparcv9/libslang.so=libslang.so.2.2.3
 d none usr/lib/sparcv9/pkgconfig 0755 root other
 f none usr/lib/sparcv9/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/sparcv9/slang 0755 root bin
 d none usr/lib/sparcv9/slang/v2 0755 root bin
 d none usr/lib/sparcv9/slang/v2/modules 0755 root bin
+f none usr/lib/sparcv9/slang/v2/modules/csv-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/fcntl-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/iconv-module.so 0644 root bin
--- a/usr/src/pkgdefs/SUNWslangr/copyright	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslangr/copyright	Tue Feb 08 00:26:18 2011 -0800
@@ -317,7 +317,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
--- a/usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl	Tue Feb 08 00:26:18 2011 -0800
@@ -20,9 +20,9 @@
 #
 
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)pkginfo.tmpl	1.3	10/07/22 SMI"
+#ident	"@(#)pkginfo.tmpl	1.4	11/01/11 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="S-Lang Library (2.2.2) (root)"
+DESC="S-Lang Library (2.2.3) (root)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/tools/install-proto.pl	Sat Jan 22 12:31:09 2011 -0800
+++ b/usr/src/tools/install-proto.pl	Tue Feb 08 00:26:18 2011 -0800
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-proto.pl	1.5	10/01/08 SMI"
+#ident	"@(#)install-proto.pl	1.6	11/01/11 SMI"
 #
 # BSD compatible install(1b) that honors DESTDIR and performs SFW post
 # processing on various file types
@@ -41,7 +40,7 @@
 my $progname = basename($0);
 
 defined($PERL) || ($PERL = $);	# fallback to this version of perl
-defined($PYTHON) || ($PYTHON = '/usr/bin/python2.4');	# fallback to this version of perl
+defined($PYTHON) || ($PYTHON = '/usr/bin/python2.4');	# fallback to this version of python
 
 (defined($DESTDIR)) || ($DESTDIR = $ENV{'ROOT'});
 
@@ -61,7 +60,6 @@
 
 	# if the path matches the pattern, it's a man page.
 	($path =~ /.*\/man\/man.+\/.*\.[1-9].*/) && ($line = 'roff');
-	($line =~ /usr\/bin\/env script/) && ($line = 'perl script');
 	
 	return($line);
 }
sustaining/oi_151a/sfw-gate