From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-vcs/subversion/files/47_mod_dav_svn.conf | 16 ++ .../subversion/files/subversion-1.9.7-kf5.patch | 211 +++++++++++++++++++++ dev-vcs/subversion/files/svnserve.confd | 10 + dev-vcs/subversion/files/svnserve.initd3 | 20 ++ dev-vcs/subversion/files/svnserve.xinetd | 14 ++ 5 files changed, 271 insertions(+) create mode 100644 dev-vcs/subversion/files/47_mod_dav_svn.conf create mode 100644 dev-vcs/subversion/files/subversion-1.9.7-kf5.patch create mode 100644 dev-vcs/subversion/files/svnserve.confd create mode 100644 dev-vcs/subversion/files/svnserve.initd3 create mode 100644 dev-vcs/subversion/files/svnserve.xinetd (limited to 'dev-vcs/subversion/files') diff --git a/dev-vcs/subversion/files/47_mod_dav_svn.conf b/dev-vcs/subversion/files/47_mod_dav_svn.conf new file mode 100644 index 000000000000..52d08b7ab558 --- /dev/null +++ b/dev-vcs/subversion/files/47_mod_dav_svn.conf @@ -0,0 +1,16 @@ + +LoadModule dav_svn_module modules/mod_dav_svn.so + +LoadModule authz_svn_module modules/mod_authz_svn.so + + +# Example configuration: +# +# DAV svn +# SVNPath ${SVN_REPOS_LOC}/repos +# AuthType Basic +# AuthName "Subversion repository" +# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers +# Require valid-user +# + diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch new file mode 100644 index 000000000000..5b692fa30668 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch @@ -0,0 +1,211 @@ +diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp +--- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731) ++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100 +@@ -39,8 +39,6 @@ + #include + + #include +-#include +-#include + #include + #include + +@@ -221,14 +219,15 @@ + app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(q_argc, q_argv, +- get_application_name(parameters, pool), +- "subversion", +- ki18n(get_application_name(parameters, pool)), +- SVN_VER_NUMBER, +- ki18n("Version control system"), +- KCmdLineArgs::CmdLineArgKDE); +- KComponentData component_data(KCmdLineArgs::aboutData()); ++ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ ++ ++ /* componentName appears in KDE GUI prompts */ ++ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ ++ i18n(get_application_name(parameters, ++ pool)), /* displayName */ ++ QStringLiteral(SVN_VER_NUMBER)); ++ KAboutData::setApplicationData(aboutData); ++ + QString folder = QString::fromUtf8("Subversion"); + QString key = + QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); +@@ -291,14 +290,15 @@ + app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(q_argc, q_argv, +- get_application_name(parameters, pool), +- "subversion", +- ki18n(get_application_name(parameters, pool)), +- SVN_VER_NUMBER, +- ki18n("Version control system"), +- KCmdLineArgs::CmdLineArgKDE); +- KComponentData component_data(KCmdLineArgs::aboutData()); ++ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ ++ ++ /* componentName appears in KDE GUI prompts */ ++ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ ++ i18n(get_application_name(parameters, ++ pool)), /* displayName */ ++ QStringLiteral(SVN_VER_NUMBER)); ++ KAboutData::setApplicationData(aboutData); ++ + QString q_password = QString::fromUtf8(password); + QString folder = QString::fromUtf8("Subversion"); + KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); +unchanged: +--- a/build/ac-macros/compiler.m4 (revision 1798730) ++++ b/build/ac-macros/compiler.m4 (revision 1798731) +@@ -126,3 +126,18 @@ + SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option]) + fi + ]) ++ ++dnl The KWallet provider needs to use C++11 mode when using KDE 5 ++AC_DEFUN([SVN_CXX_MODE_SETUP11], ++[ ++ CXXFLAGS_KEEP="$CXXFLAGS" ++ CXXFLAGS="" ++ ++ if test "$GXX" = "yes"; then ++ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) ++ fi ++ ++ CXXMODEFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS_KEEP" ++ AC_SUBST(CXXMODEFLAGS) ++]) +unchanged: +--- a/build/ac-macros/kwallet.m4 (revision 1798730) ++++ b/build/ac-macros/kwallet.m4 (revision 1802646) +@@ -25,8 +25,10 @@ + AC_DEFUN(SVN_LIB_KWALLET, + [ + AC_ARG_WITH(kwallet, +- [AS_HELP_STRING([[--with-kwallet[=PATH]]], +- [Enable use of KWallet (KDE 4) for auth credentials])], ++ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]], ++ [Enable use of KWallet (KDE 5 or 4) for auth credentials. ++ PATH is the KDE install path, alternatively INCDIR:LIBDIR ++ are the header and library install paths. ])], + [svn_lib_kwallet="$withval"], + [svn_lib_kwallet=no]) + +@@ -42,40 +44,70 @@ + if test "$APR_HAS_DSO" = "yes"; then + if test -n "$PKG_CONFIG"; then + if test "$HAVE_DBUS" = "yes"; then +- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui]) +- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_CHECKING([for Qt]) ++ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then ++ AC_MSG_RESULT([yes, Qt5]) ++ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui" ++ kde_config_name="kf5-config" ++ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n" ++ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core" ++ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then ++ AC_MSG_RESULT([yes, Qt4]) ++ qt_pkg_config_names="QtCore QtDBus QtGui" ++ kde_config_name="kde4-config" ++ kde_inc_names="/" ++ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore" ++ fi ++ if test -n "$qt_pkg_config_names"; then + if test "$svn_lib_kwallet" != "yes"; then +- AC_MSG_CHECKING([for kde4-config]) +- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config" +- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then ++ AC_MSG_CHECKING([for $kde_config_name]) ++ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name" ++ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then + AC_MSG_RESULT([yes]) + else +- KDE4_CONFIG="" +- AC_MSG_RESULT([no]) ++ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then ++ AC_MSG_RESULT([unneeded]) ++ KDE_CONFIG="unneeded" ++ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] ++ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] ++ else ++ AC_MSG_RESULT([no]) ++ KDE_CONFIG="" ++ fi + fi + else +- AC_PATH_PROG(KDE4_CONFIG, kde4-config) ++ AC_PATH_PROG(KDE_CONFIG, $kde_config_name) ++ if test -n "$KDE_CONFIG"; then ++ kde_incdir="`$KDE_CONFIG --install include`" ++ kde_libdir="`$KDE_CONFIG --install lib`" ++ fi + fi +- if test -n "$KDE4_CONFIG"; then +- AC_MSG_CHECKING([for KWallet]) ++ if test -n "$KDE_CONFIG"; then ++ if test $kde_config_name = "kf5-config"; then ++ dnl KF5 does not compile with -std=c++98 ++ SVN_CXX_MODE_SETUP11 ++ fi + old_CXXFLAGS="$CXXFLAGS" + old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" +- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do ++ dnl --std=c++11 may be required ++ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS" ++ AC_MSG_CHECKING([for KWallet]) ++ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do + if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then + CPPFLAGS="$CPPFLAGS $d" + fi + done +- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" +- kde_incdir="`$KDE4_CONFIG --install include`" +- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir" +- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" +- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" +- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" ++ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`" ++ for kde_inc_name in $kde_inc_names; do ++ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name" ++ done ++ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes" ++ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`" ++ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options" ++ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC" + LIBS="$LIBS $SVN_KWALLET_LIBS" +- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" +- kde_libdir="`$KDE4_CONFIG --install lib`" ++ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`" + LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`" + AC_LANG(C++) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +@@ -87,16 +119,19 @@ + AC_MSG_RESULT([yes]) + CXXFLAGS="$old_CXXFLAGS" + LIBS="$old_LIBS" ++ if test "$kde_config_name" = "kf5-config"; then ++ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available]) ++ fi + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot find KWallet]) + fi + else +- AC_MSG_ERROR([cannot find kde4-config]) ++ AC_MSG_ERROR([cannot find $kde_config_name]) + fi + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui]) ++ AC_MSG_ERROR([cannot find Qt]) + fi + else + AC_MSG_ERROR([cannot find D-Bus]) diff --git a/dev-vcs/subversion/files/svnserve.confd b/dev-vcs/subversion/files/svnserve.confd new file mode 100644 index 000000000000..83997ce92719 --- /dev/null +++ b/dev-vcs/subversion/files/svnserve.confd @@ -0,0 +1,10 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Options for svnserve +#SVNSERVE_OPTS="--root=/var/svn" + +# User and group as which to run svnserve +#SVNSERVE_USER="svn" +#SVNSERVE_GROUP="svnusers" diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3 new file mode 100644 index 000000000000..a28ce0b478a6 --- /dev/null +++ b/dev-vcs/subversion/files/svnserve.initd3 @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +description="svn server" +pidfile="/var/run/svnserve.pid" +command="/usr/bin/svnserve" +command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}" +command_background="true" +start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}" + +depend() { + need net +} + +start_pre() { + # Ensure that we run from a readable working dir, and that we do not + # lock filesystems when being run from such a location. + cd / +} diff --git a/dev-vcs/subversion/files/svnserve.xinetd b/dev-vcs/subversion/files/svnserve.xinetd new file mode 100644 index 000000000000..e29f906b5096 --- /dev/null +++ b/dev-vcs/subversion/files/svnserve.xinetd @@ -0,0 +1,14 @@ +service svn +{ + socket_type = stream + wait = no + user = apache + group = apache + umask = 002 + protocol = tcp + log_on_failure += USERID HOST + port = 3690 + server = /usr/bin/svnserve + server_args = -i + disable = yes +} -- cgit v1.2.3