Author: pebender
Date: Sat May 30 20:30:32 2009
New Revision: 4860
Added:
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
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/web.pm
trunk/gar-minimyth/script/net/webfs/
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/rootfs/srv/www/cgi-bin/filesystem.cgi
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/mm_webpage.pm
trunk/gar-minimyth/script/utils/busybox/checksums
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.1.config
Log:
- Replaced webfsd with busybox's ftpd and httpd.
- Changed file system network access from using http to ftp.
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 Sat May 30
20:30:32 2009
@@ -129,6 +129,10 @@
in the kernel enough that the problem mentioned here has been fixed:
<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.
+
Modified mm_local_*
- Replaced tftp and wget with curl.
@@ -163,6 +167,7 @@
not linked to QtDBus.
Removed packages
+ Removed net/webfs.
Removed nvidia/nvidia-180.44.
Added packages
Modified: trunk/gar-minimyth/script/meta/minimyth/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/Makefile (original)
+++ trunk/gar-minimyth/script/meta/minimyth/Makefile Sat May 30 20:30:32
2009
@@ -74,7 +74,6 @@
utils/util-linux-ng \
X11/vdpinfo \
net/wakelan \
- net/webfs \
X11/x11vnc \
X11/xmacro \
xorg/xorg \
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 Sat May 30
20:30:32 2009
@@ -22,7 +22,7 @@
sensors \
acpi \
time \
- web \
+ inetd \
media \
audio \
video \
@@ -50,7 +50,7 @@
wiimote \
audio \
media \
- web \
+ inetd \
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
Sat May 30 20:30:32 2009
@@ -88,7 +88,6 @@
umount
vdpinfo
wakelan
-webfsd
X
x11vnc
xinit
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/httpd.conf
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/httpd.conf
Sat May 30 20:30:32 2009
@@ -0,0 +1,2 @@
+H:/srv/www
+I:index.html
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inetd.conf
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/inetd.conf
Sat May 30 20:30:32 2009
@@ -0,0 +1,2 @@
+...@mm_inetd_http_true@ftp stream tcp nowait root:root /usr/sbin/ftpd ftpd /
+...@mm_inetd_ftp_true@http stream tcp nowait httpd:httpd /usr/sbin/httpd
httpd -c /etc/httpd.conf -p 80 -i
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/inetd.pm
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/inetd.pm
Sat May 30 20:30:32 2009
@@ -0,0 +1,47 @@
+################################################################################
+# inetd
+################################################################################
+package init::inetd;
+
+use strict;
+use warnings;
+
+use File::Find ();
+use MiniMyth ();
+
+sub start
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ $minimyth->message_output('info', "starting inetd ...");
+
+ my $http_true = '';
+ my $ftp_true = '';
+ # Allow web access to the file system on machines that have security
disabled.
+ if ($minimyth->var_get('MM_SECURITY_ENABLED') ne 'no')
+ {
+ $ftp_true = '#';
+ }
+
+ $minimyth->file_replace_variable(
+ '/etc/inetd.conf',
+ { '@MM_INETD_HTTP_TRUE@' => $http_true,
+ '@MM_INETD_FTP_TRUE@' => $ftp_true });
+
+ system('/usr/sbin/inetd');
+
+ return 1;
+}
+
+sub stop
+{
+ my $self = shift;
+ my $minimyth = shift;
+
+ $minimyth->application_stop('xinetd', "stopping inetd ...");
+
+ 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
Sat May 30 20:30:32 2009
@@ -7,8 +7,8 @@
require "/srv/www/cgi-bin/mm_webpage.pm";
-my $minimyth = new MiniMyth;
-my $server_name = $ENV{'SERVER_NAME'};
+my $minimyth = new MiniMyth;
+my $http_host = $ENV{'HTTP_HOST'};
my @middle = ();
@@ -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="http://$server_name:8080/";>http://$server_name:8080/</a> to access
your MiniMyth system's filesystem.));
+ push(@middle, qq( You can use the URL <a
href="ftp://$http_host";>ftp://$http_host</a> to access your MiniMyth
system's filesystem.));
}
else
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/mm_webpage.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/mm_webpage.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/srv/www/cgi-bin/mm_webpage.pm
Sat May 30 20:30:32 2009
@@ -91,7 +91,7 @@
push(@page, q( alt="Valid CSS!" height="31"
width="88" /></a>));
push(@page, q( </div>));
push(@page, q( <div class="version">));
- push(@page, q( Last Updated on 2009-01-28));
+ push(@page, q( Last Updated on 2009-05-30));
push(@page, q( <br />));
push(@page, q(
< mailto : webmaster at minimyth dot org >));
push(@page, q( </div>));
Modified: trunk/gar-minimyth/script/utils/busybox/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/checksums (original)
+++ trunk/gar-minimyth/script/utils/busybox/checksums Sat May 30 20:30:32
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
-af87eb7c23f68580a29726790080d947 download/busybox-1.14.1.config
+a168d9e11759884149f4a6a2ffbe2838 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 Sat
May 30 20:30:32 2009
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.14.1
-# Sat May 30 20:00:49 2009
+# Sat May 30 20:14:22 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 is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
CONFIG_HOSTNAME=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_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_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP 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
-~----------~----~----~----~------~----~------~--~---
