19476174 upgrade Subversion to 1.7.19 s11u2-sru
authorStefan Teleman <stefan.teleman@oracle.com>
Fri, 13 Mar 2015 10:45:14 -0700
branchs11u2-sru
changeset 3944 53cdaa2b6b94
parent 3943 93bc1e9a6489
child 3947 49b86ceff723
19476174 upgrade Subversion to 1.7.19 20673493 problem in UTILITY/SVN
components/subversion/Makefile
components/subversion/patches/000-Makefile.in.patch
components/subversion/patches/001-configure.patch
components/subversion/patches/002-CVE-2013-1849.patch
components/subversion/patches/003-CVE-2013-4505.patch
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.p5m
--- a/components/subversion/Makefile	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/Makefile	Fri Mar 13 10:45:14 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -28,25 +28,23 @@
 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		subversion
-COMPONENT_VERSION=	1.7.5
+COMPONENT_VERSION=	1.7.19
 COMPONENT_PROJECT_URL=	http://subversion.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:cb102a437335a8921f00cef9bf730d84527713f1a5091e3e1eb2f16402f85dc1
+	sha256:184246bf5ccd0cb31f296b87fdae72617e445901b468529e638b919ca4012d4f
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/svn
+TPNO=			21233
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
 PATCH_LEVEL = 0
-
 PYMODS = client core delta fs ra repos wc
-
 PLMODS= Fs Core Wc Client Repos Ra Delta
-
 JAVA_ROOT = $(JAVA_HOME)
 
 # because we can't seem to get -norunpath to the java bindings build any
@@ -54,16 +52,16 @@
 CXX += $(studio_NORUNPATH)
 
 CFLAGS += -features=extensions
-CFLAGS += -xustr=ascii_utf16_ushort -xcsi
 CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic
 CXXFLAGS += -template=geninlinefuncs
-CXXFLAGS += -verbose=template
-CXXFLAGS += -xustr=ascii_utf16_ushort
 CXXFLAGS += $(CC_PIC)
 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS
 CFLAGS += `pkg-config --cflags neon`
 CFLAGS += $(CPP_LARGEFILES)
 
+APR_VERSION = 1.3
+APR_UTIL_VERSION = 1.3
+
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \
     ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \
@@ -88,6 +86,20 @@
 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)"
 CONFIGURE_ENV += PERL="$(PERL)"
 CONFIGURE_ENV += PLMODS="$(PLMODS)"
+
+LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn
+APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config
+APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config
+APXS.32 = /usr/apache2/2.2/bin/apxs
+APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib
+APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib
+APACHE_LIBEXECDIR.32 = `$(APXS.32) -q libexecdir`
+
+LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \
+	   -R$(APU-CONFIG-RPATH.$(BITS))
+
+CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
+
 # Current version of subversion only supports ruby 1.8, not 1.9.
 # Until subversion is updated to 1.8.0 (ruby 1.9 support added)
 # or later, use ruby 1.8.
@@ -98,19 +110,19 @@
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS))
 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS))
-CONFIGURE_OPTIONS += --libdir=$(CONFIGURE_PREFIX)/lib/svn
+CONFIGURE_OPTIONS += --libdir=$(LIBSVNDIR.$(BITS))
 CONFIGURE_OPTIONS += --localstatedir=/var
 CONFIGURE_OPTIONS += --enable-shared 
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --disable-libtool-lock 
 CONFIGURE_OPTIONS += --disable-neon-version-check
 CONFIGURE_OPTIONS += --disable-experimental-libtool
-CONFIGURE_OPTIONS += --with-apxs=/usr/apache2/2.2/bin/apxs
+CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
 CONFIGURE_OPTIONS += --with-ssl 
 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT)
-CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.3
-CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.3
+CONFIGURE_OPTIONS += --with-apr=/usr/apr/$(APR_VERSION)
+CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/$(APR_UTIL_VERSION)
 CONFIGURE_OPTIONS += --enable-nls
 CONFIGURE_OPTIONS += --disable-mod-activation
 CONFIGURE_OPTIONS += --enable-javahl
--- a/components/subversion/patches/000-Makefile.in.patch	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/patches/000-Makefile.in.patch	Fri Mar 13 10:45:14 2015 -0700
@@ -1,3 +1,6 @@
+# Internal patch.
+# Our Python installation uses additional directories.
+# Various fixes for correctly recording the RUNPATH|RPATH in shared objects.
 --- Makefile.in	2011-07-16 04:50:53.000000000 -0700
 +++ Makefile.in	2012-05-21 19:46:33.032512405 -0700
 @@ -85,8 +85,8 @@
--- a/components/subversion/patches/001-configure.patch	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/patches/001-configure.patch	Fri Mar 13 10:45:14 2015 -0700
@@ -1,5 +1,9 @@
---- configure	2012-05-10 11:52:02.000000000 -0700
-+++ configure	2013-03-20 14:20:04.139519952 -0700
+# Internal patch.
+# apr-config and apu-config use the wrong options
+# neon library pkg-config should not print the library path
+# Our Kerberos installation is not 100% compatible with MIT-Kerberos
+--- configure	2014-12-08 23:32:25.000000000 -0800
++++ configure	2015-01-20 10:36:42.439487008 -0800
 @@ -4686,14 +4686,14 @@
    fi
  
@@ -12,7 +16,7 @@
      fi
    else
 -    SVN_APR_LIBS="`$apr_config --link-ld`"
-+    SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
++    SVN_APR_LIBS="`$apr_config --link-libtool`"
      if test $? -ne 0; then
 -      as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5
 +      as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5
@@ -31,10 +35,10 @@
      fi
    else
 -    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
-+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
++    SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
      if test $? -ne 0; then
 -      as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
-+      as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5
++      as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5
      fi
    fi
    SVN_APRUTIL_LIBS="`
@@ -51,8 +55,8 @@
      conftest$ac_exeext conftest.$ac_ext
                if test "$shared_linking" = "no"; then
                  NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                  LIBS="$LIBS $NEON_LIBS"
                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -60,8 +64,8 @@
                old_CFLAGS="$CFLAGS"
                old_LIBS="$LIBS"
                NEON_LIBS=`$PKG_CONFIG neon --libs`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
                LIBS="$LIBS $NEON_LIBS"
                neon_test_code="
@@ -69,42 +73,37 @@
      conftest$ac_exeext conftest.$ac_ext
                if test "$shared_linking" = "no"; then
                  NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                  LIBS="$LIBS $NEON_LIBS"
                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
[email protected]@ -5520,6 +5528,8 @@
-               SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
-               CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
-               NEON_LIBS=`$neon_config --libs`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
-             fi
-             svn_lib_neon="yes"
-             break
[email protected]@ -5576,8 +5586,9 @@
[email protected]@ -5576,9 +5584,9 @@
  fi
  
  
 -
 -
+-
 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
 +export NEON_LIBS
  
+ if test "$svn_lib_neon" = "yes"; then
  
- if test "$svn_lib_neon" = "yes"; then
---- configure	2013-07-29 12:50:28.716771506 -0700
-+++ configure	2013-07-29 13:04:59.668934315 -0700
[email protected]@ -6098,8 +6098,8 @@
[email protected]@ -6106,11 +6114,11 @@
        old_CFLAGS="$CFLAGS"
        old_LIBS="$LIBS"
        CFLAGS=""
 -      SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
 -      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
-+      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberos5"
++      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
 +      SVN_GSSAPI_LIBS="-lgss"
-       SVN_GSSAPI_LIBS="`
-   input_flags="$SVN_GSSAPI_LIBS"
-   output_flags=""
+       if test $? -ne 0; then
+-                                SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi"
+-        SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss"
++        SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
++        SVN_GSSAPI_LIBS="-lgss"
+         if test $? -ne 0; then
+                     as_fn_error $? "krb5-config returned an error" "$LINENO" 5
+         fi
--- a/components/subversion/patches/002-CVE-2013-1849.patch	Wed Mar 04 16:03:27 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# CVE-2013-1849
-# http://subversion.apache.org/security/CVE-2013-1849-advisory.txt
-
---- subversion/mod_dav_svn/liveprops.c	2012-02-03 12:04:00.000000000 -0800
-+++ subversion/mod_dav_svn/liveprops.c	2014-01-22 09:29:53.399158026 -0800
[email protected]@ -429,7 +429,8 @@
-         svn_filesize_t len = 0;
- 
-         /* our property, but not defined on collection resources */
--        if (resource->collection || resource->baselined)
-+        if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY ||
-+            resource->collection || resource->baselined)
-           return DAV_PROP_INSERT_NOTSUPP;
- 
-         serr = svn_fs_file_length(&len, resource->info->root.root,
[email protected]@ -453,7 +454,9 @@
-         svn_string_t *pval;
-         const char *mime_type = NULL;
- 
--        if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
-+        if ((resource->type == DAV_RESOURCE_TYPE_ACTIVITY) ||
-+            (resource->baselined &&
-+             resource->type == DAV_RESOURCE_TYPE_VERSION))
-           return DAV_PROP_INSERT_NOTSUPP;
- 
-         if (resource->type == DAV_RESOURCE_TYPE_PRIVATE
--- a/components/subversion/patches/003-CVE-2013-4505.patch	Wed Mar 04 16:03:27 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-# CVE-2013-4505
-# http://subversion.apache.org/security/CVE-2013-4505-advisory.txt
-
---- tools/server-side/mod_dontdothat/mod_dontdothat.c	2011-11-28 12:02:41.000000000 -0800
-+++ tools/server-side/mod_dontdothat/mod_dontdothat.c	2014-01-29 06:58:46.573510739 -0800
[email protected]@ -30,12 +30,14 @@
- #include <util_filter.h>
- #include <ap_config.h>
- #include <apr_strings.h>
-+#include <apr_uri.h>
- 
- #include <expat.h>
- 
- #include "mod_dav_svn.h"
- #include "svn_string.h"
- #include "svn_config.h"
-+#include "private/svn_fspath.h"
- 
- module AP_MODULE_DECLARE_DATA dontdothat_module;
- 
[email protected]@ -161,26 +163,71 @@
-     }
- }
- 
-+/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
-+static void
-+log_dav_err(request_rec *r,
-+                dav_error *err,
-+                int level)
-+{
-+  dav_error *errscan;
-+
-+  /* Log the errors */
-+  /* ### should have a directive to log the first or all */
-+  for (errscan = err; errscan != NULL; errscan = errscan->prev) {
-+    apr_status_t status;
-+
-+    if (errscan->desc == NULL)
-+      continue;
-+
-+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
-+    status = errscan->aprerr;
-+#else
-+    status = errscan->save_errno;
-+#endif
-+
-+    ap_log_rerror(APLOG_MARK, level, status, r,
-+        "%s  [%d, #%d]",
-+        errscan->desc, errscan->status, errscan->error_id);
-+  }
-+}
-+
- static svn_boolean_t
- is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
- {
-   const char *relative_path;
-   const char *cleaned_uri;
-   const char *repos_name;
-+  const char *uri_path;
-   int trailing_slash;
-   dav_error *derr;
- 
--  /* Ok, so we need to skip past the scheme, host, etc. */
--  uri = ap_strstr_c(uri, "://");
--  if (uri)
--    uri = ap_strchr_c(uri + 3, '/');
-+  /* uri can be an absolute uri or just a path, we only want the path to match
-+   * against */
-+  if (uri && svn_path_is_url(uri))
-+  {
-+    apr_uri_t parsed_uri;
-+    apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
-+    if (APR_SUCCESS != rv)
-+    {
-+      /* Error parsing the URI, log and reject request. */
-+      ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
-+          "mod_dontdothat: blocked request after failing "
-+          "to parse uri: '%s'", uri);
-+      return FALSE;
-+    }
-+    uri_path = parsed_uri.path;
-+  }
-+  else
-+  {
-+    uri_path = uri;
-+  }
- 
--  if (uri)
-+  if (uri_path)
-     {
-       const char *repos_path;
- 
-       derr = dav_svn_split_uri(ctx->r,
--                               uri,
-+                               uri_path,
-                                ctx->cfg->base_path,
-                                &cleaned_uri,
-                                &trailing_slash,
[email protected]@ -194,7 +241,7 @@
-           if (! repos_path)
-             repos_path = "";
- 
--          repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path);
-+          repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool);
- 
-           /* First check the special cases that are always legal... */
-           for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx)
[email protected]@ -228,6 +275,18 @@
-                 }
-             }
-         }
-+      else
-+      {
-+        log_dav_err(ctx->r, derr, APLOG_ERR);
-+        return FALSE;
-+      }
-+    }
-+  else
-+  {
-+    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
-+        "mod_dontdothat: empty uri passed to is_this_legal(), "
-+        "module bug?");
-+    return FALSE;
-     }
- 
-   return TRUE;
-
--- a/components/subversion/subversion-java.p5m	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/subversion-java.p5m	Fri Mar 13 10:45:14 2015 -0700
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for the Subversion SCM"
 set name=com.oracle.info.description value="Java bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion-perl.p5m	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/subversion-perl.p5m	Fri Mar 13 10:45:14 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
 
@@ -28,7 +28,7 @@
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
 set name=com.oracle.info.description value="Perl bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion-python.p5m	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/subversion-python.p5m	Fri Mar 13 10:45:14 2015 -0700
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for the Subversion SCM"
 set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -71,3 +71,8 @@
 link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
 #
 license subversion.license license="Apache v2.0"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+  fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
--- a/components/subversion/subversion.p5m	Wed Mar 04 16:03:27 2015 +0100
+++ b/components/subversion/subversion.p5m	Fri Mar 13 10:45:14 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file  path=usr/include/svn/(.+)$ -> \
@@ -28,14 +28,14 @@
 set name=pkg.summary value="Subversion source code management system"
 set name=pkg.description value="A full-featured version control and source code management system designed to be a better CVS"
 set name=com.oracle.info.description value="the Subversion source code management system"
-set name=com.oracle.info.tpno value=9086
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
+
 dir path=usr
 dir path=usr/apache2
 dir path=usr/apache2/2.2
@@ -87,48 +87,50 @@
 file path=usr/bin/svnserve
 file path=usr/bin/svnsync
 file path=usr/bin/svnversion
-file path=usr/include/svn/mod_authz_svn.h
-file path=usr/include/svn/mod_dav_svn.h
-file path=usr/include/svn/svn_auth.h
-file path=usr/include/svn/svn_base64.h
-file path=usr/include/svn/svn_checksum.h
-file path=usr/include/svn/svn_client.h
-file path=usr/include/svn/svn_cmdline.h
-file path=usr/include/svn/svn_compat.h
-file path=usr/include/svn/svn_config.h
-file path=usr/include/svn/svn_ctype.h
-file path=usr/include/svn/svn_dav.h
-file path=usr/include/svn/svn_delta.h
-file path=usr/include/svn/svn_diff.h
-file path=usr/include/svn/svn_dirent_uri.h
-file path=usr/include/svn/svn_dso.h
-file path=usr/include/svn/svn_error.h
-file path=usr/include/svn/svn_error_codes.h
-file path=usr/include/svn/svn_fs.h
-file path=usr/include/svn/svn_hash.h
-file path=usr/include/svn/svn_io.h
-file path=usr/include/svn/svn_iter.h
-file path=usr/include/svn/svn_md5.h
-file path=usr/include/svn/svn_mergeinfo.h
-file path=usr/include/svn/svn_nls.h
-file path=usr/include/svn/svn_opt.h
-file path=usr/include/svn/svn_path.h
-file path=usr/include/svn/svn_pools.h
-file path=usr/include/svn/svn_props.h
-file path=usr/include/svn/svn_quoprint.h
-file path=usr/include/svn/svn_ra.h
-file path=usr/include/svn/svn_ra_svn.h
-file path=usr/include/svn/svn_repos.h
-file path=usr/include/svn/svn_sorts.h
-file path=usr/include/svn/svn_string.h
-file path=usr/include/svn/svn_subst.h
-file path=usr/include/svn/svn_time.h
-file path=usr/include/svn/svn_types.h
-file path=usr/include/svn/svn_user.h
-file path=usr/include/svn/svn_utf.h
-file path=usr/include/svn/svn_version.h
-file path=usr/include/svn/svn_wc.h
-file path=usr/include/svn/svn_xml.h
+
+file usr/include/subversion-1/mod_dav_svn.h path=usr/include/svn/mod_dav_svn.h
+file usr/include/subversion-1/svn_auth.h path=usr/include/svn/svn_auth.h
+file usr/include/subversion-1/svn_base64.h path=usr/include/svn/svn_base64.h
+file usr/include/subversion-1/svn_cache_config.h path=usr/include/svn/svn_cache_config.h
+file usr/include/subversion-1/svn_checksum.h path=usr/include/svn/svn_checksum.h
+file usr/include/subversion-1/svn_client.h path=usr/include/svn/svn_client.h
+file usr/include/subversion-1/svn_cmdline.h path=usr/include/svn/svn_cmdline.h
+file usr/include/subversion-1/svn_compat.h path=usr/include/svn/svn_compat.h
+file usr/include/subversion-1/svn_config.h path=usr/include/svn/svn_config.h
+file usr/include/subversion-1/svn_ctype.h path=usr/include/svn/svn_ctype.h
+file usr/include/subversion-1/svn_dav.h path=usr/include/svn/svn_dav.h
+file usr/include/subversion-1/svn_delta.h path=usr/include/svn/svn_delta.h
+file usr/include/subversion-1/svn_diff.h path=usr/include/svn/svn_diff.h
+file usr/include/subversion-1/svn_dirent_uri.h path=usr/include/svn/svn_dirent_uri.h
+file usr/include/subversion-1/svn_dso.h path=usr/include/svn/svn_dso.h
+file usr/include/subversion-1/svn_error.h path=usr/include/svn/svn_error.h
+file usr/include/subversion-1/svn_error_codes.h path=usr/include/svn/svn_error_codes.h
+file usr/include/subversion-1/svn_fs.h path=usr/include/svn/svn_fs.h
+file usr/include/subversion-1/svn_hash.h path=usr/include/svn/svn_hash.h
+file usr/include/subversion-1/svn_io.h path=usr/include/svn/svn_io.h
+file usr/include/subversion-1/svn_iter.h path=usr/include/svn/svn_iter.h
+file usr/include/subversion-1/svn_md5.h path=usr/include/svn/svn_md5.h
+file usr/include/subversion-1/svn_mergeinfo.h path=usr/include/svn/svn_mergeinfo.h
+file usr/include/subversion-1/svn_nls.h path=usr/include/svn/svn_nls.h
+file usr/include/subversion-1/svn_opt.h path=usr/include/svn/svn_opt.h
+file usr/include/subversion-1/svn_path.h path=usr/include/svn/svn_path.h
+file usr/include/subversion-1/svn_pools.h path=usr/include/svn/svn_pools.h
+file usr/include/subversion-1/svn_props.h path=usr/include/svn/svn_props.h
+file usr/include/subversion-1/svn_quoprint.h path=usr/include/svn/svn_quoprint.h
+file usr/include/subversion-1/svn_ra.h path=usr/include/svn/svn_ra.h
+file usr/include/subversion-1/svn_ra_svn.h path=usr/include/svn/svn_ra_svn.h
+file usr/include/subversion-1/svn_repos.h path=usr/include/svn/svn_repos.h
+file usr/include/subversion-1/svn_sorts.h path=usr/include/svn/svn_sorts.h
+file usr/include/subversion-1/svn_string.h path=usr/include/svn/svn_string.h
+file usr/include/subversion-1/svn_subst.h path=usr/include/svn/svn_subst.h
+file usr/include/subversion-1/svn_time.h path=usr/include/svn/svn_time.h
+file usr/include/subversion-1/svn_types.h path=usr/include/svn/svn_types.h
+file usr/include/subversion-1/svn_user.h path=usr/include/svn/svn_user.h
+file usr/include/subversion-1/svn_utf.h path=usr/include/svn/svn_utf.h
+file usr/include/subversion-1/svn_version.h path=usr/include/svn/svn_version.h
+file usr/include/subversion-1/svn_wc.h path=usr/include/svn/svn_wc.h
+file usr/include/subversion-1/svn_xml.h path=usr/include/svn/svn_xml.h
+
 file path=usr/lib/svn/libsvn_client-1.so.0.0.0
 file path=usr/lib/svn/libsvn_delta-1.so.0.0.0
 file path=usr/lib/svn/libsvn_diff-1.so.0.0.0
@@ -163,7 +165,7 @@
 file path=usr/share/man/man1/svnversion.1
 file path=usr/share/man/man5/svnserve.conf.5
 file path=usr/share/man/man8/svnserve.8
-#
+
 link path=usr/lib/svn/libsvn_client-1.so.0 target=libsvn_client-1.so.0.0.0
 link path=usr/lib/svn/libsvn_client-1.so target=libsvn_client-1.so.0.0.0
 link path=usr/lib/svn/libsvn_delta-1.so.0 target=libsvn_delta-1.so.0.0.0
@@ -190,5 +192,6 @@
 link path=usr/lib/svn/libsvn_subr-1.so target=libsvn_subr-1.so.0.0.0
 link path=usr/lib/svn/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0
 link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0
-#
+
 license subversion.license license="Apache v2.0"
+