--- a/usr/src/cmd/apache2/METADATA Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apache2/METADATA Thu Aug 02 08:51:00 2012 +0100
@@ -1,10 +1,10 @@
NAME: httpd
-VERSION: 2.2.16
+VERSION: 2.2.22
DESCRIPTION: Apache HTTP Server Version 2.2
LICENSE: Apache v2.0, BSD-like
PACKAGE: SUNWapch22d SUNWapch22r SUNWapch22u
PROJECT_URL: http://httpd.apache.org
-SOURCE_DOWNLOAD: http://archive.apache.org/dist/httpd/httpd-2.2.16.tar.gz
+SOURCE_DOWNLOAD: http://archive.apache.org/dist/httpd/httpd-2.2.22.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/apache
OSR: 7336
--- a/usr/src/cmd/apache2/apache.build.env Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apache2/apache.build.env Thu Aug 02 08:51:00 2012 +0100
@@ -25,7 +25,7 @@
#ident "@(#)apache.build.env 1.8 10/08/09 SMI"
#
-APACHE_VERSION=2.2.16
+APACHE_VERSION=2.2.22
APACHE_VERSION_DIR=2.2
APACHE_DIR=httpd-${APACHE_VERSION}
APACHE_PREFORK_DIR=${APACHE_DIR}-prefork
Binary file usr/src/cmd/apache2/httpd-2.2.16.tar.gz has changed
Binary file usr/src/cmd/apache2/httpd-2.2.22.tar.gz has changed
--- a/usr/src/cmd/apr-util/apr-util-1.3/METADATA Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apr-util/apr-util-1.3/METADATA Thu Aug 02 08:51:00 2012 +0100
@@ -1,10 +1,10 @@
NAME: apr-util
-VERSION: 1.3.9
+VERSION: 1.4.1
DESCRIPTION: Apache Portable Runtime Utility (APR-util)
LICENSE: Apache v2.0, BSD-like
PACKAGE: SUNWapu13-ldap SUNWapu13dbd-mysql SUNWapu13dbd-pgsql SUNWapu13dbd-sqlite SUNWapu13dev SUNWapu13doc SUNWapu13lib
PROJECT_URL: http://apr.apache.org
-SOURCE_DOWNLOAD: http://archive.apache.org/dist/apr/apr-util-1.3.9.tar.gz
+SOURCE_DOWNLOAD: http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/apache
OSR: 9634
Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.3.9.tar.gz has changed
Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.4.1.tar.gz has changed
--- a/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env Thu Aug 02 08:51:00 2012 +0100
@@ -26,7 +26,7 @@
#ident "@(#)apr-util.build.env 1.2 09/08/10 SMI"
#
-APR_UTIL_VERSION=1.3.9
+APR_UTIL_VERSION=1.4.1
APR_UTIL_VERSION_DIR=1.3
APR_UTIL_DIR=apr-util-${APR_UTIL_VERSION}
APR_UTIL_DIR32=${APR_UTIL_DIR}-32
--- a/usr/src/cmd/apr-util/apr-util-1.3/patches/CVE-2010-1623.patch Tue Jul 03 21:34:06 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- buckets/apr_brigade.c 2010/10/01 11:42:57 1003493
-+++ buckets/apr_brigade.c 2010/10/01 11:43:26 1003494
-@@ -331,7 +331,18 @@
- return APR_SUCCESS;
- }
- APR_BUCKET_REMOVE(e);
-- APR_BRIGADE_INSERT_TAIL(bbOut, e);
-+ if (APR_BUCKET_IS_METADATA(e) || len > APR_BUCKET_BUFF_SIZE/4) {
-+ APR_BRIGADE_INSERT_TAIL(bbOut, e);
-+ }
-+ else {
-+ if (len > 0) {
-+ rv = apr_brigade_write(bbOut, NULL, NULL, str, len);
-+ if (rv != APR_SUCCESS) {
-+ return rv;
-+ }
-+ }
-+ apr_bucket_destroy(e);
-+ }
- readbytes += len;
- /* We didn't find an APR_ASCII_LF within the maximum line length. */
- if (readbytes >= maxbytes) {
--- a/usr/src/cmd/apr/apr-1.3/METADATA Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apr/apr-1.3/METADATA Thu Aug 02 08:51:00 2012 +0100
@@ -1,10 +1,10 @@
NAME: apr
-VERSION: 1.3.9
+VERSION: 1.4.6
DESCRIPTION: Apache Portable Runtime (APR)
LICENSE: Apache v2.0, BSD
PACKAGE: SUNWapr13dev SUNWapr13doc SUNWapr13lib
PROJECT_URL: http://apr.apache.org
-SOURCE_DOWNLOAD: http://archive.apache.org/dist/apr/apr-1.3.9.tar.gz
+SOURCE_DOWNLOAD: http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/apache
OSR: 9635
@@ -34,7 +34,3 @@
make 64-bit libtool use the system search paths for
64-bit libraries
(this issue is specific to Solaris)
- port_getn_rc.patch -
- Fixes EINTR regression with Solaris apr_pollset_poll()
- in APR 1.3.9. This patch is taken from
- http://svn.apache.org/viewvc?view=revision&revision=836111
Binary file usr/src/cmd/apr/apr-1.3/apr-1.3.9.tar.gz has changed
Binary file usr/src/cmd/apr/apr-1.3/apr-1.4.6.tar.gz has changed
--- a/usr/src/cmd/apr/apr-1.3/apr.build.env Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apr/apr-1.3/apr.build.env Thu Aug 02 08:51:00 2012 +0100
@@ -26,7 +26,7 @@
#ident "@(#)apr.build.env 1.3 09/10/12 SMI"
#
-APR_VERSION=1.3.9
+APR_VERSION=1.4.6
APR_VERSION_DIR=1.3
APR_DIR=apr-${APR_VERSION}
APR_DIR32=${APR_DIR}-32
--- a/usr/src/cmd/apr/apr-1.3/patches/largefile.patch Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/cmd/apr/apr-1.3/patches/largefile.patch Thu Aug 02 08:51:00 2012 +0100
@@ -1,27 +1,26 @@
--- build/apr_hints.m4.orig Tue Jun 26 16:47:46 2007
+++ build/apr_hints.m4 Fri Feb 8 04:54:31 2008
-@@ -243,8 +243,19 @@
+@@ -245,7 +245,19 @@
;;
*-solaris2*)
PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
- APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
-- APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE])
-+ APR_SETVAR(THREADED_CPPFLAGS, [])
-+ if test "$enable_threads" != "no"; then
-+ APR_ADDTO(THREADED_CPPFLAGS, [-D_POSIX_PTHREAD_SEMANTICS])
-+ dnl If using native compiler, use recommended -mt option to ensure
-+ dnl proper preprocessor definitions and library link order.
-+ if $CC -flags 2>&1 | grep '^-mt.*multi-threaded' > /dev/null 2>&1; then
-+ APR_ADDTO(THREADED_CPPFLAGS, [-mt])
-+ else
-+ APR_ADDTO(THREADED_CPPFLAGS, [-D_REENTRANT])
-+ fi
-+ fi
-+ APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS $THREADED_CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64])
-+ APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE])
- # readdir64_r error handling seems broken on Solaris (at least
- # up till 2.8) -- it will return -1 at end-of-directory.
- APR_SETIFNULL(ac_cv_func_readdir64_r, [no])
++ APR_SETVAR(THREADED_CPPFLAGS, [])
++ if test "$enable_threads" != "no"; then
++ APR_ADDTO(THREADED_CPPFLAGS, [-D_POSIX_PTHREAD_SEMANTICS])
++ dnl If using native compiler, use recommended -mt option to ensure
++ dnl proper preprocessor definitions and library link order.
++ if $CC -flags 2>&1 | grep '^-mt.*multi-threaded' > /dev/null 2>&1; then
++ APR_ADDTO(THREADED_CPPFLAGS, [-mt])
++ else
++ APR_ADDTO(THREADED_CPPFLAGS, [-D_REENTRANT])
++ fi
++ fi
++ APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS $THREADED_CPPFLAGS])
++ APR_ADDTO(CPPFLAGS, [-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64])
+ if test $PLATOSVERS -ge 10; then
+ APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE])
+ else
--- configure.in.orig Sat Nov 3 07:13:08 2007
+++ configure.in Fri Feb 8 04:54:31 2008
@@ -107,7 +107,7 @@
--- a/usr/src/cmd/apr/apr-1.3/patches/port_getn_rc.patch Tue Jul 03 21:34:06 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-=== Patch is taken from
-=== http://svn.apache.org/viewvc?view=revision&revision=836111
---- poll/unix/port.c.orig 2009-11-18 15:04:29.000000000 -0500
-+++ poll/unix/port.c 2009-11-18 15:02:28.000000000 -0500
-@@ -100,18 +100,27 @@
- tvptr = &tv;
- }
-
-+ list[0].portev_user = (void *)-1; /* so we can double check that an
-+ * event was returned
-+ */
-+
- ret = port_getn(port, list, max, nget, tvptr);
-+ /* Note: 32-bit port_getn() on Solaris 10 x86 returns large negative
-+ * values instead of 0 when returning immediately.
-+ */
-
-- if (ret < 0) {
-+ if (ret == -1) {
- rv = apr_get_netos_error();
-
- switch(rv) {
- case EINTR:
- case ETIME:
-- if (*nget > 0) {
-+ if (*nget > 0 && list[0].portev_user != (void *)-1) {
- /* This confusing API can return an event at the same time
- * that it reports EINTR or ETIME. If that occurs, just
-- * report the event.
-+ * report the event. With EINTR, nget can be > 0 without
-+ * any event, so check that portev_user was filled in.
-+ *
- * (Maybe it will be simplified; see thread
- * http://mail.opensolaris.org
- * /pipermail/networking-discuss/2009-August/011979.html
--- a/usr/src/pkgdefs/SUNWapch22d/prototype_com Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapch22d/prototype_com Thu Aug 02 08:51:00 2012 +0100
@@ -39,10 +39,14 @@
d none usr/apache2/2.2 0755 root bin
d none usr/apache2/2.2/man 0755 root bin
d none usr/apache2/2.2/man/man1 0755 root bin
+f none usr/apache2/2.2/man/man1/ab.1 0644 root bin
+f none usr/apache2/2.2/man/man1/apxs.1 0644 root bin
f none usr/apache2/2.2/man/man1/dbmmanage.1 0644 root bin
f none usr/apache2/2.2/man/man1/htdbm.1 0644 root bin
f none usr/apache2/2.2/man/man1/htdigest.1 0644 root bin
f none usr/apache2/2.2/man/man1/htpasswd.1 0644 root bin
+f none usr/apache2/2.2/man/man1/httxt2dbm.1 0644 root bin
+f none usr/apache2/2.2/man/man1/logresolve.1 0644 root bin
d none usr/apache2/2.2/man/man3 0755 root bin
f none usr/apache2/2.2/man/man3/Apache::TestSmoke.3 0644 root bin
f none usr/apache2/2.2/man/man3/Apache::TestRun.3 0644 root bin
@@ -133,12 +137,9 @@
f none usr/apache2/2.2/man/man3/Apache2::Status.3 0644 root bin
f none usr/apache2/2.2/man/man3/ModPerl::Registry.3 0644 root bin
d none usr/apache2/2.2/man/man8 0755 root bin
-f none usr/apache2/2.2/man/man8/ab.8 0644 root bin
f none usr/apache2/2.2/man/man8/apachectl.8 0644 root bin
-f none usr/apache2/2.2/man/man8/apxs.8 0644 root bin
f none usr/apache2/2.2/man/man8/htcacheclean.8 0644 root bin
f none usr/apache2/2.2/man/man8/httpd.8 0644 root bin
-f none usr/apache2/2.2/man/man8/logresolve.8 0644 root bin
f none usr/apache2/2.2/man/man8/rotatelogs.8 0644 root bin
f none usr/apache2/2.2/man/man8/suexec.8 0644 root bin
d none usr/share 0755 root sys
@@ -146,12 +147,9 @@
d none usr/share/man/man1m 0755 root bin
f none usr/share/man/man1m/apache2.1m 0444 root bin
d none usr/share/man/man8 0755 root bin
-f none usr/share/man/man8/ab.8 0444 root bin
f none usr/share/man/man8/apachectl.8 0444 root bin
-f none usr/share/man/man8/apxs.8 0444 root bin
f none usr/share/man/man8/htcacheclean.8 0444 root bin
f none usr/share/man/man8/httpd.8 0444 root bin
-f none usr/share/man/man8/logresolve.8 0444 root bin
f none usr/share/man/man8/rotatelogs.8 0444 root bin
f none usr/share/man/man8/suexec.8 0444 root bin
d none usr/apache2/2.2/manual 0755 root bin
@@ -505,16 +503,6 @@
d none usr/apache2/2.2/manual/rewrite 0755 root bin
f none usr/apache2/2.2/manual/rewrite/index.html.en 0644 root bin
f none usr/apache2/2.2/manual/rewrite/index.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_tech.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_guide.html.en 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_guide_advanced.html.en 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_intro.html.en 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_intro.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_guide.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_guide_advanced.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_tech.html.en 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_flags.html 0644 root bin
-f none usr/apache2/2.2/manual/rewrite/rewrite_flags.html.en 0644 root bin
f none usr/apache2/2.2/manual/suexec.html.en 0644 root bin
f none usr/apache2/2.2/manual/custom-error.html.es 0644 root bin
f none usr/apache2/2.2/manual/filter.html.ja.utf8 0644 root bin
@@ -543,6 +531,9 @@
f none usr/apache2/2.2/manual/configuring.html.fr 0644 root bin
f none usr/apache2/2.2/manual/convenience.map 0644 root bin
d none usr/apache2/2.2/manual/mod 0755 root bin
+f none usr/apache2/2.2/manual/mod/core.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/directives.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/mod/index.html.zh-cn 0644 root bin
f none usr/apache2/2.2/manual/mod/mod_disk_cache.html.ko.euc-kr 0644 root bin
f none usr/apache2/2.2/manual/mod/mod_userdir.html.ja.utf8 0644 root bin
f none usr/apache2/2.2/manual/mod/quickreference.html.de 0644 root bin
@@ -936,4 +927,68 @@
f none usr/apache2/2.2/manual/howto/auth.html.tr.utf8 0644 root bin
f none usr/apache2/2.2/manual/mod/mod_proxy_scgi.html 0644 root bin
f none usr/apache2/2.2/manual/mod/mod_proxy_scgi.html.en 0644 root bin
+f none usr/apache2/2.2/manual/developer/documenting.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/developer/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/faq/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/handler.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/howto/auth.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/howto/htaccess.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/howto/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/images/rewrite_rule_flow.png 0644 root bin
+f none usr/apache2/2.2/manual/images/syntax_rewritecond.png 0644 root bin
+f none usr/apache2/2.2/manual/images/syntax_rewriterule.png 0644 root bin
+f none usr/apache2/2.2/manual/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/logs.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/misc/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_auth_basic.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_auth_digest.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_authn_alias.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_authn_file.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_authnz_ldap.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_autoindex.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_proxy_ftp.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_proxy_http.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_proxy_http.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_proxy_scgi.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_proxy.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_rewrite.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/mod_suexec.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/mod/quickreference.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/mpm.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/new_features_2_2.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/platform/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/programs/index.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/programs/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/access.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/access.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/advanced.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/advanced.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/avoid.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/avoid.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/flags.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/flags.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/flags.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/htaccess.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/htaccess.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/index.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/intro.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/intro.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/intro.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/proxy.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/proxy.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/remapping.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/remapping.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/rewritemap.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/rewritemap.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/tech.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/tech.html.en 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/tech.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/vhosts.html 0644 root bin
+f none usr/apache2/2.2/manual/rewrite/vhosts.html.en 0644 root bin
+f none usr/apache2/2.2/manual/sitemap.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/ssl/index.html.zh-cn 0644 root bin
+f none usr/apache2/2.2/manual/suexec.html.fr 0644 root bin
+f none usr/apache2/2.2/manual/upgrading.html.ja.utf8 0644 root bin
+f none usr/apache2/2.2/manual/vhosts/index.html.zh-cn 0644 root bin
--- a/usr/src/pkgdefs/SUNWapr13lib/prototype_com Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_com Thu Aug 02 08:51:00 2012 +0100
@@ -39,6 +39,6 @@
d none usr/apr 0755 root bin
d none usr/apr/1.3 0755 root bin
d none usr/apr/1.3/lib 0755 root bin
-f none usr/apr/1.3/lib/libapr-1.so.0.3.9 0555 root bin
-s none usr/apr/1.3/lib/libapr-1.so=libapr-1.so.0.3.9
-s none usr/apr/1.3/lib/libapr-1.so.0=libapr-1.so.0.3.9
+f none usr/apr/1.3/lib/libapr-1.so.0.4.6 0555 root bin
+s none usr/apr/1.3/lib/libapr-1.so=libapr-1.so.0.4.6
+s none usr/apr/1.3/lib/libapr-1.so.0=libapr-1.so.0.4.6
--- a/usr/src/pkgdefs/SUNWapr13lib/prototype_i386 Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_i386 Thu Aug 02 08:51:00 2012 +0100
@@ -48,7 +48,7 @@
# SUNWapr13lib
#
d none usr/apr/1.3/lib/amd64 0755 root bin
-f none usr/apr/1.3/lib/amd64/libapr-1.so.0.3.9 0555 root bin
-s none usr/apr/1.3/lib/amd64/libapr-1.so=libapr-1.so.0.3.9
-s none usr/apr/1.3/lib/amd64/libapr-1.so.0=libapr-1.so.0.3.9
+f none usr/apr/1.3/lib/amd64/libapr-1.so.0.4.6 0555 root bin
+s none usr/apr/1.3/lib/amd64/libapr-1.so=libapr-1.so.0.4.6
+s none usr/apr/1.3/lib/amd64/libapr-1.so.0=libapr-1.so.0.4.6
s none usr/apr/1.3/lib/64=amd64
--- a/usr/src/pkgdefs/SUNWapr13lib/prototype_sparc Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_sparc Thu Aug 02 08:51:00 2012 +0100
@@ -48,7 +48,7 @@
# SUNWapr13lib
#
d none usr/apr/1.3/lib/sparcv9 0755 root bin
-f none usr/apr/1.3/lib/sparcv9/libapr-1.so.0.3.9 0555 root bin
-s none usr/apr/1.3/lib/sparcv9/libapr-1.so=libapr-1.so.0.3.9
-s none usr/apr/1.3/lib/sparcv9/libapr-1.so.0=libapr-1.so.0.3.9
+f none usr/apr/1.3/lib/sparcv9/libapr-1.so.0.4.6 0555 root bin
+s none usr/apr/1.3/lib/sparcv9/libapr-1.so=libapr-1.so.0.4.6
+s none usr/apr/1.3/lib/sparcv9/libapr-1.so.0=libapr-1.so.0.4.6
s none usr/apr/1.3/lib/64=sparcv9
--- a/usr/src/pkgdefs/SUNWapu13dev/prototype_com Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapu13dev/prototype_com Thu Aug 02 08:51:00 2012 +0100
@@ -39,6 +39,7 @@
f none usr/apr-util/1.3/include/apr_anylock.h 0644 root bin
f none usr/apr-util/1.3/include/apr_base64.h 0644 root bin
f none usr/apr-util/1.3/include/apr_buckets.h 0644 root bin
+f none usr/apr-util/1.3/include/apr_crypto.h 0644 root bin
f none usr/apr-util/1.3/include/apr_date.h 0644 root bin
f none usr/apr-util/1.3/include/apr_dbd.h 0644 root bin
f none usr/apr-util/1.3/include/apr_dbm.h 0644 root bin
@@ -65,6 +66,7 @@
f none usr/apr-util/1.3/include/apr_xlate.h 0644 root bin
f none usr/apr-util/1.3/include/apr_xml.h 0644 root bin
f none usr/apr-util/1.3/include/apu.h 0644 root bin
+f none usr/apr-util/1.3/include/apu_errno.h 0644 root bin
f none usr/apr-util/1.3/include/apu_version.h 0644 root bin
f none usr/apr-util/1.3/include/apu_want.h 0644 root bin
d none usr/apr-util/1.3/lib 0755 root bin
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_com Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_com Thu Aug 02 08:51:00 2012 +0100
@@ -39,6 +39,6 @@
d none usr/apr-util 0755 root bin
d none usr/apr-util/1.3 0755 root bin
d none usr/apr-util/1.3/lib 0755 root bin
-s none usr/apr-util/1.3/lib/libaprutil-1.so=libaprutil-1.so.0.3.9
-s none usr/apr-util/1.3/lib/libaprutil-1.so.0=libaprutil-1.so.0.3.9
-f none usr/apr-util/1.3/lib/libaprutil-1.so.0.3.9 0555 root bin
+s none usr/apr-util/1.3/lib/libaprutil-1.so=libaprutil-1.so.0.4.1
+s none usr/apr-util/1.3/lib/libaprutil-1.so.0=libaprutil-1.so.0.4.1
+f none usr/apr-util/1.3/lib/libaprutil-1.so.0.4.1 0555 root bin
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_i386 Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_i386 Thu Aug 02 08:51:00 2012 +0100
@@ -48,7 +48,7 @@
# SUNWapu13lib
#
d none usr/apr-util/1.3/lib/amd64 0755 root bin
-f none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0.3.9 0555 root bin
-s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so=libaprutil-1.so.0.3.9
-s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0=libaprutil-1.so.0.3.9
+f none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0.4.1 0555 root bin
+s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so=libaprutil-1.so.0.4.1
+s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0=libaprutil-1.so.0.4.1
s none usr/apr-util/1.3/lib/64=amd64
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc Tue Jul 03 21:34:06 2012 +0100
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc Thu Aug 02 08:51:00 2012 +0100
@@ -48,7 +48,7 @@
# SUNWapu13lib
#
d none usr/apr-util/1.3/lib/sparcv9 0755 root bin
-f none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0.3.9 0555 root bin
-s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so=libaprutil-1.so.0.3.9
-s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0=libaprutil-1.so.0.3.9
+f none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0.4.1 0555 root bin
+s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so=libaprutil-1.so.0.4.1
+s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0=libaprutil-1.so.0.4.1
s none usr/apr-util/1.3/lib/64=sparcv9