Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 443174 Details for
Bug 519328
dev-vcs/subversion - add server and xinetd use flags
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
subversion-1.9.4.ebuild.diff
subversion-1.9.4.ebuild.diff (text/plain), 5.62 KB, created by
Conrad Kostecki
on 2016-08-12 20:58:45 UTC
(
hide
)
Description:
subversion-1.9.4.ebuild.diff
Filename:
MIME Type:
Creator:
Conrad Kostecki
Created:
2016-08-12 20:58:45 UTC
Size:
5.62 KB
patch
obsolete
>--- /usr/portage/dev-vcs/subversion/subversion-1.9.4.ebuild 2016-04-28 21:53:32.000000000 +0200 >+++ subversion-1.9.4.ebuild 2016-08-12 22:52:41.765360351 +0200 >@@ -20,7 +20,7 @@ > 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" >-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" >+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl server test vim-syntax" > > COMMON_DEPEND=">=dev-db/sqlite-3.7.12 > >=dev-libs/apr-1.3:1 >@@ -384,19 +384,21 @@ > newbin tools/backup/hot-backup.py svn-hot-backup > rm -fr tools/backup > >- # 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 >- use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ >- -e "s\GROUP:-apache\GROUP:-svnusers\g" \ >- -i "${ED}"etc/init.d/svnserve || die >- use apache2 || sed -e "0,/apache/s//svn/" \ >- -e "s:apache:svnusers:" \ >- -i "${ED}"etc/xinetd.d/svnserve || die >+ if use server; then >+ # 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 >+ use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ >+ -e "s\GROUP:-apache\GROUP:-svnusers\g" \ >+ -i "${ED}"etc/init.d/svnserve || die >+ use apache2 || sed -e "0,/apache/s//svn/" \ >+ -e "s:apache:svnusers:" \ >+ -i "${ED}"etc/xinetd.d/svnserve || die >+ fi > > # Install documentation. > dodoc CHANGES COMMITTERS README >@@ -458,8 +460,10 @@ > 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." >+ >+ if use server; then >+ ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." >+ fi > } > > pkg_postrm() { >@@ -467,35 +471,37 @@ > } > > 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" >+ if use server; then >+ # 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 >- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" >- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" >+ 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" >+ echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." >+ echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" >+ echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." >+ echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" >+ echo "to finish the configuration." > fi >- chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" >- chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" >- echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." >- echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" >- echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." >- echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" >- echo "to finish the configuration." > fi > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 519328
:
443172
| 443174