# HG changeset patch # User Mike Sullivan # Date 1460677426 25200 # Node ID d4593dbbc6ce80cdd6d168ad6b594846cb2a93b4 # Parent 045df0b18275665a08159e5a6e86cbd7b6a44acc backout 22853244 - needs more work diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/Makefile --- a/components/subversion/Makefile Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/Makefile Thu Apr 14 16:43:46 2016 -0700 @@ -22,52 +22,45 @@ # # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # - +BUILD_BITS= 64_and_32 include ../../make-rules/shared-macros.mk -PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin +PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN) COMPONENT_NAME= subversion -COMPONENT_VERSION= 1.9.3 +COMPONENT_VERSION= 1.7.20 COMPONENT_PROJECT_URL= http://subversion.apache.org/ -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:74cd21d2f8a2a54e4dbd2389fe1605a19dbda8ba88ffc4bb0edc9a66e143cc93 + sha256:2bdb01eb3f3df5c9370af98580e1892822d6e75f2077ce97fc81749f316ef25a COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/svn -TPNO= 27091 +TPNO= 22298 -include $(WS_MAKE_RULES)/prep.mk -include $(WS_MAKE_RULES)/configure.mk -include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/common.mk -PATCH_LEVEL := 0 +PATCH_LEVEL = 0 +PYMODS = client core delta fs ra repos wc +PLMODS= Fs Core Wc Client Repos Ra Delta JAVA_ROOT = $(JAVA_HOME) -GNUCP = /usr/gnu/bin/cp +PERL_VERSION.32 = 5.12 +PERL_VERSION.64 = 5.16 +PERL_VERSION = $(PERL_VERSION.$(BITS)) +PERL = $(PERL.$(PERL_VERSION)) +GNUCP = $(GNUBIN)/cp -# Because we can't seem to get -norunpath to the java bindings build any +# because we can't seem to get -norunpath to the java bindings build any # other way. CXX += $(studio_NORUNPATH) CFLAGS += -features=extensions -CFLAGS += -D_REENTRANT CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic CXXFLAGS += -template=geninlinefuncs CXXFLAGS += $(CC_PIC) -CXXFLAGS += -D_REENTRANT -DNDEBUG -DSOLARIS +CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS CXXFLAGS += $(CPP_LARGEFILES) -CXXFLAGS += -D_REENTRANT -CFLAGS += `pkg-config --cflags serf-1` +CFLAGS += `pkg-config --cflags neon` CFLAGS += $(CPP_LARGEFILES) -PYMODS := client core delta fs ra repos wc -PLMODS := - -ifneq (,$(findstring m64,$(CXXFLAGS))) - PLMODS = Fs Core Wc Client Repos Ra Delta -endif - COMPONENT_TEST_MASTER = \ $(COMPONENT_TEST_RESULTS_DIR)/results-subversion.master @@ -75,44 +68,27 @@ '-e "/libtool/d"' \ '-e "/-m32/d"' \ '-e "/-m64/d"' \ - '-e "/Entering/d"' \ - '-e "/Leaving/d"' \ - '-e "/At least/d"' \ '-e "s^lib/$(MACH64)^lib/MACH64^g"' \ '-e "s/^make\[[0-9]\{1,\}\]/make/g"' \ '-e "/ld: warning/d"' \ '-e "/warning/d"' -PERL_VERSION.32 = none -PERL_VERSION.64 = 5.22 -PERL_VERSION=$(PERL_VERSION.$(BITS)) -PERL.32 = none -PERL.64 = /usr/perl5/$(PERL_VERSION)/bin/perl -PERL=$(PERL.$(BITS)) - -PERL_VERSION_22 = 5.22 -PERL_ARCH_22_i386 = i86pc-solaris-thread-multi-64 -PERL_ARCH_22_sparc = sun4-solaris-thread-multi-64 -PERL_ARCH_22 = $(PERL_ARCH_22_$(MACH)) - +PERL_VERSION_12 = 5.12 +PERL_VERSION_16 = 5.16 +PERL_ARCH_12_i386 = i86pc-solaris-64int +PERL_ARCH_16_i386 = i86pc-solaris-64 +PERL_ARCH_12_sparc = sun4-solaris-64int +PERL_ARCH_16_sparc = sun4-solaris-64 +PERL_ARCH_12 = $(PERL_ARCH_12_$(MACH)) +PERL_ARCH_16 = $(PERL_ARCH_16_$(MACH)) APR_VERSION = 1.5 APR_UTIL_VERSION = 1.5 -# Use the libraries just built plus the svn test harness library. -LD_TEST_PATH_32 := \ - $(PROTO_DIR)/usr/lib/svn:$(BUILD_DIR_32)/subversion/tests/.libs -LD_TEST_PATH_64 := \ - $(PROTO_DIR)/usr/lib/svn/$(MACH64):$(BUILD_DIR_64)/subversion/tests/.libs - # Let's write some post-configure hacks COMPONENT_POST_CONFIGURE_ACTION = \ ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \ cd $(SOURCE_DIR) ; \ - $(PYTHON.$(BITS)) ./build/transform_sql.py ./subversion/libsvn_fs_fs/rep-cache-db.sql < ./subversion/libsvn_fs_fs/rep-cache-db.sql > $(BUILD_DIR_$(BITS))/subversion/libsvn_fs_fs/rep-cache-db.h 2>&1 ; \ - cd $(BUILD_DIR_$(BITS)) ; \ - find . -type f -name "*.class" -exec rm -f {} \; > /dev/null 2>&1 ; \ - cd $(BUILD_DIR_$(BITS)) ; \ - $(GSED) -i 's/-mt//g' Makefile ) + $(PYTHON.$(BITS)) ./build/transform_sql.py ./subversion/libsvn_fs_fs/rep-cache-db.sql < ./subversion/libsvn_fs_fs/rep-cache-db.sql > $(BUILD_DIR_$(BITS))/subversion/libsvn_fs_fs/rep-cache-db.h 2>&1 ) COMPONENT_BUILD_TARGETS = all swig-py swig-pl javahl COMPONENT_INSTALL_TARGETS = install install-lib \ @@ -122,84 +98,51 @@ $(BUILD_DIR)/$(MACH64)/.installed: COMPONENT_INSTALL_TARGETS += install-mods-shared -CONFIGURE_LIBDIR.32 = $(CONFIGURE_PREFIX)/lib/svn -CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib/svn/$(MACH64) - -APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config -APR-CONFIG.64 = /usr/apr/$(APR_VERSION)/bin/$(MACH64)/apr-1-config -APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config -APU-CONFIG.64 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/$(MACH64)/apu-1-config -APXS.32 = no -APXS.64 = /usr/apache2/2.4/bin/apxs -APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib -APR-CONFIG-RPATH.64 = /usr/apr/$(APR_VERSION)/lib/$(MACH64) -APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib -APU-CONFIG-RPATH.64 = /usr/apr-util/$(APR_VERSION)/lib/$(MACH64) - -EXPAT_INCLUDE = /usr/include -EXPAT_LIBDIR.32 = /usr/lib -EXPAT_LIBDIR.64 = /usr/lib/$(MACH64) -EXPAT_LIBDIR = $(EXPAT_LIBDIR.$(BITS)) -EXPAT_LIB = -lexpat - -APACHE_LIBEXECDIR=/usr/apache2/2.4/libexec - -LDFLAGS += -R$(CONFIGURE_LIBDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ - -R$(APU-CONFIG-RPATH.$(BITS)) - -LD_OPTIONS += -R$(CONFIGURE_LIBDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ - -R$(APU-CONFIG-RPATH.$(BITS)) - -CONFIGURE_ENV += CFLAGS="$(CFLAGS)" -CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_ENV += PYTHON="$(PYTHON.$(BITS))" CONFIGURE_ENV += PYMODS="$(PYMODS)" CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES.$(BITS))" CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" CONFIGURE_ENV += PERL="$(PERL)" -CONFIGURE_ENV += ac_cv_path_PERL="$(PERL)" CONFIGURE_ENV += PLMODS="$(PLMODS)" CONFIGURE_ENV += LD_OPTIONS="$(LD_OPTIONS)" -CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" + +CONFIGURE_LIBDIR.32 = $(CONFIGURE_PREFIX)/lib/svn +CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib/svn/$(MACH64) -CONFIGURE_OPTIONS += --localstatedir=/var -CONFIGURE_OPTIONS += --enable-shared +APR-CONFIG.32 = $(USRDIR)/apr/$(APR_VERSION)/bin/apr-1-config +APR-CONFIG.64 = $(USRDIR)/apr/$(APR_VERSION)/bin/$(MACH64)/apr-1-config +APU-CONFIG.32 = $(USRDIR)/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config +APU-CONFIG.64 = $(USRDIR)/apr-util/$(APR_UTIL_VERSION)/bin/$(MACH64)/apu-1-config +APXS.32 = no +APXS.64 = $(USRDIR)/apache2/2.4/bin/apxs +APR-CONFIG-RPATH.32 = $(USRDIR)/apr/$(APR_VERSION)/lib +APR-CONFIG-RPATH.64 = $(USRDIR)/apr/$(APR_VERSION)/lib/$(MACH64) +APU-CONFIG-RPATH.32 = $(USRDIR)/apr-util/$(APR_VERSION)/lib +APU-CONFIG-RPATH.64 = $(USRDIR)/apr-util/$(APR_VERSION)/lib/$(MACH64) + +LDFLAGS += -R$(CONFIGURE_LIBDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ + -R$(APU-CONFIG-RPATH.$(BITS)) + +CONFIGURE_OPTIONS += --localstatedir=$(VARDIR) +CONFIGURE_OPTIONS += --enable-shared CONFIGURE_OPTIONS += --disable-static -CONFIGURE_OPTIONS += --disable-libtool-lock +CONFIGURE_OPTIONS += --disable-libtool-lock +CONFIGURE_OPTIONS += --disable-neon-version-check CONFIGURE_OPTIONS += --disable-experimental-libtool 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/$(APR_VERSION) -CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/$(APR_UTIL_VERSION) +CONFIGURE_OPTIONS += --with-apr=$(USRDIR)/apr/$(APR_VERSION) +CONFIGURE_OPTIONS += --with-apr-util=$(USRDIR)/apr-util/$(APR_UTIL_VERSION) CONFIGURE_OPTIONS += --enable-nls CONFIGURE_OPTIONS += --disable-mod-activation CONFIGURE_OPTIONS += --enable-javahl CONFIGURE_OPTIONS += --with-swig -CONFIGURE_OPTIONS += --with-expat=$(EXPAT_INCLUDE):$(EXPAT_LIBDIR):$(EXPAT_LIB) -CONFIGURE_OPTIONS += --with-serf=$(CONFIGURE_PREFIIX) +CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-apr=$(APR-CONFIG.$(BITS)) CONFIGURE_OPTIONS += --with-apr-util=$(APU-CONFIG.$(BITS)) -CONFIGURE_OPTIONS += --with-apache-libexecdir=$(APACHE_LIBEXECDIR) - -COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)" -COMPONENT_BUILD_ENV += CXXFLAGS="$(CXXFLAGS)" -COMPONENT_BUILD_ENV += PYTHON="$(PYTHON.$(BITS))" -COMPONENT_BUILD_ENV += PYMODS="$(PYMODS)" -COMPONENT_BUILD_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES.$(BITS))" -COMPONENT_BUILD_ENV += JAVA_ROOT="$(JAVA_ROOT)" -COMPONENT_BUILD_ENV += PERL="$(PERL)" -COMPONENT_BUILD_ENV += ac_cv_path_PERL="$(PERL)" -COMPONENT_BUILD_ENV += PLMODS="$(PLMODS)" - -COMPONENT_BUILD_ENV += LD_OPTIONS="$(LD_OPTIONS)" -COMPONENT_BUILD_ENV += LDFLAGS="$(LDFLAGS)" - -COMPONENT_TEST_ENV += LD_LIBRARY_PATH_32="$(LD_TEST_PATH_32)" -COMPONENT_TEST_ENV += LD_LIBRARY_PATH_64="$(LD_TEST_PATH_64)" - -PKG_MACROS += PERL_ARCH_22="$(PERL_ARCH_22)" -PKG_MACROS += PYVER=$(PYTHON_VERSION) +CONFIGURE_OPTIONS += --with-gssapi=$(CONFIGURE_PREFIX) # Swig overwrites the 32-bit directory with 64-bit objects. # So we work around that. @@ -216,34 +159,18 @@ $(GNUCP) -rpd vendor-packages-32/svn vendor-packages/ ; \ fi ; ) -ASLR_MODE=$(ASLR_ENABLE) - -configure: $(CONFIGURE_32_and_64) - -build: $(BUILD_32_and_64) - -install: $(INSTALL_32_and_64) - -# The test target takes a very long time to run. -test: $(TEST_32_and_64) - -system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) +PKG_MACROS += PERL_ARCH_12="$(PERL_ARCH_12)" +PKG_MACROS += PERL_ARCH_16="$(PERL_ARCH_16)" +PKG_MACROS += PYVER=$(PYTHON_VERSION) REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += developer/versioning/subversion -REQUIRED_PACKAGES += developer/build/scons -REQUIRED_PACKAGES += gnome/gnome-keyring REQUIRED_PACKAGES += library/apr-15 REQUIRED_PACKAGES += library/apr-util-15 REQUIRED_PACKAGES += library/expat -REQUIRED_PACKAGES += library/glib2 -REQUIRED_PACKAGES += library/gnome/gnome-keyring -REQUIRED_PACKAGES += library/libserf +REQUIRED_PACKAGES += library/neon REQUIRED_PACKAGES += library/zlib -REQUIRED_PACKAGES += runtime/perl-522 -REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/c++-runtime REQUIRED_PACKAGES += system/library/security/gss REQUIRED_PACKAGES += system/library/security/libsasl REQUIRED_PACKAGES += system/library/security/libsasl2 - diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/history --- a/components/subversion/history Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/history Thu Apr 14 16:43:46 2016 -0700 @@ -1,3 +1,1 @@ -library/perl-5/subversion-512@1.7.20,5.12-5.12.0.0.0.98.0 library/perl-5/subversion-522 -library/perl-5/subversion-516@1.7.20,5.12-5.12.0.0.0.98.0 library/perl-5/subversion-522 library/python-2/subversion@1.7.5,5.12-5.12.0.0.0.41.0 library/python/subversion diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/patches/000-Makefile.in.patch --- a/components/subversion/patches/000-Makefile.in.patch Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/patches/000-Makefile.in.patch Thu Apr 14 16:43:46 2016 -0700 @@ -1,23 +1,9 @@ -# Disable 32-bit Perl bindings. -# Solaris-specific, not for upstream. ---- Makefile.in 2015-09-18 05:56:29.000000000 -0700 -+++ Makefile.in 2016-04-11 13:04:32.722626722 -0700 -@@ -21,6 +21,14 @@ - # ==================================================================== - # - -+MACH=$(shell uname -p) -+MACH64= -+ifeq ($(MACH),i386) -+ MACH64=amd64 -+else -+ MACH64=sparcv9 -+endif -+ - top_builddir = . - top_srcdir = @top_srcdir@ - abs_builddir = @abs_builddir@ -@@ -82,14 +90,14 @@ +# 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 2013-03-21 09:03:57.096238407 -0700 +@@ -85,8 +85,8 @@ swig_rb_libdir = @libdir@ ### these possibly need further discussion @@ -28,14 +14,7 @@ swig_pldir = @libdir@/svn-perl swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext toolsdir = @bindir@/svn-tools - - # where to install pkg-config files --pkgconfig_dir = $(datadir)/pkgconfig -+pkgconfig_dir = @libdir@/pkgconfig - - javahl_javadir = @libdir@/svn-javahl - javahl_javahdir = @libdir@/svn-javahl/include -@@ -142,9 +150,13 @@ +@@ -134,8 +134,8 @@ SWIG = @SWIG@ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ @@ -43,46 +22,20 @@ -SWIG_PY_LIBS = @SWIG_PY_LIBS@ +SWIG_PY_LINK = @SWIG_PY_LINK@ $(CFLAGS) $(EXTRA_CFLAGS) +SWIG_PY_LIBS = @SWIG_PY_LIBS@ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) -+ -+ifneq (,$(findstring m64,$(CXXFLAGS))) SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ -+endif -+ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ - SWIG_RB_LINK = @SWIG_RB_LINK@ -@@ -185,9 +197,17 @@ +@@ -180,7 +180,8 @@ ### suppressed (but they may come from httpd or APR). CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) +-SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) +EXTRA_SWIG_LDFLAGS = -R$(libdir) - SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) - SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_CPPFLAGS) ++SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) $(SWIG_PY_LIBS) -+SVN_RUNPATH= -+ifneq (,$(findstring m32,$(CXXFLAGS))) -+ SVN_RUNPATH=/usr/lib/svn -+else -+ SVN_RUNPATH=/usr/lib/svn/$(MACH64) -+endif -+ - COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES) - COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES) - COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES) -@@ -203,7 +223,12 @@ - - # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c) - COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c -+ -+COMPILE_SWIG_PL := /bin/true -+ifneq (,$(findstring m64,$(CXXFLAGS))) - COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c -+endif -+ - COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c - - # special compilation for files destined for javahl (i.e. C++) -@@ -261,7 +286,7 @@ + COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) + COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) +@@ -209,7 +210,7 @@ LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) # special link rule for mod_dav_svn @@ -91,7 +44,7 @@ # Special LDFLAGS for some libraries libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@ -@@ -286,7 +311,7 @@ +@@ -235,7 +236,7 @@ COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ # these commands link the wrapper objects into an extension library/module @@ -100,125 +53,35 @@ LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) -@@ -313,7 +338,12 @@ - ### this isn't correct yet - INSTALL_SWIG_PY = $(INSTALL_LIB) - INSTALL_SWIG_PY_LIB = $(INSTALL_LIB) -+ -+INSTALL_SWIG_PL_LIB := -+ifneq (,$(findstring m64,$(CXXFLAGS))) - INSTALL_SWIG_PL_LIB = $(INSTALL_LIB) -+endif -+ - INSTALL_SWIG_RB = $(INSTALL_LIB) - INSTALL_SWIG_RB_LIB = $(INSTALL_LIB) - -@@ -341,12 +371,18 @@ - - # The path to generated and complementary source files for the SWIG - # bindings. -+# ifneq (,$(findstring m64,$(CXXFLAGS))) - SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl -+# endif -+ - SWIG_PY_DIR = $(abs_builddir)/subversion/bindings/swig/python - SWIG_RB_DIR = $(abs_builddir)/subversion/bindings/swig/ruby - - # The path to the source files for the SWIG bindings -+# ifneq (,$(findstring m64,$(CXXFLAGS))) - SWIG_PL_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/perl -+# endif -+ - SWIG_PY_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/python - SWIG_RB_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/ruby - -@@ -833,33 +869,67 @@ - $(EXTRACLEAN_SWIG_HEADERS) - - $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in -- ./config.status subversion/bindings/swig/perl/native/Makefile.PL -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ ./config.status subversion/bindings/swig/perl/native/Makefile.PL ; \ -+ fi -+ +@@ -736,7 +737,14 @@ + ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL -- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) ; \ -+ fi -+ ( if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ; fi ) -+ ( if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; \ -+ for file in Makefile Makefile.client Makefile.delta \ -+ Makefile.fs Makefile.ra Makefile.repos Makefile.wc ; do \ -+ cp -f $$file $$file.orig ; \ -+ sed -e 's;^LD_RUN_PATH.*$$;LD_RUN_PATH=$(SVN_RUNPATH);g' $$file.orig >$$file ; \ -+ rm -f $$file.orig ; \ -+ done ; fi ) +- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ ( cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ) ++ ( cd $(SWIG_PL_DIR)/native; \ ++ for file in Makefile Makefile.client Makefile.delta \ ++ Makefile.fs Makefile.ra Makefile.repos Makefile.wc ; do \ ++ cp -f $$file $$file.orig ; \ ++ sed -e 's;^LD_RUN_PATH.*$$;LD_RUN_PATH=/usr/lib/svn;g' $$file.orig >$$file ; \ ++ rm -f $$file.orig ; \ ++ done ) # There is a "readlink -f" command on some systems for the same purpose, # but it's not as portable (e.g. Mac OS X doesn't have it). These should - # only be used where Python/Perl are known to be available. - READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))' -+READLINK_PL := -+ifneq (,$(findstring m64,$(CXXFLAGS))) - READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)' -+endif -+ -+swig-pl_DEPS := -+ifneq (,$(findstring m64,$(CXXFLAGS))) -+ swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile -+endif - --swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ -- $(SWIG_PL_DIR)/native/Makefile - swig-pl: $(swig-pl_DEPS) -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ +@@ -750,13 +758,13 @@ if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \ ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \ -+ fi ; \ -+ fi -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" LD_RUN_PATH="$(SVN_RUNPATH)" ; \ fi - cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" -+ -+install-swig-pl-lib: ++ cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" LD_RUN_PATH="/usr/lib/svn" check-swig-pl: swig-pl swig-pl-lib -- cd $(SWIG_PL_DIR)/native; $(MAKE) test -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; $(MAKE) test ; \ -+ fi + cd $(SWIG_PL_DIR)/native; $(MAKE) test install-swig-pl: swig-pl install-swig-pl-lib - cd $(SWIG_PL_DIR)/native; $(MAKE) install -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor DESTDIR=$(DESTDIR) LD_RUN_PATH="" ; \ -+ fi ++ cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor DESTDIR=$(DESTDIR) LD_RUN_PATH="" -+EXTRACLEAN_SWIG_PL := -+ifneq (,$(findstring m64,$(CXXFLAGS))) EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \ $(SWIG_PL_SRC_DIR)/native/core.c -+endif - - # Running Makefile.PL at this point *fails* (cannot find ..../.libs) so if the - # Makefile does not exist, DO NOT try to make it. But, if it doesn't exist, -@@ -868,11 +938,13 @@ - if test -z "$(RELEASE_MODE)"; then \ - $(EXTRACLEAN_SWIG_PL); \ - fi -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ - for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \ - do \ - cd $$d; \ - rm -rf *.lo *.la *.o .libs; \ -- done -+ done ; \ -+ fi - if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \ - cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \ - fi diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/patches/001-configure.patch --- a/components/subversion/patches/001-configure.patch Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/patches/001-configure.patch Thu Apr 14 16:43:46 2016 -0700 @@ -1,8 +1,10 @@ -# Pass the right flags to apr-config and apu-config. -# Only Solaris seems to need this, so not for upstream. ---- configure 2015-12-07 23:53:20.000000000 -0800 -+++ configure 2016-03-20 15:21:11.528922510 -0700 -@@ -4896,14 +4896,14 @@ +# 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 if test "$enable_all_static" = "yes"; then @@ -21,7 +23,7 @@ fi fi SVN_APR_LIBS="` -@@ -5140,14 +5140,14 @@ +@@ -5089,14 +5089,14 @@ fi if test "$enable_all_static" = "yes"; then @@ -40,3 +42,68 @@ fi fi SVN_APRUTIL_LIBS="` +@@ -5300,6 +5300,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'` + CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" + LIBS="$LIBS $NEON_LIBS" + neon_test_code=" +@@ -5320,6 +5322,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'` + LIBS="$LIBS $NEON_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5481,6 +5485,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'` + CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" + LIBS="$LIBS $NEON_LIBS" + neon_test_code=" +@@ -5501,6 +5507,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'` + LIBS="$LIBS $NEON_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -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 + +@@ -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/kerberosv5" ++ SVN_GSSAPI_LIBS="-lgss" + 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 diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/patches/002-build-outputs.mk.patch --- a/components/subversion/patches/002-build-outputs.mk.patch Thu Apr 14 15:10:58 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# Disable 32-bit Perl bindings. -# Solaris-specific, not for upstream. ---- build-outputs.mk 2015-12-07 23:53:19.000000000 -0800 -+++ build-outputs.mk 2016-04-11 14:30:25.902324040 -0700 -@@ -486,9 +486,18 @@ - - libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl - libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la -+ -+libsvn_swig_perl_OBJECTS := -+ifneq (,$(findstring m64,$(CXXFLAGS))) - libsvn_swig_perl_OBJECTS = swigutil_pl.lo -+endif -+ - subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS) -- cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS) -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS) ; \ -+ else \ -+ /usr/gnu/bin/touch $@ ; \ -+ fi - - libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py - libsvn_swig_py_DEPS = subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la -@@ -1253,9 +1262,10 @@ - - - install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la -- $(MKDIR) $(DESTDIR)$(swig_pl_libdir) -- cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la -- -+ if test "`echo $(CXXFLAGS) | ggrep 'm64'`" != "" ; then \ -+ $(MKDIR) $(DESTDIR)$(swig_pl_libdir) ; \ -+ cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la ; \ -+ fi - - install-swig-py: subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_diff.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la - $(MKDIR) $(DESTDIR)$(swig_pydir) diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-perl-512.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion-perl-512.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -0,0 +1,81 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# + default mangler.man.stability uncommitted> + + \ + set action.hash %<1>$(PERL_ARCH_12)/%<2> > +set name=pkg.fmri \ + value=pkg:/library/perl-5/subversion-512@$(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=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +# +link path=usr/lib/svn/libsvn_swig_perl-1.so target=libsvn_swig_perl-1.so.0.0.0 +link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0 +file path=usr/lib/svn/libsvn_swig_perl-1.so.0.0.0 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Base.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Client.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Core.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Delta.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Fs.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Ra.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Repos.3 +file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Wc.3 +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Client/_Client.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Client/_Client.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Core/_Core.bs +file \ + path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Core/_Core.so \ + pkg.depend.bypass-generate=.* +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Delta/_Delta.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Delta/_Delta.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Fs/_Fs.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Fs/_Fs.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Ra/_Ra.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Ra/_Ra.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Repos/_Repos.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Repos/_Repos.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Wc/_Wc.bs +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH_12)/auto/SVN/_Wc/_Wc.so +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Base.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Client.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Core.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Delta.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Fs.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Ra.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Repos.pm +file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Wc.pm +# +license subversion.license license="Apache v2.0" +# +# Unversioned content was migrated here from there in 1.7.5, s12_33, but +# to force an upgrade, we need to uprev that to be >= the S11 value. +depend type=optional fmri=library/perl-5/subversion@1.7.20-5.12.0.0.0.74.0 diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-perl-516.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion-perl-516.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -0,0 +1,76 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# + default mangler.man.stability uncommitted> + + \ + set action.hash %<1>$(PERL_ARCH_16)/%<2> > +set name=pkg.fmri \ + value=pkg:/library/perl-5/subversion-516@$(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=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so \ + target=libsvn_swig_perl-1.so.0.0.0 +link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0 \ + target=libsvn_swig_perl-1.so.0.0.0 +file path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0.0.0 +file path=usr/perl5/5.16/man/man3/SVN::Base.3 +file path=usr/perl5/5.16/man/man3/SVN::Client.3 +file path=usr/perl5/5.16/man/man3/SVN::Core.3 +file path=usr/perl5/5.16/man/man3/SVN::Delta.3 +file path=usr/perl5/5.16/man/man3/SVN::Fs.3 +file path=usr/perl5/5.16/man/man3/SVN::Ra.3 +file path=usr/perl5/5.16/man/man3/SVN::Repos.3 +file path=usr/perl5/5.16/man/man3/SVN::Wc.3 +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Client/_Client.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Client/_Client.so +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Core/_Core.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Core/_Core.so \ + pkg.depend.bypass-generate=.* +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Delta/_Delta.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Delta/_Delta.so +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Fs/_Fs.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Fs/_Fs.so +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Ra/_Ra.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Ra/_Ra.so +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Repos/_Repos.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Repos/_Repos.so +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Wc/_Wc.bs +file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Wc/_Wc.so +file path=usr/perl5/vendor_perl/5.16/SVN/Base.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Client.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Core.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Delta.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Fs.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Ra.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Repos.pm +file path=usr/perl5/vendor_perl/5.16/SVN/Wc.pm +license subversion.license license="Apache v2.0" + diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-perl-522.p5m --- a/components/subversion/subversion-perl-522.p5m Thu Apr 14 15:10:58 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -# - default mangler.man.stability uncommitted> - - \ - set action.hash %<1>$(PERL_ARCH_22)/%<2> > -set name=pkg.fmri \ - value=pkg:/library/perl-5/subversion-522@$(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=$(TPNO) -set name=info.classification \ - value="org.opensolaris.category.2008:Development/Source Code Management" -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) -set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=org.opensolaris.arc-caseid value=PSARC/2006/563 -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so \ - target=libsvn_swig_perl-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0 \ - target=libsvn_swig_perl-1.so.0.0.0 -file path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0.0.0 -file path=usr/perl5/5.22/man/man3/SVN::Base.3 -file path=usr/perl5/5.22/man/man3/SVN::Client.3 -file path=usr/perl5/5.22/man/man3/SVN::Core.3 -file path=usr/perl5/5.22/man/man3/SVN::Delta.3 -file path=usr/perl5/5.22/man/man3/SVN::Fs.3 -file path=usr/perl5/5.22/man/man3/SVN::Ra.3 -file path=usr/perl5/5.22/man/man3/SVN::Repos.3 -file path=usr/perl5/5.22/man/man3/SVN::Wc.3 -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Client/_Client.so -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Core/_Core.so \ - pkg.depend.bypass-generate=.* -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Delta/_Delta.so -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Fs/_Fs.so -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Ra/_Ra.so -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Repos/_Repos.so -file path=usr/perl5/vendor_perl/5.22/$(PERL_ARCH_22)/auto/SVN/_Wc/_Wc.so -file path=usr/perl5/vendor_perl/5.22/SVN/Base.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Client.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Core.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Delta.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Fs.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Ra.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Repos.pm -file path=usr/perl5/vendor_perl/5.22/SVN/Wc.pm -license subversion.license license="Apache v2.0" - diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-perl-64.p5m --- a/components/subversion/subversion-perl-64.p5m Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/subversion-perl-64.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -18,11 +18,11 @@ # # CDDL HEADER END # -# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ - value=pkg:/library/perl-522/subversion-64@1.7.5-5.12.0.0.0.95.0 + value=pkg:/library/perl-516/subversion-64@1.7.5-5.12.0.0.0.33.0 set name=pkg.renamed value=true set name=org.opensolaris.consolidation value=$(CONSOLIDATION) depend type=require \ - fmri=library/perl-5/subversion-522@1.7.5,5.12-5.12.0.0.0.95.0 + fmri=library/perl-5/subversion-516@1.7.5,5.12-5.12.0.0.0.33.0 diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-perl.p5m --- a/components/subversion/subversion-perl.p5m Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/subversion-perl.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -33,6 +33,8 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2006/563 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -depend type=conditional fmri=library/perl-5/subversion-522 \ - predicate=runtime/perl-522 +depend type=conditional fmri=library/perl-5/subversion-512 \ + predicate=runtime/perl-512 +depend type=conditional fmri=library/perl-5/subversion-516 \ + predicate=runtime/perl-516 diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion-python.p5m --- a/components/subversion/subversion-python.p5m Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/subversion-python.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2016, 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/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -35,7 +35,6 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2006/563 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -# file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_client.so file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_core.so @@ -62,8 +61,9 @@ file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/ra.py file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/repos.py file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/wc.py +file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__init__.py + # -file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_client.so file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_core.so file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_delta.so @@ -89,7 +89,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/svn/ra.py file path=usr/lib/python$(PYVER)/vendor-packages/svn/repos.py file path=usr/lib/python$(PYVER)/vendor-packages/svn/wc.py -# link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \ target=libsvn_swig_py-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \ diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/subversion.p5m --- a/components/subversion/subversion.p5m Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/subversion.p5m Thu Apr 14 16:43:46 2016 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> \ @@ -46,20 +46,16 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) file path=usr/apache2/2.4/libexec/mod_authz_svn.so file path=usr/apache2/2.4/libexec/mod_dav_svn.so -file usr/bin/$(MACH64)/svn path=usr/bin/svn -file usr/bin/$(MACH64)/svnadmin path=usr/bin/svnadmin -file usr/bin/$(MACH64)/svndumpfilter path=usr/bin/svndumpfilter -file usr/bin/$(MACH64)/svnlook path=usr/bin/svnlook -file usr/bin/$(MACH64)/svnrdump path=usr/bin/svnrdump -file usr/bin/$(MACH64)/svnserve path=usr/bin/svnserve -file usr/bin/$(MACH64)/svnsync path=usr/bin/svnsync -file usr/bin/$(MACH64)/svnversion path=usr/bin/svnversion -# -file usr/include/subversion-1/mod_authz_svn.h \ - path=usr/include/svn/mod_authz_svn.h +file path=usr/apache2/2.4/libexec/mod_dontdothat.so +file path=usr/bin/svn +file path=usr/bin/svnadmin +file path=usr/bin/svndumpfilter +file path=usr/bin/svnlook +file path=usr/bin/svnrdump +file path=usr/bin/svnserve +file path=usr/bin/svnsync +file path=usr/bin/svnversion file usr/include/subversion-1/mod_dav_svn.h path=usr/include/svn/mod_dav_svn.h -file usr/include/subversion-1/svn-revision.txt \ - path=usr/include/svn/svn-revision.txt 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 \ @@ -104,100 +100,7 @@ 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_x509.h path=usr/include/svn/svn_x509.h file usr/include/subversion-1/svn_xml.h path=usr/include/svn/svn_xml.h -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc -# -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_client.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_client.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_delta.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_delta.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_delta.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_delta.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_diff.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_diff.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_diff.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_diff.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_fs.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_fs.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_fs.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_fs.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_util.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_util.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_util.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_util.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_x.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_x.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_x.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_x.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_local.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_local.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_local.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_local.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_serf.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_serf.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_serf.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_serf.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_svn.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_svn.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_svn.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_svn.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_repos.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_repos.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_repos.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_repos.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_subr.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_subr.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_subr.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_subr.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_wc.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_wc.pc -file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_wc.pc \ - path=usr/lib/$(MACH64)/pkgconfig/libsvn_wc.pc -# -file usr/lib/svn/pkgconfig/libsvn_auth_gnome_keyring.pc \ - path=usr/lib/pkgconfig/libsvn_auth_gnome_keyring.pc -file usr/lib/svn/pkgconfig/libsvn_client.pc \ - path=usr/lib/pkgconfig/libsvn_client.pc -file usr/lib/svn/pkgconfig/libsvn_delta.pc \ - path=usr/lib/pkgconfig/libsvn_delta.pc -file usr/lib/svn/pkgconfig/libsvn_diff.pc path=usr/lib/pkgconfig/libsvn_diff.pc -file usr/lib/svn/pkgconfig/libsvn_fs.pc path=usr/lib/pkgconfig/libsvn_fs.pc -file usr/lib/svn/pkgconfig/libsvn_fs_fs.pc \ - path=usr/lib/pkgconfig/libsvn_fs_fs.pc -file usr/lib/svn/pkgconfig/libsvn_fs_util.pc \ - path=usr/lib/pkgconfig/libsvn_fs_util.pc -file usr/lib/svn/pkgconfig/libsvn_fs_x.pc path=usr/lib/pkgconfig/libsvn_fs_x.pc -file usr/lib/svn/pkgconfig/libsvn_ra.pc path=usr/lib/pkgconfig/libsvn_ra.pc -file usr/lib/svn/pkgconfig/libsvn_ra_local.pc \ - path=usr/lib/pkgconfig/libsvn_ra_local.pc -file usr/lib/svn/pkgconfig/libsvn_ra_serf.pc \ - path=usr/lib/pkgconfig/libsvn_ra_serf.pc -file usr/lib/svn/pkgconfig/libsvn_ra_svn.pc \ - path=usr/lib/pkgconfig/libsvn_ra_svn.pc -file usr/lib/svn/pkgconfig/libsvn_repos.pc \ - path=usr/lib/pkgconfig/libsvn_repos.pc -file usr/lib/svn/pkgconfig/libsvn_subr.pc path=usr/lib/pkgconfig/libsvn_subr.pc -file usr/lib/svn/pkgconfig/libsvn_wc.pc path=usr/lib/pkgconfig/libsvn_wc.pc -# -link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so \ - target=libsvn_auth_gnome_keyring-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so.0 \ - target=libsvn_auth_gnome_keyring-1.so.0.0.0 -file path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so \ target=libsvn_client-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0 \ @@ -222,9 +125,6 @@ link path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0 \ target=libsvn_fs_util-1.so.0.0.0 file path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_fs_x-1.so target=libsvn_fs_x-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_fs_x-1.so.0 target=libsvn_fs_x-1.so.0.0.0 -file path=usr/lib/svn/$(MACH64)/libsvn_fs_x-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0 file path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0.0.0 @@ -233,11 +133,11 @@ link path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0 \ target=libsvn_ra_local-1.so.0.0.0 file path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_ra_serf-1.so \ - target=libsvn_ra_serf-1.so.0.0.0 -link path=usr/lib/svn/$(MACH64)/libsvn_ra_serf-1.so.0 \ - target=libsvn_ra_serf-1.so.0.0.0 -file path=usr/lib/svn/$(MACH64)/libsvn_ra_serf-1.so.0.0.0 +link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so \ + target=libsvn_ra_neon-1.so.0.0.0 +link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0 \ + target=libsvn_ra_neon-1.so.0.0.0 +file path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so \ target=libsvn_ra_svn-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so.0 \ @@ -253,13 +153,8 @@ link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0 link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0 file path=usr/lib/svn/$(MACH64)/libsvn_wc-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_auth_gnome_keyring-1.so \ - target=libsvn_auth_gnome_keyring-1.so.0.0.0 -link path=usr/lib/svn/libsvn_auth_gnome_keyring-1.so.0 \ - target=libsvn_auth_gnome_keyring-1.so.0.0.0 -file path=usr/lib/svn/libsvn_auth_gnome_keyring-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_client-1.so.0 target=libsvn_client-1.so.0.0.0 file path=usr/lib/svn/libsvn_client-1.so.0.0.0 link path=usr/lib/svn/libsvn_delta-1.so target=libsvn_delta-1.so.0.0.0 @@ -277,18 +172,15 @@ link path=usr/lib/svn/libsvn_fs_util-1.so target=libsvn_fs_util-1.so.0.0.0 link path=usr/lib/svn/libsvn_fs_util-1.so.0 target=libsvn_fs_util-1.so.0.0.0 file path=usr/lib/svn/libsvn_fs_util-1.so.0.0.0 -link path=usr/lib/svn/libsvn_fs_x-1.so target=libsvn_fs_x-1.so.0.0.0 -link path=usr/lib/svn/libsvn_fs_x-1.so.0 target=libsvn_fs_x-1.so.0.0.0 -file path=usr/lib/svn/libsvn_fs_x-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0 file path=usr/lib/svn/libsvn_ra-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra_local-1.so target=libsvn_ra_local-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra_local-1.so.0 target=libsvn_ra_local-1.so.0.0.0 file path=usr/lib/svn/libsvn_ra_local-1.so.0.0.0 -link path=usr/lib/svn/libsvn_ra_serf-1.so target=libsvn_ra_serf-1.so.0.0.0 -link path=usr/lib/svn/libsvn_ra_serf-1.so.0 target=libsvn_ra_serf-1.so.0.0.0 -file path=usr/lib/svn/libsvn_ra_serf-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_neon-1.so target=libsvn_ra_neon-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_neon-1.so.0 target=libsvn_ra_neon-1.so.0.0.0 +file path=usr/lib/svn/libsvn_ra_neon-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra_svn-1.so target=libsvn_ra_svn-1.so.0.0.0 link path=usr/lib/svn/libsvn_ra_svn-1.so.0 target=libsvn_ra_svn-1.so.0.0.0 file path=usr/lib/svn/libsvn_ra_svn-1.so.0.0.0 @@ -301,8 +193,6 @@ link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0 link path=usr/lib/svn/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0 file path=usr/lib/svn/libsvn_wc-1.so.0.0.0 - -# file path=usr/share/locale/de/LC_MESSAGES/subversion.mo file path=usr/share/locale/es/LC_MESSAGES/subversion.mo file path=usr/share/locale/fr/LC_MESSAGES/subversion.mo @@ -315,7 +205,6 @@ file path=usr/share/locale/sv/LC_MESSAGES/subversion.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo -# file path=usr/share/man/man1/svn.1 file path=usr/share/man/man1/svnadmin.1 file path=usr/share/man/man1/svndumpfilter.1 diff -r 045df0b18275 -r d4593dbbc6ce components/subversion/test/results-subversion.master --- a/components/subversion/test/results-subversion.master Thu Apr 14 15:10:58 2016 -0700 +++ b/components/subversion/test/results-subversion.master Thu Apr 14 16:43:46 2016 -0700 @@ -1,128 +1,91 @@ -[001/109] auth-test......................................................success -[002/109] bit-array-test.................................................success -[003/109] cache-test.....................................................success -[004/109] checksum-test..................................................success -[005/109] client-test....................................................success -[006/109] compat-test....................................................success -[007/109] config-test....................................................success -[008/109] conflict-data-test.............................................success -[009/109] crypto-test....................................................success -[010/109] db-test........................................................success -[011/109] diff-diff3-test................................................success -[012/109] dirent_uri-test................................................success -[013/109] dump-load-test.................................................success -[014/109] entries-compat-test............................................success -[015/109] error-code-test................................................success -[016/109] error-test.....................................................success -[017/109] fs-fs-pack-test................................................success -[018/109] fs-fs-private-test.............................................success -[019/109] fs-test........................................................success -[020/109] fs-x-pack-test.................................................success -[021/109] hashdump-test..................................................success -[022/109] io-test........................................................success -[023/109] locks-test.....................................................success -[024/109] mergeinfo-test.................................................success -[025/109] mtcc-test......................................................success -[026/109] op-depth-test..................................................success -[027/109] opt-test.......................................................success -[028/109] packed-data-test...............................................success -[029/109] parse-diff-test................................................success -[030/109] path-test......................................................success -[031/109] prefix-string-test.............................................success -[032/109] priority-queue-test............................................success -[033/109] pristine-store-test............................................success -[034/109] ra-local-test..................................................success -[035/109] ra-test........................................................success -[036/109] random-test....................................................success -[037/109] repos-test.....................................................success -[038/109] revision-test..................................................success -[039/109] root-pools-test................................................success -[040/109] skel-test......................................................success -[041/109] spillbuf-test..................................................success -[042/109] sqlite-test....................................................success -[043/109] stream-test....................................................success -[044/109] string-table-test..............................................success -[045/109] string-test....................................................success -[046/109] subst_translate-test...........................................success -[047/109] time-test......................................................success -[048/109] translate-test.................................................success -[049/109] utf-test.......................................................success -[050/109] wc-queries-test................................................success -[051/109] wc-test........................................................success -[052/109] window-test....................................................success -[053/109] x509-test......................................................success -[054/109] authz_tests.py.................................................success -[055/109] autoprop_tests.py..............................................success -[056/109] basic_tests.py.................................................success -[057/109] blame_tests.py.................................................success -[058/109] cat_tests.py...................................................success -[059/109] changelist_tests.py............................................success -[060/109] checkout_tests.py..............................................success -[061/109] commit_tests.py................................................success -[062/109] copy_tests.py..................................................success -[063/109] depth_tests.py.................................................success -[064/109] diff_tests.py..................................................success -[065/109] entries_tests.py...............................................success -[066/109] export_tests.py................................................success -[067/109] externals_tests.py.............................................success -[068/109] getopt_tests.py................................................success -[069/109] history_tests.py...............................................success -[070/109] import_tests.py................................................success -[071/109] info_tests.py..................................................success -[072/109] input_validation_tests.py......................................success -[073/109] iprop_authz_tests.py...........................................success -[074/109] iprop_tests.py.................................................success -[075/109] lock_tests.py..................................................success -[076/109] log_tests.py...................................................success -[077/109] merge_authz_tests.py...........................................success -[078/109] merge_automatic_tests.py.......................................success -[079/109] merge_reintegrate_tests.py.....................................success -[080/109] merge_tests.py.................................................success -[081/109] merge_tree_conflict_tests.py...................................success -[082/109] mergeinfo_tests.py.............................................success -[083/109] mod_authz_svn_tests.py.........................................success -[084/109] move_tests.py..................................................success -[085/109] patch_tests.py.................................................success -[086/109] prop_tests.py..................................................success -[087/109] redirect_tests.py..............................................success -[088/109] relocate_tests.py..............................................success -[089/109] resolve_tests.py...............................................success -[090/109] revert_tests.py................................................success -[091/109] schedule_tests.py..............................................success -[092/109] special_tests.py...............................................success -[093/109] stat_tests.py..................................................success -[094/109] svnadmin_tests.py..............................................success -[095/109] svnauthz_tests.py..............................................success -[096/109] svndumpfilter_tests.py.........................................success -[097/109] svnfsfs_tests.py...............................................success -[098/109] svnlook_tests.py...............................................success -[099/109] svnmucc_tests.py...............................................success -[100/109] svnrdump_tests.py..............................................success -[101/109] svnsync_authz_tests.py.........................................success -[102/109] svnsync_tests.py...............................................success -[103/109] svnversion_tests.py............................................success -[104/109] switch_tests.py................................................success -[105/109] trans_tests.py.................................................success -[106/109] tree_conflict_tests.py.........................................success -[107/109] update_tests.py................................................success -[108/109] upgrade_tests.py...............................................success -[109/109] wc_tests.py....................................................success +make: Entering directory `$(@D)' +Running tests in auth-test [1/84].............................success +Running tests in cache-test [2/84]............................success +Running tests in checksum-test [3/84].........................success +Running tests in client-test [4/84]...........................success +Running tests in compat-test [5/84]...........................success +Running tests in config-test [6/84]...........................success +Running tests in db-test [7/84]...............................success +Running tests in diff-diff3-test [8/84].......................success +Running tests in dirent_uri-test [9/84].......................success +Running tests in entries-compat-test [10/84]..................success +Running tests in error-test [11/84]...........................success +Running tests in fs-pack-test [12/84].........................success +Running tests in fs-test [13/84]..............................success +Running tests in hashdump-test [14/84]........................success +Running tests in locks-test [15/84]...........................success +Running tests in mergeinfo-test [16/84].......................success +Running tests in op-depth-test [17/84]........................success +Running tests in opt-test [18/84].............................success +Running tests in parse-diff-test [19/84]......................success +Running tests in path-test [20/84]............................success +Running tests in pristine-store-test [21/84]..................success +Running tests in ra-local-test [22/84]........................success +Running tests in random-test [23/84]..........................success +Running tests in repos-test [24/84]...........................success +Running tests in revision-test [25/84]........................success +Running tests in skel-test [26/84]............................success +Running tests in stream-test [27/84]..........................success +Running tests in string-test [28/84]..........................success +Running tests in subst_translate-test [29/84].................success +Running tests in target-test [30/84]..........................success +Running tests in time-test [31/84]............................success +Running tests in translate-test [32/84].......................success +Running tests in tree-conflict-data-test [33/84]..............success +Running tests in utf-test [34/84].............................success +Running tests in window-test [35/84]..........................success +Running tests in authz_tests.py [36/84].......................success +Running tests in autoprop_tests.py [37/84]....................success +Running tests in basic_tests.py [38/84].......................success +Running tests in blame_tests.py [39/84].......................success +Running tests in cat_tests.py [40/84].........................success +Running tests in changelist_tests.py [41/84]..................success +Running tests in checkout_tests.py [42/84]....................success +Running tests in commit_tests.py [43/84]......................success +Running tests in copy_tests.py [44/84]........................success +Running tests in depth_tests.py [45/84].......................success +Running tests in diff_tests.py [46/84]........................success +Running tests in entries_tests.py [47/84].....................success +Running tests in export_tests.py [48/84]......................success +Running tests in externals_tests.py [49/84]...................success +Running tests in getopt_tests.py [50/84]......................success +Running tests in history_tests.py [51/84].....................success +Running tests in import_tests.py [52/84]......................success +Running tests in info_tests.py [53/84]........................success +Running tests in input_validation_tests.py [54/84]............success +Running tests in lock_tests.py [55/84]........................success +Running tests in log_tests.py [56/84].........................success +Running tests in merge_authz_tests.py [57/84].................success +Running tests in merge_reintegrate_tests.py [58/84]...........success +Running tests in merge_tests.py [59/84].......................success +Running tests in merge_tree_conflict_tests.py [60/84].........success +Running tests in mergeinfo_tests.py [61/84]...................success +Running tests in patch_tests.py [62/84].......................success +Running tests in prop_tests.py [63/84]........................success +Running tests in redirect_tests.py [64/84]....................success +Running tests in relocate_tests.py [65/84]....................success +Running tests in resolve_tests.py [66/84].....................success +Running tests in resolved_tests.py [67/84]....................success +Running tests in revert_tests.py [68/84]......................success +Running tests in schedule_tests.py [69/84]....................success +Running tests in special_tests.py [70/84].....................success +Running tests in stat_tests.py [71/84]........................success +Running tests in svnadmin_tests.py [72/84]....................success +Running tests in svndumpfilter_tests.py [73/84]...............success +Running tests in svnlook_tests.py [74/84].....................success +Running tests in svnmucc_tests.py [75/84].....................success +Running tests in svnrdump_tests.py [76/84]....................success +Running tests in svnsync_tests.py [77/84].....................success +Running tests in svnversion_tests.py [78/84]..................success +Running tests in switch_tests.py [79/84]......................success +Running tests in trans_tests.py [80/84].......................success +Running tests in tree_conflict_tests.py [81/84]...............success +Running tests in update_tests.py [82/84]......................success +Running tests in upgrade_tests.py [83/84].....................success +Running tests in utf8_tests.py [84/84]........................success +At least one test was SKIPPED, checking $(@D)/tests.log SKIP: cache-test 2: basic memcache svn_cache test SKIP: cache-test 3: memcache svn_cache with very long keys -SKIP: crypto-test 1: basic password encryption/decryption test -SKIP: crypto-test 2: password checktext generation/validation -SKIP: fs-x-pack-test 1: pack a FSX filesystem -SKIP: fs-x-pack-test 2: pack FSX where revs % shard = 0 -SKIP: fs-x-pack-test 3: read from a packed FSX filesystem -SKIP: fs-x-pack-test 4: commit to a packed FSX filesystem -SKIP: fs-x-pack-test 5: get/set revprop while packing FSX filesystem -SKIP: fs-x-pack-test 6: get/set large packed revprops in FSX -SKIP: fs-x-pack-test 7: get/set huge packed revprops in FSX -SKIP: fs-x-pack-test 8: recover a fully packed filesystem -SKIP: fs-x-pack-test 9: test file hint at shard boundary -SKIP: fs-x-pack-test 10: test svn_fs_info -SKIP: fs-x-pack-test 11: test representations container -SKIP: fs-x-pack-test 12: test packing with shard size = 1 SKIP: pristine-store-test 3: reject_mismatching_text SKIP: authz_tests.py 1: authz issue #2486 - open root SKIP: authz_tests.py 2: authz issue #2486 - open directory @@ -143,101 +106,57 @@ SKIP: authz_tests.py 17: multiple lines matching a user SKIP: authz_tests.py 18: wc-to-wc-copy with absent nodes and then revert SKIP: authz_tests.py 19: recursive ls with private subtrees -SKIP: authz_tests.py 20: authz issue #3781, check case sensitivity +SKIP: authz_tests.py 20: authz issue #3781, check case sensitiveness SKIP: authz_tests.py 21: authz should notice a tree conflict SKIP: authz_tests.py 22: wc delete with absent nodes SKIP: authz_tests.py 23: verify commit error reporting SKIP: authz_tests.py 24: upgrade absent nodes to server-excluded -SKIP: authz_tests.py 25: remove a subdir with authz file -SKIP: authz_tests.py 26: authz with configured global groups -SKIP: authz_tests.py 27: delete file without rights on the root -SKIP: authz_tests.py 28: log --diff on dontdothat -SKIP: authz_tests.py 29: replace file external with authz node -SKIP: authz_tests.py 30: log censors revprops for partially visible revs -SKIP: basic_tests.py 52: verify that neon/serf are compiled if tested +SKIP: authz_tests.py 25: delete file without rights on the root +SKIP: basic_tests.py 51: verify that neon/serf are compiled if tested SKIP: checkout_tests.py 14: checkout from the root of a Windows drive -SKIP: iprop_authz_tests.py 1: property inheritance and read restricted parents -SKIP: lock_tests.py 54: create generic DAV lock with timeout -SKIP: lock_tests.py 57: refresh timeout of DAV lock -SKIP: lock_tests.py 58: lock and delete a file called 'a %( ) .txt' SKIP: merge_authz_tests.py 1: skipped paths get overriding mergeinfo SKIP: merge_authz_tests.py 3: reintegrate fails if no root access -SKIP: mod_authz_svn_tests.py 1: test anonymous access -SKIP: mod_authz_svn_tests.py 2: test mixed anonymous and authenticated access -SKIP: mod_authz_svn_tests.py 3: test mixed with noauthwhenanon directive -SKIP: mod_authz_svn_tests.py 4: test authenticated only access -SKIP: mod_authz_svn_tests.py 5: test authenticated only access with anonoff -SKIP: mod_authz_svn_tests.py 6: test authenticated only access with lcuser -SKIP: mod_authz_svn_tests.py 7: test authenticated only access via groups -SKIP: mod_authz_svn_tests.py 8: test satisfy all require any config -SKIP: mod_authz_svn_tests.py 9: test satisfy all require all config SKIP: redirect_tests.py 1: temporary redirect should error out SKIP: redirect_tests.py 2: redirected checkout SKIP: redirect_tests.py 3: redirected update -SKIP: redirect_tests.py 4: redirected update of non-repos-root wc -SKIP: redirect_tests.py 5: redirected externals -SKIP: redirect_tests.py 6: redirected copy -SKIP: redirect_tests.py 7: redirected commands -SKIP: svnadmin_tests.py 9: 'svnadmin hotcopy' checking db/format file -SKIP: svnsync_authz_tests.py 1: verify that unreadable content is not synced -SKIP: svnsync_authz_tests.py 2: verify that copies from unreadable dirs work -SKIP: svnsync_authz_tests.py 3: verify copies with mods from unreadable dirs -SKIP: svnsync_authz_tests.py 4: verify copies with mods from unreadable dirs +copy -SKIP: svnsync_authz_tests.py 6: verify if specifically denied paths dont sync -SKIP: svnsync_authz_tests.py 7: copy, then rm at-src-unreadable child -SKIP: update_tests.py 31: update wc on the root of a Windows (virtual) drive -SKIP: update_tests.py 57: access denied paths should be skipped -SKIP: update_tests.py 76: test filename with backslashes inside -SKIP: wc_tests.py 11: missing .svn/wc.db and .svn/entries -XFAIL: dirent_uri-test 46: test match with RFC 6125 s. 6.4.3 Rule 3 -XFAIL: fs-test 44: test reopen and modify txn -XFAIL: op-depth-test 42: mixed_rev_move - [[needs different libsvn_wc entry point]] -XFAIL: op-depth-test 56: commit_moved_away_descendant -XFAIL: op-depth-test 68: move retract (issue 4336) -XFAIL: op-depth-test 75: move more than once, revert intermediate -XFAIL: op-depth-test 79: del4: delete AAA -XFAIL: op-depth-test 80: del4: add AAA -XFAIL: op-depth-test 81: del4: replace AAA -XFAIL: op-depth-test 83: del4: replace self AAA -XFAIL: op-depth-test 85: move4: delete AAA -XFAIL: op-depth-test 86: move4: add AAA -XFAIL: op-depth-test 87: move4: replace AAA -XFAIL: op-depth-test 89: move4: replace self AAA -XFAIL: op-depth-test 95: move within mixed move -XFAIL: basic_tests.py 63: peg rev resolution on non-existent wc paths +SKIP: svnsync_tests.py 14: verify that unreadable content is not synced +SKIP: svnsync_tests.py 15: verify that copies from unreadable dirs work +SKIP: svnsync_tests.py 16: verify copies with mods from unreadable dirs +SKIP: svnsync_tests.py 17: verify copies with mods from unreadable dirs +copy +SKIP: svnsync_tests.py 32: verify if specifically denied paths dont sync +SKIP: svnsync_tests.py 36: copy, then rm at-src-unreadable child +SKIP: update_tests.py 24: update a nested wc in a read-only wc +SKIP: update_tests.py 32: update wc on the root of a Windows (virtual) drive +SKIP: update_tests.py 59: access denied paths should be skipped +SKIP: utf8_tests.py 1: conversion of paths and logs to/from utf8 +At least one test XFAILED, checking $(@D)/tests.log +XFAIL: dirent_uri-test 49: test match with RFC 6125 s. 6.4.3 Rule 3 +XFAIL: fs-test 18: merging commit + [[needs to be written to match new merge() algorithm expectations]] XFAIL: blame_tests.py 15: blame -g handles changes from empty mergeinfo -XFAIL: commit_tests.py 66: last changed of copied subdir XFAIL: copy_tests.py 103: copy and move conflicts -XFAIL: diff_tests.py 77: diff repo to wc of a copy +XFAIL: diff_tests.py 49: diff URL against working copy with local mods XFAIL: export_tests.py 11: export working copy at base revision -XFAIL: externals_tests.py 49: file externals versioned obstruction -XFAIL: merge_automatic_tests.py 16: cherry2_fwd -XFAIL: merge_automatic_tests.py 17: cherry3_fwd XFAIL: merge_tests.py 49: avoid repeated merges for cyclic merging XFAIL: merge_tests.py 64: merge target with non inheritable mergeinfo XFAIL: merge_tests.py 114: don't inherit bogus mergeinfo XFAIL: merge_tests.py 115: don't inherit bogus working mergeinfo -XFAIL: patch_tests.py 46: patch file lacking trailing eol on context -XFAIL: patch_tests.py 52: hunks that overlap +XFAIL: merge_tree_conflict_tests.py 12: tree conflicts 5.1: leaf edit, tree del +XFAIL: merge_tree_conflict_tests.py 13: tree conflicts 5.2: leaf del, tree del +XFAIL: merge_tree_conflict_tests.py 18: tree conflicts 5.2: leaf del (no ci), tree del +XFAIL: merge_tree_conflict_tests.py 23: replace vs. delete tree-conflicts +XFAIL: patch_tests.py 40: avoid reordering hunks +XFAIL: resolve_tests.py 2: resolving prop conflicts +XFAIL: revert_tests.py 4: revert a moved file XFAIL: revert_tests.py 25: revert a copy with depth=files XFAIL: revert_tests.py 26: revert a nested add with depth=immediates -XFAIL: special_tests.py 24: cat added symlink -XFAIL: special_tests.py 27: multiline link file with svn:special -XFAIL: stat_tests.py 37: modified before translation, unmodified after -XFAIL: svnrdump_tests.py 51: load: mergeinfo that contains r0 +XFAIL: special_tests.py 18: merge symlink-add from foreign repos XFAIL: switch_tests.py 9: switch a file to a dir and back to the file -XFAIL: trans_tests.py 10: able to handle inconsistent eols on add -XFAIL: trans_tests.py 11: able to handle inconsistent mime on add -XFAIL: wc_tests.py 1: file status through unversioned symlink -XFAIL: wc_tests.py 2: file status through versioned symlink -XFAIL: wc_tests.py 3: file status with not-parent symlink -XFAIL: wc_tests.py 4: add file through unversioned symlink -XFAIL: wc_tests.py 5: add file through versioned symlink -XFAIL: wc_tests.py 6: add file with not-parent symlink +XFAIL: tree_conflict_tests.py 14: merge dir: del/rpl/mv onto not-same Summary of test results: - 2193 tests PASSED - 82 tests SKIPPED - 45 tests XFAILED (1 WORK-IN-PROGRESS) + 1585 tests PASSED + 45 tests SKIPPED + 22 tests XFAILED (1 WORK-IN-PROGRESS) SUMMARY: All tests successful. +make: Leaving directory `$(@D)'