Author: pebender
Date: Sun May 31 15:15:16 2009
New Revision: 4863
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-dir.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-web.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/web.pm
trunk/gar-minimyth/script/net/lighttpd/ (props changed)
trunk/gar-minimyth/script/net/lighttpd/Makefile
trunk/gar-minimyth/script/net/lighttpd/checksums
trunk/gar-minimyth/script/net/lighttpd/files/
trunk/gar-minimyth/script/net/lighttpd/files/lighttpd-1.4.22-gar.patch
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/httpd.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inetd.conf
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/inetd.pm
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/configure.mk
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/filesystem.cgi
trunk/gar-minimyth/script/utils/busybox/checksums
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.1.config
Log:
- Replaced busybox httpd and ftpd with lighttpd.
- Added package net/lighttpd.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun May 31
15:15:16 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 66 (2009-05-30):
+Changes since 66 (2009-05-31):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082 and
@@ -130,8 +130,7 @@
<http://www.minimyth.org/forum/viewtopic.php?p=6322>
Modified network access
- - Replaced webfsd with busybox's ftpd and httpd.
- - Changed file system network access from using http to ftp.
+ - Replaced webfsd with lighttpd.
Modified mm_local_*
- Replaced tftp and wget with curl.
@@ -175,6 +174,7 @@
Added kernel-headers/linux-headers-2.6.30.
Added lib/libuuid.
Added lib/popt.
+ Added net/lighttpd.
Added net/vconfig.
Added nvidia/nvidia-180.51.
Added nvidia/nvidia-185.18.14.
Modified: trunk/gar-minimyth/script/meta/minimyth/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/Makefile (original)
+++ trunk/gar-minimyth/script/meta/minimyth/Makefile Sun May 31 15:15:16
2009
@@ -31,6 +31,7 @@
system/irclient \
system/irserver \
system/lcdproc \
+ net/lighttpd \
system/kbdd \
kernel/kernel \
fonts/liberation-fonts \
Modified: trunk/gar-minimyth/script/meta/minimyth/files/configure.mk
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/configure.mk (original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/configure.mk Sun May 31
15:15:16 2009
@@ -22,7 +22,7 @@
sensors \
acpi \
time \
- inetd \
+ web \
media \
audio \
video \
@@ -50,7 +50,7 @@
wiimote \
audio \
media \
- inetd \
+ web \
time \
acpi \
game \
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
Sun May 31 15:15:16 2009
@@ -36,6 +36,7 @@
kbdd
LCDd
ldconfig
+lighttpd
lircd
lsdvd
lsmod
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
Sun May 31 15:15:16 2009
@@ -10,6 +10,13 @@
mythtv/filters/
udev/cdrom_id
+# http
+mod_accesslog.so
+mod_cgi.so
+mod_dirlisting.so
+mod_indexfile.so
+mod_staticfile.so
+
# iconv
gconv/gconv-modules
gconv/CP1250.so
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-dir.conf
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-dir.conf
Sun May 31 15:15:16 2009
@@ -0,0 +1,60 @@
+# Configuration for file system access using http.
+
+server.modules = (
+ "mod_accesslog",
+)
+
+server.document-root = "/"
+
+server.port = 8080
+
+#server.username = "root"
+#server.groupname = "root"
+
+server.errorlog-use-syslog = "enable"
+
+dir-listing.activate = "enable"
+
+index-file.names = ()
+
+mimetype.assign = (
+ ".tar.bz2" => "application/x-bzip-compressed-tar",
+ ".bz2" => "application/x-bzip2",
+ ".cache" => "application/octet-stream",
+ ".conf" => "text/plain",
+ ".css" => "text/css",
+ ".gif" => "image/gif",
+ ".html" => "text/html",
+ ".mk" => "text/plain",
+ ".pid" => "text/plain",
+ ".pl" => "text/plain",
+ ".pm" => "text/plain",
+ ".png" => "image/png",
+ ".rules" => "text/plain",
+ ".sh" => "text/plain",
+ ".txt" => "text/plain",
+ # default.
+ "" => "application/octet-stream",
+)
+
+$HTTP["url"] =~ "^/etc/|/lib/udev/rules.d/|/srv/www/software/(base|build|
extras)/(licenses|versions)/" {
+ mimetype.assign = (
+ ".tar.bz2" => "application/x-bzip-compressed-tar",
+ ".bz2" => "application/x-bzip2",
+ ".cache" => "application/octet-stream",
+ ".conf" => "text/plain",
+ ".css" => "text/css",
+ ".gif" => "image/gif",
+ ".html" => "text/html",
+ ".mk" => "text/plain",
+ ".pid" => "text/plain",
+ ".pl" => "text/plain",
+ ".pm" => "text/plain",
+ ".png" => "image/png",
+ ".rules" => "text/plain",
+ ".sh" => "text/plain",
+ ".txt" => "text/plain",
+ # default.
+ "" => "text/plain",
+ )
+}
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-web.conf
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lighttpd-web.conf
Sun May 31 15:15:16 2009
@@ -0,0 +1,63 @@
+# Configuration for web interface.
+
+server.modules = (
+ "mod_accesslog",
+ "mod_cgi"
+)
+
+server.document-root = "/srv/www"
+
+server.port = 80
+
+server.username = "httpd"
+server.groupname = "httpd"
+
+server.errorlog-use-syslog = "enable"
+
+index-file.names = ( "index.html" )
+
+mimetype.assign = (
+ ".tar.bz2" => "application/x-bzip-compressed-tar",
+ ".bz2" => "application/x-bzip2",
+ ".cache" => "application/octet-stream",
+ ".conf" => "text/plain",
+ ".css" => "text/css",
+ ".gif" => "image/gif",
+ ".html" => "text/html",
+ ".mk" => "text/plain",
+ ".pid" => "text/plain",
+ ".pl" => "text/plain",
+ ".pm" => "text/plain",
+ ".png" => "image/png",
+ ".rules" => "text/plain",
+ ".sh" => "text/plain",
+ ".txt" => "text/plain",
+ # default.
+ "" => "application/octet-stream",
+)
+
+$HTTP["url"] =~ "^/software/(base|build|extras)/licenses/" {
+ mimetype.assign = (
+ ".tar.bz2" => "application/x-bzip-compressed-tar",
+ ".bz2" => "application/x-bzip2",
+ ".cache" => "application/octet-stream",
+ ".conf" => "text/plain",
+ ".css" => "text/css",
+ ".gif" => "image/gif",
+ ".html" => "text/html",
+ ".mk" => "text/plain",
+ ".pid" => "text/plain",
+ ".pl" => "text/plain",
+ ".pm" => "text/plain",
+ ".png" => "image/png",
+ ".rules" => "text/plain",
+ ".sh" => "text/plain",
+ ".txt" => "text/plain",
+ # default.
+ "" => "text/plain",
+ )
+}
+
+cgi.assign = (
+ ".cgi" => ""
+)
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/web.pm
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/web.pm
Sun May 31 15:15:16 2009
@@ -0,0 +1,42 @@
+################################################################################
+# web
+################################################################################
+package init::web;
+
+use strict;
+use warnings;
+
+use File::Find ();
+use MiniMyth ();
+
+sub start
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ $minimyth->message_output('info', "starting web server ...");
+
+ # Web page.
+ system(qq(/usr/sbin/lighttpd -f /etc/lighttpd-web.conf));
+
+ # Allow web access to the file system on machines that have security
disabled.
+ # It is run as root in order to provide access to all files.
+ if ($minimyth->var_get('MM_SECURITY_ENABLED') eq 'no')
+ {
+ system(qq(/usr/sbin/lighttpd -f /etc/lighttpd-dir.conf));
+ }
+
+ return 1;
+}
+
+sub stop
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ $minimyth->application_stop('lighttpd', "stopping web server ...");
+
+ return 1;
+}
+
+1;
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/filesystem.cgi
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/filesystem.cgi
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/filesystem.cgi
Sun May 31 15:15:16 2009
@@ -16,7 +16,7 @@
push(@middle, q( <p>));
if ($minimyth->var_get('MM_SECURITY_ENABLED') eq 'no')
{
- push(@middle, qq( You can use the URL <a
href="ftp://$http_host";>ftp://$http_host</a> to access your MiniMyth
system's filesystem.));
+ push(@middle, qq( You can use the URL <a
href="http://$http_host:8080/";>http://$http_host:8080/</a> to access your
MiniMyth system's filesystem.));
}
else
{
Added: trunk/gar-minimyth/script/net/lighttpd/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/net/lighttpd/Makefile Sun May 31 15:15:16 2009
@@ -0,0 +1,83 @@
+GARNAME = lighttpd
+GARVERSION = 1.4.22
+CATEGORIES = net
+MASTER_SITES = http://www.lighttpd.net/download/
+DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES = $(DISTNAME)-gar.patch
+LICENSE = BSD_3_Clause
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c lib/pcre
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
+ --disable-static \
+ --enable-shared \
+ --enable-lfs \
+ --disable-ipv6 \
+ --with-gnu-ld \
+ --without-mysql \
+ --without-ldap \
+ --without-attr \
+ --without-valgrind \
+ --without-openssl \
+ --without-kerberos5 \
+ --with-pcre \
+ --without-zlib \
+ --without-bzip2 \
+ --without-fam \
+ --without-webdav-props \
+ --without-webdav-locks \
+ --without-gdbm \
+ --without-memcache \
+ --without-lua
+CONFIGURE_ENV = \
+ PCRECONFIG="$(build_DESTDIR)$(build_bindir)/pkg-config libpcre"
+
+include ../../gar.mk
+
+pre-configure:
+ @cd $(WORKSRC) ; autoreconf --verbose --install --force
+ @$(call FIX_LIBTOOL,$(WORKSRC)/configure)
+ @$(MAKECOOKIE)
+
+post-install:
+ @rm -f $(DESTDIR)$(libdir)/mod_access.la
+ @rm -f $(DESTDIR)$(libdir)/mod_accesslog.la
+ @rm -f $(DESTDIR)$(libdir)/mod_alias.la
+ @rm -f $(DESTDIR)$(libdir)/mod_auth.la
+ @rm -f $(DESTDIR)$(libdir)/mod_cgi.la
+ @rm -f $(DESTDIR)$(libdir)/mod_cml.la
+ @rm -f $(DESTDIR)$(libdir)/mod_compress.la
+ @rm -f $(DESTDIR)$(libdir)/mod_dirlisting.la
+ @rm -f $(DESTDIR)$(libdir)/mod_evasive.la
+ @rm -f $(DESTDIR)$(libdir)/mod_evhost.la
+ @rm -f $(DESTDIR)$(libdir)/mod_expire.la
+ @rm -f $(DESTDIR)$(libdir)/mod_extforward.la
+ @rm -f $(DESTDIR)$(libdir)/mod_fastcgi.la
+ @rm -f $(DESTDIR)$(libdir)/mod_flv_streaming.la
+ @rm -f $(DESTDIR)$(libdir)/mod_indexfile.la
+ @rm -f $(DESTDIR)$(libdir)/mod_magnet.la
+ @rm -f $(DESTDIR)$(libdir)/mod_mysql_vhost.la
+ @rm -f $(DESTDIR)$(libdir)/mod_proxy.la
+ @rm -f $(DESTDIR)$(libdir)/mod_redirect.la
+ @rm -f $(DESTDIR)$(libdir)/mod_rewrite.la
+ @rm -f $(DESTDIR)$(libdir)/mod_rrdtool.la
+ @rm -f $(DESTDIR)$(libdir)/mod_scgi.la
+ @rm -f $(DESTDIR)$(libdir)/mod_secdownload.la
+ @rm -f $(DESTDIR)$(libdir)/mod_setenv.la
+ @rm -f $(DESTDIR)$(libdir)/mod_simple_vhost.la
+ @rm -f $(DESTDIR)$(libdir)/mod_ssi.la
+ @rm -f $(DESTDIR)$(libdir)/mod_staticfile.la
+ @rm -f $(DESTDIR)$(libdir)/mod_status.la
+ @rm -f $(DESTDIR)$(libdir)/mod_trigger_b4_dl.la
+ @rm -f $(DESTDIR)$(libdir)/mod_userdir.la
+ @rm -f $(DESTDIR)$(libdir)/mod_usertrack.la
+ @rm -f $(DESTDIR)$(libdir)/mod_webdav.la
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/net/lighttpd/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/net/lighttpd/checksums Sun May 31 15:15:16
2009
@@ -0,0 +1,2 @@
+ed4ca3897eadf419c893b03fee53c982 download/lighttpd-1.4.22.tar.bz2
+c4f4e6798d01c4734b569f2c0b463910 download/lighttpd-1.4.22-gar.patch
Added:
trunk/gar-minimyth/script/net/lighttpd/files/lighttpd-1.4.22-gar.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/net/lighttpd/files/lighttpd-1.4.22-gar.patch
Sun May 31 15:15:16 2009
@@ -0,0 +1,24 @@
+diff -Naur lighttpd-1.4.22-old/configure lighttpd-1.4.22-new/configure
+--- lighttpd-1.4.22-old/configure 2009-02-17 00:58:51.000000000 -0800
++++ lighttpd-1.4.22-new/configure 2009-05-31 14:12:46.000000000 -0700
+@@ -24573,7 +24573,7 @@
+ { echo "$as_me:$LINENO: result: $WITH_PCRE" >&5
+ echo "${ECHO_T}$WITH_PCRE" >&6; }
+
+-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
++if test "$WITH_PCRE" != "no"; then
+ # Extract the first word of "pcre-config", so it can be a program name
with args.
+ set dummy pcre-config; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+diff -Naur lighttpd-1.4.22-old/configure.in
lighttpd-1.4.22-new/configure.in
+--- lighttpd-1.4.22-old/configure.in 2009-02-17 00:55:16.000000000 -0800
++++ lighttpd-1.4.22-new/configure.in 2009-05-31 14:13:30.000000000 -0700
+@@ -252,7 +252,7 @@
+ [WITH_PCRE=$withval],[WITH_PCRE=yes])
+ AC_MSG_RESULT([$WITH_PCRE])
+
+-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
++if test "$WITH_PCRE" != "no"; then
+ AC_PATH_PROG(PCRECONFIG, pcre-config)
+
+ if test x"$PCRECONFIG" != x; then
Modified: trunk/gar-minimyth/script/utils/busybox/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/checksums (original)
+++ trunk/gar-minimyth/script/utils/busybox/checksums Sun May 31 15:15:16
2009
@@ -2,4 +2,4 @@
6e4ee71f800d70d9b1ab4da4b1c09782
download/busybox-1.14.1-dhcp_options.patch
81e6ab7f1058db274797e57728db493c
download/busybox-1.14.1-dhcp_timezone.patch
ea8eb4c9335e415053d59e3a0b32489d
download/busybox-1.14.1-tftp_timeout.patch
-5c4d3589469de5c8594a66870d343c24 download/busybox-1.14.1.config
+995d7d3a9071f0ac2a5c2f8cec26ecd8 download/busybox-1.14.1.config
Modified:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.1.config
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.1.config
(original)
+++ trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.1.config Sun
May 31 15:15:16 2009
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.14.1
-# Sat May 30 20:14:22 2009
+# Sun May 31 10:56:04 2009
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -627,24 +627,24 @@
# CONFIG_DNSD is not set
# CONFIG_ETHER_WAKE is not set
# CONFIG_FAKEIDENTD is not set
-CONFIG_FTPD=y
-CONFIG_FEATURE_FTP_WRITE=y
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
CONFIG_HOSTNAME=y
-CONFIG_HTTPD=y
-CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_FEATURE_HTTPD_PROXY=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -661,7 +661,7 @@
# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
+# CONFIG_INETD is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
