diff options
author | 2004-05-02 22:51:54 +0000 | |
---|---|---|
committer | 2004-05-02 22:51:54 +0000 | |
commit | 2f0e5251547cf4b98eb8a9532af19d91359e03b1 (patch) | |
tree | 54782573bf28cd6eb7e3be36f75d090bb363ec1b /net-misc/rsync | |
parent | updating copyright info (Manifest recommit) (diff) | |
download | gentoo-2-2f0e5251547cf4b98eb8a9532af19d91359e03b1.tar.gz gentoo-2-2f0e5251547cf4b98eb8a9532af19d91359e03b1.tar.bz2 gentoo-2-2f0e5251547cf4b98eb8a9532af19d91359e03b1.zip |
adding rsyncd conf in econf. closes 49707
Diffstat (limited to 'net-misc/rsync')
-rw-r--r-- | net-misc/rsync/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/rsync/Manifest | 2 | ||||
-rw-r--r-- | net-misc/rsync/files/digest-rsync-2.6.2-r2 | 2 | ||||
-rw-r--r-- | net-misc/rsync/rsync-2.6.2-r1.ebuild | 8 | ||||
-rw-r--r-- | net-misc/rsync/rsync-2.6.2-r2.ebuild | 68 |
5 files changed, 84 insertions, 3 deletions
diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog index 2cf2983aabb4..727ba76edbab 100644 --- a/net-misc/rsync/ChangeLog +++ b/net-misc/rsync/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/rsync # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.50 2004/05/02 20:32:25 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.51 2004/05/02 22:51:54 mholzer Exp $ + +*rsync-2.6.2-r2 (03 May 2004) + + 03 May 2004; Martin Holzer <mholzer@gentoo.org> rsync-2.6.2-r2.ebuild: + adding rsyncd conf in econf. closes 49707 02 May 2004; Bryan �stergaard <kloeri@gentoo.org> rsync-2.6.2-r1.ebuild: Stable on alpha. diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 92f76fe4f13c..dd252482b4c7 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -3,6 +3,7 @@ MD5 f444a8aab35c011e327bbef5dc8af423 rsync-2.6.2.ebuild 2146 MD5 2b4231199efd5dc8f43008d49ab84680 rsync-2.6.0.ebuild 2262 MD5 4e22b7b0c7b8a312af968e94fc71e137 rsync-2.6.0-r1.ebuild 2435 MD5 7ad9010076a4dce098c8a2f148965318 rsync-2.6.2-r1.ebuild 1968 +MD5 7ad9010076a4dce098c8a2f148965318 rsync-2.6.2-r2.ebuild 1968 MD5 d12329ba4505253f35b46e3446aaaebc files/digest-rsync-2.6.2 63 MD5 4d441bf205926e27dd5a2f535c6a970c files/rsyncd.conf 413 MD5 c5f7ff7f88f35b5f20b080b75cf801ce files/rsyncd.conf.d 356 @@ -10,3 +11,4 @@ MD5 3ff6f8bc2cf6a0c67a94d80eaaa721c3 files/rsyncd.init.d 424 MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136 MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r1 204 MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r1 131 +MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r2 131 diff --git a/net-misc/rsync/files/digest-rsync-2.6.2-r2 b/net-misc/rsync/files/digest-rsync-2.6.2-r2 new file mode 100644 index 000000000000..c6e03ea0dd43 --- /dev/null +++ b/net-misc/rsync/files/digest-rsync-2.6.2-r2 @@ -0,0 +1,2 @@ +MD5 bcacd9a9108a9e4760832212ec3d658d rsync-2.6.2.tar.gz 515402 +MD5 5b33440e8a22a85b6d00aa86bc4ee508 rsync-2.6.2-acl.diff.bz2 30505 diff --git a/net-misc/rsync/rsync-2.6.2-r1.ebuild b/net-misc/rsync/rsync-2.6.2-r1.ebuild index 2f474870f06d..8809f29b04cc 100644 --- a/net-misc/rsync/rsync-2.6.2-r1.ebuild +++ b/net-misc/rsync/rsync-2.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.2-r1.ebuild,v 1.8 2004/05/02 22:45:02 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.2-r1.ebuild,v 1.9 2004/05/02 22:51:54 mholzer Exp $ inherit eutils flag-o-matic gcc @@ -26,6 +26,11 @@ src_unpack() { use acl && epatch ${DISTDIR}/${P}-acl.diff.bz2 # change confdir to /etc/rsync rather than just /etc (the --sysconfdir + # configure option doesn't work + sed -i \ + -e 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g' \ + rsync.h \ + || die "sed rsync.h failed" # yes, updating the man page is very important. sed -i \ -e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \ @@ -40,7 +45,6 @@ src_compile() { econf \ $(use_with build included-popt) \ $(use_with acl acl-support) \ - --with-rsyncd-conf=/etc/rsync/rsyncd.conf \ || die emake || die "emake failed" } diff --git a/net-misc/rsync/rsync-2.6.2-r2.ebuild b/net-misc/rsync/rsync-2.6.2-r2.ebuild new file mode 100644 index 000000000000..c8ecafb93ba6 --- /dev/null +++ b/net-misc/rsync/rsync-2.6.2-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.2-r2.ebuild,v 1.1 2004/05/02 22:51:54 mholzer Exp $ + +inherit eutils flag-o-matic gcc + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="http://rsync.samba.org/" +SRC_URI="http://rsync.samba.org/ftp/rsync/${P}.tar.gz + acl? ( http://www.saout.de/misc/${P}-acl.diff.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ~ia64 ppc64 s390" +IUSE="build static acl" + +RDEPEND="virtual/glibc + !build? ( >=dev-libs/popt-1.5 )" +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + acl? ( sys-apps/acl )" + +src_unpack() { + unpack "${P}.tar.gz" + cd ${S} + use acl && epatch ${DISTDIR}/${P}-acl.diff.bz2 + + # change confdir to /etc/rsync rather than just /etc (the --sysconfdir + # yes, updating the man page is very important. + sed -i \ + -e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \ + rsyncd.conf.5 \ + || die "sed rsyncd.conf.5 failed" +} + +src_compile() { + [ "`gcc-version`" == "2.95" ] && append-ldflags -lpthread + use static && append-ldflags -static + export LDFLAGS + econf \ + $(use_with build included-popt) \ + $(use_with acl acl-support) \ + --with-rsyncd-conf=/etc/rsync/rsyncd.conf \ + || die + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + insinto /etc/conf.d && newins "${FILESDIR}/rsyncd.conf.d" rsyncd + exeinto /etc/init.d && newexe "${FILESDIR}/rsyncd.init.d" rsyncd + if ! use build ; then + dodir /etc/rsync + dodoc NEWS OLDNEWS README TODO tech_report.tex + if [ ! -e /etc/rsync/rsyncd.conf ] ; then + insinto /etc/rsync + doins "${FILESDIR}/rsyncd.conf" + fi + else + rm -rf "${D}/usr/share" + fi +} + +pkg_postinst() { + ewarn "Please make sure you do NOT disable the rsync server running" + ewarn "in a chroot. Please check /etc/rsync/rsyncd.conf and make sure" + ewarn "it says: use chroot = yes" +} |