# HG changeset patch # User Christophe Lincoln # Date 1394356266 -3600 # Node ID 307866ad479ea17ac88ceacde1304e8d5261d72d # Parent 301137af7e7e195e7db2cd6eb2e806a3feaba398 busybox: Add 404.html and up config file, CSS and HTML diff -r 301137af7e7e -r 307866ad479e busybox/stuff/httpd.conf --- a/busybox/stuff/httpd.conf Sun Mar 09 06:29:42 2014 +0000 +++ b/busybox/stuff/httpd.conf Sun Mar 09 10:11:06 2014 +0100 @@ -4,16 +4,16 @@ H:/var/www # Allow address. -A:0.0.0.0/0 +A:192.168. # File to open by default. #I:index.html # Path to the 404 error page. -#E404:/path/404.html +E404:/httpd/404.html -# Require user root, password root on urls starting with /adm/. -#/adm:root:root +# Require user root on urls starting with /adm/. use passwd system db +/adm:root:* # Reverse proxy. #P:/url:[http://]hostname[:port]/new/path diff -r 301137af7e7e -r 307866ad479e busybox/stuff/www/httpd/404.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/www/httpd/404.html Sun Mar 09 10:11:06 2014 +0100 @@ -0,0 +1,28 @@ + + + + 404 Not Found + + + + + + + + + +
+

404 Not Found

+ + +
+ + + + + + diff -r 301137af7e7e -r 307866ad479e busybox/stuff/www/index.html --- a/busybox/stuff/www/index.html Sun Mar 09 06:29:42 2014 +0000 +++ b/busybox/stuff/www/index.html Sun Mar 09 10:11:06 2014 +0100 @@ -31,7 +31,7 @@ diff -r 301137af7e7e -r 307866ad479e busybox/stuff/www/style.css --- a/busybox/stuff/www/style.css Sun Mar 09 06:29:42 2014 +0000 +++ b/busybox/stuff/www/style.css Sun Mar 09 10:11:06 2014 +0100 @@ -1,44 +1,138 @@ -/* CSS style for SliTaz GNU/Linux. */ +/* CSS style for SliTaz Network (minimal version) */ html { min-height: 102%; } - -body { - background: #ffffff; - color: black; - font: 13px sans-serif, vernada, arial; - margin: 0; - min-width: 640px; +body { font: 88% sans-serif, vernada, arial; margin: 0; } +h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; } +h1 a { color: #fff; text-decoration: none; } +h2 { color: #444; } h3 { color: #666; font-size: 140%; } +a { text-decoration: underline; color: #215090; } +a:hover { text-decoration: none; } +img { border: 0pt none; vertical-align: middle; } +pre { + overflow: auto; + font-size: 98%; } -a { text-decoration: underline; color: #215090; } -a:hover { text-decoration: none; color: blue; } -img { border: 0pt none; vertical-align: middle; } -h2 { color: #444; } -h3 { color: #666; font-size: 140%; } +/* Header */ #header { + background: #222; height: 40px; - background: #351a0a; - border-bottom: 8px solid #d66018; + border-bottom: 4px solid #afafaf; } #header h1 { margin: 0; - padding: 8px 0 0 8px; - color: white; - font-size: 20px; + padding: 8px 0 0 4px; + width: 250px; } +#header h1 a { + color: white; + text-decoration: none; + font-size: 20px; + font-style: italic; +} + +#header h1 a:hover { + color: #afafaf; +} + +/* Header links */ + +#network { + float: right; + padding: 14px 5px 0; + font-size: 12px; +} + +#network a, #network span { + padding: 0 4px; + color: #fff; + font-weight: bold; + text-decoration: none; +} + +#network a:hover, #network span { color: #afafaf; } + +/* Logo */ + +#logo { + background: url(images/logo.png) no-repeat left; + position: absolute; + float: left; + left: 0px; + top: 0px; + width: 40px; + height: 40px; +} + +/* Search */ + +#search { + position: absolute; + right: 20px; + top: 60px; +} + +#search input[type="text"] { + width: 200px; + + padding: 4px; + margin: 4px 0px; + font-size: 14px; + line-height: 1.2em; + background: #fefefe; + border: 2px solid #afafaf; + -webkit-appearance: none; + -webkit-padding-end: 12px; + -webkit-padding-start: 6px; +} + +/* Content */ + #content { - padding: 30px 80px; + margin: 40px auto; + padding: 0 20px; text-align: justify; + max-width: 720px; } +.box { + padding: 6px; + margin: 4px 0px; +} + +pre, .box { + background-color: #f8f8f8; + border: 1px solid #ddd; +} + +pre { + padding: 10px; +} + +pre img { margin: 4px 4px 4px 0px; } + +.error { color: red; } +.ok { color: green; } +.date { color: #666; font-size: 96%; } + +/* Round corner */ + +pre, img, .box, input[type="text"] { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} + +/* Footer */ + #footer { text-align: center; + padding: 20px; border-top: 1px solid #ddd; - padding: 40px; - color: #666; + font-size: 90%; } -#footer a { color: #666; padding: 0 2px; } +#footer a { padding: 0 2px; } diff -r 301137af7e7e -r 307866ad479e xorg-server-light/receipt --- a/xorg-server-light/receipt Sun Mar 09 06:29:42 2014 +0000 +++ b/xorg-server-light/receipt Sun Mar 09 10:11:06 2014 +0100 @@ -12,18 +12,29 @@ WEB_SITE="http://www.x.org/" WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" PROVIDE="xorg-server" -#HOST_ARCH="i486 arm" +HOST_ARCH="i486 arm" DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \ xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \ -xorg-xf86-input-evdev" +xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb bzip2" BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \ -xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev perl flex xorg-dev-proto" +xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \ +flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev" # Handle arch compilation case "$ARCH" in - arm) BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev \ -xorg-libXfont-dev libgcrypt-dev pixman-dev" ;; + arm) + #--disable-xf86vidmode + BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \ +xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \ +xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \ +xorg-compositeproto xorg-xf86dgaproto xorg-randrproto xorg-recordproto \ +xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \ +libxcb-dev bzip2-dev" + ARCH_ARGS="--disable-config-udev" + ARM_LIBS="/cross/$arch/sysroot/usr/lib" ;; + i?86) + ARCH_ARGS="--enable-config-udev" ;; esac # Rules to configure and make the package. @@ -38,7 +49,6 @@ --with-serverconfig-path=/etc/X11 \ --enable-install-setuid \ --enable-xorg \ - --enable-config-udev \ --disable-config-dbus \ --with-fontrootdir=/usr/share/fonts \ --with-os-name="SliTaz GNU/Linux" \ @@ -53,7 +63,11 @@ --disable-xnest \ --disable-xfbdev \ --disable-xv \ - $CONFIGURE_ARGS && +XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ +-lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ +XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \ +-lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \ + ${CONFIGURE_ARGS} ${ARCH_ARGS} && make && make install }