Security bump (bug #532406). Removed old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

8 files changed, 46 insertions, 666 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index a299f9e651ff..ee8ed1213221 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.205 2014/12/14 02:52:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.206 2014/12/16 12:16:00 polynomial-c Exp $
+
+*subversion-1.8.11 (16 Dec 2014)
+
+  16 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -subversion-1.8.9.ebuild,
+  +subversion-1.8.11.ebuild,
+  -files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch,
+  -files/subversion-1.6.2-local_library_preloading.patch,
+  -files/subversion-1.6.3-kwallet_window.patch,
+  -files/subversion-1.7.6-kwallet.patch,
+  -files/subversion-1.7.6-revert-mod_dontdothat-move.patch,
+  -files/svnserve.initd:
+  Security bump (bug #532406). Removed old.
 
   14 Dec 2014; Manuel Rüger <mrueg@gentoo.org> subversion-1.8.10-r1.ebuild:
   Add support for kde applications dependency.
diff --git a/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch b/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
deleted file mode 100644
index 689b29cd7fc7..000000000000
--- a/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -47,6 +47,7 @@
- SVN_SASL_LIBS = @SVN_SASL_LIBS@
- SVN_SERF_LIBS = @SVN_SERF_LIBS@
- SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
-+SVN_XML_LIBS = -lexpat
- SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
- 
- LIBS = @LIBS@
---- build/ac-macros/aprutil.m4
-+++ build/ac-macros/aprutil.m4
-@@ -77,16 +77,14 @@
-     AC_MSG_ERROR([apu-config --prefix failed])
-   fi
- 
--  dnl When APR stores the dependent libs in the .la file, we don't need
--  dnl --libs.
--  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
-+  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apu-config --link-libtool failed])
-   fi
- 
--  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
-+  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apu-config --link-ld --libs failed])
-+    AC_MSG_ERROR([apu-config --link-ld failed])
-   fi
- 
-   AC_SUBST(SVN_APRUTIL_INCLUDES)
---- build/ac-macros/apr.m4
-+++ build/ac-macros/apr.m4
-@@ -74,16 +74,14 @@
-     AC_MSG_ERROR([apr-config --prefix failed])
-   fi
- 
--  dnl When APR stores the dependent libs in the .la file, we don't need 
--  dnl --libs.
--  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
-+  SVN_APR_LIBS="`$apr_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apr-config --link-libtool failed])
-   fi
- 
--  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
-+  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apr-config --link-ld --libs failed])
-+    AC_MSG_ERROR([apr-config --link-ld failed])
-   fi
- 
-   SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
diff --git a/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch b/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch
deleted file mode 100644
index 704b30026fb3..000000000000
--- a/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -198,6 +198,24 @@
- 
- AC_SUBST(LT_LDFLAGS)
- 
-+AC_ARG_ENABLE(local-library-preloading,
-+  AS_HELP_STRING([--disable-local-library-preloading], 
-+                 [Disable preloading of locally built libraries in locally built executables]),
-+  [
-+  if test "$enableval" != "no"; then
-+    TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
-+  else
-+    TRANSFORM_LIBTOOL_SCRIPTS=""
-+  fi
-+  ], [
-+  if test "`uname`" != "Darwin"; then
-+    TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
-+  else
-+    TRANSFORM_LIBTOOL_SCRIPTS=""
-+  fi
-+])
-+AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS)
-+
- dnl Check if -no-undefined is needed for the platform.
- dnl It should always work but with libtool 1.4.3 on OS X it breaks the build.
- dnl So we only turn it on for platforms where we know we really need it.
---- Makefile.in
-+++ Makefile.in
-@@ -309,7 +309,10 @@
- 
- @INCLUDE_OUTPUTS@
- 
--local-all: @BUILD_RULES@
-+local-all: @BUILD_RULES@ @TRANSFORM_LIBTOOL_SCRIPTS@
-+
-+transform-libtool-scripts: @BUILD_RULES@
-+	@$(top_srcdir)/build/transform_libtool_scripts.sh
- 
- locale-gnu-pot:
- 	cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \
---- build/transform_libtool_scripts.sh
-+++ build/transform_libtool_scripts.sh
-@@ -0,0 +1,121 @@
-+#!/bin/sh
-+#
-+#
-+# Licensed to the Apache Software Foundation (ASF) under one
-+# or more contributor license agreements.  See the NOTICE file
-+# distributed with this work for additional information
-+# regarding copyright ownership.  The ASF licenses this file
-+# to you under the Apache License, Version 2.0 (the
-+# "License"); you may not use this file except in compliance
-+# with the License.  You may obtain a copy of the License at
-+#
-+#   http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing,
-+# software distributed under the License is distributed on an
-+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+# KIND, either express or implied.  See the License for the
-+# specific language governing permissions and limitations
-+# under the License.
-+#
-+#
-+
-+# Dependencies of libraries
-+subr="subr"
-+auth_gnome_keyring="auth_gnome_keyring $subr"
-+auth_kwallet="auth_kwallet $subr"
-+delta="delta $subr"
-+diff="diff $subr"
-+fs_util="fs_util $subr"
-+fs_base="fs_base $delta $fs_util $subr"
-+fs_fs="fs_fs $delta $fs_util $subr"
-+fs="fs $fs_base $fs_fs $fs_util $subr"
-+repos="repos $delta $fs $fs_util $subr"
-+ra_local="ra_local $delta $fs $fs_util $repos $subr"
-+ra_neon="ra_neon $delta $subr"
-+ra_serf="ra_serf $delta $subr"
-+ra_svn="ra_svn $delta $subr"
-+ra="ra $delta $ra_local $ra_neon $ra_serf $ra_svn $subr"
-+wc="wc $delta $diff $subr"
-+client="client $delta $diff $ra $subr $wc"
-+
-+# Variable 'libraries' containing names of variables corresponding to libraries
-+libraries="auth_gnome_keyring auth_kwallet client delta diff fs fs_base fs_fs fs_util ra ra_local ra_neon ra_serf ra_svn repos subr wc"
-+
-+for library in $libraries; do
-+  # Delete duplicates in dependencies of libraries
-+  library_dependencies="$(echo -n $(for x in $(eval echo "\$$library"); do echo $x; done | sort -u))"
-+  eval "$library=\$library_dependencies"
-+done
-+
-+# Dependencies of executables
-+svn="$auth_gnome_keyring $auth_kwallet $client $delta $diff $ra $subr $wc"
-+svnadmin="$delta $fs $repos $subr"
-+svndumpfilter="$delta $fs $repos $subr"
-+svnlook="$delta $diff $fs $repos $subr"
-+svnserve="$delta $fs $ra_svn $repos $subr"
-+svnsync="$auth_gnome_keyring $auth_kwallet $delta $ra $subr"
-+svnversion="$subr $wc"
-+entries_dump="$subr $wc"
-+
-+# Variable 'executables' containing names of variables corresponding to executables
-+executables="svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion entries_dump"
-+
-+for executable in $executables; do
-+  # Set variables containing paths of executables
-+  if [ "$executable" != entries_dump ]; then
-+    eval "${executable}_path=subversion/$executable/$executable"
-+  else
-+    eval "${executable}_path=subversion/tests/cmdline/entries-dump"
-+  fi
-+  # Delete duplicates in dependencies of executables
-+  executable_dependencies="$(echo -n $(for x in $(eval echo "\$$executable"); do echo $x; done | sort -u))"
-+  eval "$executable=\$executable_dependencies"
-+done
-+
-+test_paths="$(find subversion/tests -mindepth 2 -maxdepth 2 -name '*-test' ! -path '*/.libs/*' | sort)"
-+for test in $test_paths; do
-+  test_path="$test"
-+  # Dependencies of tests are based on names of directories containing tests
-+  test_library="$(echo $test | sed -e 's:^subversion/tests/libsvn_\([^/]*\)/.*:\1:')"
-+  test_dependencies="$(eval echo "\$$test_library")"
-+  # Set variables corresponding to tests and containing dependencies of tests
-+  test="$(echo $test | sed -e 's:^subversion/tests/libsvn_[^/]*/\(.*\):\1:' -e 's/-/_/g')"
-+  eval "$test=\$test_dependencies"
-+  # Set variables containing paths of tests
-+  eval "${test}_path=\$test_path"
-+  # Set variable 'tests' containing names of variables corresponding to tests
-+  tests="$tests $test"
-+done
-+
-+# auth-test dynamically loads libsvn_auth_gnome_keyring and libsvn_auth_kwallet libraries
-+auth_test="auth_gnome_keyring auth_kwallet $auth_test"
-+
-+# Usage: sed_append LINE_NUMBER TEXT FILE
-+sed_append()
-+{
-+  sed -e "$1a\\
-+$2" "$3" > "$3.new"
-+  mv -f "$3.new" "$3"
-+}
-+
-+current_directory="$(pwd)"
-+for libtool_script in $executables $tests; do
-+  eval "libtool_script_path=\$${libtool_script}_path"
-+  libtool_script_libraries=""
-+  if [ -f "$libtool_script_path" ]; then
-+    if { grep LD_LIBRARY_PATH "$libtool_script_path" && ! grep LD_PRELOAD "$libtool_script_path"; } > /dev/null; then
-+      echo "Transforming $libtool_script_path"
-+      libtool_script_dependencies="$(eval echo "\$$libtool_script")"
-+      for libtool_script_dependency in $libtool_script_dependencies; do
-+        libtool_script_library="$current_directory/subversion/libsvn_$libtool_script_dependency/.libs/libsvn_$libtool_script_dependency-1.so"
-+        [ -f "$libtool_script_library" ] && libtool_script_libraries="$libtool_script_libraries $libtool_script_library"
-+      done
-+      libtool_script_libraries="${libtool_script_libraries# *}"
-+      # Append definitions of LD_PRELOAD to libtool scripts
-+      sed_append 4 "LD_PRELOAD=\"$libtool_script_libraries\"" "$libtool_script_path"
-+      sed_append 5 "export LD_PRELOAD" "$libtool_script_path"
-+      chmod +x "$libtool_script_path"
-+    fi
-+  fi
-+done
diff --git a/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch b/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch
deleted file mode 100644
index 4bb9c09f0a4c..000000000000
--- a/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-https://svn.collab.net/viewvc/svn?view=revision&revision=38004
-https://svn.collab.net/viewvc/svn?view=revision&revision=38014
-https://svn.collab.net/viewvc/svn?view=revision&revision=38028
-https://svn.collab.net/viewvc/svn?view=revision&revision=38122
-
---- subversion/libsvn_auth_kwallet/kwallet.cpp
-+++ subversion/libsvn_auth_kwallet/kwallet.cpp
-@@ -22,6 +22,7 @@
- 
- /*** Includes. ***/
- 
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
-@@ -30,6 +31,9 @@
- #include "svn_auth.h"
- #include "svn_config.h"
- #include "svn_error.h"
-+#include "svn_io.h"
-+#include "svn_pools.h"
-+#include "svn_string.h"
- #include "svn_version.h"
- 
- #include "private/svn_auth_private.h"
-@@ -38,13 +42,20 @@
- 
- #include <dbus/dbus.h>
- #include <QtCore/QCoreApplication>
-+#include <QtCore/QList>
-+#include <QtCore/QMap>
- #include <QtCore/QString>
-+#include <QtGui/QApplication>
-+#include <QtGui/QX11Info>
- 
- #include <kaboutdata.h>
- #include <kcmdlineargs.h>
- #include <kcomponentdata.h>
- #include <klocalizedstring.h>
- #include <kwallet.h>
-+#include <kwindowsystem.h>
-+#include <netwm.h>
-+#include <netwm_def.h>
- 
- 
- /*-----------------------------------------------------------------------*/
-@@ -52,6 +63,28 @@
- /*-----------------------------------------------------------------------*/
- 
- 
-+#define INITIALIZE_APPLICATION                                            \
-+  if (apr_hash_get(parameters,                                            \
-+                   "svn:auth:qapplication-safe",                          \
-+                   APR_HASH_KEY_STRING))                                  \
-+    {                                                                     \
-+      QApplication *app;                                                  \
-+      if (! qApp)                                                         \
-+        {                                                                 \
-+          int argc = 1;                                                   \
-+          app = new QApplication(argc, (char *[1]) {(char *) "svn"});     \
-+        }                                                                 \
-+    }                                                                     \
-+  else                                                                    \
-+    {                                                                     \
-+      QCoreApplication *app;                                              \
-+      if (! qApp)                                                         \
-+        {                                                                 \
-+          int argc = 1;                                                   \
-+          app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); \
-+        }                                                                 \
-+    }
-+
- static const char *
- get_application_name(apr_hash_t *parameters,
-                      apr_pool_t *pool)
-@@ -69,8 +102,7 @@
-   const char *svn_application_name;
-   if (svn_application_name_with_pid)
-     {
--      long pid = getpid();
--      svn_application_name = apr_psprintf(pool, "Subversion [%ld]", pid);
-+      svn_application_name = apr_psprintf(pool, "Subversion [%ld]", long(getpid()));
-     }
-   else
-     {
-@@ -102,9 +134,108 @@
-     }
- }
- 
-+static pid_t
-+get_parent_pid(pid_t pid,
-+               apr_pool_t *pool)
-+{
-+  pid_t parent_pid = 0;
-+
-+#ifdef __linux__
-+  svn_stream_t *stat_file_stream;
-+  svn_string_t *stat_file_string;
-+  const char *preceeding_space, *following_space, *parent_pid_string;
-+
-+  const char *path = apr_psprintf(pool, "/proc/%ld/stat", long(pid));
-+  svn_error_t *err = svn_stream_open_readonly(&stat_file_stream, path, pool, pool);
-+  if (err == SVN_NO_ERROR)
-+    {
-+      err = svn_string_from_stream(&stat_file_string, stat_file_stream, pool, pool);
-+      if (err == SVN_NO_ERROR)
-+        {
-+          if ((preceeding_space = strchr(stat_file_string->data, ' ')))
-+            {
-+              if ((preceeding_space = strchr(preceeding_space + 1, ' ')))
-+                {
-+                  if ((preceeding_space = strchr(preceeding_space + 1, ' ')))
-+                    {
-+                      if ((following_space = strchr(preceeding_space + 1, ' ')))
-+                        {
-+                          parent_pid_string = apr_pstrndup(pool,
-+                                                           preceeding_space + 1,
-+                                                           following_space - preceeding_space);
-+                          parent_pid = atol(parent_pid_string);
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-+  if (err)
-+    {
-+      svn_error_clear(err);
-+    }
-+#endif
-+
-+  return parent_pid;
-+}
-+
-+static WId
-+get_wid(apr_hash_t *parameters,
-+        apr_pool_t *pool)
-+{
-+  WId wid = 1;
-+
-+  if (apr_hash_get(parameters,
-+                   "svn:auth:qapplication-safe",
-+                   APR_HASH_KEY_STRING))
-+    {
-+      QMap<pid_t, WId> process_info_list;
-+      QList<WId> windows(KWindowSystem::windows());
-+      QList<WId>::const_iterator i;
-+      for (i = windows.begin(); i != windows.end(); i++)
-+        {
-+          process_info_list[NETWinInfo(QX11Info::display(),
-+                                       *i,
-+                                       QX11Info::appRootWindow(),
-+                                       NET::WMPid).pid()] = *i;
-+        }
-+
-+      apr_pool_t *iterpool = svn_pool_create(pool);
-+      pid_t pid = getpid();
-+      while (pid != 0)
-+        {
-+          svn_pool_clear(iterpool);
-+          if (process_info_list.contains(pid))
-+            {
-+              wid = process_info_list[pid];
-+              break;
-+            }
-+          pid = get_parent_pid(pid, iterpool);
-+        }
-+      svn_pool_destroy(iterpool);
-+    }
-+
-+  if (wid == 1)
-+    {
-+      const char *wid_env_string = getenv("WINDOWID");
-+      if (wid_env_string)
-+        {
-+          long wid_env = atol(wid_env_string);
-+          if (wid_env != 0)
-+            {
-+              wid = wid_env;
-+            }
-+        }
-+    }
-+
-+  return wid;
-+}
-+
- static KWallet::Wallet *
- get_wallet(QString wallet_name,
--           apr_hash_t *parameters)
-+           apr_hash_t *parameters,
-+           apr_pool_t *pool)
- {
-   KWallet::Wallet *wallet =
-     static_cast<KWallet::Wallet *> (apr_hash_get(parameters,
-@@ -115,7 +246,7 @@
-                                  APR_HASH_KEY_STRING))
-     {
-       wallet = KWallet::Wallet::openWallet(wallet_name,
--                                           -1,
-+                                           pool ? get_wid(parameters, pool) : 1,
-                                            KWallet::Wallet::Synchronous);
-     }
-   if (wallet)
-@@ -141,7 +272,7 @@
-   apr_hash_t *parameters = static_cast<apr_hash_t *> (data);
-   if (apr_hash_get(parameters, "kwallet-initialized", APR_HASH_KEY_STRING))
-     {
--      KWallet::Wallet *wallet = get_wallet(NULL, parameters);
-+      KWallet::Wallet *wallet = get_wallet(NULL, parameters, NULL);
-       delete wallet;
-       apr_hash_set(parameters,
-                    "kwallet-initialized",
-@@ -172,12 +303,7 @@
-       return FALSE;
-     }
- 
--  QCoreApplication *app;
--  if (! qApp)
--    {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
--    }
-+  INITIALIZE_APPLICATION
- 
-   KCmdLineArgs::init(1,
-                      (char *[1]) {(char *) "svn"},
-@@ -195,7 +321,7 @@
-     QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring);
-   if (! KWallet::Wallet::keyDoesNotExist(wallet_name, folder, key))
-     {
--      KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
-+      KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool);
-       if (wallet)
-         {
-           apr_hash_set(parameters,
-@@ -242,12 +368,7 @@
-       return FALSE;
-     }
- 
--  QCoreApplication *app;
--  if (! qApp)
--    {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
--    }
-+  INITIALIZE_APPLICATION
- 
-   KCmdLineArgs::init(1,
-                      (char *[1]) {(char *) "svn"},
-@@ -262,7 +383,7 @@
-   QString q_password = QString::fromUtf8(password);
-   QString wallet_name = get_wallet_name(parameters);
-   QString folder = QString::fromUtf8("Subversion");
--  KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
-+  KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool);
-   if (wallet)
-     {
-       apr_hash_set(parameters,
---- subversion/svn/main.c
-+++ subversion/svn/main.c
-@@ -2067,6 +2067,9 @@
-                                            pool)))
-     svn_handle_error2(err, stderr, TRUE, "svn: ");
- 
-+  /* svn can safely create instance of QApplication class. */
-+  svn_auth_set_parameter(ab, "svn:auth:qapplication-safe", "1");
-+
-   ctx->auth_baton = ab;
- 
-   /* Set up conflict resolution callback. */
---- subversion/svnsync/main.c
-+++ subversion/svnsync/main.c
-@@ -1,6 +1,6 @@
- /*
-  * ====================================================================
-- * Copyright (c) 2005-2008 CollabNet.  All rights reserved.
-+ * Copyright (c) 2005-2009 CollabNet.  All rights reserved.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution.  The terms
-@@ -2362,7 +2362,15 @@
-                                         check_cancel, NULL,
-                                         pool);
-   if (! err)
--    err = (*subcommand->cmd_func)(os, &opt_baton, pool);
-+    {
-+      /* svnsync can safely create instance of QApplication class. */
-+      svn_auth_set_parameter(opt_baton.source_auth_baton,
-+                             "svn:auth:qapplication-safe", "1");
-+      svn_auth_set_parameter(opt_baton.sync_auth_baton,
-+                             "svn:auth:qapplication-safe", "1");
-+
-+      err = (*subcommand->cmd_func)(os, &opt_baton, pool);
-+    }
-   if (err)
-     {
-       /* For argument-related problems, suggest using the 'help'
diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
deleted file mode 100644
index e568b88a3f46..000000000000
--- a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/03/21 18:22:15	1303489
-+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:54:26	1345740
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -212,12 +215,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -289,12 +291,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
diff --git a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
deleted file mode 100644
index 24b2834ab748..000000000000
--- a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build-outputs.mk	2012-08-21 20:38:31.000000000 +0200
-+++ build-outputs.mk.new	2012-08-21 20:45:08.000000000 +0200
-@@ -825,7 +825,7 @@
- # Section 6: Install-Group build targets
- ########################################
- 
--apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 
- bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
- 
-@@ -877,16 +877,17 @@
- 
- test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
- 
--tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
-+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 
- 
- ########################################
- # Section 7: Install-Group install targets
- ########################################
- 
--install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
-+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
- 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
-+	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la 
- 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
-@@ -1036,7 +1037,7 @@
- 	$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
- 	cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
- 
--install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)  tools/server-side/mod_dontdothat/mod_dontdothat.la
-+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 	$(MKDIR) $(DESTDIR)$(toolsdir)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
-@@ -1046,7 +1047,6 @@
- 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
- 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
- 	cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
--	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- 
- ########################################
diff --git a/dev-vcs/subversion/files/svnserve.initd b/dev-vcs/subversion/files/svnserve.initd
deleted file mode 100644
index b1ed7e696a0d..000000000000
--- a/dev-vcs/subversion/files/svnserve.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd,v 1.1 2010/06/22 18:17:21 arfrever Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting svnserve"
-	# Ensure that we run from a readable working dir, and that we do not
-	# lock filesystems when being run from such a location.
-	cd /
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-		--chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
-		--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping svnserve"
-	start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid
-	eend $?
-}
diff --git a/dev-vcs/subversion/subversion-1.8.9.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild
index c45bb1671841..161f70f81e85 100644
--- a/dev-vcs/subversion/subversion-1.8.9.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.9.ebuild,v 1.15 2014/11/29 18:55:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.1 2014/12/16 12:16:00 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
+	kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
@@ -58,7 +58,10 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
 
 want_apache
 
@@ -116,8 +119,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
 		"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
 		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
-		"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch \
-		"${FILESDIR}"/${P}-po_fixes.patch
+		"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
 	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
@@ -284,31 +286,33 @@ src_compile() {
 }
 
 src_test() {
-	if ! has_version ~${CATEGORY}/${P} ; then
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed."
-	fi
-
-	default
+	if has_version ~${CATEGORY}/${P} ; then
+		default
 
-	if use ctypes-python ; then
-		python_test() {
-			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-				|| die "ctypes-python tests fail with ${EPYTHON}"
-		}
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
 
-		distutils-r1_src_test
-	fi
+			distutils-r1_src_test
+		fi
 
-	if use python ; then
-		swig_py_test() {
-			pushd "${BUILD_DIR}" >/dev/null || die
-			"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-			popd >/dev/null || die
-		}
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
 
-		BUILD_DIR=subversion/bindings/swig/python \
-		python_foreach_impl swig_py_test
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
 	fi
 }
 
@@ -363,7 +367,8 @@ src_install() {
 	fi
 
 	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion subversion
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
 	rm -f tools/client-side/bash_completion
 
 	# Install hot backup script, bug 54304.