From a0d50d1f7be484aea2020fb99e84567f7a992dfd Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sun, 2 Mar 2008 11:26:26 +0000 Subject: [PATCH] add support for neon 0.28.0 wrt #210535 Package-Manager: portage-2.1.4.4 --- dev-util/subversion/ChangeLog | 8 +- dev-util/subversion/Manifest | 12 +- .../files/subversion-1.4.6-neon-0.28.patch | 58 +++ .../subversion/subversion-1.4.6-r1.ebuild | 415 ++++++++++++++++++ 4 files changed, 487 insertions(+), 6 deletions(-) create mode 100644 dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch create mode 100644 dev-util/subversion/subversion-1.4.6-r1.ebuild diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index b9f86bd78ba4..d6c6373d5a81 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.294 2008/02/17 12:45:15 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.295 2008/03/02 11:26:25 hollow Exp $ + +*subversion-1.4.6-r1 (02 Mar 2008) + + 02 Mar 2008; Benedikt Böhm + +files/subversion-1.4.6-neon-0.28.patch, +subversion-1.4.6-r1.ebuild: + add support for neon 0.28.0 wrt #210535 17 Feb 2008; Christoph Mende subversion-1.4.6.ebuild: Stable on amd64, bug #207572 diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 3e05022b7ac3..6d878ac49f99 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -6,6 +6,7 @@ AUX subversion-1.1.1-perl-vendor.patch 713 RMD160 fdc54d38c44c3e1273b654b3d1a2f4 AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b SHA1 f05075b7c17be367cf83529e8558d8a1d14ace91 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 AUX subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 SHA1 7fc6c3dd48b5d018a9794973ecb085abdf262d89 SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236 AUX subversion-1.4.3-debug-config.patch 886 RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 SHA1 f9f38bf70f8042a4a754830a7f456f6d2d52bf5d SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448 +AUX subversion-1.4.6-neon-0.28.patch 2501 RMD160 7ad442306b88b27f49b3c0c4927e69b7520d773f SHA1 de31c7660c50c98ed8c629b98371f1ceb6828fe7 SHA256 cd405f98ed6706ca8f961fad29faf955f45b73eaeda585ee43c6a2f8cdc2e2c6 AUX subversion-apr_cppflags.patch 426 RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a SHA1 13b975d3632d2a12667a731fe425bf5f21a09955 SHA256 0d7e52ce90cc806270ccb5e3c2b700fdb6d251a17001b91f08de5beab66295e6 AUX subversion-hotbackup-config.patch 629 RMD160 6a53b1b676bc3ce3ef2644666c2ebd21574c18fe SHA1 941f864c430eceb1c4cce40cf6830fbcae1219b3 SHA256 7a80e05ed26508abee1bd2aa358747a681ce55e18711ff28c745012f60d989f3 AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e922bc777ba847eb85d421d92f560f84b895b5 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006 @@ -16,13 +17,14 @@ AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9 DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 SHA1 acc80381cb670736ad626fee1eb04f36ba7e5fc8 SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53 DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124 EBUILD subversion-1.4.5.ebuild 13743 RMD160 d430ee15a0a191ad525bc2c2a049efbc0cebd3f8 SHA1 82b328cbdb8d18bc51d54d2927af4647c6e0ebb1 SHA256 f0fa626ddd93edfa4a02a61277a357696afce3d3dd00f10de387bd46842ad5ab +EBUILD subversion-1.4.6-r1.ebuild 13788 RMD160 db0b3c8aa243d1f4971a6c36bb5971231c1c80c7 SHA1 7c26f809ea08c6b6a971066c5efb020236336fef SHA256 48a1a5e9305b1836b98d370fe25c04c5eb95cfa24357a02f80cbca216f7d4884 EBUILD subversion-1.4.6.ebuild 13794 RMD160 5106b4348eb605d41b1f1480e8fbe158f0b4fb82 SHA1 94a4a5cd30ec56bb69453af5d2af16fc517eb3be SHA256 9b901eea36340e8936beedc5964ec86e60c00054201cea6a97589f4bfb6cdcdb -MISC ChangeLog 50787 RMD160 2a07ec8270dbeff8596767abef6c97f340603da7 SHA1 3442ddead97c0a19be29862f91336922ca5f5dad SHA256 074cf8c475ba19316d4e2d20bcd1b675a51126771a65eae017a6081a2eff1576 +MISC ChangeLog 50987 RMD160 5779b4ed84a9166a2f98dc909899dd1a9e2131bf SHA1 2375afceacf440b015f50b7e2ef61e19685ea4d3 SHA256 9961ebf98c4127a5248574d90d85515fe7b897872fc0f02658a31ad6160422bb MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.8 (GNU/Linux) -iD8DBQFHuCxkKhnDs22gwa8RAq7FAKC2Yqq2+U3/r2USizsGyCROE6/TzgCdGZvm -jCghP5br4s0M+3bQQlo5BVE= -=+Y5N +iEYEARECAAYFAkfKjucACgkQmPFBzbX68WFETgCfc5hSOR06CtAbp6vFwpd3x41X +QdcAoJEBuD/Q+EWolH7JSepP4UffQNGb +=Xy3T -----END PGP SIGNATURE----- diff --git a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch new file mode 100644 index 000000000000..0b5f7e5399b4 --- /dev/null +++ b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch @@ -0,0 +1,58 @@ +--- build/ac-macros/neon.m4 ++++ build/ac-macros/neon.m4 +@@ -50,14 +50,18 @@ + NEON_VERSION=`cat $abs_srcdir/neon/.version` + AC_MSG_RESULT([$NEON_VERSION]) + +- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then + AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], + [Define to 1 if you have Neon 0.25 or later.]) + fi +- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then + AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], + [Define to 1 if you have Neon 0.26 or later.]) + fi ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then ++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], ++ [Define to 1 if you have Neon 0.27 or later.]) ++ fi + + for svn_allowed_neon in $NEON_ALLOWED_LIST; do + if test "$NEON_VERSION" = "$svn_allowed_neon" || +@@ -127,14 +131,18 @@ + NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` + AC_MSG_RESULT([$NEON_VERSION]) + +- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then + AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], + [Define to 1 if you have Neon 0.25 or later.]) + fi +- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then + AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], + [Define to 1 if you have Neon 0.26 or later.]) + fi ++ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then ++ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], ++ [Define to 1 if you have Neon 0.27 or later.]) ++ fi + + for svn_allowed_neon in $NEON_ALLOWED_LIST; do + if test "$NEON_VERSION" = "$svn_allowed_neon" || +--- subversion/libsvn_ra_dav/session.c ++++ subversion/libsvn_ra_dav/session.c +@@ -575,7 +575,11 @@ + } neonprogress_baton_t; + + static void ++#ifdef SVN_NEON_0_27 ++ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total) ++#else + ra_dav_neonprogress(void *baton, off_t progress, off_t total) ++#endif /* SVN_NEON_0_27 */ + { + const neonprogress_baton_t *neonprogress_baton = baton; + if (neonprogress_baton->progress_func) diff --git a/dev-util/subversion/subversion-1.4.6-r1.ebuild b/dev-util/subversion/subversion-1.4.6-r1.ebuild new file mode 100644 index 000000000000..613087ded814 --- /dev/null +++ b/dev-util/subversion/subversion-1.4.6-r1.ebuild @@ -0,0 +1,415 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r1.ebuild,v 1.1 2008/03/02 11:26:25 hollow Exp $ + +inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" + +DESCRIPTION="A compelling replacement for CVS." +HOMEPAGE="http://subversion.tigris.org/" +SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2" + +LICENSE="Subversion" +SLOT="0" +IUSE="apache2 berkdb debug doc emacs extras java nls nowebdav perl python ruby svnserve vim-syntax" +RESTRICT="test" + +COMMONDEPEND=">=dev-libs/apr-util-1.2.8 + berkdb? ( =sys-libs/db-4* ) + doc? ( app-doc/doxygen ) + emacs? ( virtual/emacs ) + nls? ( sys-devel/gettext ) + !nowebdav? ( >=net-misc/neon-0.26.4 ) + ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig ) + perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig ) + python? ( >=dev-lang/python-2.0 dev-lang/swig )" + +RDEPEND="${COMMONDEPEND} + java? ( >=virtual/jre-1.4 ) + perl? ( dev-perl/URI )" + +DEPEND="${COMMONDEPEND} + java? ( >=virtual/jdk-1.4 ) + >=sys-devel/autoconf-2.59" + +want_apache + +S="${WORKDIR}"/${P/_rc/-rc} + +# Allow for custom repository locations. +# This can't be in pkg_setup because the variable needs to be available to +# pkg_config. +: ${SVN_REPOS_LOC:=/var/svn} + +pkg_setup() { + if use berkdb ; then + if ! built_with_use 'dev-libs/apr-util' berkdb ; then + eerror "dev-libs/apr-util is missing USE=berkdb" + die "dev-libs/apr-util is missing USE=berkdb" + fi + + if has_version '.*svn-revision.txt\),echo "exported" \2,' Makefile.in + + elibtoolize + + use emacs && cp "${FILESDIR}"/vc-svn.el "${S}"/contrib/client-side/vc-svn.el +} + +src_compile() { + local myconf= + + myconf="${myconf} $(use_enable java javahl)" + use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}" + + if use python || use perl || use ruby ; then + myconf="${myconf} --with-swig" + else + myconf="${myconf} --without-swig" + fi + + if use nowebdav ; then + myconf="${myconf} --without-neon" + else + myconf="${myconf} --with-neon=/usr" + fi + + append-flags $(/usr/bin/apr-1-config --cppflags) + + econf ${myconf} \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + $(use_with apache2 apxs ${APXS}) \ + $(use_with berkdb berkeley-db) \ + $(use_enable debug maintainer-mode) \ + $(use_enable nls) \ + --disable-experimental-libtool \ + --disable-mod-activation \ + || die "econf failed" + + # Respect the user LDFLAGS + export SWIG_LDFLAGS="${LDFLAGS}" + + # Build subversion, but do it in a way that is safe for parallel builds. + # Also apparently the included apr has a libtool that doesn't like -L flags. + # So not specifying it at all when not building apache modules and only + # specify it for internal parts otherwise. + ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "Compilation of ${PN} failed" + + if use python ; then + # Building fails without the apache apr-util as includes are wrong. + emake swig-py || die "Compilation of ${PN} Python bindings failed" + fi + + if use perl ; then + # Work around a buggy Makefile.PL, bug 64634 + mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc} + emake -j1 swig-pl || die "Compilation of ${PN} Perl bindings failed" + fi + + if use ruby ; then + emake swig-rb || die "Compilation of ${PN} Ruby bindings failed" + fi + + if use java ; then + # ensure that the destination dir exists, else some compilation fails + mkdir -p "${S}"/subversion/bindings/java/javahl/classes + # Compile javahl + make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "make javahl failed" + fi + + if use emacs ; then + einfo "Compiling emacs support" + elisp-compile "${S}"/contrib/client-side/psvn/psvn.el || die "emacs modules failed" + elisp-compile "${S}"/contrib/client-side/vc-svn.el || die "emacs modules failed" + elisp-compile "${S}"/doc/svn-doc.el || die "emacs modules failed" + elisp-compile "${S}"/doc/tools/svnbook.el || die "emacs modules failed" + fi + + if use doc ; then + doxygen doc/doxygen.conf || die "doxygen failed" + fi +} + +src_install () { + python_version + PYTHON_DIR=/usr/$(get_libdir)/python${PYVER} + + make DESTDIR="${D}" install || die "Installation of ${PN} failed" + + if use python ; then + make DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \ + || die "Installation of ${PN} Python bindings failed" + + # move python bindings + dodir "${PYTHON_DIR}/site-packages" + mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages" + mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages" + rm -Rf "${D}"/usr/$(get_libdir)/svn-python + fi + + if use perl ; then + make DESTDIR="${D}" install-swig-pl || die "Installation of ${PN} Perl bindings failed" + fixlocalpod + fi + + if use ruby ; then + make DESTDIR="${D}" install-swig-rb || die "Installation of ${PN} Ruby bindings failed" + fi + + if use java ; then + make DESTDIR="${D}" install-javahl || die "make install-javahl failed" + java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so + java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install apache2 module config + if use apache2 ; then + MOD="${APACHE_MODULESDIR/${APACHE_BASEDIR}\//}" + dodir "${APACHE_MODULES_CONFDIR}" + cat <"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf + + + LoadModule dav_svn_module ${MOD}/mod_dav_svn.so + + + + LoadModule authz_svn_module ${MOD}/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 + # + +EOF + fi + + # Bug 43179 - Install bash-completion if user wishes + dobashcompletion tools/client-side/bash_completion subversion + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304 + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # The svn_load_dirs script is installed by Debian and looks like a good + # candidate for us to install as well + if use perl ; then + newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs + fi + rm -f contrib/client-side/svn_load_dirs.pl + + # Install svnserve init-script and xinet.d snippet, bug 43245 + if use svnserve; then + newinitd "${FILESDIR}"/svnserve.initd svnserve + if use apache2 ; then + newconfd "${FILESDIR}"/svnserve.confd svnserve + else + newconfd "${FILESDIR}"/svnserve.confd2 svnserve + fi + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + fi + + # Install documentation + dodoc BUGS CHANGES COMMITTERS HACKING INSTALL README TRANSLATING + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + if use doc ; then + dohtml doc/doxygen/html/* + cp -R notes "${D}usr/share/doc/${PF}" + ecompressdir "/usr/share/doc/${PF}/notes" + fi + + # Install Vim syntax files. + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins contrib/client-side/svn.vim + fi + rm -f contrib/client-side/svn.vim + + # Install emacs lisps + if use emacs ; then + elisp-install ${PN} contrib/client-side/psvn/psvn.el* + elisp-install ${PN}/compat contrib/client-side/vc-svn.el* + elisp-install ${PN} doc/svn-doc.el* + elisp-install ${PN} doc/tools/svnbook.el* + touch "${D}${SITELISP}/${PN}/compat/.nosearch" + + elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el + fi + rm -fr contrib/client-side/psvn/ + rm -f contrib/client-side/vc-svn.el* + + # Install extra files + if use extras ; then + find contrib tools '(' -name "*.bat" -o -name "*.in" ')' -print0 | xargs -0 rm -f + rm -fr tools/{dev,po} + dodir "/usr/share/${PN}" + cp -R contrib tools "${D}usr/share/${PN}" + fi +} + +pkg_preinst() { + # Compare versions of Berkeley DB. + if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -qn "${D}usr/lib/libsvn_subr-1.so.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() { + use emacs && elisp-site-regen + use perl && perl-module_pkg_postinst + + elog "Subversion Server Notes" + elog "-----------------------" + elog + elog "If you intend to run a server, a repository needs to be created using" + elog "svnadmin (see man svnadmin) or the following command to create it in" + elog "${SVN_REPOS_LOC}:" + elog + elog " emerge --config =${CATEGORY}/${PF}" + elog + elog "Subversion has multiple server types, take your pick:" + elog + if use svnserve; then + elog " - svnserve daemon: " + elog " 1. edit /etc/conf.d/svnserve" + elog " 2. start daemon: /etc/init.d/svnserve start" + elog " 3. make persistent: rc-update add svnserve default" + elog + elog " - svnserve via xinetd:" + elog " 1. edit /etc/xinetd.d/svnserve (remove disable line)" + elog " 2. restart xinetd.d: /etc/init.d/xinetd restart" + elog + fi + elog " - svn over ssh:" + elog " 1. Fix the repository permissions:" + elog " groupadd svnusers" + elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos/" + elog " chmod -R g-w ${SVN_REPOS_LOC}/repos" + elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/db" + elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks" + elog " 2. create an svnserve wrapper in /usr/local/bin to set the umask you" + elog " want, for example:" + elog " #!/bin/bash" + elog " . /etc/conf.d/svnserve" + elog " umask 002" + elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\"" + elog + if use apache2; then + elog " - http-based server:" + elog " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" + elog " 2. create an htpasswd file:" + elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" + elog + fi + + elog "If you intend to use svn-hot-backup, you can specify the number of" + elog "backups to keep per repository by specifying an environment variable." + elog "If you want to keep e.g. 2 backups, do the following:" + elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion" + elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion" + elog + + if [[ -n "${CHANGED_BDB_VERSION}" ]]; then + ewarn "You upgraded from an older version of Berkely 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 +} + +pkg_postrm() { + use emacs && elisp-site-regen + use perl && perl-module_pkg_postrm +} + +pkg_config() { + if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then + die "You seem to only have built the Subversion client" + fi + + einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..." + if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then + echo "A subversion repository already exists and I will not overwrite it." + echo "Delete ${ROOT}${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version." + else + mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" + + einfo ">>> Populating repository directory ..." + # create initial repository + "${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" + + einfo ">>> Setting repository permissions ..." + if use svnserve; then + SVNSERVE_USER="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_USER})" + SVNSERVE_GROUP="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_GROUP})" + fi + 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" + enewgroup "${SVNSERVE_GROUP}" + enewuser "${SVNSERVE_USER}" -1 -1 ${SVN_REPOS_LOC} "${SVNSERVE_GROUP}" + fi + chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" + chmod -Rf 755 "${ROOT}${SVN_REPOS_LOC}/repos" + fi +} -- 2.26.2