Update to v1.21

12 files changed, 257 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..04bf8f22f10a
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,34 @@
+pkgbase = mini_httpd
+	pkgdesc = A small and simple forking http server. CGI, SSL, auth, vhosts, ipv6.
+	pkgver = 1.21
+	pkgrel = 1
+	url = http://www.acme.com/software/mini_httpd/
+	install = mini_httpd.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	depends = openssl
+	backup = etc/mini_httpd.conf
+	source = http://www.acme.com/software/mini_httpd/mini_httpd-1.21.tar.gz
+	source = mini_httpd.service
+	source = mini_httpd_ssl.service
+	source = mini_httpd.logrotate
+	source = mini_httpd.conf
+	source = mini_httpd_ssl.conf
+	source = mini_httpd.pem
+	source = sample.cgi
+	source = sample_perl.cgi
+	source = LICENSE
+	md5sums = c7d18a2952eb44282366c127e6dc3870
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+
+pkgname = mini_httpd
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..0d40a9021ca6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,26 @@
+mini_httpd - small HTTP server
+
+Copyright © 1999,2000 by Jef Poskanzer <jef@mail.acme.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..b0351fd3fb01
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer: mrxx <mrxx at cyberhome dot at>
+# Contributor: bender02 at gmx dot com
+pkgname=mini_httpd
+pkgver=1.21
+pkgrel=1
+pkgdesc="A small and simple forking http server. CGI, SSL, auth, vhosts, ipv6."
+url="http://www.acme.com/software/mini_httpd/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('openssl')
+backup=('etc/mini_httpd.conf')
+source=("http://www.acme.com/software/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	'mini_httpd.service'
+	'mini_httpd_ssl.service'
+	'mini_httpd.logrotate'
+	'mini_httpd.conf'
+	'mini_httpd_ssl.conf'
+	'mini_httpd.pem'
+	'sample.cgi'
+	'sample_perl.cgi'
+	'LICENSE')
+
+md5sums=('c7d18a2952eb44282366c127e6dc3870'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+        'SKIP'
+	'SKIP'
+        'SKIP'
+	'SKIP'
+        'SKIP')
+
+install=mini_httpd.install
+
+prepare()
+{
+	cd "$pkgname-$pkgver"
+	sed -i  's|#SSL_|SSL_|' Makefile
+	sed -i  '/SSL_TREE/s|/usr/local/ssl|/usr|' Makefile
+	sed -i  's/htpasswd/mini_htpasswd/g' Makefile
+	sed -i  's/getline/my_getline/' htpasswd.c
+	sed -i  's/HAVE_INT64T/__int8_t_defined/g' mini_httpd.c
+	mv htpasswd.c mini_htpasswd.c
+	mv htpasswd.1 mini_htpasswd.1
+}
+
+build() {
+	cd "$pkgname-$pkgver"
+	make
+}
+
+package() {
+	cd "$pkgname-$pkgver"
+	install -Dm644 -t "${pkgdir}/etc/${pkgname}/" "${srcdir}/${pkgname}.conf" "${srcdir}/${pkgname}_ssl.conf"
+	install -Dm644 -t "${pkgdir}/usr/lib/systemd/system/" "${srcdir}/${pkgname}.service" "${srcdir}/${pkgname}_ssl.service"
+	install -Dm640 -t "${pkgdir}/etc/ssl/private/" "${srcdir}/${pkgname}.pem"
+	install -Dm755 -t "${pkgdir}/srv/http/" "${srcdir}/sample.cgi" "${srcdir}/sample_perl.cgi"
+	install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
+	install -D "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+	make BINDIR=${pkgdir}/usr/bin MANDIR=${pkgdir}/usr/share/man install
+}
diff --git a/mini_httpd.conf b/mini_httpd.conf
new file mode 100644
index 000000000000..1201ab4dbc9a
--- /dev/null
+++ b/mini_httpd.conf
@@ -0,0 +1,7 @@
+port=80
+dir=/srv/http
+cgipat=**.cgi
+charset=utf-8
+user=nobody
+logfile=/var/log/mini_httpd.log
+pidfile=/run/mini_httpd.pid
diff --git a/mini_httpd.install b/mini_httpd.install
new file mode 100644
index 000000000000..69b5db2b1d31
--- /dev/null
+++ b/mini_httpd.install
@@ -0,0 +1,17 @@
+post_install() {
+	[ ! -f /srv/http/index.html ] && echo "<html><body><h2>Server online.</h2></body></html>" >/srv/http/index.html
+	[ ! -f /srv/http/index.php ] && echo "<?php phpinfo(); ?>" >/srv/http/index.php
+	echo
+	echo "*** USAGE ***"
+	echo
+	echo "'systemctl start mini_httpd.service' starts the web server."
+	echo "'systemctl start mini_httpd_ssl.service' starts the web server in SSL mode."
+	echo "Web server root is /srv/http."
+	echo "Configuration files are in /etc/mini_httpd/ (man mini_httpd for options)"
+	echo "For directory protection, use mini_htpasswd ."
+	echo
+}
+
+post_upgrade() {
+	post_install
+}
diff --git a/mini_httpd.logrotate b/mini_httpd.logrotate
new file mode 100644
index 000000000000..8d1bc59ad013
--- /dev/null
+++ b/mini_httpd.logrotate
@@ -0,0 +1,13 @@
+/var/log/mini_httpd.log
+{
+        weekly
+        missingok
+        notifempty
+        compress
+	delaycompress
+	create 644 nobody nobody
+	sharedscripts
+	postrotate
+	  kill -HUP `cat /run/mini_httpd.pid 2>/dev/null` 2> /dev/null || true
+	endscript
+}
diff --git a/mini_httpd.pem b/mini_httpd.pem
new file mode 100644
index 000000000000..0fb960b02e25
--- /dev/null
+++ b/mini_httpd.pem
@@ -0,0 +1,49 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYwC3Iy3LFuES+
+ki4MBwm41Vorivj/6gTmY2IGbdGuFAhKjvopzrGHU6G8teG545iAg4bomNJnQ2Wm
+KP9ZAkYErCeQTtHh1DeTclnjP00oqyJ7pXOdef4szH0Et/nEZA+SXKQe+pLlAnnI
+kQogpwnfk6WOI3px0HIelxTaZMxWCjeQ/nyaH73S/1wU5IBQTr2ddie3ds+E1NUs
+WMwion4tWiaHrAaPSKo6HEO2+KKrc+an+HPMohZ7NDoYRap1WxDuVmvVeyuqGj71
+G8Etnfv12mkT0srTF99iCYjTQVMj6CCg7kJanrc7YZaRztFmaOcK03iTPxTAYIMX
++F+GyukXAgMBAAECggEAZ96/A3y9NhBAxuo2X71lcge6wkNFYRisblIEdWS2Ic7D
+eJfTKxy/gctv/xgbP8GxkSpfUcmhwdCFzcCxKsCuBj1exfWjKRKbHCu1Th9cg5wj
+3bq7bMlo+uOu28eTE2YLZLaUb/BqdUoCsE1Yeq27vAn1mTss5zoccArChmPmw1Yw
+VAaNVdy/fCAAqGkBoEIYxbk7j1khDgyNxcbnXcetReSnR1fL01sO0dP0EM3hDLKt
+KD2Rm1dluJxc1OMrHWGcsjhoSKJnNTw9FxaxvgYFcg4ulz5hnLGKt3wwNyK+he63
+QdB6vrcyaggZ+XzouG/YF5x/3c1XpQRRmRcZBDAqYQKBgQDGQir2w2ZtWktjjDEs
+NT3jtk7WZHZIpyTp22mNVa6Ep01QM7G92/TAXtwfhTtPk0SV0JqSPS3YvA2yEHpB
+4bEWCUCwrlXujXj80KjlnilpazxaAwW04C5/5OLVF48aUKHJNwVsV2yJy1nRbKXi
+ViVz86qABODH6O1SENN2a/MR0QKBgQDFPQZmJ+o+SQ/O34MXqsxq8d3s5CdfvtYO
+syp8luFs+L/WimTkx/26numYuhnSceWgkYt+Hoe/ts8jlQVl/Rk+RajR2sftYxsJ
+xUDe5kWpKxWJ/mVqw8iU3ahvjQLzQyJrp2wZNaZJ5l+3lEZcfiI7eGvPaypVZhKV
+h6eA6TReZwKBgCfmBwl0F3foVQWqn/a6nELoXINO4nMKmCYsDtjvplhx5uA+FwYT
+bvUL4hbB1EbWZ1YTDhhiEYjth4APSttZVS8PG6Ky4v5IIFIYl/Tl2IWrnBCtTQey
+mgkJAhFKVXVBRt3coc3E5kXw05mO2O9s0Mq9/dEXqjjxClmao0PQw7ERAoGAMR3B
+Oi82ZcxL43hFbN9biEYyvYsTQwSCyaZULjJkcH6BRyuvdElZJd/sy9uMEpvKUvHr
+iryPkW40pue1MHCWmKtAHwIcR0EmuogkX114e2f/NR3ko3GdwXRxPVYgJfPR3n0S
+rjRt9Hkp3M1PuDiwzZ5vOne1Uw7YEeR2EeQA5oECgYEAsyLCTeNCSGURRPIQYYgv
+VTrpBM3PlQDp4b/cnkWujGAsTnZbgtks4+VO0T7oQJul1d8F4LP/U1pPrWiREVKv
+EaDt7sHTI/Y2zFV90NNxzEAWpcovyGaQcHSUk7HCu3bOZfBe5RIsADBGZWhACTQk
+NrPBZBJEvO4F7fvlvbxS03E=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgIJALM9hNIIiKfOMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhCZXJrZWxleTEa
+MBgGA1UECgwRQUNNRSBMYWJvcmF0b3JpZXMwHhcNMTUwNzE0MDAzNDIwWhcNMzEw
+NzEwMDAzNDIwWjBRMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTER
+MA8GA1UEBwwIQmVya2VsZXkxGjAYBgNVBAoMEUFDTUUgTGFib3JhdG9yaWVzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmMAtyMtyxbhEvpIuDAcJuNVa
+K4r4/+oE5mNiBm3RrhQISo76Kc6xh1OhvLXhueOYgIOG6JjSZ0Nlpij/WQJGBKwn
+kE7R4dQ3k3JZ4z9NKKsie6VznXn+LMx9BLf5xGQPklykHvqS5QJ5yJEKIKcJ35Ol
+jiN6cdByHpcU2mTMVgo3kP58mh+90v9cFOSAUE69nXYnt3bPhNTVLFjMIqJ+LVom
+h6wGj0iqOhxDtviiq3Pmp/hzzKIWezQ6GEWqdVsQ7lZr1Xsrqho+9RvBLZ379dpp
+E9LK0xffYgmI00FTI+ggoO5CWp63O2GWkc7RZmjnCtN4kz8UwGCDF/hfhsrpFwID
+AQABo1AwTjAdBgNVHQ4EFgQUwSlSt1brS9kzm7p1LpTh5iKiJOYwHwYDVR0jBBgw
+FoAUwSlSt1brS9kzm7p1LpTh5iKiJOYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAQEAMLSFlpF1D0MkYiCvy+ZIKjtYKo50LOoglvTjJ4GwPBcVNtl2t3Cy
+S1Vgax/6MadUbOipfXlvbIjN3Rh1dMo09VasoSM03ayMU8k3MFfhpu0ShOW0NLFX
+dpCjG1UTG9BEVnGPlkjTx6GeEdgaaBgIafgS3cHNpLfPLQH1FIO12MUXFXR2wowV
+//jwdtAp9ZExcNEXkfLWdEGavF+kRF5wjvmBu9e8jGe3WwLPHoyb8zxUq26eQrBZ
+HDGIEVfovUH5EIYCcizkVl1jxL9E+WAj5R5cxyfXVMb8mo9iZws7K86Whq7/SIeL
+OSDHlT6v4ozJkdgUONSpG0IjpGzQjAhWmg==
+-----END CERTIFICATE-----
diff --git a/mini_httpd.service b/mini_httpd.service
new file mode 100644
index 000000000000..e60ead0fe074
--- /dev/null
+++ b/mini_httpd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=mini_httpd server
+After=syslog.target
+After=network.target
+
+[Service]
+PIDFile=/run/mini_httpd.pid
+ExecStart=/usr/bin/mini_httpd -C /etc/mini_httpd/mini_httpd.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mini_httpd_ssl.conf b/mini_httpd_ssl.conf
new file mode 100644
index 000000000000..2e25e602227e
--- /dev/null
+++ b/mini_httpd_ssl.conf
@@ -0,0 +1,9 @@
+port=443
+dir=/srv/http
+cgipat=**.cgi
+charset=utf-8
+user=nobody
+ssl
+certfile=/etc/ssl/private/mini_httpd.pem
+logfile=/var/log/mini_httpd.log
+pidfile=/run/mini_httpd.pid
diff --git a/mini_httpd_ssl.service b/mini_httpd_ssl.service
new file mode 100644
index 000000000000..d11a71295361
--- /dev/null
+++ b/mini_httpd_ssl.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=mini_httpd server
+After=syslog.target
+After=network.target
+
+[Service]
+PIDFile=/run/mini_httpd.pid
+ExecStart=/usr/bin/mini_httpd -C /etc/mini_httpd/mini_httpd_ssl.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sample.cgi b/sample.cgi
new file mode 100644
index 000000000000..c5d55967bc0f
--- /dev/null
+++ b/sample.cgi
@@ -0,0 +1,8 @@
+#!/bin/bash
+echo "Content-type: text/html"
+echo
+echo "<html>
+<body>
+<h2>CGI Bash Example</h2>
+</body>
+</html>"
diff --git a/sample_perl.cgi b/sample_perl.cgi
new file mode 100644
index 000000000000..9398fc772737
--- /dev/null
+++ b/sample_perl.cgi
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+print "Content-type: text/html\n\n";
+print <<htmlcode;
+
+<html>
+<body>
+<h2>CGI Perl Example</h2>
+</body>
+htmlcode