Version bump; added threads support via USE=threads. Also added init/conf scripts thanks to Adam Chodorowski in bug 59427.

Package-Manager: portage-2.0.51.16

7 files changed, 116 insertions, 20 deletions

diff --git a/www-servers/webfs/ChangeLog b/www-servers/webfs/ChangeLog
index 6dde869b2540..a1a8c44ee02a 100644
--- a/www-servers/webfs/ChangeLog
+++ b/www-servers/webfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/webfs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.6 2005/01/23 21:05:58 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.7 2005/02/16 15:58:36 ka0ttic Exp $
+
+*webfs-1.21 (16 Feb 2005)
+
+  16 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +files/webfs.confd,
+  +files/webfs.initd, webfs-1.20.ebuild, +webfs-1.21.ebuild:
+  Version bump; added threads support via USE=threads. Also added init/conf
+  scripts thanks to Adam Chodorowski in bug 59427.
 
   23 Jan 2005; Simon Stelling <blubb@gentoo.org> webfs-1.20.ebuild:
   added ~amd64
diff --git a/www-servers/webfs/Manifest b/www-servers/webfs/Manifest
index 5647fef7e550..6766caf5276d 100644
--- a/www-servers/webfs/Manifest
+++ b/www-servers/webfs/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d712684e6675b889ea234e7376e970af webfs-1.20.ebuild 745
-MD5 9fc576f45c704e542670b3546d241824 ChangeLog 1525
+MD5 6cfeb7c20c6d12d9532b8062affb72ff webfs-1.21.ebuild 980
+MD5 3662a439d7c3458574683fb16d844ed6 webfs-1.20.ebuild 782
+MD5 a14ba947d9c1c25b64d8d7d2a81dd957 ChangeLog 1812
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
+MD5 94dac2cb13f5eabedc2f0c8b94a0741d files/webfs.confd 606
 MD5 579ace48be13da5a18919374112e42c3 files/digest-webfs-1.20 61
+MD5 67b1bfcd2840ebff1879c074c71f82c7 files/digest-webfs-1.21 61
+MD5 8fb265a9d956a86a5294567cac50f37b files/webfs.initd 1198
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCE1fJEZCkKN40op4RArugAJ44V5vsTgLiuVgXiSwUJSWOV7N8rACgo1YR
-PyzAL/epaNDNjxb/I6v/Ufw=
-=OvoA
+iD8DBQFCE221EZCkKN40op4RAiVEAJ44P/eYH3eiPFZ0JRjztOa96pKr9QCeNwur
+VyyxZTuN5o8KGb9CCaAQe98=
+=pjpy
 -----END PGP SIGNATURE-----
diff --git a/www-servers/webfs/files/digest-webfs-1.21 b/www-servers/webfs/files/digest-webfs-1.21
new file mode 100644
index 000000000000..e488b8238705
--- /dev/null
+++ b/www-servers/webfs/files/digest-webfs-1.21
@@ -0,0 +1 @@
+MD5 6dc125fe160479404147e7bbfc781dbc webfs-1.21.tar.gz 44249
diff --git a/www-servers/webfs/files/webfs.confd b/www-servers/webfs/files/webfs.confd
new file mode 100644
index 000000000000..5c4de3ad9b74
--- /dev/null
+++ b/www-servers/webfs/files/webfs.confd
@@ -0,0 +1,27 @@
+# Configuration for webfsd init script
+
+WEBFS_PORT=80
+WEBFS_DOCROOT=/var/www/localhost/htdocs
+WEBFS_INDEX=index.html
+WEBFS_LOG=/var/log/webfsd.log
+
+# set server name
+#WEBFS_SERVNAME=
+
+# uncomment to chroot to specified dir
+#WEBFS_CHROOT="/var/www/localhost" 
+
+# max allowed connections (defaults to 32)
+#WEBFS_MAXCONN=50
+
+# uncomment to enable directory listings
+#WEBFS_DIR_LIST=true
+
+# uncomment to enable SSL (you'll need to add -C <cert> -P <pass> to WEBFS_OPTS)
+#WEBFS_SSL=true
+
+# uncomment to enable ipv6
+#WEBFS_IPV6=true
+
+# Add any extra options here. See webfsd for more information.
+#WEBFS_OPTS=""
diff --git a/www-servers/webfs/files/webfs.initd b/www-servers/webfs/files/webfs.initd
new file mode 100644
index 000000000000..381661860ba5
--- /dev/null
+++ b/www-servers/webfs/files/webfs.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/files/webfs.initd,v 1.1 2005/02/16 15:58:37 ka0ttic Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	WEBFS_OPTS="-p ${WEBFS_PORT:-80} -f ${WEBFS_INDEX:-index.html} ${WEBFS_OPTS}"
+	[[ -n "${WEBFS_DOCROOT}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -r ${WEBFS_DOCROOT}"
+	[[ -n "${WEBFS_CHROOT}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -R ${WEBFS_CHROOT}"
+	[[ -n "${WEBFS_LOG}" ]] && WEBF_OPTS="${WEBFS_OPTS} -l ${WEBFS_LOG}"
+	[[ -n "${WEBFS_MAXCONN}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -c ${WEBFS_MAXCONN}"
+	[[ -n "${WEBFS_IPV6}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -6"
+	[[ -n "${WEBFS_SSL}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -S" 
+	[[ -n "${WEBFS_SERVNAME}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -n ${WEBFS_SERVNAME}"
+	[[ -n "${WEBFS_DIR_LIST}" ]] || WEBFS_OPTS="${WEBFS_OPTS} -j" 
+
+	ebegin "Starting webfsd"
+	start-stop-daemon --start --quiet --exec /usr/bin/webfsd -- ${WEBFS_OPTS}
+	eend $? "Failed to start webfsd"
+}
+
+stop() {
+	ebegin "Stopping webfsd"
+	start-stop-daemon --stop --quiet --name webfsd --exec /usr/bin/webfsd
+	eend $? "Failed to stop webfsd"
+}
diff --git a/www-servers/webfs/webfs-1.20.ebuild b/www-servers/webfs/webfs-1.20.ebuild
index 0a6d746254b0..c7904ca1bce4 100644
--- a/www-servers/webfs/webfs-1.20.ebuild
+++ b/www-servers/webfs/webfs-1.20.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.20.ebuild,v 1.4 2005/01/23 21:05:58 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.20.ebuild,v 1.5 2005/02/16 15:58:36 ka0ttic Exp $
 
-IUSE="ssl"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Lightweight HTTP server for static content"
-SRC_URI="http://bytesex.org/misc/webfs_${PV}.tar.gz"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://bytesex.org/webfs.html"
 
-KEYWORDS="x86 sparc alpha ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc alpha ppc ~amd64"
+IUSE="ssl"
 
 DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
@@ -20,16 +18,12 @@ RDEPEND="${DEPEND}
 	app-misc/mime-types"
 
 src_compile() {
-
-	local myconf=""
-
-	use ssl \
-		|| myconf="${myconf} USE_SSL=no"
-
-	emake prefix=/usr ${myconf}
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	emake prefix=/usr ${myconf} || die "emake failed"
 }
 
 src_install() {
-	einstall mandir=${D}/usr/share/man
+	einstall mandir=${D}/usr/share/man || die "make install failed"
 	dodoc README COPYING
 }
diff --git a/www-servers/webfs/webfs-1.21.ebuild b/www-servers/webfs/webfs-1.21.ebuild
new file mode 100644
index 000000000000..95d597f2de65
--- /dev/null
+++ b/www-servers/webfs/webfs-1.21.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21.ebuild,v 1.1 2005/02/16 15:58:36 ka0ttic Exp $
+
+DESCRIPTION="Lightweight HTTP server for static content"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
+HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+IUSE="ssl threads"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types"
+
+src_compile() {
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	use threads && myconf="${myconf} USE_THREADS=yes"
+
+	emake prefix=/usr ${myconf} || die "emake failed"
+}
+
+src_install() {
+	einstall mandir=${D}/usr/share/man || die "make install failed"
+	newinitd ${FILESDIR}/${PN}.initd ${PN} || die "newinitd failed"
+	newconfd ${FILESDIR}/${PN}.confd ${PN} || die "newconfd failed"
+	dodoc README COPYING
+}