Import sfw build 140
Bugs Fixed
----------
6890057 upgrade squid to 2.7 stable9
6922616 gnuplot doesn't find default font for png plots
6929417 Upgrade nmap to 5.21
6939380 SFW delivered SMF manifests should be relocated to /lib/svc/manifest
6942427 pkgtemplate.pl needs updated copyright
6950179 Update fetchmail to version 6.3.17 (CVE-2010-1167)
--- a/usr/src/Targetdirs Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/Targetdirs Thu May 20 09:24:15 2010 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Targetdirs 1.251 10/04/12 SMI"
+# ident "@(#)Targetdirs 1.253 10/04/27 SMI"
#
#
@@ -96,17 +96,16 @@
/var/ntp \
/var/ntp/ntpstats \
/var/run \
- /var/svc \
- /var/svc/manifest \
- /var/svc/manifest/application \
- /var/svc/manifest/application/management \
- /var/svc/manifest/application/database \
- /var/svc/manifest/network \
- /var/svc/manifest/network/ldap \
- /var/svc/manifest/network/loadbalancer \
- /var/svc/manifest/network/routing \
- /var/svc/manifest/network/ssl \
- /var/svc/manifest/system
+ /lib/svc/manifest \
+ /lib/svc/manifest/application \
+ /lib/svc/manifest/application/management \
+ /lib/svc/manifest/application/database \
+ /lib/svc/manifest/network \
+ /lib/svc/manifest/network/ldap \
+ /lib/svc/manifest/network/loadbalancer \
+ /lib/svc/manifest/network/routing \
+ /lib/svc/manifest/network/ssl \
+ /lib/svc/manifest/system
# Note: Do not add subdirs (other than logs, proxy and libexec)
# of /var/apache2/2.2 to the list. The apache2 installation will
@@ -365,8 +364,6 @@
/usr/lib/python2.4/vendor-packages/OpenSSL \
/usr/lib/python2.4/vendor-packages/OpenSSL/64 \
/usr/lib/python2.4/vendor-packages/OpenSSL/test \
- /usr/lib/python2.4/vendor-packages/zenmapCore \
- /usr/lib/python2.4/vendor-packages/zenmapGUI \
/usr/lib/python2.6 \
/usr/lib/python2.6/vendor-packages \
/usr/lib/python2.6/vendor-packages/64 \
@@ -409,7 +406,10 @@
/usr/lib/python2.6/vendor-packages/pylint/reporters \
/usr/lib/python2.6/vendor-packages/pylint/checkers \
/usr/lib/python2.6/vendor-packages/pylint-0.18.0-py2.6.egg-info \
+ /usr/lib/python2.6/vendor-packages/radialnet \
/usr/lib/python2.6/vendor-packages/svn \
+ /usr/lib/python2.6/vendor-packages/zenmapCore \
+ /usr/lib/python2.6/vendor-packages/zenmapGUI \
/usr/lib/quilt \
/usr/lib/sane \
/usr/lib/security \
@@ -1178,6 +1178,7 @@
/usr/share/meld/glade2/pixmaps \
/usr/share/man/man8oldap \
/usr/share/nano \
+ /usr/share/ncat \
/usr/share/nmap \
/usr/share/nmap/nselib \
/usr/share/nmap/scripts \
--- a/usr/src/cmd/apache2/install-apache2 Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/apache2/install-apache2 Thu May 20 09:24:15 2010 -0700
@@ -22,10 +22,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-apache2 1.22 09/10/26 SMI"
+#ident "@(#)install-apache2 1.23 10/04/22 SMI"
#
set -o errexit
@@ -143,7 +142,7 @@
install_smf_hooks() {
cd ${TOP}/Solaris
- ins_file http-apache22.xml ${ROOT}/var/svc/manifest/network 444
+ ins_file http-apache22.xml ${ROOT}/lib/svc/manifest/network 444
}
install_auth_gss() {
--- a/usr/src/cmd/bind/install-bind Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/bind/install-bind Thu May 20 09:24:15 2010 -0700
@@ -21,15 +21,13 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
+#ident "@(#)install-bind 1.12 10/04/22 SMI"
# Install BIND's objects into the proto area ready for packaging.
#
-#ident "@(#)install-bind 1.11 09/07/12 SMI"
-
# VERS should be provided on command line or set in environment
if [ $# -gt 0 ]; then
VERS=$1;
@@ -65,7 +63,7 @@
LIBDIR=${PREFIX}/lib/dns
SBINDIR=${PREFIX}/sbin
DOCDIR=${PREFIX}/share/doc
-MANIFESTDIR=${ROOT}/var/svc/manifest/network
+MANIFESTDIR=${ROOT}/lib/svc/manifest/network
METHODDIR=${ROOT}/lib/svc/method
cd ${VERS}
--- a/usr/src/cmd/cimserver/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/cimserver/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.2 09/01/28 SMI"
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
VERS=pegasus-2.8.0
PREFIX=${ROOT}/usr
@@ -311,10 +311,10 @@
# SMF
mkdir -p -m 755 ${ROOT}/lib/svc/method
-mkdir -p -m 755 ${ROOT}/var/svc/manifest/network
+mkdir -p -m 755 ${ROOT}/lib/svc/manifest/network
_install S Solaris/svc-cimserver ${ROOT}/lib/svc/method/svc-cimserver 555
-_install N Solaris/cimserver.xml ${ROOT}/var/svc/manifest/network/cimserver.xml 444
+_install N Solaris/cimserver.xml ${ROOT}/lib/svc/manifest/network/cimserver.xml 444
# supporting directories
mkdir -p -m 755 ${ROOT}/var/Pegasus
--- a/usr/src/cmd/conman/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/conman/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,10 +21,9 @@
#
#
-# 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.2 09/06/09 SMI"
+# ident "@(#)install-sfw 1.3 10/04/22 SMI"
set -o errexit
PREFIX=${ROOT}/usr
@@ -51,7 +50,7 @@
_install E conman ${PREFIX}/bin/conman 555
_install E conmand ${PREFIX}/sbin/conmand 555
-_install N ../conmand.xml ${ROOT}/var/svc/manifest/system/conmand.xml 444
+_install N ../conmand.xml ${ROOT}/lib/svc/manifest/system/conmand.xml 444
_install S ../svc-conmand ${ROOT}/lib/svc/method/svc-conmand 555
_install N etc/conman.conf ${ROOT}/etc/conman.conf 644
--- a/usr/src/cmd/cups/Makefile.sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/cups/Makefile.sfw Thu May 20 09:24:15 2010 -0700
@@ -21,9 +21,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-
-#ident "@(#)Makefile.sfw 1.12 10/04/15 SMI"
-#
+#ident "@(#)Makefile.sfw 1.13 10/04/22 SMI"
include ../Makefile.cmd
@@ -41,7 +39,7 @@
CONFIGURE_OPTIONS += --with-fontpath=/usr/openwin/lib
CONFIGURE_OPTIONS += --with-logdir=/var/log/cups
CONFIGURE_OPTIONS += --with-domainsocket=/var/run/cups-socket
-CONFIGURE_OPTIONS += --with-smfmanifestdir=/var/svc/manifest/application
+CONFIGURE_OPTIONS += --with-smfmanifestdir=/lib/svc/manifest/application
CONFIGURE_OPTIONS += --with-printcap=/etc/printers.conf
CONFIGURE_OPTIONS += --with-cups-user=lp
CONFIGURE_OPTIONS += --with-cups-group=lp
@@ -111,8 +109,8 @@
$(INSTALL_PROTO) -m 0555 smb $(ROOT)/usr/lib/cups/backend/smb
# install the service to set up CUPS as the default print service
$(INSTALL_PROTO) -m 0555 Solaris/print-service-selector $(ROOT)/lib/svc/method/print-service-selector
- $(MKDIR) -p $(ROOT)/var/svc/manifest/application/print
- $(INSTALL_PROTO) -m 0444 Solaris/service-selector.xml $(ROOT)/var/svc/manifest/application/print/service-selector.xml
+ $(MKDIR) -p $(ROOT)/lib/svc/manifest/application/print
+ $(INSTALL_PROTO) -m 0444 Solaris/service-selector.xml $(ROOT)/lib/svc/manifest/application/print/service-selector.xml
$(INSTALL_PROTO) -m 0444 auth_attr $(ROOT)/etc/security/auth_attr.d/cups
$(INSTALL_PROTO) -m 0444 prof_attr $(ROOT)/etc/security/prof_attr.d/cups
# clean up the turds
--- a/usr/src/cmd/ejabberd/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/ejabberd/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,10 +21,9 @@
#
#
-# 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/06/17 SMI"
+#ident "@(#)install-sfw 1.2 10/04/22 SMI"
#
set -o errexit
@@ -35,5 +34,5 @@
_install M ejabberdctl.1m ${ROOT}/usr/share/man/man1m/ejabberdctl.1m 444
# Install smf files
-_install N Solaris/xmpp-ejabberd.xml ${ROOT}/var/svc/manifest/network/xmpp-ejabberd.xml 444
+_install N Solaris/xmpp-ejabberd.xml ${ROOT}/lib/svc/manifest/network/xmpp-ejabberd.xml 444
_install N Solaris/xmpp-ejabberd ${ROOT}/lib/svc/method/xmpp-ejabberd 555
--- a/usr/src/cmd/fetchmail/METADATA Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/fetchmail/METADATA Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
NAME: fetchmail
-VERSION: 6.3.16
+VERSION: 6.3.17
DESCRIPTION: fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
LICENSE: GPLv2
PACKAGE: SUNWfetchmail
PROJECT_URL: http://fetchmail.berlios.de/
-SOURCE_DOWNLOAD: http://download.berlios.de/fetchmail/fetchmail-6.3.16.tar.bz2
+SOURCE_DOWNLOAD: http://download.berlios.de/fetchmail/fetchmail-6.3.17.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/utility/fetchmail
OSR: 8301
Binary file usr/src/cmd/fetchmail/fetchmail-6.3.16.tar.bz2 has changed
Binary file usr/src/cmd/fetchmail/fetchmail-6.3.17.tar.bz2 has changed
--- a/usr/src/cmd/freeipmi/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/freeipmi/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,11 +21,9 @@
#
#
-# Copyright 2010 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.2 10/03/10 SMI"
-#
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
# stop at first error
set -o errexit
@@ -40,9 +38,9 @@
source ${SRC}/tools/install.subr
# install bmc watchdog for freeIPMI
-_install N ${SRC}/cmd/freeipmi/bmc-watchdog.xml ${ROOT}/var/svc/manifest/system/bmc-watchdog.xml 444
+_install N ${SRC}/cmd/freeipmi/bmc-watchdog.xml ${ROOT}/lib/svc/manifest/system/bmc-watchdog.xml 444
_install N ${SRC}/cmd/freeipmi/svc-bmc-watchdog ${ROOT}/lib/svc/method/svc-bmc-watchdog 444
-_install N ${SRC}/cmd/freeipmi/ipmidetectd.xml ${ROOT}/var/svc/manifest/system/ipmidetectd.xml 444
+_install N ${SRC}/cmd/freeipmi/ipmidetectd.xml ${ROOT}/lib/svc/manifest/system/ipmidetectd.xml 444
_install N ${SRC}/cmd/freeipmi/svc-ipmidetectd ${ROOT}/lib/svc/method/svc-ipmidetectd 444
# manpages is converted by sunman-stability sed-script to
--- a/usr/src/cmd/ipmitool/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/ipmitool/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# ident "@(#)install-sfw 1.12 08/11/21 SMI"
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+#ident "@(#)install-sfw 1.13 10/04/22 SMI"
#
VERS=ipmitool-1.8.10
@@ -32,7 +31,7 @@
SFWDIR=${ROOT}/usr/sfw/bin # old proto dir for ipmitool
SBINDIR=${ROOT}/usr/sbin # proto dir for ipmitool binary
LIBDIR=${ROOT}/usr/lib # proto dir for ipmievd binary
-XMLDIR=${ROOT}/var/svc/manifest/network # proto dir for ipmievd XML manifest
+XMLDIR=${ROOT}/lib/svc/manifest/network # proto dir for ipmievd XML manifest
METHODDIR=${ROOT}/lib/svc/method # proto dir for ipmievd method
IPMITOOLMAN=${MANDIR}/man1m/ipmitool.1m # proto location of ipmitool manpage
IPMIEVDMAN=${MANDIR}/man8/ipmievd.8 # proto location of ipmievd manpage
--- a/usr/src/cmd/lighttpd14/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/lighttpd14/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,10 +21,9 @@
#
#
-# Copyright 2010 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 "@(#)install-sfw 1.4 10/02/19 SMI"
+#ident "@(#)install-sfw 1.5 10/04/22 SMI"
set -o errexit
@@ -130,7 +129,7 @@
SBINDIR=${PREFIX}/sbin
LIBDIR=${PREFIX}/lib
-MANIFESTDIR=${ROOT}/var/svc/manifest/network
+MANIFESTDIR=${ROOT}/lib/svc/manifest/network
METHODDIR=${ROOT}/lib/svc/method
MANSCRIPT=${TOP}/sunman-stability
--- a/usr/src/cmd/mysql-5-0/install-mysql Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/mysql-5-0/install-mysql Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-mysql 1.6 10/02/19 SMI"
+#ident "@(#)install-mysql 1.7 10/04/22 SMI"
# stop at the first error
set -o errexit
@@ -46,7 +45,7 @@
typeset MAN1DIR=${PREFIX}/man/man1
typeset MAN8DIR=${PREFIX}/man/man8
typeset DOCDIR="${CWD}/${MYSQL_DIR}/Docs"
-typeset MANIFESTDIR="${ROOT}/var/svc/manifest/application/database"
+typeset MANIFESTDIR="${ROOT}/lib/svc/manifest/application/database"
typeset METHODDIR="${ROOT}/lib/svc/method"
typeset MANSCRIPT=sunman-stability
--- a/usr/src/cmd/mysql-5-1/install-mysql Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/mysql-5-1/install-mysql Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 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-mysql 1.2 10/01/06 SMI"
+#ident "@(#)install-mysql 1.3 10/04/22 SMI"
# stop at the first error
set -o errexit
@@ -49,7 +48,7 @@
typeset MAN1DIR=${PREFIX}/man/man1
typeset MAN8DIR=${PREFIX}/man/man8
typeset DOCDIR="${CWD}/${MYSQLDIR}/Docs"
-typeset MANIFESTDIR="${ROOT}/var/svc/manifest/application/database"
+typeset MANIFESTDIR="${ROOT}/lib/svc/manifest/application/database"
typeset METHODDIR="${ROOT}/lib/svc/method"
typeset MANSCRIPT=sunman-stability
--- a/usr/src/cmd/net-snmp/install-snmp Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/net-snmp/install-snmp Thu May 20 09:24:15 2010 -0700
@@ -20,10 +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-snmp 1.3 09/09/23 SMI"
+#ident "@(#)install-snmp 1.4 10/04/22 SMI"
set -o errexit
@@ -86,8 +85,8 @@
# 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}/var/svc/manifest/application/management/net-snmp.xml 444
-_install N seaport.xml ${IROOT}/var/svc/manifest/application/management/seaport.xml 444
+_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/nmap/METADATA Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/METADATA Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
NAME: Nmap
-VERSION: 4.75
+VERSION: 5.21
DESCRIPTION: Nmap Network Scanning
LICENSE: GPLv2
PACKAGE: SUNWnmap
PROJECT_URL: http://insecure.org/
-SOURCE_DOWNLOAD: http://nmap.org/dist/nmap-4.75.tar.gz
+SOURCE_DOWNLOAD: http://nmap.org/dist/nmap-5.21.tar.gz
SUPPORT: C
BUGTRAQ: solaris/network/nmap
OSR: 5863
--- a/usr/src/cmd/nmap/Makefile.sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Makefile.sfw Thu May 20 09:24:15 2010 -0700
@@ -19,12 +19,12 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.10 10/03/14 SMI"
+#ident "@(#)Makefile.sfw 1.11 10/04/26 SMI"
-VER=nmap-4.75
+RELNUM=$(COMPONENT_VERSION:sh)
+VER=nmap-$(RELNUM)
ARCHIVE=$(VER).tar.gz
include ../Makefile.cmd
@@ -32,11 +32,11 @@
PREFIX = $(ROOT)/usr
DESTDIR = $(SRC)/cmd/nmap/proto
INSTALL = /usr/bin/ginstall -c
-OPENSSL_ROOT = /usr/sfw
-LDFLAGS_32 = -L$(ROOT)/usr/lib -L/usr/sfw/lib -R/usr/sfw/lib
+OPENSSL_ROOT = /usr
+LDFLAGS_32 = -L$(ROOT)/usr/lib
LD_OPTIONS = -lsocket -lresolv -lnsl -lgen -lc -lm -z ignore
-PYTHON = $(PYTHON24)
-PYTHONPATH = /usr/lib/python2.4/vendor-packages:/usr/lib/python2.4/site-packages
+PYTHON = $(PYTHON26)
+PYTHONPATH = /usr/lib/python2.6/vendor-packages:/usr/lib/python2.6/site-packages
PKG_CONFIG_PATH_32 = $(PREFIX)/lib/pkgconfig:/usr/lib/pkgconfig
CFLAGS = -m32 -fPIC -O2
CCFLAGS = -m32 -fPIC -O2
@@ -54,7 +54,9 @@
--with-openssl=$(OPENSSL_ROOT) \
--with-libpcap=$(PREFIX) \
--with-libpcre=$(PREFIX) \
- --with-liblua=included
+ --with-liblua=included \
+ --with-ncat \
+ --with-ndiff
all: $(VER)/config.status
(cd $(VER); env - \
@@ -93,7 +95,7 @@
MAKE=$(GMAKE) \
DESTDIR=$(DESTDIR) \
$(GMAKE) "DESTDIR=$(DESTDIR)" "INSTALL=$(INSTALL)" install )
- env PYTHON=$(PYTHON) INSTDIR=$(DESTDIR) $(SH) ./install-nmap
+ env PYTHON=$(PYTHON) INSTDIR=$(DESTDIR) VERS=$(VER) $(SHELL) ./install-nmap
$(VER)/config.status: $(VER)/configure
(cd $(VER); env - \
@@ -116,16 +118,19 @@
$(VER)/configure: $(ARCHIVE)
gzip -dc $(ARCHIVE) | tar xopf -
( cd $(VER) ; \
- gpatch -p1 <../Solaris/diffs/configure.0.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.1.diff ; \
- gpatch -p1 <../Solaris/diffs/configure.3.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.4.diff ; \
- gpatch -p1 <../Solaris/diffs/configure.5.diff ; \
- gpatch -p1 <../Solaris/diffs/configure.6.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.7.diff ; \
- gpatch -p1 <../Solaris/diffs/tcpip.cc.8.diff ; \
- gpatch -p1 <../Solaris/diffs/intf.c.9.diff ; \
- gpatch -p1 <../Solaris/diffs/setup.py.11.diff ; \
+ gpatch -p0 <../Solaris/diffs/configure.0.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.1.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.2.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.3.diff ; \
+ gpatch -p0 <../Solaris/diffs/configure.3.diff ; \
+ gpatch -p0 <../Solaris/diffs/configure.4.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.4.diff ; \
+ gpatch -p0 <../Solaris/diffs/configure.5.diff ; \
+ gpatch -p0 <../Solaris/diffs/configure.6.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.7.diff ; \
+ gpatch -p0 <../Solaris/diffs/tcpip.cc.8.diff ; \
+ gpatch -p0 <../Solaris/diffs/intf.c.9.diff ; \
+ gpatch -p0 <../Solaris/diffs/setup.py.11.diff ; \
find . -type f -name "configure" -exec chmod 0755 {} \; -print ; \
find . -type f -name "configure" -exec touch -acm {} \; -print ; \
find . -type f -name "setup.py" -exec chmod 0755 {} \; -print ; \
--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.4.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/Makefile.4.diff Thu May 20 09:24:15 2010 -0700
@@ -1,6 +1,13 @@
---- nmap-4.75.orig/liblua/Makefile 2008-05-30 21:43:43.000000000 -0400
-+++ nmap-4.75/liblua/Makefile 2008-09-08 12:36:51.436289000 -0400
-@@ -7,12 +7,10 @@
+--- liblua/Makefile 2008-05-30 18:43:43.000000000 -0700
++++ liblua/Makefile 2010-02-23 10:35:45.182118996 -0800
+@@ -2,17 +2,17 @@
+ # see ../INSTALL for installation instructions
+ # see ../Makefile and luaconf.h for further customization
+
++SHELL = /bin/bash
++
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+
# Your platform. See PLATS for possible values.
PLAT= none
@@ -14,7 +21,7 @@
MYCFLAGS=
MYLDFLAGS=
-@@ -52,16 +50,16 @@
+@@ -52,16 +52,16 @@
$(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A)
@@ -30,7 +37,7 @@
depend:
- @$(CC) $(CFLAGS) -MM l*.c print.c
-+ @$(CC) $(CPPFLAGS) $(CFLAGS) -xM1 l*.c print.c
++ @$(CC) $(CPPFLAGS) $(CFLAGS) -MM l*.c print.c
echo:
@echo "PLAT = $(PLAT)"
--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.1.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.1.diff Thu May 20 09:24:15 2010 -0700
@@ -1,6 +1,6 @@
---- nmap-4.75.orig/nbase/Makefile.in 2008-04-28 14:10:11.000000000 -0400
-+++ nmap-4.75/nbase/Makefile.in 2008-09-08 13:45:01.606723000 -0400
-@@ -6,18 +6,20 @@
+--- nbase/Makefile.in 2009-03-25 05:49:32.000000000 -0700
++++ nbase/Makefile.in 2010-02-23 10:25:33.136566614 -0800
+@@ -6,7 +6,7 @@
srcdir = @srcdir@
CC = @CC@
@@ -9,6 +9,8 @@
RANLIB = @RANLIB@
CCOPT =
DEFS = @DEFS@
+@@ -14,12 +14,14 @@
+ DEFS += -D_FORTIFY_SOURCE=2
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
+CXXFLAGS = @CXXFLAGS@
@@ -18,11 +20,11 @@
SHTOOL = ./shtool
INSTALL = $(SHTOOL) install
MAKEDEPEND = @MAKEDEPEND@
-+AR = /usr/ccs/bin/ar cq
++AR = /usr/ccs/bin/ar cq
TARGET = libnbase.a
-@@ -28,7 +30,7 @@
+@@ -30,7 +32,7 @@
$(TARGET): $(DEPS) $(OBJS)
rm -f $@
@@ -31,19 +33,15 @@
$(RANLIB) $@
clean:
-@@ -50,11 +52,12 @@
+@@ -51,8 +53,10 @@
+ config.status: configure
./config.status --recheck
++.c.o:
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
.cc.o:
- $(CC) -c $(CFLAGS) $*.cc
--
--# DO NOT DELETE -- Needed by makedepend
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -c $< -o $@
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< o $@
-+c.o:
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ # DO NOT DELETE -- Needed by makedepend
-+# DO NOT DELETE -- Needed by makedepend
-
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.2.diff Thu May 20 09:24:15 2010 -0700
@@ -0,0 +1,23 @@
+--- nsock/src/Makefile.in 2009-08-07 10:53:50.000000000 -0700
++++ nsock/src/Makefile.in 2010-02-23 11:27:25.487769258 -0800
+@@ -43,11 +43,11 @@
+ $(AR) cr $@ $(OBJS)
+ $(RANLIB) $@
+
+-$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
++$(NBASEDIR)/libnbase.a:
+ cd $(NBASEDIR) && $(MAKE)
+
+ clean:
+- rm -f $(OBJS) $(TARGET) makefile.dep
++ rm -f $(OBJS) $(TARGET)
+
+ distclean: clean
+ rm -f Makefile config.log config.status nsock_config.h
+@@ -75,6 +75,3 @@
+ config.status: configure
+ ./config.status --recheck
+
+-makefile.dep:
+- $(CC) -MM $(CPPFLAGS) $(SRCS) > $@
+-include makefile.dep
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.3.diff Thu May 20 09:24:15 2010 -0700
@@ -0,0 +1,24 @@
+--- ncat/Makefile.in 2010-01-11 11:41:56.000000000 -0800
++++ ncat/Makefile.in 2010-03-12 08:44:44.631386263 -0800
+@@ -120,11 +120,11 @@
+
+ .PHONY: uninstall all clean distclean
+
+-$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile
++$(NBASEDIR)/libnbase.a:
+ @echo Compiling libnbase;
+ cd $(NBASEDIR) && $(MAKE)
+
+-$(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
++$(NSOCKDIR)/libnsock.a:
+ @echo Compiling libnsock;
+ cd $(NSOCKDIR) && $(MAKE)
+
+@@ -161,6 +161,6 @@
+ .NOEXPORT:
+
+ makefile.dep:
+- $(CC) -MM $(CPPFLAGS) $(SRCS) > $@
++ $(CC) $(CPPFLAGS) $(CFLAGS) -MM $(SRCS) > $@
+ include makefile.dep
+
--- a/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.7.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/Makefile.in.7.diff Thu May 20 09:24:15 2010 -0700
@@ -1,20 +1,66 @@
---- nmap-4.75/Makefile.in 2008-09-04 22:32:06.000000000 -0700
-+++ nmap-4.75/Makefile.in 2010-03-11 12:26:44.932376010 -0800
-@@ -1,3 +1,4 @@
+--- Makefile.in 2009-12-12 12:26:15.000000000 -0800
++++ Makefile.in 2010-02-23 11:34:57.694961587 -0800
+@@ -1,7 +1,9 @@
+SHELL = /bin/bash
# Extract the version string from nmap.h.
export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
++export TOPDIR=$(shell pwd)
NMAP_NAME= Nmap
-@@ -35,7 +36,7 @@
+-NMAP_URL= http://nmap.org
++NMAP_URL= http://nmap.org/
+ NMAP_PLATFORM=@host@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -13,12 +15,12 @@
+ deskdir = $(prefix)/share/applications
+ NMAPDEVDIR=~/nmap-private-dev
+
+-export NBASEDIR=@NBASEDIR@
+-export NSOCKDIR=@NSOCKDIR@
+-export LIBLUADIR = @LIBLUADIR@
++export NBASEDIR=$(TOPDIR)/@NBASEDIR@
++export NSOCKDIR=$(TOPDIR)/@NSOCKDIR@
++export LIBLUADIR=$(TOPDIR)/@LIBLUADIR@
+ export NDIR=$(shell pwd)
+-export LIBLUA_LIBS = @LIBLUA_LIBS@
+-export NCATDIR=@NCATDIR@
++export LIBLUA_LIBS=$(TOPDIR)/@LIBLUA_LIBS@
++export NCATDIR=$(TOPDIR)/@NCATDIR@
+ CC = @CC@
+ CXX = @CXX@
+ CCOPT =
+@@ -26,9 +28,9 @@
+ STRIP = @STRIP@
+ LIBPCAPDIR = @libpcapdir@
+ LIBPCREDIR = @LIBPCREDIR@
+-export LIBDNETDIR = @LIBDNETDIR@
+-ZENMAPDIR = zenmap
+-NDIFFDIR = ndiff
++export LIBDNETDIR=$(TOPDIR)/@LIBDNETDIR@
++ZENMAPDIR=$(TOPDIR)/zenmap
++NDIFFDIR=$(TOPDIR)/ndiff
+ PYTHON = @PYTHON@
+ DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
+ # With GCC, add extra security checks to source code.
+@@ -39,13 +41,13 @@
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
# DEFS += -DMTRACE=1
- CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS)
+-CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS)
++export CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
++export CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS) $(INCLS)
CPPFLAGS = @CPPFLAGS@
-export CFLAGS = $(CXXFLAGS)
-+export CFLAGS = @CFLAGS@
# CFLAGS = $(DEFS) $(INCLS)
STATIC =
- LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
-@@ -72,7 +73,10 @@
+-LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
+-LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@
++LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) -z ignore
++LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBS@ -lsocket -lnsl -lgen
+ # LIBS = -lefence @LIBS@
+ # LIBS = -lrmalloc @LIBS@
+ INSTALL = @INSTALL@
+@@ -95,7 +97,10 @@
# %.o : %.cc -- nope this is a GNU extension
.cc.o:
@@ -24,18 +70,18 @@
+.c.o:
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- all: @LUA_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@
- $(MAKE) $(TARGET) $(BUILDZENMAP)
-@@ -80,7 +84,7 @@
+ all: @LUA_BUILD@ @PCAP_BUILD@ @PCRE_BUILD@ @DNET_BUILD@ @NBASE_BUILD@ @NSOCK_BUILD@ @NCAT_BUILD@
+ $(MAKE) $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF)
+@@ -103,7 +108,7 @@
$(TARGET): @LUA_DEPENDS@ @PCAP_DEPENDS@ @PCRE_DEPENDS@ @DNET_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(OBJS)
- echo Compiling nmap
+ @echo Compiling nmap
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
pcre_build: $(LIBPCREDIR)/Makefile
@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
-@@ -164,7 +168,9 @@
+@@ -207,7 +212,9 @@
config.cache config.log config.status
install-nmap: $(TARGET)
@@ -46,20 +92,21 @@
$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
# Use strip -x to avoid stripping dynamically loaded NSE functions. See
# http://seclists.org/nmap-dev/2007/q4/0272.html.
-@@ -198,7 +204,8 @@
+@@ -252,6 +259,8 @@
cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
install-zenmap: $(ZENMAPDIR)/setup.py
-- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
- cd $(ZENMAPDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
+ $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
- # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
-@@ -258,5 +265,5 @@
+@@ -337,7 +346,7 @@
./config.status --recheck
makefile.dep:
- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM $(CPPFLAGS) $(SRCS) | grep -v '/usr/gnu' | grep -v '/usr/include' | grep -v '/usr/sfw' | nawk 'NR>1 { if ($$0 ~ /^.*\.o:/ && line ~ /\\$$/ ) sub(/ \\$$/, "", line); print line } { line = $$0 } END { sub(/ \\$$/, "", line); print line }' > $@
include makefile.dep
+
+ # These the old names of scripts that have been renamed or deleted. Any
--- a/usr/src/cmd/nmap/Solaris/diffs/configure.0.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/configure.0.diff Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
---- nmap-4.75.orig/nbase/configure 2008-08-29 16:56:53.000000000 -0400
-+++ nmap-4.75-32/nbase/configure 2008-09-30 14:23:06.365993000 -0400
+--- nbase/configure 2009-08-13 14:54:55.000000000 -0700
++++ nbase/configure 2010-02-23 11:03:32.469676825 -0800
@@ -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.63.
#
@@ -10,6 +10,8 @@
## M4sh Initialization. ##
@@ -15,16 +15,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -39,7 +41,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
-@@ -567,7 +569,7 @@
+@@ -589,7 +591,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -33,7 +24,17 @@
# Identity of this package.
PACKAGE_NAME=
-@@ -651,7 +653,9 @@
+@@ -657,7 +659,9 @@
+ CPPFLAGS
+ LDFLAGS
+ CFLAGS
++CXXFLAGS
+ CC
++CXX
+ target_alias
+ host_alias
+ build_alias
+@@ -706,7 +710,9 @@
host_alias
target_alias
CC
@@ -41,9 +42,9 @@
CFLAGS
+CXXFLAGS
LDFLAGS
+ LIBS
CPPFLAGS
- ac_ct_CC
-@@ -718,7 +722,7 @@
+@@ -748,7 +754,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
@@ -52,7 +53,7 @@
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -3815,6 +3819,10 @@
+@@ -3916,6 +3922,10 @@
#include <stdlib.h>
@@ -63,33 +64,3 @@
static void foo(void) __attribute__ ((noreturn));
static void
-@@ -7224,7 +7232,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
-@@ -7728,9 +7736,11 @@
- host_alias!$host_alias$ac_delim
- target_alias!$target_alias$ac_delim
- CC!$CC$ac_delim
-+CXX!$CXX$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
- CPPFLAGS!$CPPFLAGS$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CC!$ac_ct_CC$ac_delim
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
-@@ -7752,7 +7762,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/usr/src/cmd/nmap/Solaris/diffs/configure.3.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/configure.3.diff Thu May 20 09:24:15 2010 -0700
@@ -1,59 +1,48 @@
---- nmap-4.75.orig/libdnet-stripped/configure 2008-03-15 03:23:08.000000000 -0700
-+++ nmap-4.75/libdnet-stripped/configure 2010-03-09 19:27:09.828800551 -0800
+--- libdnet-stripped/configure 2010-01-14 08:47:28.000000000 -0800
++++ libdnet-stripped/configure 2010-03-09 20:33:25.547953751 -0800
@@ -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.63.
#
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,8 @@
## M4sh Initialization. ##
## --------------------- ##
-+
+export LD_OPTIONS="-lsocket -lresolv -lnsl -lgen -z ignore"
+
-+
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -39,7 +43,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 +555,7 @@
+@@ -573,7 +575,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 +640,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 +682,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 +725,7 @@
+@@ -657,7 +659,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
+@@ -699,7 +701,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
+@@ -738,7 +740,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -62,17 +51,8 @@
# Identity of this package.
PACKAGE_NAME=
-@@ -934,7 +938,7 @@
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -2200,7 +2204,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2318,7 +2320,7 @@
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
@@ -80,7 +60,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -3168,7 +3172,7 @@
+@@ -3298,7 +3300,7 @@
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
@@ -89,7 +69,16 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3245,7 +3249,7 @@
+@@ -3337,7 +3339,7 @@
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- CFLAGS=""
++ CFLAGS="$CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3377,7 +3379,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -98,7 +87,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3301,15 +3305,15 @@
+@@ -3434,15 +3436,15 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@@ -117,8 +106,8 @@
+ CFLAGS="$CFLAGS"
fi
fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-@@ -3540,7 +3544,7 @@
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+@@ -3671,7 +3673,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
@@ -127,99 +116,67 @@
touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -5377,7 +5381,7 @@
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
-- CXXFLAGS="-g"
-+ CXXFLAGS="$CXXFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5454,7 +5458,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4576,7 +4578,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.
+@@ -12025,13 +12027,13 @@
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-- CXXFLAGS="-g"
-+ CXXFLAGS="$CXXFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5510,15 +5514,15 @@
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-+ CXXFLAGS="$CXXFLAGS"
- else
-- CXXFLAGS="-g"
-+ CXXFLAGS="$CXXFLAGS"
- fi
- else
- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-+ CXXFLAGS="$CXXFLAGS"
- else
-- CXXFLAGS=
-+ CXXFLAGS="$CXXFLAGS"
- fi
- fi
- ac_ext=cpp
-@@ -5569,7 +5573,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
-@@ -20702,15 +20706,15 @@
+ # DLPI needs putmsg under HPUX so test for -lstr while we're at it
- fi
-
-- # DLPI needs putmsg under HPUX so test for -lstr while we're at it
-+ # DLPI needs putmsg under HPUX so test for -lc while we're at it
-
--{ echo "$as_me:$LINENO: checking for putmsg in -lstr" >&5
--echo $ECHO_N "checking for putmsg in -lstr... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for putmsg in -lc" >&5
-+echo $ECHO_N "checking for putmsg in -lc... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for putmsg in -lstr" >&5
+-$as_echo_n "checking for putmsg in -lstr... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking for putmsg in -lc" >&5
++$as_echo_n "checking for putmsg in -lc... " >&6; }
if test "${ac_cv_lib_str_putmsg+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lstr $LIBS"
-+LIBS="-lsocket -lresolv -lnsl -lgen $LIBS"
++LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20770,7 +20774,7 @@
+@@ -12039,13 +12041,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char putmsg ();
++#include <stropts.h>
++#include <sys/types.h>
++#include <net/if.h>
++#include <sys/socket.h>
++#include <sys/filio.h>
++
+ int
+ main ()
+ {
+@@ -12095,7 +12096,7 @@
#define HAVE_LIBSTR 1
_ACEOF
- LIBS="-lstr $LIBS"
-+ LIBS="-lc -lsocket -lnsl -lgen $LIBS"
++ LIBS=" -lc -lsocket -lresolv -lnsl -lgen $LIBS"
fi
-@@ -21558,6 +21562,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <sys/types.h>
-+#include <net/if.h>
-+#include <sys/socket.h>
-+#include <sys/filio.h>
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -22808,15 +22816,8 @@
+@@ -14380,15 +14381,8 @@
fi
- { echo "$as_me:$LINENO: checking for Linux PF_PACKET sockets" >&5
- echo $ECHO_N "checking for Linux PF_PACKET sockets... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Linux PF_PACKET sockets" >&5
+ $as_echo_n "checking for Linux PF_PACKET sockets... " >&6; }
- if test "${ac_cv_dnet_linux_pf_packet+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+- $as_echo_n "(cached) " >&6
-else
- if test -f /usr/include/netpacket/packet.h ; then
- ac_cv_dnet_linux_pf_packet=yes
@@ -229,14 +186,5 @@
- fi
-fi
- { echo "$as_me:$LINENO: result: $ac_cv_dnet_linux_pf_packet" >&5
- echo "${ECHO_T}$ac_cv_dnet_linux_pf_packet" >&6; }
-@@ -23389,7 +23390,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
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_dnet_linux_pf_packet" >&5
+ $as_echo "$ac_cv_dnet_linux_pf_packet" >&6; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/nmap/Solaris/diffs/configure.4.diff Thu May 20 09:24:15 2010 -0700
@@ -0,0 +1,17 @@
+--- ncat/configure 2010-01-11 11:41:56.000000000 -0800
++++ ncat/configure 2010-02-24 08:57:30.573120275 -0800
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.63.
+ #
+@@ -589,7 +589,7 @@
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+
+ # Identity of this package.
+ PACKAGE_NAME=
--- a/usr/src/cmd/nmap/Solaris/diffs/configure.5.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/configure.5.diff Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
---- nmap-4.75.orig/nsock/src/configure 2008-05-22 14:14:15.000000000 -0400
-+++ nmap-4.75/nsock/src/configure 2008-09-08 14:47:24.614786000 -0400
+--- nsock/src/configure 2009-08-07 11:18:16.000000000 -0700
++++ nsock/src/configure 2010-02-23 10:21:43.319013652 -0800
@@ -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.63.
#
@@ -10,6 +10,8 @@
## M4sh Initialization. ##
@@ -15,16 +15,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -39,7 +41,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
-@@ -567,7 +569,7 @@
+@@ -589,7 +591,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -33,7 +24,7 @@
# Identity of this package.
PACKAGE_NAME=
-@@ -684,7 +686,7 @@
+@@ -751,7 +753,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
@@ -42,12 +33,3 @@
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -4619,7 +4621,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
--- a/usr/src/cmd/nmap/Solaris/diffs/configure.6.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/configure.6.diff Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
---- nmap-4.75.orig/configure 2008-09-05 01:32:06.000000000 -0400
-+++ nmap-4.75/configure 2008-09-30 14:56:14.539244000 -0400
+--- configure 2009-11-05 11:50:33.000000000 -0800
++++ configure 2010-02-23 11:01:24.667473081 -0800
@@ -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.63.
#
@@ -10,6 +10,8 @@
## M4sh Initialization. ##
@@ -15,16 +15,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -39,7 +41,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
-@@ -567,7 +569,7 @@
+@@ -589,7 +591,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -33,7 +24,7 @@
# Identity of this package.
PACKAGE_NAME=
-@@ -780,7 +782,7 @@
+@@ -832,7 +834,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
@@ -42,7 +33,7 @@
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
-@@ -1796,7 +1798,7 @@
+@@ -1939,7 +1941,7 @@
fi
if test -d /usr/local/include; then
CFLAGS="$CFLAGS -I/usr/local/include"
@@ -51,34 +42,83 @@
fi
fi
-@@ -4061,7 +4063,7 @@
- if test 4 -ge $nmap_gcc_major_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-- CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+@@ -3973,7 +3975,7 @@
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+- CXXFLAGS="-g"
++ CXXFLAGS="$CXXFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4012,7 +4014,7 @@
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- CXXFLAGS=""
++ CXXFLAGS="$CXXFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4052,7 +4054,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+- CXXFLAGS="-g"
++ CXXFLAGS="$CXXFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4109,15 +4111,15 @@
+ CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+ CXXFLAGS="$CXXFLAGS"
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -5845,7 +5847,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+- CXXFLAGS="-g"
++ CXXFLAGS="$CXXFLAGS"
+ fi
else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/vendor-packages"`
+ if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
++ CXXFLAGS="$CXXFLAGS"
+ else
+- CXXFLAGS=
++ CXXFLAGS="$CXXFLAGS"
+ fi
+ fi
+ ac_ext=c
+@@ -4223,7 +4225,7 @@
+ if test -n "$GXX"; then
+ # -fno-strict-aliasing disables strict-aliasing optimizations that assume
+ # that pointers of different types never point to the same object.
+- CXXFLAGS="$CXXFLAGS -Wall -fno-strict-aliasing"
++ CXXFLAGS="$CXXFLAGS"
fi
- { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
- echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
-@@ -5862,7 +5864,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-+ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages"`
- fi
- { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
- echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
-@@ -6242,7 +6244,7 @@
+
+ # Remember that all following tests will run with this CXXFLAGS by default
+@@ -6024,8 +6026,7 @@
+ else
+ am_py_prefix=$prefix
+ fi
+- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pythondir="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+@@ -6054,8 +6055,7 @@
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++ am_cv_python_pyexecdir="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+@@ -6723,7 +6723,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -87,7 +127,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -6282,7 +6284,7 @@
+@@ -6764,7 +6764,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -96,12 +136,3 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -8811,7 +8813,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
--- a/usr/src/cmd/nmap/Solaris/diffs/intf.c.9.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/intf.c.9.diff Thu May 20 09:24:15 2010 -0700
@@ -1,11 +1,11 @@
---- nmap-4.75.orig/libdnet-stripped/src/intf.c 2006-06-10 14:23:27.000000000 -0700
-+++ nmap-4.75/libdnet-stripped/src/intf.c 2010-03-09 19:35:31.034800463 -0800
-@@ -422,7 +422,7 @@
- return (-1);
- }
- } else if (entry->intf_type == INTF_TYPE_ETH) {
--#if defined(SIOCGIFHWADDR)
-+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
- if (ioctl(intf->fd, SIOCGIFHWADDR, &ifr) < 0)
+--- libdnet-stripped/src/intf.c 2009-08-06 17:11:57.000000000 -0700
++++ libdnet-stripped/src/intf.c 2010-03-09 20:32:28.207885025 -0800
+@@ -323,7 +323,7 @@
+ /* Set link-level address. */
+ if (entry->intf_link_addr.addr_type == ADDR_TYPE_ETH &&
+ addr_cmp(&entry->intf_link_addr, &orig->intf_link_addr) != 0) {
+-#if defined(SIOCSIFHWADDR)
++#if defined(SIOCSIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun))
+ if (addr_ntos(&entry->intf_link_addr, &ifr.ifr_hwaddr) < 0)
return (-1);
- if (addr_ston(&ifr.ifr_addr, &entry->intf_link_addr) < 0)
+ if (ioctl(intf->fd, SIOCSIFHWADDR, &ifr) < 0)
--- a/usr/src/cmd/nmap/Solaris/diffs/setup.py.11.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/setup.py.11.diff Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
---- nmap-4.75.orig/zenmap/setup.py 2008-09-06 08:29:33.000000000 -0700
-+++ nmap-4.75/zenmap/setup.py 2008-11-19 13:07:11.744133543 -0800
-@@ -252,6 +252,7 @@
- uline = line + 1
+--- zenmap/setup.py 2010-01-26 16:57:31.000000000 -0800
++++ zenmap/setup.py 2010-02-24 10:12:10.652841785 -0800
+@@ -324,7 +324,6 @@
+ if not re_sys.match(line):
break
-
-+ ucontent.insert(uline, "sys.path.append('/usr/lib/python2.4/vendor-packages')\n")
- ucontent.insert(uline, "sys.path.append(%s)\n" % repr(modules))
+ uline += 1
+- ucontent.insert(uline, "\nimport sys\nsys.path.append(%s)\n" % repr(modules))
ufile = open(app_file_name, "w")
+ ufile.writelines(ucontent)
--- a/usr/src/cmd/nmap/Solaris/diffs/tcpip.cc.8.diff Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/Solaris/diffs/tcpip.cc.8.diff Thu May 20 09:24:15 2010 -0700
@@ -1,11 +1,11 @@
---- nmap-4.75.orig/tcpip.cc 2008-09-04 07:41:59.000000000 -0700
-+++ nmap-4.75/tcpip.cc 2010-03-09 19:08:27.633513449 -0800
-@@ -2963,7 +2963,7 @@
- else if (ifflags & IFF_BROADCAST) {
- mydevs[numifaces].device_type = devt_ethernet;
- /* Get the MAC Address ... */
+--- tcpip.cc 2010-01-14 19:55:23.000000000 -0800
++++ tcpip.cc 2010-03-09 20:30:38.315876272 -0800
+@@ -3124,7 +3124,7 @@
+ devs[count].device_type = devt_ethernet;
+
+ /* If the device type is ethernet, get the MAC address. */
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
- Strncpy(tmpifr.ifr_name, mydevs[numifaces].devname, sizeof(tmpifr.ifr_name));
- memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))));
- rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
+ memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin)));
+ rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
+ if (rc < 0 && errno != EADDRNOTAVAIL)
--- a/usr/src/cmd/nmap/install-nmap Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/nmap/install-nmap Thu May 20 09:24:15 2010 -0700
@@ -20,17 +20,16 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-nmap 1.4 10/01/08 SMI"
+# ident "@(#)install-nmap 1.5 10/04/26 SMI"
#
-VERS=nmap-4.75
PREFIX=${ROOT}/usr
BINDIR=${PREFIX}/bin
-PYTHONLIBDIR=${PREFIX}/lib/python2.4/vendor-packages
+PYTHONLIBDIR=${PREFIX}/lib/python2.6/vendor-packages
SHAREDIR=${PREFIX}/share
+LOCALEDIR=${SHAREDIR}/locale
MAN1DIR=${SHAREDIR}/man/man1
NMAPDIR=${SHAREDIR}/nmap
APPDIR=${SHAREDIR}/applications
@@ -59,17 +58,25 @@
done
cd ${INSTDIR}/usr/bin
-_install E nmap ${BINDIR}/nmap 0755
-_install P zenmap ${BINDIR}/zenmap 0755
+for file in \
+ ncat \
+ nmap
+do
+ /usr/ccs/bin/strip ${file}
+ /usr/ccs/bin/mcs -d ${file}
+ _install E ${file} ${BINDIR}/${file} 0755
+ /usr/bin/elfedit -e "dyn:runpath ${NEWRUNPATH}" ${BINDIR}/${file}
+ chmod 0755 ${BINDIR}/${file}
+done
-/usr/bin/elfedit -e "dyn:runpath ${NEWRUNPATH}" ${BINDIR}/nmap
-chmod 0755 ${BINDIR}/nmap
+_install P ndiff ${BINDIR}/ndiff 0755
+_install P zenmap ${BINDIR}/zenmap 0755
cd ${BINDIR}
_install L zenmap nmapfe
_install L zenmap xnmap
-cd ${INSTDIR}/usr/lib/python2.4/site-packages
+cd ${INSTDIR}/usr/lib/python2.6/site-packages
for d in `find radialnet zenmapCore zenmapGUI -type d` ; do
mkdir -p ${PYTHONLIBDIR}/${d}
done
@@ -87,14 +94,32 @@
cd ${INSTDIR}/usr/share
for d in \
+ ncat \
nmap \
zenmap
do
/usr/bin/cp -rP ${d} ${SHAREDIR}
done
+cd ${TOP}
+
+for l in \
+ fr \
+ hr \
+ pt_BR \
+ de \
+ ru
+do
+ _install N ${INSTDIR}/usr/share/zenmap/locale/${l}/LC_MESSAGES/zenmap.mo ${LOCALEDIR}/${l}/LC_MESSAGES/zenmap.mo 0644
+done
+
+rm -rf ${SHAREDIR}/zenmap/locale
+
cd ${INSTDIR}/usr/share/man/man1
_install M nmap.1 ${MAN1DIR}/nmap.1 444
+_install M ncat.1 ${MAN1DIR}/ncat.1 444
+_install M ndiff.1 ${MAN1DIR}/ndiff.1 444
+_install M zenmap.1 ${MAN1DIR}/zenmap.1 444
cd ${SHAREDIR}/nmap
find . -type f -exec chmod 0444 {} \; -print > /dev/null 2>&1
@@ -106,9 +131,6 @@
_install N ${SRC}/cmd/nmap/nmapfe.png ${PIXDIR}/nmapfe.png 0444
_install N ${SRC}/cmd/nmap/nmapfe.desktop ${APPDIR}/nmapfe.desktop 0444
-cd ${SRC}/cmd/nmap/${VERS}
-_install M docs/zenmap.1 ${MAN1DIR}/zenmap.1 0444
-
cd ${MAN1DIR}
ln -sf zenmap.1 xnmap.1
ln -sf zenmap.1 nmapfe.1
Binary file usr/src/cmd/nmap/nmap-4.75.tar.gz has changed
Binary file usr/src/cmd/nmap/nmap-5.21.tar.gz has changed
--- a/usr/src/cmd/ntpd/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/ntpd/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,13 +21,9 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# install objects in the proto area, since it would
-# really like to install locally, but that doesn't scale.
-#
-#ident "@(#)install-sfw 1.2 10/02/19 SMI"
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
set -o errexit
PKGVERS=$1
@@ -40,7 +36,7 @@
MAN1MDIR=${MANDIR}/man1m
MAN4DIR=${MANDIR}/man4
VARDIR=${ROOT}/var/ntp
-MANIFESTDIR=${ROOT}/var/svc/manifest/network
+MANIFESTDIR=${ROOT}/lib/svc/manifest/network
METHODDIR=${ROOT}/lib/svc/method
HTMLDIR=${ROOT}/usr/share/doc/ntp
AUTHHDIR=${ROOT}/usr/lib/help/auths/locale/C
--- a/usr/src/cmd/openldap/install-openldap Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/openldap/install-openldap Thu May 20 09:24:15 2010 -0700
@@ -20,12 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Install BIND's objects into the proto area ready for packaging.
-#
-# ident "@(#)install-openldap 1.4 10/02/19 SMI"
+#ident "@(#)install-openldap 1.5 10/04/22 SMI"
# VERS should be provided on command line or set in environment
if [ $# -ge 2 ]; then
@@ -164,7 +161,7 @@
## Solaris specific stuff (SMF etc)
cd ../Solaris
i=ldap-olslapd.xml
-_install N ${i} ${ROOT}/var/svc/manifest/network/ldap/${i} 444
+_install N ${i} ${ROOT}/lib/svc/manifest/network/ldap/${i} 444
i=ldap-olslapd
_install N ${i} ${ROOT}/lib/svc/method/${i} 555
cd $TOP
--- a/usr/src/cmd/openwsman/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/openwsman/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,10 +21,9 @@
#
#
-# Copyright 2010 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.2 10/02/19 SMI"
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
# Stop at first error
set -o errexit
@@ -188,7 +187,7 @@
# SMF files
_install S svc-openwsmand ${ROOT}/lib/svc/method/svc-openwsmand 555
-_install N openwsmand.xml ${ROOT}/var/svc/manifest/network/openwsmand.xml 444
+_install N openwsmand.xml ${ROOT}/lib/svc/manifest/network/openwsmand.xml 444
# install Man pages
--- a/usr/src/cmd/pen/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/pen/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -21,11 +21,9 @@
#
#
-# 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/01 SMI"
-#
+#ident "@(#)install-sfw 1.2 10/04/22 SMI"
set -o errexit
@@ -86,7 +84,7 @@
# It will add a smf service for 'pen' deamon. As pen needs a large mount of
# options, many smf style properties are proposed.
#
-MANIDIR=${ROOT}/var/svc/manifest/network/loadbalancer
+MANIDIR=${ROOT}/lib/svc/manifest/network/loadbalancer
SMF2DIR=${ROOT}/lib/svc/method
_install N Solaris/pen.xml ${MANIDIR}/pen.xml 444
--- a/usr/src/cmd/postgres/pgbouncer/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/postgres/pgbouncer/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -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 "@(#)install-sfw 1.1 08/04/28 SMI"
+#ident "@(#)install-sfw 1.2 10/04/22 SMI"
. ${SRC}/tools/install.subr
@@ -50,7 +49,7 @@
PREFIX=${ROOT}/usr/postgres/$POSTGRES_VERSION
SYSCONFDIR=${ROOT}/etc/pgbouncer
PGBDOCDIR=${PREFIX}/share/doc/pgbouncer
-MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
+MANIFESTDIR=${ROOT}/lib/svc/manifest/application/database
install_dir ${SYSCONFDIR} 755
--- a/usr/src/cmd/postgres/postgresql-8.2/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.2/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-sfw 1.9 10/02/19 SMI""
+#ident "@(#)install-sfw 1.10 10/04/22 SMI""
. ${SRC}/tools/install.subr
@@ -240,7 +239,7 @@
PGSHAREDIR=${PREFIX}/share
SYSMAN5DIR=${ROOT}/usr/share/man/man5
VARDIR=${ROOT}/var/postgres
-MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
+MANIFESTDIR=${ROOT}/lib/svc/manifest/application/database
METHODDIR=${ROOT}/lib/svc/method
ETC=${ROOT}/etc
RIGHTSDIR=${ROOT}/etc/security
--- a/usr/src/cmd/postgres/postgresql-8.3/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.3/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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 "@(#)install-sfw 1.5 10/02/19 SMI"
+#ident "@(#)install-sfw 1.6 10/04/22 SMI"
. ${SRC}/tools/install.subr
@@ -276,7 +275,7 @@
PGSHAREDIR=${PREFIX}/share
SYSMAN5DIR=${ROOT}/usr/share/man/man5
VARDIR=${ROOT}/var/postgres
-MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
+MANIFESTDIR=${ROOT}/lib/svc/manifest/application/database
METHODDIR=${ROOT}/lib/svc/method
ETC=${ROOT}/etc
RIGHTSDIR=${ETC}/security
--- a/usr/src/cmd/postgres/postgresql-8.4/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.4/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.2 10/02/19 SMI"
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
. ${SRC}/tools/install.subr
@@ -75,7 +74,7 @@
PGSHAREDIR=${PREFIX}/share
SYSMAN5DIR=${ROOT}/usr/share/man/man5
VARDIR=${ROOT}/var/postgres
-MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
+MANIFESTDIR=${ROOT}/lib/svc/manifest/application/database
METHODDIR=${ROOT}/lib/svc/method
ETC=${ROOT}/etc
RIGHTSDIR=${ETC}/security
--- a/usr/src/cmd/privoxy/install-privoxy Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/privoxy/install-privoxy Thu May 20 09:24:15 2010 -0700
@@ -19,13 +19,9 @@
# CDDL HEADER END
#
#
-# install objects in the proto area, since it would
-# really like to install locally, but that doesn't scale.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-privoxy 1.1 08/09/16 SMI"
+#ident "@(#)install-privoxy 1.2 10/04/22 SMI"
set -o errexit
@@ -38,7 +34,7 @@
function install_smf {
(cd ${TOP}/Solaris
- ins_file http-privoxy.xml ${ROOT}/var/svc/manifest/network 444
+ ins_file http-privoxy.xml ${ROOT}/lib/svc/manifest/network 444
ins_file http-privoxy ${ROOT}/lib/svc/method 555
)
}
--- a/usr/src/cmd/quagga/post-install.sh Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/quagga/post-install.sh Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)post-install.sh 1.7 09/07/14 SMI"
+# ident "@(#)post-install.sh 1.8 10/04/22 SMI"
#
# Handle various things where the files installed by Quagga's 'make install'
# differ from what we need for the SFW packages. E.g.:
@@ -99,8 +98,8 @@
_install N ../../../common/rbac/exec_attr ${ROOT}/etc/security/exec_attr 644
_install S ../Solaris/quaggaadm ${ROOT}/usr/sbin/quaggaadm 555
_install L quaggaadm ${ROOT}/usr/sbin/zebraadm
-_install N solaris/quagga.xml ${ROOT}/var/svc/manifest/network/routing/quagga.xml 444
-_install N solaris/trill.xml ${ROOT}/var/svc/manifest/network/routing/trill.xml 444
+_install N solaris/quagga.xml ${ROOT}/lib/svc/manifest/network/routing/quagga.xml 444
+_install N solaris/trill.xml ${ROOT}/lib/svc/manifest/network/routing/trill.xml 444
_install S solaris/quagga.init ${ROOT}/lib/svc/method/quagga 0555
_install N ${SRCDIR}/doc/quagga.info-1 ${ROOT}/usr/sfw/share/info/quagga.info 444
--- a/usr/src/cmd/samba/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/samba/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,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 "@(#)install-sfw 1.33 09/11/24 SMI"
+#ident "@(#)install-sfw 1.34 10/04/22 SMI"
TOP=`pwd`
PREFIX=${ROOT}/usr/sfw
@@ -274,9 +273,9 @@
_install N pam.conf-winbind ${ROOT}/etc/pam.conf-winbind 444
# install smf manifests
-_install N wins.xml ${ROOT}/var/svc/manifest/network/wins.xml 444
-_install N samba.xml ${ROOT}/var/svc/manifest/network/samba.xml 444
-_install N swat.xml ${ROOT}/var/svc/manifest/network/swat.xml 444
-_install N winbind.xml ${ROOT}/var/svc/manifest/network/winbind.xml 444
+_install N wins.xml ${ROOT}/lib/svc/manifest/network/wins.xml 444
+_install N samba.xml ${ROOT}/lib/svc/manifest/network/samba.xml 444
+_install N swat.xml ${ROOT}/lib/svc/manifest/network/swat.xml 444
+_install N winbind.xml ${ROOT}/lib/svc/manifest/network/winbind.xml 444
exit 0
--- a/usr/src/cmd/snort/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/snort/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -19,13 +19,10 @@
#
# CDDL HEADER END
#
-
#
-# Copyright 2010 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.2 10/02/19 SMI"
-#
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
# stop at first error
set -o errexit
@@ -63,7 +60,7 @@
# remove old snort manual
rm -rf ${OLDMANDIR}/snort.8
-_install N snort.xml ${ROOT}/var/svc/manifest/network/snort.xml 444
+_install N snort.xml ${ROOT}/lib/svc/manifest/network/snort.xml 444
_install N snortd ${ROOT}/lib/svc/method/snortd 555
cd ${PKGVERS}
--- a/usr/src/cmd/squid/METADATA Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/squid/METADATA Thu May 20 09:24:15 2010 -0700
@@ -1,10 +1,10 @@
NAME: squid
-VERSION: 2.7.STABLE6
+VERSION: 2.7.STABLE9
DESCRIPTION: Squid Web Proxy Cache
LICENSE: GPLv2
PACKAGE: SUNWsquidu SUNWsquidr
PROJECT_URL: http://www.squid-cache.org/
-SOURCE_DOWNLOAD: http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE6.tar.gz
+SOURCE_DOWNLOAD: http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/squid
OSR: 7240
--- a/usr/src/cmd/squid/Makefile.sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/squid/Makefile.sfw Thu May 20 09:24:15 2010 -0700
@@ -19,15 +19,54 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.8 09/10/16 SMI"
+# ident "@(#)Makefile.sfw 1.9 10/04/30 SMI"
#
-VER =$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+include ../Makefile.cmd
+
+VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+TARBALL = $(COMPONENT_ARCHIVE:sh)
+PATCHES:sh = echo Patches/*.patch
-include ../Makefile.cmd
+# Squid has own prefix
+CONFIGURE_OPTIONS = --prefix=$(CFGPREFIX)/squid
+CONFIGURE_OPTIONS += --libexecdir=$(CFGPREFIX)/squid/libexec
+CONFIGURE_OPTIONS += --localstatedir=/var/squid
+CONFIGURE_OPTIONS += --sharedstatedir=/var/squid
+CONFIGURE_OPTIONS += --sysconfdir=$(CFGETC)/squid
+CONFIGURE_OPTIONS += --enable-arp-acl
+CONFIGURE_OPTIONS += --enable-auth='basic,digest,negotiate,ntlm'
+CONFIGURE_OPTIONS += --enable-basic-auth-helpers='DB,NCSA,YP,LDAP,PAM,getpwnam,MSNT,POP3,multi-domain-NTLM,SMB,SASL'
+CONFIGURE_OPTIONS += --enable-cache-digests
+CONFIGURE_OPTIONS += --enable-carp
+CONFIGURE_OPTIONS += --enable-coss-aio-ops
+CONFIGURE_OPTIONS += --enable-delay-pools
+CONFIGURE_OPTIONS += --enable-digest-auth-helpers='ldap,password'
+CONFIGURE_OPTIONS += --enable-external-acl-helpers='ip_user,unix_group,ldap_group,wbinfo_group'
+CONFIGURE_OPTIONS += --enable-follow-x-forwarded-for
+CONFIGURE_OPTIONS += --enable-forward-log
+CONFIGURE_OPTIONS += --enable-forw-via-db
+CONFIGURE_OPTIONS += --enable-htcp
+CONFIGURE_OPTIONS += --enable-icmp
+CONFIGURE_OPTIONS += --enable-large-cache-files
+CONFIGURE_OPTIONS += --enable-multicast-miss
+CONFIGURE_OPTIONS += --enable-negotiate-auth-helpers='squid_kerb_auth'
+CONFIGURE_OPTIONS += --enable-ntlm-auth-helpers='SMB,fakeauth,no_check'
+CONFIGURE_OPTIONS += --enable-ntlm-fail-open
+CONFIGURE_OPTIONS += --enable-referer-log
+CONFIGURE_OPTIONS += --enable-removal-policies='heap,lru'
+CONFIGURE_OPTIONS += --enable-snmp
+CONFIGURE_OPTIONS += --enable-ssl
+CONFIGURE_OPTIONS += --enable-storeio='aufs,coss,diskd,ufs,null'
+CONFIGURE_OPTIONS += --enable-useragent-log
+CONFIGURE_OPTIONS += --enable-x-accelerator-vary
+CONFIGURE_OPTIONS += --with-aio
+CONFIGURE_OPTIONS += --with-aufs-threads=8
+CONFIGURE_OPTIONS += --with-large-files
+CONFIGURE_OPTIONS += --with-build-environment=POSIX_V6_ILP32_OFFBIG
+CONFIGURE_OPTIONS += --with-pthreads
SFW_PATH="/usr/perl5/bin:/usr/sfw/bin:$(PATH)"
@@ -56,50 +95,12 @@
"CFLAGS= $(CFLAGS) -D__BIG_ENDIAN__ -DSOLARIS_11 -I /usr/include/kerberosv5 " \
"LDFLAGS=-R/usr/sfw/lib -L/usr/sfw/lib " \
MAKE=$(CCSMAKE) \
- $(SHELL) ./configure \
- --enable-arp-acl \
- --enable-auth='basic,digest,negotiate,ntlm' \
- --enable-basic-auth-helpers='DB,NCSA,YP,LDAP,PAM,getpwnam,MSNT,POP3,multi-domain-NTLM,SMB,SASL' \
- --enable-cache-digests \
- --enable-carp \
- --enable-coss-aio-ops \
- --enable-delay-pools \
- --enable-digest-auth-helpers='ldap,password' \
- --enable-external-acl-helpers='ip_user,unix_group,ldap_group,wbinfo_group' \
- --enable-follow-x-forwarded-for \
- --enable-forward-log \
- --enable-forw-via-db \
- --enable-htcp \
- --enable-icmp \
- --enable-large-cache-files \
- --enable-multicast-miss \
- --enable-negotiate-auth-helpers='squid_kerb_auth' \
- --enable-ntlm-auth-helpers='SMB,fakeauth,no_check' \
- --enable-ntlm-fail-open \
- --enable-referer-log \
- --enable-removal-policies='heap,lru' \
- --enable-snmp \
- --enable-ssl \
- --enable-storeio='aufs,coss,diskd,ufs,null' \
- --enable-useragent-log \
- --enable-x-accelerator-vary \
- --libexecdir=/usr/squid/libexec \
- --localstatedir=/var/squid \
- --prefix=/usr/squid \
- --sharedstatedir=/var/squid \
- --sysconfdir=/etc/squid \
- --with-aio \
- --with-aufs-threads=8 \
- --with-large-files \
- --with-build-environment=POSIX_V6_ILP32_OFFBIG \
- --with-pthreads; \
+ $(SHELL) ./configure $(CONFIGURE_OPTIONS); \
/usr/perl5/bin/perl -pi -e 's/-lsasl2/-lsasl/g' \
helpers/basic_auth/SASL/Makefile )
-$(VER)/configure: $(VER).tar.gz
- /usr/bin/gzip -dc $(VER).tar.gz | \
- $(GTAR) xpf - --no-same-owner
- touch $(VER)/configure
+$(VER)/configure: $(VER)/$(SFW_STAMP_PATCHED)
+ $(TOUCH) $@
clean:
-rm -rf $(VER)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/squid/Patches/bug2902.patch Thu May 20 09:24:15 2010 -0700
@@ -0,0 +1,118 @@
+Index: src/auth/digest/auth_digest.c
+===================================================================
+RCS file: /cvsroot/squid/squid/src/auth/digest/auth_digest.c,v
+retrieving revision 1.23.2.3
+diff -u -p -r1.23.2.3 auth_digest.c
+--- src/auth/digest/auth_digest.c 7 Mar 2010 16:00:07 -0000 1.23.2.3
++++ src/auth/digest/auth_digest.c 22 Apr 2010 20:25:39 -0000
+@@ -1315,7 +1315,8 @@ authenticateDigestDecodeAuth(auth_user_r
+ /* do we have a username ? */
+ if (!username || username[0] == '\0') {
+ debug(29, 4) ("authenticateDigestDecode: Empty or not present username\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* Sanity check of the username.
+ * " can not be allowed in usernames until * the digest helper protocol
+@@ -1323,28 +1324,33 @@ authenticateDigestDecodeAuth(auth_user_r
+ */
+ if (strchr(username, '"')) {
+ debug(29, 2) ("authenticateDigestDecode: Unacceptable username '%s'\n", username);
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* do we have a realm ? */
+ if (!digest_request->realm || digest_request->realm[0] == '\0') {
+ debug(29, 2) ("authenticateDigestDecode: Empty or not present realm");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* and a nonce? */
+ if (!digest_request->nonceb64 || digest_request->nonceb64[0] == '\0') {
+ debug(29, 2) ("authenticateDigestDecode: Empty or not present nonce");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* we can't check the URI just yet. We'll check it in the
+ * authenticate phase, but needs to be given */
+ if (!digest_request->uri || digest_request->uri[0] == '\0') {
+ debug(29, 2) ("authenticateDigestDecode: Missing URI field");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* is the response the correct length? */
+ if (!digest_request->response || strlen(digest_request->response) != 32) {
+ debug(29, 2) ("authenticateDigestDecode: Response length invalid\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* check the algorithm is present and supported */
+ if (!digest_request->algorithm)
+@@ -1352,7 +1358,8 @@ authenticateDigestDecodeAuth(auth_user_r
+ else if (strcmp(digest_request->algorithm, "MD5")
+ && strcmp(digest_request->algorithm, "MD5-sess")) {
+ debug(29, 2) ("authenticateDigestDecode: invalid algorithm specified!\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* 2617 requirements, indicated by qop */
+ if (digest_request->qop) {
+@@ -1361,23 +1368,27 @@ authenticateDigestDecodeAuth(auth_user_r
+ if (strcmp(digest_request->qop, QOP_AUTH) != 0) {
+ /* we received a qop option we didn't send */
+ debug(29, 2) ("authenticateDigestDecode: Invalid qop option received\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* check cnonce */
+ if (!digest_request->cnonce || digest_request->cnonce[0] == '\0') {
+ debug(29, 2) ("authenticateDigestDecode: Missing cnonce field\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* check nc */
+ if (strlen(digest_request->nc) != 8 || strspn(digest_request->nc, "0123456789abcdefABCDEF") != 8) {
+ debug(29, 2) ("authenticateDigestDecode: invalid nonce count\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ } else {
+ /* cnonce and nc both require qop */
+ if (digest_request->cnonce || digest_request->nc) {
+ debug(29, 2) ("authenticateDigestDecode: missing qop!\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ }
+
+@@ -1389,7 +1400,8 @@ authenticateDigestDecodeAuth(auth_user_r
+ /* we couldn't find a matching nonce! */
+ debug(29, 2) ("authenticateDigestDecode: Unexpected or invalid nonce received\n");
+ digest_request->flags.credentials_ok = 3;
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ digest_request->nonce = nonce;
+ authDigestNonceLink(nonce);
+@@ -1397,7 +1409,8 @@ authenticateDigestDecodeAuth(auth_user_r
+ /* check that we're not being hacked / the username hasn't changed */
+ if (nonce->auth_user && strcmp(username, authenticateUserUsername(nonce->auth_user))) {
+ debug(29, 2) ("authenticateDigestDecode: Username for the nonce does not equal the username for the request\n");
+- return authDigestLogUsername(auth_user_request, username);
++ authDigestLogUsername(auth_user_request, username);
++ return;
+ }
+ /* the method we'll check at the authenticate step as well */
+
--- a/usr/src/cmd/squid/install-squid Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/squid/install-squid Thu May 20 09:24:15 2010 -0700
@@ -19,13 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# install objects in the proto area, since it would
-# really like to install locally, but that doesn't scale.
-#
-# ident "@(#)install-squid 1.4 09/09/16 SMI"
+#ident "@(#)install-squid 1.5 10/04/22 SMI"
# functions - search for "START HERE" to find start of control flow
set -o errexit
@@ -67,7 +63,7 @@
install_smf() {
(cd ${TOP}/Solaris
- ins_file http-squid.xml ${ROOT}/var/svc/manifest/network 444
+ ins_file http-squid.xml ${ROOT}/lib/svc/manifest/network 444
ins_file http-squid ${ROOT}/lib/svc/method 555
)
}
Binary file usr/src/cmd/squid/squid-2.7.STABLE6.tar.gz has changed
Binary file usr/src/cmd/squid/squid-2.7.STABLE9.tar.gz has changed
--- a/usr/src/cmd/stunnel/Makefile.sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/stunnel/Makefile.sfw Thu May 20 09:24:15 2010 -0700
@@ -19,11 +19,9 @@
#
# 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.3 09/05/07 SMI"
-#
+#ident "@(#)Makefile.sfw 1.4 10/04/22 SMI"
# Change this ip updating the package version.
PKGNAME=stunnel
@@ -31,7 +29,7 @@
PROG=$(PKGNAME)-$(VER)
CLOBBERFILES=stunnel.pod test_stun stunnel.man
PREFIX=${ROOT}/usr
-XMLDIR=${ROOT}/var/svc/manifest/network/ssl
+XMLDIR=${ROOT}/lib/svc/manifest/network/ssl
LIBDIR=${ROOT}/usr/lib
XMLFILE=stunnel.xml
BINDIR=${PREFIX}/bin
--- a/usr/src/cmd/stunnel/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/stunnel/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,20 +20,17 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# install objects in the proto area, since it would
-# really like to install locally, but that doesn't scale.
-#
-#ident "@(#)install-sfw 1.2 10/02/19 SMI"
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
+
set -e
PKGNAME=${1}
VERS=${2}
PKGVERS=${PKGNAME}-${VERS}
PREFIX=${ROOT}/usr
-XMLDIR=${ROOT}/var/svc/manifest/network/ssl
+XMLDIR=${ROOT}/lib/svc/manifest/network/ssl
LIBDIR=${ROOT}/usr/lib
XMLFILE=stunnel.xml
BINDIR=${PREFIX}/bin
--- a/usr/src/cmd/tomcat/install-tomcat Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/tomcat/install-tomcat Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-tomcat 1.21 09/12/16 SMI"
+#ident "@(#)install-tomcat 1.22 10/04/22 SMI"
# functions - search for "START HERE" to find start of control flow
@@ -79,7 +78,7 @@
install_smf_hook() {
cd ${TOP}/Solaris
- _install N http-tomcat${VERSION}.xml ${ROOT}/var/svc/manifest/network/http-tomcat${VERSION}.xml 444
+ _install N http-tomcat${VERSION}.xml ${ROOT}/lib/svc/manifest/network/http-tomcat${VERSION}.xml 444
_install N http-tomcat${VERSION} ${ROOT}/lib/svc/method/http-tomcat${VERSION} 555
}
--- a/usr/src/cmd/tor/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/tor/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -19,11 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.2 10/02/19 SMI"
-#
+#ident "@(#)install-sfw 1.3 10/04/22 SMI"
set -o errexit
source ${SRC}/tools/install.subr
@@ -36,7 +34,7 @@
LOGDIR=${ROOT}/var/log/tor
MANSCRIPT=${TOP}/sunman-stability
METHODDIR=${ROOT}/lib/svc/method
-MANIFESTDIR=${ROOT}/var/svc/manifest/network
+MANIFESTDIR=${ROOT}/lib/svc/manifest/network
MKDIR=/usr/bin/mkdir
CHMOD=/usr/bin/chmod
--- a/usr/src/cmd/vim/runtime.patch Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch Thu May 20 09:24:15 2010 -0700
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/04/27*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/05/11*\\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/cmd/webmin/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/cmd/webmin/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,13 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# install objects in the proto area, since it would
-# really like to install locally, but that doesn't scale.
-#
-#pragma ident "@(#)install-sfw 1.10 10/03/14 SMI"
+#ident "@(#)install-sfw 1.11 10/04/22 SMI"
TOP=`pwd`
BINDIR=${ROOT}/usr/sfw/bin
@@ -47,7 +43,7 @@
PERL_MODS="${SSLEAYPKGVERS} ${AUTHENPKGVERS} ${RBACPKGVERS} ${IOTTYPKGVERS}"
WEBMINCONFDIR=${TOP}/etc
PREFIX=${ROOT}/usr/sfw/lib/webmin
-SMFPREFIX=${ROOT}/var/svc/manifest/application/management
+SMFPREFIX=${ROOT}/lib/svc/manifest/application/management
. ${SRC}/tools/install.subr
--- a/usr/src/lib/gd2/Makefile.sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/lib/gd2/Makefile.sfw Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.7 10/02/19 SMI"
+# ident "@(#)Makefile.sfw 1.8 10/04/15 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
@@ -143,6 +142,7 @@
( cd $(VER) ; \
gpatch -p0 <../Solaris/Makefile.in.0.diff ; \
gpatch -p0 <../Solaris/Makefile.in.1.diff ; \
+ gpatch -p0 <../Solaris/default_fontpath.diff ; \
touch -acm configure ; \
chmod 0755 configure ; \
cd - )
@@ -153,6 +153,7 @@
( cd $(VER64) ; \
gpatch -p0 <../Solaris/Makefile.in.0.diff ; \
gpatch -p0 <../Solaris/Makefile.in.1.diff ; \
+ gpatch -p0 <../Solaris/default_fontpath.diff ; \
touch -acm configure ; \
chmod 0755 configure ; \
cd - )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/gd2/Solaris/default_fontpath.diff Thu May 20 09:24:15 2010 -0700
@@ -0,0 +1,32 @@
+--- gd.h 2007-05-06 13:38:20.000000000 -0800
++++ gd.h 2010-04-15 12:13:00.000000000 -0800
+@@ -71,7 +71,28 @@
+ /* 2.0.23: more Type 1 fonts */
+ #ifndef DEFAULT_FONTPATH
+ /* default fontpath for unix systems - whatever happened to standards ! */
+-#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
++#define DEFAULT_FONTPATH \
++"/usr/share/fonts/TrueType/arphic:" \
++"/usr/share/fonts/TrueType/baekmuk:" \
++"/usr/share/fonts/TrueType/bh-luxi:" \
++"/usr/share/fonts/TrueType/bitstream-vera:" \
++"/usr/share/fonts/TrueType/bpg-georgian:" \
++"/usr/share/fonts/TrueType/core:" \
++"/usr/share/fonts/TrueType/dejavu:" \
++"/usr/share/fonts/TrueType/freefont:" \
++"/usr/share/fonts/TrueType/gentium:" \
++"/usr/share/fonts/TrueType/google-droid:" \
++"/usr/share/fonts/TrueType/hanyang:" \
++"/usr/share/fonts/TrueType/indic-fonts-core:" \
++"/usr/share/fonts/TrueType/ipafont:" \
++"/usr/share/fonts/TrueType/kacst:" \
++"/usr/share/fonts/TrueType/liberation:" \
++"/usr/share/fonts/TrueType/mgopen:" \
++"/usr/share/fonts/TrueType/sil:" \
++"/usr/share/fonts/TrueType/unifont:" \
++"/usr/share/fonts/X11/Type1:" \
++"/usr/share/fonts/sun/TrueType:" \
++"/usr/share/fonts/sun/Type1"
+ #endif
+ #ifndef PATHSEPARATOR
+ #define PATHSEPARATOR ":"
--- a/usr/src/lib/memcached/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/lib/memcached/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw 1.4 10/02/19 SMI"
-#
+#ident "@(#)install-sfw 1.5 10/04/22 SMI"
# Memcached 1.4.1 is dependent on libevent
@@ -34,7 +32,7 @@
LIBDIR32="${PREFIX}/lib/${MACH32}"
SHAREDIR="${PREFIX}/share"
MAN1MDIR="${SHAREDIR}/man/man1m"
-MANIFESTDIR="${ROOT}/var/svc/manifest/application/database"
+MANIFESTDIR="${ROOT}/lib/svc/manifest/application/database"
METHODDIR="${ROOT}/lib/svc/method"
MANSCRIPT="sunman-stability"
RIGHTSDIR=${ROOT}/etc/security
--- a/usr/src/lib/trousers/install-sfw Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/lib/trousers/install-sfw Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 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 "@(#)install-sfw 1.7 10/03/10 SMI"
+#ident "@(#)install-sfw 1.8 10/04/22 SMI"
VERS=trousers-0.3.4
@@ -39,7 +38,7 @@
MAN4DIR=${SHAREDIR}/man/man4
ROOTMAN3DIR=${MAN3DIR}
METHODDIR=${ROOT}/lib/svc/method
-MANIFESTDIR=${ROOT}/var/svc/manifest/application/security
+MANIFESTDIR=${ROOT}/lib/svc/manifest/application/security
TPMSYSDIR=${ROOT}/var/tpm/system
MKDIR=/usr/bin/mkdir
--- a/usr/src/pkgdefs/SUNWapch22r/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWapch22r/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -22,8 +22,7 @@
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.12 10/04/01 SMI"
-#
+#ident "@(#)prototype_com 1.13 10/04/22 SMI"
#
# SUNWapch22r
@@ -63,13 +62,12 @@
f none etc/apache2/2.2/samples-conf.d/reqtimeout.conf 0644 root bin
d none lib 755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/http-apache22.xml 0444 root bin
d none lib/svc/method 0755 root bin
f none lib/svc/method/http-apache22 0555 root bin
d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/http-apache22.xml 0444 root bin
d none var/apache2 0755 root bin
d none var/apache2/2.2 0755 root bin
d none var/apache2/2.2/htdocs 0755 root bin
--- a/usr/src/pkgdefs/SUNWbindr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbindr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.8 07/03/15 SMI"
+#ident "@(#)prototype_com 1.9 10/04/22 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
@@ -45,13 +44,11 @@
#
# SUNWbindr
#
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-d none var/svc/manifest/network/dns 755 root sys
-f manifest var/svc/manifest/network/dns/server.xml 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+d none lib/svc/manifest/network/dns 755 root sys
+f manifest lib/svc/manifest/network/dns/server.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/dns-server 555 root bin
--- a/usr/src/pkgdefs/SUNWcimserverr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcimserverr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# 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 "@(#)prototype_com 1.2 09/01/29 SMI"
+#ident "@(#)prototype_com 1.3 10/04/22 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
@@ -2776,11 +2775,10 @@
d none var/Pegasus/repository/root/classes 755 root bin
d none var/Pegasus/repository/root/instances 755 root bin
d none var/Pegasus/repository/root/qualifiers 755 root bin
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/cimserver.xml 444 root bin
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/cimserver.xml 444 root bin
d none lib/svc/method 755 root bin
f none lib/svc/method/svc-cimserver 555 root bin
--- a/usr/src/pkgdefs/SUNWconmanr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWconmanr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
#
#
-# 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.2 09/06/09 SMI"
+#ident "@(#)prototype_com 1.3 10/04/22 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
@@ -55,11 +54,8 @@
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/system 755 root sys
+f manifest lib/svc/manifest/system/conmand.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/svc-conmand 555 root bin
-
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/system 755 root sys
-f manifest var/svc/manifest/system/conmand.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWcupsr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcupsr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
#
#
-# Copyright 2010 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.7 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.8 10/04/22 SMI"
i pkginfo
i copyright
@@ -49,6 +47,11 @@
f none etc/security/prof_attr.d/cups 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/application 0755 root sys
+f manifest lib/svc/manifest/application/cups.xml 0444 root bin
+d none lib/svc/manifest/application/print 755 root sys
+f manifest lib/svc/manifest/application/print/service-selector.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/print-service-selector 0555 root bin
d none var 0755 root sys
@@ -60,9 +63,3 @@
d none var/spool 0755 root bin
d none var/spool/cups 0710 root lp
d none var/spool/cups/tmp 1770 root lp
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/application 0755 root sys
-f manifest var/svc/manifest/application/cups.xml 0444 root bin
-d none var/svc/manifest/application/print 755 root sys
-f manifest var/svc/manifest/application/print/service-selector.xml 0444 root sys
--- a/usr/src/pkgdefs/SUNWejabberdr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWejabberdr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
#
#
-# Copyright 2010 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.3 10/02/19 SMI"
+#ident "@(#)prototype_com 1.4 10/04/22 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
@@ -60,13 +59,12 @@
f none etc/security/prof_attr.d/ejabberd 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/xmpp-ejabberd.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/xmpp-ejabberd 555 root bin
d none var 0755 root sys
d none var/ejabberd 0755 daemon daemon
d none var/ejabberd/log 0755 daemon daemon
d none var/ejabberd/db 0755 daemon daemon
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/xmpp-ejabberd.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWfetchmail/pkginfo.tmpl Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWfetchmail/pkginfo.tmpl Thu May 20 09:24:15 2010 -0700
@@ -21,7 +21,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)pkginfo.tmpl 1.5 10/04/07 SMI"
+#pragma ident "@(#)pkginfo.tmpl 1.6 10/05/06 SMI"
#
#
@@ -38,7 +38,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="Fetchmail Mail Retrieval and Forwarding Utility (6.3.16)"
+DESC="Fetchmail Mail Retrieval and Forwarding Utility (6.3.17)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWfreeipmir/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWfreeipmir/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
#
#
-# 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/08/14 SMI"
+#ident "@(#)prototype_com 1.2 10/04/22 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,11 +61,10 @@
f none etc/sysconfig/freeipmi-bmc-watchdog 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/system 0755 root sys
+f manifest lib/svc/manifest/system/bmc-watchdog.xml 0444 root sys
+f manifest lib/svc/manifest/system/ipmidetectd.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/svc-bmc-watchdog 0755 root bin
f none lib/svc/method/svc-ipmidetectd 0755 root bin
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/system 0755 root sys
-f manifest var/svc/manifest/system/bmc-watchdog.xml 0444 root sys
-f manifest var/svc/manifest/system/ipmidetectd.xml 0444 root sys
--- a/usr/src/pkgdefs/SUNWipmir/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWipmir/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 07/02/01 SMI"
+#ident "@(#)prototype_com 1.2 10/04/22 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
@@ -45,10 +44,8 @@
#
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/ipmievd.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/svc-ipmievd 555 root bin
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/ipmievd.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWlighttpd14r/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlighttpd14r/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
#
#
-# Copyright 2010 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.4 10/02/19 SMI"
+#ident "@(#)prototype_com 1.5 10/04/22 SMI"
#
# SUNWlighttpd14r
#
@@ -47,13 +46,12 @@
f none etc/security/prof_attr.d/lighttpd 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/http-lighttpd14.xml 0444 root bin
d none lib/svc/method 0755 root bin
f none lib/svc/method/http-lighttpd14 0555 root bin
d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/http-lighttpd14.xml 0444 root bin
d none var/lighttpd 0755 root bin
d none var/lighttpd/1.4 0755 root bin
d none var/lighttpd/1.4/docroot 0755 root bin
--- a/usr/src/pkgdefs/SUNWmemcachedr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWmemcachedr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.4 10/02/19 SMI"
+#ident "@(#)prototype_com 1.5 10/04/22 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,12 +49,9 @@
f none etc/security/prof_attr.d/memcached 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/database 755 root sys
+f manifest lib/svc/manifest/application/database/memcached.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/memcached 555 root bin
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/database 755 root sys
-f manifest var/svc/manifest/application/database/memcached.xml 444 root sys
-
--- a/usr/src/pkgdefs/SUNWmysql51r/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWmysql51r/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -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/02/18 SMI"
+#ident "@(#)prototype_com 1.2 10/04/22 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
@@ -57,13 +56,12 @@
d none var/mysql 0700 mysql mysql
d none var/mysql/5.1 0700 mysql mysql
d none var/mysql/5.1/data 0700 mysql mysql
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/application 0755 root sys
-d none var/svc/manifest/application/database 0755 root sys
-f manifest var/svc/manifest/application/database/mysql_51.xml 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/application 0755 root sys
+d none lib/svc/manifest/application/database 0755 root sys
+f manifest lib/svc/manifest/application/database/mysql_51.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/mysql_51 0555 root bin
s none var/mysql/data=5.1/data
--- a/usr/src/pkgdefs/SUNWmysql5r/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWmysql5r/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.4 10/02/19 SMI"
+#ident "@(#)prototype_com 1.5 10/04/22 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,12 +61,11 @@
d none var/mysql 0700 mysql mysql
d none var/mysql/5.0 0700 mysql mysql
d none var/mysql/5.0/data 0700 mysql mysql
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/application 0755 root sys
-d none var/svc/manifest/application/database 0755 root sys
-f manifest var/svc/manifest/application/database/mysql.xml 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/application 0755 root sys
+d none lib/svc/manifest/application/database 0755 root sys
+f manifest lib/svc/manifest/application/database/mysql.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/mysql 0555 root bin
--- a/usr/src/pkgdefs/SUNWnet-snmp-mgr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnet-snmp-mgr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -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/07/06 SMI"
+#ident "@(#)prototype_com 1.2 10/04/22 SMI"
#
# *
# * U.S. Government Rights - Commercial software. Government users are subject
@@ -224,12 +223,10 @@
f none etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle 0444 root bin
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+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
-d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/application 0755 root sys
-d none var/svc/manifest/application/management 0755 root sys
-f manifest var/svc/manifest/application/management/net-snmp.xml 0444 root sys
-f manifest var/svc/manifest/application/management/seaport.xml 0444 root sys
--- a/usr/src/pkgdefs/SUNWnmap/Makefile Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/Makefile Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile 1.1 07/05/03 SMI"
+#ident "@(#)Makefile 1.2 10/04/26 SMI"
include ../Makefile.com
--- a/usr/src/pkgdefs/SUNWnmap/depend Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/depend Thu May 20 09:24:15 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)depend 1.8 10/01/07 SMI"
+# ident "@(#)depend 1.9 10/04/26 SMI"
#
#
# This package information file defines software dependencies associated
@@ -65,7 +64,7 @@
P SUNWbzip The bzip compression utility
P SUNWzlib The Zip compression library
P SUNWzlibr The Zip compression library (Root)
-P SUNWPython The Python interpreter, libraries and utilities
+P SUNWPython26 The Python interpreter, libraries and utilities
P SUNWbash GNU Bourne-Again shell (bash)
P SUNWsqlite3 SQLite3 a serverless transactional SQL engine
P SUNWpysqlite Python DB-API 2.0 interface for the SQLite
--- a/usr/src/pkgdefs/SUNWnmap/pkginfo.tmpl Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/pkginfo.tmpl Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 08/11/24 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/04/26 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -37,7 +36,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="nmap - Network exploration tool and security / port scanner (4.75)"
+DESC="nmap - Network exploration tool and security / port scanner (5.21)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWnmap/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.2 08/11/25 SMI"
+# ident "@(#)prototype_com 1.3 10/04/27 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
@@ -45,389 +44,454 @@
d none usr 0755 root sys
d none usr/bin 0755 root bin
f none usr/bin/nmap 0755 root bin
+f none usr/bin/ndiff 0755 root bin
+f none usr/bin/ncat 0755 root bin
f none usr/bin/zenmap 0755 root bin
s none usr/bin/nmapfe=zenmap
s none usr/bin/xnmap=zenmap
+d none usr/lib 0755 root bin
+d none usr/lib/python2.6 0755 root bin
+d none usr/lib/python2.6/vendor-packages 0755 root bin
+d none usr/lib/python2.6/vendor-packages/zenmapGUI 0755 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/App.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/About.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/About.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/App.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.py 0644 root bin
+d none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets 0755 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.py 0644 root bin
+d none usr/lib/python2.6/vendor-packages/zenmapCore 0755 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Diff.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Name.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/I18N.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Name.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Diff.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/I18N.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Paths.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Version.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/Version.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py 0644 root bin
+d none usr/lib/python2.6/vendor-packages/radialnet 0755 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/__init__.py 0644 root bin
+d none usr/lib/python2.6/vendor-packages/radialnet/gui 0755 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Image.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Image.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Application.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Application.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.pyc 0644 root bin
+d none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets 0755 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.pyc 0644 root bin
+d none usr/lib/python2.6/vendor-packages/radialnet/util 0755 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/integration.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/drawing.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/integration.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/drawing.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/misc.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/geometry.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/misc.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/util/geometry.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/__init__.pyc 0644 root bin
+d none usr/lib/python2.6/vendor-packages/radialnet/core 0755 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Graph.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Info.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Info.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Graph.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.py 0644 root bin
d none usr/share 0755 root sys
-d none usr/share/man 0755 root bin
-d none usr/share/man/man1 0755 root bin
-f none usr/share/man/man1/nmap.1 0444 root bin
-f none usr/share/man/man1/zenmap.1 0444 root bin
-s none usr/share/man/man1/xnmap.1=zenmap.1
-s none usr/share/man/man1/nmapfe.1=zenmap.1
d none usr/share/nmap 0755 root bin
+d none usr/share/nmap/nselib 0755 root bin
+d none usr/share/nmap/nselib/data 0755 root bin
+d none usr/share/nmap/nselib/data/psexec 0755 root bin
+d none usr/share/nmap/scripts 0755 root bin
+f none usr/share/nmap/nmap-services 0444 root bin
+f none usr/share/nmap/nse_main.lua 0444 root bin
f none usr/share/nmap/nmap.xsl 0444 root bin
-f none usr/share/nmap/nmap.dtd 0444 root bin
-f none usr/share/nmap/nmap-services 0444 root bin
f none usr/share/nmap/nmap-rpc 0444 root bin
-f none usr/share/nmap/nmap-os-db 0444 root bin
f none usr/share/nmap/nmap-service-probes 0444 root bin
-f none usr/share/nmap/nmap-protocols 0444 root bin
-f none usr/share/nmap/nmap-mac-prefixes 0444 root bin
-d none usr/share/nmap/scripts 0755 root bin
+f none usr/share/nmap/scripts/sshv1.nse 0444 root bin
+f none usr/share/nmap/scripts/http-malware-host.nse 0444 root bin
+f none usr/share/nmap/scripts/pptp-version.nse 0444 root bin
+f none usr/share/nmap/scripts/http-headers.nse 0444 root bin
+f none usr/share/nmap/scripts/http-open-proxy.nse 0444 root bin
f none usr/share/nmap/scripts/script.db 0444 root bin
-f none usr/share/nmap/scripts/ASN.nse 0444 root bin
-f none usr/share/nmap/scripts/HTTPAuth.nse 0444 root bin
-f none usr/share/nmap/scripts/HTTP_open_proxy.nse 0444 root bin
-f none usr/share/nmap/scripts/HTTPpasswd.nse 0444 root bin
-f none usr/share/nmap/scripts/HTTPtrace.nse 0444 root bin
-f none usr/share/nmap/scripts/MSSQLm.nse 0444 root bin
-f none usr/share/nmap/scripts/MySQLinfo.nse 0444 root bin
-f none usr/share/nmap/scripts/PPTPversion.nse 0444 root bin
-f none usr/share/nmap/scripts/RealVNC_auth_bypass.nse 0444 root bin
-f none usr/share/nmap/scripts/SMTP_openrelay_test.nse 0444 root bin
-f none usr/share/nmap/scripts/SMTPcommands.nse 0444 root bin
-f none usr/share/nmap/scripts/SNMPcommunitybrute.nse 0444 root bin
-f none usr/share/nmap/scripts/SNMPsysdescr.nse 0444 root bin
-f none usr/share/nmap/scripts/SQLInject.nse 0444 root bin
-f none usr/share/nmap/scripts/SSHv1-support.nse 0444 root bin
-f none usr/share/nmap/scripts/SSLv2-support.nse 0444 root bin
-f none usr/share/nmap/scripts/UPnP-info.nse 0444 root bin
-f none usr/share/nmap/scripts/anonFTP.nse 0444 root bin
-f none usr/share/nmap/scripts/brutePOP3.nse 0444 root bin
-f none usr/share/nmap/scripts/bruteTelnet.nse 0444 root bin
-f none usr/share/nmap/scripts/chargenTest.nse 0444 root bin
-f none usr/share/nmap/scripts/daytimeTest.nse 0444 root bin
-f none usr/share/nmap/scripts/dns-safe-recursion-port.nse 0444 root bin
-f none usr/share/nmap/scripts/dns-safe-recursion-txid.nse 0444 root bin
-f none usr/share/nmap/scripts/dns-test-open-recursion.nse 0444 root bin
-f none usr/share/nmap/scripts/echoTest.nse 0444 root bin
+f none usr/share/nmap/scripts/daytime.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-server-stats.nse 0444 root bin
+f none usr/share/nmap/scripts/skypev2-version.nse 0444 root bin
+f none usr/share/nmap/scripts/citrix-brute-xml.nse 0444 root bin
+f none usr/share/nmap/scripts/dns-zone-transfer.nse 0444 root bin
+f none usr/share/nmap/scripts/socks-open-proxy.nse 0444 root bin
f none usr/share/nmap/scripts/finger.nse 0444 root bin
-f none usr/share/nmap/scripts/ftpbounce.nse 0444 root bin
-f none usr/share/nmap/scripts/iax2Detect.nse 0444 root bin
-f none usr/share/nmap/scripts/ircServerInfo.nse 0444 root bin
-f none usr/share/nmap/scripts/ircZombieTest.nse 0444 root bin
-f none usr/share/nmap/scripts/nbstat.nse 0444 root bin
-f none usr/share/nmap/scripts/netbios-smb-os-discovery.nse 0444 root bin
-f none usr/share/nmap/scripts/popcapa.nse 0444 root bin
-f none usr/share/nmap/scripts/promiscuous.nse 0444 root bin
-f none usr/share/nmap/scripts/ripeQuery.nse 0444 root bin
-f none usr/share/nmap/scripts/robots.nse 0444 root bin
+f none usr/share/nmap/scripts/http-auth.nse 0444 root bin
+f none usr/share/nmap/scripts/sql-injection.nse 0444 root bin
+f none usr/share/nmap/scripts/banner.nse 0444 root bin
+f none usr/share/nmap/scripts/citrix-enum-servers-xml.nse 0444 root bin
+f none usr/share/nmap/scripts/http-userdir-enum.nse 0444 root bin
f none usr/share/nmap/scripts/rpcinfo.nse 0444 root bin
-f none usr/share/nmap/scripts/showHTMLTitle.nse 0444 root bin
-f none usr/share/nmap/scripts/showHTTPVersion.nse 0444 root bin
-f none usr/share/nmap/scripts/showOwner.nse 0444 root bin
-f none usr/share/nmap/scripts/showSMTPVersion.nse 0444 root bin
-f none usr/share/nmap/scripts/showSSHVersion.nse 0444 root bin
-f none usr/share/nmap/scripts/skype_v2-version.nse 0444 root bin
-f none usr/share/nmap/scripts/strangeSMTPport.nse 0444 root bin
+f none usr/share/nmap/scripts/smtp-commands.nse 0444 root bin
+f none usr/share/nmap/scripts/ntp-info.nse 0444 root bin
f none usr/share/nmap/scripts/whois.nse 0444 root bin
-f none usr/share/nmap/scripts/xamppDefaultPass.nse 0444 root bin
-f none usr/share/nmap/scripts/zoneTrans.nse 0444 root bin
-d none usr/share/nmap/nselib 0755 root bin
-f none usr/share/nmap/nselib/base64.lua 0444 root bin
-f none usr/share/nmap/nselib/comm.lua 0444 root bin
-f none usr/share/nmap/nselib/datafiles.lua 0444 root bin
+f none usr/share/nmap/scripts/http-date.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-processes.nse 0444 root bin
+f none usr/share/nmap/scripts/smtp-strangeport.nse 0444 root bin
+f none usr/share/nmap/scripts/db2-info.nse 0444 root bin
+f none usr/share/nmap/scripts/pop3-capabilities.nse 0444 root bin
+f none usr/share/nmap/scripts/nfs-showmount.nse 0444 root bin
+f none usr/share/nmap/scripts/telnet-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/sslv2.nse 0444 root bin
+f none usr/share/nmap/scripts/dhcp-discover.nse 0444 root bin
+f none usr/share/nmap/scripts/ms-sql-info.nse 0444 root bin
+f none usr/share/nmap/scripts/robots.txt.nse 0444 root bin
+f none usr/share/nmap/scripts/ssh-hostkey.nse 0444 root bin
+f none usr/share/nmap/scripts/mysql-info.nse 0444 root bin
+f none usr/share/nmap/scripts/citrix-enum-apps-xml.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-os-discovery.nse 0444 root bin
+f none usr/share/nmap/scripts/dns-random-txid.nse 0444 root bin
+f none usr/share/nmap/scripts/iax2-version.nse 0444 root bin
+f none usr/share/nmap/scripts/http-iis-webdav-vuln.nse 0444 root bin
+f none usr/share/nmap/scripts/ftp-anon.nse 0444 root bin
+f none usr/share/nmap/scripts/http-passwd.nse 0444 root bin
+f none usr/share/nmap/scripts/http-favicon.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-psexec.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-system-info.nse 0444 root bin
+f none usr/share/nmap/scripts/citrix-enum-servers.nse 0444 root bin
+f none usr/share/nmap/scripts/smbv2-enabled.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-users.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-groups.nse 0444 root bin
+f none usr/share/nmap/scripts/dns-random-srcport.nse 0444 root bin
+f none usr/share/nmap/scripts/x11-access.nse 0444 root bin
+f none usr/share/nmap/scripts/html-title.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-domains.nse 0444 root bin
+f none usr/share/nmap/scripts/sniffer-detect.nse 0444 root bin
+f none usr/share/nmap/scripts/dns-recursion.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-check-vulns.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/nbstat.nse 0444 root bin
+f none usr/share/nmap/scripts/imap-capabilities.nse 0444 root bin
+f none usr/share/nmap/scripts/p2p-conficker.nse 0444 root bin
+f none usr/share/nmap/scripts/http-trace.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-security-mode.nse 0444 root bin
+f none usr/share/nmap/scripts/ftp-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/auth-owners.nse 0444 root bin
+f none usr/share/nmap/scripts/auth-spoof.nse 0444 root bin
+f none usr/share/nmap/scripts/snmp-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/http-enum.nse 0444 root bin
+f none usr/share/nmap/scripts/snmp-sysdescr.nse 0444 root bin
+f none usr/share/nmap/scripts/ftp-bounce.nse 0444 root bin
+f none usr/share/nmap/scripts/pop3-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-sessions.nse 0444 root bin
+f none usr/share/nmap/scripts/smb-enum-shares.nse 0444 root bin
+f none usr/share/nmap/scripts/irc-info.nse 0444 root bin
+f none usr/share/nmap/scripts/oracle-sid-brute.nse 0444 root bin
+f none usr/share/nmap/scripts/upnp-info.nse 0444 root bin
+f none usr/share/nmap/scripts/pjl-ready-message.nse 0444 root bin
+f none usr/share/nmap/scripts/smtp-open-relay.nse 0444 root bin
+f none usr/share/nmap/scripts/asn-query.nse 0444 root bin
+f none usr/share/nmap/scripts/ssl-cert.nse 0444 root bin
+f none usr/share/nmap/scripts/citrix-enum-apps.nse 0444 root bin
+f none usr/share/nmap/scripts/realvnc-auth-bypass.nse 0444 root bin
+f none usr/share/nmap/nselib/smb.lua 0444 root bin
+f none usr/share/nmap/nselib/msrpcperformance.lua 0444 root bin
+f none usr/share/nmap/nselib/url.lua 0444 root bin
+f none usr/share/nmap/nselib/ssh2.lua 0444 root bin
f none usr/share/nmap/nselib/dns.lua 0444 root bin
-f none usr/share/nmap/nselib/http.lua 0444 root bin
-f none usr/share/nmap/nselib/ipOps.lua 0444 root bin
-f none usr/share/nmap/nselib/listop.lua 0444 root bin
+f none usr/share/nmap/nselib/imap.lua 0444 root bin
+f none usr/share/nmap/nselib/smbauth.lua 0444 root bin
+f none usr/share/nmap/nselib/msrpc.lua 0444 root bin
f none usr/share/nmap/nselib/match.lua 0444 root bin
-f none usr/share/nmap/nselib/packet.lua 0444 root bin
+f none usr/share/nmap/nselib/msrpctypes.lua 0444 root bin
+f none usr/share/nmap/nselib/nsedebug.lua 0444 root bin
+f none usr/share/nmap/nselib/data/usernames.lst 0444 root bin
+f none usr/share/nmap/nselib/data/favicon-db 0444 root bin
+f none usr/share/nmap/nselib/data/oracle-sids 0444 root bin
+f none usr/share/nmap/nselib/data/folders.lst 0444 root bin
+f none usr/share/nmap/nselib/data/http-fingerprints 0444 root bin
+f none usr/share/nmap/nselib/data/yokoso-fingerprints 0444 root bin
+f none usr/share/nmap/nselib/data/passwords.lst 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/experimental.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/README 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/network.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/pwdump.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/nmap_service.c 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/default.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/nmap_service.exe 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/drives.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/nmap_service.vcproj 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/examples.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/backdoor.lua 0444 root bin
+f none usr/share/nmap/nselib/data/psexec/encoder.c 0444 root bin
f none usr/share/nmap/nselib/pop3.lua 0444 root bin
-f none usr/share/nmap/nselib/shortport.lua 0444 root bin
+f none usr/share/nmap/nselib/proxy.lua 0444 root bin
+f none usr/share/nmap/nselib/datafiles.lua 0444 root bin
f none usr/share/nmap/nselib/snmp.lua 0444 root bin
f none usr/share/nmap/nselib/stdnse.lua 0444 root bin
+f none usr/share/nmap/nselib/listop.lua 0444 root bin
+f none usr/share/nmap/nselib/ipOps.lua 0444 root bin
+f none usr/share/nmap/nselib/packet.lua 0444 root bin
f none usr/share/nmap/nselib/strbuf.lua 0444 root bin
+f none usr/share/nmap/nselib/netbios.lua 0444 root bin
+f none usr/share/nmap/nselib/comm.lua 0444 root bin
+f none usr/share/nmap/nselib/shortport.lua 0444 root bin
+f none usr/share/nmap/nselib/base64.lua 0444 root bin
f none usr/share/nmap/nselib/tab.lua 0444 root bin
+f none usr/share/nmap/nselib/http.lua 0444 root bin
+f none usr/share/nmap/nselib/ssh1.lua 0444 root bin
f none usr/share/nmap/nselib/unpwdb.lua 0444 root bin
-f none usr/share/nmap/nselib/url.lua 0444 root bin
-d none usr/share/pixmaps 0755 root other
-f none usr/share/pixmaps/nmapfe.png 0444 root bin
+f none usr/share/nmap/nselib/strict.lua 0444 root bin
+f none usr/share/nmap/nselib/citrixxml.lua 0444 root bin
+f none usr/share/nmap/nmap-os-db 0444 root bin
+f none usr/share/nmap/nmap-protocols 0444 root bin
+f none usr/share/nmap/nmap.dtd 0444 root bin
+f none usr/share/nmap/nmap-mac-prefixes 0444 root bin
+d none usr/share/applications 0755 root other
+f none usr/share/applications/nmapfe.desktop 0444 root bin
+f none usr/share/applications/zenmap-root.desktop 0444 root bin
+f none usr/share/applications/zenmap.desktop 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/ncat.1 0444 root bin
+f none usr/share/man/man1/zenmap.1 0444 root bin
+f none usr/share/man/man1/nmap.1 0444 root bin
+f none usr/share/man/man1/ndiff.1 0444 root bin
+s none usr/share/man/man1/xnmap.1=zenmap.1
+s none usr/share/man/man1/nmapfe.1=zenmap.1
+d none usr/share/ncat 0755 root bin
+f none usr/share/ncat/ca-bundle.crt 0644 root bin
d none usr/share/zenmap 0755 root bin
-d none usr/share/zenmap/pixmaps 0755 root bin
-f none usr/share/zenmap/pixmaps/vl_3.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/irix.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/win.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/unknown.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_2.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/freebsd.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_4.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/default.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/macosx.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_1.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/linux.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/redhat.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_5.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/ubuntu.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/openbsd.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/solaris.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/linux_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_2_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/redhat_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/solaris_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/default_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/irix_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/ubuntu_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/wizard_logo.png 0444 root bin
-f none usr/share/zenmap/pixmaps/splash.png 0444 root bin
-f none usr/share/zenmap/pixmaps/openbsd_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/unknown_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/win_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/macosx_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_4_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/openbsd_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_2_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/freebsd_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/freebsd_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/redhat_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/solaris_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_5_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_3_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/default_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/linux_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/macosx_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_1_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_1_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_3_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/zenmap.png 0444 root bin
-f none usr/share/zenmap/pixmaps/win_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_4_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/ubuntu_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/vl_5_75.png 0444 root bin
-f none usr/share/zenmap/pixmaps/unknown_32.png 0444 root bin
-f none usr/share/zenmap/pixmaps/irix_32.png 0444 root bin
-d none usr/share/zenmap/pixmaps/radialnet 0755 root bin
-f none usr/share/zenmap/pixmaps/radialnet/logo.svg 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/border.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/expand.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/collapse.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/padlock.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/router.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/close.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/wireless.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/firewall.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/switch.png 0444 root bin
-f none usr/share/zenmap/pixmaps/radialnet/logo.png 0444 root bin
-d none usr/share/zenmap/config 0755 root bin
-f none usr/share/zenmap/config/zenmap.conf 0444 root bin
-f none usr/share/zenmap/config/scan_profile.usp 0444 root bin
-f none usr/share/zenmap/config/zenmap_version 0444 root bin
-d none usr/share/zenmap/misc 0755 root bin
-f none usr/share/zenmap/misc/profile_editor.xml 0444 root bin
-f none usr/share/zenmap/misc/options.xml 0444 root bin
-f none usr/share/zenmap/misc/wizard.xml 0444 root bin
d none usr/share/zenmap/docs 0755 root bin
f none usr/share/zenmap/docs/help.html 0444 root bin
-d none usr/share/zenmap/locale 0755 root bin
-d none usr/share/zenmap/locale/pt_BR 0755 root bin
-d none usr/share/zenmap/locale/pt_BR/LC_MESSAGES 0755 root bin
-f none usr/share/zenmap/locale/pt_BR/LC_MESSAGES/umit.mo 0444 root bin
+d none usr/share/zenmap/misc 0755 root bin
+f none usr/share/zenmap/misc/profile_editor.xml 0444 root bin
+d none usr/share/zenmap/config 0755 root bin
+f none usr/share/zenmap/config/zenmap_version 0444 root bin
+f none usr/share/zenmap/config/zenmap.conf 0444 root bin
+f none usr/share/zenmap/config/scan_profile.usp 0444 root bin
+d none usr/share/locale 0755 root other
+d none usr/share/locale/fr 0755 root other
+d none usr/share/locale/fr/LC_MESSAGES 0755 root other
+f none usr/share/locale/fr/LC_MESSAGES/zenmap.mo 0644 root other
+d none usr/share/locale/hr 0755 root other
+d none usr/share/locale/hr/LC_MESSAGES 0755 root other
+f none usr/share/locale/hr/LC_MESSAGES/zenmap.mo 0644 root other
+d none usr/share/locale/pt_BR 0755 root other
+d none usr/share/locale/pt_BR/LC_MESSAGES 0755 root other
+f none usr/share/locale/pt_BR/LC_MESSAGES/zenmap.mo 0644 root other
+d none usr/share/locale/de 0755 root other
+d none usr/share/locale/de/LC_MESSAGES 0755 root other
+f none usr/share/locale/de/LC_MESSAGES/zenmap.mo 0644 root other
+d none usr/share/locale/ru 0755 root other
+d none usr/share/locale/ru/LC_MESSAGES 0755 root other
+f none usr/share/locale/ru/LC_MESSAGES/zenmap.mo 0644 root other
+d none usr/share/pixmaps 0755 root other
+f none usr/share/pixmaps/nmapfe.png 0444 root bin
+d none usr/share/zenmap/pixmaps 0755 root bin
+f none usr/share/zenmap/pixmaps/vl_2_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/throbber.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_2_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/splash.png 0444 root bin
+f none usr/share/zenmap/pixmaps/redhat_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/default_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/redhat_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/default_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/solaris_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/zenmap.png 0444 root bin
+f none usr/share/zenmap/pixmaps/solaris_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_4_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/unknown_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/win_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/macosx_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/linux_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/unknown_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_4_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/win_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/linux_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/macosx_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/irix_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/irix_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/openbsd_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_5_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/freebsd_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/openbsd_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_5_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/freebsd_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_3_75.png 0444 root bin
+d none usr/share/zenmap/pixmaps/radialnet 0755 root bin
+f none usr/share/zenmap/pixmaps/radialnet/padlock.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/switch.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/logo.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/wireless.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/border.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/router.png 0444 root bin
+f none usr/share/zenmap/pixmaps/radialnet/firewall.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_3_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_1_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/ubuntu_75.png 0444 root bin
+f none usr/share/zenmap/pixmaps/throbber.gif 0444 root bin
+f none usr/share/zenmap/pixmaps/vl_1_32.png 0444 root bin
+f none usr/share/zenmap/pixmaps/ubuntu_32.png 0444 root bin
f none usr/share/zenmap/su-to-zenmap.sh 0755 root bin
-d none usr/share/applications 0755 root other
-f none usr/share/applications/zenmap.desktop 0444 root bin
-f none usr/share/applications/zenmap-root.desktop 0444 root bin
-f none usr/share/applications/nmapfe.desktop 0444 root bin
-d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-d none usr/lib/python2.4/vendor-packages/zenmapCore 0755 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/BasePaths.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/RecentScans.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Diff.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapCommand.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitConf.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitDB.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Version.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitConfigParser.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Name.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Paths.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitOptionParser.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapParser.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/SearchResult.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/BugRegister.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitLogging.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NetworkInventory.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/DiffHtml.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapOptions.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/I18N.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/TargetList.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Diff.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/BasePaths.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/RecentScans.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapCommand.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitConf.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitDB.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Version.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitConfigParser.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Name.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/Paths.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitOptionParser.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapParser.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/SearchResult.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/BugRegister.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/UmitLogging.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NetworkInventory.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/DiffHtml.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/NmapOptions.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/I18N.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapCore/TargetList.pyc 0644 root bin
-d none usr/lib/python2.4/vendor-packages/zenmapGUI 0755 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Icons.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/OptionBuilder.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/App.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/NmapOutputProperties.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanNmapOutputPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanScanListPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileHelp.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanToolbar.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/CrashReport.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Wizard.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/About.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/TopologyPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/SearchGUI.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/NmapOutputViewer.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/BugReport.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/DiffCompare.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Splash.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanHostDetailsPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanNotebook.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanRunDetailsPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/FileChoosers.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/SearchWindow.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanHostsView.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScansListStore.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/MainWindow.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/TargetCombo.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileCombo.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanOpenPortsPage.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileEditor.py 0644 root bin
-d none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets 0755 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higboxes.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/utils.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/gtkutils.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higexpanders.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higtables.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higlabels.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higbuttons.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higscrollers.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higframe.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higwindows.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higdialogs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higspinner.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higentries.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higboxes.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/utils.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/gtkutils.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higexpanders.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higtables.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higtextviewers.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higprogressbars.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higlabels.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higbuttons.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higscrollers.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higframe.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higwindows.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/hignotebooks.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higdialogs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higspinner.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/higwidgets/higentries.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Icons.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/OptionBuilder.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/App.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/NmapOutputProperties.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanNmapOutputPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanScanListPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileHelp.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanToolbar.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/CrashReport.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Wizard.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/About.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/TopologyPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/SearchGUI.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/NmapOutputViewer.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/BugReport.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/DiffCompare.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/Splash.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanHostDetailsPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanNotebook.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanRunDetailsPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/FileChoosers.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/SearchWindow.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanHostsView.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScansListStore.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/MainWindow.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/TargetCombo.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileCombo.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ScanOpenPortsPage.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/zenmapGUI/ProfileEditor.pyc 0644 root bin
-d none usr/lib/python2.4/vendor-packages/radialnet 0755 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/__init__.py 0644 root bin
-d none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets 0755 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/labels.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/frames.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/comboboxes.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/boxes.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/expanders.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/buttons.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/textview.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/windows.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/labels.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/frames.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/comboboxes.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/boxes.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/expanders.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/buttons.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/textview.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/bestwidgets/windows.pyc 0644 root bin
-d none usr/lib/python2.4/vendor-packages/radialnet/core 0755 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Info.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/XMLHandler.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/ArgvHandle.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Graph.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Coordinate.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Interpolation.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Info.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/XMLHandler.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/ArgvHandle.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Graph.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Coordinate.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/core/Interpolation.pyc 0644 root bin
-d none usr/lib/python2.4/vendor-packages/radialnet/gui 0755 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/NodeNotebook.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Application.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/ControlWidget.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Image.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Dialogs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Toolbar.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/RadialNet.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/HostsViewer.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/NodeWindow.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/NodeNotebook.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Application.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/ControlWidget.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Image.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Dialogs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/Toolbar.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/RadialNet.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/HostsViewer.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/gui/NodeWindow.pyc 0644 root bin
-d none usr/lib/python2.4/vendor-packages/radialnet/util 0755 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/integration.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/geometry.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/misc.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/drawing.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/integration.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/geometry.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/misc.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/util/drawing.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/radialnet/__init__.pyc 0644 root bin
+
--- a/usr/src/pkgdefs/SUNWnmap/prototype_i386 Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/prototype_i386 Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_i386 1.1 07/05/03 SMI"
+#ident "@(#)prototype_i386 1.2 10/04/26 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
--- a/usr/src/pkgdefs/SUNWnmap/prototype_sparc Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWnmap/prototype_sparc Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_sparc 1.1 07/05/03 SMI"
+#ident "@(#)prototype_sparc 1.2 10/04/26 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
--- a/usr/src/pkgdefs/SUNWntpr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWntpr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -21,11 +21,9 @@
#
#
-# Copyright 2010 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.2 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.3 10/04/22 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
@@ -57,11 +55,10 @@
d none var 755 root sys
d none var/ntp 755 root sys
d none var/ntp/ntpstats 755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/ntp.xml 0444 root sys
d none lib 755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/ntp.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/ntp 0555 root bin
--- a/usr/src/pkgdefs/SUNWopenldapr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 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.4 10/02/19 SMI"
+# ident "@(#)prototype_com 1.5 10/04/22 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
@@ -77,12 +76,11 @@
f none etc/security/prof_attr.d/openldap 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+d none lib/svc/manifest/network/ldap 755 root sys
+f manifest lib/svc/manifest/network/ldap/ldap-olslapd.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/ldap-olslapd 555 root bin
d none var 755 root sys
d none var/openldap 755 openldap openldap
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-d none var/svc/manifest/network/ldap 755 root sys
-f manifest var/svc/manifest/network/ldap/ldap-olslapd.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWopenwsmanr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenwsmanr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
#
#
-# Copyright 2010 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.2 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.3 10/04/22 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
@@ -55,13 +53,11 @@
#SMF files
-d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/openwsmand.xml 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/openwsmand.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/svc-openwsmand 0555 root bin
--- a/usr/src/pkgdefs/SUNWpenr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpenr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
#
#
-# 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/01 SMI"
-#
+#ident "@(#)prototype_com 1.2 10/04/22 SMI"
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
@@ -47,11 +45,9 @@
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+d none lib/svc/manifest/network/loadbalancer 755 root sys
+f manifest lib/svc/manifest/network/loadbalancer/pen.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/pen 555 root bin
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-d none var/svc/manifest/network/loadbalancer 755 root sys
-f manifest var/svc/manifest/network/loadbalancer/pen.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWpgbouncer-pg83-config/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpgbouncer-pg83-config/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -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_com 1.3 08/06/12 SMI"
+#ident "@(#)prototype_com 1.4 10/04/22 SMI"
#
# SUNWpgbouncer-pg83-config
#
@@ -35,9 +34,9 @@
d none etc 755 root sys
d none etc/pgbouncer 755 root bin
e preserve etc/pgbouncer/pgbouncer.ini 444 root bin
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/database 755 root sys
-f manifest var/svc/manifest/application/database/pgbouncer.xml 444 root sys
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/database 755 root sys
+f manifest lib/svc/manifest/application/database/pgbouncer.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.6 10/02/19 SMI"
+#ident "@(#)prototype_com 1.7 10/04/22 SMI"
#
# SUNWpostgr-82-server-data-root
#
@@ -43,6 +42,10 @@
f none etc/security/prof_attr.d/postgres-82 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/database 755 root sys
+f manifest lib/svc/manifest/application/database/postgresql.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/postgresql 555 root bin
d none var 755 root sys
@@ -51,8 +54,3 @@
d none var/postgres/8.2/data 700 postgres postgres
d none var/postgres/8.2/data_64 700 postgres postgres
d none var/postgres/8.2/backups 700 postgres postgres
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/database 755 root sys
-f manifest var/svc/manifest/application/database/postgresql.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.3 10/02/19 SMI"
+#ident "@(#)prototype_com 1.4 10/04/22 SMI"
#
# SUNWpostgr-83-server-data-root
#
@@ -42,6 +41,10 @@
f none etc/security/prof_attr.d/postgres-83 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/database 755 root sys
+f manifest lib/svc/manifest/application/database/postgresql_83.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/postgres_83 555 root bin
d none var 755 root sys
@@ -50,8 +53,3 @@
d none var/postgres/8.3/data 700 postgres postgres
d none var/postgres/8.3/data_64 700 postgres postgres
d none var/postgres/8.3/backups 700 postgres postgres
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/database 755 root sys
-f manifest var/svc/manifest/application/database/postgresql_83.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.2 10/02/19 SMI"
+#ident "@(#)prototype_com 1.3 10/04/22 SMI"
#
# SUNWpostgr-84-server-data-root
#
@@ -42,6 +41,10 @@
f none etc/security/prof_attr.d/postgres-84 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/database 755 root sys
+f manifest lib/svc/manifest/application/database/postgresql_84.xml 444 root sys
d none lib/svc/method 755 root bin
f none lib/svc/method/postgres_84 555 root bin
d none var 755 root sys
@@ -50,8 +53,3 @@
d none var/postgres/8.4/data 700 postgres postgres
d none var/postgres/8.4/data_64 700 postgres postgres
d none var/postgres/8.4/backups 700 postgres postgres
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/database 755 root sys
-f manifest var/svc/manifest/application/database/postgresql_84.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWprivoxyr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWprivoxyr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -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/09/16 SMI"
+#ident "@(#)prototype_com 1.2 10/04/22 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
@@ -92,11 +91,10 @@
d none var 755 root sys
d none var/log 755 root sys
d none var/log/privoxy 755 webservd webservd
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/http-privoxy.xml 444 root bin
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/http-privoxy.xml 444 root bin
f none lib/svc/method/http-privoxy 555 root bin
--- a/usr/src/pkgdefs/SUNWquaggar/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWquaggar/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.6 10/02/19 SMI"
+#ident "@(#)prototype_com 1.7 10/04/22 SMI"
#
#
# This required package information file contains a list of package contents.
@@ -61,12 +60,10 @@
f none etc/security/exec_attr.d/quagga 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+d none lib/svc/manifest/network/routing 0755 root sys
+f manifest lib/svc/manifest/network/routing/quagga.xml 0444 root bin
+f manifest lib/svc/manifest/network/routing/trill.xml 0444 root bin
d none lib/svc/method 755 root bin
f none lib/svc/method/quagga 0555 root bin
-d none var 755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-d none var/svc/manifest/network/routing 0755 root sys
-f manifest var/svc/manifest/network/routing/quagga.xml 0444 root bin
-f manifest var/svc/manifest/network/routing/trill.xml 0444 root bin
--- a/usr/src/pkgdefs/SUNWsmbar/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 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.15 08/04/25 SMI"
+#ident "@(#)prototype_com 1.16 10/04/22 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,14 +48,15 @@
d none etc/sfw 755 root bin
f none etc/sfw/smb.conf-example 444 root bin
d none etc/sfw/private 500 root bin
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/samba.xml 444 root sys
+f manifest lib/svc/manifest/network/swat.xml 444 root sys
+f manifest lib/svc/manifest/network/winbind.xml 444 root sys
+f manifest lib/svc/manifest/network/wins.xml 444 root sys
d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/samba.xml 444 root sys
-f manifest var/svc/manifest/network/swat.xml 444 root sys
-f manifest var/svc/manifest/network/winbind.xml 444 root sys
-f manifest var/svc/manifest/network/wins.xml 444 root sys
d none var/samba 755 root bin
d none var/samba/log 755 root bin
d none var/samba/locks 755 root bin
--- a/usr/src/pkgdefs/SUNWsnortr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsnortr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
#
#
-# Copyright 2010 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.2 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.3 10/04/22 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,11 +60,8 @@
f none etc/security/exec_attr.d/snort 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/snort.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/snortd 0555 root bin
-d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/snort.xml 0444 root sys
-
--- a/usr/src/pkgdefs/SUNWsquidr/pkginfo.tmpl Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsquidr/pkginfo.tmpl Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.3 09/03/04 SMI"
+# ident "@(#)pkginfo.tmpl 1.4 10/04/23 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -37,7 +36,7 @@
SUNW_PKGTYPE="root"
MAXINST="1000"
CATEGORY="system"
-DESC="Squid Web Proxy Cache (2.7 STABLE6)"
+DESC="Squid Web Proxy Cache (2.7 STABLE9)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWsquidr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsquidr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.3 09/09/16 SMI"
+#ident "@(#)prototype_com 1.4 10/04/22 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
@@ -58,11 +57,10 @@
d none var/squid 755 webservd webservd
d none var/squid/logs 755 webservd webservd
d none var/squid/cache 755 webservd webservd
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/http-squid.xml 444 root bin
d none lib 755 root bin
d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/http-squid.xml 444 root bin
d none lib/svc/method 755 root bin
f none lib/svc/method/http-squid 555 root bin
--- a/usr/src/pkgdefs/SUNWsquidu/pkginfo.tmpl Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsquidu/pkginfo.tmpl Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 09/03/04 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/04/23 SMI"
#
# This required package information file describes characteristics of the
@@ -38,7 +37,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="Squid Web Proxy Cache (2.7 STABLE6)"
+DESC="Squid Web Proxy Cache (2.7 STABLE9)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWstunnelr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWstunnelr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.4 10/02/19 SMI"
+#ident "@(#)prototype_com 1.5 10/04/22 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
@@ -41,12 +40,12 @@
#
# SUNWstunnelr - stunnel root components
#
-d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-d none var/svc/manifest/network/ssl 0755 root sys
-f manifest var/svc/manifest/network/ssl/stunnel.xml 0444 root bin
+d none lib 0755 root bin
+d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+d none lib/svc/manifest/network/ssl 0755 root sys
+f manifest lib/svc/manifest/network/ssl/stunnel.xml 0444 root bin
d none etc 755 root sys
d none etc/stunnel 755 root sys
f none etc/stunnel/stunnel.sample 444 root sys
--- a/usr/src/pkgdefs/SUNWtcatr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWtcatr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -20,11 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.13 09/10/30 SMI"
-#
+#ident "@(#)prototype_com 1.14 10/04/22 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
@@ -52,11 +50,10 @@
d none lib/svc 0755 root bin
d none lib/svc/method 0755 root bin
f none lib/svc/method/http-tomcat6 0555 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/http-tomcat6.xml 0444 root bin
d none var 755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/http-tomcat6.xml 0444 root bin
d none var/tomcat6 0755 root bin
d none var/tomcat6/logs 0755 webservd webservd
d none var/tomcat6/temp 0755 webservd webservd
--- a/usr/src/pkgdefs/SUNWtor-root/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWtor-root/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -18,11 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_com 1.3 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.4 10/04/22 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,14 +51,13 @@
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/network 0755 root sys
+f manifest lib/svc/manifest/network/tor.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/tor.sh 0555 root bin
d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/network 0755 root sys
-f manifest var/svc/manifest/network/tor.xml 0444 root sys
d none var/lib 0755 root other
d none var/lib/tor 0755 daemon daemon
--- a/usr/src/pkgdefs/SUNWtss-root/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWtss-root/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,11 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 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.3 10/02/19 SMI"
-#
+#ident "@(#)prototype_com 1.4 10/04/22 SMI"
#
# This required package information file contains a list of package contents.
@@ -51,15 +49,14 @@
d none lib 0755 root bin
d none lib/svc 0755 root bin
+d none lib/svc/manifest 0755 root sys
+d none lib/svc/manifest/application 0755 root sys
+d none lib/svc/manifest/application/security 0755 root sys
+f manifest lib/svc/manifest/application/security/tcsd.xml 0444 root sys
d none lib/svc/method 0755 root bin
f none lib/svc/method/tcsd.sh 0555 root bin
d none var 0755 root sys
-d none var/svc 0755 root sys
-d none var/svc/manifest 0755 root sys
-d none var/svc/manifest/application 0755 root sys
-d none var/svc/manifest/application/security 0755 root sys
-f manifest var/svc/manifest/application/security/tcsd.xml 0444 root sys
d none var/tpm 0755 root sys
d none var/tpm/system 0700 root sys
--- a/usr/src/pkgdefs/SUNWwebminr/prototype_com Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwebminr/prototype_com Thu May 20 09:24:15 2010 -0700
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.8 10/02/22 SMI"
+#ident "@(#)prototype_com 1.9 10/04/22 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,12 +45,12 @@
# SUNWwebminr
#
d none etc 755 root sys
-d none var 755 root sys
-d none var/svc 755 root sys
-d none var/svc/manifest 755 root sys
-d none var/svc/manifest/application 755 root sys
-d none var/svc/manifest/application/management 755 root sys
-f manifest var/svc/manifest/application/management/webmin.xml 444 root sys
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/application 755 root sys
+d none lib/svc/manifest/application/management 755 root sys
+f manifest lib/svc/manifest/application/management/webmin.xml 444 root sys
d none etc/webmin 0700 root bin
#
# From the Webmin cmd directory proto_root
--- a/usr/src/tools/pkgtemplate.pl Sun May 09 20:32:17 2010 -0700
+++ b/usr/src/tools/pkgtemplate.pl Thu May 20 09:24:15 2010 -0700
@@ -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 "@(#)pkgtemplate.pl 1.1 08/03/26 SMI"
+#ident "@(#)pkgtemplate.pl 1.2 10/04/22 SMI"
#
use Getopt::Long;
@@ -46,7 +45,7 @@
open(CFD, "</var/sadm/install/contents");
- print("loading contents file");
+ print("loading contents file:");
while ($line = <CFD>) {
my ($entry) = ();
@@ -137,10 +136,9 @@
#
#
-# Copyright $year Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) $year, Oracle and/or its affiliates. All rights reserved.
#
-# ident \"@(#)pkgtemplate.pl 1.1 08/03/26 SMI\"
+# ident \"@(#)pkgtemplate.pl 1.2 10/04/22 SMI\"
#
" ;
@@ -163,7 +161,7 @@
MAXINST=\"1000\"
CATEGORY=\"system\"
DESC=\"$description\"
-VENDOR=\"SunMicrosystems, Inc.\"
+VENDOR=\"Sun Microsystems, Inc.\"
HOTLINE=\"Please contact your local service provider\"
EMAIL=\"\"
CLASSES=\"@classes\"