Version bump for bug 96936; added USE flags cgi,dmalloc,threads. Updated initd/confd files as well as added a shttpd.conf now that shttpd supports them. Thanks to Lukas Zapletal for the help.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 101 insertions, 33 deletions

diff --git a/www-servers/shttpd/files/digest-shttpd-1.21 b/www-servers/shttpd/files/digest-shttpd-1.21
deleted file mode 100644
index 1ac27bf3569d..000000000000
--- a/www-servers/shttpd/files/digest-shttpd-1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0dc2a4b4314799a3b17f071da7d38606 shttpd_1.21.c 84125
diff --git a/www-servers/shttpd/files/digest-shttpd-1.25 b/www-servers/shttpd/files/digest-shttpd-1.25
new file mode 100644
index 000000000000..bba11151c022
--- /dev/null
+++ b/www-servers/shttpd/files/digest-shttpd-1.25
@@ -0,0 +1 @@
+MD5 ce1760374ad9e9d0b359af4f975ca0ef shttpd-1.25.tar.gz 40835
diff --git a/www-servers/shttpd/files/shttpd.conf b/www-servers/shttpd/files/shttpd.conf
new file mode 100644
index 000000000000..ea3ca81c5684
--- /dev/null
+++ b/www-servers/shttpd/files/shttpd.conf
@@ -0,0 +1,84 @@
+# 
+# Gentoo configuration file for SHTTPD web server
+# http://shttpd.sourceforge.net
+#
+
+# Which directory to serve.
+# By default, current directory is used
+
+document_root		/var/www/localhost/htdocs
+
+# Authentication realm.
+# By default, it is "mydomain.com"
+
+server_name			gentoo.local
+
+# Listening port
+# By default, 80 or 443 if SSL is used
+
+listen_port			81
+
+# Comma-separated list of index files.
+# No spaces allowed between them.
+# By default, index.html,index.cgi
+
+index_files			index.html,index.cgi
+
+# CGI file extention.
+# By default, .cgi
+
+cgi_extention		.cgi
+
+# Access log file.
+# By default, it is "access.log"
+
+access_log			/var/log/shttpd/access.log
+
+# Error log file.
+# By default, no error log is created, errors are written to stderr
+
+error_log			/var/log/shttpd/error.log
+
+# Mime types file.
+# By default, none. Built-in mime types are used.
+
+mime_types			/etc/mime.types
+
+# Global .htpasswd file, one for all directories.
+# This one overrides any per-directory .htpasswd file.
+# By default, none
+
+#global_htpasswd	/etc/shttpd/htpasswd
+
+# Show all debug messages.
+# Very noisy. By default, off
+
+debug			0
+
+# SSL certificate file location.
+# Enabling this directive force switch to SSL mode, listening port 443.
+# By default, not enabled
+
+ssl_certificate		/etc/shttpd/shttpd.pem
+
+# Operate in SSL mode
+# By default, no
+
+use_ssl				0
+
+# Inetd mode. Exit after serving one document.
+# Assume client socket already connected on stdin/stdout
+# By default, no
+
+inetd_mode			0
+
+# Switch directory listing on/off
+# By default, yes
+
+list_directories	1
+
+# For UNIX only. If started by root, switch uid to specified one.
+# By default, not specified.
+
+runtime_uid			shttpd
+
diff --git a/www-servers/shttpd/files/shttpd.confd b/www-servers/shttpd/files/shttpd.confd
index aeaeaeaeb277..d3bc6f4e2237 100644
--- a/www-servers/shttpd/files/shttpd.confd
+++ b/www-servers/shttpd/files/shttpd.confd
@@ -1,36 +1,20 @@
 # /etc/init.d/shttpd:
-# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/files/shttpd.confd,v 1.1 2005/06/06 14:17:42 ka0ttic Exp $
-#
-# usage: shttpd [OPTIONS]
-# -d <directory>  wwwroot (dflt: )
-# -D              no directory listing
-# -p <port>       listening port (dflt: 80 or 443)
-# -l <logfile>    access log file (dflt: shttpd.log)
-# -I              inetd mode
-# -e <errorlog>   error log file
-# -i <files>      index files (dflt: index.html,index.cgi)
-# -c <cgi_ext>    CGI file pattern (dflt: .cgi)
-# -P <passfile>   global auth file
-# -A <passfile> <domain> <user> <password> edit .htpasswd file
-# -u <login_name> switch UID to user <login_name>
-# -N <servername> server domain name (auth realm) (dflt: mydomain.com)
-# -m <mime_file>  mime types file
-# -v              debug mode
-# -s <pem_file>   SSL certfileificate file (dflt: shttpd.pem)
-# -S              use SSL
-#
+# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/files/shttpd.confd,v 1.2 2005/07/01 04:49:16 ka0ttic Exp $
 
-SHTTPD_PORT="81"
-SHTTPD_USER="shttpd"
-SHTTPD_DOCROOT="/var/www/localhost/htdocs"
-SHTTPD_LOG="/var/log/shttpd/access.log"
-SHTTPD_ERROR="/var/log/shttpd/error.log"
+# shttpd now uses /etc/shttpd/shttpd.conf.
+# This file is obsolete and will be removed later.
+
+#SHTTPD_PORT="81"
+#SHTTPD_USER="shttpd"
+#SHTTPD_DOCROOT="/var/www/localhost/htdocs"
+#SHTTPD_LOG="/var/log/shttpd/access.log"
+#SHTTPD_ERROR="/var/log/shttpd/error.log"
 
 # comma separated list of files shttpd will interpret as index files
-SHTTPD_INDECIS="index.html,index.cgi"
-SHTTPD_CGIEXT=".cgi"
-SHTTPD_DOMAIN="localhost"
-SHTTPD_MIME="/etc/mime.types"
+#SHTTPD_INDECIS="index.html,index.cgi"
+#SHTTPD_CGIEXT=".cgi"
+#SHTTPD_DOMAIN="localhost"
+#SHTTPD_MIME="/etc/mime.types"
 
 # set any extra options here.
 #SHTTPD_EXTRAOPTS=""
diff --git a/www-servers/shttpd/files/shttpd.xinetd b/www-servers/shttpd/files/shttpd.xinetd
index 5dc8cef2800d..d8a26703b2db 100644
--- a/www-servers/shttpd/files/shttpd.xinetd
+++ b/www-servers/shttpd/files/shttpd.xinetd
@@ -6,8 +6,8 @@ service shttpd
 	port			= 81
 	server          = /usr/sbin/shttpd
 # change these lines
-	server_args		= -d /var/www/localhost/htdocs -I -l /var/log/shttpd_access.log -e /var/log/shttpd_error.log
-	user            = root
-	group			= root
+	server_args		= -I -d /var/www/localhost/htdocs -l /var/log/shttpd/access.log -e /var/log/shttpd/error.log
+	user            = shttpd
+	group			= shttpd
 	disable         = yes
 }