diff options
| -rw-r--r-- | www-servers/shttpd/ChangeLog | 11 | ||||
| -rw-r--r-- | www-servers/shttpd/Manifest | 21 | ||||
| -rw-r--r-- | www-servers/shttpd/files/digest-shttpd-1.21 | 1 | ||||
| -rw-r--r-- | www-servers/shttpd/files/digest-shttpd-1.25 | 1 | ||||
| -rw-r--r-- | www-servers/shttpd/files/shttpd.conf | 84 | ||||
| -rw-r--r-- | www-servers/shttpd/files/shttpd.confd | 42 | ||||
| -rw-r--r-- | www-servers/shttpd/files/shttpd.xinetd | 6 | ||||
| -rw-r--r-- | www-servers/shttpd/shttpd-1.21.ebuild | 57 | ||||
| -rw-r--r-- | www-servers/shttpd/shttpd-1.25.ebuild | 68 |
9 files changed, 185 insertions, 106 deletions
diff --git a/www-servers/shttpd/ChangeLog b/www-servers/shttpd/ChangeLog index 77a025459fc7..7fffc882e3a1 100644 --- a/www-servers/shttpd/ChangeLog +++ b/www-servers/shttpd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-servers/shttpd # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/ChangeLog,v 1.3 2005/06/09 11:46:30 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/ChangeLog,v 1.4 2005/07/01 04:49:16 ka0ttic Exp $ + +*shttpd-1.25 (01 Jul 2005) + + 01 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +files/shttpd.conf, + files/shttpd.confd, files/shttpd.xinetd, -shttpd-1.21.ebuild, + +shttpd-1.25.ebuild: + 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. 09 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> shttpd-1.21.ebuild: Add app-misc/mime-types to RDEPEND. diff --git a/www-servers/shttpd/Manifest b/www-servers/shttpd/Manifest index 00c12650203c..27763d33ed1e 100644 --- a/www-servers/shttpd/Manifest +++ b/www-servers/shttpd/Manifest @@ -1,17 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 36d6904f02c89080a02c318520a60736 ChangeLog 682 +MD5 3ee6294c00069271db2fea4b5f3571fe shttpd-1.25.ebuild 1781 +MD5 63101e2bc1bd45e22761d2394dc0fb3b ChangeLog 1065 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165 -MD5 917c4c0998c4ca73af551429ae3d97c6 shttpd-1.21.ebuild 1317 -MD5 e8075e7b26f52ed5cb6750573df32559 files/digest-shttpd-1.21 57 -MD5 6f9204c5ccd79aa7756278fa6f66e6fc files/shttpd.xinetd 326 -MD5 fb02d1f737f76e6bbb884451df051d1c files/shttpd.confd 1282 +MD5 0916be1bcda8b46336b6eb51393e730e files/digest-shttpd-1.25 62 +MD5 9ea0f73dae901e0662a60f73ea7a34d4 files/shttpd.xinetd 330 +MD5 0c7096f8e2cdb81487516d8cddab2bc0 files/shttpd.conf 1679 +MD5 d48ebf5434099fd2d142d5f4670e45bb files/shttpd.confd 639 MD5 af3d01bc4e48b2f3ff04c0e4d899e18f files/shttpd.initd 1231 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCqCxtEZCkKN40op4RAhP7AKCt/nK43npOWSTMDSM+u90yIwgN2gCfUHVq -NdsRj9knWYcxz/tTFGB2uV0= -=o52/ ------END PGP SIGNATURE----- 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 } diff --git a/www-servers/shttpd/shttpd-1.21.ebuild b/www-servers/shttpd/shttpd-1.21.ebuild deleted file mode 100644 index c7d5d8a2f08f..000000000000 --- a/www-servers/shttpd/shttpd-1.21.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/shttpd-1.21.ebuild,v 1.3 2005/06/09 11:46:30 ka0ttic Exp $ - -inherit eutils toolchain-funcs - -MY_P="${P/-/_}" -DESCRIPTION="Small and embeddable HTTPD server with CGI support" -HOMEPAGE="http://shttpd.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~ppc ~x86" -IUSE="ssl" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )" -RDEPEND="${DEPEND} - app-misc/mime-types" - -src_unpack() { - mkdir ${S} - cp ${DISTDIR}/${MY_P}.c ${S} -} - -src_compile() { - local opts - CC=$(tc-getCC) - - if use ssl ; then - opts="-DWITH_SSL ${MY_P}.c -o ${PN} -lcrypto -lssl" - else - opts="${MY_P}.c -o ${PN}" - fi - - echo "${CC} ${opts}" - ${CC} ${opts} || die "compile failure" -} - -src_install() { - keepdir /var/log/shttpd - dosbin ${PN} || die - - insinto /etc/xinetd.d - newins ${FILESDIR}/${PN}.xinetd ${PN} || die - newinitd ${FILESDIR}/${PN}.initd ${PN} || die - newconfd ${FILESDIR}/${PN}.confd ${PN} || die -} - -pkg_postinst() { - enewgroup shttpd - enewuser shttpd -1 /bin/false /var/www/localhost/htdocs shttpd - einfo - einfo "You can run shttpd standalone or in xinetd mode." - einfo "Please read http://shttpd.sourceforge.net/ for more info!" - einfo -} diff --git a/www-servers/shttpd/shttpd-1.25.ebuild b/www-servers/shttpd/shttpd-1.25.ebuild new file mode 100644 index 000000000000..a6719b2a48c1 --- /dev/null +++ b/www-servers/shttpd/shttpd-1.25.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/shttpd/shttpd-1.25.ebuild,v 1.1 2005/07/01 04:49:16 ka0ttic Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="Small and embeddable HTTPD server with (optional) CGI support" +HOMEPAGE="http://shttpd.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="ssl cgi threads dmalloc" + +DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) + dmalloc? ( >=dev-libs/dmalloc-5.3.0 )" +RDEPEND="${DEPEND} + app-misc/mime-types" + +src_compile() { + local libs + CC=$(tc-getCC) + + if use ssl ; then + libs="${libs} -lcrypto -lssl" + append-flags -DWITH_SSL + fi + + if use dmalloc ; then + libs="${libs} -ldmalloc" + append-flags -DWITH_DMALLOC + fi + + use cgi || append-flags -DNO_CGI + use threads && append-flags -DMT + + append-flags -DCONFIG=\"/etc/${PN}/${PN}.conf\" -DWITH_PUT_AND_DELETE + echo "${CC} ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} ${libs}" + ${CC} ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} ${libs} || die "compile failure" +} + +src_install() { + keepdir /var/log/${PN} + dosbin ${PN} || die + doman ${PN}.1 || die + + insinto /etc/${PN} + doins ${FILESDIR}/${PN}.conf ${PN}.pem || die + + insinto /etc/xinetd.d + newins ${FILESDIR}/${PN}.xinetd ${PN} || die + newinitd ${FILESDIR}/${PN}.initd ${PN} || die + newconfd ${FILESDIR}/${PN}.confd ${PN} || die + + docinto embed + dodoc embed/* shttpd.c +} + +pkg_postinst() { + enewgroup shttpd + enewuser shttpd -1 /bin/false /var/www/localhost/htdocs shttpd + einfo + einfo "You can run shttpd standalone or in xinetd mode." + einfo "Don't forget to edit /etc/shttpd/shttpd.conf." + einfo "Please read http://shttpd.sourceforge.net/ for more info!" + einfo +} |