diff options
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/Manifest.gz | bin | 12030 -> 12027 bytes | |||
-rw-r--r-- | dev-vcs/subversion/Manifest | 2 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.14.5-no-unaligned.patch | 23 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.14.5-r1.ebuild | 447 |
4 files changed, 472 insertions, 0 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex b4bf315478e6..2fdf84bfc2d6 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 7fe06c1ca9aa..dad5feab06ec 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,5 +1,6 @@ AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d AUX subversion-1.14.3-ruby-c99.patch 1023 BLAKE2B ebd735e4ba48f30c34e15e514720dd39da8fe0ceb8fa8b88b5060a7c2ca521926b3f4003601ac7519e99c28bc56a5a5126cb97d5063b3e610792e43618c68529 SHA512 02e7fcb7c7239ba7344d03e86557932f4e03ca7ae71df5c66a72ffc65315d234554bd429edbc1553c1ea847867e6424f1af8e938ae6604338f67416f87717539 +AUX subversion-1.14.5-no-unaligned.patch 617 BLAKE2B 0cff974d0042bdeca432f786d704f3cf1db3219501a480081584d4eb70cea51e7b73a498d451783bfc187594e09c9daaaaa6939e197b93d67247251500cedaf0 SHA512 e8d805a6f005db6768920d7ae40e2443440710cba3282d7684ece41890d44cd7bd1e42f14bfe43dc1eb6031fb999660d98850035b18cb395700dd74a45e4b340 AUX subversion-1.5.6-aix-dso.patch 734 BLAKE2B b628257f7df660247d2ae34d4f10b701cded2e84826195bb2c73623ea863fcecbf85ca8c92304db6b6f9fb9e092b76e980c3bbe0254e0e653b8a0fa13938c50b SHA512 fdc7f58519ae0b68458600472352fde8dd24cc32c3563ecd74da256fc6ad32dedfda78926aa60aa72a12b68a2a9e5dd43241bc501c707bb1f0b40c9e30d1b992 AUX subversion-1.8.1-revert_bdb6check.patch 3160 BLAKE2B 5ea5fb779fdd064acf527216884bd72a93dde984f7ae0938bfd5111831dda4901264085de400dd5641fb2703b36443b41508a425900fe3e8cb4fedce33b6c90b SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 AUX subversion-1.8.16-javadoc-nolint.patch 688 BLAKE2B 08f59a5f86c3465ab839b2e4d18f2339157b3c644c56909f4fe4fe9efbd08d95999d7ffacfaa0e41ae56cd55cc3596ef0a10be3e89af42bd9aecbf53b556306b SHA512 0c34c6834ddcc7a9b263a84f21792a4e05c3dc71f122e43f0f5b3415fd45517f38df1c32dcae774af3d1e7776ac88241ff2fce0d974101ad3a8499c3798d8ce5 @@ -9,5 +10,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60 DIST subversion-1.14.3.tar.bz2 8569985 BLAKE2B bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49 SHA512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 DIST subversion-1.14.5.tar.bz2 8675355 BLAKE2B d5650c50b345938bb012bc942958a7a23cc6de030f2f005b6caa43afe39f0ba6f3ad4d733b13eb746ab08bf8de491f0a56cc5700dd64e02e6f74f393a5dd293b SHA512 e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321 EBUILD subversion-1.14.3.ebuild 12723 BLAKE2B 268081fcdaf22e3d3396ee6e0888dddcac5a9a0f014289083af123f59dddba57dde70f454acd6327d7d6177d4b7f6a68313e9d88deb1d3e188f0b28a66cb2591 SHA512 d01afca9083e28210a1300fbbc4b6466c07df24deb05b20a16be67eae7fbe48ee14032464cc79578a23c03971d30b27bbabd3273ad548b860298e3efcf80126b +EBUILD subversion-1.14.5-r1.ebuild 12752 BLAKE2B 056946c9929549fedecb640c6ac6cc3379d31c7adecf2c667bbe1bc52b98de71a4f1bdafa770673ba549565c0988fb4552b3ea2b622d54543f6b87dedc4602cf SHA512 43597f4b59047a8d4468d396ae842675d9832e3c5d97a173abcaeb9df8cf385257938b4e8cdeebdfe8d8f68e2fee33310be8185645f8c2238d966cc1c9228e42 EBUILD subversion-1.14.5.ebuild 12705 BLAKE2B a7385063b3ea19bfeb36ca066a2822d712f2056d11092dcfcfc09e741471a3e9ab540be0e69aed223d983f7aad95bb0b88ecde7448a21572d31345a355a6bb7b SHA512 98a64f81871b81740b34f7547f92cf168f8c3c70c536b9cff1f5f9eb948f7cb62871c6f61235eb0ca93fb5eed6732914d817848ced9f94a44d9192a7d2149bca MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e diff --git a/dev-vcs/subversion/files/subversion-1.14.5-no-unaligned.patch b/dev-vcs/subversion/files/subversion-1.14.5-no-unaligned.patch new file mode 100644 index 000000000000..95d576b8a9d2 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.14.5-no-unaligned.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/950271 +https://gcc.gnu.org/PR119016 +https://marc.info/?l=subversion-dev&m=174056933428992&w=2 + +Always take the safe path. It vectorises with GCC 15 at least anyway. +--- a/subversion/include/svn_types.h ++++ b/subversion/include/svn_types.h +@@ -125,15 +125,7 @@ extern "C" { + * + * @since New in 1.7. + */ +-#ifndef SVN_UNALIGNED_ACCESS_IS_OK +-# if defined(_M_IX86) || defined(i386) \ +- || defined(_M_X64) || defined(__x86_64) \ +- || defined(__powerpc__) || defined(__ppc__) +-# define SVN_UNALIGNED_ACCESS_IS_OK 1 +-# else + # define SVN_UNALIGNED_ACCESS_IS_OK 0 +-# endif +-#endif + + + diff --git a/dev-vcs/subversion/subversion-1.14.5-r1.ebuild b/dev-vcs/subversion/subversion-1.14.5-r1.ebuild new file mode 100644 index 000000000000..1f1d9f222638 --- /dev/null +++ b/dev-vcs/subversion/subversion-1.14.5-r1.ebuild @@ -0,0 +1,447 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE="none" +GENTOO_DEPEND_ON_PERL="no" +PYTHON_COMPAT=( python3_{10..13} ) +USE_RUBY="ruby31 ruby32 ruby33" + +inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 +inherit libtool multilib multiprocessing perl-module prefix python-any-r1 ruby-single xdg-utils + +MY_P="${P/_/-}" +DESCRIPTION="Advanced version control system" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + app-arch/bzip2 + app-arch/lz4 + >=dev-db/sqlite-3.7.12 + >=dev-libs/apr-1.5:1 + >=dev-libs/apr-util-1.5:1 + dev-libs/expat + >=dev-libs/libutf8proc-2.5.0:= + >=net-libs/serf-1.3.4 + sys-apps/file + sys-libs/zlib + berkdb? ( >=sys-libs/db-4.0.14:= ) + keyring? ( + dev-libs/glib:2 + app-crypt/libsecret + sys-apps/dbus + ) + kwallet? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwallet:5 + sys-apps/dbus + ) + perl? ( dev-lang/perl:= ) + ruby? ( ${RUBY_DEPS} ) + sasl? ( dev-libs/cyrus-sasl ) +" +RDEPEND=" + ${COMMON_DEPEND} + apache2? ( + acct-group/apache + acct-user/apache + www-servers/apache[apache2_modules_dav] + ) + !apache2? ( + acct-group/svnusers + acct-user/svn + ) + java? ( >=virtual/jre-1.8:* ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI ) +" +# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once +DEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + nls? ( sys-devel/gettext ) + perl? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch + "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch + "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch + "${FILESDIR}"/${PN}-1.14.5-no-unaligned.patch +) + +want_apache + +pkg_setup() { + if use berkdb ; then + local apu_bdb_version="$("${EPREFIX}"/usr/bin/apu-1-config --includes \ + | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ + | sed 's:.*b::')" + einfo + if [[ -z "${SVN_BDB_VERSION}" ]] ; then + if [[ -n "${apu_bdb_version}" ]] ; then + SVN_BDB_VERSION="${apu_bdb_version}" + einfo "Matching db version to apr-util" + else + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + java-pkg-opt-2_pkg_setup + + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + + if use debug ; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ + + # Allow for custom repository locations. + SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" + + if use ruby ; then + local rbslot + RB_VER="" + for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do + # No break here as we want to pick the best (latest) + if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot/.}(-)]" ; then + RB_VER="${rbslot/.}" + fi + done + [[ -z "${RB_VER}" ]] && die "No usable ruby version found" + fi +} + +src_prepare() { + default + + chmod +x build/transform_libtool_scripts.sh || die + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + + hprefixify build/ac-macros/svn-macros.m4 + + eautoconf + elibtoolize + + sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ + -i build-outputs.mk || die "sed failed" + + xdg_environment_reset +} + +src_configure() { + local myconf=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + $(use_with apache2 apache-libexecdir) + $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs) + $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") + --without-ctypesgen + --disable-runtime-module-search + $(use_with keyring gnome-keyring) + $(use_enable java javahl) + $(use_with java jdk "${JAVA_HOME}") + $(use_enable nls) + $(use_enable plaintext-password-storage) + $(use_with sasl) + --with-serf + --with-apr="${EPREFIX}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" + --disable-experimental-libtool + --without-jikes + --disable-mod-activation + --disable-static + --enable-svnxx + --without-swig-python + ) + + if use kwallet ; then + myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" ) + else + myconf+=( --without-kwallet ) + fi + + if use perl; then + myconf+=( --with-swig-perl ) + else + myconf+=( --without-swig-perl ) + fi + + if use ruby; then + # bug #932536 (workaround for swig w/ older ruby) + append-flags -std=gnu17 + + myconf+=( --with-swig-ruby="${EPREFIX}/usr/bin/ruby${RB_VER}" ) + else + myconf+=( --without-swig-ruby ) + fi + + if use java ; then + myconf+=( --without-junit ) + fi + + case ${CHOST} in + *-solaris*) + # need -lintl to link + use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=( --disable-local-library-preloading ) + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=( --enable-local-library-preloading ) + ;; + esac + + # version 1.7.7 again tries to link against the older installed version and fails, when trying to + # compile for x86 on amd64, so workaround this issue again + # check newer versions, if this is still/again needed + #myconf+=( --disable-disallowing-of-undefined-references ) + + # for build-time scripts + if use test; then + python_setup + fi + + ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ + econf "${myconf[@]}" +} + +src_compile() { + emake local-all + + if use perl ; then + emake swig-pl + fi + + if use ruby ; then + emake swig-rb + fi + + if use java ; then + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl + fi + + if use extras ; then + emake tools + fi + + if use doc ; then + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + + if use java; then + emake doc-javahl + fi + fi +} + +src_test() { + # TODO: Maybe run swig tests for each language? + #if has_version ~${CATEGORY}/${P} ; then + emake -Onone PARALLEL="$(makeopts_jobs)" check + #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 + + if [[ -f "${S}/fails.log" ]] ; then + echo "====== contents of fails.log follow ======" + cat "${S}/fails.log" || die + echo "====== contents of fails.log end ======" + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install + + if use perl ; then + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl + perl_delete_localpod + find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die + fi + + if use ruby ; then + emake DESTDIR="${D}" install-swig-rb + fi + + if use java ; then + emake DESTDIR="${D}" install-javahl + java-pkg_regso "${ED}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_dojar "${ED}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED}"/usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install Apache module configuration. + if use apache2 ; then + keepdir "${APACHE_MODULES_CONFDIR}" + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}/47_mod_dav_svn.conf" + fi + + # Install bash completion, bug #43179. + newbashcomp tools/client-side/bash_completion svn + bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} + rm -f tools/client-side/bash_completion || die + + # Install hot backup script, bug #54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup || die + + # Install svnserve init-script and xinet.d snippet, bug #43245. + newinitd "${FILESDIR}"/svnserve.initd3 svnserve + newconfd "${FILESDIR}"/svnserve.confd svnserve + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + # Adjust default user and group with disabled apache2 USE flag, bug #381385 + if ! use apache2 ; then + sed -e "s\USER:-apache\USER:-svn\g" \ + -e "s\GROUP:-apache\GROUP:-svnusers\g" \ + -i "${ED}"/etc/init.d/svnserve || die + sed -e "0,/apache/s//svn/" \ + -e "s:apache:svnusers:" \ + -i "${ED}"/etc/xinetd.d/svnserve || die + fi + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install extra files. + if use extras ; then + cat <<- EOF > 80subversion-extras + PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools + + find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + rm -fr tools/{buildbot,dev,diff,po} + fi + + if use doc ; then + docinto html + dodoc -r doc/doxygen/html/* + + if use java ; then + java-pkg_dojavadoc doc/javadoc + fi + fi + + find "${D}" -name '*.la' -type f -delete || die + + cd "${ED}"/usr/share/locale + for i in * ; do + if [[ ${i} != *${LINGUAS}* ]] ; then + rm -r ${i} || die + fi + done +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug #122877. + if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${ED}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi + + ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." +} + +pkg_postrm() { + : +} + +pkg_config() { + # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} + # already has EPREFIX in it + einfo "Initializing the database in ${SVN_REPOS_LOC}..." + if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then + echo "A Subversion repository already exists and I will not overwrite it." + echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." + else + mkdir -p "${SVN_REPOS_LOC}/conf" + + einfo "Populating repository directory..." + # Create initial repository. + "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + + einfo "Setting repository permissions..." + SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2 ; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + fi + chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" + chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos" + fi +} |