added daemon init scripts and zeroconf USE flag, renamed ftp USE flag to ftpd

Package-Manager: portage-2.1.4_rc7

10 files changed, 251 insertions, 5 deletions

diff --git a/sys-fs/owfs/ChangeLog b/sys-fs/owfs/ChangeLog
index 96c2a5c7ac10..a1771c192aac 100644
--- a/sys-fs/owfs/ChangeLog
+++ b/sys-fs/owfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/owfs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.2 2007/12/08 02:24:51 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.3 2007/12/15 16:10:06 wschlich Exp $
+
+*owfs-2.7_p0-r1 (15 Dec 2007)
+
+  15 Dec 2007; Wolfram Schlich <wschlich@gentoo.org> +files/owftpd.confd,
+  +files/owftpd.initd, +files/owhttpd.confd, +files/owhttpd.initd,
+  +files/owserver.confd, +files/owserver.initd, +owfs-2.7_p0-r1.ebuild:
+  added daemon init scripts and zeroconf USE flag, renamed ftp
+  USE flag to ftpd
 
   08 Dec 2007; Wolfram Schlich <wschlich@gentoo.org> owfs-2.7_p0.ebuild:
   fix php check, add ~amd64
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index a02f801ef76b..7f3e8399fe6e 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -1,12 +1,40 @@
+AUX owftpd.confd 121 RMD160 63984e8a4a49ca73cb9b54ebb9d1dbfa5e2cda76 SHA1 53c47048b8038c38ae3687fa841a88dc844f09fa SHA256 a6513ef051d2290482b49ad4e79f1999abe95c61e40bbabb37e20c29b0dac61e
+MD5 64ef59ff63d471117a898409a3e27a57 files/owftpd.confd 121
+RMD160 63984e8a4a49ca73cb9b54ebb9d1dbfa5e2cda76 files/owftpd.confd 121
+SHA256 a6513ef051d2290482b49ad4e79f1999abe95c61e40bbabb37e20c29b0dac61e files/owftpd.confd 121
+AUX owftpd.initd 903 RMD160 411218501ba3d8c26d64f2961fa2c36344c78129 SHA1 3d38fdebb424beeda3c6c9408fa90c60484c8acc SHA256 0d366fe45181a9debdd4b022594afbd4e426228405c6bc32ffc6b7c37db890e1
+MD5 fdce8cf80d7c8bd7fe7a862a59bccf58 files/owftpd.initd 903
+RMD160 411218501ba3d8c26d64f2961fa2c36344c78129 files/owftpd.initd 903
+SHA256 0d366fe45181a9debdd4b022594afbd4e426228405c6bc32ffc6b7c37db890e1 files/owftpd.initd 903
+AUX owhttpd.confd 89 RMD160 92a80ff6463d0944cce84ed2537ebeed23eca761 SHA1 c06bd8e771bc61a1e3a6095ff39fc7add4e01370 SHA256 62fe2751f31172d1dc042464f1bcdac3813663b9ce6843ee02747d8d0a587641
+MD5 6790aa317e038aaf4e7754d0e5ba6f9f files/owhttpd.confd 89
+RMD160 92a80ff6463d0944cce84ed2537ebeed23eca761 files/owhttpd.confd 89
+SHA256 62fe2751f31172d1dc042464f1bcdac3813663b9ce6843ee02747d8d0a587641 files/owhttpd.confd 89
+AUX owhttpd.initd 865 RMD160 da9bff350a272ad1dd22fe50a9c714797c5e98b8 SHA1 ad7127268d13f540e134aaa93ba44b33da2729a1 SHA256 2ad9d1b77ef43f614783e061ad1889d7734519b0a6702b2957bc35d3a562c651
+MD5 de4ec460d1c02a2c0b634586b871e737 files/owhttpd.initd 865
+RMD160 da9bff350a272ad1dd22fe50a9c714797c5e98b8 files/owhttpd.initd 865
+SHA256 2ad9d1b77ef43f614783e061ad1889d7734519b0a6702b2957bc35d3a562c651 files/owhttpd.initd 865
+AUX owserver.confd 108 RMD160 18b8630190d50a150781306f782c78798d0518cd SHA1 eb4cd880f2a47bdc36c995cee263924cc3ddc2db SHA256 13a2a221288224aee0e504ef34ae2375635a5c7cf7f9dee593f649509179a6bf
+MD5 605cd2b8f9a154317498f8f963b68213 files/owserver.confd 108
+RMD160 18b8630190d50a150781306f782c78798d0518cd files/owserver.confd 108
+SHA256 13a2a221288224aee0e504ef34ae2375635a5c7cf7f9dee593f649509179a6bf files/owserver.confd 108
+AUX owserver.initd 860 RMD160 ac273aaa6172077f47d65d71e6622974c0c89c23 SHA1 46f806d3b02f2fc5de88e1f8064687b31d450b5f SHA256 226f1c1947ccaf982413b9b1ba9ef3d7fa7f69f84ab897aff85dfbe94bd273bb
+MD5 b1755e130b73d617ee13963574028a78 files/owserver.initd 860
+RMD160 ac273aaa6172077f47d65d71e6622974c0c89c23 files/owserver.initd 860
+SHA256 226f1c1947ccaf982413b9b1ba9ef3d7fa7f69f84ab897aff85dfbe94bd273bb files/owserver.initd 860
 DIST owfs-2.7p0.tar.gz 1058362 RMD160 734d385b93611e988499f47f805c4af090ad5bb8 SHA1 4026da34e1b94baa3167414e203e5f56bc24662a SHA256 dc1f7fe5cad844070eabe98149978c513c625a5a072987857bf1bc42eca42f8a
+EBUILD owfs-2.7_p0-r1.ebuild 3141 RMD160 a30b708d1f69e0f01d70165e7288df525d29cd4e SHA1 35af2425d293c27592e6fe60abc8adb517e0bc97 SHA256 eb884f13b073f08a7fc9e18fa5ac2e761c9341ea5929896d646911b60ee4b616
+MD5 51e32491dcf219f1f65d46cee64afe28 owfs-2.7_p0-r1.ebuild 3141
+RMD160 a30b708d1f69e0f01d70165e7288df525d29cd4e owfs-2.7_p0-r1.ebuild 3141
+SHA256 eb884f13b073f08a7fc9e18fa5ac2e761c9341ea5929896d646911b60ee4b616 owfs-2.7_p0-r1.ebuild 3141
 EBUILD owfs-2.7_p0.ebuild 1530 RMD160 b55e810f467b29ee45db27cb537c96758d2691c8 SHA1 232aaa48d93e849ffed80c5fb0b6710be2bc1758 SHA256 dd4a41b67667edb00c48da4cecd688c1c0a444a875d25c6122483caa3f577a21
 MD5 e31f88b931797c813557786eb8d69d73 owfs-2.7_p0.ebuild 1530
 RMD160 b55e810f467b29ee45db27cb537c96758d2691c8 owfs-2.7_p0.ebuild 1530
 SHA256 dd4a41b67667edb00c48da4cecd688c1c0a444a875d25c6122483caa3f577a21 owfs-2.7_p0.ebuild 1530
-MISC ChangeLog 436 RMD160 17a049d922f7765a0c8289e391a004e3eb7f0bbf SHA1 16ab946c8c39503e004518b27e8b2182ed056e98 SHA256 62af6f98d60a2eb4670bca38841263d65a19cced7f731a71244f82c731230cb1
-MD5 8ef6b441793c012fba65e0633df037f5 ChangeLog 436
-RMD160 17a049d922f7765a0c8289e391a004e3eb7f0bbf ChangeLog 436
-SHA256 62af6f98d60a2eb4670bca38841263d65a19cced7f731a71244f82c731230cb1 ChangeLog 436
+MISC ChangeLog 763 RMD160 ad2f0396edbb5b8303451090299d57d1a8e4f5ef SHA1 bc94d465c3b7f4a257e49d681803ab3a03d47533 SHA256 1a27dd8bc542b13f4d010c4a6e9ae619c52f8acf580955896ef3e679c62abd82
+MD5 c724409f4dd0cacab6d55fdc31296e43 ChangeLog 763
+RMD160 ad2f0396edbb5b8303451090299d57d1a8e4f5ef ChangeLog 763
+SHA256 1a27dd8bc542b13f4d010c4a6e9ae619c52f8acf580955896ef3e679c62abd82 ChangeLog 763
 MISC metadata.xml 603 RMD160 4a4eded26c136cfb518862d46714f1bc1e207853 SHA1 b3043c8a2a56503064c0c97db0596a0b684c82bc SHA256 aae3ae268a798f00e5f4a33f8338d62c2c2fc7e384313804bf7967725dab4623
 MD5 5f4010812ff21627cee10573aaa5645b metadata.xml 603
 RMD160 4a4eded26c136cfb518862d46714f1bc1e207853 metadata.xml 603
@@ -14,3 +42,6 @@ SHA256 aae3ae268a798f00e5f4a33f8338d62c2c2fc7e384313804bf7967725dab4623 metadata
 MD5 6d58dd137a5399ce8b3f967b5125bc9f files/digest-owfs-2.7_p0 235
 RMD160 7ee34802e559f989bd0c607c65dd66c0cd6d1b94 files/digest-owfs-2.7_p0 235
 SHA256 a774b0d778926dcfae10eb071853901de952dec716880d32524da122a3baff55 files/digest-owfs-2.7_p0 235
+MD5 6d58dd137a5399ce8b3f967b5125bc9f files/digest-owfs-2.7_p0-r1 235
+RMD160 7ee34802e559f989bd0c607c65dd66c0cd6d1b94 files/digest-owfs-2.7_p0-r1 235
+SHA256 a774b0d778926dcfae10eb071853901de952dec716880d32524da122a3baff55 files/digest-owfs-2.7_p0-r1 235
diff --git a/sys-fs/owfs/files/digest-owfs-2.7_p0-r1 b/sys-fs/owfs/files/digest-owfs-2.7_p0-r1
new file mode 100644
index 000000000000..6e4364d3b0c7
--- /dev/null
+++ b/sys-fs/owfs/files/digest-owfs-2.7_p0-r1
@@ -0,0 +1,3 @@
+MD5 07ee9ad9973c47b3ab6da923c97fa5eb owfs-2.7p0.tar.gz 1058362
+RMD160 734d385b93611e988499f47f805c4af090ad5bb8 owfs-2.7p0.tar.gz 1058362
+SHA256 dc1f7fe5cad844070eabe98149978c513c625a5a072987857bf1bc42eca42f8a owfs-2.7p0.tar.gz 1058362
diff --git a/sys-fs/owfs/files/owftpd.confd b/sys-fs/owfs/files/owftpd.confd
new file mode 100644
index 000000000000..d9435314af15
--- /dev/null
+++ b/sys-fs/owfs/files/owftpd.confd
@@ -0,0 +1,2 @@
+# owfs owftpd configuration
+OWFTPD_OPTS="--nozero -p 127.0.0.1:9321 -s 127.0.0.1:9300 --max_clients 5 --timeout_ftp 600"
diff --git a/sys-fs/owfs/files/owftpd.initd b/sys-fs/owfs/files/owftpd.initd
new file mode 100755
index 000000000000..30c70eb8a3b6
--- /dev/null
+++ b/sys-fs/owfs/files/owftpd.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/files/owftpd.initd,v 1.1 2007/12/15 16:10:07 wschlich Exp $
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+    need net
+    use logger owserver
+}
+
+start() {
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
+		--pid_file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWFTPD_OPTS:---nozero -p 127.0.0.1:9321 -s 127.0.0.1:9300 --max_clients 5 --timeout_ftp 600}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+    eend $?
+}
diff --git a/sys-fs/owfs/files/owhttpd.confd b/sys-fs/owfs/files/owhttpd.confd
new file mode 100644
index 000000000000..604d79b7b5c7
--- /dev/null
+++ b/sys-fs/owfs/files/owhttpd.confd
@@ -0,0 +1,2 @@
+# owfs owhttpd configuration
+OWHTTPD_OPTS="--nozero -p 127.0.0.1:9380 -s 127.0.0.1:9300"
diff --git a/sys-fs/owfs/files/owhttpd.initd b/sys-fs/owfs/files/owhttpd.initd
new file mode 100755
index 000000000000..24b40783e471
--- /dev/null
+++ b/sys-fs/owfs/files/owhttpd.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/files/owhttpd.initd,v 1.1 2007/12/15 16:10:07 wschlich Exp $
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+    need net
+    use logger owserver
+}
+
+start() {
+    ebegin "Starting owhttpd"
+    start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
+		--pid_file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWHTTPD_OPTS:---nozero -p 127.0.0.1:9380 -s 127.0.0.1:9300}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping owhttpd"
+    start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+    eend $?
+}
diff --git a/sys-fs/owfs/files/owserver.confd b/sys-fs/owfs/files/owserver.confd
new file mode 100644
index 000000000000..5ec6f3f54b72
--- /dev/null
+++ b/sys-fs/owfs/files/owserver.confd
@@ -0,0 +1,2 @@
+# owfs owserver configuration
+OWSERVER_OPTS="--nozero -p 127.0.0.1:9300 -d /dev/ttyS0 --timeout_volatile 5"
diff --git a/sys-fs/owfs/files/owserver.initd b/sys-fs/owfs/files/owserver.initd
new file mode 100755
index 000000000000..402e319ce40c
--- /dev/null
+++ b/sys-fs/owfs/files/owserver.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/files/owserver.initd,v 1.1 2007/12/15 16:10:07 wschlich Exp $
+
+INSTANCE=${SVCNAME#*.}
+PROGRAM=${SVCNAME%%.*}
+PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+depend() {
+    need net
+    use logger
+}
+
+start() {
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
+		--pid_file ${PIDFILE} \
+		--background --error_print 1 \
+		${OWSERVER_OPTS:---nozero -p 127.0.0.1:9300 -d /dev/ttyS0}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
+		--pidfile ${PIDFILE} -u ${OWUID}
+    eend $?
+}
diff --git a/sys-fs/owfs/owfs-2.7_p0-r1.ebuild b/sys-fs/owfs/owfs-2.7_p0-r1.ebuild
new file mode 100644
index 000000000000..e325797aa092
--- /dev/null
+++ b/sys-fs/owfs/owfs-2.7_p0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p0-r1.ebuild,v 1.1 2007/12/15 16:10:06 wschlich Exp $
+
+inherit eutils
+
+MY_P=${P/_/}
+
+DESCRIPTION="Access 1-Wire devices like a filesystem"
+SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
+HOMEPAGE="http://www.owfs.org/ http://owfs.sourceforge.net/"
+LICENSE="GPL-2"
+DEPEND="fuse? ( sys-fs/fuse )
+	perl? ( dev-lang/perl dev-lang/swig )
+	php? ( dev-lang/php dev-lang/swig )
+	python? ( dev-lang/python dev-lang/swig )
+	tcl? ( dev-lang/tcl )
+	usb? ( dev-libs/libusb )
+	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug fuse ftpd httpd parport perl php python server tcl usb zeroconf"
+
+S=${WORKDIR}/${MY_P}
+
+OWUID=${OWUID:-owfs}
+OWGID=${OWGID:-owfs}
+
+pkg_setup() {
+	if use php && has_version dev-lang/php && ! built_with_use dev-lang/php cli; then
+		eerror "${PN} needs the command line interface (CLI) of php"
+		eerror "Please re-emerge dev-lang/php with USE=cli"
+		die "need dev-lang/php built with cli USE flag"
+	fi
+	if use zeroconf && has_version net-dns/avahi && ! built_with_use net-dns/avahi mdnsresponder-compat; then
+		eerror "You need to recompile net-dns/avahi with mdnsresponder-compat USE flag"
+		die "net-dns/avahi is missing required mdnsresponder-compat support for USE=zeroconf"
+	fi
+	enewgroup ${OWGID} 150
+	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable fuse owfs) \
+		$(use_enable ftpd owftpd) \
+		$(use_enable httpd owhttpd) \
+		$(use_enable parport) \
+		$(use_enable perl owperl) \
+		$(use_enable php owphp) \
+		$(use_enable python owpython) \
+		$(use_enable server owserver) \
+		$(use_enable tcl owtcl) \
+		$(use_enable zeroconf zero) \
+		$(use_enable usb) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README NEWS ChangeLog AUTHORS
+	if use server || use httpd || use ftpd; then
+		diropts -m 0750 -o ${OWUID} -g ${OWGID}
+		dodir /var/run/owfs
+		for i in server httpd ftpd; do
+			if use ${i}; then
+				newinitd "${FILESDIR}"/ow${i}.initd ow${i}
+				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use server || use httpd || use ftpd; then
+		echo
+		einfo
+		einfo "Be sure to check/edit the following files,"
+		einfo "e.g. to fit your 1 wire bus controller"
+		einfo "device or daemon network settings:"
+		for i in server httpd ftpd; do
+			if use ${i}; then
+				einfo "- ${ROOT%/}/etc/conf.d/ow${i}"
+			fi
+		done
+		einfo
+		echo
+		if [[ ${OWUID} != root ]]; then
+			ewarn
+			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
+			ewarn "from and/or write to a 1 wire bus controller device, make"
+			ewarn "sure the user has appropriate permission to access the"
+			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
+			ewarn "by adding the user to the group 'uucp' (for serial devices)"
+			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb)."
+			ewarn
+			echo
+		fi
+	fi
+}