From: Paul de Vrieze Date: Sat, 18 Nov 2006 20:45:55 +0000 (+0000) Subject: New upstream version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51823f428fdc267051f0b19a4c186016c308b2de;p=gentoo.git New upstream version Package-Manager: portage-2.1.2_rc1-r7 --- diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 4479af15551c..d1e3624b92aa 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.242 2006/10/20 21:15:11 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.243 2006/11/18 20:45:55 pauldv Exp $ + +*subversion-1.4.2 (14 Nov 2006) + + 14 Nov 2006; Paul de Vrieze +files/svnserve.confd2, + +subversion-1.4.2.ebuild: + New upstream version. Also no longer assume the apache user exists in the + config function. Thanks to Olivier Rolland and Yuval + Yaari for the bug (#123802) 20 Oct 2006; Bryan Østergaard subversion-1.3.2-r3.ebuild: diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index d1cc79f9254b..5876a0e17fba 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -46,6 +46,10 @@ AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e9 MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 files/svnserve.confd 323 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006 files/svnserve.confd 323 +AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557191219c3afa90126b8a2bfe7dd62b8a09eb82 SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00 +MD5 d084a7558053784886bc858b94fa9186 files/svnserve.confd2 320 +RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb files/svnserve.confd2 320 +SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00 files/svnserve.confd2 320 AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b47512fb444c0f752ad4eb6c3252f659a967e SHA256 6b483e211b5c311079605e246fca9228c7e5762d27a023fa4c4529fdaa766b08 MD5 7d95a67c28ea2a5c204628d5104c1427 files/svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 files/svnserve.initd 817 @@ -64,6 +68,7 @@ DIST subversion-1.3.0.tar.bz2 6811793 RMD160 da1d5a61e49c9337fc5d2ed31cf361b07a2 DIST subversion-1.3.1.tar.bz2 6796453 RMD160 5a8ce81cdb76ad2a6faf9df22178f5458d3b5e6f SHA1 f8d670a0ae931fca17192d02862aa93a229e5dda SHA256 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185 DIST subversion-1.4.0.tar.bz2 4709293 RMD160 18ba1f5678fe121ce6f685fc7edf546f113c46d2 SHA1 92671bba140e9b9e300b5ffb526c4a7c59aeb5b1 SHA256 6960ed42174be9c54853e8708cc91a7c8355b23c4c3921a6d7fe7947d50843e4 +DIST subversion-1.4.2.tar.bz2 4714508 RMD160 8c6f7e73fbc9caed8b6ac7af8361eb4aad6efe71 SHA1 349847a97ad790cb14ad15bfd7bfe5bc5a9c8837 SHA256 7fe21c880e2a7591740730185fc6b32faeae15e79ccd7a336cd41589536ec4e9 EBUILD subversion-1.1.3.ebuild 11427 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 SHA1 4cbd9d92f45547412f75960d202672e31a5d26b4 SHA256 392e782e138556145f4b96dd6765ffbe6d5703439acd56310f06656931a0642c MD5 5492b14cd976c4b74652b69899f4b66b subversion-1.1.3.ebuild 11427 RMD160 958f605daa5e1a9b9fa9e8ff70812ab0e61d24d5 subversion-1.1.3.ebuild 11427 @@ -104,10 +109,14 @@ EBUILD subversion-1.4.0.ebuild 11390 RMD160 018de0f84030748c689e77761b563632499a MD5 a5fb782136a11691bb9063a1b5e8b498 subversion-1.4.0.ebuild 11390 RMD160 018de0f84030748c689e77761b563632499a4b66 subversion-1.4.0.ebuild 11390 SHA256 20b8614686f813c879bcdd2db83b3e26255fce2f453dd3ac6cc8d0a5eeaa29a1 subversion-1.4.0.ebuild 11390 -MISC ChangeLog 40778 RMD160 13c5c493dcda87ec83d24835d361e4f15f903c83 SHA1 6b78740ab2f475637e99bf9a3a06de923b23b3b5 SHA256 28b355ad7a457dc53e2d1af6eb4aa8862c498f128d687f40705fdd3c4f53de36 -MD5 a54aa8247b8e5a5ef4334ac18cf1b967 ChangeLog 40778 -RMD160 13c5c493dcda87ec83d24835d361e4f15f903c83 ChangeLog 40778 -SHA256 28b355ad7a457dc53e2d1af6eb4aa8862c498f128d687f40705fdd3c4f53de36 ChangeLog 40778 +EBUILD subversion-1.4.2.ebuild 11608 RMD160 2580ed89c70da4e990e77ac85e631707b26422f2 SHA1 9db5462d44d6c731e13eecc375ee60988cb2c2d7 SHA256 622e84225ccd75ded958b276b299e26df4ec3b003fb688a334b25321c5fca7b3 +MD5 e790a0400929a23eec7a7bacf1bbba04 subversion-1.4.2.ebuild 11608 +RMD160 2580ed89c70da4e990e77ac85e631707b26422f2 subversion-1.4.2.ebuild 11608 +SHA256 622e84225ccd75ded958b276b299e26df4ec3b003fb688a334b25321c5fca7b3 subversion-1.4.2.ebuild 11608 +MISC ChangeLog 41114 RMD160 d76def52398c4226c953b6172e6fc46bf9d0f452 SHA1 8dc55474f81099135682b812326311dc3830b72a SHA256 6e5c9486b58b033668734ea253bc1663cd1ec783a0865caf6f00f2d099344576 +MD5 8566232ab5765ffa40fe9e05ecf66aed ChangeLog 41114 +RMD160 d76def52398c4226c953b6172e6fc46bf9d0f452 ChangeLog 41114 +SHA256 6e5c9486b58b033668734ea253bc1663cd1ec783a0865caf6f00f2d099344576 ChangeLog 41114 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222 @@ -142,3 +151,6 @@ SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/di MD5 7025f60815e7fd5e8c8648a9fa66b7b8 files/digest-subversion-1.4.0 256 RMD160 722d37a621303768280ad75e7aa4bbbbc2a897f4 files/digest-subversion-1.4.0 256 SHA256 bd7fb04b6ddb693ea64dbcaca64d1518705722da5a2a7bfb9bc22ccace19cd12 files/digest-subversion-1.4.0 256 +MD5 783368cc0ffe58e31c4f6557a17db45b files/digest-subversion-1.4.2 256 +RMD160 242b7ae279b98b63ce6ad5d7d10e31a92e270416 files/digest-subversion-1.4.2 256 +SHA256 d9f968207d11d28aae086e2a818ddfec68a0f4848280c131e32342b9d98f495f files/digest-subversion-1.4.2 256 diff --git a/dev-util/subversion/files/digest-subversion-1.4.2 b/dev-util/subversion/files/digest-subversion-1.4.2 new file mode 100644 index 000000000000..fdd7a94fe36e --- /dev/null +++ b/dev-util/subversion/files/digest-subversion-1.4.2 @@ -0,0 +1,3 @@ +MD5 edebb06afb3266d09e75f728a8259677 subversion-1.4.2.tar.bz2 4714508 +RMD160 8c6f7e73fbc9caed8b6ac7af8361eb4aad6efe71 subversion-1.4.2.tar.bz2 4714508 +SHA256 7fe21c880e2a7591740730185fc6b32faeae15e79ccd7a336cd41589536ec4e9 subversion-1.4.2.tar.bz2 4714508 diff --git a/dev-util/subversion/files/svnserve.confd2 b/dev-util/subversion/files/svnserve.confd2 new file mode 100644 index 000000000000..b487a4097583 --- /dev/null +++ b/dev-util/subversion/files/svnserve.confd2 @@ -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-util/subversion/subversion-1.4.2.ebuild b/dev-util/subversion/subversion-1.4.2.ebuild new file mode 100644 index 000000000000..e6a287771fbd --- /dev/null +++ b/dev-util/subversion/subversion-1.4.2.ebuild @@ -0,0 +1,355 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.2.ebuild,v 1.1 2006/11/18 20:45:55 pauldv Exp $ + +inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 + +DESCRIPTION="A compelling replacement for CVS" +HOMEPAGE="http://subversion.tigris.org/" +SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby" +RESTRICT="test" + +COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} ) + >=dev-libs/apr-util-0.9.7 + python? ( >=dev-lang/python-2.0 ) + perl? ( >=dev-lang/perl-5.8.6-r6 + !=dev-lang/perl-5.8.7 ) + ruby? ( >=dev-lang/ruby-1.8.2 ) + !nowebdav? ( net-misc/neon ) + berkdb? ( =sys-libs/db-4* ) + java? ( >=virtual/jdk-1.4 ) + emacs? ( virtual/emacs )" +RDEPEND="${COMMONDEPEND} + java? ( >=virtual/jre-1.4 )" + +DEPEND="${COMMONDEPEND} + java? ( >=virtual/jdk-1.4 ) + >=sys-devel/autoconf-2.59" + +S=${WORKDIR}/${P/_rc/-rc} + +# Allow for custion 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 && has_version '.*svn-revision.txt\),echo "exported" \2,' Makefile.in + + elibtoolize +} + +src_compile() { + local myconf + myconf="--with-apr=/usr --with-apr-util=/usr" + + use apache2 && myconf="${myconf} --with-apxs=${APXS2}" + use apache2 || myconf="${myconf} --without-apxs" + + 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-config --cppflags` + + econf ${myconf} \ + $(use_with berkdb berkeley-db) \ + $(use_with python) \ + $(use_enable nls) \ + --with-apr=/usr \ + --with-apr-util=/usr \ + --disable-experimental-libtool \ + --disable-mod-activation || die "econf failed" + + # Respect the user LDFLAGS + export EXTRA_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 "make of subversion failed" + + if use python; then + # Building fails without the apache apr-util as includes are wrong. + emake swig-py || die "subversion 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} + make swig-pl || die "Perl library building failed" + fi + + if use ruby; then + make swig-rb || die "Ruby library building 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 "Compilation 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" + fi +} + + +src_install () { + python_version + PYTHON_DIR=/usr/$(get_libdir)/python${PYVER} + + make DESTDIR=${D} install || die "Installation of subversion failed" + +# This might not be necessary with the new install +# if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then +# if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then +# mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}` +# mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR} +# rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null +# fi +# fi + + + dobin svn-config + if use python; then + make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed" + + # move python bindings + mkdir -p ${D}${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 + rmdir ${D}/usr/$(get_libdir)/svn-python + fi + if use perl; then + make DESTDIR=${D} install-swig-pl || die "Perl library building failed" + fixlocalpod + fi + if use ruby; then + make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed" + fi + if use java; then + make DESTDIR="${D}" install-javahl || die "installation failed" + java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so + java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install apache module config + if useq apache2; then + MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"` + mkdir -p ${D}/${APACHE2_MODULES_CONFDIR} + cat <${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf + + + LoadModule dav_svn_module ${MOD}/mod_dav_svn.so + + + DAV svn + SVNPath ${SVN_REPOS_LOC}/repos + AuthType Basic + AuthName "Subversion repository" + AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers + Require valid-user + + + + LoadModule authz_svn_module ${MOD}/mod_authz_svn.so + + + +EOF + fi + + # Bug 43179 - Install bash-completion if user wishes + dobashcompletion tools/client-side/bash_completion subversion + + # Install hot backup script, bug 54304 + newbin tools/backup/hot-backup.py svn-hot-backup + + # The svn_load_dirs script is installed by Debian and looks like a good + # candidate for us to install as well + newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs + + # Install svnserve init-script and xinet.d snippet, bug 43245 + exeinto /etc/init.d ; newexe ${FILESDIR}/svnserve.initd svnserve + insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve + + insinto /etc/conf.d + if use apache2 >/dev/null; then + newins ${FILESDIR}/svnserve.confd svnserve + else + newins ${FILESDIR}/svnserve.confd2 svnserve + fi + + # Install documentation + + dodoc BUGS COMMITTERS COPYING HACKING INSTALL README + dodoc CHANGES + dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl + find contrib tools -name \*.in -print0 | xargs -0 rm -f + mkdir -p ${D}/usr/share/doc/${PF}/ + cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/ + cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/ + + docinto notes + for f in notes/* + do + [[ -f ${f} ]] && dodoc ${f} + done + + # Install emacs lisps + if use emacs; then + insinto /usr/share/emacs/site-lisp/subversion + doins contrib/client-side/psvn/psvn.el* + doins contrib/client-side/vc-svn.el* + + elisp-site-file-install ${FILESDIR}/70svn-gentoo.el + fi +} + +src_test() { + ewarn "Testing does not work for subversion" +} + +pkg_postinst() { + use emacs && elisp-site-regen + use perl && perl-module_pkg_postinst + + einfo "Subversion Server Notes" + einfo "-----------------------" + einfo + + einfo "If you intend to run a server, a repository needs to be created using" + einfo "svnadmin (see man svnadmin) or the following command to create it in" + einfo "/var/svn:" + einfo + einfo " emerge --config =${CATEGORY}/${PF}" + einfo + einfo "If you upgraded from an older version of berkely db and experience" + einfo "problems with your repository then run the following commands as root:" + einfo " db4_recover -h ${SVN_REPOS_LOC}/repos" + einfo " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + einfo + einfo "Subversion has multiple server types, take your pick:" + einfo + einfo " - svnserve daemon: " + einfo " 1. edit /etc/conf.d/svnserve" + einfo " 2. start daemon: /etc/init.d/svnserve start" + einfo " 3. make persistent: rc-update add svnserve default" + einfo + einfo " - svnserve via xinetd:" + einfo " 1. edit /etc/xinetd.d/svnserve (remove disable line)" + einfo " 2. restart xinetd.d: /etc/init.d/xinetd restart" + einfo + einfo " - svn over ssh:" + einfo " 1. Fix the repository permissions:" + einfo " groupadd svnusers" + einfo " chown -R root:svnusers /var/svn/repos/" + einfo " chmod -R g-w /var/svn/repos" + einfo " chmod -R g+rw /var/svn/repos/db" + einfo " chmod -R g+rw /var/svn/repos/locks" + einfo " 2. create an svnserve wrapper in /usr/local/bin to set the umask you" + einfo " want, for example:" + einfo " #!/bin/bash" + einfo " umask 002" + einfo " exec /usr/bin/svnserve \"\$@\"" + einfo + + if use apache2 >/dev/null; then + einfo " - http-based server:" + einfo " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" + einfo " 2. create an htpasswd file:" + einfo " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" + einfo + fi + + einfo "If you intend to use svn-hot-backup, you can specify the number of" + einfo "backups to keep per repository by specifying an environment variable." + einfo "If you want to keep e.g. 2 backups, do the following:" + einfo "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion" + einfo "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion" + einfo "" +} + +pkg_postrm() { + has_version virtual/emacs && elisp-site-regen + use perl && perl-module_pkg_postrm +} + +pkg_config() { + if [[ ! -x /usr/bin/svnadmin ]]; then + die "You seem to only have built the subversion client" + fi + + 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 + /usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos + + einfo ">>> Setting repository permissions ..." + if use apache2 >/dev/null; then + chown -Rf apache:apache ${SVN_REPOS_LOC}/repos + else + enewgroup svnusers + enewuser svn -1 -1 /var/svn svnusers + chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos + fi + chmod -Rf 755 ${SVN_REPOS_LOC}/repos + fi +}