Bump apr-util to 1.5.1 oi_151a
authorJon Tibble <meths@btinternet.com>
Tue, 19 Feb 2013 16:34:31 +0000
branchoi_151a
changeset 210 b3ba25e86a27
parent 209 44a8c4ba6ecc
child 211 8a6d16a6b5de
Bump apr-util to 1.5.1
usr/src/cmd/apr-util/apr-util-1.3/METADATA
usr/src/cmd/apr-util/apr-util-1.3/Makefile.sfw
usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.4.1.tar.gz
usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.5.1.tar.gz
usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env
usr/src/cmd/apr-util/apr-util-1.3/patches/configure
usr/src/pkgdefs/SUNWapu13lib/prototype_com
usr/src/pkgdefs/SUNWapu13lib/prototype_i386
usr/src/pkgdefs/SUNWapu13lib/prototype_sparc
--- a/usr/src/cmd/apr-util/apr-util-1.3/METADATA	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/cmd/apr-util/apr-util-1.3/METADATA	Tue Feb 19 16:34:31 2013 +0000
@@ -1,10 +1,10 @@
 NAME:             apr-util
-VERSION:          1.4.1
+VERSION:          1.5.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.4.1.tar.gz
+SOURCE_DOWNLOAD:  http://archive.apache.org/dist/apr/apr-util-1.5.1.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              9634
--- a/usr/src/cmd/apr-util/apr-util-1.3/Makefile.sfw	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/cmd/apr-util/apr-util-1.3/Makefile.sfw	Tue Feb 19 16:34:31 2013 +0000
@@ -144,7 +144,8 @@
 	    echo "patching $$i"; \
 	    $(GPATCH) $(GPATCH_FLAGS) -i $$i; \
         done; \
-	autoconf; rm -rf autom4te.cache)
+	autoconf; rm -rf autom4te.cache; \
+	$(GPATCH) $(GPATCH_FLAGS) -i ../patches/configure )
 	touch $(APR_UTIL_DIR)-$*/configure
 
 test-%: 
Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.4.1.tar.gz has changed
Binary file usr/src/cmd/apr-util/apr-util-1.3/apr-util-1.5.1.tar.gz has changed
--- a/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/cmd/apr-util/apr-util-1.3/apr-util.build.env	Tue Feb 19 16:34:31 2013 +0000
@@ -26,7 +26,7 @@
 #ident	"@(#)apr-util.build.env	1.2	09/08/10 SMI"
 #
 
-APR_UTIL_VERSION=1.4.1
+APR_UTIL_VERSION=1.5.1
 APR_UTIL_VERSION_DIR=1.3
 APR_UTIL_DIR=apr-util-${APR_UTIL_VERSION}
 APR_UTIL_DIR32=${APR_UTIL_DIR}-32
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/apr-util/apr-util-1.3/patches/configure	Tue Feb 19 16:34:31 2013 +0000
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Feb 19 10:30:12 2013
++++ configure	Tue Feb 19 10:30:24 2013
+@@ -24843,6 +24843,7 @@
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+ test -n "\$AWK" || AWK=awk
++
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_com	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_com	Tue Feb 19 16:34:31 2013 +0000
@@ -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.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
+s none usr/apr-util/1.3/lib/libaprutil-1.so=libaprutil-1.so.0.5.1
+s none usr/apr-util/1.3/lib/libaprutil-1.so.0=libaprutil-1.so.0.5.1
+f none usr/apr-util/1.3/lib/libaprutil-1.so.0.5.1 0555 root bin
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_i386	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_i386	Tue Feb 19 16:34:31 2013 +0000
@@ -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.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
+f none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0.5.1 0555 root bin
+s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so=libaprutil-1.so.0.5.1
+s none usr/apr-util/1.3/lib/amd64/libaprutil-1.so.0=libaprutil-1.so.0.5.1
 s none usr/apr-util/1.3/lib/64=amd64
--- a/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc	Sun Feb 17 18:38:34 2013 +0000
+++ b/usr/src/pkgdefs/SUNWapu13lib/prototype_sparc	Tue Feb 19 16:34:31 2013 +0000
@@ -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.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
+f none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0.5.1 0555 root bin
+s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so=libaprutil-1.so.0.5.1
+s none usr/apr-util/1.3/lib/sparcv9/libaprutil-1.so.0=libaprutil-1.so.0.5.1
 s none usr/apr-util/1.3/lib/64=sparcv9