Mercurial Mercurial > sustaining > oi_151a > sfw-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import sfw build 158 sfwnv_158
authorCyril Plisko <cyril.plisko@grigale.com>
Sat, 22 Jan 2011 12:27:08 -0800
changeset 64 707ce1130311
parent 63 1f696df7901d
child 65 f2d1eb7d29c8
Import sfw build 158 Bugs Fixed ---------- 6955181 memcached denial-of-service 7007860 SFW still contains multiple references to /var/svc/manifest files that got moved to /lib 7009105 OPENSSL_VERSION_NUMBER changed format breaking ON build 7009580 preparations for upgrading to a new compiler 7009623 gld fails to execute 7010920 CUPS ships /var/run in error 7011373 time to update default package copyright again
usr/src/Makefile.master file | annotate | diff | comparison | revisions
usr/src/cmd/bind/migration.txt file | annotate | diff | comparison | revisions
usr/src/cmd/binutils/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/cups/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/cups/Patches/04-no_var_run.patch file | annotate | diff | comparison | revisions
usr/src/cmd/lighttpd14/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/mysql-5-0/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/mysql-5-0/Solaris/mysql.1.sunman file | annotate | diff | comparison | revisions
usr/src/cmd/mysql-5-1/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/mysql-5-1/Solaris/mysql_51.1.sunman file | annotate | diff | comparison | revisions
usr/src/cmd/quagga/Solaris/README.Solaris file | annotate | diff | comparison | revisions
usr/src/cmd/ruby18/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/spawn-fcgi/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/stunnel/solaris_manpage.pod file | annotate | diff | comparison | revisions
usr/src/cmd/sudo/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/cmd/sudo/no_var_run.patch file | annotate | diff | comparison | revisions
usr/src/cmd/vim/runtime.patch file | annotate | diff | comparison | revisions
usr/src/lib/libxmlrpc-c/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/lib/memcached/METADATA file | annotate | diff | comparison | revisions
usr/src/lib/memcached/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/lib/memcached/Solaris/memcached.xml file | annotate | diff | comparison | revisions
usr/src/lib/memcached/install-sfw file | annotate | diff | comparison | revisions
usr/src/lib/memcached/install-sfw-64 file | annotate | diff | comparison | revisions
usr/src/lib/memcached/memcached-1.4.1.tar.gz file | annotate | diff | comparison | revisions
usr/src/lib/memcached/memcached-1.4.5.tar.gz file | annotate | diff | comparison | revisions
usr/src/lib/openssl/Patches/01-7009105.patch file | annotate | diff | comparison | revisions
usr/src/lib/openssl/README file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWbindr/postinstall file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWbindr/preinstall file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWcupsr/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWmemcached/pkginfo.tmpl file | annotate | diff | comparison | revisions
usr/src/pkgdefs/common_files/copyright file | annotate | diff | comparison | revisions 
--- a/usr/src/Makefile.master	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/Makefile.master	Sat Jan 22 12:27:08 2011 -0800
@@ -18,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#pragma ident	"@(#)Makefile.master	1.50	10/11/03 SMI"
+#pragma ident	"@(#)Makefile.master	1.51	11/01/03 SMI"
 #
 # Makefile.master, global definitions for system source
 #
@@ -477,8 +477,8 @@
 #
 # tradeoff time for space (smaller is better)
 #
-sparc_SPACEFLAG		= -xspace -W0,-Lt
-sparcv9_SPACEFLAG	= -xspace -W0,-Lt
+sparc_SPACEFLAG		= -xspace
+sparcv9_SPACEFLAG	= -xspace
 i386_SPACEFLAG		= -xspace
 amd64_SPACEFLAG		=
 SPACEFLAG		= $($(MACH)_SPACEFLAG)
--- a/usr/src/cmd/bind/migration.txt	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/bind/migration.txt	Sat Jan 22 12:27:08 2011 -0800
@@ -472,7 +472,7 @@
 "Managing Services (Overview)" in System Administration Guide: Basic
 Administration, available on http://docs.sun.com. Also refer to smf(5),
 svcs(1), svcadm(1M), svccfg(1M) man pages and the BIND 9 name service
-manifest server.xml in /var/svc/manifest/network/dns.
+manifest server.xml in /lib/svc/manifest/network/dns.
 
 
 		*************************************
--- a/usr/src/cmd/binutils/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/binutils/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,12 +20,11 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
-#ident	"@(#)Makefile.sfw	1.8	09/05/20 SMI"
+#ident	"@(#)Makefile.sfw	1.9	11/01/03 SMI"
 #
 
 include ../Makefile.cmd
@@ -60,7 +59,8 @@
 	    LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
-	    $(SH) ./configure \
+	    CONFIG_SHELL=$(CONFIG_SHELL) \
+	    $(CONFIG_SHELL) ./configure \
 		--prefix=/usr/gnu \
 		--mandir=/usr/gnu/share/man \
 		--infodir=/usr/share/info \
--- a/usr/src/cmd/cups/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/cups/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.14	10/12/07 SMI"
+#ident	"@(#)Makefile.sfw	1.15	11/01/11 SMI"
 
 include ../Makefile.cmd
 
@@ -118,7 +118,6 @@
 	$(RM) $(ROOT)/etc/cups/snmp.conf.N $(ROOT)/etc/cups/cupsd.conf.N
 	$(RM) $(ROOT)/usr/share/cups/mime/mime.convs.O $(ROOT)/usr/share/cups/mime/mime.types.O
 	$(RM) $(ROOT)/usr/share/applications/cups.desktop
-	rmdir $(ROOT)/var/run/cups/certs $(ROOT)/var/run/cups
 
 install-protofix:	install-target
 	# apply the file attributes from the packaging
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/Patches/04-no_var_run.patch	Sat Jan 22 12:27:08 2011 -0800
@@ -0,0 +1,16 @@
+--- scheduler/Makefile.orig
++++ scheduler/Makefile
+@@ -150,13 +150,6 @@
+ 		echo Creating $(SERVERROOT)/ssl...; \
+ 		$(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
+ 	fi
+-	if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
+-		echo Creating $(STATEDIR)...; \
+-		$(INSTALL_DIR) -m 755 $(STATEDIR); \
+-	fi
+-	echo Creating $(STATEDIR)/certs...
+-	$(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
+-		$(STATEDIR)/certs
+ 	echo Creating $(LOGDIR)...
+ 	$(INSTALL_DIR) -m 755 $(LOGDIR)
+ 	echo Creating $(REQUESTS)...
--- a/usr/src/cmd/lighttpd14/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/lighttpd14/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,9 +20,9 @@
 #
 
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.6	10/08/31 SMI"
+# ident	"@(#)Makefile.sfw	1.7	11/01/03 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -37,7 +37,7 @@
 MYSQL_LIBDIR=$(MYSQL_DIR)/lib/mysql
 MYSQL_CONFIG=$(MYSQL_DIR)/bin/mysql_config
 
-LIGHTTPD_CFLAGS="-xO4 -xbuiltin=%all -xinline=%auto -xprefetch=auto -xdepend  -xc99=%all -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 -xstrconst -I/usr/include/pcre"
+LIGHTTPD_CFLAGS="-xO4 -xbuiltin=%none -xinline=%auto -xprefetch=auto -xdepend  -xc99=%all -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 -xstrconst -I/usr/include/pcre"
 
 LIGHTTPD_LDFLAGS="-L$(SPRO_VROOT)/lib -L$(ROOT)$(MYSQL_LIBDIR) -lsendfile"
 
--- a/usr/src/cmd/mysql-5-0/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/mysql-5-0/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.12	10/04/07 SMI"
+#ident	"@(#)Makefile.sfw	1.13	11/01/03 SMI"
 
 VER=$(COMPONENT_VERSION:sh)
 MYSQL_DIR=$(COMPONENT_NAME:sh)-$(VER)
@@ -44,7 +44,7 @@
 # C++ common flags
 
 CXXCOMMONFLAGS= -DDBUG_OFF -DBIG_TABLES -DHAVE_RWLOCK_T -KPIC -DPIC -xO4 -xmaxopt=4 \
--xprefetch=auto -xprefetch_level=3 -mt -fns=no -fsimple=1 -xbuiltin=%all \
+-xprefetch=auto -xprefetch_level=3 -mt -fns=no -fsimple=1 -xbuiltin=%none \
 -xlibmil -xlibmopt -norunpath
 
 # C++ 64 bit flags
@@ -55,7 +55,7 @@
 
 # C common compiler flags
 COMMONCFLAGS= -xO4 -xstrconst -xprefetch=auto -xprefetch_level=3 -mt\
--fns=no -fsimple=1 -xbuiltin=%all -xlibmil -xlibmopt -xnorunpath
+-fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath
 
 # common ENV for both 32 & 64bit compilation 
 ENVCOMMONLINE=MAKE=$(CCSMAKE) \
--- a/usr/src/cmd/mysql-5-0/Solaris/mysql.1.sunman	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/mysql-5-0/Solaris/mysql.1.sunman	Sat Jan 22 12:27:08 2011 -0800
@@ -19,10 +19,9 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-.\" Use is subject to license terms.
+.\"  Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
-.\"ident	"@(#)mysql.1.sunman	1.6	10/03/16 SMI"
+.\"ident	"@(#)mysql.1.sunman	1.7	11/01/03 SMI"
 .\"
 .TH "mysql_50" "1" "" "" "User Commands"
 .SH NAME
@@ -112,7 +111,7 @@
 .RS
 .PP
 .br
-/var/svc/manifest/application/database/mysql.xml
+/lib/svc/manifest/application/database/mysql.xml
 ./br
 /lib/svc/method/mysql
 .RE
@@ -139,7 +138,7 @@
 
 .br
 example%svccfg import
-        /var/svc/manifest/application/database/mysql.xml
+        /lib/svc/manifest/application/database/mysql.xml
 
 The mysql:version_50 service is disabled by default. You can check the status of the service by issuing the following command :
 
--- a/usr/src/cmd/mysql-5-1/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/mysql-5-1/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.7	10/09/03 SMI"
+#ident	"@(#)Makefile.sfw	1.8	11/01/03 SMI"
 
 
 MYSQL_VERSION=5.1.37
@@ -46,7 +46,7 @@
 # C++ common flags
 
 CXXCOMMONFLAGS= -DDBUG_OFF -DBIG_TABLES -DHAVE_RWLOCK_T -KPIC -DPIC -xO4 -xmaxopt=4 \
--xprefetch=auto -xprefetch_level=3 -mt -fns=no -fsimple=1 -xbuiltin=%all \
+-xprefetch=auto -xprefetch_level=3 -mt -fns=no -fsimple=1 -xbuiltin=%none \
 -xlibmil -xlibmopt -norunpath
 
 # C++ 64 bit flags
@@ -57,7 +57,7 @@
 
 # C common compiler flags
 COMMONCFLAGS= -xO4 -xstrconst -xprefetch=auto -xprefetch_level=3 -mt\
--fns=no -fsimple=1 -xbuiltin=%all -xlibmil -xlibmopt -xnorunpath
+-fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath
 
 # common ENV for both 32 & 64bit compilation 
 ENVCOMMONLINE=MAKE=$(GMAKE) \
--- a/usr/src/cmd/mysql-5-1/Solaris/mysql_51.1.sunman	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/mysql-5-1/Solaris/mysql_51.1.sunman	Sat Jan 22 12:27:08 2011 -0800
@@ -19,10 +19,9 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-.\" Use is subject to license terms.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
-.\"ident	"@(#)mysql_51.1.sunman	1.2	10/03/16 SMI"
+.\"ident	"@(#)mysql_51.1.sunman	1.3	11/01/03 SMI"
 .TH "mysql_51" "1" "" "" "User Commands"
 .SH NAME
 MySQL 5.1 \- MySQL RDBMS version 5.1 for Solaris 
@@ -106,7 +105,7 @@
 .RS
 .PP
 .br
-/var/svc/manifest/application/database/mysql_51.xml
+/lib/svc/manifest/application/database/mysql_51.xml
 ./br
 /lib/svc/method/mysql_51
 .RE
@@ -303,7 +302,7 @@
 
 .br
 example%svccfg import
-        /var/svc/manifest/application/database/mysql_51.xml
+        /lib/svc/manifest/application/database/mysql_51.xml
 
 The mysql:version_51 service is disabled by default. You can check the status of the service by issuing the following command :
 
--- a/usr/src/cmd/quagga/Solaris/README.Solaris	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/quagga/Solaris/README.Solaris	Sat Jan 22 12:27:08 2011 -0800
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#pragma ident	"@(#)README.Solaris	1.1	06/12/19 SMI"
+#ident	"@(#)README.Solaris	1.2	11/01/03 SMI"
 
 		SOLARIS' OFFERING OF OPENSOURCE QUAGGA SOFTWARE
 	       ************************************************
@@ -67,7 +66,7 @@
                 ripngd, bgpd)			/usr/sbin
 quaggaadm (formerly zebraadm)			/usr/sbin
 daemon start/stop scripts			/lib/svc/method 
-SMF manifests					/var/svc/manifest/network/routing
+SMF manifests					/lib/svc/manifest/network/routing
 Quagga Info documentation			/usr/sfw/info
 Manual Pages					/usr/sfw/man/man8
 Libraries					/usr/sfw/lib
--- a/usr/src/cmd/ruby18/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/ruby18/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.20	09/11/20 SMI"
+# ident	"@(#)Makefile.sfw	1.21	11/01/03 SMI"
 #
 
 RUBY_VER=$(COMPONENT_VERSION:sh)
@@ -52,7 +51,7 @@
 
 include ../Makefile.cmd
 
-RUBY_CFLAGS="-xO4 -xbuiltin=%all -xinline=%auto -xprefetch=auto -xdepend -xtarget=generic -I$(ROOT)/usr/include"
+RUBY_CFLAGS="-xO4 -xbuiltin=%none -xinline=%auto -xprefetch=auto -xdepend -xtarget=generic -I$(ROOT)/usr/include"
 CFLAGS += -I$(ROOT)/usr/include
 CPPFLAGS += -I$(ROOT)/usr/include
 LDFLAGS = -L$(ROOT)/usr/lib -M $(SRC)/cmd/mapfile_noexstk -R/usr/sfw/lib
--- a/usr/src/cmd/spawn-fcgi/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/spawn-fcgi/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.1	09/11/19 SMI"
+# ident	"@(#)Makefile.sfw	1.2	11/01/03 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -34,7 +33,7 @@
 
 CONFIGURE_OPTIONS += --mandir=$(CFGPREFIX)/share/man
 
-L_CFLAGS="-xO4 -xbuiltin=%all -xinline=%auto -xprefetch=auto -xdepend  -xc99=%all -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 -xstrconst"
+L_CFLAGS="-xO4 -xbuiltin=%none -xinline=%auto -xprefetch=auto -xdepend  -xc99=%all -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 -xstrconst"
 
 L_LDFLAGS="-L$(SPRO_VROOT)/lib -lsendfile"
 
--- a/usr/src/cmd/stunnel/solaris_manpage.pod	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/stunnel/solaris_manpage.pod	Sat Jan 22 12:27:08 2011 -0800
@@ -1,6 +1,6 @@
 =begin text
 
-#ident	"@(#)solaris_manpage.pod	1.2	10/03/16 SMI"
+#ident	"@(#)solaris_manpage.pod	1.3	11/01/03 SMI"
 
 =end text
 
@@ -84,7 +84,7 @@
 Use the inetconv(1M) command to create a inetd(1M) service manifest and 
 register the service with smf(5), for example:
 
-# inetconv -i /tmp/inetd_scratch.conf -o /var/svc/manifest/network/ssl
+# inetconv -i /tmp/inetd_scratch.conf -o /lib/svc/manifest/network/ssl
 
 =item *
 
--- a/usr/src/cmd/sudo/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/sudo/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -18,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#pragma ident	"@(#)Makefile.sfw	1.4	10/10/06 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.5	11/01/12 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -50,7 +50,7 @@
 	    $(CCSMAKE) -e install)
 	$(RM) $(ROOTBIN)/sudoreplay $(ROOT)/usr/share/man/man1m/sudoreplay.1m
 	$(RM) $(ROOT)/usr/share/man/man4/sudoers.ldap.4
-	$(RM) -r $(ROOT)/var/run/sudo $(ROOT)/usr/share/doc/sudo
+	$(RM) -r $(ROOT)/usr/share/doc/sudo
 	(DESTDIR=$(ROOT) $(SH) ./install.sfw $(VER))
 
 $(VER)/config.status: $(VER)/configure
@@ -77,6 +77,7 @@
 	( \
 	    cd $(VER) && \
 	    gpatch -p1 < ../solaris.patch; \
+	    gpatch -p1 < ../no_var_run.patch; \
 	)
 	touch $(VER)/configure
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sudo/no_var_run.patch	Sat Jan 22 12:27:08 2011 -0800
@@ -0,0 +1,10 @@
+--- sudo-1.7.4p4/Makefile.in.orig
++++ sudo-1.7.4p4/Makefile.in
+@@ -499,7 +499,6 @@
+ 	    $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
+ 	    $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
+ 	    $(DESTDIR)$(ldifdir)
+-	$(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
+ 
+ install-binaries: install-dirs $(PROGS)
+ 	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 04511 sudo $(DESTDIR)$(sudodir)/sudo
--- a/usr/src/cmd/vim/runtime.patch	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/cmd/vim/runtime.patch	Sat Jan 22 12:27:08 2011 -0800
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \11/01/03*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \11/01/18*\\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/libxmlrpc-c/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/libxmlrpc-c/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,17 +20,15 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.3	09/08/23 SMI"
+# ident	"@(#)Makefile.sfw	1.4	11/01/03 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 VER64=$(VER)-64
 
 include ../Makefile.lib
-include ../Makefile.lib.64
 
 CONFIGURE_OPTIONS += --enable-cplusplus
 
@@ -43,6 +41,7 @@
 	    CXX="$(CCC)" \
 	    CXXFLAGS="$(CXXFLAGS)" \
 	    LD_LIBRARY_PATH="$(ROOT)/usr/lib" \
+	    CFLAGS_PERSONAL="$(CFLAGS)" \
 	    LADD="-norunpath" \
 	    "ROOT=$(ROOT)" \
 	    $(GMAKE))
--- a/usr/src/lib/memcached/METADATA	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/memcached/METADATA	Sat Jan 22 12:27:08 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             memcached
-VERSION:          1.4.1
+VERSION:          1.4.5
 DESCRIPTION:      high-performance, distributed memory object caching system
 LICENSE:          BSD
 PACKAGE:          SUNWmemcached
-PROJECT_URL:      http://www.danga.com/memcached/
-SOURCE_DOWNLOAD:  http://memcached.googlecode.com/files/memcached-1.4.1.tar.gz
+PROJECT_URL:      http://memcached.org/
+SOURCE_DOWNLOAD:  http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/database/memcached
 OSR:              10029
--- a/usr/src/lib/memcached/Makefile.sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/memcached/Makefile.sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -18,14 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.7	09/10/15 SMI"
+# ident	"@(#)Makefile.sfw	1.8	11/01/03 SMI"
 
-# Memcached 1.4.1
+# Memcached 1.4.5
 
-VER=memcached-1.4.1
+VER=memcached-1.4.5
 VER64=$(VER)-64
 
 include ../Makefile.lib
--- a/usr/src/lib/memcached/Solaris/memcached.xml	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/memcached/Solaris/memcached.xml	Sat Jan 22 12:27:08 2011 -0800
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
+ Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 
  CDDL HEADER START
 
@@ -23,7 +22,7 @@
 
  CDDL HEADER END
 
- ident	"@(#)memcached.xml	1.3	09/10/15 SMI"
+ ident	"@(#)memcached.xml	1.4	11/01/03 SMI"
 
     NOTE:  This service manifest is not editable; its contents will
     be overwritten by package or patch operations, including
@@ -74,7 +73,7 @@
 
     <template>
       <common_name>
-         <loctext xml:lang='C'>memcached 1.4.1</loctext>
+         <loctext xml:lang='C'>memcached 1.4.5</loctext>
       </common_name>
       <documentation>
          <manpage title='memcached' section='1m' manpath='/usr/share/man' />
--- a/usr/src/lib/memcached/install-sfw	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/memcached/install-sfw	Sat Jan 22 12:27:08 2011 -0800
@@ -20,13 +20,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-sfw	1.5	10/04/22 SMI"
+#ident	"@(#)install-sfw	1.6	11/01/03 SMI"
 
-# Memcached 1.4.1 is dependent on libevent
+# Memcached 1.4.5 is dependent on libevent
 
-VER="memcached-1.4.1"
+VER="memcached-1.4.5"
 PREFIX="${ROOT}/usr"
 LIBDIR="${PREFIX}/lib"
 LIBDIR32="${PREFIX}/lib/${MACH32}"
--- a/usr/src/lib/memcached/install-sfw-64	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/memcached/install-sfw-64	Sat Jan 22 12:27:08 2011 -0800
@@ -20,15 +20,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)install-sfw-64	1.2	09/10/15 SMI"
+# ident	"@(#)install-sfw-64	1.3	11/01/03 SMI"
 #
 
-# Memcached 1.4.1 is dependent on libevent
+# Memcached 1.4.5 is dependent on libevent
 
-VER="memcached-1.4.1-64"
+VER="memcached-1.4.5-64"
 PREFIX="${ROOT}/usr"
 LIBDIR="${PREFIX}/lib/${MACH64}"
 
Binary file usr/src/lib/memcached/memcached-1.4.1.tar.gz has changed
Binary file usr/src/lib/memcached/memcached-1.4.5.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/Patches/01-7009105.patch	Sat Jan 22 12:27:08 2011 -0800
@@ -0,0 +1,12 @@
+diff -ruN openssl-0.9.8q-old/crypto/opensslv.h openssl-0.9.8q/crypto/opensslv.h
+--- openssl-0.9.8q-old/crypto/opensslv.h	2010-12-02 19:53:52.000000000 +0100
++++ openssl-0.9.8q/crypto/opensslv.h	2010-12-27 14:08:42.112072026 +0100
+@@ -25,7 +25,7 @@
+  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
+  *  major minor fix final patch/beta)
+  */
+-#define OPENSSL_VERSION_NUMBER	0x0090811f
++#define OPENSSL_VERSION_NUMBER	0x0090811fL
+ #ifdef OPENSSL_FIPS
+ #define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8q-fips 2 Dec 2010"
+ #else
--- a/usr/src/lib/openssl/README	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/lib/openssl/README	Sat Jan 22 12:27:08 2011 -0800
@@ -65,6 +65,10 @@
 Patches
 ---
 
+01-7009105.patch
+Adds an 'L' suffix to OPENSSL_VERSION_NUMBER in opensslv.h. See 7009105
+for more information.
+
 08-6193522.patch
 Give CA.pl better defaults. See 6193522 for more information.
 
--- a/usr/src/pkgdefs/SUNWbindr/postinstall	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/pkgdefs/SUNWbindr/postinstall	Sat Jan 22 12:27:08 2011 -0800
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)postinstall	1.6	07/03/29 SMI"
+#ident	"@(#)postinstall	1.7	11/01/03 SMI"
 #
 
 # Contracted interface.
@@ -180,7 +179,7 @@
 	fi
 
 	# Import service manifest into the repository.
-	svccfg import /var/svc/manifest/network/dns/server.xml
+	svccfg import /lib/svc/manifest/network/dns/server.xml
 
 	# Apply BIND 9.3.4 conversion if applicable.
 	if [ -f $fupdate ]; then
--- a/usr/src/pkgdefs/SUNWbindr/preinstall	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/pkgdefs/SUNWbindr/preinstall	Sat Jan 22 12:27:08 2011 -0800
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)preinstall	1.4	06/03/18 SMI"
+#ident	"@(#)preinstall	1.5	11/01/03 SMI"
 #
 
 #
@@ -38,7 +37,7 @@
 
 [ -f $TMPFILE ] && rm $TMPFILE
 
-if [ ! -f $BASEDIR/var/svc/manifest/network/dns/server.xml ]; then
+if [ ! -f $BASEDIR/lib/svc/manifest/network/dns/server.xml ]; then
 	[ -f $BASEDIR/etc/named.conf ] && touch $TMPFILE
 fi
 
--- a/usr/src/pkgdefs/SUNWcupsr/prototype_com	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/pkgdefs/SUNWcupsr/prototype_com	Sat Jan 22 12:27:08 2011 -0800
@@ -20,9 +20,9 @@
 #
 
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.9	10/10/27 SMI"
+#ident	"@(#)prototype_com	1.10	11/01/11 SMI"
 
 i pkginfo
 i copyright
@@ -60,7 +60,6 @@
 d none var/cache/cups/rss 0755 root lp
 d none var/log 0755 root sys
 d none var/log/cups 0755 root lp
-d none var/run 755 root sys
 d none var/spool 0755 root bin
 d none var/spool/cups 0710 root lp
 d none var/spool/cups/tmp 1770 root lp
--- a/usr/src/pkgdefs/SUNWmemcached/pkginfo.tmpl	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/pkgdefs/SUNWmemcached/pkginfo.tmpl	Sat Jan 22 12:27:08 2011 -0800
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.4	10/07/22 SMI"
+# ident	"@(#)pkginfo.tmpl	1.5	11/01/03 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="The memcached memory object cache (1.4.1)"
+DESC="The memcached memory object cache (1.4.5)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/common_files/copyright	Sat Jan 15 11:19:05 2011 -0800
+++ b/usr/src/pkgdefs/common_files/copyright	Sat Jan 22 12:27:08 2011 -0800
@@ -1,1 +1,1 @@
-Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
sustaining/oi_151a/sfw-gate