Version bumped. Submitted in #32455.

6 files changed, 148 insertions, 4 deletions

diff --git a/net-www/mini_httpd/ChangeLog b/net-www/mini_httpd/ChangeLog
index 8167cd76dd8d..eb5e5b066a05 100644
--- a/net-www/mini_httpd/ChangeLog
+++ b/net-www/mini_httpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mini_httpd
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/ChangeLog,v 1.1 2003/03/04 06:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/ChangeLog,v 1.2 2003/11/02 15:39:48 mholzer Exp $
+
+*mini_httpd-1.18 (02 Nov 2003)
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org> mini_httpd-1.18.ebuild,
+  files/mini_httpd.conf.sample-1.18, files/mini_httpd.confd-1.18:
+  Version bumped. Submitted in #32455.
 
 *mini_httpd-1.17_beta1 (03 Mar 2003)
 
diff --git a/net-www/mini_httpd/Manifest b/net-www/mini_httpd/Manifest
index 51e2bc5ddb5f..24bbd4b022e3 100644
--- a/net-www/mini_httpd/Manifest
+++ b/net-www/mini_httpd/Manifest
@@ -1,10 +1,10 @@
-MD5 a1d569221f9f05a060a142d6e17d4f09 ChangeLog 392
+MD5 22a9495c3d2b59d89a8ca7a4bbd4c14d ChangeLog 605
 MD5 390437b89439128ffbf7e136bec73d6f mini_httpd-1.17_beta1.ebuild 2005
-MD5 e6643db3b57c82a4caaefff79ea35130 mini_httpd-1.18.ebuild 1894
+MD5 99e574ca727e1582f9895b62acc34e5e mini_httpd-1.18.ebuild 1887
 MD5 0a7617c2c08ec920ece4d2b412af270c files/digest-mini_httpd-1.17_beta1 71
 MD5 4999dd0e1f1fef19fee9d91e030157e7 files/mini_httpd.conf.sample 860
 MD5 ed4076d5cbddbca74574382aa02707f5 files/mini_httpd.confd 1146
 MD5 c4f55d73acba4d4cc93d951e945594f0 files/mini_httpd.init 877
 MD5 ee9ef5baa0e5a9f6c592593d84dcdc84 files/digest-mini_httpd-1.18 66
-MD5 9ed57d9af0f7957dc91f83b4d46fb9ac files/mini_httpd.confd-1.18 1288
+MD5 1f17075a6adb5c405ef8dfc95c524c5d files/mini_httpd.confd-1.18 1294
 MD5 09c10d40d61d041e03bc659690dd19c8 files/mini_httpd.conf.sample-1.18 886
diff --git a/net-www/mini_httpd/files/digest-mini_httpd-1.18 b/net-www/mini_httpd/files/digest-mini_httpd-1.18
new file mode 100644
index 000000000000..b02732dd9fbb
--- /dev/null
+++ b/net-www/mini_httpd/files/digest-mini_httpd-1.18
@@ -0,0 +1 @@
+MD5 7b98c81f7d8f4fd0924f37ad3c95c936 mini_httpd-1.18.tar.gz 41044
diff --git a/net-www/mini_httpd/files/mini_httpd.conf.sample-1.18 b/net-www/mini_httpd/files/mini_httpd.conf.sample-1.18
new file mode 100644
index 000000000000..ec14ac08d8f3
--- /dev/null
+++ b/net-www/mini_httpd/files/mini_httpd.conf.sample-1.18
@@ -0,0 +1,47 @@
+## /etc/mini_httpd.conf
+##
+## format is: key=value
+## see mini_httpd(8) for available KEYwords.
+
+## run in debug-mode?
+#debug
+
+## what interface to bind to?
+## (default is binding to any interface)
+#host=www.example.org
+port=8080
+user=nobody
+
+## CGI:
+##	?	match a single char
+##	*	matches any string excluding "/"
+##	**	matches any string including "/"
+##	separate multiple patterns with "|"
+#cgipat=**.sh|**.cgi
+
+## chroot:
+chroot
+#nochroot
+
+## data-dir (directory to use use inside a chroot -- see man-page)
+#data_dir=/foo/bar
+
+logfile=/var/log/mini_httpd.log
+pidfile=/var/run/mini_httpd.pid
+
+charset=iso-8859-1
+
+## useless setting (just modifies the http-header)
+## (see mini_httpd(8) and http://www.w3.org/P3P/ for more info)
+#p3p
+
+## virtual hosting:
+#vhost
+
+## cache-control: send this "max-age" in all HTTP-responses:
+#maxage=0
+
+## ssl:
+#nossl
+#ssl
+#certfile=/tmp/mini_httpd.pem
diff --git a/net-www/mini_httpd/files/mini_httpd.confd-1.18 b/net-www/mini_httpd/files/mini_httpd.confd-1.18
new file mode 100644
index 000000000000..16a669ac05ba
--- /dev/null
+++ b/net-www/mini_httpd/files/mini_httpd.confd-1.18
@@ -0,0 +1,28 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/files/mini_httpd.confd-1.18,v 1.1 2003/11/02 15:39:48 mholzer Exp $
+
+## Config file for /etc/init.d/mini_httpd
+
+## the startup-dir of mini_httpd is the docroot, so we specify it here
+## and the init-script does a "cd" prior to startup:
+#MINI_HTTPD_DOCROOT="/var/www/localhost"
+
+## There are 2 ways to configure mini_httpd:
+##	1) specify all params on the cmd-line
+##	2) use a config-file (and start with "-C <conf-file>")
+## Note: 1) and 2) can be mixed.
+##
+## We choose 1) here -- if you have a more complicated setup read
+## mini_httpd(8) for details on 2).
+
+MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log"
+
+## to add cgi-support you should switch over to a config-file, a sample can
+## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
+##     mini_httpd.conf.sample.gz
+## copy the sample to /etc/mini_httpd.conf and replace the MINI_HTTPD_OPTS-line
+## above by:
+##MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
+## poor-mans cgi-pattern (only use if you know what you are doing -- you have been warned)
+#MINI_HTTPD_OPTS="$MINI_HTTPD_OPS -c **.cgi|**.sh"
diff --git a/net-www/mini_httpd/mini_httpd-1.18.ebuild b/net-www/mini_httpd/mini_httpd-1.18.ebuild
new file mode 100644
index 000000000000..1fed6e13fe16
--- /dev/null
+++ b/net-www/mini_httpd/mini_httpd-1.18.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/mini_httpd-1.18.ebuild,v 1.1 2003/11/02 15:39:48 mholzer Exp $
+
+DESCRIPTION="Small forking webserver with optional ssl and ipv6 support"
+HOMEPAGE="http://www.acme.com/software/mini_httpd/"
+SRC_URI="http://www.acme.com/software/mini_httpd/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ssl ipv6"
+
+DEPEND="virtual/glibc
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${P}
+
+src_compile() {
+	## we need to hack a bit to have the correct install-dir -- no autoconf :(
+	mv Makefile Makefile.org
+	cat Makefile.org | sed -e "s@/usr/local/sbin@${D}/usr/sbin@; \
+		s@/usr/local/man@${D}/usr/share/man@; \
+		s@-mkdir -p \${BINDIR}@& \${MANDIR}/man8 \${MANDIR}/man1@" > \
+		Makefile || die "error rewriting Makefile"
+	rm -f Makefile.org
+
+	## for ssl-support we need another Makefile-patch:
+	if [ "$(use ssl)" ]; then
+		mv Makefile Makefile.org
+		cat Makefile.org | sed -e "s@^#\(SSL_TREE.*=\)\(.*$\)@\1 /usr@; \
+			s@^#\(SSL_DEFS.*$\)@\1@; \
+			s@^#\(SSL_INC.*$\)@\1@; \
+			s@^#\(SSL_LIBS.*$\)@\1@" > \
+			Makefile || die "error rewriting Makefile"
+		rm -f Makefile.org
+	fi
+
+	## ipv6-support: normally this is auto-detected at compile time ... so we
+	## need to force a bit ;)
+	if [ ! "$(use ipv6)" ]; then
+		sed -i 's@#define USE_IPV6@#undef USE_IPV6@' mini_httpd.c
+	fi
+	emake || die
+}
+
+src_install() {
+	make install || die
+	mv ${D}/usr/sbin/{,mini_}htpasswd
+	mv ${D}/usr/share/man/man1/{,mini_}htpasswd.1
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mini_httpd.init mini_httpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/mini_httpd.confd-${PV} mini_httpd
+	dodoc README
+	newdoc ${FILESDIR}/mini_httpd.conf.sample-${PV} mini_httpd.conf.sample
+}
+
+pkg_postinst() {
+	ewarn "Adjust MINI_HTTPD_DOCROOT in /etc/conf.d/mini_httpd !"
+}