Changed the rsyncd.init from start-stop-daemon to --daemon. Should close #16505

4 files changed, 59 insertions, 9 deletions

diff --git a/app-admin/gentoo-rsync-mirror/ChangeLog b/app-admin/gentoo-rsync-mirror/ChangeLog
index 90eb53e4e775..7c8948043ab9 100644
--- a/app-admin/gentoo-rsync-mirror/ChangeLog
+++ b/app-admin/gentoo-rsync-mirror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/gentoo-rsync-mirror
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.6 2003/03/04 00:17:39 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.7 2003/03/19 18:42:27 tantive Exp $
+
+*gentoo-rsync-mirror-1.0-r2 (19 Mar 2003)
+
+  19 Mar 2003; Michael Imhof <tantive@gentoo.org> :
+  Changed the rsyncd.init from start-stop-daemon to --daemon.
+  Should close #16505
 
   25 Feb 2003; Michael Imhof <tantive@gentoo.org> :
   Corrected paths in rsyncd.conf, fixes #15720
diff --git a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r2 b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r2
diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.init b/app-admin/gentoo-rsync-mirror/files/rsyncd.init
index 5db5bad5c40d..72b04e6286c6 100644
--- a/app-admin/gentoo-rsync-mirror/files/rsyncd.init
+++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.init
@@ -1,23 +1,24 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.init,v 1.2 2003/02/14 22:02:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.init,v 1.3 2003/03/19 18:42:27 tantive Exp $
 
 depend() {
-	need net
+	use net
 }
 
 # FYI: --sparce seems to cause problems.
-RSYNCOPTS="--daemon --safe-links --compress --bwlimit=700 --timeout=1800"
+RSYNC_OPTS="--safe-links --compress --bwlimit=700 --timeout=1800"
+
 
 start() {
-	ebegin "Starting rsync daemon"
-	start-stop-daemon --start --quiet --pidfile /var/run/rsyncd.pid --exec /usr/bin/rsync -- ${RSYNCOPTS}
+	ebegin "Starting rsyncd"
+	rsync --daemon ${RSYNC_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping rsync daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/rsyncd.pid
+	ebegin "Stopping rsyncd"
+	kill `cat /var/run/rsyncd.pid`
 	eend $?
 }
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild
new file mode 100644
index 000000000000..405147f4be52
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild,v 1.1 2003/03/19 18:42:27 tantive Exp $
+
+S=${WORKDIR}/gentoo-rsync-mirror-${PV}
+DESCRIPTION="Ebuild for setting up an gentoo rsync mirror"
+HOMEPAGE="http://www.gentoo.org/doc/en/rsync.xml"
+IUSE=""
+
+DEPEND="virtual/glibc"
+RDEPEND="net-misc/rsync
+	dev-lang/perl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+src_install() {
+	dodir /opt/gentoo-rsync
+	cp ${FILESDIR}/rsync-gentoo-portage.sh ${D}/opt/gentoo-rsync
+	cp ${FILESDIR}/rsynclogparse-extended.pl ${D}/opt/gentoo-rsync
+	insinto etc/rsync
+	doins ${FILESDIR}/rsyncd.conf
+	doins ${FILESDIR}/rsyncd.motd
+	dodir /opt/gentoo-rsync/portage
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rsyncd.init rsyncd
+}
+
+pkg_postinst() {
+	einfo "The rsync-mirror is now installed into /opt/gentoo-rsync"
+	einfo "The local portage copy resists in      /opt/gentoo-rsync/portage"
+	einfo "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
+	einfo "configuration of your main rsync server and use it so sync."
+	einfo "Change /etc/rsync/rsyncd.motd to display your correct alias."
+	einfo
+	einfo "The service can be started using /etc/init.d/rsyncd start"
+	einfo "Don't forget to add"
+	einfo "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
+	einfo "to your /etc/crontab to sync your tree every 30 minutes."
+	einfo
+	einfo "For more information visit: http://www.gentoo.org/doc/en/rsync.xml"
+}
+