Created
November 30, 2011 11:10
-
-
Save jclulow/1408709 to your computer and use it in GitHub Desktop.
SFW for Stable
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # HG changeset patch | |
| # User sfwbuild@sfw0 | |
| # Date 1322636825 -39600 | |
| # Branch oi_151a | |
| # Node ID 8c0f45c508837f33f4d4cebba1b541e0a0c25ffb | |
| # Parent 4c78dcc5e8bda51afb5826dd1a2e77a910ead117 | |
| bump apache to 2.2.21, apr to 1.4.5, apr-util to 1.3.12 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apache2/httpd-2.2.16.tar.gz | |
| Binary file usr/src/cmd/apache2/httpd-2.2.16.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apache2/httpd-2.2.21.tar.gz | |
| Binary file usr/src/cmd/apache2/httpd-2.2.21.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.3.12.tar.gz | |
| Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.3.12.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.3.9.tar.gz | |
| Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.3.9.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env | |
| --- a/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.3.12 | |
| APR_UTIL_VERSION_DIR=1.3 | |
| APR_UTIL_DIR=apr-util-${APR_UTIL_VERSION} | |
| APR_UTIL_DIR32=${APR_UTIL_DIR}-32 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr-util/apr-util-1.3/patches/CVE-2010-1623.patch | |
| --- a/usr/src/cmd/apr-util/apr-util-1.3/patches/CVE-2010-1623.patch Tue Sep 20 18:53:20 2011 +0000 | |
| +++ /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) { | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr/apr-1.3/apr-1.3.9.tar.gz | |
| Binary file usr/src/cmd/apr/apr-1.3/apr-1.3.9.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr/apr-1.3/apr-1.4.5.tar.gz | |
| Binary file usr/src/cmd/apr/apr-1.3/apr-1.4.5.tar.gz has changed | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr/apr-1.3/apr.build.env | |
| --- a/usr/src/cmd/apr/apr-1.3/apr.build.env Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/cmd/apr/apr-1.3/apr.build.env Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -26,7 +26,7 @@ | |
| #ident "@(#)apr.build.env 1.3 09/10/12 SMI" | |
| # | |
| -APR_VERSION=1.3.9 | |
| +APR_VERSION=1.4.5 | |
| APR_VERSION_DIR=1.3 | |
| APR_DIR=apr-${APR_VERSION} | |
| APR_DIR32=${APR_DIR}-32 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr/apr-1.3/patches/largefile.patch | |
| --- a/usr/src/cmd/apr/apr-1.3/patches/largefile.patch Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/cmd/apr/apr-1.3/patches/largefile.patch Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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 @@ | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/cmd/apr/apr-1.3/patches/port_getn_rc.patch | |
| --- a/usr/src/cmd/apr/apr-1.3/patches/port_getn_rc.patch Tue Sep 20 18:53:20 2011 +0000 | |
| +++ /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 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapr13lib/prototype_com | |
| --- a/usr/src/pkgdefs/SUNWapr13lib/prototype_com Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_com Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.5 0555 root bin | |
| +s none usr/apr/1.3/lib/libapr-1.so=libapr-1.so.0.4.5 | |
| +s none usr/apr/1.3/lib/libapr-1.so.0=libapr-1.so.0.4.5 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapr13lib/prototype_i386 | |
| --- a/usr/src/pkgdefs/SUNWapr13lib/prototype_i386 Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_i386 Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.5 0555 root bin | |
| +s none usr/apr/1.3/lib/amd64/libapr-1.so=libapr-1.so.0.4.5 | |
| +s none usr/apr/1.3/lib/amd64/libapr-1.so.0=libapr-1.so.0.4.5 | |
| s none usr/apr/1.3/lib/64=amd64 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapr13lib/prototype_sparc | |
| --- a/usr/src/pkgdefs/SUNWapr13lib/prototype_sparc Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapr13lib/prototype_sparc Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.5 0555 root bin | |
| +s none usr/apr/1.3/lib/sparcv9/libapr-1.so=libapr-1.so.0.4.5 | |
| +s none usr/apr/1.3/lib/sparcv9/libapr-1.so.0=libapr-1.so.0.4.5 | |
| s none usr/apr/1.3/lib/64=sparcv9 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapu13dbd-pgsql/.make.state | |
| --- a/usr/src/pkgdefs/SUNWapu13dbd-pgsql/.make.state Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapu13dbd-pgsql/.make.state Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -1,6 +1,17 @@ | |
| .MAKE_VERSION: VERSION-1.0 | |
| .BUILT_LAST_MAKE_RUN: | |
| +/ws/sfw-gate/packages/i386/nightly-nd: | |
| + [ -d /ws/sfw-gate/packages/i386/nightly-nd ] || mkdir -p /ws/sfw-gate/packages/i386/nightly-nd | |
| +.BUILT_LAST_MAKE_RUN: | |
| +clean: | |
| + /usr/bin/rm -f pkginfo | |
| clobber: | |
| /usr/bin/rm -f pkginfo | |
| +.BUILT_LAST_MAKE_RUN: | |
| +pkg: | |
| + pkgmk -f prototype_i386 -d /ws/sfw-gate/packages/i386/nightly-nd -r /ws/sfw-gate/proto/root_i386 \ | |
| + -p "sfw020111130180247" \ | |
| + -o SUNWapu13dbd-pgsql | |
| +.BUILT_LAST_MAKE_RUN: | |
| pkginfo: | |
| /usr/bin/rm -f pkginfo; nawk -f ../awk_pkginfo pkginfo.tmpl > pkginfo | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapu13lib/prototype_com | |
| --- a/usr/src/pkgdefs/SUNWapu13lib/prototype_com Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_com Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.3.12 | |
| +s none usr/apr-util/1.3/lib/libaprutil-1.so.0=libaprutil-1.so.0.3.12 | |
| +f none usr/apr-util/1.3/lib/libaprutil-1.so.0.3.12 0555 root bin | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapu13lib/prototype_i386 | |
| --- a/usr/src/pkgdefs/SUNWapu13lib/prototype_i386 Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_i386 Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.3.12 0555 root bin | |
| +s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so=libaprutil-1.so.0.3.12 | |
| +s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0=libaprutil-1.so.0.3.12 | |
| s none usr/apr-util/1.3/lib/64=amd64 | |
| diff -r 4c78dcc5e8bd -r 8c0f45c50883 usr/src/pkgdefs/SUNWapu13lib/prototype_sparc | |
| --- a/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc Tue Sep 20 18:53:20 2011 +0000 | |
| +++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc Wed Nov 30 18:07:05 2011 +1100 | |
| @@ -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.3.12 0555 root bin | |
| +s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so=libaprutil-1.so.0.3.12 | |
| +s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0=libaprutil-1.so.0.3.12 | |
| s none usr/apr-util/1.3/lib/64=sparcv9 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Not sure why usr/src/pkgdefs/SUNWapu13dbd-pgsql/.make.state is under version control...
Retaining SUNWap[ru]13* package names and /usr/apr*/1.3 paths to avoid having to move too much stuff around. There's a page on APR Backwards Compatibility which suggests minor versions are compatible: http://apr.apache.org/versioning.html
Also, SONAME for libapr* doesn't change from "libapr-1.so.0", so it should be fine.