Import sfw build 150
Bugs Fixed
----------
6986045 bzip2 1.0.6 contains a security fix for CVE-2010-0405
--- a/usr/src/cmd/bzip2/METADATA Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/bzip2/METADATA Tue Oct 05 00:10:08 2010 -0700
@@ -1,10 +1,10 @@
NAME: bzip2
-VERSION: 1.0.5
+VERSION: 1.0.6
DESCRIPTION: bzip compression
LICENSE: BSD
PACKAGE: SUNWbzip
-PROJECT_URL: http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz
-SOURCE_DOWNLOAD: http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz
+PROJECT_URL: http://www.bzip.org
+SOURCE_DOWNLOAD: http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
SUPPORT: B
BUGTRAQ: solaris/utility/bzip
OSR: 6532
--- a/usr/src/cmd/bzip2/Makefile.sfw Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/bzip2/Makefile.sfw Tue Oct 05 00:10:08 2010 -0700
@@ -19,16 +19,15 @@
#
# 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.15 09/02/02 SMI"
+#ident "@(#)Makefile.sfw 1.16 10/09/20 SMI"
# This makefile is unusual, because it builds both 32 and 64 bit
# versions of the library. The builds occur in separate subdirs,
# and 2 install scripts are used.
-VER=bzip2-1.0.5
+VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
VER64=$(VER)-64
# lint stuff
@@ -59,8 +58,8 @@
$(CCSMAKE))
install: all
- $(SH) ./install-bzip2
- MACH64=$(MACH64) $(SH) ./install-bzip2-64
+ $(SH) ./install-bzip2 $(VER)
+ MACH64=$(MACH64) $(SH) ./install-bzip2-64 $(VER)
real-all: all32 lint32 all64 lint64
@@ -83,14 +82,14 @@
$(VER)/Makefile: $(VER).tar.gz
gzip -dc $(VER).tar.gz | tar xopf -
- gpatch -p0 < bzip2.patch
+ (cd $(VER); gpatch -p1 < ../bzip2.patch)
cp $(VER)/Makefile $(VER)/Makefile.dist
cp oldapi.c $(VER)/oldapi.c
cp makefile.build.64 $(VER)/Makefile
mv $(VER) $(VER64)
touch $(VER64)/Makefile
gzip -dc $(VER).tar.gz | tar xopf -
- gpatch -p0 < bzip2.patch
+ (cd $(VER); gpatch -p1 < ../bzip2.patch)
cp $(VER)/Makefile $(VER)/Makefile.dist
cp oldapi.c $(VER)/oldapi.c
cp makefile.build $(VER)/Makefile
Binary file usr/src/cmd/bzip2/bzip2-1.0.5.tar.gz has changed
Binary file usr/src/cmd/bzip2/bzip2-1.0.6.tar.gz has changed
--- a/usr/src/cmd/bzip2/bzip2.1.sunman Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/bzip2/bzip2.1.sunman Tue Oct 05 00:10:08 2010 -0700
@@ -1,5 +1,5 @@
'\" t
-.\" ident "@(#)bzip2.1.sunman 1.7 10/03/16 SMI"
+.\" ident "@(#)bzip2.1.sunman 1.8 10/09/22 SMI"
.\"
.\" modified to reference existing Solaris man pages, and to add note
.\" about source availability ([email protected])
@@ -7,7 +7,7 @@
.PU
.TH bzip2 1
.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.5
+bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6
.br
bzcat \- decompresses files to stdout
.br
@@ -411,12 +411,12 @@
tries hard to detect I/O errors and exit cleanly, but the details of
what the problem is sometimes seem rather misleading.
-This manual page pertains to version 1.0.5 of
+This manual page pertains to version 1.0.6 of
.I bzip2.
Compressed data created by this version is entirely forwards and
backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2, 1.0.3 and 1.0.4 but with the
-following exception: 0.9.0 and above can correctly decompress multiple
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following
+exception: 0.9.0 and above can correctly decompress multiple
concatenated compressed files. 0.1pl2 cannot do this; it will stop
after decompressing just the first file in the stream.
--- a/usr/src/cmd/bzip2/install-bzip2 Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/bzip2/install-bzip2 Tue Oct 05 00:10:08 2010 -0700
@@ -20,12 +20,11 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-bzip2 1.12 08/04/21 SMI"
+#ident "@(#)install-bzip2 1.13 10/09/20 SMI"
-VERS=bzip2-1.0.5
+VERS=$1
PREFIX=${ROOT}/usr
BINDIR=${PREFIX}/bin
--- a/usr/src/cmd/bzip2/install-bzip2-64 Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/bzip2/install-bzip2-64 Tue Oct 05 00:10:08 2010 -0700
@@ -20,12 +20,11 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-bzip2-64 1.10 08/04/21 SMI"
+#ident "@(#)install-bzip2-64 1.11 10/09/20 SMI"
-VERS=bzip2-1.0.5-64
+VERS=$1-64
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
--- a/usr/src/cmd/vim/runtime.patch Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch Tue Oct 05 00:10:08 2010 -0700
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/09/14*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/09/28*\\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/pkgdefs/SUNWbzip/copyright Mon Sep 20 06:25:26 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbzip/copyright Tue Oct 05 00:10:08 2010 -0700
@@ -2,7 +2,7 @@
--------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2007 Julian R Seward. All
+documentation, are copyright (C) 1996-2010 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,6 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Julian Seward, [email protected]
-bzip2/libbzip2 version 1.0.5 of 10 December 2007
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
--------------------------------------------------------------------------