Import sfw build 142 sfwnv_142
authorCyril Plisko <cyril.plisko@grigale.com>
Fri, 11 Jun 2010 23:41:07 -0700
changeset 16 4481d72bca2d
parent 15 24b3ef38fbcd
child 17 4c6e1d5e1470
Import sfw build 142 Bugs Fixed ---------- 6394581 man pages for the tools from the package SUNWdvdrw are missing 6442414 manpage for growisofs missing first page and section number is wrong 6704068 SUNWlibmemcached RPATH & RUNPATH issue in snv_89 6906615 /usr/share/lib/ant/ant-junit.jar is non-functional 6921621 Samba login-cache problem on Sparc Architecture 6932289 growisofs goes into loop on multisession with SATA device on T5220, works with PATA device same HW 6947234 Update OpenLDAP to a newer release 6950477 would like to have coreutils 8.5 6952564 SER removal 6955426 RPATH and RUNPATH violations in mrtg package 6955845 Upgrade the mysql 5.0 bits to 5.0.91 6956538 tspi library unnecessarily linked with certain ON libraries
usr/src/Targetdirs
usr/src/cmd/Makefile
usr/src/cmd/coreutils/METADATA
usr/src/cmd/coreutils/Makefile.sfw
usr/src/cmd/coreutils/configure.patch
usr/src/cmd/coreutils/coreutils-7.4.tar.gz
usr/src/cmd/coreutils/coreutils-8.5.tar.gz
usr/src/cmd/coreutils/install-sfw
usr/src/cmd/dvd+rw-tools/METADATA
usr/src/cmd/dvd+rw-tools/Makefile.sfw
usr/src/cmd/dvd+rw-tools/Patches/manpages.diff
usr/src/cmd/dvd+rw-tools/build.patch
usr/src/cmd/dvd+rw-tools/dvd+rw-tools-5.21.4.10.8.tar.gz
usr/src/cmd/dvd+rw-tools/dvd+rw-tools-7.1.tar.gz
usr/src/cmd/dvd+rw-tools/install-dvd+rw-tools
usr/src/cmd/dvd+rw-tools/sunman-stability
usr/src/cmd/mrtg/Makefile.sfw
usr/src/cmd/mysql-5-0/METADATA
usr/src/cmd/mysql-5-0/mysql-5.0.86.tar.gz
usr/src/cmd/mysql-5-0/mysql-5.0.91.tar.gz
usr/src/cmd/openldap/METADATA
usr/src/cmd/openldap/Makefile.sfw
usr/src/cmd/openldap/install-openldap
usr/src/cmd/openldap/install-openldap64
usr/src/cmd/openldap/openldap-2.4.11.tgz
usr/src/cmd/openldap/openldap-2.4.21.tgz
usr/src/cmd/samba/Makefile.sfw
usr/src/cmd/samba/login_cache-diff
usr/src/cmd/ser/METADATA
usr/src/cmd/ser/Makefile.auth_diameter.patch
usr/src/cmd/ser/Makefile.defs.patch
usr/src/cmd/ser/Makefile.modules.patch
usr/src/cmd/ser/Makefile.mysql.patch
usr/src/cmd/ser/Makefile.patch
usr/src/cmd/ser/Makefile.rules.patch
usr/src/cmd/ser/Makefile.sfw
usr/src/cmd/ser/Makefile.sources.patch
usr/src/cmd/ser/Makefile.utils.patch
usr/src/cmd/ser/Makefile.vm.patch
usr/src/cmd/ser/Makefile.xlog.patch
usr/src/cmd/ser/README.solaris.ser
usr/src/cmd/ser/install-sfw
usr/src/cmd/ser/sc.patch
usr/src/cmd/ser/ser
usr/src/cmd/ser/ser-0.8.12.tar.gz
usr/src/cmd/ser/ser.8.patch
usr/src/cmd/ser/ser.cfg.5.patch
usr/src/cmd/ser/ser.cfg.patch
usr/src/cmd/ser/ser_mysql.sh.patch
usr/src/cmd/ser/sunman-stability
usr/src/cmd/serweb/METADATA
usr/src/cmd/serweb/Makefile.sfw
usr/src/cmd/serweb/README.solaris.serweb
usr/src/cmd/serweb/config.php.patch
usr/src/cmd/serweb/epilog.html
usr/src/cmd/serweb/index.php.patch
usr/src/cmd/serweb/install-sfw
usr/src/cmd/serweb/my_account.php.patch
usr/src/cmd/serweb/prolog.html
usr/src/cmd/serweb/separator.html
usr/src/cmd/serweb/serweb_2004-01-04.tar.gz
usr/src/cmd/serweb/sql_and_fifo_functions.php.patch
usr/src/cmd/vim/runtime.patch
usr/src/lib/Makefile
usr/src/lib/ant/Makefile.sfw
usr/src/lib/ant/build_xml.patch
usr/src/lib/libmemcached/Makefile.sfw
usr/src/lib/trousers/Patches/tspi_Makefile.am.patch
usr/src/pkgdefs/Makefile
usr/src/pkgdefs/SUNWant/prototype_com
usr/src/pkgdefs/SUNWdvdrw/pkginfo.tmpl
usr/src/pkgdefs/SUNWdvdrw/prototype_com
usr/src/pkgdefs/SUNWgnu-coreutils/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-coreutils/prototype_com
usr/src/pkgdefs/SUNWmysql5test/prototype_com
usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenldapr/prototype_com
usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenldapu/prototype_com
usr/src/pkgdefs/SUNWopenldapu/prototype_i386
usr/src/pkgdefs/SUNWopenldapu/prototype_sparc
usr/src/pkgdefs/SUNWserr/Makefile
usr/src/pkgdefs/SUNWserr/copyright
usr/src/pkgdefs/SUNWserr/pkginfo.tmpl
usr/src/pkgdefs/SUNWserr/prototype_com
usr/src/pkgdefs/SUNWserr/prototype_i386
usr/src/pkgdefs/SUNWserr/prototype_sparc
usr/src/pkgdefs/SUNWseru/Makefile
usr/src/pkgdefs/SUNWseru/copyright
usr/src/pkgdefs/SUNWseru/depend
usr/src/pkgdefs/SUNWseru/pkginfo.tmpl
usr/src/pkgdefs/SUNWseru/prototype_com
usr/src/pkgdefs/SUNWseru/prototype_i386
usr/src/pkgdefs/SUNWseru/prototype_sparc
usr/src/pkgdefs/SUNWserweb/Makefile
usr/src/pkgdefs/SUNWserweb/copyright
usr/src/pkgdefs/SUNWserweb/depend
usr/src/pkgdefs/SUNWserweb/pkginfo.tmpl
usr/src/pkgdefs/SUNWserweb/prototype_com
usr/src/pkgdefs/SUNWserweb/prototype_i386
usr/src/pkgdefs/SUNWserweb/prototype_sparc
--- a/usr/src/Targetdirs	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/Targetdirs	Fri Jun 11 23:41:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.253	10/04/27 SMI"
+# ident	"@(#)Targetdirs	1.254	10/06/09 SMI"
 #
 
 #
@@ -823,7 +823,6 @@
 	/usr/sfw/share/man/man1m \
 	/usr/sfw/share/man/man3 \
 	/usr/sfw/share/man/man4 \
-	/usr/sfw/share/man/man5 \
 	/usr/sfw/share/man/man7 \
 	/usr/sfw/share/man/man8 \
 	/usr/sfw/share/src \
@@ -1313,23 +1312,6 @@
 	/var/squid/cache \
 	/var/squid/logs \
 	/var/tomcat6 \
-	/usr/sfw/share/doc/ser \
-	/etc/sfw/ser  \
-	/usr/sfw/lib/ser \
-	/usr/sfw/lib/ser/modules \
-	/usr/sfw/share/serweb \
-	/usr/sfw/share/serweb/html \
-	/usr/sfw/share/serweb/html/admin \
-	/usr/sfw/share/serweb/html/admin/cron_job \
-	/usr/sfw/share/serweb/html/img \
-	/usr/sfw/share/serweb/html/img/butons \
-	/usr/sfw/share/serweb/html/img/preload \
-	/usr/sfw/share/serweb/html/img/tab \
-	/usr/sfw/share/serweb/html/img/title \
-	/usr/sfw/share/serweb/html/styles \
-	/usr/sfw/share/serweb/html/user_interface \
-	/usr/sfw/share/serweb/html/user_interface/reg \
-	/usr/sfw/share/serweb/phplib \
 	/usr/pgadmin3 \
 	/usr/pgadmin3/bin \
 	/usr/pgadmin3/share \
--- a/usr/src/cmd/Makefile	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/Makefile	Fri Jun 11 23:41:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.189	10/04/09 SMI"
+# ident	"@(#)Makefile	1.190	10/06/09 SMI"
 #
 
 #
@@ -201,8 +201,6 @@
 	sane-frontends \
 	sblim-wbemcli \
 	screen \
-	ser \
-	serweb \
 	sg3_utils \
 	shmux \
 	simplewbem \
@@ -269,7 +267,6 @@
 a2ps:	psutils ImageMagick
 foomatic-ppd:	gutenprint
 foomatic-db-engine:	foomatic-db
-ser:	mysql-5-1
 apr-util/apr-util-1.3: apr/apr-1.3 mysql-5-1 postgres/postgresql-8.3
 apache2: apr-util/apr-util-1.3
 apache2-modperl: apache2
--- a/usr/src/cmd/coreutils/METADATA	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/coreutils/METADATA	Fri Jun 11 23:41:07 2010 -0700
@@ -1,15 +1,12 @@
 NAME:             coreutils
-VERSION:          7.4
+VERSION:          8.5
 DESCRIPTION:      GNU Core Utilities
 LICENSE:          GPLv3
 PACKAGE:          SUNWgnu-coreutils
 PROJECT_URL:      http://ftp.gnu.org/gnu/coreutils/
-SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/coreutils/coreutils-7.4.tar.gz
+SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/coreutils/coreutils-8.5.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu-coreutils
 OSR:              11996
 COMMENTS:         
 su omitted, due to requirement that all userid-changing commands utilize PAM.
-
-
-
--- a/usr/src/cmd/coreutils/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/coreutils/Makefile.sfw	Fri Jun 11 23:41:07 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) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.3	09/07/30 SMI"
+# ident	"@(#)Makefile.sfw	1.4	10/05/27 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -40,7 +39,7 @@
 	@find . -name core -exec rm -f {} \;
 
 install: all
-	$(SHELL) ./install-sfw
+	VERS=$(COMPONENT_VERSION:sh) $(SHELL) ./install-sfw
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); env - \
@@ -54,6 +53,7 @@
 $(VER)/configure: $(ARCHIVE)
 	gunzip -c $(ARCHIVE) | tar xopf -
 	touch $(VER)/configure
+	(cd $(VER); patch -p0 < ../configure.patch)
 
 clean:
 	-rm -rf $(VER)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/coreutils/configure.patch	Fri Jun 11 23:41:07 2010 -0700
@@ -0,0 +1,47 @@
+--- configure.old	Wed May 26 14:38:12 2010
++++ configure	Wed May 26 14:38:16 2010
+@@ -53256,7 +53256,6 @@
+ }
+ fi
+ 
+-# Limit stdbuf to ELF systems with GCC
+ optional_pkglib_progs=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
+ $as_echo_n "checking whether this is an ELF system... " >&6; }
+@@ -53276,24 +53275,20 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
+ $as_echo "$elf_sys" >&6; }
+-if test "$elf_sys" = "yes" && \
+-   test "$GCC" = "yes"; then
+-  {
+-  if test -z "$optional_bin_progs"; then
+-    optional_bin_progs=stdbuf
+-  else
+-    optional_bin_progs="$optional_bin_progs stdbuf"
+-  fi
+-}
+-  {
+-  if test -z "$optional_pkglib_progs"; then
+-    optional_pkglib_progs=libstdbuf.so
+-  else
+-    optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
+-  fi
+-}
++
++if test -z "$optional_bin_progs"; then
++  optional_bin_progs=stdbuf
++else
++  optional_bin_progs="$optional_bin_progs stdbuf"
+ fi
+ 
++if test -z "$optional_pkglib_progs"; then
++  optional_pkglib_progs=libstdbuf.so
++else
++  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
++fi
++
++
+ ############################################################################
+ mk="$srcdir/src/Makefile.am"
+ # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
Binary file usr/src/cmd/coreutils/coreutils-7.4.tar.gz has changed
Binary file usr/src/cmd/coreutils/coreutils-8.5.tar.gz has changed
--- a/usr/src/cmd/coreutils/install-sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/coreutils/install-sfw	Fri Jun 11 23:41:07 2010 -0700
@@ -19,15 +19,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-sfw	1.2	09/07/30 SMI"
+#ident	"@(#)install-sfw	1.3	10/05/27 SMI"
 
 set +o errexit
 
-VERS=7.4
-
 GNUPREFIX=usr/gnu
 GNUBINDIR=${GNUPREFIX}/bin
 GNUSHAREDIR=${GNUPREFIX}/share
@@ -39,6 +36,7 @@
 
 PREFIX=${ROOT}/usr
 BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib
 SHAREDIR=${PREFIX}/share
 MANDIR=${SHAREDIR}/man
 MAN1DIR=${MANDIR}/man1
@@ -53,9 +51,9 @@
 
 # Binaries and manual pages
 
-CMDS_NONCONFLICTING="[ base64 dir dircolors ginstall md5sum pinky printenv \
-ptx readlink seq sha1sum sha224sum sha256sum sha384sum sha512sum shred \
-shuf stat tac timeout truncate users vdir whoami"
+CMDS_NONCONFLICTING="[ base64 dir dircolors ginstall md5sum nproc pinky \
+printenv ptx readlink seq sha1sum sha224sum sha256sum sha384sum sha512sum \
+shred shuf stat stdbuf tac timeout truncate users vdir whoami"
 
 for cmd in $CMDS_NONCONFLICTING; do
 	_install E ${cmd} ${BINDIR}/${cmd} 555
@@ -81,6 +79,12 @@
 	_install M ../man/${man} ${tgtdir}/${dman} 444
 done
 
+LIBS_NONCONFLICTING="libstdbuf.so"
+
+for lib in $LIBS_NONCONFLICTING; do
+	_install E ${lib} ${LIBDIR}/${lib} 555
+done
+
 CMDS_CONFLICTING_ELF="basename cat chgrp chmod chown chroot cksum comm \
 cp csplit cut date dd df dirname du echo env expand expr factor false \
 fmt fold head hostid id join kill link ln logname ls mkdir \
--- a/usr/src/cmd/dvd+rw-tools/METADATA	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/dvd+rw-tools/METADATA	Fri Jun 11 23:41:07 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             dvd+rw-tools
-VERSION:          5.21.4.10.8
+VERSION:          7.1
 DESCRIPTION:      support for burning DVDs on USB and many external burners
 LICENSE:          GPLv2
 PACKAGE:          SUNWdvdrw
 PROJECT_URL:      http://fy.chalmers.se/~appro/linux/DVD+RW
-SOURCE_DOWNLOAD:  http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-5.21.4.10.8.tar.gz
+SOURCE_DOWNLOAD:  http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/dvd+rw-tools
 OSR:              3691
--- a/usr/src/cmd/dvd+rw-tools/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/dvd+rw-tools/Makefile.sfw	Fri Jun 11 23:41:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,38 +18,31 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.7	08/08/04 SMI"
+# ident	"@(#)Makefile.sfw	1.8	10/05/21 SMI"
 #
 
-VER=dvd+rw-tools-5.21.4.10.8
-
 include ../Makefile.cmd
 
-all: $(VER)/unpack
-	(cd $(VER); env \
+VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+TARBALL =	$(COMPONENT_ARCHIVE:sh)
+PATCHES:sh =	echo Patches/*.diff
+GPATCH_FLAGS=	-p1
+
+all: $(VER)/$(SFW_STAMP_PATCHED)
+	(cd $(VER); env - \
 	    "CC=$(CC)" \
 	    CXX="$(CCC) -norunpath" \
 	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 	    "CFLAGS += -D_FILE_OFFSET_BITS=64" \
 	    PATH=$(SFW_PATH) \
-	    MAKE=$(CCSMAKE) \
 	    $(CCSMAKE) -e)
-	@find . -name core -exec rm -f {} \;
 
 test:	# there aren't any
 
 install: all
-	$(SH) ./install-dvd+rw-tools
-
-$(VER)/unpack: $(VER).tar.gz
-	gzip -dc $(VER).tar.gz | tar xopf -
-	gpatch -p0 < build.patch
-	touch $(VER)/configure
-	find $(VER) -type d -exec chmod 755 "{}" \;
-	find $(VER) -type f -exec chmod ugo+r "{}" \;
+	$(SH) ./install-dvd+rw-tools $(VER)
 
 clean:
 	-rm -rf $(VER)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/dvd+rw-tools/Patches/manpages.diff	Fri Jun 11 23:41:07 2010 -0700
@@ -0,0 +1,161 @@
+--- dvd+rw-tools-7.1.orig/dvd+rw-booktype.1
++++ dvd+rw-tools-7.1/dvd+rw-booktype.1
+@@ -0,0 +1,35 @@
++.TH dvd+rw-booktype 1 "September 2004, version 4.10"
++.SH NAME
++dvd+rw-booktype \- format DVD+-RW/-RAM disk with a logical format
++
++.SH SYNOPSIS
++.B dvd+rw\-booktype
++[\fB\-dvd\-rom\-spec | \-dvd+rw\-spec | \-dvd+r\-spec | \-inq\fP]
++[\fB\ \-media | \-unit| \-unit+rw | \-unit+r\fP]
++.I /dev/dvd
++
++.SH DESCRIPTION
++The
++.B dvd+rw\-booktype
++command formats dvd disk in the specified dvd
++drive (e.g. \fI/dev/dvd\fR) with a specified logical format.
++You can't expect this utility to work with all recorders.
++
++.SH OPTIONS
++.TP
++.BI \-dvd-rom
++This is useful for addressing
++.B DVD\-ROM compatibility,
++or playability in legacy units.
++
++.SH SEE ALSO
++Most up-to-date information on dvd+rw\-tools is available at
++http://fy.chalmers.se/~appro/linux/DVD+RW/.
++.PP
++The manpage for \fBgrowisofs\fP(1), \fBdvd-ram-control\fP(1),
++\fBdvd+rw\-mediainfo\fP(1), \fBdvd+rw\-format\fP(1).
++
++.SH AUTHOR
++\fBdvd+rw\-booktype\fR was written by Andy Polyakov <[email protected]>.
++This manual page was written by Osamu Aoki <[email protected]>
++for the Debian project.
+--- dvd+rw-tools-7.1.orig/dvd+rw-format.1
++++ dvd+rw-tools-7.1/dvd+rw-format.1
+@@ -0,0 +1,43 @@
++.TH dvd+rw-format 1 "September 2004"
++.SH NAME
++dvd+rw-format \- format DVD+-RW/-RAM disk
++
++.SH SYNOPSIS
++.B dvd+rw\-format
++[\fB\-force[=full]\fP]
++[\fB\-lead\-out | \-blank[=full]\fP]
++[\fB\-ssa[=none | default | max]\fP]
++.I /dev/dvd
++
++.SH DESCRIPTION
++The
++.B dvd+rw\-format
++command formats dvd disk in the specified dvd
++drive (e.g. \fI/dev/dvd\fR).
++
++.SH OPTIONS
++.TP
++.BI \-force[=full]
++This forces to format dvd as new while wiping any existing data.
++.TP
++.BI \-blank[=full]
++This blanks dvd while changing to sequential mode.
++.TP
++.BI \-lead\-out
++This relocates the lead\-out next to outermost written sector as well
++as makes sure there is no virgin surface before it. Previously written
++data is not affected by this operation. Useful for addressing
++.B DVD\-ROM compatibility,
++or playability of already recorded media in legacy units.
++
++.SH SEE ALSO
++Most up-to-date information on dvd+rw\-tools is available at
++http://fy.chalmers.se/~appro/linux/DVD+RW/.
++.PP
++The manpage for \fBgrowisofs\fP(1), \fBdvd-ram-control\fP(1),
++\fBdvd+rw\-mediainfo\fP(1), \fBdvd+rw\-booktype\fP(1).
++
++.SH AUTHOR
++\fBdvd+rw\-format\fR was written by Andy Polyakov <[email protected]>.
++This manual page was written by Osamu Aoki <[email protected]>
++for the Debian project.
+--- dvd+rw-tools-7.1.orig/dvd+rw-mediainfo.1
++++ dvd+rw-tools-7.1/dvd+rw-mediainfo.1
+@@ -0,0 +1,31 @@
++.TH dvd+rw-mediainfo 1 "April 2004"
++.SH NAME
++dvd+rw-mediainfo \- display information about dvd drive and disk
++
++.SH SYNOPSIS
++.B dvd+rw\-mediainfo
++.I /dev/dvd
++
++.SH DESCRIPTION
++The
++.B dvd+rw\-mediainfo
++command displays information about the drive and disk in the specified dvd
++drive (e.g. \fI/dev/dvd\fR). This is especially useful for debugging
++purposed and it is requested to include it's output when reporting bugs
++found in the \fBdvd+rw\-tools\fI package.
++
++.SH OPTIONS
++.TP
++This program does not accept any command line options.
++
++.SH SEE ALSO
++Most up-to-date information on dvd+rw\-tools is available at
++http://fy.chalmers.se/~appro/linux/DVD+RW/.
++.PP
++The manpage for \fBgrowisofs\fP(1), \fBdvd-ram-control\fP(1),
++\fBdvd+rw\-format\fP(1), \fBdvd+rw\-booktype\fP(1).
++
++.SH AUTHOR
++\fBdvd+rw\-mediainfo\fR was written by Andy Polyakov <[email protected]>.
++This manual page was written by Thomas Viehmann <[email protected]>
++for the Debian project.
+--- dvd+rw-tools-7.1.orig/dvd-ram-control.1
++++ dvd+rw-tools-7.1/dvd-ram-control.1
+@@ -0,0 +1,40 @@
++.TH dvd-ram-control 1 "May 2010, version 7.1"
++.SH NAME
++dvd-ram-control \- Control DVD-RAM disk modes and protection
++
++.SH SYNOPSIS
++.B dvd-rw\-control
++[\fB\-arre\fP] [\fB\-awre\fP] [\fB\-rdonly|-rdwr\fP] /dev/dvd
++
++.SH DESCRIPTION
++The
++.B dvd-ram-control
++command controls DVD-RAM disk modes of block reallocations and write
++protections. This utility will work only with DVD-RAM recorders.
++
++.SH OPTIONS
++.TP
++.BI \-arre
++Sets automatic read reallocation enabled (ARRE) bit so that automatic
++reallocation of defective data blocks is used during read operation.
++.TP
++.BI \-awre
++Sets automatic write reallocation enabled (AWRE) bit so that automatic
++reallocation of defective data blocks is used during write operations.
++.TP
++.BI \-rdonly
++Makes disc to be write protected.
++.TP
++.BI \-rdwr
++Makes disc to be unprotected.
++
++
++.SH SEE ALSO
++Most up-to-date information on dvd+rw\-tools is available at
++http://fy.chalmers.se/~appro/linux/DVD+RW/.
++.PP
++The manpage for \fBgrowisofs\fP(1), \fBdvd+rw\-booktype\fP(1),
++\fBdvd+rw\-mediainfo\fP(1), \fBdvd+rw\-format\fP(1).
++
++.SH AUTHOR
++\fBdvd+rw\-booktype\fR was written by Andy Polyakov <[email protected]>.
Binary file usr/src/cmd/dvd+rw-tools/dvd+rw-tools-5.21.4.10.8.tar.gz has changed
Binary file usr/src/cmd/dvd+rw-tools/dvd+rw-tools-7.1.tar.gz has changed
--- a/usr/src/cmd/dvd+rw-tools/install-dvd+rw-tools	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/dvd+rw-tools/install-dvd+rw-tools	Fri Jun 11 23:41:07 2010 -0700
@@ -20,14 +20,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)install-dvd+rw-tools	1.6	07/04/27 SMI"
+# ident	"@(#)install-dvd+rw-tools	1.7	10/05/21 SMI"
 #
-VERS=5.21.4.10.8
-
-PKGVERS=dvd+rw-tools-${VERS}
+PKGVERS=$1
 PREFIX=${ROOT}/usr
 BINDIR=${PREFIX}/bin
 SHAREDIR=${PREFIX}/share
@@ -41,7 +38,8 @@
 
 MANSCRIPT=sunman-stability
 
-for manpage in growisofs.1
+for manpage in dvd+rw-booktype.1 dvd+rw-format.1 dvd+rw-mediainfo.1 \
+	       dvd-ram-control.1 growisofs.1
 do
 	mandir=${SHAREDIR}/man/man1
 	_install M ${PKGVERS}/${manpage} ${mandir}/${manpage} 444
--- a/usr/src/cmd/dvd+rw-tools/sunman-stability	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/dvd+rw-tools/sunman-stability	Fri Jun 11 23:41:07 2010 -0700
@@ -3,8 +3,8 @@
 \.\\"\
 \.\\" Modified for Solaris to to add the Solaris stability classification\
 \.\\" and to add a note about source availability.\
-\.\\"\
-
+\.\\"\ 
+s/.TH GROWISOFS 1m/.TH GROWISOFS 1/
 $a\
 \.\\" Begin Sun update\
 .SH ATTRIBUTES\
@@ -16,15 +16,14 @@
 box;\
 cbp-1 | cbp-1\
 l | l .\
-ATTRIBUTE TYPE  ATTRIBUTE VALUE\
+ATTRIBUTE TYPE	ATTRIBUTE VALUE\
 =\
-Availability    media/dvd+rw-tools\
+Availability	media/dvd+rw-tools\
 =\
-Interface Stability     Unstable\
+Interface Stability	Uncommitted\
 .TE \
 .PP\
 .SH NOTES\
 This utility is part of dvd+rw-tools.\
 The source for dvd+rw-tools is available on http://opensolaris.org.\
-http://fy.chalmers.se/~appro/linux/DVD+RW \
 \.\\" End Sun update
--- a/usr/src/cmd/mrtg/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/mrtg/Makefile.sfw	Fri Jun 11 23:41:07 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	"@(#)Makefile.sfw	1.3	09/08/23 SMI"
+# ident	"@(#)Makefile.sfw	1.4	10/06/01 SMI"
 #
 
 VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -33,7 +32,6 @@
 include ../Makefile.cmd
 
 # configure(1) options to use
-CONFIGURE_OPTIONS +=	--with-gd=/usr/include/gd2
 CONFIGURE_OPTIONS +=	--with-gd-lib=/usr/lib
 CONFIGURE_OPTIONS +=	--with-gd-inc=/usr/include/gd2
 
--- a/usr/src/cmd/mysql-5-0/METADATA	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/mysql-5-0/METADATA	Fri Jun 11 23:41:07 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             mysql
-VERSION:          5.0.86
+VERSION:          5.0.91
 DESCRIPTION:      MySQL Database
 LICENSE:          GPLv2
 PACKAGE:          SUNWmysql5r SUNWmysql5u SUNWmysql5test
 PROJECT_URL:      http://www.mysql.org/
-SOURCE_DOWNLOAD:  http://opensource.become.com/mysql/Downloads/MySQL-5.0/mysql-5.0.86.tar.gz
+SOURCE_DOWNLOAD:  http://opensource.become.com/mysql/Downloads/MySQL-5.0/mysql-5.0.91.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/database/mysql
 OSR:              7205
Binary file usr/src/cmd/mysql-5-0/mysql-5.0.86.tar.gz has changed
Binary file usr/src/cmd/mysql-5-0/mysql-5.0.91.tar.gz has changed
--- a/usr/src/cmd/openldap/METADATA	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/openldap/METADATA	Fri Jun 11 23:41:07 2010 -0700
@@ -1,17 +1,17 @@
 NAME:             OpenLDAP
-VERSION:          2.4.11
+VERSION:          2.4.21
 DESCRIPTION:      Open LDAP server
 LICENSE:          OpenLDAP, Oracle, Other
 PACKAGE:          SUNWopenldapr SUNWopenldapu
 PROJECT_URL:      http://www.openldap.org/
-SOURCE_DOWNLOAD:  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.11.tgz
+SOURCE_DOWNLOAD:  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.21.tgz
 SUPPORT:          C
 BUGTRAQ:          solaris/ldap/openldap
 OSR:              9145
 COMMENTS:         
 	LFI#146318
+	PSARC	2008/507 2010/180
 
 
 
 
-
--- a/usr/src/cmd/openldap/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/openldap/Makefile.sfw	Fri Jun 11 23:41:07 2010 -0700
@@ -18,18 +18,17 @@
 #
 # 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/06/04 SMI"
+# ident	"@(#)Makefile.sfw	1.4	10/06/02 SMI"
 #
 
 include ../Makefile.cmd
 
 # Library subversion number
-LVER=2.1.0
+LVER=2.5.4
 # release version number
-VER=openldap-2.4.11
+VER=openldap-2.4.21
 VER64=${VER}-64
 VERP=/usr/openldap/2.4
 BDB=bdb-4.5.20.b
@@ -45,8 +44,8 @@
 SDF=${SDFVER}/blib/script/sdf
 SDFBLIB=../../../../${SDFVER}/blib
 
-CFLAGS += -mt -xstrconst -ztext -zdefs -Bdirect
-CFLAGS64 += -mt -xstrconst -ztext -zdefs -Bdirect
+CFLAGS += -mt -xstrconst -ztext -zdefs -Bdirect -W2,-Rcond_elim
+CFLAGS64 += -mt -xstrconst -ztext -zdefs -Bdirect -W2,-Rcond_elim
 LDFLAGS = -L${ROOT}/lib -L${ROOT}/usr/lib -lumem -L${BDBLP} \
     -L${ROOT}/usr/sfw/lib -L/usr/sfw/lib -R/usr/sfw/lib
 LDFLAGS64 = -L${ROOT}/lib/${MACH64} -L${ROOT}/usr/lib/${MACH64} \
@@ -96,12 +95,14 @@
 
 test32:	all32
 	(cd $(VER); env \
+	    LD_LIBRARY_PATH=${ROOT}/usr/lib \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) test)
 
 test64:	all64
 	(cd $(VER64); env \
+	    LD_LIBRARY_PATH=${ROOT}/usr/lib/${MACH64} \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) test)
--- a/usr/src/cmd/openldap/install-openldap	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/openldap/install-openldap	Fri Jun 11 23:41:07 2010 -0700
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-openldap	1.5	10/04/22 SMI"
+#ident	"@(#)install-openldap	1.6	10/06/02 SMI"
 
 # VERS should be provided on command line or set in environment
 if [ $# -ge 2 ]; then
@@ -74,7 +73,7 @@
 ## Client Tools
 cd clients/tools
 for i in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn \
-	ldappasswd ldapsearch ldapwhoami
+	ldappasswd ldapsearch ldapwhoami ldapurl
 do
 	setrunpath ${i}
 	_install E ${i} ${BINDIR}/${CPREFIX}${i} 555
@@ -152,7 +151,8 @@
 setrunpath servers/slapd/slapd
 _install E servers/slapd/slapd ${LIBEXECDIR}/slapd 555
 cd ${SBINDIR}
-for i in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest
+for i in slapacl slapadd slapauth slapcat slapdn slapindex \
+	slappasswd slapschema slaptest
 do
 	_install L ../lib/slapd ${i} 555
 done
--- a/usr/src/cmd/openldap/install-openldap64	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/openldap/install-openldap64	Fri Jun 11 23:41:07 2010 -0700
@@ -19,13 +19,11 @@
 #
 # 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.
 #
 # Install BIND's objects into the proto area ready for packaging.
 #
-# ident	"@(#)install-openldap64	1.2	08/10/27 SMI"
+# ident	"@(#)install-openldap64	1.3	10/06/02 SMI"
 
 # VERS should be provided on command line or set in environment
 if [ $# -ge 2 ]; then
@@ -87,7 +85,7 @@
 ## Client Tools
 cd clients/tools
 for i in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn \
-	ldappasswd ldapsearch ldapwhoami
+	ldappasswd ldapsearch ldapwhoami ldapurl
 do
 	setrunpath ${i}
 	_install E ${i} ${BINDIR}/${CPREFIX}${i} 555
@@ -137,7 +135,8 @@
 setrunpath servers/slapd/slapd
 _install E servers/slapd/slapd ${LIBEXECDIR}/slapd 555
 cd ${SBINDIR}
-for i in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest
+for i in slapacl slapadd slapauth slapcat slapdn slapindex \
+	slappasswd slapschema slaptest
 do
 	_install L ../../lib/${MACH64}/slapd ${i} 555
 done
Binary file usr/src/cmd/openldap/openldap-2.4.11.tgz has changed
Binary file usr/src/cmd/openldap/openldap-2.4.21.tgz has changed
--- a/usr/src/cmd/samba/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/samba/Makefile.sfw	Fri Jun 11 23:41:07 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) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.35	09/10/05 SMI"
+#ident	"@(#)Makefile.sfw	1.36	10/06/07 SMI"
 
 SAMBAVER=samba-3.0.37
 
@@ -113,6 +112,7 @@
 	(cd $(SAMBAVER) ; gpatch -p1 < ../swat.c-diff \
 	 ; gpatch -p1 < ../configure.in-diff \
 	 ; gpatch -p1 < ../makefile.in-diff \
+	 ; gpatch -p1 < ../login_cache-diff \
 	 ; cp ../vfs_zfsacl.c source/modules/ )
 	# samfs support
 	(cd $(SAMBAVER) ; gpatch -p1 < ../samfs-configure.in-diff \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/login_cache-diff	Fri Jun 11 23:41:07 2010 -0700
@@ -0,0 +1,32 @@
+--- samba-3.0.37/source/passdb/login_cache.c	Thu Mar 11 04:54:39 2010
++++ samba-3.0.37-new/source/passdb/login_cache.c	Wed Mar 17 04:37:18 2010
+@@ -68,6 +68,7 @@
+ {
+ 	TDB_DATA keybuf, databuf;
+ 	LOGIN_CACHE *entry;
++	uint16_t acct_ctrl;
+ 
+ 	if (!login_cache_init())
+ 		return NULL;
+@@ -95,7 +96,7 @@
+ 	}
+ 
+ 	if (tdb_unpack (databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
+-			&entry->entry_timestamp, &entry->acct_ctrl, 
++			&entry->entry_timestamp, &acct_ctrl, 
+ 			&entry->bad_password_count, 
+ 			&entry->bad_password_time) == -1) {
+ 		DEBUG(7, ("No cache entry found\n"));
+@@ -106,6 +107,12 @@
+ 
+ 	SAFE_FREE(databuf.dptr);
+ 
++	/*
++	 * Deal with 32-bit acct_ctrl. In the tdb we only store 16-bit
++	 * ("w" in SAM_CACHE_FORMAT). Fixes bug 7253.
++	 */
++	entry->acct_ctrl = acct_ctrl;
++
+ 	DEBUG(5, ("Found login cache entry: timestamp %12u, flags 0x%x, count %d, time %12u\n",
+ 		  (unsigned int)entry->entry_timestamp, entry->acct_ctrl, 
+ 		  entry->bad_password_count, (unsigned int)entry->bad_password_time));
--- a/usr/src/cmd/ser/METADATA	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             ser
-VERSION:          0.8.12
-DESCRIPTION:      configurable, free SIP (RFC3261) server
-LICENSE:          GPLv2
-PACKAGE:          SUNWserr SUNWseru
-PROJECT_URL:      http://www.iptel.org/ser
-SOURCE_DOWNLOAD:  http://ftp.iptel.org/pub/ser/0.8.12/src/ser-0.8.12.tar.gz
-SUPPORT:          C
-BUGTRAQ:          solaris/network/sip
-OSR:              2200
-COMMENTS:         
--- a/usr/src/cmd/ser/Makefile.auth_diameter.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-*** Makefile	Fri May 21 07:33:31 2004
---- Makefile.modified	Fri May 21 07:33:22 2004
-***************
-*** 5,10 ****
---- 5,11 ----
-  # 
-  # WARNING: do not run this directly, it should be run by the master Makefile
-  
-+ include ../../Makefile.defs
-  auto_gen=
-  NAME=auth_diameter.so
-  #LIBS=-Llib -ldiameter_msg
--- a/usr/src/cmd/ser/Makefile.defs.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,814 +0,0 @@
-*** Makefile.defs	Fri May 21 07:01:03 2004
---- Makefile.defs.modified	Fri May 21 08:16:22 2004
-***************
-*** 1,753 ****
-! # $Id: Makefile.defs,v 1.244.2.10 2003/11/20 10:57:22 andrei Exp $
-! #
-! # makefile defs (CC, LD,a.s.o)
-! #
-! # Environment variables:
-! #   PREFIX, LOCALBASE, BASEDIR
-! #   INSTALL, TAR , CC, LEX, YACC,
-! #   CPU, CC_EXTRA_OPTS,
-! #   exclude_modules, skip_modules, include_modules
-! #   extra_defs
-! #
-! # History:
-! # --------
-! #              created by andrei
-! #  2003-02-24  added LOCALBASE, fixed doc-dir for freebsd - patch provided
-! #               by Maxim Sobolev <[email protected]>
-! #  2003-02-25  added -DDISABLE_NAGLE (andrei)
-! #  2003-03-02  added -DDIGEST_DOMAIN (janakj)
-! #  2003-03-10  added -xcode=pic32 for module compilation w/ sun cc
-! #               (too many symbols for pic13)  (andrei)
-! #  2003-04-16  added CC_EXTRA_OPTS, s/march/mcpu, added CPU (cpu to optimize 
-! #               for, used only with gcc-3.x) (andrei)
-! #  2003-05-23  check if this makefile was already included (andrei)
-! #              removed -DDIGEST_DOMAIN (andrei)
-! #  2003-05-30  added extra_defs (andrei)
-! #  2003-06-06  moved compiler detection before DEFS (andrei)
-! #  2003-06-10  removed -m32 for gcc 3.x/sparc64  -- it will use 
-! #              arch. default: -m32 on solaris, -m64 on *bsd (andrei)
-! #  2003-09-25  added -pthread into LIBS when compiling on FreeBSD/alpha
-! #              and other FreeBSD arches for which no fast locking assembly
-! #              code exists (sobomax)
-! #  2003-11-08  mips1 support introduced (andrei)
-  
-  
-! # check if already included/exported
-  
-! ifeq ($(makefile_defs), 1)
-! else
-! makefile_defs=1
-! export makefile_defs
-  
-- 
-- #version number
-  VERSION = 0
-  PATCHLEVEL = 8
-! SUBLEVEL =   12
-! EXTRAVERSION = 
-  
-! RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-! OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
-! ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
-! 			-e s/armv4l/arm/)
-  
-! # TLS support
-! TLS ?= 
-! ifneq ($(TLS),)
-! 	RELEASE:=$(RELEASE)-tls
-! endif
-! # extra CC command line options (e.g  -march=athlon-mp)
-! CC_EXTRA_OPTS ?=
-!  # install location
-! DESTDIR ?= /usr/local
-! PREFIX ?= $(DESTDIR)
-! LOCALBASE ?= /usr/local
-! prefix = $(PREFIX)
-! # install path is $(basedir) $(prefix) 
-! # example:
-! #  creating a bin. archive in /tmp, which unpacks in /usr/local
-! #  basedir=/tmp
-! #  prefix=/usr/local
-  
-! BASEDIR ?=
-! basedir = $(BASEDIR)
-! # install prefixes for various stuff
-! cfg-prefix = $(basedir)$(prefix)
-! bin-prefix = $(basedir)$(prefix)
-! modules-prefix = $(basedir)$(prefix)
-! doc-prefix = $(basedir)$(prefix)
-! man-prefix = $(basedir)$(prefix)
-! ut-prefix = $(basedir)$(prefix)
-  
-! # dirs
-! cfg-dir = etc/ser/
-! bin-dir = sbin/
-! modules-dir = lib/ser/modules/
-! ifeq ($(OS), linux)
-! 	doc-dir = share/doc/ser/
-! 	man-dir = share/man/
-! else
-! ifeq ($(OS), freebsd)
-! 	doc-dir = share/doc/ser/
-! 	man-dir = man/
-! else
-! ifeq ($(OS), openbsd)
-! 	doc-dir = share/doc/ser/
-! 	man-dir = man/
-! else
-! ifeq ($(OS), netbsd)
-! 	doc-dir = share/doc/ser
-! 	man-dir = man/
-! else
-! 	doc-dir = doc/ser/
-! 	man-dir = man/
-! endif
-! endif
-! endif
-! endif
-! ut-prefix = bin/
-! # target dirs for various stuff
-! cfg-target = $(prefix)/$(cfg-dir)
-! modules-target = $(prefix)/$(modules-dir)
-  
-  
-! ifeq ($(OS), solaris)
-! #use GNU versions
-! INSTALL ?= ginstall
-! TAR ?= gtar
-! else
-! INSTALL ?= install 
-! TAR ?= tar
-! endif
-  
-! INSTALL-TOUCH = touch          # used to create the file first (good to 
-!                                #  make solaris install work)
-! # INSTALL-CFG = $(INSTALL) -m 644
-! INSTALL-BIN = $(INSTALL) -m 755
-! INSTALL-MODULES = $(INSTALL) -m 755
-! INSTALL-DOC = $(INSTALL) -m 644
-! INSTALL-MAN = $(INSTALL) -m 644
-  
-! #set some vars from the environment (and not make builtins)
-! CC   := $(shell echo "$${CC}")
-! LEX  := $(shell echo "$${LEX}")
-! YACC := $(shell echo "$${YACC}")
-  
-! 
-! 
-! 
-! # find compiler name & version
-! ifeq ($(CC),)
-! 	CC=gcc
-! endif
-! LD= $(CC)
-! CC_LONGVER=$(shell if  $(CC) -v 2>/dev/null; then \
-! 						$(CC) -v 2>&1 ;\
-! 					else \
-! 						$(CC) -V 2>&1 ; \
-! 					fi )
-! MKTAGS=ctags -R .
-! 
-! #find-out the compiler's name
-! 
-! ifneq (,$(findstring gcc, $(CC_LONGVER)))
-! 	CC_NAME=gcc
-! 	CC_VER=$(CC) $(shell $(CC) --version|head -1| \
-! 				 sed -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
-! 	# sun sed is a little brain damaged => this complicated expression
-! 	MKDEP=$(CC) -MM 
-! 	#transform gcc version into 2.9x or 3.0
-! 	CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
-! 				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \
-! 				 sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
-! 				 	's/3\../3.0/')
-! endif
-! 
-! ifneq (, $(findstring Sun, $(CC_LONGVER)))
-! 	CC_NAME=suncc
-! 	CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -1| \
-! 					sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g' )
-! 	CC_VER=$(CC) $(CC_SHORTVER)
-! 	MKDEP=$(CC) -xM1 
-! endif
-! 
-! ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER)))
-! 	# very nice: gcc compatible
-! 	CC_NAME=icc
-! 	CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -1| \
-! 					sed -e 's/.*Version \([0-9]\.[0-9]\.[0-9]*\).*/\1/g' )
-! 	CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
-! 	CC_VER=$(CC) $(CC_FULLVER)
-! 	MKDEP=$(CC) -MM 
-! endif
-! 
-! 
-! ifeq (,$(CC_NAME))
-! #not found
-! 	CC_NAME=$(CC)
-! 	CC_SHORTVER=unknown
-! 	CC_VER=unknown
-! 	MKDEP=gcc -MM 
-! $(warning	Unknown compiler $(CC)\; supported compilers: \
-! 			gcc, sun cc, intel icc )
-! endif
-! 
-! 
-! # compile-time options
-! #
-! # -DSTATS
-! #		allows to print out number of packets processed on CTRL-C;
-! # 		implementation still nasty and reports per-process
-! # -DNO_DEBUG
-! #		turns off some of the debug messages (DBG(...)).
-! # -DNO_LOG
-! #		completely turns of all the logging (and DBG(...))
-! # -DEXTRA_DEBUG
-! #		compiles in some extra debugging code
-! # -DDNS_IP_HACK
-! #		faster ip address resolver for ip strings (e.g "127.0.0.1")
-! # -DSHM_MEM
-! #		compiles in shared mem. support, needed by some modules and
-! #		by USE_SHM_MEM
-! # -DSHM_MMAP
-! #		use mmap instead of SYSV shared memory
-! # -DPKG_MALLOC
-! #		uses a faster malloc (exclusive w/ USE_SHM_MEM)
-! # -DUSE_SHM_MEM
-! #		all pkg_malloc => shm_malloc (most mallocs use a common sh.
-! #		mem. segment); don't define PKG_MALLOC if you want this!
-! # -DDBG_QM_MALLOC
-! #		qm_malloc debug code, will cause pkg_malloc and shm_malloc
-! #		to keep and display lot of debuging information: file name,
-! #		function, line number of malloc/free call for each block,
-! #		extra error checking (trying to free the same pointer
-! #		twice, trying to free a pointer alloc'ed with a different
-! #		malloc etc.)
-! # -DVQ_MALLOC
-! #		additional option to PKG_MALLOC which utilizes a fater then
-! #		qm version
-! #		(not true anymore, q_malloc performs approx. the same)
-! # -DF_MALLOC
-! #		an even faster malloc, not recommended for debugging
-! # -DDBG_MALLOC
-! #		issues additional debugging information if lock/unlock is called
-! # -DFAST_LOCK
-! #		uses fast arhitecture specific locking (see the arh. specific section)
-! # -DUSE_SYSV_SEM
-! #		uses sys v sems for locking (slower & limited number)
-! # -DUSE_PTHREAD_MUTEX
-! #		uses pthread mutexes, faster than sys v or posix sems, but do not 
-! #		work on all systems inter-processes (e.g. linux)
-! # -DUSE_POSIX_SEM
-! #		uses posix semaphores for locking (faster than sys v)
-! # -DBUSY_WAIT
-! #		uses busy waiting on the lock (FAST_LOCK)
-! # -DADAPTIVE_WAIT
-! #		try busy waiting for a while and if the lock is still held go to
-! #		force reschedule (FAST_LOCK)
-! # -DADAPTIVE_WAIT_LOOPS=number
-! #		number of loops we busy wait, after "number" loops have elapsed we 
-! #		force a reschedule (FAST_LOCK)
-! # -DNOSMP
-! #		don't use smp compliant locking (faster but won't work on SMP machines)
-! #		(not yet enabled) (FAST_LOCK)
-! # -DNO_PINGTEL_TAG_HACK
-! #		if enabled, To-header-field will be less liberal and will not accept
-! #		'tag=' (tag parameter with equal sign and without value); it is called
-! #		this way because such message was sighted from a Pingtel phone
-! # -DWITH_SNMP_MOD
-! #  		if enabled, allows forking of the snmp agent just before child
-! #  		forking (done at the top of main_loop). Needed if you want
-! #  		to use the snmp module.
-! # -DUSE_TCP
-! #		compiles in tcp support
-! # -DDISABLE_NAGLE
-! #		disable the tcp Nagle algorithm (lower delay)
-! # -DUSE_TLS
-! #		compiles in tls support, requires -DUSE_TCP. Please use
-! #		make TLS=1 instead. (tls support is highly experimental for now)
-! 
-! 
-! DEFS+= $(extra_defs) \
-! 	 -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
-! 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
-! 	 -DCFG_DIR='"$(cfg-target)"'\
-! 	 -DPKG_MALLOC \
-! 	 -DSHM_MEM  -DSHM_MMAP \
-! 	 -DDNS_IP_HACK \
-! 	 -DUSE_IPV6 \
-! 	 -DUSE_TCP \
-! 	 -DDISABLE_NAGLE \
-! 	 -DF_MALLOC \
-! 	# -DDBG_QM_MALLOC \
-! 	# -DDBG_QM_MALLOC \
-! 	# -DF_MALLOC \
-! 	# -DDBG_F_MALLOC \
-! 	# -DDBG_QM_MALLOC \
-! 	 #-DF_MALLOC \
-! 	 #-DNO_DEBUG \
-! 	 #-DNO_LOG
-! 	 #-DEXTRA_DEBUG \
-! 	 #-DDBG_QM_MALLOC \
-! 	 #-DVQ_MALLOC  
-! 	 #-DCONTACT_BUG
-! 	 #-DDBG_LOCK
-! 	 #-DNOSMP \
-! 	 #-DEXTRA_DEBUG \
-! 	 #-DUSE_SHM_MEM \
-! 	 #-DSTATS \
-! 	 #-DWITH_SNMP_MOD \
-! 	 #-DNO_LOG
-! 
-! #PROFILE=  -pg #set this if you want profiling
-! 
-! # WARNING: do not add mode=debug or mode=release anymore in the Makefile,
-! # use make mode=debug all instead. Anyway no by default ser is  compiled w/ 
-! # debugging symbols in all cases (-g). --andrei
-! 
-! ifneq ($(TLS),)
-! 	DEFS+= -DUSE_TLS
-! endif
-! 
-! ifeq ($(mode),)
-! 	mode = release
-! endif
-! 
-! ifeq ($(mode),debug)
-! 	DEFS+= -DEXTRA_DEBUG
-! endif
-! 
-! # platform dependent settings
-! 
-! # find ld & as name (gnu or solaris)
-! ifeq ($(ARCH), sparc64)
-! ifeq ($(CC_NAME), gcc)
-! 		LDGCC=$(shell $(CC) -v 2>&1 | grep with-ld| \
-! 				   sed -e 's/.*--with-ld=\([^ ][^ ]*\).*/\1/' )
-! 		ASGCC=$(shell $(CC) -v 2>&1 | grep with-as| \
-! 				   sed -e 's/.*--with-as=\([^ ][^ ]*\).*/\1/' )
-! 		LDPATH=$(shell  if [ -z "$(LDGCC)" ] ; then echo "ld" ;\
-! 						else \
-! 						if $(LDGCC) -V 2>/dev/null 1>/dev/null; then \
-! 							echo $(LDGCC); \
-! 						else echo "ld" ; \
-! 						fi\
-! 						fi)
-! 		ASPATH=$(shell  if [ -z "$(ASGCC)" ] ; then echo "as" ;\
-! 						else \
-! 						if $(ASGCC) -V 2>/dev/null 1>/dev/null; then \
-! 							echo $(ASGCC); \
-! 						else echo "as" ; \
-! 						fi\
-! 						fi)
-! 							
-! 		LDTYPE=$(shell if $(LDPATH) -V 1>/dev/null  2>/dev/null; then \
-! 							if $(LDPATH) -V 2>&1|grep GNU >/dev/null; \
-! 							then echo gnu; \
-! 							else \
-! 							if $(LDPATH) -V 2>&1|grep Solaris >/dev/null;\
-! 							then echo solaris; \
-! 							else \
-! 								echo unknown ; \
-! 							fi \
-! 							fi \
-! 						fi)
-! 		ASTYPE=$(shell if $(ASPATH) -V 1>/dev/null  2>/dev/null </dev/null; \
-! 						then \
-! 							if $(ASPATH) -V 2>&1 </dev/null |grep GNU >/dev/null; \
-! 							then echo gnu; \
-! 							else \
-! 							if $(ASPATH) -V 2>&1 </dev/null |grep Sun >/dev/null;\
-! 							then echo solaris; \
-! 							else \
-! 								echo unknown ; \
-! 							fi \
-! 							fi \
-! 						fi)
-! #$(warning "using ld=$(LDPATH)/$(LDTYPE), as=$(ASPATH)/$(ASTYPE)")
-! 
-! endif
-! endif
-! 
-! # arh. specific definitions
-! ifeq ($(ARCH), i386)
-! 	use_fast_lock=yes
-! endif
-! 
-! ifeq ($(ARCH), sparc64)
-! ifeq 	($(CC_NAME), gcc)
-! 	use_fast_lock=yes
-! endif
-! endif
-! 
-! ifeq ($(ARCH), arm)
-! 	use_fast_lock=yes
-! endif
-! 
-! ifeq ($(ARCH), ppc)
-! 	use_fast_lock=yes
-! endif
-! 
-! ifeq ($(ARCH), mips)
-! # mips1 arch. (e.g. R3000) - no hardware locking support
-! 	use_fast_lock=no
-! endif
-! 
-! ifeq ($(use_fast_lock), yes)
-! 	DEFS+= -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 
-! 	found_lock_method=yes
-! endif
-! 
-! CFLAGS=
-! LDFLAGS=
-! # setting CFLAGS
-! ifeq ($(mode), release)
-! 	#if i386
-! ifeq	($(ARCH), i386)
-! 		# if gcc 
-! ifeq		($(CC_NAME), gcc)
-! 				#common stuff
-! 				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE) \
-! 					-Wall   \
-! 			#if gcc 3.0
-! ifeq			($(CC_SHORTVER), 3.0)
-! 					CPU ?= athlon
-! 					CFLAGS+=-minline-all-stringops -malign-double \
-! 							-falign-loops \
-! 							-mcpu=$(CPU) \
-! 							#-mcpu=athlon
-! else
-! ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
-! $(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
-! 					for better results)
-! 					
-! 					CFLAGS+=-m486 \
-! 							-malign-loops=4
-! else
-! 				#really old version
-! $(warning			You are using an old and unsupported gcc \
-! 					 version  ($(CC_SHORTVER)), compile at your own risk!)
-! 
-! endif			# CC_SHORTVER, 2.9x
-! endif			# CC_SHORTVER, 3.0
-! 
-! else		# CC_NAME, gcc
-! ifeq		($(CC_NAME), icc)
-! 			CFLAGS=-g -O3  -ipo -ipo_obj -unroll  $(PROFILE) \
-! 					 -tpp6 -xK  #-openmp  #optimize for PIII 
-! 				# -prefetch doesn't seem to work
-! 				#( ty to inline acroos files, unroll loops,prefetch,
-! 				# optimize for PIII, use PIII instructions & vect.,
-! 				# mutlithread loops)
-! else
-! 				#other compilers
-! $(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
-! endif		#CC_NAME, icc
-! endif		#CC_NAME, gcc
-! endif	#ARCH, i386
-! 
-! 
-! 	#if sparc
-! ifeq	($(ARCH), sparc64)
-! 			#if gcc
-! ifeq		($(CC_NAME), gcc)
-! 				#common stuff
-! 				CFLAGS=-g -O9 -funroll-loops  $(PROFILE) \
-! 					-Wall\
-! 					#-Wcast-align \
-! 					#-Wmissing-prototypes 
-! 				#if gcc 3.0
-! ifeq			($(CC_SHORTVER), 3.0)
-! 					CPU ?= ultrasparc
-! 					#use 32bit for now
-! 					CFLAGS+= -mcpu=ultrasparc -mtune=$(CPU)   \
-! 					# use -m64 to force 64 bit (but add it also to LDFLAGS), 
-! 					# -m32 for 32 bit (default on solaris),
-! 					# nothing for arch. default
-! 					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
-! 					#-mno-epilogue #try to inline function exit code
-! 					#-mflat # omit save/restore
-! 					#-,faster-structs #faster non Sparc ABI structure copy ops
-! else			# CC_SHORTVER, 3.0
-! ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
-! $(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
-! 					for better results)
-! ifneq				($(OS), netbsd)
-! 						# on netbsd/sparc64,  gcc 2.95.3 does not compile
-! 						# ser with -mv8
-! 						CFLAGS+= -mv8 
-! endif
-! ifeq					($(ASTYPE), solaris)
-! 							CFLAGS+= -Wa,-xarch=v8plus
-! endif					
-! else			#CC_SHORTVER, 2.9x
-! 				#really old version
-! $(warning			You are using an old and unsupported gcc \
-! 					 version ($(CC_SHORTVER)), compile at your own risk!)
-! 					
-! 					CFLAGS+= -mv8 
-! ifeq					($(ASTYPE), solaris)
-! 							CFLAGS+= -Wa,-xarch=v8plus
-! endif					
-! 	
-! endif			#CC_SHORTVER, 2.9x
-! endif			#CC_SHORTVER, 3.0
-! 
-! else		#CC_NAME, gcc
-! ifeq		($(CC_NAME), suncc)
-! 			CFLAGS+=-g -xO5 -fast -native -xarch=v8plusa -xCC \
-! 					-xc99 # C99 support
-! 			# -Dinline="" # add this if cc < 5.3 (define inline as null)
-! else
-! 				#other compilers
-! $(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
-! endif		#CC_NAME, suncc
-! endif		#CC_NAME, gcc
-! endif	#ARCH, sparc
-! 
-! 	#if ipaq/netwinder
-! ifeq	($(ARCH), arm)
-! 		# if gcc 
-! ifeq		($(CC_NAME), gcc)
-! 				#common stuff
-! 				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
-! 					-Wall   \
-! 			#if gcc 3.0
-! ifeq			($(CC_SHORTVER), 3.0)
-! 					CFLAGS+= -mcpu=strongarm1100
-! 							#-mcpu=athlon
-! else
-! ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
-! $(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
-! 					for better results)
-! 					
-! 					CFLAGS+=
-! else
-! 				#really old version
-! $(warning			You are using an old and unsupported gcc \
-! 					 version ($(CC_SHORTVER)), compile at your own risk!)
-! 	
-! endif			# CC_SHORTVER, 2.9x
-! endif			# CC_SHORTVER, 3.0
-! 	
-! else		# CC_NAME, gcc
-! 				#other compilers
-! $(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
-! endif		#CC_NAME, gcc
-! endif	#ARCH, arm 
-! 
-! 	#if  mips (R3000)
-! ifeq	($(ARCH), mips)
-! 		# if gcc 
-! ifeq		($(CC_NAME), gcc)
-! 				#common stuff
-! 				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
-! 					-Wall   \
-! 			#if gcc 3.0
-! ifeq			($(CC_SHORTVER), 3.0)
-! 					CFLAGS+= -mcpu=r3000
-! 							#-mcpu=athlon
-! else
-! ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
-! $(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
-! 					for better results)
-! 					
-! 					CFLAGS+=-mcpu=r3000
-! else
-! 				#really old version
-! $(warning			You are using an old and unsupported gcc \
-! 					 version ($(CC_SHORTVER)), compile at your own risk!)
-! 	
-! endif			# CC_SHORTVER, 2.9x
-! endif			# CC_SHORTVER, 3.0
-! 	
-! else		# CC_NAME, gcc
-! 				#other compilers
-! $(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
-! endif		#CC_NAME, gcc
-! endif	#ARCH, mips
-! 
-! 
-! CFLAGS+= $(CC_EXTRA_OPTS)
-! 
-! 
-! # setting LDFLAGS
-! ifeq	($(CC_NAME), gcc)
-! ifeq		($(ARCH), sparc64)
-! ifeq			($(LDTYPE), solaris)
-! 					# solaris ld
-! 					LDFLAGS+=-O2 $(PROFILE)
-! 					MOD_LDFLAGS=-G $(LDFLAGS)
-! else			
-! 					#gcc and maybe others, on solaris, with gnu ld
-! 					LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) 
-! 					MOD_LDFLAGS=-shared $(LDFLAGS)
-! endif
-! else
-! 			#gcc and maybe others
-! 			LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) 
-! 			MOD_LDFLAGS=-shared $(LDFLAGS)
-! endif
-! endif
-! ifeq	($(CC_NAME), icc)
-! 	#gcc and maybe others
-! 	LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) 
-! 	MOD_LDFLAGS=-shared $(LDFLAGS)
-! endif
-! ifeq	($(CC_NAME), suncc)
-! 	LDFLAGS+=-xO5 $(PROFILE)
-! 	MOD_LDFLAGS=-G $(LDFLAGS)
-! endif
-! 	# we need -fPIC -DPIC only for shared objects, we don't need them for
-! 	# the executable file, because it's always loaded at a fixed address
-! 	# -andrei
-! else	#mode,release
-! ifeq	($(CC_NAME), gcc)
-! 		CFLAGS=-g -Wcast-align $(PROFILE)
-! ifeq		($(ARCH), sparc64)
-! 			CFLAGS+= -mcpu=ultrasparc 
-! endif
-! ifeq		($(LDTYPE), solaris)
-! 			#solaris ld
-! 			LDFLAGS+=-g $(PROFILE)
-! 			MOD_LDFLAGS=-G $(LDFLAGS)
-! else
-! 			#gnu or other ld type
-! 			LDFLAGS+=-g -Wl,-E $(PROFILE)
-! 			MOD_LDFLAGS=-shared $(LDFLAGS)
-! endif
-! endif
-! ifeq	($(CC_NAME), icc)
-! 		CFLAGS=-g  $(PROFILE)
-! 		LDFLAGS+=-g -Wl,-E $(PROFILE)
-! 		MOD_LDFLAGS=-shared $(LDFLAGS)
-! endif
-! ifeq	($(CC_NAME), suncc)
-! 		CFLAGS= -g $(PROFILE)
-! 		LDFLAGS+=-g $(PROFILE)
-! 		MOD_LDFLAGS=-G $(LDFLAGS)
-! endif
-! 
-! endif #mode=release
-! 
-! 
-! #*FLAGS used for compiling the modules
-! ifeq	($(CC_NAME), gcc)
-! MOD_CFLAGS=-fPIC -DPIC $(CFLAGS)
-! endif
-! ifeq	($(CC_NAME), icc)
-! MOD_CFLAGS=-Kpic $(CFLAGS)
-! endif
-! ifeq	($(CC_NAME), suncc)
-! MOD_CFLAGS=-xcode=pic32  $(CFLAGS)
-! endif
-! 
-! ifeq ($(LEX),)
-! 	LEX=flex
-! endif
-! ifeq ($(YACC),)
-! 	YACC=bison
-! endif
-! YACC_FLAGS=-d -b cfg
-! # on solaris add -lxnet (e.g. LIBS= -lxnet)
-! LIBS= -lfl -ldl -lresolv
-! 
-! 
-! #os specific stuff
-! ifeq ($(OS), linux)
-! 	DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \
-! 			-DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_SYSV_SEM  # try posix sems
-! 		found_lock_method=yes
-! 	endif
-! endif
-! 
-! ifeq  ($(OS), solaris)
-! 	DEFS+= -DHAVE_GETIPNODEBYNAME -DHAVE_SYS_SOCKIO_H -DHAVE_SCHED_YIELD
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
-! 		found_lock_method=yes
-! 	endif
-! 	ifeq ($(mode), release)
-! 		#use these only if you're using gcc with Solaris ld
-! 		#LDFLAGS=-O2 $(PROFILE)
-! 		#MOD_LDFLAGS=-O2 -G
-! 	else
-! 		#LDFLAGS=-g $(PROFILE)
-! 		#MOD_LDFLAGS=-g -G
-! 	endif
-! ifneq ($(TLS),)
-! 	DEFS+= -I/usr/local/ssl/include
-! endif
-! 	YACC=yacc
-! 
-! ifeq ($(CC_NAME), suncc)
-! 	LIBS= -lfast -ldl -lresolv
-! endif
-! 	LIBS+= -L/usr/local/lib -lfl -lxnet -lrt -lnsl 
-! 	# -lrt needed for sched_yield
-! endif
-! 
-! ifeq ($(OS), freebsd)
-! 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
-! 		-DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
-! 		found_lock_method=yes
-! 		LIBS= -pthread -lfl  #dlopen is in libc
-! 	else
-! 		LIBS= -lfl  #dlopen is in libc
-! 	endif
-! 	YACC=yacc
-! endif
-! 
-! ifeq ($(OS), openbsd)
-! 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DDLSYM_PREFIX='"_"' -DHAVE_GETHOSTBYNAME2 \
-! 		-DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
-! 		found_lock_method=yes
-! 	endif
-! 	# (symbols on openbsd are prefixed by "_")
-! 	YACC=yacc
-! 	# no sched_yield on openbsd unless linking with c_r (not recommended)
-! 	LIBS= -lfl 
-! 	LDFLAGS=        # openbsd ld doesn't like -O2 or -E
-! endif
-! 	
-! ifeq ($(OS), netbsd)
-! 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
-! 		-DHAVE_MSGHDR_MSG_CONTROL
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_SYSV_SEM  # try pthread sems
-! 		found_lock_method=yes
-! 	endif
-! 	YACC=yacc
-! 	LIBS= -lfl 
-! endif
-! 
-! ifneq (,$(findstring CYGWIN, $(OS)))
-! 	#cygwin is the same as common
-! 	ifneq ($(found_lock_method), yes)
-! 		DEFS+= -DUSE_SYSV_SEM  # try sys v sems
-! 		found_lock_method=yes
-! 	endif
-! endif
-! 
-! #add libssl if needed
-! ifneq ($(TLS),)
-! LIBS+= -L/usr/local/lib -L/usr/local/ssl/lib -lssl  -lcrypto
-! endif
-! 
-! ifneq ($(found_lock_method), yes)
-! $(warning	No locking method found so far, trying SYS V sems)
-! 		DEFS+= -DUSE_SYSV_SEM  # try sys v sems
-! 		found_lock_method=yes
-! endif
-! 
-! 
-! 
-! 
-! 
-! endif  # ifeq ($(makefile_defs, 1)
---- 1,56 ----
-! # om nama shivaya nama
-  
-+ SHELL = /bin/bash
-  
-! OS = solaris
-! PREFIX = ${DESTDIR}
-! prefix = ${PREFIX}
-! basedir = ${BASEDIR}
-  
-! YACC = yacc
-! LEX = flex
-! YACC_FLAGS = -d -b cfg
-! LD = ${CC}
-! MKDEP = ${CC} -xM1
-  
-  VERSION = 0
-  PATCHLEVEL = 8
-! SUBLEVEL = 12
-  
-! RELEASE = ${VERSION}.${PATCHLEVEL}.${SUBLEVEL}
-  
-! srcdir = ${SRC}/cmd/ser/ser-${RELEASE}
-  
-! TARGET = all
-  
-! LDFLAGS = -xO5
-  
-+ CC_VER = ${CC} ${CC_SVER}
-  
-! MY_NAME = ser
-  
-! CFG_TARGET = /etc/sfw/ser/
-  
-! LIBS = -ldl -lresolv -L/usr/sfw/lib -lfl -lxnet -lrt -lnsl
-  
-! DEFS = \
-! 	-DNAME='"$(MY_NAME)"' \
-! 	-DVERSION='"$(RELEASE)"' \
-! 	-DOS='"$(OS)"' \
-! 	-DARCH='"$(ARCH)"' \
-! 	-D__CPU_$(ARCH) \
-! 	-DCOMPILER='"$(CC_VER)"' \
-! 	-D__OS_$(OS) \
-! 	-DCFG_DIR='"$(CFG_TARGET)"' \
-! 	-DPKG_MALLOC \
-! 	-DSHM_MEM  \
-! 	-DSHM_MMAP \
-! 	-DDNS_IP_HACK \
-! 	-DUSE_IPV6 \
-! 	-DUSE_TCP \
-! 	-DDISABLE_NAGLE \
-! 	-DF_MALLOC \
-! 	-DHAVE_GETIPNODEBYNAME \
-! 	-DHAVE_SYS_SOCKIO_H \
-! 	-DHAVE_SCHED_YIELD \
-! 	-DUSE_PTHREAD_MUTEX
--- a/usr/src/cmd/ser/Makefile.modules.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-*** Makefile.modules	Fri May 21 07:01:03 2004
---- Makefile.modules.modified	Fri May 21 08:15:44 2004
-***************
-*** 1,40 ****
-- #
-- # $Id: Makefile.modules,v 1.5 2003/05/23 15:45:01 andrei Exp $
-- #
-- # module Makefile
-- #(to be included from each module)
-- #
-- MOD_NAME=$(NAME:.so=)
-  
-! ALLDEP=Makefile ../../Makefile.sources ../../Makefile.rules \
-!  ../../Makefile.modules
-  
-! #override modules value, a module cannot have submodules
-! override modules=
-! override static_modules=
-! override static_modules_path=
-  
-- 
-- ifeq ($(MAKELEVEL), 0)
-- # make called directly in the module dir!
-- 
-- $(warning "you should run make from the main ser directory")
-- ifneq ($(makefile_defs), 1)
-- $(error "the local makefile does not include Makefile.defs!")
-- endif
-- 
-- else
-- # called by the main Makefile
-- 
-- ALLDEP+=../../Makefile ../../Makefile.defs
-- 
-- endif
-- 
-  include ../../Makefile.sources
-! 
-! ifeq (,$(filter $(MOD_NAME), $(static_modules)))
-! CFLAGS:=$(MOD_CFLAGS)
-! LDFLAGS:=$(MOD_LDFLAGS)
-! endif
-! 
-  include ../../Makefile.rules
---- 1,11 ----
-  
-! MOD_NAME = $(NAME:.so=)
-  
-! SOURCE_LIST = ${MOD_NAME}_src
-  
-  include ../../Makefile.sources
-! modules =
-! utils =
-! CFLAGS = -xcode=pic32
-! LDFLAGS = -G -xO5
-  include ../../Makefile.rules
--- a/usr/src/cmd/ser/Makefile.mysql.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-*** Makefile	Tue Sep 16 11:55:07 2003
---- Makefile.modified	Mon Feb 22 03:17:13 2010
-***************
-*** 6,20 ****
-  auto_gen=
-  NAME=mysql.so
-  
-- 
-  # mysql.h locations (freebsd,openbsd  solaris)
-! DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \
-  		-I$(LOCALBASE)/mysql/include -I/usr/pkg/include
-  # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD
-  # (Debian does the right thing and puts it in /usr/lib)
-! LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \
-  		-L$(LOCALBASE)/mysql/lib/mysql/ -L/usr/pkg/lib/mysql \
-  		-L$(LOCALBASE)/mysql/lib \
-  		-lmysqlclient -lz
-  
-  include ../../Makefile.modules
---- 6,21 ----
-  auto_gen=
-  NAME=mysql.so
-  
-  # mysql.h locations (freebsd,openbsd  solaris)
-! DEFS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \
-  		-I$(LOCALBASE)/mysql/include -I/usr/pkg/include
-  # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD
-  # (Debian does the right thing and puts it in /usr/lib)
-! LIBS = -L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \
-  		-L$(LOCALBASE)/mysql/lib/mysql/ -L/usr/pkg/lib/mysql \
-  		-L$(LOCALBASE)/mysql/lib \
-  		-lmysqlclient -lz
-  
-  include ../../Makefile.modules
-+ 
-+ LDFLAGS += -R/usr/mysql/lib/mysql
--- a/usr/src/cmd/ser/Makefile.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-*** Makefile	Fri May 21 07:01:03 2004
---- Makefile.modified	Thu May 20 17:26:29 2004
-***************
-*** 29,328 ****
-  #              added skip_cfg_install (andrei)
-  #
-  
-! auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
-  
-! #include  source related defs
-! include Makefile.sources
-  
-- # whether or not to install ser.cfg or just ser.cfg.default
-- # (ser.cfg will never be overwritten by make install, this is usefull
-- #  when creating packages)
-- skip_cfg_install?=
-- 
-- #extra modules to exclude
-- skip_modules?=
-- 
-- # if not set on the cmd. line or the env, exclude this modules:
-- exclude_modules?= 			cpl cpl-c ext extcmd \
-- 							postgres snmp \
-- 							im radius_acc radius_auth \
-- 							jabber mysql \
-- 							auth_radius group_radius uri_radius 
-- # always exclude the CVS dir
-- override exclude_modules+= CVS $(skip_modules)
-- 
-- #always include this modules
-- include_modules?=
-- 
-- # first 2 lines are excluded because of the experimental or incomplete
-- # status of the modules
-- # the rest is excluded because it depends on external libraries
-- #
-- static_modules=
-- static_modules_path=$(addprefix modules/, $(static_modules))
-- extra_sources=$(wildcard $(addsuffix /*.c, $(static_modules_path)))
-- extra_objs=$(extra_sources:.c=.o)
-- 
-- static_defs= $(foreach  mod, $(static_modules), \
-- 		-DSTATIC_$(shell echo $(mod) | tr [:lower:] [:upper:]) )
-- 
-- override extra_defs+=$(static_defs) $(EXTRA_DEFS)
-- export extra_defs
-- 
-- modules=$(filter-out $(addprefix modules/, \
-- 			$(exclude_modules) $(static_modules)), \
-- 			$(wildcard modules/*))
-- modules:=$(filter-out $(modules), $(addprefix modules/, $(include_modules) )) \
-- 			$(modules)
-- modules_names=$(shell echo $(modules)| \
-- 				sed -e 's/modules\/\([^/ ]*\)\/*/\1.so/g' )
-- modules_basenames=$(shell echo $(modules)| \
-- 				sed -e 's/modules\/\([^/ ]*\)\/*/\1/g' )
-- #modules_names=$(patsubst modules/%, %.so, $(modules))
-- modules_full_path=$(join  $(modules), $(addprefix /, $(modules_names)))
-- 
-- NAME=ser
-- 
-- ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules
-- 
-- #include general defs (like CC, CFLAGS  a.s.o)
-- # hack to force makefile.defs re-inclusion (needed when make calls itself with
-- # other options -- e.g. make bin)
-- makefile_defs=0
-- DEFS:=
-  include Makefile.defs
-  
-! #export relevant variables to the sub-makes
-! export DEFS PROFILE CC  LD MKDEP MKTAGS CFLAGS LDFLAGS MOD_CFLAGS MOD_LDFLAGS
-! export LEX YACC YACC_FLAGS
-! export PREFIX LOCALBASE
-! # export relevant variables for recursive calls of this makefile 
-! # (e.g. make deb)
-! #export LIBS
-! #export TAR 
-! #export NAME RELEASE OS ARCH 
-! #export cfg-prefix cfg-dir bin-prefix bin-dir modules-prefix modules-dir
-! #export doc-prefix doc-dir man-prefix man-dir ut-prefix ut-dir
-! #export cfg-target modules-target
-! #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
-! #export INSTALL-TOUCH
-  
-! ifneq ($(TLS),)
-! 	tar_extra_args+=
-! else
-! 	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
-! endif
-! # include the common rules
-  include Makefile.rules
-  
-! #extra targets 
-  
-! $(NAME): static_modules
-! 
-! lex.yy.c: cfg.lex cfg.tab.h $(ALLDEP)
-! 	$(LEX) $<
-! 
-! cfg.tab.c cfg.tab.h: cfg.y  $(ALLDEP)
-! 	$(YACC) $(YACC_FLAGS) $<
-! 
-! .PHONY: all
-! all: $(NAME) modules
-! 
-! 
-! 
-! .PHONY: modules
-! modules:
-! 	-@for r in $(modules) "" ; do \
-! 		if [ -n "$$r" ]; then \
-! 			echo  "" ; \
-! 			echo  "" ; \
-! 			$(MAKE) -C $$r ; \
-! 		fi ; \
-! 	done 
-! 
-! .PHONY: static_modules
-! static_modules:
-! 	-@echo "Extra objs: $(extra_objs)" 
-! 	-@for r in $(static_modules_path) "" ; do \
-! 		if [ -n "$$r" ]; then \
-! 			echo  "" ; \
-! 			echo  "Making static module $r" ; \
-! 			$(MAKE) -C $$r static ; \
-! 		fi ; \
-! 	done 
-! 
-! 
-! 	
-! dbg: ser
-! 	gdb -command debug.gdb
-! 
-! .PHONY: tar
-! .PHONY: dist
-! 
-! dist: tar
-! 
-! tar: 
-! 	$(TAR) -C .. \
-! 		--exclude=$(notdir $(CURDIR))/test* \
-! 		--exclude=$(notdir $(CURDIR))/tmp* \
-! 		--exclude=$(notdir $(CURDIR))/debian/ser* \
-! 		--exclude=$(notdir $(CURDIR))/ser_tls* \
-! 		--exclude=CVS* \
-! 		--exclude=.cvsignore \
-! 		--exclude=*.[do] \
-! 		--exclude=*.so \
-! 		--exclude=*.il \
-! 		--exclude=$(notdir $(CURDIR))/ser \
-! 		--exclude=*.gz \
-! 		--exclude=*.bz2 \
-! 		--exclude=*.tar \
-! 		--exclude=*.patch \
-! 		--exclude=.\#* \
-! 		--exclude=*.swp \
-! 		${tar_extra_args} \
-! 		-cf - $(notdir $(CURDIR)) | \
-! 			(mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \
-! 			    cd tmp/_tar1; $(TAR) -xf - ) && \
-! 			    mv tmp/_tar1/$(notdir $(CURDIR)) \
-! 			       tmp/_tar2/"$(NAME)-$(RELEASE)" && \
-! 			    (cd tmp/_tar2 && $(TAR) \
-! 			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
-! 			                               "$(NAME)-$(RELEASE)" ) ; \
-! 			    rm -rf tmp/_tar1; rm -rf tmp/_tar2
-! 
-! # binary dist. tar.gz
-! .PHONY: bin
-! bin:
-! 	mkdir -p tmp/ser/usr/local
-! 	$(MAKE) install basedir=tmp/ser prefix=/usr/local 
-! 	$(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
-! 	rm -rf tmp/ser
-! 
-! .PHONY: deb
-! deb:
-! 	dpkg-buildpackage -rfakeroot -tc
-! 
-! .PHONY: sunpkg
-! sunpkg:
-! 	mkdir -p tmp/ser
-! 	mkdir -p tmp/ser_sun_pkg
-! 	$(MAKE) install basedir=tmp/ser prefix=/usr/local
-! 	(cd solaris; \
-! 	pkgmk -r ../tmp/ser/usr/local -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
-! 	cd ..)
-! 	cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
-! 	pkgtrans -s tmp/ser_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
-! 		IPTELser
-! 	gzip -9 ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
-! 	rm -rf tmp/ser
-! 	rm -rf tmp/ser_sun_pkg
-! 
-! 
-! install: all mk-install-dirs install-cfg install-bin install-modules \
-! 	install-doc install-man
-! 
-! .PHONY: dbinstall
-! dbinstall:
-! 	-@echo "Initializing ser database"
-! 	scripts/ser_mysql.sh create
-! 	-@echo "Done"
-! 
-! mk-install-dirs: $(cfg-prefix)/$(cfg-dir) $(bin-prefix)/$(bin-dir) \
-! 			$(modules-prefix)/$(modules-dir) $(doc-prefix)/$(doc-dir) \
-! 			$(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
-! 
-! $(cfg-prefix)/$(cfg-dir): 
-! 		mkdir -p $(cfg-prefix)/$(cfg-dir)
-! 
-! $(bin-prefix)/$(bin-dir):
-! 		mkdir -p $(bin-prefix)/$(bin-dir)
-! 
-! $(modules-prefix)/$(modules-dir):
-! 		mkdir -p $(modules-prefix)/$(modules-dir)
-! 
-! 
-! $(doc-prefix)/$(doc-dir):
-! 		mkdir -p $(doc-prefix)/$(doc-dir)
-! 
-! $(man-prefix)/$(man-dir)/man8:
-! 		mkdir -p $(man-prefix)/$(man-dir)/man8
-! 
-! $(man-prefix)/$(man-dir)/man5:
-! 		mkdir -p $(man-prefix)/$(man-dir)/man5
-! 		
-! # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
-! install-cfg: $(cfg-prefix)/$(cfg-dir)
-! 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
-! 			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
-! 		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
-! 		if [ -z "${skip_cfg_install}" -a \
-! 				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
-! 			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
-! 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
-! 		fi
-! #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
-! 
-! install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1
-! 		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/ser 
-! 		$(INSTALL-BIN) ser $(bin-prefix)/$(bin-dir)
-! 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/sc
-! 		$(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir)
-! 		mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/serctl
-! 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/ser_mysql.sh  
-! 		$(INSTALL-BIN) scripts/ser_mysql.sh  $(bin-prefix)/$(bin-dir)
-! 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/gen_ha1
-! 		$(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir)
-! 
-! utils/gen_ha1/gen_ha1:
-! 		cd utils/gen_ha1; $(MAKE) all
-! 
-! install-modules: modules $(modules-prefix)/$(modules-dir)
-! 	-@for r in $(modules_full_path) "" ; do \
-! 		if [ -n "$$r" ]; then \
-! 			if [ -f "$$r" ]; then \
-! 				$(INSTALL-TOUCH) \
-! 					$(modules-prefix)/$(modules-dir)/`basename "$$r"` ; \
-! 				$(INSTALL-MODULES)  "$$r"  $(modules-prefix)/$(modules-dir) ; \
-! 			else \
-! 				echo "ERROR: module $$r not compiled" ; \
-! 			fi ;\
-! 		fi ; \
-! 	done 
-! 
-! 
-! install-modules-all: install-modules install-modules-doc
-! 
-! 
-! install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc
-! 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/INSTALL 
-! 	$(INSTALL-DOC) INSTALL $(doc-prefix)/$(doc-dir)
-! 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README-MODULES 
-! 	$(INSTALL-DOC) README-MODULES $(doc-prefix)/$(doc-dir)
-! 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/AUTHORS 
-! 	$(INSTALL-DOC) AUTHORS $(doc-prefix)/$(doc-dir)
-! 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/NEWS
-! 	$(INSTALL-DOC) NEWS $(doc-prefix)/$(doc-dir)
-! 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
-! 	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
-! 
-! 
-! install-modules-doc: $(doc-prefix)/$(doc-dir)
-! 	-@for r in $(modules_basenames) "" ; do \
-! 		if [ -n "$$r" ]; then \
-! 			if [ -f modules/"$$r"/README ]; then \
-! 				$(INSTALL-TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
-! 				$(INSTALL-DOC)  modules/"$$r"/README  \
-! 									$(doc-prefix)/$(doc-dir)/README ; \
-! 				mv -f $(doc-prefix)/$(doc-dir)/README \
-! 						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
-! 			fi ; \
-! 		fi ; \
-! 	done 
-! 
-! 
-! install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
-! 	$(INSTALL-TOUCH)  $(man-prefix)/$(man-dir)/man8/ser.8 
-! 	$(INSTALL-MAN)  ser.8 $(man-prefix)/$(man-dir)/man8
-! 	$(INSTALL-TOUCH)  $(man-prefix)/$(man-dir)/man5/ser.cfg.5 
-! 	$(INSTALL-MAN)  ser.cfg.5 $(man-prefix)/$(man-dir)/man5
-  
---- 29,80 ----
-  #              added skip_cfg_install (andrei)
-  #
-  
-! NAME = ser
-  
-! SOURCE_LIST = ser_src
-  
-  include Makefile.defs
-+ include Makefile.sources
-  
-! modules =  \
-! 	modules/acc \
-! 	modules/auth \
-! 	modules/auth_db \
-! 	modules/auth_diameter \
-! 	modules/dbtext \
-! 	modules/domain \
-! 	modules/enum \
-! 	modules/exec \
-! 	modules/group \
-! 	modules/jabber \
-! 	modules/mangler \
-! 	modules/maxfwd \
-! 	modules/msilo \
-! 	modules/mysql \
-! 	modules/nathelper \
-! 	modules/pa \
-! 	modules/pdt \
-! 	modules/permissions \
-! 	modules/pike \
-! 	modules/print \
-! 	modules/registrar \
-! 	modules/rr \
-! 	modules/sl \
-! 	modules/sms \
-! 	modules/textops \
-! 	modules/tm \
-! 	modules/uri \
-! 	modules/usrloc \
-! 	modules/vm \
-! 	modules/xlog
-  
-! utility = utils/gen_ha1/gen_ha1
-! 
-  include Makefile.rules
-  
-! lex.yy.c: cfg.lex cfg.tab.h
-! 	$(LEX) cfg.lex
-  
-! cfg.tab.c cfg.tab.h: cfg.y
-! 	$(YACC) $(YACC_FLAGS) cfg.y
-  
--- a/usr/src/cmd/ser/Makefile.rules.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-*** Makefile.rules	Fri May 21 07:01:03 2004
---- Makefile.rules.modified	Thu May 20 17:11:31 2004
-***************
-*** 1,82 ****
-- #
-- # $Id: Makefile.rules,v 1.13 2003/03/18 16:07:42 andrei Exp $
-- #
-- #
-- # common Makefile rules, included by main Makefile & the  modules
-- #
-  
-! #
-! # Uses: NAME, ALLDEP, CC, CFLAGS, DEFS, LIBS, MKDEP, auto_gen, depends, objs,
-! # extra_objs, static_modules, static_modules_path
-! # (all this must  be defined previously!,  see Makefile.defs & Makefile)
-! #
-! 
-! 
-! 
-! #implicit rules
-! %.o:%.c  $(ALLDEP)
-  	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
-  
-! %.d: %.c $(ALLDEP)
-! 	@set -e; $(MKDEP) $(DEFS) $< \
-  	|  sed 's#\(\($*D)\)\?$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \
-  	[ -s $@ ] || rm -f $@
-  
-  
-! # normal rules
-! $(NAME): $(objs) $(ALLDEP)
-! 	$(LD) $(LDFLAGS) $(objs) $(extra_objs) $(LIBS) -o $(NAME) 
-  
-  
-! .PHONY: all
-! all: $(NAME) modules
-  
-! .PHONY: dep
-! dep: $(depends)
-  
-! .PHONY: static
-! static: $(objs)
-  
-! .PHONY: clean
-! clean: 
-  	-@rm -f $(objs) $(NAME) $(objs:.o=.il) 2>/dev/null
-! 	-@for r in $(modules) $(static_modules_path) "" ; do \
-  		if [ -n "$$r" ]; then \
-! 			echo "module $$r" ; \
-! 			$(MAKE) -C $$r clean ; \
-  		fi ; \
-  	done
-  	@if [ -n "$(modules)" ]; then cd utils/gen_ha1; $(MAKE) clean; fi
-- 
-- .PHONY: proper
-- .PHONY: distclean
-- .PHONY: realclean
-- proper realclean distclean: clean 
-- 	-@rm -f $(depends) $(auto_gen) 2>/dev/null
-- 	-@for r in $(modules) "" ; do \
-- 		if [ -n "$$r" ]; then \
-- 			 $(MAKE) -C $$r proper ; \
-- 		fi ; \
-- 	done 
-- 
-- .PHONY: mantainer-cleaan
-- mantainer-clean: distclean
-- 	-rm -f TAGS tags *.dbg .*.swp
-- 	-@for r in $(modules) "" ; do \
-- 		if [ -n "$$r" ]; then \
-- 			$(MAKE) -C $$r mantainer-clean; \
-- 		fi ; \
-- 	 done 
-- 
-- 
-- .PHONY: TAGS
-- TAGS:
-- 	$(MKTAGS) 
-- 	
-- ifeq (,$(MAKECMDGOALS))
-- include $(depends)
-- endif
-- ifneq (,$(filter-out clean proper distclean realclean mantainer-clean TAGS \
-- 		tar modules, $(MAKECMDGOALS)))
-- include $(depends)
-- endif
---- 1,35 ----
-  
-! %.o: %.c
-  	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
-  
-! %.d: %.c
-! 	@set -e; $(MKDEP) $(DEFS) $<  \
-  	|  sed 's#\(\($*D)\)\?$(*F)\)\.o[ :]*#$*.o $@ : #g' > $@; \
-  	[ -s $@ ] || rm -f $@
-  
-+ $(NAME): $(objs)
-+ 	$(LD) $(LDFLAGS) $(objs) $(LIBS) -o $(NAME)
-  
-! all: $(NAME) modules utility
-  
-+ utility: $(utility)
-  
-! $(utility):
-! 	cd utils/gen_ha1; $(MAKE) all
-  
-! modules: $(modules)
-  
-! $(modules) : FRC
-! 	@cd $@; pwd; $(MAKE)
-! FRC:
-  
-! clean:
-  	-@rm -f $(objs) $(NAME) $(objs:.o=.il) 2>/dev/null
-! 	-@for r in $(modules) ; do \
-  		if [ -n "$$r" ]; then \
-! 			echo "cleaning $$r" ; \
-! 			cd ${srcdir}/$$r ; \
-! 			$(MAKE) clean ; \
-  		fi ; \
-  	done
-  	@if [ -n "$(modules)" ]; then cd utils/gen_ha1; $(MAKE) clean; fi
--- a/usr/src/cmd/ser/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile.sfw	1.9	10/02/25 SMI"
-
-VER=ser-0.8.12
-
-include ../Makefile.cmd
-
-all: $(VER)/config.status
-	(cd $(VER); env \
-		CC="$(CC) -features=no%extinl" CXX=$(CCC)	\
-		INSTALL=/usr/ucb/install	\
-		PATH=$(SFW_PATH) \
-		MAKE=$(CCSMAKE) 	\
-		DESTDIR=/usr/sfw		\
-		BASEDIR=${ROOT}			\
-		LOCALBASE=${ROOT}/usr	\
-		ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/armv4l/arm/` \
-		CC_SVER=`${CC} -V 2>&1 | head -1 |sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g'` \
-		$(CCSMAKE) all) 
-
-test:	# there aren't any
-
-install: all
-	$(SH) ./install-sfw
-
-$(VER)/config.status: $(VER)/configure
-
-$(VER)/configure: $(VER).tar.gz
-	gzip -dc $(VER).tar.gz | tar xopf -
-	(cd $(VER); gpatch < ../Makefile.patch)
-	(cd $(VER); gpatch < ../Makefile.defs.patch)
-	(cd $(VER); gpatch < ../Makefile.modules.patch)
-	(cd $(VER); gpatch < ../Makefile.rules.patch)
-	(cd $(VER); gpatch < ../Makefile.sources.patch)
-	(cd $(VER); gpatch < ../ser.8.patch)
-	(cd $(VER); gpatch < ../ser.cfg.5.patch)
-	(cd $(VER)/etc; gpatch < ../../ser.cfg.patch)
-	(cd $(VER)/scripts; gpatch < ../../sc.patch)
-	(cd $(VER)/scripts; gpatch < ../../ser_mysql.sh.patch)
-	(cd $(VER)/modules/mysql; gpatch < ../../../Makefile.mysql.patch)
-	(cd $(VER)/modules/vm; gpatch < ../../../Makefile.vm.patch)
-	(cd $(VER)/modules/xlog; gpatch < ../../../Makefile.xlog.patch)
-	(cd $(VER)/modules/auth_diameter; gpatch < ../../../Makefile.auth_diameter.patch)
-	(cd $(VER)/utils/gen_ha1; gpatch < ../../../Makefile.utils.patch)
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
--- a/usr/src/cmd/ser/Makefile.sources.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,366 +0,0 @@
-*** Makefile.sources	Fri May 21 07:01:03 2004
---- Makefile.sources.modified	Thu May 20 17:12:04 2004
-***************
-*** 1,25 ****
-- #
-- # $Id: Makefile.sources,v 1.13 2003/06/30 16:23:36 andrei Exp $
-- #
-- # common Makefile variables 
-- # (source files, objs, etc)
-  
-  
-! #
-! # expects: auto_gen defined
-! #
-! # defines: sources, objs, depends
-! #
-  
-! sources=$(filter-out $(auto_gen), $(wildcard *.c) $(wildcard mem/*.c) \
-! 		$(wildcard parser/*.c) $(wildcard parser/digest/*.c) \
-! 		$(wildcard parser/contact/*.c) $(wildcard db/*.c) ) $(auto_gen)
-! ifneq ($(TLS),)
-! 	sources+= $(wildcard tls/*.c)
-! endif
-! objs=$(sources:.c=.o)
-! extra_objs=
-! depends=$(sources:.c=.d)
-! modules=
-! static_modules=
-! static_modules_path=
---- 1,336 ----
-  
-+ ser_src = \
-+ 	action.c \
-+ 	crc.c \
-+ 	data_lump.c \
-+ 	data_lump_rpl.c \
-+ 	dprint.c \
-+ 	dset.c \
-+ 	error.c \
-+ 	fifo_server.c \
-+ 	flags.c \
-+ 	forward.c \
-+ 	hash_func.c \
-+ 	ip_addr.c \
-+ 	main.c \
-+ 	md5.c \
-+ 	md5utils.c \
-+ 	modparam.c \
-+ 	msg_translator.c \
-+ 	pass_fd.c \
-+ 	proxy.c \
-+ 	re.c \
-+ 	receive.c \
-+ 	resolve.c \
-+ 	route.c \
-+ 	route_struct.c \
-+ 	script_cb.c \
-+ 	sr_module.c \
-+ 	stats.c \
-+ 	tcp_main.c \
-+ 	tcp_read.c \
-+ 	timer.c \
-+ 	udp_server.c \
-+ 	mem/f_malloc.c \
-+ 	mem/mem.c \
-+ 	mem/memtest.c \
-+ 	mem/q_malloc.c \
-+ 	mem/shm_mem.c \
-+ 	mem/vq_malloc.c \
-+ 	parser/hf.c \
-+ 	parser/msg_parser.c \
-+ 	parser/parse_content.c \
-+ 	parser/parse_cseq.c \
-+ 	parser/parse_disposition.c \
-+ 	parser/parse_event.c \
-+ 	parser/parse_expires.c \
-+ 	parser/parse_fline.c \
-+ 	parser/parse_from.c \
-+ 	parser/parse_hname2.c \
-+ 	parser/parse_hostport.c \
-+ 	parser/parse_nameaddr.c \
-+ 	parser/parse_param.c \
-+ 	parser/parse_rr.c \
-+ 	parser/parse_to.c \
-+ 	parser/parse_uri.c \
-+ 	parser/parse_via.c \
-+ 	parser/parser_f.c \
-+ 	parser/digest/digest.c \
-+ 	parser/digest/digest_parser.c \
-+ 	parser/digest/param_parser.c \
-+ 	parser/contact/contact.c \
-+ 	parser/contact/parse_contact.c \
-+ 	db/db.c \
-+ 	lex.yy.c \
-+ 	cfg.tab.c
-  
-! acc_src = \
-! 	acc.c \
-! 	acc_mod.c
-  
-! auth_src = \
-! 	api.c \
-! 	auth_mod.c \
-! 	challenge.c \
-! 	common.c \
-! 	nonce.c \
-! 	rpid.c
-! 
-! auth_db_src = \
-! 	authdb_mod.c \
-! 	authorize.c \
-! 	rfc2617.c
-! 
-! auth_diameter_src = \
-! 	auth_diameter.c \
-! 	authorize.c \
-! 	avp.c \
-! 	message.c \
-! 	tcp_comm.c \
-! 	user_in.c
-! 
-! auth_radius_src = \
-! 	authorize.c \
-! 	authrad_mod.c \
-! 	sterman.c
-! 
-! cpl_src = \
-! 	cpl.c \
-! 	jcpli.c
-! 
-! cpl-c_src = \
-! 	cpl.c \
-! 	cpl_db.c \
-! 	cpl_loader.c \
-! 	cpl_log.c \
-! 	cpl_nonsig.c \
-! 	cpl_parser.c \
-! 	cpl_run.c \
-! 	cpl_sig.c \
-! 	cpl_time.c \
-! 	sub_list.c
-! 
-! dbtext_src = \
-! 	dbt_api.c \
-! 	dbt_base.c \
-! 	dbt_file.c \
-! 	dbt_lib.c \
-! 	dbt_res.c \
-! 	dbt_tb.c \
-! 	dbt_util.c \
-! 	dbtext.c
-! 
-! domain_src = \
-! 	domain.c \
-! 	domain_mod.c \
-! 	fifo.c \
-! 	hash.c
-! 
-! enum_src = \
-! 	enum.c \
-! 	enum_mod.c \
-! 	regexp.c
-! 
-! exec_src = \
-! 	exec.c \
-! 	exec_hf.c \
-! 	exec_mod.c \
-! 	kill.c
-! 
-! ext_src = \
-! 	ext.c \
-! 	my_exec.c
-! 
-! extcmd_src = \
-! 	extcmd.c \
-! 	extcmd_funcs.c
-! 
-! group_src = \
-! 	group.c \
-! 	group_mod.c
-! 
-! group_radius_src = \
-! 	group.c \
-! 	grouprad_mod.c
-! 
-! jabber_src = \
-! 	jabber.c \
-! 	sha.c \
-! 	tree234.c \
-! 	xjab_base.c \
-! 	xjab_jcon.c \
-! 	xjab_jconf.c \
-! 	xjab_load.c \
-! 	xjab_presence.c \
-! 	xjab_util.c \
-! 	xjab_wlist.c \
-! 	xjab_worker.c \
-! 	xode.c \
-! 	xode_from.c \
-! 	xode_str.c \
-! 	xpool.c \
-! 	xsnprintf.c \
-! 	xstream.c
-! 
-! mangler_src = \
-! 	contact_ops.c \
-! 	ip_helper.c \
-! 	mangler.c \
-! 	sdp_mangler.c \
-! 	utils.c
-! 
-! maxfwd_src = \
-! 	maxfwd.c \
-! 	mf_funcs.c
-! 
-! msilo_src = \
-! 	ms_msg_list.c \
-! 	msfuncs.c \
-! 	msilo.c
-! 
-! mysql_src = \
-! 	db_con.c \
-! 	db_mod.c \
-! 	db_res.c \
-! 	db_row.c \
-! 	db_utils.c \
-! 	db_val.c \
-! 	dbase.c \
-! 	utils.c
-! 
-! nathelper_src = \
-! 	nathelper.c \
-! 	nhelpr_funcs.c
-! 
-! pa_src = \
-! 	dlist.c \
-! 	hslot.c \
-! 	lpidf.c \
-! 	notify.c \
-! 	pa_mod.c \
-! 	paerrno.c \
-! 	pdomain.c \
-! 	presentity.c \
-! 	ptime.c \
-! 	reply.c \
-! 	subscribe.c \
-! 	watcher.c \
-! 	xpidf.c
-! 
-! pdt_src = \
-! 	domains.c \
-! 	pdt.c
-! 
-! permissions_src = \
-! 	parse_config.c \
-! 	permissions.c \
-! 	rule.c
-! 
-! pike_src = \
-! 	ip_tree.c \
-! 	pike.c \
-! 	pike_funcs.c \
-! 	timer.c
-! 
-! postgres_src = \
-! 	aug_alloc.c \
-! 	aug_util.c \
-! 	db_con.c \
-! 	db_mod.c \
-! 	db_res.c \
-! 	db_utils.c \
-! 	db_val.c \
-! 	dbase.c
-! 
-! print_src = \
-! 	print.c
-! 
-! registrar_src = \
-! 	common.c \
-! 	lookup.c \
-! 	reg_mod.c \
-! 	regtime.c \
-! 	reply.c \
-! 	rerrno.c \
-! 	save.c \
-! 	sip_msg.c
-! 
-! rr_src = \
-! 	loose.c \
-! 	record.c \
-! 	rr_mod.c
-! 
-! sl_src = \
-! 	sl.c \
-! 	sl_funcs.c \
-! 	sl_stats.c
-! 
-! sms_src = \
-! 	libsms_charset.c \
-! 	libsms_getsms.c \
-! 	libsms_modem.c \
-! 	libsms_putsms.c \
-! 	sms.c \
-! 	sms_funcs.c \
-! 	sms_report.c
-! 
-! textops_src = \
-! 	textops.c
-! 
-! tm_src = \
-! 	callid.c \
-! 	dlg.c \
-! 	h_table.c \
-! 	lock.c \
-! 	sip_msg.c \
-! 	t_cancel.c \
-! 	t_dlg.c \
-! 	t_funcs.c \
-! 	t_fwd.c \
-! 	t_hooks.c \
-! 	t_lookup.c \
-! 	t_msgbuilder.c \
-! 	t_reply.c \
-! 	t_stats.c \
-! 	test.c \
-! 	timer.c \
-! 	tm.c \
-! 	tm_load.c \
-! 	uac.c \
-! 	uac_fifo.c
-! 
-! uri_src = \
-! 	checks.c \
-! 	uri_mod.c
-! 
-! uri_radius_src = \
-! 	checks.c \
-! 	urirad_mod.c
-! 
-! usrloc_src = \
-! 	del_list.c \
-! 	dlist.c \
-! 	hslot.c \
-! 	ins_list.c \
-! 	notify.c \
-! 	ucontact.c \
-! 	udomain.c \
-! 	ul_fifo.c \
-! 	ul_mod.c \
-! 	urecord.c \
-! 	usrloc.c \
-! 	utime.c
-! 
-! vm_src = \
-! 	vm.c \
-! 	vm_fifo.c
-! 
-! xlog_src = \
-! 	xl_lib.c \
-! 	xlog.c
-! 
-! sources = ${${SOURCE_LIST}}
-! 
-! objs = $(sources:.c=.o)
-! 
-! depends = $(sources:.c=.d)
--- a/usr/src/cmd/ser/Makefile.utils.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-*** Makefile	Fri May 28 06:18:15 2004
---- Makefile.modified	Fri May 28 06:19:16 2004
-***************
-*** 2,14 ****
-  all: gen_ha1
-  
-  gen_ha1: gen_ha1.o calc.o ../../md5.o
-! 	gcc -o gen_ha1 gen_ha1.o calc.o ../../md5.o
-  
-  gen_ha1.o: gen_ha1.c
-! 	gcc -c gen_ha1.c
-  
-  calc.o: calc.c calc.h
-! 	gcc -c calc.c
-  
-  
-  clean:
---- 2,14 ----
-  all: gen_ha1
-  
-  gen_ha1: gen_ha1.o calc.o ../../md5.o
-! 	$(CC) -o gen_ha1 gen_ha1.o calc.o ../../md5.o
-  
-  gen_ha1.o: gen_ha1.c
-! 	$(CC) -c gen_ha1.c
-  
-  calc.o: calc.c calc.h
-! 	$(CC) -c calc.c
-  
-  
-  clean:
--- a/usr/src/cmd/ser/Makefile.vm.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-*** Makefile	Fri May 21 07:10:28 2004
---- Makefile.modified	Fri May 21 07:10:45 2004
-***************
-*** 10,23 ****
-  NAME=vm.so
-  LIBS=
-  
-- ifeq ($(MAKELEVEL), 0)
-- # make called directly in the module dir!
-- 
-- all::
-- 	cd ../..; make all
-- 
-- else
-- 
-  include ../../Makefile.modules
-- 
-- endif
---- 10,13 ----
--- a/usr/src/cmd/ser/Makefile.xlog.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-*** Makefile	Fri May 21 07:11:07 2004
---- Makefile.modified	Fri May 21 07:11:33 2004
-***************
-*** 5,10 ****
---- 5,12 ----
-  # 
-  # WARNING: do not run this directly, it should be run by the master Makefile
-  
-+ include ../../Makefile.defs
-+ 
-  auto_gen=
-  NAME=xlog.so
-  LIBS=
--- a/usr/src/cmd/ser/README.solaris.ser	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-On Solaris ser can be started by installing the script /etc/sfw/ser/ser
-in the appropriate /etc/rc[2,3].d directory.
-
-
-ln /etc/sfw/ser/ser /etc/rc3.d/S99ser
-ln /etc/sfw/ser/ser /etc/rc0.d/K00ser
-ln /etc/sfw/ser/ser /etc/rc1.d/K00ser
-ln /etc/sfw/ser/ser /etc/rc2.d/K00ser
-ln /etc/sfw/ser/ser /etc/rcS.d/K00ser
-
-By default ser is configured to use MySQL database (SUNWmysqlr,SUNWmysqlu,
-SUNWmysqlt) which should be configured according to the instructions in
-/etc/sfw/mysql/README.solaris.mysql. Then /etc/sfw/ser/ser_mysql.sh should be
-run to setup tables for ser.
-
-ser requires a configuration file /etc/sfw/ser/ser.cfg. A sample file
-ser.cfg.sample is provided. It should be modified according to the setup.
-
-/usr/sfw/sbin/serctl is used to manage ser including starting and stopping of
-the daemon.
-
-serweb (SUNWserweb) provides a web based user and administration interface for
-ser. Instructions for configuring sereweb are in
-/usr/sfw/share/serweb/README.solaris.serweb
-
-man pages for ser(8) and ser.cfg(5) are installed in /usr/sfw/man.
-More documentation is available in /usr/sfw/share/doc/ser.
--- a/usr/src/cmd/ser/install-sfw	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-#!/usr/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)install-sfw	1.7	07/04/02 SMI"
-
-VERS=0.8.12
-PKGVERS=ser-${VERS}
-PREFIX=${ROOT}/usr/sfw
-LIBDIR=${PREFIX}/lib
-DOCDIR=${PREFIX}/share/doc
-MANDIR=${PREFIX}/share/man
-
-. ${SRC}/tools/install.subr
-
-
-_install N README.solaris.ser ${ROOT}/etc/sfw/ser/README.solaris.ser 444
-_install N ser ${ROOT}/etc/sfw/ser/ser 555
-
-cd ${PKGVERS}
-
-# Install modules and their docs.
-
-MODULES="acc auth auth_db auth_diameter dbtext domain enum exec group mangler"
-MODULES="$MODULES maxfwd msilo nathelper pa pdt permissions pike print rr"
-MODULES="$MODULES registrar sl sms textops tm uri usrloc vm xlog mysql jabber" 
-for mod in $MODULES
-do
-_install D modules/${mod}/${mod}.so ${LIBDIR}/ser/modules/${mod}.so 555
-
-if [ -f modules/${mod}/README ]
-then
-_install N modules/${mod}/README ${DOCDIR}/ser/README.${mod} 444
-fi
-done
-
-#Install some left over Docs.
-
-_install N AUTHORS  ${DOCDIR}/ser/AUTHORS 444
-_install N INSTALL ${DOCDIR}/ser/INSTALL 444
-_install N NEWS ${DOCDIR}/ser/NEWS 444
-_install N README ${DOCDIR}/ser/README 444
-_install N README-MODULES ${DOCDIR}/ser/README-MODULES 444
-
-
-# Install ser.cfg file.
-
-sed -e "s#/usr/.*lib/ser/modules/#/usr/sfw/lib/ser/modules/#g" \
-                < etc/ser.cfg > etc/ser.cfg.sample
-_install N etc/ser.cfg.sample ${ROOT}/etc/sfw/ser/ser.cfg.sample 444
-
-# Install sbin
-
-_install E ser ${PREFIX}/sbin/ser 555
-_install E utils/gen_ha1/gen_ha1 ${PREFIX}/lib/ser/gen_ha1 555
-_install N scripts/ser_mysql.sh ${ROOT}/etc/sfw/ser/ser_mysql.sh 555
-_install N scripts/sc ${PREFIX}/sbin/serctl 555
-
-# Install man.
-
-MANSCRIPT=../sunman-stability
-
-_install M ser.cfg.5  ${MANDIR}/man5/ser.cfg.5 444
-_install M ser.8  ${MANDIR}/man8/ser.8 444
-
-
-exit 0
--- a/usr/src/cmd/ser/sc.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-*** sc	Thu Aug 21 12:53:21 2003
---- sc.new	Mon Aug 30 12:48:44 2004
-***************
-*** 19,24 ****
---- 19,25 ----
-  PID_FILE=/var/run/ser.pid
-  SYSLOG=1 # 0=output to console, 1=output to syslog
-  STARTOPTIONS= # for example -dddd
-+ PATH="$PATH:/usr/sfw/sbin:/usr/sfw/bin:/usr/sfw/lib/ser"; export PATH
-  
-  # ser's FIFO server
-  if [ -z "$SER_FIFO" ]; then
-***************
-*** 60,66 ****
-  
-  # expiration time for alias table
-  FOREVER='2020-05-28 21:32:15'
-! FOREVER_REL=1073741823
-  
-  VERSION='$Revision: 1.62 $'
-  #### SQL names
---- 61,67 ----
-  
-  # expiration time for alias table
-  FOREVER='2020-05-28 21:32:15'
-! FOREVER_REL=973741823
-  
-  VERSION='$Revision: 1.62 $'
-  #### SQL names
-***************
-*** 113,118 ****
---- 114,122 ----
-  cat <<EOF
-  $0 $VERSION
-  parameter usage: 
-+ 	   * general *
-+  file <file_name>.................... read commands from file.
-+ 
-             * subscribers *
-   add <username> <password> <email> .. add a new subscriber (*)
-   passwd <username> <passwd> ......... change user's password (*)
-***************
-*** 343,349 ****
-  				usage
-  				exit 1
-  			fi
-! 			exit $?
-  			;;
-  		add)
-  			if [ $# -ne 3 ] ; then
---- 347,353 ----
-  				usage
-  				exit 1
-  			fi
-! #			exit $?
-  			;;
-  		add)
-  			if [ $# -ne 3 ] ; then
-***************
-*** 358,364 ****
-  			fi
-  
-  			fifo_cmd ul_add "$UL_TABLE" "$1" "$2" "$FOREVER_REL" "1.00" "0"
-! 			exit $?
-  			;;
-  		rm)
-              if [ $# -ne 2 ] ; then
---- 362,368 ----
-  			fi
-  
-  			fifo_cmd ul_add "$UL_TABLE" "$1" "$2" "$FOREVER_REL" "1.00" "0"
-! #			exit $?
-  			;;
-  		rm)
-              if [ $# -ne 2 ] ; then
-***************
-*** 509,518 ****
-  # if the script calls itself ...
-  export PW
-  
-  case $1 in
-  
-  	start)
-- 		DIR=`dirname $0`
-  		echo
-  		printf "Starting SER : "
-  		if [ -r $PID_FILE ] ; then
---- 513,523 ----
-  # if the script calls itself ...
-  export PW
-  
-+ perform()
-+ {
-  case $1 in
-  
-  	start)
-  		echo
-  		printf "Starting SER : "
-  		if [ -r $PID_FILE ] ; then
-***************
-*** 520,533 ****
-  			exit 1
-  		else
-  			if [ $SYSLOG = 1 ] ; then
-! 				$DIR/ser -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null
-  			else
-! 			 	$DIR/ser -P $PID_FILE -E $STARTOPTIONS
-  			fi
-  			sleep 1
-  			echo "started pid(`cat $PID_FILE`)"
-  		fi
-! 		exit 0
-  	;;
-  
-  	stop)
---- 525,538 ----
-  			exit 1
-  		else
-  			if [ $SYSLOG = 1 ] ; then
-! 				/usr/sfw/sbin/ser -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null
-  			else
-! 			 	/usr/sfw/sbin/ser -P $PID_FILE -E $STARTOPTIONS
-  			fi
-  			sleep 1
-  			echo "started pid(`cat $PID_FILE`)"
-  		fi
-! #		exit 0
-  	;;
-  
-  	stop)
-***************
-*** 534,552 ****
-  		printf "Stopping SER : "
-  		if [ -r $PID_FILE ] ; then
-  			kill `cat $PID_FILE`
-  			echo "stopped"
-  		else
-  			echo No PID file found!
-  			exit 1
-  		fi
-! 		exit 0
-  	;;
-  
-  	restart)
-- 	        DIR=`dirname $0`
-  		printf "Stopping SER : "
-  		if [ -r $PID_FILE ] ; then
-  			kill `cat $PID_FILE`
-  			echo "stopped"
-  		else
-  			echo No PID file found! SER problably not running
---- 539,558 ----
-  		printf "Stopping SER : "
-  		if [ -r $PID_FILE ] ; then
-  			kill `cat $PID_FILE`
-+ 			rm -f $PID_FILE
-  			echo "stopped"
-  		else
-  			echo No PID file found!
-  			exit 1
-  		fi
-! #		exit 0
-  	;;
-  
-  	restart)
-  		printf "Stopping SER : "
-  		if [ -r $PID_FILE ] ; then
-  			kill `cat $PID_FILE`
-+ 			rm -f $PID_FILE
-  			echo "stopped"
-  		else
-  			echo No PID file found! SER problably not running
-***************
-*** 559,572 ****
-  			exit 1
-  		else
-  			if [ $SYSLOG = 1 ] ; then
-! 			        $DIR/ser -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null
-  			else
-! 			        $DIR/ser -P $PID_FILE -E $STARTOPTIONS
-  			fi
-  			sleep 1
-  			echo "started pid(`cat $PID_FILE`)"
-  		fi
-! 		exit 0
-  	;;
-  
-  	passwd)
---- 565,578 ----
-  			exit 1
-  		else
-  			if [ $SYSLOG = 1 ] ; then
-! 			        /usr/sfw/sbin/ser -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null
-  			else
-! 			        /usr/sfw/sbin/ser -P $PID_FILE -E $STARTOPTIONS
-  			fi
-  			sleep 1
-  			echo "started pid(`cat $PID_FILE`)"
-  		fi
-! #		exit 0
-  	;;
-  
-  	passwd)
-***************
-*** 584,590 ****
-  			exit 1
-  		fi
-  		QUERY="update $TABLE \
-! 			set $HA1_COLUMN='$HA1', $HA1B_COLUMN='$HA1B', $PASSWORD_COLUMN='$2' \
-  			, $SUB_MODIFIED_COLUMN=now() \
-  			WHERE $SUBSCRIBER_COLUMN='$1' and $REALM_COLUMN='$SIP_DOMAIN';"
-  		sql_query "$QUERY"
---- 590,596 ----
-  			exit 1
-  		fi
-  		QUERY="update $TABLE \
-! 			set $HA1_COLUMN='$HA1', $HA1B_COLUMN='$HA1B', $PASSWORD_COLUMN='' \
-  			, $SUB_MODIFIED_COLUMN=now() \
-  			WHERE $SUBSCRIBER_COLUMN='$1' and $REALM_COLUMN='$SIP_DOMAIN';"
-  		sql_query "$QUERY"
-***************
-*** 616,622 ****
-  				($SUBSCRIBER_COLUMN,$REALM_COLUMN,$HA1_COLUMN,\
-  				$HA1B_COLUMN,$PASSWORD_COLUMN,$EMAIL_COLUMN, $SUB_CREATED_COLUMN,  \
-  				$PHP_LIB_COLUMN ) \
-! 				values ('$1','$SIP_DOMAIN','$HA1','$HA1B','$2', '$3', now(), '$HA1' );";
-  		sql_query "$QUERY"
-  		if [ $? -ne 0 ] ; then
-  			echo "introducing a new user to the database failed"
---- 622,628 ----
-  				($SUBSCRIBER_COLUMN,$REALM_COLUMN,$HA1_COLUMN,\
-  				$HA1B_COLUMN,$PASSWORD_COLUMN,$EMAIL_COLUMN, $SUB_CREATED_COLUMN,  \
-  				$PHP_LIB_COLUMN ) \
-! 				values ('$1','$SIP_DOMAIN','$HA1','$HA1B','', '$3', now(), '$HA1' );"; \
-  		sql_query "$QUERY"
-  		if [ $? -ne 0 ] ; then
-  			echo "introducing a new user to the database failed"
-***************
-*** 650,656 ****
-  			sleep $WATCH_PERIOD
-  		done
-  		rm $path
-! 		exit 0
-  		;;
-  
-  	mail)
---- 656,662 ----
-  			sleep $WATCH_PERIOD
-  		done
-  		rm $path
-! #		exit 0
-  		;;
-  
-  	mail)
-***************
-*** 682,688 ****
-  
-  	online)
-  		fifo_cmd ul_dump |grep aor| awk '{print $3}' | sort | sort -mu
-! 		exit $?
-  		;;
-  
-  
---- 688,694 ----
-  
-  	online)
-  		fifo_cmd ul_dump |grep aor| awk '{print $3}' | sort | sort -mu
-! #		exit $?
-  		;;
-  
-  
-***************
-*** 796,799 ****
---- 802,826 ----
-  		;;
-  
-  esac
-+ }
-  
-+ case $1 in
-+ 	file)
-+ 		file_name=$2
-+ 		length=`wc -l $file_name | awk ' {print $1}'`
-+ 		read=0
-+ 		while [ $read -lt $length ]
-+ 		do
-+ 			read=`expr $read + 1`
-+ 			command=`sed -n $read,"$read"p $file_name`
-+ 			set "$command"
-+ 			perform $*
-+ 		done
-+ 		exit $?
-+ 		;;
-+ 
-+ 	*)
-+ 		perform $*
-+ 		exit $?
-+ 		;;
-+ esac
--- a/usr/src/cmd/ser/ser	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.	 All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)ser	1.3	06/03/18 SMI"
-#
-# if SUNWseru or config is not installed exit.
-[ ! -x /usr/sfw/sbin/ser ] || [ ! -f /etc/sfw/ser/ser.cfg ] && exit 0
-
-PATH=$PATH:/usr/sfw/sbin; export PATH
-SIP_DOMAIN="SETUP_DOMAIN"; export SIP_DOMAIN
-
-if [ -z $SIP_DOMAIN ] || [ $SIP_DOMAIN = SETUP_DOMAIN ]
-then
-	echo setup SIP_DOMAIN in $0
-	exit 1
-fi
-
-case "$1" in
-'start')
-
-	#
-	# sleep is added to give mysqld time to start.
-	# sleep can be removed if ser is being used without mysql
-	#
-	(sleep 5; serctl start) &
-	;;
-
-'stop')
-	serctl stop
-	;;
-
-'restart')
-	serctl restart
-	;;
-
-*)
-        echo "Usage: $0 { start | stop | restart }"
-        exit 1
-        ;;
-esac
-exit 0
Binary file usr/src/cmd/ser/ser-0.8.12.tar.gz has changed
--- a/usr/src/cmd/ser/ser.8.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-*** ser.8	Mon May 10 07:49:40 2004
---- ser.8.modified	Mon May 10 08:17:41 2004
-***************
-*** 86,92 ****
-  Reads the configuration from 
-  .B " config\-file" 
-  (default
-! .I  ./ser.cfg
-  ).
-  .TP
-  .BI \-l " address"
---- 86,92 ----
-  Reads the configuration from 
-  .B " config\-file" 
-  (default
-! .I  /etc/sfw/ser/ser.cfg
-  ).
-  .TP
-  .BI \-l " address"
-***************
-*** 147,157 ****
-  
-  .SH FILES
-  .PD 0
-! .B /usr/sbin/ser
-  .br
-! .B /etc/ser/ser.cfg
-  .br
-! .B /usr/lib/ser/modules/*
-  .PD
-  .SH AUTHORS
-  Andrei Pelinescu - Onciul, <[email protected]>
---- 147,157 ----
-  
-  .SH FILES
-  .PD 0
-! .B /usr/sfw/sbin/ser
-  .br
-! .B /etc/sfw/ser/ser.cfg
-  .br
-! .B /usr/sfw/lib/ser/modules/*
-  .PD
-  .SH AUTHORS
-  Andrei Pelinescu - Onciul, <[email protected]>
--- a/usr/src/cmd/ser/ser.cfg.5.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-*** ser.cfg.5	Mon May 10 07:49:51 2004
---- ser.cfg.5.modified	Mon May 10 08:00:52 2004
-***************
-*** 6,16 ****
-  .SH NAME
-  ser.cfg \- ser configuration file
-  .SH SYNOPSIS
-! .I /etc/ser/ser.cfg
-  .SH DESCRIPTION
-  .B ser
-  reads the configuration data from
-! .I /etc/ser/ser.cfg
-  (or the file specified with
-  .B \-f
-  on the command line).
---- 6,16 ----
-  .SH NAME
-  ser.cfg \- ser configuration file
-  .SH SYNOPSIS
-! .I /etc/sfw/ser/ser.cfg
-  .SH DESCRIPTION
-  .B ser
-  reads the configuration data from
-! .I /etc/sfw/ser/ser.cfg
-  (or the file specified with
-  .B \-f
-  on the command line).
-***************
-*** 25,31 ****
-  
-  .SH FILES
-  .bL
-! .I /etc/ser/ser.cfg
-  .br
-  
-  .SH AUTHORS
---- 25,31 ----
-  
-  .SH FILES
-  .bL
-! .I /etc/sfw/ser/ser.cfg
-  .br
-  
-  .SH AUTHORS
--- a/usr/src/cmd/ser/ser.cfg.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-*** ser.cfg	Mon Nov 10 07:35:15 2003
---- ser.cfg.modified	Wed Jul 14 22:57:10 2004
-***************
-*** 6,33 ****
-  
-  # ----------- global configuration parameters ------------------------
-  
-! #debug=3         # debug level (cmd line: -dddddddddd)
-! #fork=yes
-! #log_stderror=no	# (cmd line: -E)
-  
-- /* Uncomment these lines to enter debugging mode 
-- debug=7
-- fork=no
-- log_stderror=yes
-- */
-- 
-  check_via=no	# (cmd. line: -v)
-  dns=no           # (cmd. line: -r)
-  rev_dns=no      # (cmd. line: -R)
-! #port=5060
-  #children=4
-  fifo="/tmp/ser_fifo"
-  
-  # ------------------ module loading ----------------------------------
-  
-! # Uncomment this if you want to use SQL database
-! #loadmodule "/usr/local/lib/ser/modules/mysql.so"
-! 
-  loadmodule "/usr/local/lib/ser/modules/sl.so"
-  loadmodule "/usr/local/lib/ser/modules/tm.so"
-  loadmodule "/usr/local/lib/ser/modules/rr.so"
---- 6,44 ----
-  
-  # ----------- global configuration parameters ------------------------
-  
-! # 
-! # Uncomment these lines to enter debugging mode 
-! #
-! #debug=9
-! #log_stderror=yes
-! #
-! # setting fork to no stops daemon from forking and detaching from the tty.
-! #
-! #fork=no
-! #
-! # specify the interface to listen on. Default is all interfaces. When fork
-! # is set to no default is loopback interface.
-! #
-! #listen=<ip_address>
-  
-  check_via=no	# (cmd. line: -v)
-  dns=no           # (cmd. line: -r)
-  rev_dns=no      # (cmd. line: -R)
-! #
-! # port to listen on. default is 5060
-! #
-! #port=5090
-! #
-! # children/processes per transport protocol. default is 8
-! #
-  #children=4
-+ 
-  fifo="/tmp/ser_fifo"
-+ fifo_mode=438
-  
-  # ------------------ module loading ----------------------------------
-  
-! loadmodule "/usr/local/lib/ser/modules/mysql.so"
-  loadmodule "/usr/local/lib/ser/modules/sl.so"
-  loadmodule "/usr/local/lib/ser/modules/tm.so"
-  loadmodule "/usr/local/lib/ser/modules/rr.so"
-***************
-*** 36,42 ****
-  loadmodule "/usr/local/lib/ser/modules/registrar.so"
-  
-  # Uncomment this if you want digest authentication
-- # mysql.so must be loaded !
-  #loadmodule "/usr/local/lib/ser/modules/auth.so"
-  #loadmodule "/usr/local/lib/ser/modules/auth_db.so"
-  
---- 47,52 ----
-***************
-*** 44,65 ****
-  
-  # -- usrloc params --
-  
-! modparam("usrloc", "db_mode",   0)
-  
-- # Uncomment this if you want to use SQL database 
-- # for persistent storage and comment the previous line
-- #modparam("usrloc", "db_mode", 2)
-- 
-- # -- auth params --
-- # Uncomment if you are using auth module
-- #
-- #modparam("auth_db", "calculate_ha1", yes)
-- #
-- # If you set "calculate_ha1" parameter to yes (which true in this config), 
-- # uncomment also the following parameter)
-- #
-- #modparam("auth_db", "password_column", "password")
-- 
-  # -- rr params --
-  # add value to ;lr param to make some broken UAs happy
-  modparam("rr", "enable_full_lr", 1)
---- 54,62 ----
-  
-  # -- usrloc params --
-  
-! # use MySQL for persistent storage
-! modparam("usrloc", "db_mode", 1)
-  
-  # -- rr params --
-  # add value to ;lr param to make some broken UAs happy
-  modparam("rr", "enable_full_lr", 1)
-***************
-*** 70,77 ****
---- 67,76 ----
-  
-  route{
-  
-+ 	#
-  	# initial sanity checks -- messages with
-  	# max_forwards==0, or excessively long requests
-+ 	#
-  	if (!mf_process_maxfwd_header("10")) {
-  		sl_send_reply("483","Too Many Hops");
-  		break;
-***************
-*** 81,107 ****
-  		break;
-  	};
-  
-  	# we record-route all messages -- to make sure that
-  	# subsequent messages will go through our proxy; that's
-  	# particularly good if upstream and downstream entities
-  	# use different transport protocol
-  	record_route();	
-  	# loose-route processing
-  	if (loose_route()) {
-  		t_relay();
-  		break;
-  	};
-  
-! 	# if the request is for other domain use UsrLoc
-! 	# (in case, it does not work, use the following command
-! 	# with proper names and addresses in it)
-  	if (uri==myself) {
-  
-  		if (method=="REGISTER") {
-  
-! # Uncomment this if you want to use digest authentication
-! #			if (!www_authorize("iptel.org", "subscriber")) {
-! #				www_challenge("iptel.org", "0");
-  #				break;
-  #			};
-  
---- 80,111 ----
-  		break;
-  	};
-  
-+ 	#
-  	# we record-route all messages -- to make sure that
-  	# subsequent messages will go through our proxy; that's
-  	# particularly good if upstream and downstream entities
-  	# use different transport protocol
-+ 	#
-+ 
-  	record_route();	
-+ 
-+ 	#
-  	# loose-route processing
-+ 	#
-  	if (loose_route()) {
-  		t_relay();
-  		break;
-  	};
-  
-! 	lookup("aliases");
-! 
-  	if (uri==myself) {
-  
-  		if (method=="REGISTER") {
-  
-! # Uncomment this if you want to use digest authentication and set domainname 
-! #			if (!www_authorize("domainname", "subscriber")) {
-! #				www_challenge("domainname", "0");
-  #				break;
-  #			};
-  
-***************
-*** 109,125 ****
-  			break;
-  		};
-  
-  		# native SIP destinations are handled using our USRLOC DB
-  		if (!lookup("location")) {
-  			sl_send_reply("404", "Not Found");
-  			break;
-  		};
-  	};
-  	# forward to current uri now; use stateful forwarding; that
-  	# works reliably even if we forward from TCP to UDP
-  	if (!t_relay()) {
-  		sl_reply_error();
-  	};
-  
-  }
-- 
---- 113,134 ----
-  			break;
-  		};
-  
-+ 		#
-  		# native SIP destinations are handled using our USRLOC DB
-+ 		#
-  		if (!lookup("location")) {
-  			sl_send_reply("404", "Not Found");
-  			break;
-  		};
-  	};
-+ 
-+ 	#
-  	# forward to current uri now; use stateful forwarding; that
-  	# works reliably even if we forward from TCP to UDP
-+ 	#
-+ 
-  	if (!t_relay()) {
-  		sl_reply_error();
-  	};
-  
-  }
--- a/usr/src/cmd/ser/ser_mysql.sh.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-*** ser_mysql.sh	Sat Jun 19 14:49:39 2004
---- ser_mysql.sh.modified	Sat Jun 19 14:49:30 2004
-***************
-*** 35,40 ****
---- 35,41 ----
-  DUMP_CMD="mysqldump -h $DBHOST -u$SQL_USER -c -t "
-  BACKUP_CMD="mysqldump -h $DBHOST -u$SQL_USER -c "
-  TABLE_TYPE="TYPE=MyISAM"
-+ PATH="$PATH:/usr/sfw/sbin:/usr/sfw/bin:/usr/sfw/lib/ser"; export PATH
-  # user name column
-  USERCOL="username"
-  
-***************
-*** 172,178 ****
-  		($USERCOL, password, first_name, last_name, phone, 
-  		email_address, datetime_created, datetime_modified, confirmation, 
-  		flag, sendnotification, greeting, ha1, domain, ha1b, phplib_id, perms ) 
-! 		VALUES ( 'admin', 'heslo', 'Initial', 'Admin', '123', 
-  		'root@localhost', '2002-09-04 19:37:45', '0000-00-00 00:00:00', 
-  		'57DaSIPuCm52UNe54LF545750cfdL48OMZfroM53', 'o', '', '', 
-  		'$HA1', '$SIP_DOMAIN', '$HA1B',
---- 173,179 ----
-  		($USERCOL, password, first_name, last_name, phone, 
-  		email_address, datetime_created, datetime_modified, confirmation, 
-  		flag, sendnotification, greeting, ha1, domain, ha1b, phplib_id, perms ) 
-! 		VALUES ( 'admin', '', 'Initial', 'Admin', '123', 
-  		'root@localhost', '2002-09-04 19:37:45', '0000-00-00 00:00:00', 
-  		'57DaSIPuCm52UNe54LF545750cfdL48OMZfroM53', 'o', '', '', 
-  		'$HA1', '$SIP_DOMAIN', '$HA1B',
--- a/usr/src/cmd/ser/sunman-stability	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to add the Solaris stability classification,\
-\.\\" and to add a note about source availability ([email protected]).\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	service/network/sip/ser\
-=\
-Interface Stability	External\
-.TE \
-.PP\
-.SH NOTES\
-Source for ser is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/usr/src/cmd/serweb/METADATA	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             serweb
-VERSION:          0.9.4
-DESCRIPTION:      SIP proxy web provisioning
-LICENSE:          GPLv2
-PACKAGE:          SUNWserweb
-PROJECT_URL:      http://www.iptel.org/ser/serweb/
-SOURCE_DOWNLOAD:  http://www.iptel.org/ser/serweb/serweb_2004-01-04.tar.gz
-SUPPORT:          C
-BUGTRAQ:          solaris/network/sip
-OSR:              2240
-COMMENTS:         
--- a/usr/src/cmd/serweb/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile.sfw	1.7	08/02/09 SMI"
-#
-#
-
-VER=serweb_2004-01-04
-
-all: $(VER)/configure
-	@find . -name core -exec rm -f {} \;
-
-include ../Makefile.cmd
-
-install: all
-	$(SH) ./install-sfw
-
-$(VER)/configure: $(VER).tar.gz
-	gzip -dc $(VER).tar.gz | tar xopf -
-	rm -f $(VER)/html/epilog.html
-	cp epilog.html $(VER)/html/epilog.html
-	rm -f $(VER)/html/prolog.html
-	cp prolog.html $(VER)/html/prolog.html
-	rm -f $(VER)/html/separator.html
-	cp separator.html $(VER)/html/separator.html
-	(cd $(VER)/html; gpatch < ../../config.php.patch)
-	(cd $(VER)/html; gpatch < ../../sql_and_fifo_functions.php.patch)
-	(cd $(VER)/html/user_interface; gpatch < ../../../index.php.patch)
-	(cd $(VER)/html/user_interface; gpatch < ../../../my_account.php.patch)
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
--- a/usr/src/cmd/serweb/README.solaris.serweb	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-serweb is a web based user and administrator interface for sip express router
-(ser). This web interface has been tested with Apache 1.3.29 and MySQL 4.0.
-It requires SFWmphp which is not installed by default but is available on the
-Companion CD shipped with Solaris.
-
-Configuring serweb:
-
-Apache comes preinstalled on the system. In case Apache is not installed,
-install the following Sun packages:
-
-SUNWapchr (Apache Web Server (root))
-SUNWapchu (Apache Web Server (usr))
-SUNWapchd (Only if you want documentation)
-
-serweb requires PHP support for Apache which is not installed on a
-default system. Install the following Sun package from the Solaris Companion CD:
-
-SFWmphp (Scripting Language Tool for dynamic web pages (with MySQL API))
-
-Run /opt/sfw/apache/x_postinstall
-
-Copy /etc/apache/httpd.conf-php-example to /etc/apache/httpd.conf
-
-Edit /etc/apache/httpd.conf file and make the following changes:
-
-Modify DirectoryIndex section to add index.php
-
-<IfModule mod_dir.c>
-DirectoryIndex index.html index.php
-</IfModule>
-
-Set Servername to the appropriate name.
-
-Point DocumentRoot to where you have installed serweb.
-For default install it should be
-
-DocumentRoot "/usr/sfw/share/serweb/html"
-
-Edit /etc/apache/php.ini or create one to have
-register_globals = on
-short_open_tag = on
-
-/usr/sfw/share/serweb/html/config.php should be updated with site specific
-information. For minimum operation db_host, root_path, realm, domainname
-and default_domain need to be setup.
-
-Note: /usr/sfw/share/serweb/html/config.php contains passwd for the
-      database, make sure only mysqld can read it.
-
-The following url's can be used to access the two interfaces:
-
-http://<server_name>/user_interface
-
-http://<server_name>/admin
-
-Voicemail is not supported.
-
--- a/usr/src/cmd/serweb/config.php.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-*** config.php	Wed Jun 16 17:30:23 2004
---- config.php.modified	Wed Jun 16 17:32:30 2004
-***************
-*** 158,164 ****
-  		   the SER account for MySQl, you need to update here 
-  		*/
-  
-! 		$this->db_host="192.168.2.16";		//database host
-  		$this->db_name="ser";			//database name
-  		$this->db_user="ser";			//database conection user
-  		$this->db_pass="heslo";			//database conection password
---- 158,164 ----
-  		   the SER account for MySQl, you need to update here 
-  		*/
-  
-! 		$this->db_host="localhost";		//database host
-  		$this->db_name="ser";			//database name
-  		$this->db_user="ser";			//database conection user
-  		$this->db_pass="heslo";			//database conection password
-***************
-*** 175,187 ****
-  		   Don't forget trailing slash.  
-  			Hint: if path incorrect, image buttons do not show up
-  		*/
-! 		$this->root_path="/iptel/html/";
-  		/* roo uri of your server */
-  		/* $this->root_uri="http://192.168.2.16"; */
-  		$this->root_uri="http://".$_SERVER['SERVER_NAME'];
-  
-  		/* where is your zone file on your server ? */
-! 		$this->zonetab_file =   "/usr/share/zoneinfo/zone.tab";
-  		/* serweb will send confirmation emails and SIP IMs -- what sender 
-  		   address should it claim ?
-  		   should appear in them ?
---- 175,187 ----
-  		   Don't forget trailing slash.  
-  			Hint: if path incorrect, image buttons do not show up
-  		*/
-! 		$this->root_path="/";
-  		/* roo uri of your server */
-  		/* $this->root_uri="http://192.168.2.16"; */
-  		$this->root_uri="http://".$_SERVER['SERVER_NAME'];
-  
-  		/* where is your zone file on your server ? */
-! 		$this->zonetab_file =   "/usr/share/lib/zoneinfo/tab/zone_sun.tab";
-  		/* serweb will send confirmation emails and SIP IMs -- what sender 
-  		   address should it claim ?
-  		   should appear in them ?
-***************
-*** 210,220 ****
-  		$this->epilog="/epilog.html";
-  
-  		/* content of html <title> tag */
-! 		$this->title="iptel.org, the IP Telephony Site";
-  
-  		/* your domain name */
-! 		$this->realm=$this->domainname=$this->default_domain=
-! 			ereg_replace( "(www\.|sip\.)?(.*)", "\\2",  $_SERVER['SERVER_NAME']);
-  		/* initial nummerical alias for new subscriber -- don't forget to
-  		   align your SER routing script to it !
-  		*/
---- 210,221 ----
-  		$this->epilog="/epilog.html";
-  
-  		/* content of html <title> tag */
-! 		$this->title="serweb - ser web interface";
-  
-  		/* your domain name */
-! 		/* $this->realm=$this->domainname=$this->default_domain=
-! 			ereg_replace( "(www\.|sip\.)?(.*)", "\\2",  $_SERVER['SERVER_NAME']); */
-! 		$this->realm=$this->domainname=$this->default_domain="SET_YOUR_DOMAIN in config.php";
-  		/* initial nummerical alias for new subscriber -- don't forget to
-  		   align your SER routing script to it !
-  		*/
-***************
-*** 249,257 ****
-  		$this->enable_tabs[2]=true;					//enable tab phonebook
-  		$this->enable_tabs[3]=true;				//enable tab missed calls
-  		$this->enable_tabs[4]=true;				//enable tab accounting
-! 		$this->enable_tabs[5]=true;					//enable tab send IM
-  		$this->enable_tabs[6]=false;				//enable tab notification subscription
-! 		$this->enable_tabs[7]=true;				//enable tab message store
-  
-  		/* admin tabs definitions
-  			Ctab (enabled, name_of_tab, php_script)
---- 250,258 ----
-  		$this->enable_tabs[2]=true;					//enable tab phonebook
-  		$this->enable_tabs[3]=true;				//enable tab missed calls
-  		$this->enable_tabs[4]=true;				//enable tab accounting
-! 		$this->enable_tabs[5]=false;					//enable tab send IM
-  		$this->enable_tabs[6]=false;				//enable tab notification subscription
-! 		$this->enable_tabs[7]=false;				//enable tab message store
-  
-  		/* admin tabs definitions
-  			Ctab (enabled, name_of_tab, php_script)
-***************
-*** 270,279 ****
-  		/* experimental/incomplete features turned off: voicemail
-  		   and set up a jabber account for each new SIP user too
-  		*/
-! 		$this->show_voicemail_acl=true; /* show voicemail in ACL list */
-  		$this->show_voice_silo=false; /* show voice messages in silo too */
-  		$this->enable_dial_voicemail=false;
-! 		$this->enable_tabs[8]=true;				//enable tab voicemail
-  		$this->setup_jabber_account=false;
-  
-  		/* ------------------------------------------------------------*/
---- 271,280 ----
-  		/* experimental/incomplete features turned off: voicemail
-  		   and set up a jabber account for each new SIP user too
-  		*/
-! 		$this->show_voicemail_acl=false; /* show voicemail in ACL list */
-  		$this->show_voice_silo=false; /* show voice messages in silo too */
-  		$this->enable_dial_voicemail=false;
-! 		$this->enable_tabs[8]=false;				//enable tab voicemail
-  		$this->setup_jabber_account=false;
-  
-  		/* ------------------------------------------------------------*/
-***************
-*** 325,331 ****
-  			"We are reserving the following SIP address for you: #sip_address#\n\n".
-  			"To finalize your registration please check the following URL within ".
-  			"24 hours:\n".
-! 			$this->root_uri.$this->root_path."user/reg/confirmation.php?nr=#confirm#\n\n".
-  			"(If you confirm later you will have to re-register.)\n\n".
-  			"Windows Messenger users may look at additional configuration hints at\n".
-  			"http://www.iptel.org/phpBB/viewtopic.php?topic=11&forum=1&0\n";
---- 326,332 ----
-  			"We are reserving the following SIP address for you: #sip_address#\n\n".
-  			"To finalize your registration please check the following URL within ".
-  			"24 hours:\n".
-! 			$this->root_uri.$this->root_path."user_interface/reg/confirmation.php?nr=#confirm#\n\n".
-  			"(If you confirm later you will have to re-register.)\n\n".
-  			"Windows Messenger users may look at additional configuration hints at\n".
-  			"http://www.iptel.org/phpBB/viewtopic.php?topic=11&forum=1&0\n";
-***************
-*** 567,573 ****
-  		   which sometimes happens, when it is calculated from an
-  		   incorrect domain during installation process
-  		*/
-! 		$this->clear_text_pw=1;
-  
-  	}
-  }
---- 568,574 ----
-  		   which sometimes happens, when it is calculated from an
-  		   incorrect domain during installation process
-  		*/
-! 		$this->clear_text_pw=0;
-  
-  	}
-  }
--- a/usr/src/cmd/serweb/epilog.html	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-</body>
--- a/usr/src/cmd/serweb/index.php.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-*** html/user_interface/index.php.ORIG	Wed May 26 17:49:39 2004
---- html/user_interface/index.php	Thu May 27 11:38:12 2004
-***************
-*** 106,114 ****
-  <br>
-  <table border="0" cellspacing="0" cellpadding="0" align="center">
-  <tr>
-! <td><a href="<?$sess->purl("reg/get_pass.php");?>">Forgot Password?</a></td>
-  <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-! <td><a href="<?$sess->purl("reg/index.php");?>">Subscribe!</a></td>
-  </tr>
-  </table>
-  <?$f->finish();					// Finish form?>
---- 106,119 ----
-  <br>
-  <table border="0" cellspacing="0" cellpadding="0" align="center">
-  <tr>
-! <!-- /*** self sunbscription and mailing of password has been disabled.
-! <td><a href="<?
-! /** mailing of password has been disabled.
-! $sess->purl("reg/get_pass.php");
-! **/?>">Forgot Password?</a></td>
-  <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-! -->
-! <td><a href="<? $sess->purl("reg/index.php"); ?>">Subscribe!</a></td>
-  </tr>
-  </table>
-  <?$f->finish();					// Finish form?>
--- a/usr/src/cmd/serweb/install-sfw	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#!/usr/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)install-sfw	1.5	06/04/13 SMI"
-#
-
-VERS=2004-01-04
-PKGVERS=serweb_${VERS}
-PREFIX=${ROOT}/usr/sfw/share
-
-. ${SRC}/tools/install.subr
-
-
-echo "install serweb"
-
-_install N README.solaris.serweb $PREFIX/serweb/README.solaris.serweb 444
-
-cd ${PKGVERS}
-
-# Install files html and phplib
-DIRS="html phplib"
-for dir in $DIRS 
-do
-	for file in `find $dir -name CVS -prune -o -type f -print `
-	do
-		_install N $file  $PREFIX/serweb/$file 444
-	done
-done
-chmod 0440 $PREFIX/serweb/html/config.php
--- a/usr/src/cmd/serweb/my_account.php.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-*** html/user_interface/my_account.php.ORIG	Wed May 26 18:30:27 2004
---- html/user_interface/my_account.php	Wed May 26 18:29:41 2004
-***************
-*** 223,229 ****
-  			$inpb=$user_id."@".$config->domainname.":".$config->realm.":".$passwd;
-  			$ha1b=md5($inpb);
-  			
-! 			$qpass=", password='$passwd', ha1='$ha1', ha1b='$ha1b'";
-  		}
-  		
-   		$q="update ".$config->table_subscriber.
---- 223,231 ----
-  			$inpb=$user_id."@".$config->domainname.":".$config->realm.":".$passwd;
-  			$ha1b=md5($inpb);
-  			
-! 			// We are not storing passwd in clear text
-! 			// to enable that do password='$passwd'
-! 			$qpass=", password='', ha1='$ha1', ha1b='$ha1b'";
-  		}
-  		
-   		$q="update ".$config->table_subscriber.
--- a/usr/src/cmd/serweb/prolog.html	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<body><h1>
--- a/usr/src/cmd/serweb/separator.html	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-</h1><hr>
Binary file usr/src/cmd/serweb/serweb_2004-01-04.tar.gz has changed
--- a/usr/src/cmd/serweb/sql_and_fifo_functions.php.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-*** html/sql_and_fifo_functions.php.ORIG	Thu May 27 11:33:42 2004
---- html/sql_and_fifo_functions.php	Thu May 27 11:36:11 2004
-***************
-*** 87,93 ****
---- 87,98 ----
-  
-  	$q="insert into ".$table." (username, password, first_name, last_name, phone, email_address, ".
-  			"datetime_created, datetime_modified, confirmation, ha1, ha1b, domain, phplib_id, timezone) ".
-+ /***
-+ 		We are not storing clear text passwds.
-+ 
-  		"values ('$uname', '$passwd', '$fname', '$lname', '$phone', '$email', now(), now(), '$confirm', ".
-+ ****/
-+ 		"values ('$uname', '', '$fname', '$lname', '$phone', '$email', now(), now(), '$confirm', ".
-  			"'$ha1', '$ha1b','$domain', '".md5(uniqid('fvkiore'))."', '$timezone')";
-  
-  	$res=mySQL_query($q);
--- a/usr/src/cmd/vim/runtime.patch	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch	Fri Jun 11 23:41:07 2010 -0700
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \10/05/25*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/06/10*\\a[%*\\d]:\ Entering\ directory\ `%f',
 diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
 --- runtime.patched/compiler/jikes.vim	2004-06-07 07:32:36.000000000 -0700
 +++ runtime/compiler/jikes.vim	2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/lib/Makefile	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/lib/Makefile	Fri Jun 11 23:41:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.93	10/04/02 SMI"
+# ident	"@(#)Makefile	1.94	10/05/27 SMI"
 #
 
 #
@@ -164,7 +164,7 @@
 imperius: antlr2 sblim
 jaxb: activation
 saaj: activation
-ant: antlr2
+ant: antlr2 junit
 wiseman: saaj jaxb
 trousers: openssl
 pam_pkcs11: openssl
--- a/usr/src/lib/ant/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/lib/ant/Makefile.sfw	Fri Jun 11 23:41:07 2010 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.13	09/05/21 SMI"
+# ident	"@(#)Makefile.sfw	1.14	10/05/27 SMI"
 #
 
 include ../Makefile.lib
@@ -46,14 +45,13 @@
 
 SFW_PATH="$(SPRO_VROOT)/bin:$(JDK)/bin:$(PATH)"
 JDK=$(JAVA6_ROOT)
-CLASS_PATH=$(CLASSPATH):$(ROOT)/usr/share/antlr-2.7.7/antlr.jar
+CLASS_PATH=$(CLASSPATH):$(ROOT)/usr/share/lib/java/junit.jar:$(ROOT)/usr/share/antlr-2.7.7/antlr.jar
 
 install: all
 	ksh93 ./install-sfw
 
 $(ANT): $(ANT)-src.zip
 	unzip -q -o $(ANT)-src.zip
-	patch -i build_xml.patch ${ANT}/build.xml
 	(cd $(ANT); unset ANT_HOME || true; env - \
 	    CLASSPATH=$(CLASS_PATH) \
 	    JAVA_HOME=$(JDK) \
--- a/usr/src/lib/ant/build_xml.patch	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Remove of redundant execution dependency.
-
---- build.xml	2008-06-27 06:05:24.000000000 +0200
-+++ build.xml	2008-11-15 21:48:48.125000000 +0100
-@@ -925,7 +925,7 @@
-        ===================================================================
-   -->
-   <target name="dist-lite"
--    depends="jars,test-jar"
-+    depends="jars"
-     description="--> creates a minimum distribution to run Apache Ant">
- 
-     <mkdir dir="${dist.dir}"/>
--- a/usr/src/lib/libmemcached/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/lib/libmemcached/Makefile.sfw	Fri Jun 11 23:41:07 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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.2	09/09/03 SMI"
+# ident	"@(#)Makefile.sfw	1.3	10/06/07 SMI"
 
 # Libmemcached 0.16
 
@@ -36,6 +35,7 @@
 CFLAGS64 += -mt $(CCBITS64) -xstrconst
 LDFLAGS = -L$(ROOT)/usr/lib -lsocket -lnsl
 LDFLAGS64 = -L${ROOT}/usr/lib/${MACH64} -lsocket -lnsl
+SFW_ENV += "pkglibdir=/usr/lib"
 
 all: all32 all64
 
@@ -43,24 +43,21 @@
 	(cd $(VER); env \
 	CC=$(CC) "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" \
 	CXX=$(CCC) "CXXFLAGS=$(CCFLAGS)" \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	$(CCSMAKE))
 
 all64: $(VER64)/config.status
 	(cd $(VER64); env \
 	CC=$(CC64) "CFLAGS=$(CFLAGS64)" "LDFLAGS=$(LDFLAGS64)" \
 	CXX=$(CCC64) "CXXFLAGS=$(CCFLAGS64)" \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	$(CCSMAKE))
 
 install32: all32
 	(cd $(VER); env \
 	INSTALL=/usr/ucb/install \
 	DESTDIR=$(ROOT) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	$(CCSMAKE) install)
 	$(SH) ./install-sfw
 
@@ -68,8 +65,7 @@
 	(cd $(VER64)/lib; env \
 	INSTALL=/usr/ucb/install \
 	DESTDIR=$(ROOT) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	$(CCSMAKE) install)
 	MACH64=$(MACH64) $(SH) ./install-sfw-64
 
@@ -78,8 +74,7 @@
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); env \
 	CC=$(CC) "CFLAGS=$(CFLAGS)" \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	./configure --prefix=/usr \
 		--bindir=/usr/bin \
 		--libdir=/usr/lib \
@@ -89,8 +84,7 @@
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64); env \
 	CC=$(CC64) "CFLAGS=$(CFLAGS64)" \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
+	$(SFW_ENV) \
 	./configure --prefix=/usr \
 		--bindir=/usr/bin \
 		--libdir=/usr/lib/${MACH64} \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/trousers/Patches/tspi_Makefile.am.patch	Fri Jun 11 23:41:07 2010 -0700
@@ -0,0 +1,19 @@
+--- src/tspi/Makefile.am.old	Thu Jan 28 13:45:54 2010
++++ src/tspi/Makefile.am	Fri May 28 14:00:42 2010
+@@ -17,7 +17,7 @@
+ # 5. If any interfaces have been added since the last public release, then increment age.
+ # 6. If any interfaces have been removed since the last public release, then set age to 0.
+ 
+-libtspi_la_LDFLAGS=-version-info 2:3:1 -lpthread @CRYPTOLIB@
++libtspi_la_LDFLAGS=-version-info 2:3:1 @CRYPTOLIB@
+ 
+ libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
+ 
+@@ -217,7 +217,6 @@
+ libtspi_la_SOURCES+=gtk/main.c gtk/support.c gtk/interface.c gtk/callbacks.c
+ endif
+ if OPENSSL_UI
+-libtspi_la_LDFLAGS+=-lssl
+ libtspi_la_SOURCES+=ssl_ui.c
+ endif
+ 
--- a/usr/src/pkgdefs/Makefile	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/Makefile	Fri Jun 11 23:41:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.281	10/04/09 SMI"
+# ident	"@(#)Makefile	1.282	10/06/09 SMI"
 #
 
 #
@@ -390,9 +390,6 @@
 	SUNWsblimwbemcli \
 	SUNWscreen \
 	SUNWscreenrc \
-	SUNWserr \
-	SUNWseru \
-	SUNWserweb \
 	SUNWsg3utilsr \
 	SUNWsg3utilsu \
 	SUNWshmux \
--- a/usr/src/pkgdefs/SUNWant/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWant/prototype_com	Fri Jun 11 23:41:07 2010 -0700
@@ -20,10 +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.10	09/08/23 SMI"
+# ident	"@(#)prototype_com	1.11	10/05/27 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -1655,6 +1654,7 @@
 f none usr/share/lib/ant/mmetrics-frames.xsl 0444 root bin
 f none usr/share/lib/ant/ant.jar 0444 root bin
 f none usr/share/lib/ant/ant-antlr.jar 0444 root bin
+f none usr/share/lib/ant/ant-testutil.jar 0444 root bin
 f none usr/share/lib/ant/ant-trax.jar 0444 root bin
 f none usr/share/lib/ant/log.xsl 0444 root bin
 f none usr/share/lib/ant/ant-bootstrap.jar 0444 root bin
--- a/usr/src/pkgdefs/SUNWdvdrw/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWdvdrw/pkginfo.tmpl	Fri Jun 11 23:41:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,11 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+
+#
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.4	06/03/30 SMI"
+# ident	"@(#)pkginfo.tmpl	1.5	10/05/21 SMI"
 #
+
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -38,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="dvd+rw-tools 5.21.4.10.8"
+DESC="dvd+rw-tools 7.1"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWdvdrw/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWdvdrw/prototype_com	Fri Jun 11 23:41:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.4	09/09/04 SMI"
+# ident	"@(#)prototype_com	1.5	10/05/21 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
@@ -54,3 +52,7 @@
 d none usr/share/man 755 root bin
 d none usr/share/man/man1 755 root bin
 f none usr/share/man/man1/growisofs.1 444 root bin
+f none usr/share/man/man1/dvd+rw-format.1 444 root bin
+f none usr/share/man/man1/dvd-ram-control.1 444 root bin
+f none usr/share/man/man1/dvd+rw-booktype.1 444 root bin
+f none usr/share/man/man1/dvd+rw-mediainfo.1 444 root bin
--- a/usr/src/pkgdefs/SUNWgnu-coreutils/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgnu-coreutils/pkginfo.tmpl	Fri Jun 11 23:41:07 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) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)pkginfo.tmpl	1.2	09/07/30 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/27 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU core utilities (7.4)"
+DESC="GNU core utilities (8.5)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-coreutils/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgnu-coreutils/prototype_com	Fri Jun 11 23:41:07 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) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.3	09/08/05 SMI"
+#ident	"@(#)prototype_com	1.4	10/05/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
@@ -49,6 +48,7 @@
 f none usr/bin/dircolors 0555 root bin
 f none usr/bin/ginstall 0555 root bin
 f none usr/bin/md5sum 0555 root bin
+f none usr/bin/nproc 0555 root bin
 f none usr/bin/pinky 0555 root bin
 f none usr/bin/printenv 0555 root bin
 f none usr/bin/ptx 0555 root bin
@@ -62,6 +62,7 @@
 f none usr/bin/shred 0555 root bin
 f none usr/bin/shuf 0555 root bin
 f none usr/bin/stat 0555 root bin
+f none usr/bin/stdbuf 0555 root bin
 f none usr/bin/tac 0555 root bin
 f none usr/bin/timeout 0555 root bin
 f none usr/bin/truncate 0555 root bin
@@ -219,6 +220,8 @@
 f none usr/gnu/share/man/man1/who.1 0444 root bin
 f none usr/gnu/share/man/man1/whoami.1 0444 root bin
 f none usr/gnu/share/man/man1/yes.1 0444 root bin
+d none usr/lib 0755 root bin
+f none usr/lib/libstdbuf.so 0555 root bin
 d none usr/share 0755 root sys
 d none usr/share/info 0755 root bin
 f none usr/share/info/coreutils.info 0444 root bin
@@ -229,6 +232,7 @@
 f none usr/share/man/man1/dircolors.1 0444 root bin
 f none usr/share/man/man1/ginstall.1 0444 root bin
 f none usr/share/man/man1/md5sum.1 0444 root bin
+f none usr/share/man/man1/nproc.1 0444 root bin
 f none usr/share/man/man1/pinky.1 0444 root bin
 f none usr/share/man/man1/printenv.1 0444 root bin
 f none usr/share/man/man1/ptx.1 0444 root bin
@@ -242,6 +246,7 @@
 f none usr/share/man/man1/shred.1 0444 root bin
 f none usr/share/man/man1/shuf.1 0444 root bin
 f none usr/share/man/man1/stat.1 0444 root bin
+f none usr/share/man/man1/stdbuf.1 0444 root bin
 f none usr/share/man/man1/tac.1 0444 root bin
 f none usr/share/man/man1/timeout.1 0444 root bin
 f none usr/share/man/man1/truncate.1 0444 root bin
--- a/usr/src/pkgdefs/SUNWmysql5test/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWmysql5test/prototype_com	Fri Jun 11 23:41:07 2010 -0700
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.6	09/10/13 SMI"
+# ident	"@(#)prototype_com	1.7	10/05/31 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
@@ -177,6 +177,7 @@
 f none usr/mysql/5.0/mysql-test/t/binlog.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/binlog_index.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/binlog_innodb.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/binlog_delete_and_flush_index.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/binlog_killed.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/binlog_killed_simulate-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/binlog_killed_simulate.test 0644 root bin
@@ -187,6 +188,8 @@
 f none usr/mysql/5.0/mysql-test/t/bug40113.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/bug40113-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/bug46080.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/bug41756.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/bug41756-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/bug46080-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/mysql-bug45236.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/bulk_replace.test 0644 root bin
@@ -267,8 +270,10 @@
 f none usr/mysql/5.0/mysql-test/t/federated_bug_25714.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/federated_disabled-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/federated_disabled.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/federated_debug-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/federated_innodb-slave.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/federated_innodb.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/federated_debug.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/fix_priv_tables.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/flush.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/flush2-master.opt 0644 root bin
@@ -321,6 +326,7 @@
 f none usr/mysql/5.0/mysql-test/t/gis.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/grant.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/grant2.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/grant_lowercase_fs.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/grant3-master.opt 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/grant3.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/grant_cache.test 0644 root bin
@@ -360,6 +366,8 @@
 f none usr/mysql/5.0/mysql-test/t/innodb-autoinc-optimize.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/innodb-big.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/innodb_bug35220.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/innodb_bug46000.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/innodb_bug47777.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/innodb_bug42419.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/innodb_bug40565.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/innodb-deadlock.test 0644 root bin
@@ -756,6 +764,7 @@
 f none usr/mysql/5.0/mysql-test/t/status2.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/schema.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/select.test 0644 root bin
+f none usr/mysql/5.0/mysql-test/t/subselect4.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/select_found.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/select_safe.test 0644 root bin
 f none usr/mysql/5.0/mysql-test/t/shm-master.opt 0644 root bin
@@ -902,13 +911,16 @@
 f none usr/mysql/5.0/mysql-test/r/binlog_killed.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/binlog_killed_simulate.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/binlog_start_comment.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/binlog_delete_and_flush_index.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/blackhole.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/bool.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/bootstrap.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/bulk_replace.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/bug40113.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/bug46080.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/bug41756.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/case.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/case_insensitive_fs.require 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/case_sensitive_file_system.require 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/cast.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/check.result 0644 root bin
@@ -979,6 +991,7 @@
 f none usr/mysql/5.0/mysql-test/r/federated_bug_25714.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/federated_disabled.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/federated_innodb.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/federated_debug.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/fix_priv_tables.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/flush.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/flush2.result 0644 root bin
@@ -1029,6 +1042,7 @@
 f none usr/mysql/5.0/mysql-test/r/grant.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/grant2.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/grant3.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/grant_lowercase_fs.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/grant_cache.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/greedy_optimizer.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/group_by.result 0644 root bin
@@ -1115,6 +1129,8 @@
 f none usr/mysql/5.0/mysql-test/r/innodb_bug35220.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/innodb_bug42419.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/innodb_bug40565.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/innodb_bug46000.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/innodb_bug47777.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/innodb-autoinc-optimize.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/insert.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/insert_notembedded.result 0644 root bin
@@ -1445,6 +1461,7 @@
 f none usr/mysql/5.0/mysql-test/r/subselect.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/subselect2.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/subselect3.result 0644 root bin
+f none usr/mysql/5.0/mysql-test/r/subselect4.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/subselect_gis.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/subselect_innodb.result 0644 root bin
 f none usr/mysql/5.0/mysql-test/r/subselect_notembedded.result 0644 root bin
@@ -1532,6 +1549,7 @@
 f none usr/mysql/5.0/mysql-test/include/have_big5.inc 0644 root bin
 f none usr/mysql/5.0/mysql-test/include/have_blackhole.inc 0644 root bin
 f none usr/mysql/5.0/mysql-test/include/have_bug25714.inc 0644 root bin
+f none usr/mysql/5.0/mysql-test/include/have_case_insensitive_fs.inc 0644 root bin
 f none usr/mysql/5.0/mysql-test/include/have_case_sensitive_file_system.inc 0644 root bin
 f none usr/mysql/5.0/mysql-test/include/have_compress.inc 0644 root bin
 f none usr/mysql/5.0/mysql-test/include/have_community_features.inc 0644 root bin
@@ -1625,6 +1643,7 @@
 f none usr/mysql/5.0/mysql-test/std_data/Index.xml 0644 root bin
 f none usr/mysql/5.0/mysql-test/std_data/Moscow_leap 0644 root bin
 f none usr/mysql/5.0/mysql-test/std_data/bad_gis_data.dat 0644 root bin
+f none usr/mysql/5.0/mysql-test/std_data/binlog_transaction.000001 0644 root bin
 f none usr/mysql/5.0/mysql-test/std_data/bug15328.cnf 0644 root bin
 f none usr/mysql/5.0/mysql-test/std_data/bug16266.000001 0644 root bin
 f none usr/mysql/5.0/mysql-test/std_data/bug19371.MYD 0644 root bin
--- a/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl	Fri Jun 11 23:41:07 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	"@(#)pkginfo.tmpl	1.3	10/02/19 SMI"
+# ident	"@(#)pkginfo.tmpl	1.4	10/06/02 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="OpenLDAP 2.4.11"
+DESC="OpenLDAP 2.4.21"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenldapr/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapr/prototype_com	Fri Jun 11 23:41:07 2010 -0700
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.5	10/04/22 SMI"
+# ident	"@(#)prototype_com	1.6	10/06/02 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
@@ -63,11 +62,11 @@
 f none etc/openldap/schema/inetorgperson.schema 444 root sys
 f none etc/openldap/schema/java.schema 444 root sys
 f none etc/openldap/schema/misc.schema 444 root sys
-f none etc/openldap/schema/nadf.schema 444 root sys
 f none etc/openldap/schema/nis.ldif 444 root sys
 f none etc/openldap/schema/nis.schema 444 root sys
 f none etc/openldap/schema/openldap.ldif 444 root sys
 f none etc/openldap/schema/openldap.schema 444 root sys
+f none etc/openldap/schema/pmi.schema 444 root sys
 f none etc/openldap/schema/ppolicy.schema 444 root sys
 d none etc/security 755 root sys
 d none etc/security/exec_attr.d 755 root sys
--- a/usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapu/pkginfo.tmpl	Fri Jun 11 23:41:07 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	"@(#)pkginfo.tmpl	1.1	08/10/24 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	10/06/02 SMI"
 
 #
 # This required package information file describes characteristics of the
@@ -38,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenLDAP 2.4.11"
+DESC="OpenLDAP 2.4.21"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_com	Fri Jun 11 23:41:07 2010 -0700
@@ -19,11 +19,9 @@
 #
 # CDDL HEADER END
 #
+# 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	"@(#)prototype_com	1.1	08/10/24 SMI"
+# ident	"@(#)prototype_com	1.2	10/06/02 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,6 +55,7 @@
 f none usr/bin/openldapmodrdn 555 root bin
 f none usr/bin/openldappasswd 555 root bin
 f none usr/bin/openldapsearch 555 root bin
+f none usr/bin/openldapurl 555 root bin
 f none usr/bin/openldapwhoami 555 root bin
 d none usr/include 755 root bin
 d none usr/include/openldap 755 root bin
@@ -69,15 +68,15 @@
 f none usr/include/openldap/ldap_utf8.h 444 root bin
 f none usr/include/openldap/slapi-plugin.h 444 root bin
 d none usr/lib 755 root bin
-f none usr/lib/liblber-2.4.so.2.1.0 555 root bin
-s none usr/lib/liblber-2.4.so=liblber-2.4.so.2.1.0
-s none usr/lib/liblber-2.4.so.2=liblber-2.4.so.2.1.0
-f none usr/lib/libldap-2.4.so.2.1.0 555 root bin
-s none usr/lib/libldap-2.4.so=libldap-2.4.so.2.1.0
-s none usr/lib/libldap-2.4.so.2=libldap-2.4.so.2.1.0
-f none usr/lib/libldap_r-2.4.so.2.1.0 555 root bin
-s none usr/lib/libldap_r-2.4.so=libldap_r-2.4.so.2.1.0
-s none usr/lib/libldap_r-2.4.so.2=libldap_r-2.4.so.2.1.0
+f none usr/lib/liblber-2.4.so.2.5.4 555 root bin
+s none usr/lib/liblber-2.4.so=liblber-2.4.so.2.5.4
+s none usr/lib/liblber-2.4.so.2=liblber-2.4.so.2.5.4
+f none usr/lib/libldap-2.4.so.2.5.4 555 root bin
+s none usr/lib/libldap-2.4.so=libldap-2.4.so.2.5.4
+s none usr/lib/libldap-2.4.so.2=libldap-2.4.so.2.5.4
+f none usr/lib/libldap_r-2.4.so.2.5.4 555 root bin
+s none usr/lib/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
+s none usr/lib/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
 d none usr/lib/openldap 755 root bin
 d none usr/lib/openldap/bin 755 root bin
 s none usr/lib/openldap/bin/ldapcompare=../../../bin/openldapcompare
@@ -88,6 +87,7 @@
 s none usr/lib/openldap/bin/ldapmodrdn=../../../bin/openldapmodrdn
 s none usr/lib/openldap/bin/ldappasswd=../../../bin/openldappasswd
 s none usr/lib/openldap/bin/ldapsearch=../../../bin/openldapsearch
+s none usr/lib/openldap/bin/ldapurl=../../../bin/openldapurl
 s none usr/lib/openldap/bin/ldapwhoami=../../../bin/openldapwhoami
 f none usr/lib/slapd 555 root bin
 d none usr/sbin 755 root bin
@@ -98,6 +98,7 @@
 s none usr/sbin/slapdn=../lib/slapd
 s none usr/sbin/slapindex=../lib/slapd
 s none usr/sbin/slappasswd=../lib/slapd
+s none usr/sbin/slapschema=../lib/slapd
 s none usr/sbin/slaptest=../lib/slapd
 d none usr/share 755 root sys
 d none usr/share/man 755 root bin
@@ -107,10 +108,12 @@
 d none usr/share/man/man8oldap 755 root bin
 f none usr/share/man/man1oldap/openldapcompare.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldapdelete.1oldap 444 root bin
+f none usr/share/man/man1oldap/openldapexop.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldapmodify.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldapmodrdn.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldappasswd.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldapsearch.1oldap 444 root bin
+f none usr/share/man/man1oldap/openldapurl.1oldap 444 root bin
 f none usr/share/man/man1oldap/openldapwhoami.1oldap 444 root bin
 s none usr/share/man/man1oldap/openldapadd.1oldap=openldapmodify.1oldap
 f none usr/share/man/man3oldap/lber-decode.3oldap 444 root bin
@@ -303,6 +306,7 @@
 f none usr/share/man/man5oldap/slapd-ldif.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-meta.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-monitor.5oldap 444 root bin
+f none usr/share/man/man5oldap/slapd-ndb.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-null.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd.overlays.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapd-passwd.5oldap 444 root bin
@@ -315,6 +319,7 @@
 f none usr/share/man/man5oldap/slapo-accesslog.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-auditlog.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-chain.5oldap 444 root bin
+f none usr/share/man/man5oldap/slapo-collect.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-constraint.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-dds.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-dyngroup.5oldap 444 root bin
@@ -325,6 +330,7 @@
 f none usr/share/man/man5oldap/slapo-refint.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-retcode.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-rwm.5oldap 444 root bin
+f none usr/share/man/man5oldap/slapo-sssvlv.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-syncprov.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-translucent.5oldap 444 root bin
 f none usr/share/man/man5oldap/slapo-unique.5oldap 444 root bin
@@ -338,6 +344,7 @@
 f none usr/share/man/man8oldap/slapdn.8oldap 444 root bin
 f none usr/share/man/man8oldap/slapindex.8oldap 444 root bin
 f none usr/share/man/man8oldap/slappasswd.8oldap 444 root bin
+f none usr/share/man/man8oldap/slapschema.8oldap 444 root bin
 f none usr/share/man/man8oldap/slaptest.8oldap 444 root bin
 d none usr/share/doc 755 root other
 d none usr/share/doc/openldap 755 root bin
@@ -351,9 +358,13 @@
 f none usr/share/doc/openldap/admin24/config_local.png 444 root bin
 f none usr/share/doc/openldap/admin24/config_ref.png 444 root bin
 f none usr/share/doc/openldap/admin24/config_repl.png 444 root bin
+f none usr/share/doc/openldap/admin24/delta-syncrepl.png 444 root bin
 f none usr/share/doc/openldap/admin24/dual_dc.png 444 root bin
 f none usr/share/doc/openldap/admin24/intro_dctree.png 444 root bin
 f none usr/share/doc/openldap/admin24/intro_tree.png 444 root bin
+f none usr/share/doc/openldap/admin24/ldap-sync-refreshandpersist.png 444 root bin
+f none usr/share/doc/openldap/admin24/ldap-sync-refreshonly.png 444 root bin
+f none usr/share/doc/openldap/admin24/n-way-multi-master.png 444 root bin
 f none usr/share/doc/openldap/admin24/push-based-complete.png 444 root bin
 f none usr/share/doc/openldap/admin24/push-based-standalone.png 444 root bin
 f none usr/share/doc/openldap/admin24/refint.png 444 root bin
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_i386	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_i386	Fri Jun 11 23:41:07 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_i386	1.1	08/10/24 SMI"
+# ident	"@(#)prototype_i386	1.2	10/06/02 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,17 +57,18 @@
 f none usr/bin/amd64/openldapmodrdn 555 root bin
 f none usr/bin/amd64/openldappasswd 555 root bin
 f none usr/bin/amd64/openldapsearch 555 root bin
+f none usr/bin/amd64/openldapurl 555 root bin
 f none usr/bin/amd64/openldapwhoami 555 root bin
 d none usr/lib/amd64 755 root bin
-f none usr/lib/amd64/liblber-2.4.so.2.1.0 555 root bin
-s none usr/lib/amd64/liblber-2.4.so=liblber-2.4.so.2.1.0
-s none usr/lib/amd64/liblber-2.4.so.2=liblber-2.4.so.2.1.0
-f none usr/lib/amd64/libldap-2.4.so.2.1.0 555 root bin
-s none usr/lib/amd64/libldap-2.4.so=libldap-2.4.so.2.1.0
-s none usr/lib/amd64/libldap-2.4.so.2=libldap-2.4.so.2.1.0
-f none usr/lib/amd64/libldap_r-2.4.so.2.1.0 555 root bin
-s none usr/lib/amd64/libldap_r-2.4.so=libldap_r-2.4.so.2.1.0
-s none usr/lib/amd64/libldap_r-2.4.so.2=libldap_r-2.4.so.2.1.0
+f none usr/lib/amd64/liblber-2.4.so.2.5.4 555 root bin
+s none usr/lib/amd64/liblber-2.4.so=liblber-2.4.so.2.5.4
+s none usr/lib/amd64/liblber-2.4.so.2=liblber-2.4.so.2.5.4
+f none usr/lib/amd64/libldap-2.4.so.2.5.4 555 root bin
+s none usr/lib/amd64/libldap-2.4.so=libldap-2.4.so.2.5.4
+s none usr/lib/amd64/libldap-2.4.so.2=libldap-2.4.so.2.5.4
+f none usr/lib/amd64/libldap_r-2.4.so.2.5.4 555 root bin
+s none usr/lib/amd64/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
+s none usr/lib/amd64/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
 d none usr/lib/openldap/bin/amd64 755 root bin
 s none usr/lib/openldap/bin/amd64/ldapcompare=../../../../bin/amd64/openldapcompare
 s none usr/lib/openldap/bin/amd64/ldapdelete=../../../../bin/amd64/openldapdelete
@@ -78,6 +78,7 @@
 s none usr/lib/openldap/bin/amd64/ldapmodrdn=../../../../bin/amd64/openldapmodrdn
 s none usr/lib/openldap/bin/amd64/ldappasswd=../../../../bin/amd64/openldappasswd
 s none usr/lib/openldap/bin/amd64/ldapsearch=../../../../bin/amd64/openldapsearch
+s none usr/lib/openldap/bin/amd64/ldapurl=../../../../bin/amd64/openldapurl
 s none usr/lib/openldap/bin/amd64/ldapwhoami=../../../../bin/amd64/openldapwhoami
 f none usr/lib/amd64/slapd 555 root bin
 d none usr/sbin/amd64 755 root bin
@@ -88,4 +89,5 @@
 s none usr/sbin/amd64/slapdn=../../lib/amd64/slapd
 s none usr/sbin/amd64/slapindex=../../lib/amd64/slapd
 s none usr/sbin/amd64/slappasswd=../../lib/amd64/slapd
+s none usr/sbin/amd64/slapschema=../../lib/amd64/slapd
 s none usr/sbin/amd64/slaptest=../../lib/amd64/slapd
--- a/usr/src/pkgdefs/SUNWopenldapu/prototype_sparc	Wed May 26 22:56:24 2010 -0700
+++ b/usr/src/pkgdefs/SUNWopenldapu/prototype_sparc	Fri Jun 11 23:41:07 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_sparc	1.1	08/10/24 SMI"
+# ident	"@(#)prototype_sparc	1.2	10/06/02 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,17 +57,18 @@
 f none usr/bin/sparcv9/openldapmodrdn 555 root bin
 f none usr/bin/sparcv9/openldappasswd 555 root bin
 f none usr/bin/sparcv9/openldapsearch 555 root bin
+f none usr/bin/sparcv9/openldapurl 555 root bin
 f none usr/bin/sparcv9/openldapwhoami 555 root bin
 d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/liblber-2.4.so.2.1.0 555 root bin
-s none usr/lib/sparcv9/liblber-2.4.so=liblber-2.4.so.2.1.0
-s none usr/lib/sparcv9/liblber-2.4.so.2=liblber-2.4.so.2.1.0
-f none usr/lib/sparcv9/libldap-2.4.so.2.1.0 555 root bin
-s none usr/lib/sparcv9/libldap-2.4.so=libldap-2.4.so.2.1.0
-s none usr/lib/sparcv9/libldap-2.4.so.2=libldap-2.4.so.2.1.0
-f none usr/lib/sparcv9/libldap_r-2.4.so.2.1.0 555 root bin
-s none usr/lib/sparcv9/libldap_r-2.4.so=libldap_r-2.4.so.2.1.0
-s none usr/lib/sparcv9/libldap_r-2.4.so.2=libldap_r-2.4.so.2.1.0
+f none usr/lib/sparcv9/liblber-2.4.so.2.5.4 555 root bin
+s none usr/lib/sparcv9/liblber-2.4.so=liblber-2.4.so.2.5.4
+s none usr/lib/sparcv9/liblber-2.4.so.2=liblber-2.4.so.2.5.4
+f none usr/lib/sparcv9/libldap-2.4.so.2.5.4 555 root bin
+s none usr/lib/sparcv9/libldap-2.4.so=libldap-2.4.so.2.5.4
+s none usr/lib/sparcv9/libldap-2.4.so.2=libldap-2.4.so.2.5.4
+f none usr/lib/sparcv9/libldap_r-2.4.so.2.5.4 555 root bin
+s none usr/lib/sparcv9/libldap_r-2.4.so=libldap_r-2.4.so.2.5.4
+s none usr/lib/sparcv9/libldap_r-2.4.so.2=libldap_r-2.4.so.2.5.4
 d none usr/lib/openldap/bin/sparcv9 755 root bin
 s none usr/lib/openldap/bin/sparcv9/ldapcompare=../../../../bin/sparcv9/openldapcompare
 s none usr/lib/openldap/bin/sparcv9/ldapdelete=../../../../bin/sparcv9/openldapdelete
@@ -78,6 +78,7 @@
 s none usr/lib/openldap/bin/sparcv9/ldapmodrdn=../../../../bin/sparcv9/openldapmodrdn
 s none usr/lib/openldap/bin/sparcv9/ldappasswd=../../../../bin/sparcv9/openldappasswd
 s none usr/lib/openldap/bin/sparcv9/ldapsearch=../../../../bin/sparcv9/openldapsearch
+s none usr/lib/openldap/bin/sparcv9/ldapurl=../../../../bin/sparcv9/openldapurl
 s none usr/lib/openldap/bin/sparcv9/ldapwhoami=../../../../bin/sparcv9/openldapwhoami
 f none usr/lib/sparcv9/slapd 555 root bin
 d none usr/sbin/sparcv9 755 root bin
@@ -88,4 +89,5 @@
 s none usr/sbin/sparcv9/slapdn=../../lib/sparcv9/slapd
 s none usr/sbin/sparcv9/slapindex=../../lib/sparcv9/slapd
 s none usr/sbin/sparcv9/slappasswd=../../lib/sparcv9/slapd
+s none usr/sbin/sparcv9/slapschema=../../lib/sparcv9/slapd
 s none usr/sbin/sparcv9/slaptest=../../lib/sparcv9/slapd
--- a/usr/src/pkgdefs/SUNWserr/Makefile	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)Makefile	1.3	06/03/18 SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWserr/copyright	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-Copyright (C) 2001-2003 Fhg Fokus
-
-ser is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version
-
-For a license to use the ser software under conditions
-other than those described here, or to purchase support for this
-software, please contact iptel.org by e-mail at the following addresses:
-   [email protected]
-
-ser is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License 
-along with this program; if not, write to the Free Software 
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--- a/usr/src/pkgdefs/SUNWserr/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)pkginfo.tmpl	1.4	06/03/30 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWserr"
-NAME="Ser - SIP Express Router (root)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="5.10/SunOS Development"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="SIP Express Router a very fast and flexible SIP proxy server (root) 8.12"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWserr/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-#
-i pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWserr
-#
-d none etc 0755 root sys
-d none etc/sfw 0755 root bin
-d none etc/sfw/ser 0755 root bin
-f none etc/sfw/ser/ser.cfg.sample 444 root bin
-f none etc/sfw/ser/ser_mysql.sh 0555 root bin
-f none etc/sfw/ser/README.solaris.ser 0444 root bin
-f none etc/sfw/ser/ser 0555 root bin
--- a/usr/src/pkgdefs/SUNWserr/prototype_i386	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_i386	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWserr
-#
--- a/usr/src/pkgdefs/SUNWserr/prototype_sparc	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWserr
-#
--- a/usr/src/pkgdefs/SUNWseru/Makefile	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)Makefile	1.3	06/03/18 SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWseru/copyright	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-Copyright (C) 2001-2003 Fhg Fokus
-
-ser is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version
-
-For a license to use the ser software under conditions
-other than those described here, or to purchase support for this
-software, please contact iptel.org by e-mail at the following addresses:
-   [email protected]
-
-ser is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License 
-along with this program; if not, write to the Free Software 
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--- a/usr/src/pkgdefs/SUNWseru/depend	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)depend	1.7	10/03/11 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWlexpt	libexpat - XML parser library
-P SUNWmysql51u  mysql - MySQL Database Management System (usr component) 5.1
-P SUNWmysql51lib	mysql - MySQL Database Management System (library component) 5.1
-P SUNWflexruntime	Flex Lexer (Runtime Libraries) 
-P SUNWserr      Ser - SIP Express Router (root)
-P SUNWzlibr	The Zip compression library (Root)
--- a/usr/src/pkgdefs/SUNWseru/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)pkginfo.tmpl	1.4	06/03/30 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWseru"
-NAME="Ser - SIP Express Router (usr)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="SIP Express Router a very fast and flexible SIP proxy server (usr) 8.12"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWseru/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.5	09/09/04 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-#
-i pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWseru
-#
-d none usr 0755 root sys
-d none usr/sfw 0755 root bin
-d none usr/sfw/lib 0755 root bin
-d none usr/sfw/lib/ser 0755 root bin
-f none usr/sfw/lib/ser/gen_ha1 0555 root bin
-d none usr/sfw/lib/ser/modules 0755 root bin
-f none usr/sfw/lib/ser/modules/acc.so 0555 root bin
-f none usr/sfw/lib/ser/modules/auth.so 0555 root bin
-f none usr/sfw/lib/ser/modules/auth_db.so 0555 root bin
-f none usr/sfw/lib/ser/modules/auth_diameter.so 0555 root bin
-f none usr/sfw/lib/ser/modules/dbtext.so 0555 root bin
-f none usr/sfw/lib/ser/modules/domain.so 0555 root bin
-f none usr/sfw/lib/ser/modules/enum.so 0555 root bin
-f none usr/sfw/lib/ser/modules/exec.so 0555 root bin
-f none usr/sfw/lib/ser/modules/group.so 0555 root bin
-f none usr/sfw/lib/ser/modules/jabber.so 0555 root bin
-f none usr/sfw/lib/ser/modules/mangler.so 0555 root bin
-f none usr/sfw/lib/ser/modules/maxfwd.so 0555 root bin
-f none usr/sfw/lib/ser/modules/msilo.so 0555 root bin
-f none usr/sfw/lib/ser/modules/mysql.so 0555 root bin
-f none usr/sfw/lib/ser/modules/nathelper.so 0555 root bin
-f none usr/sfw/lib/ser/modules/pa.so 0555 root bin
-f none usr/sfw/lib/ser/modules/pdt.so 0555 root bin
-f none usr/sfw/lib/ser/modules/permissions.so 0555 root bin
-f none usr/sfw/lib/ser/modules/pike.so 0555 root bin
-f none usr/sfw/lib/ser/modules/print.so 0555 root bin
-f none usr/sfw/lib/ser/modules/registrar.so 0555 root bin
-f none usr/sfw/lib/ser/modules/rr.so 0555 root bin
-f none usr/sfw/lib/ser/modules/sl.so 0555 root bin
-f none usr/sfw/lib/ser/modules/sms.so 0555 root bin
-f none usr/sfw/lib/ser/modules/textops.so 0555 root bin
-f none usr/sfw/lib/ser/modules/tm.so 0555 root bin
-f none usr/sfw/lib/ser/modules/uri.so 0555 root bin
-f none usr/sfw/lib/ser/modules/usrloc.so 0555 root bin
-f none usr/sfw/lib/ser/modules/vm.so 0555 root bin
-f none usr/sfw/lib/ser/modules/xlog.so 0555 root bin
-d none usr/sfw/sbin 0755 root bin
-f none usr/sfw/sbin/ser 0555 root bin
-f none usr/sfw/sbin/serctl 0555 root bin
-d none usr/sfw/share 0755 root bin
-d none usr/sfw/share/doc 0755 root bin
-d none usr/sfw/share/doc/ser 0755 root bin
-f none usr/sfw/share/doc/ser/AUTHORS 0444 root bin
-f none usr/sfw/share/doc/ser/INSTALL 0444 root bin
-f none usr/sfw/share/doc/ser/NEWS    0444 root bin
-f none usr/sfw/share/doc/ser/README 0444 root bin
-f none usr/sfw/share/doc/ser/README-MODULES 0444 root bin
-f none usr/sfw/share/doc/ser/README.acc 0444 root bin
-f none usr/sfw/share/doc/ser/README.auth 0444 root bin
-f none usr/sfw/share/doc/ser/README.auth_db 0444 root bin
-f none usr/sfw/share/doc/ser/README.auth_diameter 0444 root bin
-f none usr/sfw/share/doc/ser/README.dbtext  0444 root bin
-f none usr/sfw/share/doc/ser/README.domain  0444 root bin
-f none usr/sfw/share/doc/ser/README.enum    0444 root bin
-f none usr/sfw/share/doc/ser/README.exec 0444 root bin
-f none usr/sfw/share/doc/ser/README.group 0444 root bin
-f none usr/sfw/share/doc/ser/README.jabber 0444 root bin
-f none usr/sfw/share/doc/ser/README.mangler 0444 root bin
-f none usr/sfw/share/doc/ser/README.maxfwd 0444 root bin
-f none usr/sfw/share/doc/ser/README.msilo 0444 root bin
-f none usr/sfw/share/doc/ser/README.nathelper 0444 root bin
-f none usr/sfw/share/doc/ser/README.pa 0444 root bin
-f none usr/sfw/share/doc/ser/README.pdt 0444 root bin
-f none usr/sfw/share/doc/ser/README.permissions 0444 root bin
-f none usr/sfw/share/doc/ser/README.pike 0444 root bin
-f none usr/sfw/share/doc/ser/README.print 0444 root bin
-f none usr/sfw/share/doc/ser/README.registrar 0444 root bin
-f none usr/sfw/share/doc/ser/README.rr 0444 root bin
-f none usr/sfw/share/doc/ser/README.sl 0444 root bin
-f none usr/sfw/share/doc/ser/README.sms 0444 root bin
-f none usr/sfw/share/doc/ser/README.textops 0444 root bin
-f none usr/sfw/share/doc/ser/README.tm 0444 root bin
-f none usr/sfw/share/doc/ser/README.uri 0444 root bin
-f none usr/sfw/share/doc/ser/README.usrloc 0444 root bin
-f none usr/sfw/share/doc/ser/README.vm 0444 root bin
-f none usr/sfw/share/doc/ser/README.xlog 0444 root bin
-d none usr/sfw/share/man 755 root bin
-d none usr/sfw/share/man/man5 755 root bin
-f none usr/sfw/share/man/man5/ser.cfg.5 444 root bin
-d none usr/sfw/share/man/man8 755 root bin
-f none usr/sfw/share/man/man8/ser.8 444 root bin
--- a/usr/src/pkgdefs/SUNWseru/prototype_i386	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident	"@(#)prototype_i386	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWseru
-#
--- a/usr/src/pkgdefs/SUNWseru/prototype_sparc	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWseru
-#
--- a/usr/src/pkgdefs/SUNWserweb/Makefile	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile	1.3	06/03/18 SMI"
-#
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWserweb/copyright	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-    This software, serweb, is a web interface for self-provisioning
-    of users of SER SIP Server (http://www.iptel.org/ser/). It is
-    provided as is without any warranty under terms of GPL. To install
-    it, unpack the distibution on your webserver so that the directory
-    html is in document root and phplib is not accessible via web.
-    Then, change config.php to reflect your local configuration.
-
-    Thats it. Sorry, we do not currently provide more info. If you
-    are interested in helping us with doc writing, write an email
-    to [email protected].
-
-========================================================================
-
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
-========================================================================
-
-GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and
-to any other program whose authors commit to using it. (Some other Free
-Software Foundation software is covered by the GNU Lesser General Public
-License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it in
-new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have. You
-must make sure that they, too, receive or can get the source code. And
-you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on,
-we want its recipients to know that what they have is not the original,
-so that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is covered
-only if its contents constitute a work based on the Program (independent
-of having been made by running the Program). Whether that is true depends
-on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any part
-    thereof, to be licensed as a whole at no charge to all third parties
-    under the terms of this License.
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive
-    use in the most ordinary way, to print or display an announcement
-    including an appropriate copyright notice and a notice that there
-    is no warranty (or else, saying that you provide a warranty) and
-    that users may redistribute the program under these conditions, and
-    telling the user how to view a copy of this License. (Exception: if
-    the Program itself is interactive but does not normally print such
-    an announcement, your work based on the Program is not required to
-    print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves,
-then this License, and its terms, do not apply to those sections when
-you distribute them as separate works. But when you distribute the same
-sections as part of a whole which is a work based on the Program, the
-distribution of the whole must be on the terms of this License, whose
-permissions for other licensees extend to the entire whole, and thus to
-each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise
-the right to control the distribution of derivative or collective works
-based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
-    b) Accompany it with a written offer, valid for at least three years,
-    to give any third party, for a charge no more than your cost of
-    physically performing source distribution, a complete machine-readable
-    copy of the corresponding source code, to be distributed under the
-    terms of Sections 1 and 2 above on a medium customarily used for
-    software interchange; or,
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code. (This alternative is allowed
-    only for noncommercial distribution and only if you received the
-    program in object code or executable form with such an offer, in
-    accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the executable. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major components
-(compiler, kernel, and so on) of the operating system on which the
-executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to
-copy the source code from the same place counts as distribution of the
-source code, even though third parties are not compelled to copy the
-source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute
-the Program or its derivative works. These actions are prohibited
-by law if you do not accept this License. Therefore, by modifying or
-distributing the Program (or any work based on the Program), you indicate
-your acceptance of this License to do so, and all its terms and conditions
-for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License
-and any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any such
-claims; this section has the sole purpose of protecting the integrity of
-the free software distribution system, which is implemented by public
-license practices. Many people have made generous contributions to the
-wide range of software distributed through that system in reliance on
-consistent application of that system; it is up to the author/donor to
-decide if he or she is willing to distribute software through any other
-system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an
-explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail
-to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by
-the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software
-and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
-AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING
-BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
-
--- a/usr/src/pkgdefs/SUNWserweb/depend	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)depend	1.5	10/04/09 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar		Core Architecture, (Root)
-P SUNWcakr		Core Solaris Kernel Architecture (Root)
-P SUNWkvm		Core Architecture, (Kvm)
-P SUNWcsr		Core Solaris, (Root)
-P SUNWckr		Core Solaris Kernel (Root)
-P SUNWcnetr		Core Solaris Network Infrastructure (Root)
-P SUNWcsu		Core Solaris, (Usr)
-P SUNWcsd		Core Solaris Devices
-P SUNWcsl		Core Solaris Libraries
-P SUNWapchr		Apache Web Server (root)
-P SUNWserr		Ser - SIP Express Router (root)
-P SUNWseru		Ser - SIP Express Router (usr)
-P SUNWmysql51lib	MySQL 5.1 - MySQL Database Management System (library component)
--- a/usr/src/pkgdefs/SUNWserweb/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)pkginfo.tmpl	1.4	06/03/30 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWserweb"
-NAME="Serweb - web interface for Ser SIP Express Router"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Serweb - web interface for SER SIP Server 2004-01-04"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWserweb/prototype_com	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,283 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.3	06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>      # where to find pkg objects
-#!include <filename>                  # include another 'prototype' file
-#!default <mode> <owner> <group>      # default used if not specified onentry
-#!<param>=<value>                     # puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWserweb
-#
-d none usr 0755 root sys
-d none usr/sfw 755 root bin
-d none usr/sfw/share 755 root bin
-d none usr/sfw/share/serweb 0755 root bin
-d none usr/sfw/share/serweb/html 0755 root bin
-d none usr/sfw/share/serweb/html/admin 0755 root bin
-d none usr/sfw/share/serweb/html/admin/cron_job 0755 root bin
-f none usr/sfw/share/serweb/html/admin/cron_job/cronentry 0444 root bin
-f none usr/sfw/share/serweb/html/admin/cron_job/prepend.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/cron_job/read_ser_moni.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/cron_job/ser_moni_update.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/acl.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/index.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/logout.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/prepend.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/ser_moni.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/ser_moni_funct.php 0444 root bin
-f none usr/sfw/share/serweb/html/admin/users.php 0444 root bin
-d none usr/sfw/share/serweb/html/img 0755 root bin
-d none usr/sfw/share/serweb/html/img/butons 0755 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_add.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_add_funds.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_change.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_delete.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_delete_calls.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_dial_your_voicemail.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_download_greeting.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_find.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_get_pass.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_import_plan.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_login.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_ok.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_register.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_save.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_send.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_test_firewall_NAT.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/butons/b_upload_greeting.gif 0444 root bin
-d none usr/sfw/share/serweb/html/img/preload 0755 root bin
-f none usr/sfw/share/serweb/html/img/preload/advanced.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/advanced_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/forgot.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/forgot_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/forgot_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/glossary.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/glossary_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/iptel_workshop.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/iptel_workshop_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/logout.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/logout_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_products.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_products_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_standards.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_standards_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_tutorial.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/sip_tutorial_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/subscribe.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/preload/subscribe_a.gif 0444 root bin
-d none usr/sfw/share/serweb/html/img/tab 0755 root bin
-f none usr/sfw/share/serweb/html/img/tab/tab_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/tab/tab_left_w.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/tab/tab_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/tab/tab_right_w.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/tab/tab_w.gif 0444 root bin
-d none usr/sfw/share/serweb/html/img/title 0755 root bin
-f none usr/sfw/share/serweb/html/img/title/subscribe_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/actual.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_bot_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/add_new.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_bot_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/advanced.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/advanced_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/all.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_bottom.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/background_pixel.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/background_top.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_right_edge.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/background_topNS.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/white_pixel.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/banner_top.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/welcome_photo5.jpg 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/box_top.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/dot_top_menu.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/dot_top_menu_active.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/dot_white.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/ext_link.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/ext_link_out.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/forgot.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/forgot_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/forgot_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/glossary.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/glossary_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/green_pixel.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/iptel_banner.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/iptel_logo.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/iptel_workshop.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/iptel_workshop_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/login.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/login_background.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/login_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/login_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/logout_down.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/logout_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/logout_mitte.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/logout_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/logout_up.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/partner.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/partner_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/password.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/password_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/password_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/pixel_top_menu.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/products.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/products_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/right_bottom.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/right_top.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/search.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/search_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/search_right.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/services.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/services_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_only.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_products.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_products_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_standards.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_standards_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_tutorial.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/sip_tutorial_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/subscribe.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_top.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/table_top_left.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/technology.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/technology_a.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/title_text.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/welcome_photo.jpg 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/welcome_photo2.jpg 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/welcome_photo3.jpg 0444 root bin
-f none usr/sfw/share/serweb/html/img/title/welcome_photo4.jpg 0444 root bin
-f none usr/sfw/share/serweb/html/img/arrows.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/blue_pixel.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/invisible.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/login_mitte.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/password_mitte.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/red_pixel.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/search_mitte.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/send_im.gif 0444 root bin
-f none usr/sfw/share/serweb/html/img/small_submit.gif 0444 root bin
-d none usr/sfw/share/serweb/html/styles 0755 root bin
-f none usr/sfw/share/serweb/html/styles/functions.js 0444 root bin
-f none usr/sfw/share/serweb/html/styles/iptel_styles.css 0444 root bin
-d none usr/sfw/share/serweb/html/user_interface 0755 root bin
-d none usr/sfw/share/serweb/html/user_interface/reg 0755 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/confirmation.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/finish.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/get_pass.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/index.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/libjab.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/prepend.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/reg/reg_jab.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/accounting.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/ctd.js 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/ctd.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/find_user.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/index.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/logout.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/message_store.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/missed_calls.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/ms_get_v_msg.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/my_account.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/notification_subscription.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/phonebook.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/play_greeting.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/prepend.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/send_im.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/stun_applet.php 0444 root bin
-f none usr/sfw/share/serweb/html/user_interface/voicemail.php 0444 root bin
-f none usr/sfw/share/serweb/html/config.php 0440 root nobody
-f none usr/sfw/share/serweb/html/functions.php 0444 root bin
-f none usr/sfw/share/serweb/html/page.php 0444 root bin
-f none usr/sfw/share/serweb/html/sql_and_fifo_functions.php 0444 root bin
-f none usr/sfw/share/serweb/html/epilog.html 0444 root bin
-f none usr/sfw/share/serweb/html/prolog.html 0444 root bin
-f none usr/sfw/share/serweb/html/separator.html 0444 root bin
-d none usr/sfw/share/serweb/phplib 0755 root bin
-f none usr/sfw/share/serweb/phplib/auth.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/be_null.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/be_sql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/cart.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/crcloginform.ihtml 0444 root bin
-f none usr/sfw/share/serweb/phplib/crloginform.ihtml 0444 root bin
-f none usr/sfw/share/serweb/phplib/csv_table.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_dbm.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_file.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_ldap.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_null.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_shm.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_split_sql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/ct_sql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_msql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_mssql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_mysql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_oci8.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_odbc.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_oracle.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_pgsql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_sybase.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/db_usql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/layout_html.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/local.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/loginform.ihtml 0444 root bin
-f none usr/sfw/share/serweb/phplib/menu.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/migrate_to_md5.php3 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_calendar.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_checkbox.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_file.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_radio.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_select.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_text.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/of_textarea.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/oohforms.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/page.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/perm.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/perminvalid.ihtml 0444 root bin
-f none usr/sfw/share/serweb/phplib/prepend.php3 0444 root bin
-f none usr/sfw/share/serweb/phplib/query_sql.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/session.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/setup.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/sqlquery-eric.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/sqlquery.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/strings2.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/table.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/table_select_js.php3 0444 root bin
-f none usr/sfw/share/serweb/phplib/template.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/tmpl_table.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/tpl_form.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/tree.inc 0444 root bin
-f none usr/sfw/share/serweb/phplib/user.inc 0444 root bin
-f none usr/sfw/share/serweb/README.solaris.serweb 0444 root bin
--- a/usr/src/pkgdefs/SUNWserweb/prototype_i386	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_i386	1.3	06/03/18 SMI"
-#
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWserweb
-#
--- a/usr/src/pkgdefs/SUNWserweb/prototype_sparc	Wed May 26 22:56:24 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.3	06/03/18 SMI"
-#
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWserweb
-#
-#