Import sfw build 154
Bugs Fixed
----------
6799069 git perl modules installed with wrong permissions (0400)
6842010 Upgrade git to latest newer release (1.6.3.1 or newer)
6946451 GNU tar version 1.23 (139099-04) dumps core creating incremental archives of ZFS snapshots
6952545 SEA code removal (SFW changes)
6972529 Insufficient privileges to execute "cdrw" from 1.23 gtar info script
6985046 Upgrade UnixODBC to 2.3.0
6989483 [CVE-2010-2542] Git 'gitdir' Remote Buffer Overflow Vulnerability
6989959 lftp no longer links agains libgnutls
6991945 gtar 1.23 - restore not working with multi volumes option but backup works
6993297 Please remove LCMS Python 2.4 bindings
6997156 lftp upgrade to version 4.0.10
6997418 Upgrade Samba to v3.5.6
6998065 libibverbs solaris extensions associate wrong HCA device with uverbs minor node
6998086 Fix base patch for libsdp, unnecessary update due to SCCS expansion
6998087 Remove unnecessary configure "BJD" instrumentation from ibutils base.patch
6998307 SUNWswig depends on SUNWPython but no longer needs to
6999990 Upgrade GNU tar (gtar) to version 1.25
7001496 Patch or live upgrading Samba to 3.5.x releasse can bite.
--- a/usr/src/Makefile.master Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/Makefile.master Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.master 1.49 10/10/28 SMI"
+#pragma ident "@(#)Makefile.master 1.50 10/11/03 SMI"
#
# Makefile.master, global definitions for system source
#
@@ -184,6 +184,7 @@
CFGMAN= $(CFGPREFIX)/share/man
CFGMAN1= $(CFGMAN)/man1
CFGMAN3= $(CFGMAN)/man3
+CFGMAN4= $(CFGMAN)/man4
CFGMAN5= $(CFGMAN)/man5
CFGMAN6= $(CFGMAN)/man6
CFGDOC= $(CFGPREFIX)/share/doc
@@ -209,6 +210,7 @@
ROOTUSRSBIN64= $(ROOT)$(CFGUSRSBIN64)
ROOTMAN1= $(ROOT)$(CFGMAN1)
ROOTMAN3= $(ROOT)$(CFGMAN3)
+ROOTMAN4= $(ROOT)$(CFGMAN4)
ROOTMAN5= $(ROOT)$(CFGMAN5)
ROOTMAN6= $(ROOT)$(CFGMAN6)
ROOTDOC= $(ROOT)$(CFGDOC)
--- a/usr/src/Targetdirs Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/Targetdirs Mon Nov 29 01:15:23 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Targetdirs 1.259 10/11/01 SMI"
+# ident "@(#)Targetdirs 1.260 10/11/18 SMI"
#
#
@@ -278,6 +278,7 @@
/usr/lib/emacs/23.1 \
/usr/lib/ejabberd \
/usr/lib/erlang \
+ /usr/lib/git-core \
/usr/lib/gutenprint \
/usr/lib/gutenprint/5.2 \
/usr/lib/gutenprint/5.2/modules \
--- a/usr/src/cmd/git/METADATA Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/git/METADATA Mon Nov 29 01:15:23 2010 -0800
@@ -1,10 +1,10 @@
NAME: git
-VERSION: 1.5.6.5
+VERSION: 1.7.3.2
DESCRIPTION: GIT source management system
LICENSE: GPLv2
PACKAGE: SUNWgit
-PROJECT_URL: http://git.or.cz/
-SOURCE_DOWNLOAD: http://kernel.org/pub/software/scm/git/git-1.5.6.5.tar.gz
+PROJECT_URL: http://git-scm.com/
+SOURCE_DOWNLOAD: http://kernel.org/pub/software/scm/git/git-1.7.3.2.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/utility/git
OSR: 8586
--- a/usr/src/cmd/git/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/git/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -19,28 +19,27 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.4 09/08/23 SMI"
+# ident "@(#)Makefile.sfw 1.5 10/11/18 SMI"
DESTDIR=$(ROOT)
PREFIX=$(CFGPREFIX)
-VER=git-1.5.6.5
+VER=git-1.7.3.2
include ../Makefile.cmd
C99MODE=$(C99_DISABLE)
SFW_PATH="$(ROOT)/bin:/usr/ccs/bin:/usr/bin:/usr/sfw/bin:$(PATH)"
-MANPAGES=git-manpages-1.5.6.5
+MANPAGES=git-manpages-1.7.3.2
DOC=$(VER)/Documentation
MANDIR=$(PREFIX)/share/man
MAN1DIR=$(MANDIR)/man1
MAN4DIR=$(MANDIR)/man4
MAN5DIR=$(MANDIR)/man5
INSTALL=install
-PERL_LIB:sh = /usr/perl5/bin/perl -MConfig -e 'print "$Config{installvendorarch}"'
+PERL_LIB:sh = /usr/perl5/5.10.0/bin/perl -MConfig -e 'print "$Config{installvendorarch}"'
all: $(VER)/Makefile
@@ -50,20 +49,20 @@
fi ; \
rm -f Makefile ; \
sed -e 's|$$(prefix)/lib|$(PERL_LIB)|' \
- -e 's|.(instdir_SQ|$$(DESTDIR)&|g' \
- -e 's|echo $$(DESTDIR)|echo |' \
+ -e '/15009/d' \
Makefile.orig > Makefile )
(cd $(VER); env - \
PATH=$(SFW_PATH) \
CC="$(CC)" \
./configure \
--without-openssl \
- --prefix=$(PREFIX))
+ --prefix=$(PREFIX) \
+ --libexecdir=/usr/lib \
+ --with-perl=/usr/perl5/5.10.0/bin/perl)
(cd $(VER); env - \
MAKE=$(GMAKE) \
PATH=$(SFW_PATH) \
DESTDIR=$(ROOT) \
- PERL_PATH=$(PERL) \
NO_PERL_MAKEMAKER=1 \
V=1 \
CC="$(CC)" \
@@ -83,13 +82,13 @@
done
-$(VER)/Makefile: $(VER).tar.gz
- gzip -dc $(VER).tar.gz | tar xopf -
+$(VER)/Makefile: $(VER).tar.bz2
+ bzip2 -dc $(VER).tar.bz2 | tar xopf -
touch $(VER)/Makefile
-sunman: $(MANPAGES).tar.gz
+sunman: $(MANPAGES).tar.bz2
$(MKDIR) -p sunman
- mkdir -p tmp; gzip -dc $(MANPAGES).tar.gz | (cd tmp; tar xopf -)
+ mkdir -p tmp; bzip2 -dc $(MANPAGES).tar.bz2 | (cd tmp; tar xopf -)
mv tmp/man1/* sunman; rmdir tmp/man1
mv tmp/man5/* sunman; rmdir tmp/man5
mv tmp/man7/* sunman; rmdir tmp/man7; rmdir tmp
Binary file usr/src/cmd/git/git-1.5.6.5.tar.gz has changed
Binary file usr/src/cmd/git/git-1.7.3.2.tar.bz2 has changed
Binary file usr/src/cmd/git/git-manpages-1.5.6.5.tar.gz has changed
Binary file usr/src/cmd/git/git-manpages-1.7.3.2.tar.bz2 has changed
--- a/usr/src/cmd/gtar/METADATA Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/gtar/METADATA Mon Nov 29 01:15:23 2010 -0800
@@ -1,10 +1,10 @@
NAME: tar
-VERSION: 1.23
+VERSION: 1.25
DESCRIPTION: GNU tar
LICENSE: GPLv3
PACKAGE: SUNWgtar
PROJECT_URL: http://directory.fsf.org/project/tar/
-SOURCE_DOWNLOAD: http://ftp.gnu.org/gnu/tar/tar-1.23.tar.bz2
+SOURCE_DOWNLOAD: http://ftp.gnu.org/gnu/tar/tar-1.25.tar.bz2
SUPPORT: B
BUGTRAQ: solaris/utility/gtar
OSR: 10261
--- a/usr/src/cmd/gtar/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/gtar/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -20,16 +20,20 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.13 09/05/05 SMI"
+#ident "@(#)Makefile.sfw 1.14 10/11/16 SMI"
#
include ../Makefile.cmd
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
TARBALL = $(VER).tar.bz2
+PATCHES:sh = echo Patches/*.diff
+GPATCH_FLAGS = -p1
+
+# workaround for CR 6998994
+sparc_COPTFLAG = -xO2
# configure(1) options to use
# a default --prefix and --mandir are set in Makefile.master
@@ -54,6 +58,9 @@
all: $(VER)/config.status
(cd $(VER); env - $(CCSMAKE) $(TARGET) $(TARGET_ENV))
+test: all
+ (cd $(VER); env - $(CCSMAKE) check $(TARGET_ENV))
+
install: install-protofix
install-target: $(VER)/config.status
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gtar/Patches/verify.diff Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,25 @@
+From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <[email protected]>
+Date: Mon, 15 Nov 2010 08:07:53 +0000
+Subject: tar: fix --verify option, which broke in 1.24
+
+* src/compare.c (verify_volume): Decode the header before invoking
+diff_archive, as diff_archive no longer does this as of the
+2010-06-28 commit. Also, don't try to invoke diff_archive on a
+zero block.
+---
+diff --git a/src/compare.c b/src/compare.c
+index 6b7e6d8..f3112c6 100644
+--- a/src/compare.c
++++ b/src/compare.c
+@@ -611,8 +611,10 @@ verify_volume (void)
+ (0, 0, _("A lone zero block at %s"),
+ STRINGIFY_BIGINT (current_block_ordinal (), buf)));
+ }
++ continue;
+ }
+
++ decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
+ diff_archive ();
+ tar_stat_destroy (¤t_stat_info);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gtar/Patches/xgetcwd.diff Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,18 @@
+--- tar-1.25/gnu/xgetcwd.c.orig Mon Nov 8 06:23:04 2010
++++ tar-1.25/gnu/xgetcwd.c Mon Nov 8 06:29:04 2010
+@@ -36,7 +36,14 @@
+ char *
+ xgetcwd (void)
+ {
+- char *cwd = getcwd (NULL, 0);
++ char *cwd;
++#ifdef HAVE_PARTLY_WORKING_GETCWD
++ cwd = getcwd (NULL, 0);
++#else
++ cwd = malloc(PATH_MAX);
++ if (cwd)
++ getcwd (cwd, PATH_MAX);
++#endif
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
+ return cwd;
Binary file usr/src/cmd/gtar/tar-1.23.tar.bz2 has changed
Binary file usr/src/cmd/gtar/tar-1.25.tar.bz2 has changed
--- a/usr/src/cmd/lftp/METADATA Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/lftp/METADATA Mon Nov 29 01:15:23 2010 -0800
@@ -1,10 +1,10 @@
NAME: lftp
-VERSION: 3.7.15
+VERSION: 4.0.10
DESCRIPTION: FTP client
LICENSE: GPLv3
PACKAGE: SUNWlftpr SUNWlftpu
PROJECT_URL: http://lftp.yar.ru/
-SOURCE_DOWNLOAD: http://ftp.yars.free.net/pub/source/lftp/lftp-3.7.15.tar.bz2
+SOURCE_DOWNLOAD: http://ftp.yars.free.net/pub/source/lftp/lftp-4.0.10.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/utility/lftp
OSR: 12244
--- a/usr/src/cmd/lftp/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/lftp/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.sfw 1.5 09/07/31 SMI"
+#pragma ident "@(#)Makefile.sfw 1.6 10/11/03 SMI"
#
include ../Makefile.cmd
@@ -53,6 +52,9 @@
# lftp.1 is not recognized as 'roff' file type and therefore $(MANSCRIPT)
# is not used by $(INSTALL_PROTO). It must be done manually.
$(SED) -f $(MANSCRIPT) $(VER)/doc/lftp.1 > $(ROOTMAN1)/lftp.1
+ # man pages for configuration files belong to section 4 on Solaris
+ $(RM) $(ROOTMAN4)/lftp.conf.4
+ $(MV) $(ROOTMAN5)/lftp.conf.5 $(ROOTMAN4)/lftp.conf.4
install-protofix: install-target
for pkg in $(COMPONENT_PACKAGES:sh) ; do \
--- a/usr/src/cmd/lftp/Patches/config.h.in.patch Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- lib/config.h.in.orig Thu Jul 30 01:59:52 2009
-+++ lib/config.h.in Thu Jul 30 02:09:02 2009
-@@ -1312,13 +1312,14 @@
- nothing if this is not supported. Do not define if restrict is
- supported directly. */
- #undef restrict
--/* Work around a bug in Sun C++: it does not support _Restrict, even
-- though the corresponding Sun C compiler does, which causes
-- "#define restrict _Restrict" in the previous line. Perhaps some future
-- version of Sun C++ will work with _Restrict; if so, it'll probably
-- define __RESTRICT, just as Sun C does. */
-+/* Work around a bug in Sun C++: it does not support _Restrict or
-+ __restrict__, even though the corresponding Sun C compiler ends up with
-+ "#define restrict _Restrict" or "#define restrict __restrict__" in the
-+ previous line. Perhaps some future version of Sun C++ will work with
-+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
- #if defined __SUNPRO_CC && !defined __RESTRICT
- # define _Restrict
-+# define __restrict__
- #endif
-
- /* Define to `unsigned int' if <sys/types.h> does not define. */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/lftp/Patches/lftp.conf.5.patch Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,8 @@
+--- doc/lftp.conf.5.orig st lis 3 06:16:28 2010
++++ doc/lftp.conf.5 st lis 3 06:16:17 2010
+@@ -1,4 +1,4 @@
+-.TH LFTP.CONF 5
++.TH LFTP.CONF 4
+ .SH NAME
+ lftp.conf \- the global configuration file for lftp
+
Binary file usr/src/cmd/lftp/lftp-3.7.15.tar.bz2 has changed
Binary file usr/src/cmd/lftp/lftp-4.0.10.tar.bz2 has changed
--- a/usr/src/cmd/net-snmp/install-snmp Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/net-snmp/install-snmp Mon Nov 29 01:15:23 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-snmp 1.4 10/04/22 SMI"
+#ident "@(#)install-snmp 1.5 10/09/30 SMI"
set -o errexit
@@ -86,7 +86,6 @@
# copy over init-script, method and manifest
_install N svc-net-snmp ${IROOT}/lib/svc/method/svc-net-snmp 555
_install N net-snmp.xml ${IROOT}/lib/svc/manifest/application/management/net-snmp.xml 444
-_install N seaport.xml ${IROOT}/lib/svc/manifest/application/management/seaport.xml 444
#copy LM-MIB
_install N ${VER64}/mibs/LM-SENSORS-MIB.txt ${IROOT}/etc/net-snmp/snmp/mibs/LM-SENSORS-MIB.txt 644
--- a/usr/src/cmd/net-snmp/seaport.xml Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- 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 2009 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
-
- ident "@(#)seaport.xml 1.1 09/07/06 SMI"
-
- NOTE: This service description is not editable; its contents
- may be overwritten by package or patch operations, including
- operating system upgrade. Make customizations in a different
- file.
-
- Service manifest for setting SEA port for Net-SNMP daemon
--->
-
-<service_bundle type='manifest' name='SUNWsmmgt:seaport'>
-
-<service
- name='application/management/seaport'
- type='service'
- version='1'>
-
- <create_default_instance enabled='false' />
-
- <single_instance />
-
- <dependency
- name='milestone'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/milestone/sysconfig' />
- </dependency>
-
- <dependency
- name='network'
- grouping='require_all'
- restart_on='restart'
- type='service'>
- <service_fmri value='svc:/milestone/network' />
- </dependency>
-
- <dependency
- name='name-services'
- grouping='optional_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/milestone/name-services' />
- </dependency>
-
- <!--
- The start method modifies /etc/snmp/conf/snmpdx.reg,
- therefore we need a writable root filesystem.
- -->
- <dependency
- name='filesystem'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local' />
- </dependency>
-
- <dependency
- name='system-log'
- grouping='optional_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/system-log' />
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/usr/lib/net-snmp/setseaport'
- timeout_seconds='60'>
- </exec_method>
-
- <exec_method
- type='method'
- name='stop'
- exec=':true'
- timeout_seconds='60'>
- </exec_method>
-
- <property_group name='startd' type='framework'>
- <propval name='duration' type='astring' value='transient' />
- <propval name='action_authorization' type='astring'
- value='solaris.smf.manage.seaport' />
- <propval name='value_authorization' type='astring'
- value='solaris.smf.manage.seaport' />
- </property_group>
-
- <stability value='Unstable' />
-
- <template>
- <common_name>
- <loctext xml:lang='C'>
- setting SEA port for Net-SNMP daemon
- </loctext>
- </common_name>
-
- <documentation>
- <manpage title='snmpd' section='1M'
- manpath='/usr/share/man/' />
- </documentation>
-
- </template>
-
-</service>
-
-</service_bundle>
--- a/usr/src/cmd/net-snmp/sun-patches/001.6859610.patch Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- sun/agent/sea/setseaport Tue Jan 27 21:08:28 2004
-+++ sun.mod/agent/sea/setseaport Sun Jul 12 22:12:33 2009
-@@ -2,7 +2,7 @@
- #If a port entry is set to 161 change it to a free port
- REGFILE="/etc/snmp/conf/snmpdx.reg"
- TMPFILE="/etc/snmp/conf/snmpdx.tmp"
--BIN="/usr/lib/sma_snmp"
-+BIN="/usr/lib/net-snmp"
- EGREP="/usr/bin/egrep"
- MV="/usr/bin/mv"
- SED="/usr/bin/sed"
--- a/usr/src/cmd/net-snmp/sun-patches/002.6859608.patch Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- sun/agent/modules/seaProxy/sunSubTreeConfigurationTable.c Fri Nov 7 21:06:32 2003
-+++ sun.mod/agent/modules/seaProxy/sunSubTreeConfigurationTable.c Sun Jul 12 22:13:01 2009
-@@ -160,7 +160,7 @@
- */
- /* if (!seaSubtreesRead) { */
- if (!seaSubtreesProxied) {
-- seaproxy_parse_config("proxy", "-v 1", "", SUNMASTERAGENT_OID);
-+ seaproxy_parse_config("proxy", "-v 1", "-c public", SUNMASTERAGENT_OID);
- }
-
- indices = NULL;
-@@ -555,7 +555,7 @@
- }
-
- /* Call to have agent parse/store proxy */
-- seaproxy_parse_config("proxy", "-v 1", "", line);
-+ seaproxy_parse_config("proxy", "-v 1", "-c public", line);
- seaSubtreesProxied = 1;
-
- return 1;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/sun-patches/003.6952545.patch Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,16 @@
+--- sun.orig/snmpd.conf Wed Jul 8 02:41:01 2009
++++ sun/snmpd.conf Fri Jul 23 05:49:36 2010
+@@ -109,13 +109,10 @@
+ # dlmods entries
+ # for 32bit agent
+ #
+-#dlmod seaProxy /usr/lib/libseaProxy.so
+ #dlmod seaExtensions /usr/lib/libseaExtensions.so
+ #
+ # for 64bit agent
+-#dlmod seaProxy /usr/lib/amd64/libseaProxy.so
+ #dlmod seaExtensions /usr/lib/amd64/libseaExtensions.so
+-#dlmod seaProxy /usr/lib/sparcv9/libseaProxy.so
+ #dlmod seaExtensions /usr/lib/sparcv9/libseaExtensions.so
+
+ #master agentx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/sun-patches/004.6952545.patch Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,11 @@
+--- sun/agent/modules/Makefile Thu Sep 4 10:53:26 2003
++++ sun.orig/agent/modules/Makefile Fri Jul 23 06:16:34 2010
+@@ -44,7 +44,7 @@
+
+ # removed healthMonitor
+
+-SUBDIRS = entityMib seaExtensions seaProxy
++SUBDIRS = entityMib seaExtensions
+
+ all:
+ @if test "$(SUBDIRS)" != ""; then \
--- a/usr/src/cmd/net-snmp/sun-patchlist.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/net-snmp/sun-patchlist.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -1,2 +1,2 @@
-001.6859610.patch
-002.6859608.patch
+003.6952545.patch
+004.6952545.patch
Binary file usr/src/cmd/net-snmp/sun.tar.gz has changed
--- a/usr/src/cmd/ofusr/ibutils/base.patch Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/ofusr/ibutils/base.patch Mon Nov 29 01:15:23 2010 -0800
@@ -1023,17 +1023,16 @@
diff -r -u /tmp/771985/ibutils-1.2/configure ibutils-1.2/configure
--- /tmp/771985/ibutils-1.2/configure Tue Jun 3 03:20:56 2008
+++ ibutils-1.2/configure Thu Sep 30 08:16:57 2010
-@@ -1355,7 +1355,9 @@
+@@ -1355,7 +1355,7 @@
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+echo "BJD-1 configure - INSTALL_DATA:$INSTALL_DATA" > /tmp/bjd
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+echo "BJD-1 configure - INSTALL_DATA:$INSTALL_DATA" >> /tmp/bjd
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'
echo "$as_me:$LINENO: checking whether build environment is sane" >&5
echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-@@ -1783,7 +1785,6 @@
+@@ -1783,7 +1783,6 @@
# --- BEGIN OPENIB_APP_OSM ---
@@ -1041,7 +1040,7 @@
# Check whether --with-osm or --without-osm was given.
if test "${with_osm+set}" = set; then
withval="$with_osm"
-@@ -1940,7 +1941,7 @@
+@@ -1940,7 +1939,7 @@
osm_debug_flags=
fi
@@ -1050,7 +1049,7 @@
else
with_osm=disabled
OSM_CLFAGS=disabled
-@@ -1949,8 +1950,6 @@
+@@ -1949,8 +1948,6 @@
OSM_BUILD=disabled
fi
--- a/usr/src/cmd/ofusr/libibverbs/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/ofusr/libibverbs/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.1 10/10/07 SMI"
+# ident "@(#)Makefile.sfw 1.2 10/11/17 SMI"
VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -96,10 +96,11 @@
prep: $(VER)/configure
-$(VER)/configure: $(VER).tar.gz
+$(VER)/configure: $(VER).tar.gz ofa_solaris.h solaris_compatibility.c
$(GTAR) zxpf $(VER).tar.gz
$(GPATCH) -p1 -d $(@D) <base.patch
- $(GTAR) zxpf solaris_compat.tar.gz
+ $(CP) -f ofa_solaris.h $(VER)/include/infiniband/.
+ $(CP) -f solaris_compatibility.c $(VER)/src/.
$(TOUCH) $@
clean:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ofusr/libibverbs/ofa_solaris.h Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2010, 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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * NAME: ofa_solaris.h
+ * DESC: OFED Solaris wrapper
+ */
+#ifndef _OFA_SOLARIS_H
+#define _OFA_SOLARIS_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/byteorder.h>
+#include <sys/sockio.h>
+#include <sys/mman.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <alloca.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint8_t __u8;
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+typedef uint64_t __u64;
+typedef int32_t __s32;
+typedef int64_t __s64;
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef int32_t s32;
+
+typedef __u8 u_int8_t;
+typedef __u16 u_int16_t;
+typedef __u32 u_int32_t;
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+typedef __u64 u_int64_t;
+typedef __s64 int64_t;
+#endif
+
+typedef uint8_t __be8;
+typedef uint16_t __be16;
+typedef uint32_t __be32;
+typedef uint64_t __be64;
+
+/* Size of a pointer */
+#if defined(_LP64) || defined(_I32LPx)
+#define __WORDSIZE 64
+#else
+#define __WORDSIZE 32
+#endif
+
+
+/*
+ * Endian definitions
+ */
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+
+#ifdef _BIG_ENDIAN
+#define __BYTE_ORDER __BIG_ENDIAN
+#elif defined _LITTLE_ENDIAN
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#else
+#error unknown endianness
+#endif
+
+/*
+ * byteswap functions.
+ */
+#define bswap_8(x) ((x) & 0xff)
+
+#if !defined(__i386) && !defined(__amd64)
+#define bswap_16(x) ((bswap_8(x) << 8) | bswap_8((x) >> 8))
+#define bswap_32(x) (((uint32_t)(x) << 24) | \
+ (((uint32_t)(x) << 8) & 0xff0000) | \
+ (((uint32_t)(x) >> 8) & 0xff00) | \
+ ((uint32_t)(x) >> 24))
+#else /* x86 */
+#define bswap_16(x) htons(x)
+#define bswap_32(x) htonl(x)
+#endif /* !__i386 && !__amd64 */
+
+#if defined(_LP64) || defined(_LONGLONG_TYPE)
+#if (!defined(__i386) && !defined(__amd64))
+#define bswap_64(x) (((uint64_t)(x) << 56) | \
+ (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
+ (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
+ (((uint64_t)(x) << 8) & 0xff00000000ULL) | \
+ (((uint64_t)(x) >> 8) & 0xff000000ULL) | \
+ (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
+ (((uint64_t)(x) >> 40) & 0xff00ULL) | \
+ ((uint64_t)(x) >> 56))
+#else /* x86 */
+#define bswap_64(x) htonll(x)
+#endif /* !__i386 && !__amd64 */
+#else /* no uint64_t */
+#define bswap_64(x) ((bswap_32(x) << 32) | bswap_32((x) >> 32))
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _OFA_SOLARIS_H */
Binary file usr/src/cmd/ofusr/libibverbs/solaris_compat.tar.gz has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ofusr/libibverbs/solaris_compatibility.c Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,1299 @@
+/*
+ * Copyright (c) 2010, 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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+/*
+ * OFED Solaris wrapper
+ */
+#if defined(__SVR4) && defined(__sun)
+
+#include <stdarg.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/processor.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+
+#include <alloca.h>
+#include "../include/infiniband/arch.h"
+#include "../include/infiniband/verbs.h"
+#include "../../libmthca-1.0.4/src/mthca-abi.h"
+#include "../../libmlx4-1.0/src/mlx4-abi.h"
+#include "../../librdmacm-1.0.6/include/rdma/rdma_cma_abi.h"
+#include <libdevinfo.h>
+
+#define HW_DRIVER_MAX_NAME_LEN 20
+#define UVERBS_KERNEL_SYSFS_NAME "sol_uverbs@0:uverbs0"
+#define UVERBS "sol_uverbs"
+#define UMAD "sol_umad"
+#define UVERBS_IB_DEVPATH_PREFIX "/devices/ib"
+#define CONNECTX_NAME "mlx4_"
+#define INFINIHOST_NAME "mthca"
+
+#define MELLANOX_VENDOR_ID 0x15b3
+#define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44
+#define PCI_DEVICE_ID_MELLANOX_ARBEL 0x6282
+#define PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT 0x6278
+#define PCI_DEVICE_ID_MELLANOX_HERMON_SDR 0x6340
+#define PCI_DEVICE_ID_MELLANOX_HERMON_DDR 0x634a
+#define PCI_DEVICE_ID_MELLANOX_HERMON_QDR 0x6354
+#define PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2 0x6732
+#define PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2 0x673c
+#define INFINIHOST_DEVICE_ID_2 0x5a45
+#define INFINIHOST_DEVICE_ID_4 0x6279
+
+
+
+/*
+ * sol_uverbs_drv_status is the status of what libibverbs knows
+ * about the status of sol_uverbs driver.
+ */
+#define SOL_UVERBS_DRV_STATUS_UNKNOWN 0x0
+#define SOL_UVERBS_DRV_STATUS_LOADED 0x1
+#define SOL_UVERBS_DRV_STATUS_UNLOADED 0x02
+
+static int sol_uverbs_drv_status = SOL_UVERBS_DRV_STATUS_UNKNOWN;
+
+/*
+ * check_path() prefixs
+ */
+typedef enum cp_prefix_e {
+ CP_SOL_UVERBS = 1,
+ CP_DEVICE = 2,
+ CP_D = 3,
+ CP_GIDS = 4,
+ CP_PKEYS = 5,
+ CP_MTHCA = 6,
+ CP_MLX4 = 7,
+ CP_PORTS = 8,
+ CP_UMAD = 9,
+ CP_SLASH = 10,
+ CP_SYS = 11,
+ CP_CLASS = 12,
+ CP_INFINIBAND_VERBS = 13,
+ CP_INFINIBAND = 14,
+ CP_INFINIBAND_MAD = 15,
+ CP_MISC = 16,
+ CP_RDMA_CM = 17
+} cp_prefix_t;
+
+/*
+ * Some sysfs emulation software
+ */
+
+
+/*
+ * Check whether a path starts with prefix, and if it does, remove it
+ * from the string. The prefix can also contains one %d scan argument.
+ */
+static int check_path(char *path, cp_prefix_t prefix, unsigned int *arg)
+{
+ int ret, pos = 0;
+
+ switch (prefix) {
+ case CP_SOL_UVERBS:
+ ret = sscanf(path, "sol_uverbs@0:uverbs%d%n/", arg,
+ &pos);
+ break;
+ case CP_DEVICE:
+ ret = sscanf(path, "device%n/", &pos);
+ break;
+ case CP_D:
+ ret = sscanf(path, "%d%n/", arg, &pos);
+ break;
+ case CP_GIDS:
+ ret = sscanf(path, "gids%n/", &pos);
+ break;
+ case CP_PKEYS:
+ ret = sscanf(path, "pkeys%n/", &pos);
+ break;
+ case CP_MTHCA:
+ ret = sscanf(path, "mthca%d%n/", arg, &pos);
+ break;
+ case CP_MLX4:
+ ret = sscanf(path, "mlx4_%d%n/", arg, &pos);
+ break;
+ case CP_PORTS:
+ ret = sscanf(path, "ports%n/", &pos);
+ break;
+ case CP_UMAD:
+ ret = sscanf(path, "umad%d%n/", arg, &pos);
+ break;
+ case CP_SLASH:
+ ret = sscanf(path, "%n/", &pos);
+ break;
+ case CP_SYS:
+ ret = sscanf(path, "sys%n/", &pos);
+ break;
+ case CP_CLASS:
+ ret = sscanf(path, "class%n/", &pos);
+ break;
+ case CP_INFINIBAND_VERBS:
+ ret = sscanf(path, "infiniband_verbs%n/", &pos);
+ break;
+ case CP_INFINIBAND:
+ ret = sscanf(path, "infiniband%n/", &pos);
+ break;
+ case CP_INFINIBAND_MAD:
+ ret = sscanf(path, "infiniband_mad%n/", &pos);
+ break;
+ case CP_MISC:
+ ret = sscanf(path, "misc%n/", &pos);
+ break;
+ case CP_RDMA_CM:
+ ret = sscanf(path, "rdma_cm%n/", &pos);
+ break;
+ default:
+ /* Unkown prefix */
+ return 0;
+ }
+
+ if (path[pos] == '/') {
+ /* Some requests have several consecutive slashes. */
+ while (path[pos] == '/')
+ pos ++;
+
+ memmove(path, &path[pos], strlen(path)-pos+1);
+ return 1;
+ }
+
+ return 0;
+}
+
+static struct ibv_context *get_device_context(const char *devname)
+{
+ struct ibv_device **root_dev_list, **dev_list = NULL;
+ struct ibv_context *ctx = NULL;
+
+ /* We need some specific infos. Open the device. */
+ root_dev_list = dev_list = ibv_get_device_list(NULL);
+ if (!dev_list) {
+ goto cleanup;
+ }
+
+ while (*dev_list) {
+ if (!strcmp(ibv_get_device_name(*dev_list), devname))
+ break;
+ ++dev_list;
+ }
+
+ if (!*dev_list) {
+ goto cleanup;
+ }
+
+ ctx = ibv_open_device(*dev_list);
+
+ cleanup:
+ if (root_dev_list) ibv_free_device_list(root_dev_list);
+
+ return ctx;
+}
+
+static int
+get_device_info(const char *devname, struct ibv_device_attr *device_attr)
+{
+ struct ibv_context *ctx = NULL;
+ int ret;
+
+ ctx = get_device_context(devname);
+ if (!ctx) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ if (ibv_query_device(ctx, device_attr)) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ ret = 0;
+
+ cleanup:
+ if (ctx) ibv_close_device(ctx);
+
+ return ret;
+}
+
+/*
+ * Get the IB user verbs port info attributes for the specified device/port.
+ * If the address of a gid pointer is passed for "gid_table", the memory
+ * will be allocated and the ports gid table returned as well. The caller
+ * must free this memory on successful completion. If the address of a
+ * pkey pointer is passed for "pkey_table", the memory will be allocated
+ * and the ports pkey table returned as well. The caller must free this
+ * memory on successful completion.
+ */
+int
+get_port_info(const char *devname, uint8_t port_num,
+ struct ibv_port_attr *port_attr, union ibv_gid **gid_table,
+ uint16_t **pkey_table)
+{
+ struct ibv_context *ctx = NULL;
+ union ibv_gid *gids = NULL;
+ uint16_t *pkeys = NULL;
+ int ret;
+ int i;
+
+ ctx = get_device_context(devname);
+ if (!ctx) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ if (ibv_query_port(ctx, port_num, port_attr)) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ if (gid_table) {
+ *gid_table = NULL;
+ gids = malloc(sizeof(union ibv_gid) * port_attr->gid_tbl_len);
+ if (!gids) {
+ ret = -1;
+ goto cleanup;
+ }
+ for (i=0; i<port_attr->gid_tbl_len; i++) {
+ if (ibv_query_gid(ctx, port_num, i, &gids[i])) {
+ ret = -1;
+ goto cleanup;
+ }
+ }
+ *gid_table = gids;
+ gids = NULL;
+ }
+
+ if (pkey_table) {
+ *pkey_table = NULL;
+ pkeys = malloc(sizeof(uint16_t) * port_attr->pkey_tbl_len);
+ if (!pkeys) {
+ ret = -1;
+ goto cleanup;
+ }
+ for (i=0; i<port_attr->pkey_tbl_len; i++) {
+ if (ibv_query_pkey(ctx, port_num, i, &pkeys[i])) {
+ ret = -1;
+ goto cleanup;
+ }
+ }
+ *pkey_table = pkeys;
+ pkeys = NULL;
+ }
+
+ ret = 0;
+
+ cleanup:
+ if (ctx)
+ ibv_close_device(ctx);
+ if (gids) {
+ free(gids);
+ }
+ if (pkeys) {
+ free(pkeys);
+ }
+
+ return ret;
+}
+
+static void uverbs_driver_check()
+{
+ int fd;
+ char uverbs_devpath[MAXPATHLEN];
+
+ snprintf(uverbs_devpath, MAXPATHLEN, "%s/%s",
+ UVERBS_IB_DEVPATH_PREFIX, UVERBS_KERNEL_SYSFS_NAME);
+
+ if ((fd = open(uverbs_devpath, O_RDWR)) < 0) {
+ sol_uverbs_drv_status = SOL_UVERBS_DRV_STATUS_UNLOADED;
+ return;
+ }
+
+ sol_uverbs_drv_status = SOL_UVERBS_DRV_STATUS_LOADED;
+ close(fd);
+}
+
+/*
+ * Generic routine to return int attributes associated with a specific
+ * user verbs device. The Solaris user verbs agent exports some
+ * properties that would normally be exported via the sysfs in Linux.
+ */
+int get_device_int_attr(char *driver, int minor, char *attr)
+{
+ di_node_t root_node;
+ di_node_t node;
+ di_minor_t node_minor;
+ int *ret;
+ int int_value;
+
+ if (sol_uverbs_drv_status == SOL_UVERBS_DRV_STATUS_UNKNOWN)
+ uverbs_driver_check();
+
+ if (sol_uverbs_drv_status == SOL_UVERBS_DRV_STATUS_UNLOADED)
+ return (-1);
+
+ root_node = di_init("/", DINFOCPYALL);
+ if (root_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ node = di_drv_first_node(driver, root_node);
+ if (node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ node_minor = di_minor_next(node, DI_MINOR_NIL);
+ while (node_minor != DI_MINOR_NIL) {
+ if ((di_minor_devt(node_minor) & 0x0000FFFF) == minor)
+ break;
+ node_minor = di_minor_next(node, node_minor);
+ }
+
+ if (node_minor == DI_MINOR_NIL) {
+ goto err_dev;
+ }
+
+ /*
+ * We have the uverbs node, return the requested int attribute.
+ */
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), node,
+ attr, &ret) != 1) {
+ goto err_dev;
+ }
+
+ int_value = *ret;
+ di_fini(root_node);
+
+ return int_value;
+
+err_dev:
+ di_fini(root_node);
+ return -1;
+}
+
+static char *
+umad_convert_vendorid_deviceid_to_name(int vendor, int device, int hca)
+{
+ char *hca_name = "<unknown>";
+ char *ibdev_name;
+ int ret;
+
+ if (vendor == MELLANOX_VENDOR_ID) {
+ switch (device) {
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ hca_name = CONNECTX_NAME;
+ break;
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ case INFINIHOST_DEVICE_ID_2:
+ case INFINIHOST_DEVICE_ID_4:
+ hca_name = INFINIHOST_NAME;
+ break;
+ }
+ }
+ ret = snprintf(NULL, 0, "%s%d", hca_name, hca);
+ ibdev_name = malloc((size_t) ret);
+ if (ibdev_name != NULL)
+ (void) snprintf(ibdev_name, ret + 1, "%s%d", hca_name, hca);
+
+ return ibdev_name;
+}
+
+static char *
+umad_get_ibdev(char *minor_dev)
+{
+ di_node_t root, umad_node;
+ di_minor_t minor_node;
+ dev_t dev;
+ int ret, *vendorids, *deviceids, *hcas;
+ char *ibdev, *minor_str;
+
+ root = di_init("/", DINFOCPYALL);
+ if (root == DI_NODE_NIL)
+ return NULL;
+
+ umad_node = di_drv_first_node("sol_umad", root);
+ if (umad_node == DI_MINOR_NIL) {
+ di_fini(root);
+ return NULL;
+ }
+ minor_node = di_minor_next(umad_node, DI_MINOR_NIL);
+ while (minor_node != DI_NODE_NIL) {
+ minor_str = di_minor_name(minor_node);
+ if (strcmp(minor_str, minor_dev) == 0)
+ break;
+ minor_node = di_minor_next(umad_node, minor_node);
+ }
+ if (minor_node == DI_MINOR_NIL) {
+ di_fini(root);
+ return NULL;
+ }
+ dev = di_minor_devt(minor_node);
+ ret = di_prop_lookup_ints(dev, umad_node, "vendor-id", &vendorids);
+ if (ret < 1) {
+ di_fini(root);
+ return NULL;
+ }
+ ret = di_prop_lookup_ints(dev, umad_node, "device-id", &deviceids);
+ if (ret < 1) {
+ di_fini(root);
+ return NULL;
+ }
+ ret = di_prop_lookup_ints(dev, umad_node, "hca-instance",
+ &hcas);
+ if (ret < 1) {
+ di_fini(root);
+ return NULL;
+ }
+ ibdev = umad_convert_vendorid_deviceid_to_name(*vendorids,
+ *deviceids, *hcas);
+
+ di_fini(root);
+
+ return ibdev;
+}
+
+static int
+umad_get_port(char *minor_dev)
+{
+ di_node_t root, umad_node;
+ di_minor_t minor_node;
+ int ret;
+ int *ports;
+ char *minor_str;
+ dev_t dev;
+
+ root = di_init("/", DINFOCPYALL);
+ if (root == DI_NODE_NIL)
+ return -1;
+
+ umad_node = di_drv_first_node("sol_umad", root);
+ if (umad_node == DI_MINOR_NIL) {
+ di_fini(root);
+ return -1;
+ }
+ minor_node = di_minor_next(umad_node, DI_MINOR_NIL);
+ while (minor_node != DI_NODE_NIL) {
+ minor_str = di_minor_name(minor_node);
+ if (strcmp(minor_str, minor_dev) == 0)
+ break;
+ minor_node = di_minor_next(umad_node, minor_node);
+ }
+ if (minor_node == DI_MINOR_NIL) {
+ di_fini(root);
+ return -1;
+ }
+ dev = di_minor_devt(minor_node);
+ ret = di_prop_lookup_ints(dev, umad_node, "port", &ports);
+ if (ret < 1) {
+ di_fini(root);
+ return -1;
+ }
+ ret = *ports;
+
+ di_fini(root);
+
+ return ret;
+}
+
+/*
+ * Given the uverbs device number, determine the appropriate IB device
+ * name for the desired uverbs interface, e.g. mthca0, mlx4_0, mlx4_1, etc.
+ */
+int uverbs_get_device_name(int devnum, char *name, size_t size)
+{
+ di_node_t root_node;
+ di_node_t uverbs_node;
+ di_minor_t node_minor;
+ int vendor_id;
+ int device_id;
+ int *ret_vendor_id;
+ int *ret_device_id;
+ int mthca_devs = 0;
+ int mlx4_devs = 0;
+ int unknown_devs = 0;
+
+ if (name == NULL) {
+ return -1;
+ }
+
+ root_node = di_init("/", DINFOCPYALL);
+ if (root_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ uverbs_node = di_drv_first_node(UVERBS, root_node);
+ if (uverbs_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ /*
+ * Since the actual hardware drivers don't export an OFED equivalent
+ * name we go through the minor nodes counting the device indices for
+ * each hardware type up to the uverbs minor device requested.
+ */
+ node_minor = di_minor_next(uverbs_node, DI_MINOR_NIL);
+ while (node_minor != DI_MINOR_NIL) {
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "vendor-id", &ret_vendor_id) != 1) {
+ goto err_dev;
+ }
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "device-id", &ret_device_id) != 1) {
+ goto err_dev;
+ }
+
+ /*
+ * If the minor number requested, we are done. Update the
+ * PCI vendor/device ID used to create the OFED IBDEV name;
+ * Otherwise update the appropriate IBDEV count.
+ */
+ if ((di_minor_devt(node_minor) & 0x0000FFFF) == devnum) {
+ vendor_id = *ret_vendor_id;
+ device_id = *ret_device_id;
+ break;
+ }
+
+ switch (*ret_device_id) {
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ mthca_devs++;
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ mlx4_devs++;
+ break;
+
+ default:
+ unknown_devs++;
+ break;
+ }
+ node_minor = di_minor_next(uverbs_node, node_minor);
+ }
+
+ if (node_minor == DI_MINOR_NIL) {
+ goto err_dev;
+ }
+
+ if ((di_minor_devt(node_minor) & 0x0000FFFF) != devnum) {
+ goto err_dev;
+ }
+
+ switch (device_id) {
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ snprintf(name, size, "mthca%d", mthca_devs);
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ snprintf(name, size, "mlx4_%d", mlx4_devs);
+ break;
+
+ default:
+ snprintf(name, size, "unknown%d", unknown_devs);
+ break;
+ }
+
+ di_fini(root_node);
+ return 0;
+
+err_dev:
+ di_fini(root_node);
+ return -1;
+}
+
+/*
+ * For a given Solaris IB verbs psuedo device minor, determine the
+ * associated HCA driver name, and guid.
+ */
+static int ibv_get_hw_driver_info(int devnum, char *name,
+ size_t size, uint64_t *ret_guid)
+{
+ di_node_t root_node;
+ di_node_t uverbs_node;
+ di_minor_t node_minor;
+ int *ret_vendor_id;
+ int *ret_device_id;
+ int arbel_devs = 0;
+ int tavor_devs = 0;
+ int hermon_devs = 0;
+ uint64_t *guid;
+
+ if (name == NULL) {
+ return -1;
+ }
+
+ root_node = di_init("/", DINFOCPYALL);
+ if (root_node == DI_NODE_NIL) {
+ goto err_dev;
+
+ }
+
+ /*
+ * get the first device node driven by the UVERBS driver.
+ */
+ uverbs_node = di_drv_first_node(UVERBS, root_node);
+ if (uverbs_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+ /*
+ * Since the actual hardware drivers don't export an OFED equivalent
+ * name we go through the minor nodes counting the device indices for
+ * each hardware type up to the uverbs minor device requested.
+ */
+ node_minor = di_minor_next(uverbs_node, DI_MINOR_NIL);
+ while (node_minor != DI_MINOR_NIL) {
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "vendor-id", &ret_vendor_id) != 1) {
+ goto err_dev;
+ }
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "device-id", &ret_device_id) != 1) {
+ goto err_dev;
+ }
+
+ /*
+ * If the minor number requested, we are done.
+ * Otherwise update the appropriate IBDEV count.
+ */
+ if ((di_minor_devt(node_minor) & 0x0000FFFF) == devnum) {
+ break;
+ }
+
+ switch (*ret_device_id) {
+
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ tavor_devs++;
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ arbel_devs++;
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ hermon_devs++;
+ break;
+
+ default:
+ fprintf(stderr, "Unsupported device ID "
+ "0x%04X\n", *ret_device_id);
+ break;
+ }
+ node_minor = di_minor_next(uverbs_node, node_minor);
+ }
+
+ if ((node_minor == DI_MINOR_NIL) ||
+ ((di_minor_devt(node_minor) & 0x0000FFFF) != devnum)) {
+ goto err_dev;
+ }
+
+ /*
+ * We have found the uverbs minor node, now
+ * return the name of the HCA driver associated it, and
+ * the GUID of the HCA device associated with it.
+ */
+ if (di_prop_lookup_int64(di_minor_devt(node_minor), uverbs_node,
+ "guid", (uint64_t **)&guid) != 1) {
+ goto err_dev;
+ }
+ *ret_guid = *guid;
+
+ switch (*ret_device_id) {
+
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ snprintf(name, size, "tavor");
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ snprintf(name, size, "arbel");
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ snprintf(name, size, "hermon");
+ break;
+
+ default:
+ fprintf(stderr, "Unsupported driver, device ID "
+ "0x%04X\n", *ret_device_id);
+ snprintf(name, size, "unknown");
+ break;
+ }
+ di_fini(root_node);
+ return 0;
+
+err_dev:
+ di_fini(root_node);
+ return -1;
+}
+
+/*
+ * In Solaris environments, the underlying hardware driver is opened to
+ * perform the memory mapping operations of kernel allocated memory
+ * into the users address space.
+ */
+int ibv_open_mmap_driver(char *dev_name)
+{
+ int fd;
+#ifndef _LP64
+ int tmpfd;
+#endif
+ di_node_t root_node;
+ di_node_t hca_node;
+ di_node_t hca_node_child;
+ int uverbs_minor;
+ char *dev_path;
+ char path_buf[MAXPATHLEN];
+ char driver_name[HW_DRIVER_MAX_NAME_LEN];
+ uint64_t guid;
+ uint64_t *hca_guid;
+
+ /*
+ * Map the user verbs device to the associated IBD interface to
+ * determine the hardware driver. To avoid ordering issues, we use
+ * associated GUID to perform the mapping.
+ */
+ uverbs_minor = strtol(dev_name + strlen(UVERBS_KERNEL_SYSFS_NAME) - 1,
+ NULL, 0);
+ root_node = di_init("/", DINFOCPYALL);
+ if (root_node == DI_NODE_NIL) {
+ goto err_out;
+ }
+
+ if (ibv_get_hw_driver_info(uverbs_minor, driver_name,
+ HW_DRIVER_MAX_NAME_LEN, &guid)) {
+ fprintf(stderr, "No hardware driver found for user verbs "
+ "instance\n");
+ goto err_out;
+ }
+
+ /*
+ * Find the HCA device instance that has an ibport child
+ * with the same GUID as our uvebrs minor device.
+ */
+ hca_node = di_drv_first_node(driver_name, root_node);
+
+ while (hca_node != DI_NODE_NIL) {
+
+ hca_node_child = di_child_node(hca_node);
+
+ while (hca_node_child != DI_MINOR_NIL) {
+
+ if (di_prop_lookup_int64(DDI_DEV_T_ANY, hca_node_child,
+ "hca-guid", &hca_guid) != 1) {
+ hca_node_child =
+ di_sibling_node(hca_node_child);
+ } else {
+ break;
+ }
+ }
+
+ if (*hca_guid == guid) {
+ break;
+ }
+ hca_node = di_drv_next_node(hca_node);
+ }
+
+ if (hca_node == DI_NODE_NIL) {
+ fprintf(stderr, "Could not find hca hardware driver - %s\n",
+ driver_name);
+ goto err_dev;
+ }
+
+ dev_path = di_devfs_path(hca_node);
+ strncpy(path_buf, "/devices", sizeof path_buf);
+ strncat(path_buf, dev_path, sizeof path_buf);
+ strncat(path_buf, ":devctl", sizeof path_buf);
+ di_devfs_path_free(dev_path);
+
+ fd = open(path_buf, O_RDWR);
+ if (fd < 0) {
+ goto err_dev;
+ }
+
+#ifndef _LP64
+ /*
+ * libc can't handle fd's greater than 255, in order to
+ * ensure that these values remain available make fd > 255.
+ * Note: not needed for LP64
+ */
+ tmpfd = fcntl(fd, F_DUPFD, 256);
+ if (tmpfd >= 0) {
+ (void) close(fd);
+ fd = tmpfd;
+ }
+#endif /* _LP64 */
+
+ if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) {
+ fprintf(stderr, "FD_CLOEXEC failed: %s\n", strerror(errno));
+ goto err_close;
+ }
+ di_fini(root_node);
+ return fd;
+
+err_close:
+ close(fd);
+
+err_dev:
+ di_fini(root_node);
+
+err_out:
+ return -1;
+}
+
+/*
+ * Given the uverbs device number, determine the appropriate ABI
+ * revision information.
+ */
+int uverbs_get_device_abi_version(int devnum, int *abi_version)
+{
+ di_node_t root_node;
+ di_node_t uverbs_node;
+ di_minor_t node_minor;
+ int *ret_vendor_id;
+ int *ret_device_id;
+
+ root_node = di_init("/", DINFOCPYALL);
+ if (root_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ uverbs_node = di_drv_first_node(UVERBS, root_node);
+ if (uverbs_node == DI_NODE_NIL) {
+ goto err_dev;
+ }
+
+ /*
+ * Since the actual hardware drivers don't export an OFED equivalent
+ * ABI revision we go through the minor nodes counting the device
+ * indices for
+ * each hardware type up to the uverbs minor device requested.
+ */
+ node_minor = di_minor_next(uverbs_node, DI_MINOR_NIL);
+ while (node_minor != DI_MINOR_NIL) {
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "vendor-id", &ret_vendor_id) != 1) {
+ node_minor = di_minor_next(uverbs_node, node_minor);
+ continue;
+ }
+ if (di_prop_lookup_ints(di_minor_devt(node_minor), uverbs_node,
+ "device-id", &ret_device_id) != 1) {
+ node_minor = di_minor_next(uverbs_node, node_minor);
+ continue;
+ }
+
+ if ((di_minor_devt(node_minor) & 0x0000FFFF) == devnum) {
+ break;
+ }
+ node_minor = di_minor_next(uverbs_node, node_minor);
+ }
+
+ if (node_minor == DI_MINOR_NIL) {
+ goto err_dev;
+ }
+
+ switch (*ret_device_id) {
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ *abi_version = MTHCA_UVERBS_ABI_VERSION;
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ *abi_version = MLX4_UVERBS_MAX_ABI_VERSION;
+ break;
+
+ default:
+ goto err_dev;
+ break;
+ }
+
+ di_fini(root_node);
+ return 0;
+
+err_dev:
+ di_fini(root_node);
+ return -1;
+}
+
+int infiniband_verbs(char *path, char *buf, size_t size)
+{
+ unsigned int device_num;
+ int len = -1;
+
+ if (check_path(path, CP_SOL_UVERBS, &device_num)) {
+
+ if (check_path(path, CP_DEVICE, NULL)) {
+ /*
+ * Under Linux, this is a link to the PCI device entry
+ * in /sys/devices/pci...../....
+ */
+ if (strcmp(path, "vendor") == 0) {
+ len = 1 + sprintf(buf, "0x%x",
+ get_device_int_attr(UVERBS, device_num,
+ "vendor-id"));
+ } else if (strcmp(path, "device") == 0) {
+ len = 1 + sprintf(buf, "0x%x",
+ get_device_int_attr(UVERBS, device_num,
+ "device-id"));
+ }
+ goto exit;
+ }
+
+ if (strcmp(path, "ibdev") == 0) {
+ if (uverbs_get_device_name(device_num, buf, size)
+ == 0) {
+ len = 1 + strlen(buf);
+ }
+ } else if (strcmp(path, "abi_version") == 0) {
+ int abi_version;
+
+ if (uverbs_get_device_abi_version(device_num,
+ &abi_version) == 0) {
+ len = 1 + sprintf(buf, "%d", abi_version);
+ }
+ }
+ goto exit;
+ }
+
+ if (strcmp(path, "abi_version") == 0) {
+ len = 1 + sprintf(buf, "%d", get_device_int_attr(UVERBS, 0,
+ "abi-version"));
+ }
+exit:
+ return len;
+}
+
+int infiniband_ports(char *path, char *buf, size_t size, char *dev_name)
+{
+ int len = -1;
+ unsigned int port_num;
+ unsigned int gid_num;
+ union ibv_gid *gids;
+ uint64_t subnet_prefix;
+ uint64_t interface_id;
+ uint16_t *pkeys;
+ unsigned int pkey_num;
+ struct ibv_port_attr port_attr;
+ float rate;
+
+ if (!(check_path(path, CP_D, &port_num)))
+ goto exit;
+
+
+ if (check_path(path, CP_GIDS, NULL)) {
+ if (get_port_info(dev_name, port_num, &port_attr, &gids, NULL))
+ goto exit;
+
+ gid_num = atoi(path);
+
+ if (gid_num < port_attr.gid_tbl_len) {
+
+ subnet_prefix =
+ htonll(gids[gid_num].global.subnet_prefix);
+ interface_id =
+ htonll(gids[gid_num].global.interface_id);
+ len = 1 + sprintf(buf,
+ "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",
+ (unsigned) (subnet_prefix >> 48) & 0xffff,
+ (unsigned) (subnet_prefix >> 32) & 0xffff,
+ (unsigned) (subnet_prefix >> 16) & 0xffff,
+ (unsigned) (subnet_prefix >> 0) & 0xffff,
+ (unsigned) (interface_id >> 48) & 0xffff,
+ (unsigned) (interface_id >> 32) & 0xffff,
+ (unsigned) (interface_id >> 16) & 0xffff,
+ (unsigned) (interface_id >> 0) & 0xffff);
+ }
+ if (gids)
+ free(gids);
+
+ } else if (check_path(path, CP_PKEYS, NULL)) {
+ if (get_port_info(dev_name, port_num, &port_attr, NULL, &pkeys))
+ goto exit;
+
+ pkey_num = atoi(path);
+ if (pkey_num < port_attr.pkey_tbl_len) {
+ len = 1 + sprintf(buf, "0x%04x", pkeys[pkey_num]);
+ }
+ if (pkeys)
+ free(pkeys);
+ } else {
+
+ if (get_port_info(dev_name, port_num, &port_attr, NULL, NULL))
+ goto exit;
+
+ if (strcmp(path, "lid_mask_count") == 0) {
+ len = 1 + sprintf(buf, "%d", port_attr.lmc);
+ } else if (strcmp(path, "sm_lid") == 0) {
+ len = 1 + sprintf(buf, "0x%x", port_attr.sm_lid);
+ } else if (strcmp(path, "sm_sl") == 0) {
+ len = 1 + sprintf(buf, "%d", port_attr.sm_sl);
+ } else if (strcmp(path, "lid") == 0) {
+ len = 1 + sprintf(buf, "0x%x", port_attr.lid);
+ } else if (strcmp(path, "state") == 0) {
+ /* TODO: may need to add a string. Correct
+ * output is "4: ACTIVE". */
+ len = 1 + sprintf(buf, "%d:", port_attr.state);
+ } else if (strcmp(path, "phys_state") == 0) {
+ /* TODO: may need to add a string. Correct
+ * output is "5: LinkUp". */
+ len = 1 + sprintf(buf, "%d", port_attr.phys_state);
+ } else if (strcmp(path, "rate") == 0) {
+ /* rate = speed * width */
+ switch (port_attr.active_speed) {
+ case 1:
+ rate = 2.5;
+ break;
+ case 2:
+ rate = 5;
+ break;
+ case 4:
+ rate = 10;
+ break;
+ default:
+ rate = 0;
+ }
+ switch (port_attr.active_width) {
+ case 1:
+ break;
+ case 2:
+ rate = 4 * rate;
+ break;
+ case 4:
+ rate = 8 * rate;
+ break;
+ case 8:
+ rate = 12 * rate;
+ break;
+ default:
+ rate = 0;
+ }
+ len = 1 + sprintf(buf, "%f", rate);
+ } else if (strcmp(path, "cap_mask") == 0) {
+ len = 1 + sprintf(buf, "0x%08x",
+ port_attr.port_cap_flags);
+ }
+ }
+exit:
+ return (len);
+}
+
+int infiniband(char *path, char *buf, size_t size)
+{
+ int len = -1;
+ unsigned int device_num;
+ char dev_name[10];
+ struct ibv_device_attr device_attr;
+
+ memset(dev_name, 0, 10);
+
+ if (check_path(path, CP_MTHCA, &device_num)) {
+
+ sprintf(dev_name, "mthca%d", device_num);
+
+ } else if (check_path(path, CP_MLX4, &device_num)) {
+
+ sprintf(dev_name, "mlx4_%d", device_num);
+ } else {
+ goto exit;
+ }
+
+ if (check_path(path, CP_PORTS, NULL)) {
+
+ len = infiniband_ports(path, buf, size, dev_name);
+
+ } else if (strcmp(path, "node_type") == 0) {
+ len = 1 + sprintf(buf, "%d", IBV_NODE_CA);
+
+ } else if (strcmp(path, "board_id") == 0) {
+ len = 1 + sprintf(buf, "unknown");
+
+ } else {
+
+ /*
+ * We need some specific infos. Open the device.
+ */
+ if (get_device_info(dev_name, &device_attr))
+ goto exit;
+
+ /* TODO: remove ntohll and swap bytes in sprintf instead */
+ if (strcmp(path, "node_guid") == 0) {
+ uint64_t node_guid = ntohll(device_attr.node_guid);
+ len = 1 + sprintf(buf, "%04x:%04x:%04x:%04x",
+ (unsigned) (node_guid >> 48) & 0xffff,
+ (unsigned) (node_guid >> 32) & 0xffff,
+ (unsigned) (node_guid >> 16) & 0xffff,
+ (unsigned) (node_guid >> 0) & 0xffff);
+ } else if (strcmp(path, "sys_image_guid") == 0) {
+ uint64_t sys_image_guid =
+ ntohll(device_attr.sys_image_guid);
+ len = 1 + sprintf(buf, "%04x:%04x:%04x:%04x",
+ (unsigned) (sys_image_guid >> 48) & 0xffff,
+ (unsigned) (sys_image_guid >> 32) & 0xffff,
+ (unsigned) (sys_image_guid >> 16) & 0xffff,
+ (unsigned) (sys_image_guid >> 0) & 0xffff);
+ } else if (strcmp(path, "fw_ver") == 0) {
+ len = 1 + sprintf(buf, "%s", device_attr.fw_ver);
+ } else if (strcmp(path, "hw_rev") == 0) {
+ len = 1 + sprintf(buf, "%d", device_attr.hw_ver);
+ } else if (strcmp(path, "hca_type") == 0) {
+ switch (device_attr.vendor_part_id) {
+ case PCI_DEVICE_ID_MELLANOX_TAVOR:
+ case PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT:
+ len = 1 + sprintf(buf, "unavailable");
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_ARBEL:
+ len = 1 + sprintf(buf, "unavailable");
+ break;
+
+ case PCI_DEVICE_ID_MELLANOX_HERMON_SDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_DDR_PCIE2:
+ case PCI_DEVICE_ID_MELLANOX_HERMON_QDR_PCIE2:
+ len = 1 + sprintf(buf, "%d", 0);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+exit:
+ return (len);
+}
+
+int infiniband_mad(char *path, char *buf, size_t size)
+{
+ int len = -1;
+ int port;
+ unsigned int device_num;
+ char umad_str[32];
+ char *ibdev;
+
+ if (check_path(path, CP_UMAD, &device_num)) {
+
+ (void) snprintf(umad_str, sizeof(umad_str),
+ "umad%d", device_num);
+
+ if (strcmp(path, "ibdev") == 0) {
+
+ ibdev = umad_get_ibdev(umad_str);
+ if (ibdev != NULL) {
+ len = strlcpy(buf, umad_get_ibdev(umad_str),
+ size) + 1;
+ free(ibdev);
+ } else {
+ len = strlcpy(buf, "unknown", size) + 1;
+ }
+ } else if (strcmp(path, "port") == 0) {
+ port = umad_get_port(umad_str);
+ len = 1 + sprintf(buf, "%d", port);
+ }
+ } else if (strcmp(path, "abi_version") == 0) {
+ len = 1 + sprintf(buf, "%d", get_device_int_attr(UMAD, 0,
+ "abi_version"));
+ }
+ return (len);
+}
+
+/*
+ * Return -1 on error, or the length of the data (buf) on success.
+ */
+int sol_read_sysfs_file(char *path, char *buf, size_t size)
+{
+ int len = -1;
+
+ if (!check_path(path, CP_SLASH, NULL))
+ goto exit;
+
+ if (!check_path(path, CP_SYS, NULL))
+ goto exit;
+
+ if (!check_path(path, CP_CLASS, NULL))
+ goto exit;
+
+ if (check_path(path, CP_INFINIBAND_VERBS, NULL)) {
+
+ len = infiniband_verbs(path, buf, size);
+
+ } else if (check_path(path, CP_INFINIBAND, NULL)) {
+
+ len = infiniband(path, buf, size);
+
+ } else if (check_path(path, CP_INFINIBAND_MAD, NULL)) {
+
+ len = infiniband_mad(path, buf, size);
+
+ } else if (check_path(path, CP_MISC, NULL)) {
+
+ if (check_path(path, CP_RDMA_CM, NULL)) {
+
+ if (strcmp(path, "abi_version") == 0) {
+ len = 1 + sprintf(buf, "%d",
+ RDMA_USER_CM_MAX_ABI_VERSION);
+ }
+ }
+ }
+exit:
+ return len;
+}
+#endif
--- a/usr/src/cmd/ofusr/libsdp/base.patch Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/ofusr/libsdp/base.patch Mon Nov 29 01:15:23 2010 -0800
@@ -676,18 +676,15 @@
dist-hook: libsdp.spec
-@@ -630,9 +735,9 @@
+@@ -630,7 +735,7 @@
install-data-hook:
if test -e $(DESTDIR)$(sysconfdir)/libsdp.conf; then \
- diff -q $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \
+ diff $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \
if test $$? == 1; then \
-- t=$(shell date +'%Y%m%d%H%M%S'); \
-+ t=$(shell date +'m%d09/28/10M%S'); \
+ t=$(shell date +'%Y%m%d%H%M%S'); \
cp -p $(srcdir)/libsdp.conf \
- $(DESTDIR)$(sysconfdir)/libsdp.conf.$$t; \
- echo "NOTE: existing libsdp.conf was not updated."; \
@@ -643,7 +748,11 @@
mkdir -p $(DESTDIR)$(sysconfdir); \
fi; \
--- a/usr/src/cmd/samba/METADATA Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/samba/METADATA Mon Nov 29 01:15:23 2010 -0800
@@ -1,10 +1,10 @@
NAME: samba
-VERSION: 3.5.5
+VERSION: 3.5.6
DESCRIPTION: CIFS volume and printing server
LICENSE: GPLv3
PACKAGE: SUNWsmbar SUNWsmbau
PROJECT_URL: http://www.samba.org
-SOURCE_DOWNLOAD: http://us1.samba.org/samba/ftp/stable/samba-3.5.5.tar.gz
+SOURCE_DOWNLOAD: http://us1.samba.org/samba/ftp/stable/samba-3.5.6.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/samba
OSR: 8443
--- a/usr/src/cmd/samba/Patches/libsmb_clikrb5.c.diff Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/samba/Patches/libsmb_clikrb5.c.diff Mon Nov 29 01:15:23 2010 -0800
@@ -1,11 +1,22 @@
---- source3/libsmb/clikrb5.c Mon Jan 18 12:38:09 2010
-+++ source3/libsmb/clikrb5.c Sat Mar 13 19:19:27 2010
-@@ -779,7 +779,7 @@
+--- source3/libsmb/clikrb5.c-bkp 2010-11-16 06:25:10.974288877 -0800
++++ source3/libsmb/clikrb5.c 2010-11-16 06:44:09.764248834 -0800
+@@ -912,8 +912,17 @@
+ }
#endif
- retval = krb5_mk_req_extended(context, auth_context, ap_req_options,
+- retval = krb5_mk_req_extended(context, auth_context, ap_req_options,
- &in_data, credsp, outbuf);
-+ /* &in_data */ NULL, credsp, outbuf);
++ retval = krb5_mk_req_extended(context, auth_context, ap_req_options,
++#if defined(HAVE_SHORT_KRB5_MK_ERROR_INTERFACE)
++ /* MIT implementation does not use the
++ * 4-th. parameter (krb5_data *) by the
++ * same way as Heimdal. Set to NULL .
++ */
++ NULL
++#else
++ &in_data
++#endif
++ , credsp, outbuf);
if (retval) {
DEBUG(1,("ads_krb5_mk_req: krb5_mk_req_extended failed (%s)\n",
error_message(retval)));
Binary file usr/src/cmd/samba/samba-3.5.5.tar.gz has changed
Binary file usr/src/cmd/samba/samba-3.5.6.tar.gz has changed
--- a/usr/src/cmd/vim/runtime.patch Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/cmd/vim/runtime.patch Mon Nov 29 01:15:23 2010 -0800
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/11/08*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/11/22*\\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/lcms/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/lcms/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.7 10/05/10 SMI"
+#ident "@(#)Makefile.sfw 1.8 10/11/04 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
@@ -34,12 +34,9 @@
RELNAME=$(COMPONENT_NAME:sh)
VER=$(RELNAME)-$(RELNUM)
VER64=$(VER)-64
-VERPY26=$(VER)-py26
-VERPY26_64=$(VER64)-py26
LARGEFILES = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
DESTDIR = $(SRC)/lib/lcms/proto
-DESTDIR_26 = $(SRC)/lib/lcms/proto_26
# We need to do this because libtool adds wrong paths to RPATH.
LDFLAGS = -z combreloc -z redlocsym -z ignore -KPIC
@@ -48,8 +45,6 @@
RUNPATH_LDFLAGS64 = -R$(CFGPREFIX)/lib/$(MACH64)
GSED = /usr/bin/gsed
-PYTHON_PATH_24 = /usr/lib/python2.4/vendor-packages
-PYTHON_PATH_24_64 = /usr/lib/python2.4/vendor-packages/64
PYTHON_PATH_26 = /usr/lib/python2.6/vendor-packages
PYTHON_PATH_26_64 = /usr/lib/python2.6/vendor-packages/64
@@ -93,22 +88,8 @@
all: all32 all64 lint32 lint64
-all32: $(VER)/config.status $(VERPY26)/config.status
- (cd $(VER); \
- env - \
- "CC=$(CC)" "CXX=$(CCC)" \
- "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
- "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
- "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
- "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e)
- (cd $(VERPY26); \
+all32: $(VER)/config.status
+ ( cd $(VER); \
env - \
"CC=$(CC)" "CXX=$(CCC)" \
"CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
@@ -121,26 +102,12 @@
"PYTHON=$(PYTHON26)" \
"PYTHONPATH=$(PYTHON_PATH_26)" \
"SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e)
+ "MAKE=$(GMAKE)" $(GMAKE) -e )
# if we do not add $($(MACH64)_XARCH), CXX will assume that it's linking
# 32-bit, and linking will fail.
-all64: $(VER64)/config.status $(VERPY26_64)/config.status
- (cd $(VER64); \
- env - \
- "CC=$(CC)" "CXX=$(CCC)" \
- "CFLAGS=$(CFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
- "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
- "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
- "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24_64)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e)
- (cd $(VERPY26_64); \
+all64: $(VER64)/config.status
+ ( cd $(VER64); \
env - \
"CC=$(CC)" "CXX=$(CCC)" \
"CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
@@ -153,7 +120,7 @@
"PYTHON=$(PYTHON26)" \
"PYTHONPATH=$(PYTHON_PATH_26_64)" \
"SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e)
+ "MAKE=$(GMAKE)" $(GMAKE) -e )
CCC += -norunpath
CCC64 += -norunpath
@@ -199,26 +166,7 @@
install: all
mkdir -p $(DESTDIR)
- mkdir -p $(DESTDIR_26)
- (cd $(VER); env - \
- "CC=$(CC)" "CXX=$(CCC)" \
- "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
- "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
- "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
- "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24)" \
- "DESTDIR=$(DESTDIR)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" \
- $(GMAKE) -e \
- DESTDIR=$(DESTDIR) \
- INSTALL=$(GINSTALL) \
- install)
- (cd $(VERPY26); env - \
+ ( cd $(VER); env - \
"CC=$(CC)" "CXX=$(CCC)" \
"CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
"CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
@@ -229,13 +177,14 @@
"LDFLAGS=$(LDFLAGS)" \
"PYTHON=$(PYTHON26)" \
"PYTHONPATH=$(PYTHON_PATH_26)" \
+ "DESTDIR=$(DESTDIR)" \
"SHELL=$(SHELL)" \
"MAKE=$(GMAKE)" \
$(GMAKE) -e \
- DESTDIR=$(DESTDIR_26) \
+ DESTDIR=$(DESTDIR) \
INSTALL=$(GINSTALL) \
- install)
- (cd $(VER64); \
+ install )
+ ( cd $(VER64); \
MACH64=$(MACH64) $(GSED) -e "s#-L/usr/lib/${MACH64}##g" src/liblcms.la > liblcms.la.sed ; \
cp -fp liblcms.la.sed src/liblcms.la ; \
env - \
@@ -247,38 +196,18 @@
"CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
"LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
"LDFLAGS=$(LDFLAGS) $(RUNPATH_LDFLAGS64) $($(MACH64)_XARCH)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24_64)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26_64)" \
"SHELL=$(SHELL)" \
"MAKE=$(GMAKE)" \
$(GMAKE) -e \
DESTDIR=$(DESTDIR) \
INSTALL=$(GINSTALL) \
- install)
- (cd $(VERPY26_64); \
- MACH64=$(MACH64) $(GSED) -e "s#-L/usr/lib/${MACH64}##g" src/liblcms.la > liblcms.la.sed ; \
- cp -fp liblcms.la.sed src/liblcms.la ; \
- env - \
- "CC=$(CC)" "CXX=$(CCC)" \
- "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
- "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
- "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
- "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS) $(RUNPATH_LDFLAGS64) $($(MACH64)_XARCH)" \
- "PYTHON=$(PYTHON26)" \
- "PYTHONPATH=$(PYTHON_PATH_26_64)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" \
- $(GMAKE) -e \
- DESTDIR=$(DESTDIR_26) \
- INSTALL=$(GINSTALL) \
- install)
- INSTDIR=$(DESTDIR) INSTDIR_26=$(DESTDIR_26) VERS=$(VER) VERS_26=$(VERPY26) $(SHELL) ./install-sfw
- INSTDIR=$(DESTDIR) INSTDIR_26=$(DESTDIR_26) VERS=$(VER64) VERS_26=$(VERPY26_64) MACH64=$(MACH64) $(SHELL) ./install-sfw-64
+ install )
+ INSTDIR=$(DESTDIR) VERS=$(VER) $(SHELL) ./install-sfw
+ INSTDIR=$(DESTDIR) VERS=$(VER64) MACH64=$(MACH64) $(SHELL) ./install-sfw-64
-test32: $(VER)/config.status $(VERPY26)/config.status
+test32: $(VER)/config.status
( cd $(VER); \
env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
"CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
@@ -288,25 +217,12 @@
"LDFLAGS=$(LDFLAGS)" \
"CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
"INSTALL=$(GINSTALL)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e check )
- ( cd $(VERPY26) ; \
- env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
- "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
- "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS)" \
- "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
- "INSTALL=$(GINSTALL)" \
"PYTHON=$(PYTHON26)" \
"PYTHONPATH=$(PYTHON_PATH_26)" \
"SHELL=$(SHELL)" \
"MAKE=$(GMAKE)" $(GMAKE) -e check )
-test64: $(VER64)/config.status $(VERPY26_64)/config.status
+test64: $(VER64)/config.status
( cd $(VER64); \
env - \
"CC=$(CC)" "CXX=$(CCC)" \
@@ -317,20 +233,6 @@
"CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
"LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
"LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24_64)" \
- "SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" $(GMAKE) -e check )
- ( cd $(VERPY26_64); \
- env - \
- "CC=$(CC)" "CXX=$(CCC)" \
- "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
- "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
- "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
- "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
"PYTHON=$(PYTHON26)" \
"PYTHONPATH=$(PYTHON_PATH_26_64)" \
"SHELL=$(SHELL)" \
@@ -347,8 +249,8 @@
"LDFLAGS=$(LDFLAGS)" \
"CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
"INSTALL=$(GINSTALL)" \
- "PYTHON=$(PYTHON24)" \
- "PYTHONPATH=$(PYTHON_PATH_24)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26)" \
"SHELL=$(SHELL)" \
"CONFIG_SHELL=$(SHELL)" \
"MAKE=$(GMAKE)" \
@@ -359,27 +261,6 @@
touch -acm libtool ; \
chmod 0755 libtool )
-$(VERPY26)/config.status: $(VERPY26)/configure
- ( cd $(VERPY26) ; \
- env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
- "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
- "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
- "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
- "LDFLAGS=$(LDFLAGS)" \
- "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
- "INSTALL=$(GINSTALL)" \
- "PYTHON=$(PYTHON26)" \
- "PYTHONPATH=$(PYTHON_PATH_26)" \
- "SHELL=$(SHELL)" \
- "CONFIG_SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" \
- ./configure --prefix=$(CFGPREFIX) \
- $(CONFIGURE_OPTIONS) )
- ( cd $(VERPY26) ; \
- gpatch -N -p0 <../libtool.1.patch ; \
- touch -acm libtool ; \
- chmod 0755 libtool )
-
$(VER64)/config.status: $(VER64)/configure
(cd $(VER64); \
env "CC=$(CC64)" "CFLAGS=$(CPPFLAGS) $(CFLAGS64)" \
@@ -392,33 +273,6 @@
"CXXLINKLIB=$(CCC64) $(CCFLAGS64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
"MACH64=$(MACH64)" \
"INSTALL=$(GINSTALL)" \
- "PYTHON=$(PYTHON24_64)" \
- "PYTHONPATH=$(PYTHON_PATH_24_64)" \
- "SHELL=$(SHELL)" \
- "CONFIG_SHELL=$(SHELL)" \
- "MAKE=$(GMAKE)" \
- ./configure --prefix=$(CFGPREFIX) \
- --bindir=$(CFGPREFIX)/bin/$(MACH64) \
- --libdir=$(CFGPREFIX)/lib/$(MACH64) \
- --libexecdir=$(CFGPREFIX)/libexec/$(MACH64) \
- $(CONFIGURE_OPTIONS) )
- (cd $(VER64); \
- gpatch -N -p0 <../libtool.1.patch ; \
- touch -acm libtool ; \
- chmod 0755 libtool )
-
-$(VERPY26_64)/config.status: $(VERPY26_64)/configure
- (cd $(VERPY26_64); \
- env "CC=$(CC64)" "CFLAGS=$(CPPFLAGS) $(CFLAGS64)" \
- "CPP=$(CC64) $(CFLAGS64) $(CPPFLAGS) -E" \
- "CXX=$(CCC64)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS64)" \
- "CXXCPP=$(CCC64) $(CPPFLAGS) $(CCFLAGS64) -E" \
- "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "CXXLDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH) -norunpath" \
- "CXXLD=$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "CXXLINKLIB=$(CCC64) $(CCFLAGS64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "MACH64=$(MACH64)" \
- "INSTALL=$(GINSTALL)" \
"PYTHON=$(PYTHON26_64)" \
"PYTHONPATH=$(PYTHON_PATH_26_64)" \
"SHELL=$(SHELL)" \
@@ -429,7 +283,7 @@
--libdir=$(CFGPREFIX)/lib/$(MACH64) \
--libexecdir=$(CFGPREFIX)/libexec/$(MACH64) \
$(CONFIGURE_OPTIONS) )
- (cd $(VERPY26_64); \
+ (cd $(VER64); \
gpatch -N -p0 <../libtool.1.patch ; \
touch -acm libtool ; \
chmod 0755 libtool )
@@ -444,16 +298,6 @@
gpatch -N -p0 <../Makefile.in.3.patch ; \
cd ..)
-$(VERPY26)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VERPY26); rmdir tmp
- touch $(VERPY26)/configure
- (cd $(VERPY26); \
- gpatch -N -p0 <../configure.0-32.patch ; \
- gpatch -N -p0 <../Makefile.in.2.patch ; \
- gpatch -N -p0 <../Makefile.in.3.patch ; \
- cd ..)
-
$(VER64)/configure: $(VER).tar.gz
mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
mv tmp/$(VER) $(VER64); rmdir tmp
@@ -464,18 +308,8 @@
gpatch -N -p0 <../Makefile.in.3.patch ; \
cd ..)
-$(VERPY26_64)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VERPY26_64); rmdir tmp
- touch $(VERPY26_64)/configure
- (cd $(VERPY26_64); \
- gpatch -N -p0 <../configure.0-64.patch ; \
- gpatch -N -p0 <../Makefile.in.2.patch ; \
- gpatch -N -p0 <../Makefile.in.3.patch ; \
- cd ..)
-
clean:
- -rm -rf $(VER) $(VER64) $(VERPY26) $(VERPY26_64) $(DESTDIR) $(DESTDIR_26)
+ -rm -rf $(VER) $(VER64) $(DESTDIR) tmp
lint32: $(VER)/config.status
(cd $(VER); \
--- a/usr/src/lib/lcms/install-sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/lcms/install-sfw Mon Nov 29 01:15:23 2010 -0800
@@ -22,11 +22,10 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw 1.2 10/04/20 SMI"
+# ident "@(#)install-sfw 1.3 10/11/04 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib
-PYTHON24LCMSDIR=${LIBDIR}/python2.4/vendor-packages
PYTHON26LCMSDIR=${LIBDIR}/python2.6/vendor-packages
PKGCONFIGDIR=${LIBDIR}/pkgconfig
INCDIR=${PREFIX}/include/lcms
@@ -56,10 +55,8 @@
cd ${HERE}
-_install D ${INSTDIR}/usr/lib/python2.4/vendor-packages/_lcms.so ${PYTHON24LCMSDIR}/_lcms.so 0755
-_install D ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
-_install N ${INSTDIR}/usr/lib/python2.4/vendor-packages/lcms.py ${PYTHON24LCMSDIR}/lcms.py 0644
-_install N ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/lcms.py ${PYTHON26LCMSDIR}/lcms.py 0644
+_install D ${INSTDIR}/usr/lib/python2.6/vendor-packages/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
+_install N ${INSTDIR}/usr/lib/python2.6/vendor-packages/lcms.py ${PYTHON26LCMSDIR}/lcms.py 0644
_install E samples/.libs/icc2ps ${BINDIR}/icc2ps 0555
_install E samples/.libs/icclink ${BINDIR}/icclink 0555
--- a/usr/src/lib/lcms/install-sfw-64 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/lcms/install-sfw-64 Mon Nov 29 01:15:23 2010 -0800
@@ -22,13 +22,12 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw-64 1.3 10/04/20 SMI"
+# ident "@(#)install-sfw-64 1.4 10/11/04 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
# 64-bit Python does not create isalist 64-bit directories,
# but only a "64" generic directory.
-PYTHON24LCMSDIR=${PREFIX}/lib/python2.4/vendor-packages/64
PYTHON26LCMSDIR=${PREFIX}/lib/python2.6/vendor-packages/64
BINDIR=${PREFIX}/bin/${MACH64} # MACH64 passed in by makefile
PKGCONFIGDIR=${LIBDIR}/pkgconfig
@@ -47,8 +46,7 @@
_install N llib-llcms.ln ${LIBDIR}/llib-llcms.ln 0644
-_install D ${INSTDIR}/usr/lib/python2.4/vendor-packages/64/_lcms.so ${PYTHON24LCMSDIR}/_lcms.so 0755
-_install D ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/64/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
+_install D ${INSTDIR}/usr/lib/python2.6/vendor-packages/64/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
sed -e 's#\${prefix}/include#\${prefix}/include/lcms#g' ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc > ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc.tmp
cp -fp ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc.tmp ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc
--- a/usr/src/lib/unixodbc/METADATA Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/METADATA Mon Nov 29 01:15:23 2010 -0800
@@ -1,10 +1,10 @@
NAME: unixODBC
-VERSION: 2.2.14
+VERSION: 2.3.0
DESCRIPTION: OBDC support for Unix
LICENSE: LGPLv2.1
PACKAGE: SUNWunixodbcr SUNWunixodbc
PROJECT_URL: http://unixodbc.org/
-SOURCE_DOWNLOAD: http://www.unixodbc.org/unixODBC-2.2.14.tar.gz
+SOURCE_DOWNLOAD: http://www.unixodbc.org/unixODBC-2.3.0.tar.gz
SUPPORT: B
BUGTRAQ: solaris/library/unixodbc
OSR: 5444
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/unixodbc/Makefile.in.1.diff Mon Nov 29 01:15:23 2010 -0800
@@ -0,0 +1,11 @@
+--- Drivers/Postgre7.1/Makefile.in 2010-02-24 11:52:22.000000000 -0500
++++ Drivers/Postgre7.1/Makefile.in 2010-09-15 12:35:33.089913000 -0400
+@@ -652,8 +652,6 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-libLTLIBRARIES
+
+- -module
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
--- a/usr/src/lib/unixodbc/Makefile.in.2.diff Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile.in.2.diff 1.1 09/04/17 SMI"
-#
---- Drivers/Postgre7.1/Makefile.in 2008-11-19 08:11:06.000000000 -0800
-+++ Drivers/Postgre7.1/Makefile.in 2009-03-16 06:00:24.735484912 -0700
-@@ -608,7 +608,6 @@
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES
-
-- -module
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- a/usr/src/lib/unixodbc/Makefile.sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/Makefile.sfw Mon Nov 29 01:15:23 2010 -0800
@@ -18,15 +18,13 @@
#
# CDDL HEADER END
#
-
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile.sfw 1.2 10/01/22 SMI"
+# ident "@(#)Makefile.sfw 1.3 10/11/17 SMI"
#
-VER=unixODBC-2.2.14
+RELNUM=$(COMPONENT_VERSION:sh)
+VER=unixODBC-$(RELNUM)
VER64=$(VER)-64
include ../Makefile.lib
@@ -41,13 +39,13 @@
PICFLAG = -KPIC -DPIC
ARCH_FLAGS_32_sparc = -m32 -xarch=sparcvis
ARCH_FLAGS_64_sparc = -m64 -xarch=sparcvis
-ARCH_FLAGS_32_i386 = -m32 -xarch=386
+ARCH_FLAGS_32_i386 = -m32 -xarch=generic
ARCH_FLAGS_64_i386 = -m64 -xarch=generic
CFLAGS_sparc = -xcode=pic32 -xmemalign=8i -xvis=yes -xregs=no%appl -xO4 $(PICFLAG)
CFLAGS_i386 = -xregs=no%frameptr $(PICFLAG) -xO3
CXXFLAGS_sparc = -xcode=pic32 -xmemalign=8i -xvis=yes -xregs=no%appl -xO4 $(PICFLAG)
CXXFLAGS_i386 = -xregs=no%frameptr $(PICFLAG) -xO3
-CFLAGS_GENERIC += -xc99=%all -mt -D_REENTRANT -DNDEBUG
+CFLAGS_GENERIC = -xc99=%all -mt -D_REENTRANT -DNDEBUG
CFLAGS_GENERIC += -D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS_GENERIC += -D_XPG6 -D_XOPEN_SOURCE=600 -D_POSIX_PTHREAD_SEMANTICS
CFLAGS_GENERIC += $(CFLAGS_$(MACH)) -s
@@ -68,7 +66,7 @@
LDFLAGS += -z ignore -s $(PICFLAG)
LDFLAGS_32 = -L$(PREFIX)/lib
LDFLAGS_64 = -L$(PREFIX)/lib/$(SUFFIX_64)
-LD_OPTIONS = -z ignore
+LD_OPTIONS = -lsocket -lresolv -lnsl -lgen -z ignore
PKG_CONFIG_PATH_32 = $(PREFIX)/lib/pkgconfig:/usr/lib/pkgconfig
PKG_CONFIG_PATH_64 = $(PREFIX)/lib/$(SUFFIX_64)/pkgconfig:/usr/lib/$(SUFFIX_64)/pkgconfig
CONFIGURE_COMMON_OPTIONS = --enable-shared \
@@ -79,7 +77,8 @@
--disable-gnuthreads \
--disable-readline \
--enable-inicaching \
- --enable-drivers \
+ --enable-drivers=yes \
+ --enable-driver-conf=yes \
--enable-fdb \
--enable-odbctrace \
--enable-iconv \
@@ -95,12 +94,13 @@
all: all32 all64
$(VER)/config.status: $(VER)/configure
- (cd $(VER) ; env INSTALL="$(GINSTALL) -c" \
+ (cd $(VER) ; env - INSTALL="$(GINSTALL) -c" \
CC="$(CC)" CXX="$(CCC)" \
CFLAGS="$(CPPFLAGS) $(CFLAGS_GENERIC) $(ARCH_FLAGS_32_$(MACH))" \
CXXFLAGS="$(CPPFLAGS) $(CCFLAGS_GENERIC) $(ARCH_FLAGS_32_$(MACH))" \
LDFLAGS="$(LDFLAGS_32) $(LDFLAGS)" \
LD_OPTIONS="$(LD_OPTIONS)" \
+ LD="$(CC) $(CFLAGS_GENERIC) $(ARCH_FLAGS_32_$(MACH)) $(LDFLAGS_32) $(LDFLAGS)" \
CXXLINK="$(CCC) $(CCFLAGS_GENERIC) $(ARCH_FLAGS_32_$(MACH)) $(LDFLAGS_32) $(LDFLAGS)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_32)" \
MAKE="$(GMAKE)" \
@@ -115,12 +115,13 @@
cd .. )
$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); env INSTALL="$(GINSTALL) -c" \
+ (cd $(VER64); env - INSTALL="$(GINSTALL) -c" \
CC="$(CC64)" CXX="$(CCC64)" \
CFLAGS="$(CPPFLAGS) $(CFLAGS_GENERIC) $(ARCH_FLAGS_64_$(MACH))" \
CXXFLAGS="$(CPPFLAGS) $(CCFLAGS_GENERIC) $(ARCH_FLAGS_64_$(MACH))" \
LDFLAGS="$(LDFLAGS_64) $(LDFLAGS)" \
LD_OPTIONS="$(LD_OPTIONS)" \
+ LD="$(CC) $(CFLAGS_GENERIC) $(ARCH_FLAGS_64_$(MACH)) $(LDFLAGS_64) $(LDFLAGS)" \
CXXLINK="$(CCC64) $(CCFLAGS_GENERIC) $(ARCH_FLAGS_64_$(MACH)) $(LDFLAGS_64) $(LDFLAGS)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_64)" \
MAKE="$(GMAKE)" \
@@ -141,7 +142,7 @@
all32: $(VER)/config.status
( cd $(VER) ; \
mkdir -p root ; \
- env LD_LIBRARY_PATH="$(ROOT)/usr/lib" \
+ env - LD_LIBRARY_PATH="$(ROOT)/usr/lib" \
LD_OPTIONS="$(LD_OPTIONS)" \
MAKE="$(GMAKE)" \
INSTALL="$(GINSTALL) -c" \
@@ -151,7 +152,7 @@
all64: $(VER64)/config.status
( cd $(VER64) ; \
mkdir -p root ; \
- env LD_LIBRARY_PATH="$(ROOT)/usr/lib/$(SUFFIX_64)" \
+ env - LD_LIBRARY_PATH="$(ROOT)/usr/lib/$(SUFFIX_64)" \
LD_OPTIONS="$(LD_OPTIONS)" \
MAKE="$(GMAKE)" \
INSTALL="$(GINSTALL) -c" \
@@ -164,15 +165,14 @@
$(MV) tmp/$(VER) $(@D)
( cd $(@D) ; \
gpatch -p0 <../configure.0.diff ; \
- gpatch -p0 <../cursorlibrary.h.1.diff ; \
- gpatch -p0 <../Makefile.in.2.diff ; \
+ gpatch -p0 <../Makefile.in.1.diff ; \
chmod 0755 configure ; \
cd .. )
/usr/bin/rmdir tmp
install: all
- $(SHELL) ./install-sfw
- MACH64=$(MACH64) $(SHELL) ./install-sfw-64
+ VERS=$(VER) $(SHELL) ./install-sfw
+ MACH64=$(MACH64) VERS=$(VER64) $(SHELL) ./install-sfw-64
# fix the proto area
$(SRC)/tools/protofix --pkg SUNWunixodbc --perm
--- a/usr/src/lib/unixodbc/configure.0.diff Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/configure.0.diff Mon Nov 29 01:15:23 2010 -0800
@@ -1,57 +1,48 @@
---- configure 2008-11-19 08:11:44.000000000 -0800
-+++ configure 2009-03-15 15:13:50.055869488 -0700
+--- configure 2010-02-23 07:30:55.000000000 -0500
++++ configure 2010-09-15 13:44:24.854675000 -0400
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61.
+ # Generated by GNU Autoconf 2.64 for unixODBC 2.3.0.
#
-@@ -39,7 +39,7 @@
-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-+ echo "#! /bin/bash" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -551,7 +551,7 @@
+@@ -238,7 +238,7 @@
+ fi
+ fi
+ fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+@@ -529,7 +529,7 @@
# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=${CONFIG_SHELL-/bin/bash}
- case X$ECHO in
+ case X$lt_ECHO in
X*--fallback-echo)
-@@ -636,7 +636,7 @@
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
-- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
-@@ -678,7 +678,7 @@
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
-- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
-@@ -721,7 +721,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
-
- # Identity of this package.
- PACKAGE_NAME=
-@@ -993,7 +993,7 @@
+@@ -613,7 +613,7 @@
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+@@ -655,7 +655,7 @@
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+@@ -999,7 +999,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
@@ -59,8 +50,8 @@
+localstatedir='/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -2025,7 +2025,7 @@
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -2686,7 +2686,7 @@
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -68,9 +59,9 @@
+ac_compiler_gnu="no"
- am__api_version="1.9"
-@@ -2293,7 +2293,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ ac_aux_dir=
+@@ -3097,7 +3097,7 @@
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
@@ -78,7 +69,16 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -3603,7 +3603,7 @@
+@@ -4153,7 +4153,7 @@
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
++ # Solaris 8's {/usr,}/bin/bash.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+@@ -4957,7 +4957,7 @@
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
@@ -87,8 +87,8 @@
touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4206,7 +4206,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5218,7 +5218,7 @@
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
@@ -96,25 +96,16 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -4703,7 +4703,7 @@
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-+ # Solaris 8's {/usr,}/bin/bash.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -7286,7 +7286,7 @@
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-@@ -24249,6 +24249,7 @@
+@@ -6667,7 +6667,7 @@
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+@@ -14651,6 +14651,7 @@
int
main ()
{
@@ -122,42 +113,61 @@
mutex_lock()
;
return 0;
-@@ -24385,8 +24386,10 @@
- _ACEOF
+@@ -14732,7 +14733,8 @@
+ $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
gotthread="yes";
- THREADLIB="-lpthread"
-- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
+ THREADLIB="-lpthread -lposix4 -lrt"
-+ export ac_cv_c_compiler_gnu="no"
-+
-+ if [ "x$ac_cv_c_compiler_gnu" = "xyes" ] ; then
- { echo "$as_me:$LINENO: checking if compiler accepts -pthread" >&5
- echo $ECHO_N "checking if compiler accepts -pthread... $ECHO_C" >&6; }
- echo 'void f(){}' > conftest.c
-@@ -24490,7 +24493,8 @@
++ ac_cv_c_compiler_gnu="no"
+ if test "x$ac_cv_c_compiler_gnu"="xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
+ $as_echo_n "checking if compiler accepts -pthread... " >&6; }
+@@ -14740,7 +14742,7 @@
+ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14806,6 +14808,7 @@
gotthread="yes";
THREADLIB=""
-- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
-+ export ac_cv_c_compiler_gnu="no"
-+ if [ "x$ac_cv_c_compiler_gnu" = "xyes" ] ; then
- { echo "$as_me:$LINENO: checking if compiler accepts -pthread" >&5
- echo $ECHO_N "checking if compiler accepts -pthread... $ECHO_C" >&6; }
- echo 'void f(){}' > conftest.c
-@@ -24527,8 +24531,10 @@
++ ac_cv_c_compiler_gnu="no"
+ if test "x$ac_cv_c_compiler_gnu"="xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
+ $as_echo_n "checking if compiler accepts -pthread... " >&6; }
+@@ -14813,7 +14816,7 @@
+ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14843,6 +14846,8 @@
fi
-+ export ac_cv_c_compiler_gnu="no"
++ ac_cv_c_compiler_gnu="no"
++ ac_cv_c_compiler_gnu="no"
if test "x$gotthread" = "xno"; then
-- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
-+ export ac_cv_c_compiler_gnu="no"
-+ if [ "x$ac_cv_c_compiler_gnu" = "xyes" ] ; then
- { echo "$as_me:$LINENO: checking if compiler accepts -pthread" >&5
- echo $ECHO_N "checking if compiler accepts -pthread... $ECHO_C" >&6; }
- echo 'void f(){}' > conftest.c
-@@ -24910,7 +24916,7 @@
+ if test "x$ac_cv_c_compiler_gnu"="xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
+@@ -14851,7 +14856,7 @@
+ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15053,7 +15058,7 @@
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -165,31 +175,32 @@
+ac_compiler_gnu="no"
- { echo "$as_me:$LINENO: checking for semundo union" >&5
-@@ -27134,7 +27140,7 @@
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ac_compiler_gnu="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5
+@@ -15287,7 +15292,8 @@
+
+ done
+
+-
++export drivers="true"
++export driverc="true"
+ if test "x$msql" = "xtrue" ; then
+ MSQL_TRUE=
+@@ -15321,6 +15327,8 @@
+ QNX_FALSE=
+ fi
- if test "x$qt_compile" = "xyes" ; then
-@@ -28984,6 +28990,8 @@
-
-
++export use_builtin_libtool="no"
++
+ if test "x$use_builtin_libtool" = "xyes" ; then
+ WITHLT_TRUE=
+ WITHLT_FALSE='#'
+@@ -15873,6 +15881,8 @@
+ fi
+ done
+export LIBS="${LIBS} -lsocket -lnsl -lgen -z ignore"
+export LD_OPTIONS="-lsocket -lnsl -lgen -z ignore"
for ac_func in putenv socket strdup strstr setenv setlocale strchr
- do
-@@ -29373,7 +29381,7 @@
-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-+ echo "#! /bin/bash" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ do :
--- a/usr/src/lib/unixodbc/cursorlibrary.h.1.diff Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)cursorlibrary.h.1.diff 1.1 09/04/17 SMI"
-#
---- cur/cursorlibrary.h 2007-11-29 07:00:36.000000000 -0500
-+++ cur/cursorlibrary.h 2009-03-15 14:03:14.931313000 -0400
-@@ -531,4 +531,7 @@
- SQLUSMALLINT *row_status_ptr,
- SQLULEN *rows_fetched_ptr,
- int ext_fetch );
-+SQLRETURN get_column_names( CLHSTMT cl_statement );
-+
- #endif
-+
--- a/usr/src/lib/unixodbc/install-sfw Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/install-sfw Mon Nov 29 01:15:23 2010 -0800
@@ -20,12 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw 1.1 09/04/17 SMI"
-
-VERS=unixODBC-2.2.14
+# ident "@(#)install-sfw 1.2 10/11/09 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib
@@ -49,9 +46,7 @@
cd ${SRC}/lib/unixodbc/${VERS}/root/usr/lib
for file in \
- libboundparam.so.1.0.0 \
libesoobS.so.1.0.0 \
- libgtrtst.so.1.0.0 \
libmimerS.so.1.0.0 \
libnn.so.1.0.0 \
libodbc.so.1.0.0 \
@@ -62,7 +57,6 @@
libodbcminiS.so.1.0.0 \
libodbcmyS.so.1.0.0 \
libodbcnnS.so.1.0.0 \
- libodbcpsql.so.1.0.0 \
libodbcpsql.so.2.0.0 \
libodbcpsqlS.so.1.0.0 \
libodbctxtS.so.1.0.0 \
@@ -78,9 +72,7 @@
cd ${LIBDIR}
for file in \
- libboundparam.so \
libesoobS.so \
- libgtrtst.so \
libmimerS.so \
libnn.so \
libodbc.so \
@@ -91,7 +83,6 @@
libodbcminiS.so \
libodbcmyS.so \
libodbcnnS.so \
- libodbcpsql.so \
libodbcpsqlS.so \
libodbctxtS.so \
liboplodbcS.so \
@@ -104,7 +95,14 @@
_install L "${file}.1.0.0" "${LIBDIR}/${file}"
done
-rm "${LIBDIR}/libodbcpsql.so"
+if [ -L "${LIBDIR}/libodbcpsql.so" ] ; then
+ rm "${LIBDIR}/libodbcpsql.so"
+fi
+
+if [ -L "${LIBDIR}/libodbcpsql.so.2" ] ; then
+ rm "${LIBDIR}/libodbcpsql.so.2"
+fi
+
_install L "libodbcpsql.so.2.0.0" "${LIBDIR}/libodbcpsql.so.2"
_install L "libodbcpsql.so.2.0.0" "${LIBDIR}/libodbcpsql.so"
@@ -123,7 +121,6 @@
cd ${SRC}/lib/unixodbc/${VERS}/root/usr/include/odbc
for file in \
- autotest.h \
odbcinst.h \
odbcinstext.h \
sql.h \
--- a/usr/src/lib/unixodbc/install-sfw-64 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/install-sfw-64 Mon Nov 29 01:15:23 2010 -0800
@@ -20,12 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw-64 1.1 09/04/17 SMI"
-
-VERS=unixODBC-2.2.14-64
+# ident "@(#)install-sfw-64 1.2 10/11/09 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
@@ -36,9 +33,7 @@
cd ${SRC}/lib/unixodbc/${VERS}/root/usr/lib/${MACH64}
for file in \
- libboundparam.so.1.0.0 \
libesoobS.so.1.0.0 \
- libgtrtst.so.1.0.0 \
libmimerS.so.1.0.0 \
libnn.so.1.0.0 \
libodbc.so.1.0.0 \
@@ -49,7 +44,6 @@
libodbcminiS.so.1.0.0 \
libodbcmyS.so.1.0.0 \
libodbcnnS.so.1.0.0 \
- libodbcpsql.so.1.0.0 \
libodbcpsql.so.2.0.0 \
libodbcpsqlS.so.1.0.0 \
libodbctxtS.so.1.0.0 \
@@ -65,9 +59,7 @@
cd ${LIBDIR}
for file in \
- libboundparam.so \
libesoobS.so \
- libgtrtst.so \
libmimerS.so \
libnn.so \
libodbc.so \
@@ -78,7 +70,6 @@
libodbcminiS.so \
libodbcmyS.so \
libodbcnnS.so \
- libodbcpsql.so \
libodbcpsqlS.so \
libodbctxtS.so \
liboplodbcS.so \
@@ -91,7 +82,14 @@
_install L "${file}.1.0.0" "${LIBDIR}/${file}"
done
-rm "${LIBDIR}/libodbcpsql.so"
+if [ -L "${LIBDIR}/libodbcpsql.so" ] ; then
+ rm "${LIBDIR}/libodbcpsql.so"
+fi
+
+if [ -L "${LIBDIR}/libodbcpsql.so.2" ] ; then
+ rm "${LIBDIR}/libodbcpsql.so.2"
+fi
+
_install L "libodbcpsql.so.2.0.0" "${LIBDIR}/libodbcpsql.so.2"
_install L "libodbcpsql.so.2.0.0" "${LIBDIR}/libodbcpsql.so"
Binary file usr/src/lib/unixodbc/unixODBC-2.2.14.tar.gz has changed
Binary file usr/src/lib/unixodbc/unixODBC-2.3.0.tar.gz has changed
--- a/usr/src/lib/unixodbc/unixODBC.pc Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/lib/unixodbc/unixODBC.pc Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)unixODBC.pc 1.1 09/04/17 SMI"
+# ident "@(#)unixODBC.pc 1.2 10/09/15 SMI"
#
prefix=/usr
exec_prefix=${prefix}
@@ -34,7 +33,7 @@
Name: unixODBC
Description: An Open Source ODBC sub-system and SDK
-Version: 2.2.14
+Version: 2.3.0
Libs: -L${libdir} -lodbc
Cflags: -I${includedir} -DHAVE_UNISTD_H -DHAVE_PWD_H -DHAVE_SYS_TYPES_H -DHAVE_LONG_LONG -DSIZEOF_LONG=${sizeof_long}
--- a/usr/src/pkgdefs/SUNWgit/copyright Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/copyright Mon Nov 29 01:15:23 2010 -0800
@@ -8,11 +8,31 @@
chooses the other license.
--------------------------------------------------------------------------------
+ Note that the only valid version of the GPL as far as this project
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ a good idea, I also ask that people involved with the project make
+ their preferences known. In particular, if you trust me to make that
+ decision, you might note so in your copyright message, ie something
+ like
+
+ This file is licensed under the GPL v2, or a later version
+ at the discretion of Linus.
+
+ might avoid issues. But we can also just decide to synchronize and
+ contact all copyright holders on record if/when the occasion arises.
+
+ Linus Torvalds
+
+----------------------------------------
+
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -25,7 +45,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -65,7 +85,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -120,7 +140,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -178,7 +198,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -235,7 +255,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -288,7 +308,7 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -313,10 +333,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
@@ -346,7 +365,7 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
--------------------------------------------------------------------------------
* Copyright (C) 2000-2002 Michael R. Elkins
--- a/usr/src/pkgdefs/SUNWgit/depend Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/depend Mon Nov 29 01:15:23 2010 -0800
@@ -17,10 +17,9 @@
#
# CDDL HEADER END
#
-# ident "@(#)depend 1.2 09/06/15 SMI"
+# ident "@(#)depend 1.3 10/11/18 SMI"
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
# This package information file defines software dependencies associated
@@ -53,8 +52,8 @@
P SUNWcurl The C-URL Wrappers Library
P SUNWzlibr The Zip compression library (Root)
P SUNWTcl Tcl - Tool Command Language
-P SUNWperl584core Perl 5.8.4 (core)
-P SUNWperl584usr Perl 5.8.4 (non-core)
+P SUNWperl510core Perl 5.10.0 (core)
+P SUNWperl510usr Perl 5.10.0 (non-core)
P SUNWlexpt libexpat - XML parser library
P SUNWTk Tk - TCL GUI Toolkit
P SUNWxcu4 XCU4 Utilities
--- a/usr/src/pkgdefs/SUNWgit/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/11/18 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="GIT - Fast Version Control System (v1.5.6.5)"
+DESC="GIT - Fast Version Control System (v1.7.3.2)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWgit/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 08/10/21 SMI"
+# ident "@(#)prototype_com 1.2 10/11/18 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
@@ -46,147 +45,278 @@
#
d none usr 0755 root sys
d none usr/bin 0755 root bin
-f none usr/bin/git-daemon 0555 root bin
-f none usr/bin/git-fast-import 0555 root bin
-f none usr/bin/git-fetch-pack 0555 root bin
-f none usr/bin/git-hash-object 0555 root bin
-f none usr/bin/git-imap-send 0555 root bin
-f none usr/bin/git-index-pack 0555 root bin
-f none usr/bin/git-merge-index 0555 root bin
-f none usr/bin/git-merge-tree 0555 root bin
-f none usr/bin/git-mktag 0555 root bin
-f none usr/bin/git-mktree 0555 root bin
-f none usr/bin/git-pack-redundant 0555 root bin
-f none usr/bin/git-patch-id 0555 root bin
-f none usr/bin/git-receive-pack 0555 root bin
-l none usr/bin/git-send-pack=git-fetch-pack
-f none usr/bin/git-shell 0555 root bin
-f none usr/bin/git-show-index 0555 root bin
-f none usr/bin/git-unpack-file 0555 root bin
-f none usr/bin/git-update-server-info 0555 root bin
-f none usr/bin/git-upload-pack 0555 root bin
-f none usr/bin/git-var 0555 root bin
-f none usr/bin/git-am 0555 root bin
-f none usr/bin/git-http-push 0555 root bin
-f none usr/bin/git-bisect 0555 root bin
-f none usr/bin/git-filter-branch 0555 root bin
-f none usr/bin/git-lost-found 0555 root bin
-f none usr/bin/git-merge-octopus 0555 root bin
-f none usr/bin/git-merge-one-file 0555 root bin
-f none usr/bin/git-merge-resolve 0555 root bin
-f none usr/bin/git-merge 0555 root bin
-f none usr/bin/git-merge-stupid 0555 root bin
-f none usr/bin/git-mergetool 0555 root bin
-f none usr/bin/git-parse-remote 0555 root bin
-f none usr/bin/git-pull 0555 root bin
-f none usr/bin/git-quiltimport 0555 root bin
-f none usr/bin/git-rebase--interactive 0555 root bin
-f none usr/bin/git-rebase 0555 root bin
-f none usr/bin/git-repack 0555 root bin
-f none usr/bin/git-request-pull 0555 root bin
-f none usr/bin/git-sh-setup 0555 root bin
-f none usr/bin/git-stash 0555 root bin
-f none usr/bin/git-submodule 0555 root bin
-f none usr/bin/git-relink 0555 root bin
-f none usr/bin/git-web--browse 0555 root bin
-f none usr/bin/git-add--interactive 0555 root bin
-f none usr/bin/git-archimport 0555 root bin
-f none usr/bin/git-cvsexportcommit 0555 root bin
-f none usr/bin/git-cvsimport 0555 root bin
+f none usr/bin/git 0555 root bin
f none usr/bin/git-cvsserver 0555 root bin
-f none usr/bin/git-send-email 0555 root bin
-f none usr/bin/git-svn 0555 root bin
-f none usr/bin/git-instaweb 0555 root bin
-l none usr/bin/git=git-fetch-pack
f none usr/bin/gitk 0555 root bin
-f none usr/bin/git-gui 0555 root bin
-l none usr/bin/git-citool=git-gui
-l none usr/bin/git-add=git-fetch-pack
-l none usr/bin/git-annotate=git-fetch-pack
-l none usr/bin/git-apply=git-fetch-pack
-l none usr/bin/git-archive=git-fetch-pack
-l none usr/bin/git-blame=git-fetch-pack
-l none usr/bin/git-branch=git-fetch-pack
-l none usr/bin/git-bundle=git-fetch-pack
-l none usr/bin/git-cat-file=git-fetch-pack
-l none usr/bin/git-check-attr=git-fetch-pack
-l none usr/bin/git-check-ref-format=git-fetch-pack
-l none usr/bin/git-checkout-index=git-fetch-pack
-l none usr/bin/git-checkout=git-fetch-pack
-l none usr/bin/git-clean=git-fetch-pack
-l none usr/bin/git-clone=git-fetch-pack
-l none usr/bin/git-commit-tree=git-fetch-pack
-l none usr/bin/git-commit=git-fetch-pack
-l none usr/bin/git-config=git-fetch-pack
-l none usr/bin/git-count-objects=git-fetch-pack
-l none usr/bin/git-describe=git-fetch-pack
-l none usr/bin/git-diff-files=git-fetch-pack
-l none usr/bin/git-diff-index=git-fetch-pack
-l none usr/bin/git-diff-tree=git-fetch-pack
-l none usr/bin/git-diff=git-fetch-pack
-l none usr/bin/git-fast-export=git-fetch-pack
-l none usr/bin/git-fetch--tool=git-fetch-pack
-l none usr/bin/git-fetch=git-fetch-pack
-l none usr/bin/git-fmt-merge-msg=git-fetch-pack
-l none usr/bin/git-for-each-ref=git-fetch-pack
-l none usr/bin/git-fsck=git-fetch-pack
-l none usr/bin/git-gc=git-fetch-pack
-l none usr/bin/git-grep=git-fetch-pack
-l none usr/bin/git-init-db=git-fetch-pack
-l none usr/bin/git-log=git-fetch-pack
-l none usr/bin/git-ls-files=git-fetch-pack
-l none usr/bin/git-ls-remote=git-fetch-pack
-l none usr/bin/git-ls-tree=git-fetch-pack
-l none usr/bin/git-mailinfo=git-fetch-pack
-l none usr/bin/git-mailsplit=git-fetch-pack
-l none usr/bin/git-merge-base=git-fetch-pack
-l none usr/bin/git-merge-file=git-fetch-pack
-l none usr/bin/git-merge-ours=git-fetch-pack
-l none usr/bin/git-merge-recursive=git-fetch-pack
-l none usr/bin/git-mv=git-fetch-pack
-l none usr/bin/git-name-rev=git-fetch-pack
-l none usr/bin/git-pack-objects=git-fetch-pack
-l none usr/bin/git-pack-refs=git-fetch-pack
-l none usr/bin/git-prune-packed=git-fetch-pack
-l none usr/bin/git-prune=git-fetch-pack
-l none usr/bin/git-push=git-fetch-pack
-l none usr/bin/git-read-tree=git-fetch-pack
-l none usr/bin/git-reflog=git-fetch-pack
-l none usr/bin/git-remote=git-fetch-pack
-l none usr/bin/git-rerere=git-fetch-pack
-l none usr/bin/git-reset=git-fetch-pack
-l none usr/bin/git-rm=git-fetch-pack
-l none usr/bin/git-rev-list=git-fetch-pack
-l none usr/bin/git-rev-parse=git-fetch-pack
-l none usr/bin/git-revert=git-fetch-pack
-l none usr/bin/git-shortlog=git-fetch-pack
-l none usr/bin/git-show-branch=git-fetch-pack
-l none usr/bin/git-show-ref=git-fetch-pack
-l none usr/bin/git-stripspace=git-fetch-pack
-l none usr/bin/git-symbolic-ref=git-fetch-pack
-l none usr/bin/git-tag=git-fetch-pack
-l none usr/bin/git-tar-tree=git-fetch-pack
-l none usr/bin/git-unpack-objects=git-fetch-pack
-l none usr/bin/git-update-index=git-fetch-pack
-l none usr/bin/git-update-ref=git-fetch-pack
-l none usr/bin/git-upload-archive=git-fetch-pack
-l none usr/bin/git-verify-pack=git-fetch-pack
-l none usr/bin/git-verify-tag=git-fetch-pack
-l none usr/bin/git-write-tree=git-fetch-pack
-l none usr/bin/git-http-fetch=git-fetch-pack
-l none usr/bin/git-cherry-pick=git-fetch-pack
-l none usr/bin/git-cherry=git-fetch-pack
-l none usr/bin/git-format-patch=git-fetch-pack
-l none usr/bin/git-fsck-objects=git-fetch-pack
-l none usr/bin/git-get-tar-commit-id=git-fetch-pack
-l none usr/bin/git-init=git-fetch-pack
-l none usr/bin/git-merge-subtree=git-fetch-pack
-l none usr/bin/git-peek-remote=git-fetch-pack
-l none usr/bin/git-repo-config=git-fetch-pack
-l none usr/bin/git-show=git-fetch-pack
-l none usr/bin/git-status=git-fetch-pack
-l none usr/bin/git-whatchanged=git-fetch-pack
+l none usr/bin/git-receive-pack=git
+f none usr/bin/git-shell 0555 root bin
+f none usr/bin/git-upload-pack 0555 root bin
+l none usr/bin/git-upload-archive=git
+d none usr/lib 0755 root bin
+d none usr/lib/git-core 0755 root bin
+l none usr/lib/git-core/git=../../bin/git
+l none usr/lib/git-core/git-add=../../bin/git
+f none usr/lib/git-core/git-add--interactive 0555 root bin
+f none usr/lib/git-core/git-am 0555 root bin
+l none usr/lib/git-core/git-annotate=../../bin/git
+l none usr/lib/git-core/git-apply=../../bin/git
+f none usr/lib/git-core/git-archimport 0555 root bin
+l none usr/lib/git-core/git-archive=../../bin/git
+f none usr/lib/git-core/git-bisect 0555 root bin
+l none usr/lib/git-core/git-bisect--helper=../../bin/git
+l none usr/lib/git-core/git-blame=../../bin/git
+l none usr/lib/git-core/git-branch=../../bin/git
+l none usr/lib/git-core/git-bundle=../../bin/git
+l none usr/lib/git-core/git-cat-file=../../bin/git
+l none usr/lib/git-core/git-check-attr=../../bin/git
+l none usr/lib/git-core/git-check-ref-format=../../bin/git
+l none usr/lib/git-core/git-checkout=../../bin/git
+l none usr/lib/git-core/git-checkout-index=../../bin/git
+l none usr/lib/git-core/git-cherry=../../bin/git
+l none usr/lib/git-core/git-cherry-pick=../../bin/git
+f none usr/lib/git-core/git-citool 0555 root bin
+l none usr/lib/git-core/git-clean=../../bin/git
+l none usr/lib/git-core/git-clone=../../bin/git
+l none usr/lib/git-core/git-commit=../../bin/git
+l none usr/lib/git-core/git-commit-tree=../../bin/git
+l none usr/lib/git-core/git-config=../../bin/git
+l none usr/lib/git-core/git-count-objects=../../bin/git
+f none usr/lib/git-core/git-cvsexportcommit 0555 root bin
+f none usr/lib/git-core/git-cvsimport 0555 root bin
+l none usr/lib/git-core/git-cvsserver=../../bin/git-cvsserver
+f none usr/lib/git-core/git-daemon 0555 root bin
+l none usr/lib/git-core/git-describe=../../bin/git
+l none usr/lib/git-core/git-diff=../../bin/git
+l none usr/lib/git-core/git-diff-files=../../bin/git
+l none usr/lib/git-core/git-diff-index=../../bin/git
+l none usr/lib/git-core/git-diff-tree=../../bin/git
+f none usr/lib/git-core/git-difftool 0555 root bin
+f none usr/lib/git-core/git-difftool--helper 0555 root bin
+l none usr/lib/git-core/git-fast-export=../../bin/git
+f none usr/lib/git-core/git-fast-import 0555 root bin
+l none usr/lib/git-core/git-fetch=../../bin/git
+l none usr/lib/git-core/git-fetch-pack=../../bin/git
+f none usr/lib/git-core/git-filter-branch 0555 root bin
+l none usr/lib/git-core/git-fmt-merge-msg=../../bin/git
+l none usr/lib/git-core/git-for-each-ref=../../bin/git
+l none usr/lib/git-core/git-format-patch=../../bin/git
+l none usr/lib/git-core/git-fsck=../../bin/git
+l none usr/lib/git-core/git-fsck-objects=../../bin/git
+l none usr/lib/git-core/git-gc=../../bin/git
+l none usr/lib/git-core/git-get-tar-commit-id=../../bin/git
+l none usr/lib/git-core/git-grep=../../bin/git
+l none usr/lib/git-core/git-gui=git-citool
+f none usr/lib/git-core/git-gui--askpass 0555 root bin
+l none usr/lib/git-core/git-hash-object=../../bin/git
+l none usr/lib/git-core/git-help=../../bin/git
+f none usr/lib/git-core/git-http-backend 0555 root bin
+f none usr/lib/git-core/git-http-fetch 0555 root bin
+f none usr/lib/git-core/git-http-push 0555 root bin
+f none usr/lib/git-core/git-imap-send 0555 root bin
+l none usr/lib/git-core/git-index-pack=../../bin/git
+l none usr/lib/git-core/git-init=../../bin/git
+l none usr/lib/git-core/git-init-db=../../bin/git
+f none usr/lib/git-core/git-instaweb 0555 root bin
+l none usr/lib/git-core/git-log=../../bin/git
+f none usr/lib/git-core/git-lost-found 0555 root bin
+l none usr/lib/git-core/git-ls-files=../../bin/git
+l none usr/lib/git-core/git-ls-remote=../../bin/git
+l none usr/lib/git-core/git-ls-tree=../../bin/git
+l none usr/lib/git-core/git-mailinfo=../../bin/git
+l none usr/lib/git-core/git-mailsplit=../../bin/git
+l none usr/lib/git-core/git-merge=../../bin/git
+l none usr/lib/git-core/git-merge-base=../../bin/git
+l none usr/lib/git-core/git-merge-file=../../bin/git
+l none usr/lib/git-core/git-merge-index=../../bin/git
+f none usr/lib/git-core/git-merge-octopus 0555 root bin
+f none usr/lib/git-core/git-merge-one-file 0555 root bin
+l none usr/lib/git-core/git-merge-ours=../../bin/git
+l none usr/lib/git-core/git-merge-recursive=../../bin/git
+f none usr/lib/git-core/git-merge-resolve 0555 root bin
+l none usr/lib/git-core/git-merge-subtree=../../bin/git
+l none usr/lib/git-core/git-merge-tree=../../bin/git
+f none usr/lib/git-core/git-mergetool 0555 root bin
+f none usr/lib/git-core/git-mergetool--lib 0555 root bin
+l none usr/lib/git-core/git-mktag=../../bin/git
+l none usr/lib/git-core/git-mktree=../../bin/git
+l none usr/lib/git-core/git-mv=../../bin/git
+l none usr/lib/git-core/git-name-rev=../../bin/git
+l none usr/lib/git-core/git-notes=../../bin/git
+l none usr/lib/git-core/git-pack-objects=../../bin/git
+l none usr/lib/git-core/git-pack-redundant=../../bin/git
+l none usr/lib/git-core/git-pack-refs=../../bin/git
+f none usr/lib/git-core/git-parse-remote 0555 root bin
+l none usr/lib/git-core/git-patch-id=../../bin/git
+l none usr/lib/git-core/git-peek-remote=../../bin/git
+l none usr/lib/git-core/git-prune=../../bin/git
+l none usr/lib/git-core/git-prune-packed=../../bin/git
+f none usr/lib/git-core/git-pull 0555 root bin
+l none usr/lib/git-core/git-push=../../bin/git
+f none usr/lib/git-core/git-quiltimport 0555 root bin
+l none usr/lib/git-core/git-read-tree=../../bin/git
+f none usr/lib/git-core/git-rebase 0555 root bin
+f none usr/lib/git-core/git-rebase--interactive 0555 root bin
+l none usr/lib/git-core/git-receive-pack=../../bin/git
+l none usr/lib/git-core/git-reflog=../../bin/git
+f none usr/lib/git-core/git-relink 0555 root bin
+l none usr/lib/git-core/git-remote=../../bin/git
+f none usr/lib/git-core/git-remote-ftp 0555 root bin
+l none usr/lib/git-core/git-remote-ftps=git-remote-ftp
+l none usr/lib/git-core/git-remote-http=git-remote-ftp
+l none usr/lib/git-core/git-remote-https=git-remote-ftp
+f none usr/lib/git-core/git-remote-testgit 0555 root bin
+f none usr/lib/git-core/git-repack 0555 root bin
+l none usr/lib/git-core/git-replace=../../bin/git
+l none usr/lib/git-core/git-repo-config=../../bin/git
+f none usr/lib/git-core/git-request-pull 0555 root bin
+l none usr/lib/git-core/git-rerere=../../bin/git
+l none usr/lib/git-core/git-reset=../../bin/git
+l none usr/lib/git-core/git-rev-list=../../bin/git
+l none usr/lib/git-core/git-rev-parse=../../bin/git
+l none usr/lib/git-core/git-revert=../../bin/git
+l none usr/lib/git-core/git-rm=../../bin/git
+f none usr/lib/git-core/git-send-email 0555 root bin
+l none usr/lib/git-core/git-send-pack=../../bin/git
+f none usr/lib/git-core/git-sh-setup 0555 root bin
+l none usr/lib/git-core/git-shell=../../bin/git-shell
+l none usr/lib/git-core/git-shortlog=../../bin/git
+l none usr/lib/git-core/git-show=../../bin/git
+l none usr/lib/git-core/git-show-branch=../../bin/git
+f none usr/lib/git-core/git-show-index 0555 root bin
+l none usr/lib/git-core/git-show-ref=../../bin/git
+l none usr/lib/git-core/git-stage=../../bin/git
+f none usr/lib/git-core/git-stash 0555 root bin
+l none usr/lib/git-core/git-status=../../bin/git
+l none usr/lib/git-core/git-stripspace=../../bin/git
+f none usr/lib/git-core/git-submodule 0555 root bin
+f none usr/lib/git-core/git-svn 0555 root bin
+l none usr/lib/git-core/git-symbolic-ref=../../bin/git
+l none usr/lib/git-core/git-tag=../../bin/git
+l none usr/lib/git-core/git-tar-tree=../../bin/git
+l none usr/lib/git-core/git-unpack-file=../../bin/git
+l none usr/lib/git-core/git-unpack-objects=../../bin/git
+l none usr/lib/git-core/git-update-index=../../bin/git
+l none usr/lib/git-core/git-update-ref=../../bin/git
+l none usr/lib/git-core/git-update-server-info=../../bin/git
+l none usr/lib/git-core/git-upload-archive=../../bin/git
+l none usr/lib/git-core/git-upload-pack=../../bin/git-upload-pack
+l none usr/lib/git-core/git-var=../../bin/git
+l none usr/lib/git-core/git-verify-pack=../../bin/git
+l none usr/lib/git-core/git-verify-tag=../../bin/git
+f none usr/lib/git-core/git-web--browse 0555 root bin
+l none usr/lib/git-core/git-whatchanged=../../bin/git
+l none usr/lib/git-core/git-write-tree=../../bin/git
+d none usr/lib/python2.6 0755 root bin
+d none usr/lib/python2.6/site-packages 0755 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers-0.1.0-py2.6.egg-info 0444 root bin
+d none usr/lib/python2.6/site-packages/git_remote_helpers 0755 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/__init__.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/__init__.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/util.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/util.pyc 0444 root bin
+d none usr/lib/python2.6/site-packages/git_remote_helpers/git 0755 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/exporter.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/exporter.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/git.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/git.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/importer.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/importer.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/non_local.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/non_local.pyc 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.py 0444 root bin
+f none usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.pyc 0444 root bin
d none usr/share 0755 root sys
+d none usr/share/git-core 0755 root bin
+d none usr/share/git-core/templates 0755 root bin
+d none usr/share/git-core/templates/branches 0755 root bin
+f none usr/share/git-core/templates/description 0444 root bin
+d none usr/share/git-core/templates/hooks 0755 root bin
+f none usr/share/git-core/templates/hooks/applypatch-msg.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/commit-msg.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/post-commit.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/post-receive.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/post-update.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/pre-applypatch.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/pre-commit.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/pre-rebase.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/prepare-commit-msg.sample 0444 root bin
+f none usr/share/git-core/templates/hooks/update.sample 0444 root bin
+d none usr/share/git-core/templates/info 0755 root bin
+f none usr/share/git-core/templates/info/exclude 0444 root bin
+d none usr/share/git-gui 0755 root bin
+d none usr/share/git-gui/lib 0755 root bin
+f none usr/share/git-gui/lib/about.tcl 0444 root bin
+f none usr/share/git-gui/lib/blame.tcl 0444 root bin
+f none usr/share/git-gui/lib/branch_checkout.tcl 0444 root bin
+f none usr/share/git-gui/lib/branch_create.tcl 0444 root bin
+f none usr/share/git-gui/lib/branch_delete.tcl 0444 root bin
+f none usr/share/git-gui/lib/branch_rename.tcl 0444 root bin
+f none usr/share/git-gui/lib/branch.tcl 0444 root bin
+f none usr/share/git-gui/lib/browser.tcl 0444 root bin
+f none usr/share/git-gui/lib/checkout_op.tcl 0444 root bin
+f none usr/share/git-gui/lib/choose_font.tcl 0444 root bin
+f none usr/share/git-gui/lib/choose_repository.tcl 0444 root bin
+f none usr/share/git-gui/lib/choose_rev.tcl 0444 root bin
+f none usr/share/git-gui/lib/class.tcl 0444 root bin
+f none usr/share/git-gui/lib/commit.tcl 0444 root bin
+f none usr/share/git-gui/lib/console.tcl 0444 root bin
+f none usr/share/git-gui/lib/database.tcl 0444 root bin
+f none usr/share/git-gui/lib/date.tcl 0444 root bin
+f none usr/share/git-gui/lib/diff.tcl 0444 root bin
+f none usr/share/git-gui/lib/encoding.tcl 0444 root bin
+f none usr/share/git-gui/lib/error.tcl 0444 root bin
+f none usr/share/git-gui/lib/git-gui.ico 0444 root bin
+f none usr/share/git-gui/lib/index.tcl 0444 root bin
+f none usr/share/git-gui/lib/logo.tcl 0444 root bin
+f none usr/share/git-gui/lib/merge.tcl 0444 root bin
+f none usr/share/git-gui/lib/mergetool.tcl 0444 root bin
+f none usr/share/git-gui/lib/option.tcl 0444 root bin
+f none usr/share/git-gui/lib/remote_add.tcl 0444 root bin
+f none usr/share/git-gui/lib/remote_branch_delete.tcl 0444 root bin
+f none usr/share/git-gui/lib/remote.tcl 0444 root bin
+f none usr/share/git-gui/lib/search.tcl 0444 root bin
+f none usr/share/git-gui/lib/shortcut.tcl 0444 root bin
+f none usr/share/git-gui/lib/spellcheck.tcl 0444 root bin
+f none usr/share/git-gui/lib/sshkey.tcl 0444 root bin
+f none usr/share/git-gui/lib/status_bar.tcl 0444 root bin
+f none usr/share/git-gui/lib/tclIndex 0644 root bin
+f none usr/share/git-gui/lib/themed.tcl 0644 root bin
+f none usr/share/git-gui/lib/tools_dlg.tcl 0644 root bin
+f none usr/share/git-gui/lib/tools.tcl 0644 root bin
+f none usr/share/git-gui/lib/transport.tcl 0444 root bin
+f none usr/share/git-gui/lib/win32_shortcut.js 0444 root bin
+f none usr/share/git-gui/lib/win32.tcl 0444 root bin
+d none usr/share/git-gui/lib/msgs 0755 root bin
+f none usr/share/git-gui/lib/msgs/de.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/el.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/fr.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/hu.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/it.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/ja.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/nb.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/ru.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/sv.msg 0444 root bin
+f none usr/share/git-gui/lib/msgs/zh_cn.msg 0444 root bin
+d none usr/share/gitk 0755 root bin
+d none usr/share/gitk/lib 0755 root bin
+d none usr/share/gitk/lib/msgs 0755 root bin
+f none usr/share/gitk/lib/msgs/de.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/es.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/fr.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/hu.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/it.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/ja.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/ru.msg 0444 root bin
+f none usr/share/gitk/lib/msgs/sv.msg 0444 root bin
+d none usr/share/gitweb 0755 root bin
+f none usr/share/gitweb/gitweb.cgi 0555 root bin
+d none usr/share/gitweb/static 0755 root bin
+f none usr/share/gitweb/static/git-favicon.png 0444 root bin
+f none usr/share/gitweb/static/git-logo.png 0444 root bin
+f none usr/share/gitweb/static/gitweb.css 0444 root bin
+f none usr/share/gitweb/static/gitweb.js 0444 root bin
d none usr/share/man 0755 root bin
d none usr/share/man/man1 0755 root bin
f none usr/share/man/man1/git-add.1 0444 root bin
@@ -222,22 +352,24 @@
f none usr/share/man/man1/git-diff-index.1 0444 root bin
f none usr/share/man/man1/git-diff-tree.1 0444 root bin
f none usr/share/man/man1/git-diff.1 0444 root bin
+f none usr/share/man/man1/git-difftool.1 0444 root bin
f none usr/share/man/man1/git-fast-export.1 0444 root bin
f none usr/share/man/man1/git-fast-import.1 0444 root bin
f none usr/share/man/man1/git-fetch-pack.1 0444 root bin
f none usr/share/man/man1/git-fetch.1 0444 root bin
f none usr/share/man/man1/git-filter-branch.1 0444 root bin
f none usr/share/man/man1/git-fmt-merge-msg.1 0444 root bin
-f none usr/share/man/man1/git-fsck.1 0444 root bin
f none usr/share/man/man1/git-for-each-ref.1 0444 root bin
f none usr/share/man/man1/git-format-patch.1 0444 root bin
f none usr/share/man/man1/git-fsck-objects.1 0444 root bin
+f none usr/share/man/man1/git-fsck.1 0444 root bin
f none usr/share/man/man1/git-gc.1 0444 root bin
f none usr/share/man/man1/git-get-tar-commit-id.1 0444 root bin
f none usr/share/man/man1/git-grep.1 0444 root bin
f none usr/share/man/man1/git-gui.1 0444 root bin
f none usr/share/man/man1/git-hash-object.1 0444 root bin
f none usr/share/man/man1/git-help.1 0444 root bin
+f none usr/share/man/man1/git-http-backend.1 0444 root bin
f none usr/share/man/man1/git-http-fetch.1 0444 root bin
f none usr/share/man/man1/git-http-push.1 0444 root bin
f none usr/share/man/man1/git-imap-send.1 0444 root bin
@@ -249,7 +381,6 @@
f none usr/share/man/man1/git-lost-found.1 0444 root bin
f none usr/share/man/man1/git-ls-files.1 0444 root bin
f none usr/share/man/man1/git-ls-remote.1 0444 root bin
-f none usr/share/man/man1/git-merge.1 0444 root bin
f none usr/share/man/man1/git-ls-tree.1 0444 root bin
f none usr/share/man/man1/git-mailinfo.1 0444 root bin
f none usr/share/man/man1/git-mailsplit.1 0444 root bin
@@ -258,19 +389,22 @@
f none usr/share/man/man1/git-merge-index.1 0444 root bin
f none usr/share/man/man1/git-merge-one-file.1 0444 root bin
f none usr/share/man/man1/git-merge-tree.1 0444 root bin
+f none usr/share/man/man1/git-merge.1 0444 root bin
+f none usr/share/man/man1/git-mergetool--lib.1 0444 root bin
f none usr/share/man/man1/git-mergetool.1 0444 root bin
f none usr/share/man/man1/git-mktag.1 0444 root bin
f none usr/share/man/man1/git-mktree.1 0444 root bin
f none usr/share/man/man1/git-mv.1 0444 root bin
f none usr/share/man/man1/git-name-rev.1 0444 root bin
+f none usr/share/man/man1/git-notes.1 0444 root bin
f none usr/share/man/man1/git-pack-objects.1 0444 root bin
f none usr/share/man/man1/git-pack-redundant.1 0444 root bin
f none usr/share/man/man1/git-pack-refs.1 0444 root bin
f none usr/share/man/man1/git-parse-remote.1 0444 root bin
f none usr/share/man/man1/git-patch-id.1 0444 root bin
f none usr/share/man/man1/git-peek-remote.1 0444 root bin
+f none usr/share/man/man1/git-prune-packed.1 0444 root bin
f none usr/share/man/man1/git-prune.1 0444 root bin
-f none usr/share/man/man1/git-prune-packed.1 0444 root bin
f none usr/share/man/man1/git-pull.1 0444 root bin
f none usr/share/man/man1/git-push.1 0444 root bin
f none usr/share/man/man1/git-quiltimport.1 0444 root bin
@@ -279,8 +413,10 @@
f none usr/share/man/man1/git-receive-pack.1 0444 root bin
f none usr/share/man/man1/git-reflog.1 0444 root bin
f none usr/share/man/man1/git-relink.1 0444 root bin
+f none usr/share/man/man1/git-remote-helpers.1 0444 root bin
f none usr/share/man/man1/git-remote.1 0444 root bin
f none usr/share/man/man1/git-repack.1 0444 root bin
+f none usr/share/man/man1/git-replace.1 0444 root bin
f none usr/share/man/man1/git-repo-config.1 0444 root bin
f none usr/share/man/man1/git-request-pull.1 0444 root bin
f none usr/share/man/man1/git-rerere.1 0444 root bin
@@ -298,6 +434,7 @@
f none usr/share/man/man1/git-show-index.1 0444 root bin
f none usr/share/man/man1/git-show-ref.1 0444 root bin
f none usr/share/man/man1/git-show.1 0444 root bin
+f none usr/share/man/man1/git-stage.1 0444 root bin
f none usr/share/man/man1/git-stash.1 0444 root bin
f none usr/share/man/man1/git-status.1 0444 root bin
f none usr/share/man/man1/git-stripspace.1 0444 root bin
@@ -333,74 +470,7 @@
f none usr/share/man/man5/gitcvs-migration.5 0444 root bin
f none usr/share/man/man5/gitdiffcore.5 0444 root bin
f none usr/share/man/man5/gitglossary.5 0444 root bin
+f none usr/share/man/man5/gitrevisions.5 0444 root bin
f none usr/share/man/man5/gittutorial-2.5 0444 root bin
f none usr/share/man/man5/gittutorial.5 0444 root bin
-d none usr/share/git-core 0755 root bin
-d none usr/share/git-core/templates 0755 root bin
-d none usr/share/git-core/templates/branches 0755 root bin
-f none usr/share/git-core/templates/description 0444 root bin
-d none usr/share/git-core/templates/info 0755 root bin
-f none usr/share/git-core/templates/info/exclude 0444 root bin
-d none usr/share/git-core/templates/hooks 0755 root bin
-f none usr/share/git-core/templates/hooks/applypatch-msg 0444 root bin
-f none usr/share/git-core/templates/hooks/commit-msg 0444 root bin
-f none usr/share/git-core/templates/hooks/pre-commit 0444 root bin
-f none usr/share/git-core/templates/hooks/update 0444 root bin
-f none usr/share/git-core/templates/hooks/post-receive 0444 root bin
-f none usr/share/git-core/templates/hooks/post-update 0444 root bin
-f none usr/share/git-core/templates/hooks/prepare-commit-msg 0444 root bin
-f none usr/share/git-core/templates/hooks/pre-applypatch 0444 root bin
-f none usr/share/git-core/templates/hooks/post-commit 0444 root bin
-f none usr/share/git-core/templates/hooks/pre-rebase 0444 root bin
-d none usr/share/gitk 0755 root bin
-d none usr/share/gitk/lib 0755 root bin
-d none usr/share/gitk/lib/msgs 0755 root bin
-f none usr/share/gitk/lib/msgs/de.msg 0444 root bin
-f none usr/share/gitk/lib/msgs/es.msg 0444 root bin
-f none usr/share/gitk/lib/msgs/it.msg 0444 root bin
-f none usr/share/gitk/lib/msgs/sv.msg 0444 root bin
-d none usr/share/git-gui 0755 root bin
-d none usr/share/git-gui/lib 0755 root bin
-f none usr/share/git-gui/lib/tclIndex 0644 root bin
-f none usr/share/git-gui/lib/about.tcl 0444 root bin
-f none usr/share/git-gui/lib/blame.tcl 0444 root bin
-f none usr/share/git-gui/lib/branch.tcl 0444 root bin
-f none usr/share/git-gui/lib/branch_checkout.tcl 0444 root bin
-f none usr/share/git-gui/lib/branch_create.tcl 0444 root bin
-f none usr/share/git-gui/lib/branch_delete.tcl 0444 root bin
-f none usr/share/git-gui/lib/branch_rename.tcl 0444 root bin
-f none usr/share/git-gui/lib/browser.tcl 0444 root bin
-f none usr/share/git-gui/lib/checkout_op.tcl 0444 root bin
-f none usr/share/git-gui/lib/choose_font.tcl 0444 root bin
-f none usr/share/git-gui/lib/choose_repository.tcl 0444 root bin
-f none usr/share/git-gui/lib/choose_rev.tcl 0444 root bin
-f none usr/share/git-gui/lib/class.tcl 0444 root bin
-f none usr/share/git-gui/lib/commit.tcl 0444 root bin
-f none usr/share/git-gui/lib/console.tcl 0444 root bin
-f none usr/share/git-gui/lib/database.tcl 0444 root bin
-f none usr/share/git-gui/lib/date.tcl 0444 root bin
-f none usr/share/git-gui/lib/diff.tcl 0444 root bin
-f none usr/share/git-gui/lib/encoding.tcl 0444 root bin
-f none usr/share/git-gui/lib/error.tcl 0444 root bin
-f none usr/share/git-gui/lib/index.tcl 0444 root bin
-f none usr/share/git-gui/lib/logo.tcl 0444 root bin
-f none usr/share/git-gui/lib/merge.tcl 0444 root bin
-f none usr/share/git-gui/lib/option.tcl 0444 root bin
-f none usr/share/git-gui/lib/remote.tcl 0444 root bin
-f none usr/share/git-gui/lib/remote_branch_delete.tcl 0444 root bin
-f none usr/share/git-gui/lib/shortcut.tcl 0444 root bin
-f none usr/share/git-gui/lib/spellcheck.tcl 0444 root bin
-f none usr/share/git-gui/lib/status_bar.tcl 0444 root bin
-f none usr/share/git-gui/lib/transport.tcl 0444 root bin
-f none usr/share/git-gui/lib/win32.tcl 0444 root bin
-f none usr/share/git-gui/lib/git-gui.ico 0444 root bin
-f none usr/share/git-gui/lib/win32_shortcut.js 0444 root bin
-d none usr/share/git-gui/lib/msgs 0755 root bin
-f none usr/share/git-gui/lib/msgs/de.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/fr.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/hu.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/it.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/ja.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/ru.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/sv.msg 0444 root bin
-f none usr/share/git-gui/lib/msgs/zh_cn.msg 0444 root bin
+f none usr/share/man/man5/gitworkflows.5 0444 root bin
--- a/usr/src/pkgdefs/SUNWgit/prototype_i386 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/prototype_i386 Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_i386 1.1 08/10/21 SMI"
+# ident "@(#)prototype_i386 1.2 10/11/18 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
@@ -50,7 +49,7 @@
#
d none usr/perl5 0755 root bin
d none usr/perl5/vendor_perl 0755 root bin
-d none usr/perl5/vendor_perl/5.8.4 0755 root bin
-d none usr/perl5/vendor_perl/5.8.4/i86pc-solaris-64int 0755 root bin
-f none usr/perl5/vendor_perl/5.8.4/i86pc-solaris-64int/Git.pm 0400 root bin
-f none usr/perl5/vendor_perl/5.8.4/i86pc-solaris-64int/Error.pm 0400 root bin
+d none usr/perl5/vendor_perl/5.10.0 0755 root bin
+d none usr/perl5/vendor_perl/5.10.0/i86pc-solaris-64int 0755 root bin
+f none usr/perl5/vendor_perl/5.10.0/i86pc-solaris-64int/Git.pm 0444 root bin
+f none usr/perl5/vendor_perl/5.10.0/i86pc-solaris-64int/Error.pm 0444 root bin
--- a/usr/src/pkgdefs/SUNWgit/prototype_sparc Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/prototype_sparc Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_sparc 1.1 08/10/21 SMI"
+# ident "@(#)prototype_sparc 1.2 10/11/18 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
@@ -50,7 +49,7 @@
#
d none usr/perl5 0755 root bin
d none usr/perl5/vendor_perl 0755 root bin
-d none usr/perl5/vendor_perl/5.8.4 0755 root bin
-d none usr/perl5/vendor_perl/5.8.4/sun4-solaris-64int 0755 root bin
-f none usr/perl5/vendor_perl/5.8.4/sun4-solaris-64int/Git.pm 0400 root bin
-f none usr/perl5/vendor_perl/5.8.4/sun4-solaris-64int/Error.pm 0400 root bin
+d none usr/perl5/vendor_perl/5.10.0 0755 root bin
+d none usr/perl5/vendor_perl/5.10.0/sun4-solaris-64int 0755 root bin
+f none usr/perl5/vendor_perl/5.10.0/sun4-solaris-64int/Git.pm 0444 root bin
+f none usr/perl5/vendor_perl/5.10.0/sun4-solaris-64int/Error.pm 0444 root bin
--- a/usr/src/pkgdefs/SUNWgtar/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgtar/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.10 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.11 10/11/16 SMI"
#
#
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="GNU tar - A utility used to store, backup, and transport files (gtar) 1.23"
+DESC="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWgtar/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgtar/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.8 09/05/06 SMI"
+#ident "@(#)prototype_com 1.9 10/11/16 SMI"
#
# This required package information file contains a list of package contents.
@@ -65,6 +64,9 @@
d none usr/gnu/share/man/man1 0755 root bin
s none usr/gnu/share/man/man1/tar.1=../../../../share/man/man1/gtar.1
d none usr/share/locale 0755 root other
+d none usr/share/locale/ca 0755 root other
+d none usr/share/locale/ca/LC_MESSAGES 0755 root other
+f none usr/share/locale/ca/LC_MESSAGES/tar.mo 0444 root other
d none usr/share/locale/cs 0755 root other
d none usr/share/locale/cs/LC_MESSAGES 0755 root other
f none usr/share/locale/cs/LC_MESSAGES/tar.mo 0444 root other
--- a/usr/src/pkgdefs/SUNWlcms/depend Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlcms/depend Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
-#ident "@(#)depend 1.3 10/04/20 SMI"
+#ident "@(#)depend 1.4 10/11/04 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -51,7 +51,6 @@
P SUNWlibC Sun Workshop Compilers Bundled libC
P SUNWTiff libtiff - library for reading and writing TIFF
P SUNWjpg jpeg - The Independent JPEG Groups JPEG software
-P SUNWPython The Python interpreter, libraries and utilities
P SUNWPython26 The Python 2.6 interpreter, libraries and utilities
P SUNWzlib The Zip compression library
P SUNWlibms Math & Microtasking Libraries (Usr)
--- a/usr/src/pkgdefs/SUNWlcms/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.2 10/04/20 SMI"
+# ident "@(#)prototype_com 1.3 10/11/04 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
@@ -62,10 +62,6 @@
f none usr/lib/llib-llcms.ln 0644 root bin
d none usr/lib/pkgconfig 0755 root other
f none usr/lib/pkgconfig/lcms.pc 0644 root other
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-f none usr/lib/python2.4/vendor-packages/_lcms.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/lcms.py 0644 root bin
d none usr/lib/python2.6 0755 root bin
d none usr/lib/python2.6/vendor-packages 0755 root bin
f none usr/lib/python2.6/vendor-packages/_lcms.so 0755 root bin
--- a/usr/src/pkgdefs/SUNWlcms/prototype_i386 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_i386 Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_i386 1.4 10/04/20 SMI"
+# ident "@(#)prototype_i386 1.5 10/11/04 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
@@ -51,8 +51,6 @@
s none usr/lib/amd64/liblcms.so.1=liblcms.so.1.0.19
s none usr/lib/amd64/liblcms.so=liblcms.so.1.0.19
f none usr/lib/amd64/llib-llcms.ln 0644 root bin
-d none usr/lib/python2.4/vendor-packages/64 0755 root bin
-f none usr/lib/python2.4/vendor-packages/64/_lcms.so 0755 root bin
d none usr/lib/python2.6/vendor-packages/64 0755 root bin
f none usr/lib/python2.6/vendor-packages/64/_lcms.so 0755 root bin
d none usr/lib/amd64/pkgconfig 0755 root other
--- a/usr/src/pkgdefs/SUNWlcms/prototype_sparc Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_sparc Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_sparc 1.4 10/04/20 SMI"
+# ident "@(#)prototype_sparc 1.5 10/11/04 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
@@ -50,8 +50,6 @@
f none usr/lib/sparcv9/liblcms.so.1.0.19 0755 root bin
s none usr/lib/sparcv9/liblcms.so.1=liblcms.so.1.0.19
s none usr/lib/sparcv9/liblcms.so=liblcms.so.1.0.19
-d none usr/lib/python2.4/vendor-packages/64 0755 root bin
-f none usr/lib/python2.4/vendor-packages/64/_lcms.so 0755 root bin
d none usr/lib/python2.6/vendor-packages/64 0755 root bin
f none usr/lib/python2.6/vendor-packages/64/_lcms.so 0755 root bin
f none usr/lib/sparcv9/llib-llcms.ln 0644 root bin
--- a/usr/src/pkgdefs/SUNWlftpr/copyright Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlftpr/copyright Mon Nov 29 01:15:23 2010 -0800
@@ -5,7 +5,7 @@
the language indicating that GPLv3 or any later version may be used.
=============================================================================
-Copyright (c) 1996-2009 Alexander V. Lukyanov
+Copyright (c) 1996-2010 Alexander V. Lukyanov
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/usr/src/pkgdefs/SUNWlftpr/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlftpr/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.3 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.4 10/11/03 SMI"
#
#
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="root"
MAXINST="1000"
CATEGORY="system"
-DESC="lftp - Sophisticated file transfer program version 3.7.15 (Root files package)"
+DESC="lftp - Sophisticated file transfer program version 4.0.10 (Root files package)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWlftpu/copyright Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlftpu/copyright Mon Nov 29 01:15:23 2010 -0800
@@ -5,7 +5,7 @@
the language indicating that GPLv3 or any later version may be used.
=============================================================================
-Copyright (c) 1996-2009 Alexander V. Lukyanov
+Copyright (c) 1996-2010 Alexander V. Lukyanov
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/usr/src/pkgdefs/SUNWlftpu/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlftpu/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.3 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.4 10/11/03 SMI"
#
#
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="lftp - Sophisticated file transfer program version 3.7.15 (User files package)"
+DESC="lftp - Sophisticated file transfer program version 4.0.10 (User files package)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWlftpu/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWlftpu/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_com 1.2 09/07/31 SMI"
+#pragma ident "@(#)prototype_com 1.3 10/11/03 SMI"
#
# This required package information file contains a list of package contents.
@@ -50,15 +49,20 @@
d none usr/share/man/man1 0755 root bin
f none usr/share/man/man1/lftp.1 0444 root bin
f none usr/share/man/man1/lftpget.1 0444 root bin
+d none usr/share/man/man4 0755 root bin
+f none usr/share/man/man4/lftp.conf.4 0444 root bin
d none usr/share/lftp 0755 root bin
f none usr/share/lftp/verify-file 0555 root bin
f none usr/share/lftp/import-netscape 0555 root bin
f none usr/share/lftp/import-ncftp 0555 root bin
-f none usr/share/lftp/convert-netscape-cookies 0555 root bin
+f none usr/share/lftp/convert-mozilla-cookies 0555 root bin
d none usr/bin 0755 root bin
f none usr/bin/lftpget 0555 root bin
f none usr/bin/lftp 0555 root bin
d none usr/share/locale 0755 root other
+d none usr/share/locale/cs 0755 root other
+d none usr/share/locale/cs/LC_MESSAGES 0755 root other
+f none usr/share/locale/cs/LC_MESSAGES/lftp.mo 0444 root other
d none usr/share/locale/it 0755 root other
d none usr/share/locale/it/LC_MESSAGES 0755 root other
f none usr/share/locale/it/LC_MESSAGES/lftp.mo 0444 root other
--- a/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 09/07/06 SMI"
+# ident "@(#)prototype_com 1.2 10/09/30 SMI"
#
# * U.S. Government Rights - Commercial software. Government users are subject
# * to the Sun Microsystems, Inc. standard license agreement and applicable
@@ -39,5 +38,4 @@
d none usr 755 root sys
d none usr/lib 755 root bin
f none usr/lib/libseaExtensions.so 755 root bin
-f none usr/lib/libseaProxy.so 755 root bin
--- a/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_i386 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_i386 Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_i386 1.1 09/07/06 SMI"
+# ident "@(#)prototype_i386 1.2 10/09/30 SMI"
#
# * U.S. Government Rights - Commercial software. Government users are subject
# * to the Sun Microsystems, Inc. standard license agreement and applicable
@@ -56,5 +55,4 @@
#
# SUNWnet-snmp-addons
d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libseaProxy.so 0755 root bin
f none usr/lib/amd64/libseaExtensions.so 755 root bin
--- a/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_sparc Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWnet-snmp-addons/prototype_sparc Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_sparc 1.1 09/07/06 SMI"
+# ident "@(#)prototype_sparc 1.2 10/09/30 SMI"
#
# *
# * U.S. Government Rights - Commercial software. Government users are subject
@@ -59,4 +58,3 @@
#
d none usr/lib/sparcv9 0755 root bin
f none usr/lib/sparcv9/libseaExtensions.so 0755 root bin
-f none usr/lib/sparcv9/libseaProxy.so 0755 root bin
--- a/usr/src/pkgdefs/SUNWnet-snmp-mgr/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWnet-snmp-mgr/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.2 10/04/22 SMI"
+#ident "@(#)prototype_com 1.3 10/09/30 SMI"
#
# *
# * U.S. Government Rights - Commercial software. Government users are subject
@@ -227,6 +227,5 @@
d none lib/svc/manifest/application 0755 root sys
d none lib/svc/manifest/application/management 0755 root sys
f manifest lib/svc/manifest/application/management/net-snmp.xml 0444 root sys
-f manifest lib/svc/manifest/application/management/seaport.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/svc-net-snmp 0555 root bin
--- a/usr/src/pkgdefs/SUNWnet-snmp-utils/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWnet-snmp-utils/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 09/07/06 SMI"
+# ident "@(#)prototype_com 1.2 10/09/30 SMI"
#
#
# * U.S. Government Rights - Commercial software. Government users are subject
@@ -272,8 +271,6 @@
d none usr/lib/net-snmp 0755 root bin
f none usr/lib/net-snmp/masfcnv 0555 root bin
f none usr/lib/net-snmp/masfd 0555 root bin
-f none usr/lib/net-snmp/setseaport 0555 root bin
-f none usr/lib/net-snmp/findseaport 0555 root bin
d none usr/perl5 0755 root bin
d none usr/perl5/vendor_perl 0755 root bin
d none usr/perl5/vendor_perl/5.8.4 0755 root bin
--- a/usr/src/pkgdefs/SUNWsmbar/postinstall Tue Nov 16 22:41:24 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# 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 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)postinstall 1.1 06/04/13 SMI"
-#
-# postinstall - leaving the samba service enabled after the reinstallation
-# over the allready configured (and most probably running)
-# samba
-#
-
-if [ -z "$PKG_INSTALL_ROOT" -o "$PKG_INSTALL_ROOT" = "/" ] ; then
- cat >> /var/svc/profile/upgrade <<-_ENABLE_SMB
- if [ -f /etc/sfw/smb.conf ]; then
- /usr/sbin/svcadm enable svc:/network/wins:default
- /usr/sbin/svcadm enable svc:/network/samba:default
- fi
- _ENABLE_SMB
-fi
--- a/usr/src/pkgdefs/SUNWsmbar/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWsmbar/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.17 10/07/26 SMI"
+#ident "@(#)prototype_com 1.18 10/11/19 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
@@ -36,7 +36,6 @@
i pkginfo
i copyright
i depend
-i postinstall
# source locations relative to the prototype file
#
# SUNWsmbar
--- a/usr/src/pkgdefs/SUNWswig/depend Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWswig/depend Mon Nov 29 01:15:23 2010 -0800
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)depend 1.1 08/09/18 SMI"
+#ident "@(#)depend 1.2 10/11/08 SMI"
#
#
# This package information file defines software dependencies associated
@@ -53,4 +52,3 @@
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWlibC Sun Workshop Compilers Bundled libC
-P SUNWPython The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWunixodbc/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWunixodbc/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/09/15 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="UnixODBC - The UnixODBC Subsystem and SDK (2.2.14)"
+DESC="UnixODBC - The UnixODBC Subsystem and SDK (2.3.0)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWunixodbc/prototype_com Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWunixodbc/prototype_com Mon Nov 29 01:15:23 2010 -0800
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 09/04/17 SMI"
+# ident "@(#)prototype_com 1.2 10/11/17 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
@@ -53,7 +52,6 @@
f none usr/bin/iusql 0755 root bin
f none usr/bin/odbc_config 0755 root bin
f none usr/bin/odbcinst 0755 root bin
-f none usr/include/odbc/autotest.h 0644 root bin
f none usr/include/odbc/odbcinst.h 0644 root bin
f none usr/include/odbc/odbcinstext.h 0644 root bin
f none usr/include/odbc/sql.h 0644 root bin
@@ -63,9 +61,7 @@
f none usr/include/odbc/unixodbc_conf.h 0644 root bin
f none usr/include/odbc/uodbc_extras.h 0644 root bin
f none usr/include/odbc/uodbc_stats.h 0644 root bin
-f none usr/lib/libboundparam.so.1.0.0 0755 root bin
f none usr/lib/libesoobS.so.1.0.0 0755 root bin
-f none usr/lib/libgtrtst.so.1.0.0 0755 root bin
f none usr/lib/libmimerS.so.1.0.0 0755 root bin
f none usr/lib/libnn.so.1.0.0 0755 root bin
f none usr/lib/libodbc.so.1.0.0 0755 root bin
@@ -76,7 +72,6 @@
f none usr/lib/libodbcminiS.so.1.0.0 0755 root bin
f none usr/lib/libodbcmyS.so.1.0.0 0755 root bin
f none usr/lib/libodbcnnS.so.1.0.0 0755 root bin
-f none usr/lib/libodbcpsql.so.1.0.0 0755 root bin
f none usr/lib/libodbcpsql.so.2.0.0 0755 root bin
f none usr/lib/libodbcpsqlS.so.1.0.0 0755 root bin
f none usr/lib/libodbctxtS.so.1.0.0 0755 root bin
@@ -85,12 +80,8 @@
f none usr/lib/libsapdbS.so.1.0.0 0755 root bin
f none usr/lib/libtdsS.so.1.0.0 0755 root bin
f none usr/lib/libtemplate.so.1.0.0 0755 root bin
-s none usr/lib/libboundparam.so.1=libboundparam.so.1.0.0
-s none usr/lib/libboundparam.so=libboundparam.so.1.0.0
s none usr/lib/libesoobS.so.1=libesoobS.so.1.0.0
s none usr/lib/libesoobS.so=libesoobS.so.1.0.0
-s none usr/lib/libgtrtst.so.1=libgtrtst.so.1.0.0
-s none usr/lib/libgtrtst.so=libgtrtst.so.1.0.0
s none usr/lib/libmimerS.so.1=libmimerS.so.1.0.0
s none usr/lib/libmimerS.so=libmimerS.so.1.0.0
s none usr/lib/libnn.so.1=libnn.so.1.0.0
@@ -111,7 +102,6 @@
s none usr/lib/libodbcmyS.so=libodbcmyS.so.1.0.0
s none usr/lib/libodbcnnS.so.1=libodbcnnS.so.1.0.0
s none usr/lib/libodbcnnS.so=libodbcnnS.so.1.0.0
-s none usr/lib/libodbcpsql.so.1=libodbcpsql.so.1.0.0
s none usr/lib/libodbcpsql.so.2=libodbcpsql.so.2.0.0
s none usr/lib/libodbcpsql.so=libodbcpsql.so.2.0.0
s none usr/lib/libodbcpsqlS.so.1=libodbcpsqlS.so.1.0.0
--- a/usr/src/pkgdefs/SUNWunixodbc/prototype_i386 Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWunixodbc/prototype_i386 Mon Nov 29 01:15:23 2010 -0800
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_i386 1.1 09/04/17 SMI"
+# ident "@(#)prototype_i386 1.2 10/11/17 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
@@ -50,9 +49,7 @@
d none usr/bin/amd64 0755 root bin
d none usr/lib/amd64 0755 root bin
d none usr/lib/amd64/pkgconfig 0755 root other
-f none usr/lib/amd64/libboundparam.so.1.0.0 0755 root bin
f none usr/lib/amd64/libesoobS.so.1.0.0 0755 root bin
-f none usr/lib/amd64/libgtrtst.so.1.0.0 0755 root bin
f none usr/lib/amd64/libmimerS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libnn.so.1.0.0 0755 root bin
f none usr/lib/amd64/libodbc.so.1.0.0 0755 root bin
@@ -63,7 +60,6 @@
f none usr/lib/amd64/libodbcminiS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libodbcmyS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libodbcnnS.so.1.0.0 0755 root bin
-f none usr/lib/amd64/libodbcpsql.so.1.0.0 0755 root bin
f none usr/lib/amd64/libodbcpsql.so.2.0.0 0755 root bin
f none usr/lib/amd64/libodbcpsqlS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libodbctxtS.so.1.0.0 0755 root bin
@@ -72,12 +68,8 @@
f none usr/lib/amd64/libsapdbS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libtdsS.so.1.0.0 0755 root bin
f none usr/lib/amd64/libtemplate.so.1.0.0 0755 root bin
-s none usr/lib/amd64/libboundparam.so.1=libboundparam.so.1.0.0
-s none usr/lib/amd64/libboundparam.so=libboundparam.so.1.0.0
s none usr/lib/amd64/libesoobS.so.1=libesoobS.so.1.0.0
s none usr/lib/amd64/libesoobS.so=libesoobS.so.1.0.0
-s none usr/lib/amd64/libgtrtst.so.1=libgtrtst.so.1.0.0
-s none usr/lib/amd64/libgtrtst.so=libgtrtst.so.1.0.0
s none usr/lib/amd64/libmimerS.so.1=libmimerS.so.1.0.0
s none usr/lib/amd64/libmimerS.so=libmimerS.so.1.0.0
s none usr/lib/amd64/libnn.so.1=libnn.so.1.0.0
@@ -98,7 +90,6 @@
s none usr/lib/amd64/libodbcmyS.so=libodbcmyS.so.1.0.0
s none usr/lib/amd64/libodbcnnS.so.1=libodbcnnS.so.1.0.0
s none usr/lib/amd64/libodbcnnS.so=libodbcnnS.so.1.0.0
-s none usr/lib/amd64/libodbcpsql.so.1=libodbcpsql.so.1.0.0
s none usr/lib/amd64/libodbcpsql.so.2=libodbcpsql.so.2.0.0
s none usr/lib/amd64/libodbcpsql.so=libodbcpsql.so.2.0.0
s none usr/lib/amd64/libodbcpsqlS.so.1=libodbcpsqlS.so.1.0.0
--- a/usr/src/pkgdefs/SUNWunixodbc/prototype_sparc Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWunixodbc/prototype_sparc Mon Nov 29 01:15:23 2010 -0800
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_sparc 1.1 09/04/17 SMI"
+# ident "@(#)prototype_sparc 1.2 10/11/17 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
@@ -49,9 +48,7 @@
#
d none usr/lib/sparcv9 0755 root bin
d none usr/lib/sparcv9/pkgconfig 0755 root other
-f none usr/lib/sparcv9/libboundparam.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libesoobS.so.1.0.0 0755 root bin
-f none usr/lib/sparcv9/libgtrtst.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libmimerS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libnn.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libodbc.so.1.0.0 0755 root bin
@@ -62,7 +59,6 @@
f none usr/lib/sparcv9/libodbcminiS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libodbcmyS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libodbcnnS.so.1.0.0 0755 root bin
-f none usr/lib/sparcv9/libodbcpsql.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libodbcpsql.so.2.0.0 0755 root bin
f none usr/lib/sparcv9/libodbcpsqlS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libodbctxtS.so.1.0.0 0755 root bin
@@ -71,12 +67,8 @@
f none usr/lib/sparcv9/libsapdbS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libtdsS.so.1.0.0 0755 root bin
f none usr/lib/sparcv9/libtemplate.so.1.0.0 0755 root bin
-s none usr/lib/sparcv9/libboundparam.so.1=libboundparam.so.1.0.0
-s none usr/lib/sparcv9/libboundparam.so=libboundparam.so.1.0.0
s none usr/lib/sparcv9/libesoobS.so.1=libesoobS.so.1.0.0
s none usr/lib/sparcv9/libesoobS.so=libesoobS.so.1.0.0
-s none usr/lib/sparcv9/libgtrtst.so.1=libgtrtst.so.1.0.0
-s none usr/lib/sparcv9/libgtrtst.so=libgtrtst.so.1.0.0
s none usr/lib/sparcv9/libmimerS.so.1=libmimerS.so.1.0.0
s none usr/lib/sparcv9/libmimerS.so=libmimerS.so.1.0.0
s none usr/lib/sparcv9/libnn.so.1=libnn.so.1.0.0
@@ -97,7 +89,6 @@
s none usr/lib/sparcv9/libodbcmyS.so=libodbcmyS.so.1.0.0
s none usr/lib/sparcv9/libodbcnnS.so.1=libodbcnnS.so.1.0.0
s none usr/lib/sparcv9/libodbcnnS.so=libodbcnnS.so.1.0.0
-s none usr/lib/sparcv9/libodbcpsql.so.1=libodbcpsql.so.1.0.0
s none usr/lib/sparcv9/libodbcpsql.so.2=libodbcpsql.so.2.0.0
s none usr/lib/sparcv9/libodbcpsql.so=libodbcpsql.so.2.0.0
s none usr/lib/sparcv9/libodbcpsqlS.so.1=libodbcpsqlS.so.1.0.0
--- a/usr/src/pkgdefs/SUNWunixodbcr/pkginfo.tmpl Tue Nov 16 22:41:24 2010 -0800
+++ b/usr/src/pkgdefs/SUNWunixodbcr/pkginfo.tmpl Mon Nov 29 01:15:23 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/09/15 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -35,7 +35,7 @@
SUNW_PKGTYPE="root"
MAXINST="1000"
CATEGORY="system"
-DESC="UnixODBC - The UnixODBC Subsystem and SDK (2.2.14) (root package)"
+DESC="UnixODBC - The UnixODBC Subsystem and SDK (2.3.0) (root package)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""