From 51f3b7f5afe70b49a1e89ee41887f6bb2b1ba343 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 30 Jun 2007 17:21:34 +0000 Subject: [PATCH] QoS-Graphen wieder eingebaut. usbutils und which Paket gemacht. unbenoetigte Apache-Module werden nicht geladen. Net-SSLeay gefixt - DynDNS braucht das. Alsa-Module werden geladen. Java-paket verkleinert. Sambactrl gefixt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@652 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/httpd/conf.d/php4.conf | 2 +- config/httpd/loadmodule.conf | 68 +- config/httpd/mod_info.conf | 14 - config/httpd/mod_status.conf | 14 - config/rootfiles/common/Net_SSLeay | 148 ++-- config/rootfiles/common/apache2 | 2 - config/rootfiles/common/usbutils | 3 + config/rootfiles/packages/java | 1002 ++++++++++++------------- doc/packages-list.txt | 3 + html/cgi-bin/qos.cgi | 59 ++ lfs/usbutils | 81 ++ lfs/which | 79 ++ make.sh | 2 + src/initscripts/init.d/alsa | 9 +- src/install+setup/install/main.c | 8 +- src/install+setup/install/probehw.sh | 2 + src/install+setup/install/probenic.sh | 10 +- src/misc-progs/Makefile | 5 +- src/misc-progs/mpfirectrl.c | 40 + src/misc-progs/sambactrl.c | 6 +- src/paks/alsa/install.sh | 1 + 21 files changed, 896 insertions(+), 662 deletions(-) delete mode 100644 config/httpd/mod_info.conf delete mode 100644 config/httpd/mod_status.conf create mode 100644 config/rootfiles/common/usbutils create mode 100644 lfs/usbutils create mode 100644 lfs/which create mode 100644 src/misc-progs/mpfirectrl.c diff --git a/config/httpd/conf.d/php4.conf b/config/httpd/conf.d/php4.conf index f017bac51c..b831a490a5 100644 --- a/config/httpd/conf.d/php4.conf +++ b/config/httpd/conf.d/php4.conf @@ -1,4 +1,4 @@ - + AddType application/x-httpd-php .php3 AddType application/x-httpd-php .php4 AddType application/x-httpd-php .php diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf index c4d03528ae..16e26cf709 100644 --- a/config/httpd/loadmodule.conf +++ b/config/httpd/loadmodule.conf @@ -1,51 +1,51 @@ LoadModule authn_file_module /usr/lib/apache/mod_authn_file.so -LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so -LoadModule authn_anon_module /usr/lib/apache/mod_authn_anon.so -LoadModule authn_dbd_module /usr/lib/apache/mod_authn_dbd.so -LoadModule authn_default_module /usr/lib/apache/mod_authn_default.so +#LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so +#LoadModule authn_anon_module /usr/lib/apache/mod_authn_anon.so +#LoadModule authn_dbd_module /usr/lib/apache/mod_authn_dbd.so +#LoadModule authn_default_module /usr/lib/apache/mod_authn_default.so LoadModule authz_host_module /usr/lib/apache/mod_authz_host.so -LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so +#LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so -LoadModule authz_dbm_module /usr/lib/apache/mod_authz_dbm.so -LoadModule authz_owner_module /usr/lib/apache/mod_authz_owner.so -LoadModule authz_default_module /usr/lib/apache/mod_authz_default.so +#LoadModule authz_dbm_module /usr/lib/apache/mod_authz_dbm.so +#LoadModule authz_owner_module /usr/lib/apache/mod_authz_owner.so +#LoadModule authz_default_module /usr/lib/apache/mod_authz_default.so LoadModule auth_basic_module /usr/lib/apache/mod_auth_basic.so LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so #LoadModule dbd_module /usr/lib/apache/mod_dbd.so -LoadModule dumpio_module /usr/lib/apache/mod_dumpio.so -LoadModule ext_filter_module /usr/lib/apache/mod_ext_filter.so -LoadModule include_module /usr/lib/apache/mod_include.so -LoadModule filter_module /usr/lib/apache/mod_filter.so -LoadModule deflate_module /usr/lib/apache/mod_deflate.so +#LoadModule dumpio_module /usr/lib/apache/mod_dumpio.so +#LoadModule ext_filter_module /usr/lib/apache/mod_ext_filter.so +#LoadModule include_module /usr/lib/apache/mod_include.so +#LoadModule filter_module /usr/lib/apache/mod_filter.so +#LoadModule deflate_module /usr/lib/apache/mod_deflate.so LoadModule log_config_module /usr/lib/apache/mod_log_config.so -LoadModule log_forensic_module /usr/lib/apache/mod_log_forensic.so -LoadModule logio_module /usr/lib/apache/mod_logio.so +#LoadModule log_forensic_module /usr/lib/apache/mod_log_forensic.so +#LoadModule logio_module /usr/lib/apache/mod_logio.so LoadModule env_module /usr/lib/apache/mod_env.so -LoadModule mime_magic_module /usr/lib/apache/mod_mime_magic.so -LoadModule cern_meta_module /usr/lib/apache/mod_cern_meta.so -LoadModule expires_module /usr/lib/apache/mod_expires.so +#LoadModule mime_magic_module /usr/lib/apache/mod_mime_magic.so +#LoadModule cern_meta_module /usr/lib/apache/mod_cern_meta.so +#LoadModule expires_module /usr/lib/apache/mod_expires.so LoadModule headers_module /usr/lib/apache/mod_headers.so -LoadModule ident_module /usr/lib/apache/mod_ident.so -LoadModule usertrack_module /usr/lib/apache/mod_usertrack.so -LoadModule unique_id_module /usr/lib/apache/mod_unique_id.so +#LoadModule ident_module /usr/lib/apache/mod_ident.so +#LoadModule usertrack_module /usr/lib/apache/mod_usertrack.so +#LoadModule unique_id_module /usr/lib/apache/mod_unique_id.so LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so -LoadModule version_module /usr/lib/apache/mod_version.so +#LoadModule version_module /usr/lib/apache/mod_version.so LoadModule mime_module /usr/lib/apache/mod_mime.so -LoadModule dav_module /usr/lib/apache/mod_dav.so -LoadModule status_module /usr/lib/apache/mod_status.so +#LoadModule dav_module /usr/lib/apache/mod_dav.so +#LoadModule status_module /usr/lib/apache/mod_status.so LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so -LoadModule asis_module /usr/lib/apache/mod_asis.so -LoadModule info_module /usr/lib/apache/mod_info.so +#LoadModule asis_module /usr/lib/apache/mod_asis.so +#LoadModule info_module /usr/lib/apache/mod_info.so LoadModule cgi_module /usr/lib/apache/mod_cgi.so -LoadModule dav_fs_module /usr/lib/apache/mod_dav_fs.so -LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so -LoadModule negotiation_module /usr/lib/apache/mod_negotiation.so +#LoadModule dav_fs_module /usr/lib/apache/mod_dav_fs.so +#LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so +#LoadModule negotiation_module /usr/lib/apache/mod_negotiation.so LoadModule dir_module /usr/lib/apache/mod_dir.so -LoadModule imagemap_module /usr/lib/apache/mod_imagemap.so -LoadModule actions_module /usr/lib/apache/mod_actions.so -LoadModule speling_module /usr/lib/apache/mod_speling.so -LoadModule userdir_module /usr/lib/apache/mod_userdir.so +#LoadModule imagemap_module /usr/lib/apache/mod_imagemap.so +#LoadModule actions_module /usr/lib/apache/mod_actions.so +#LoadModule speling_module /usr/lib/apache/mod_speling.so +#LoadModule userdir_module /usr/lib/apache/mod_userdir.so LoadModule alias_module /usr/lib/apache/mod_alias.so LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so LoadModule ssl_module /usr/lib/apache/mod_ssl.so -LoadModule php4_module /usr/lib/apache/libphp4.so +#LoadModule php4_module /usr/lib/apache/libphp4.so diff --git a/config/httpd/mod_info.conf b/config/httpd/mod_info.conf deleted file mode 100644 index f19885b73f..0000000000 --- a/config/httpd/mod_info.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Allow remote server configuration reports, with the URL of -# http://servername/server-info (requires that mod_info.c be loaded). -# -# see http://httpd.apache.org/docs-2.0/mod/mod_info.html -# - - - SetHandler server-info - Order deny,allow - Deny from all - Allow from localhost - - diff --git a/config/httpd/mod_status.conf b/config/httpd/mod_status.conf deleted file mode 100644 index dc7312227b..0000000000 --- a/config/httpd/mod_status.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Allow server status reports generated by mod_status, -# with the URL of http://servername/server-status -# -# see http://httpd.apache.org/docs-2.0/mod/mod_status.html -# - - - SetHandler server-status - Order deny,allow - Deny from all - Allow from localhost - - diff --git a/config/rootfiles/common/Net_SSLeay b/config/rootfiles/common/Net_SSLeay index 26e7232a3b..c5d46600ad 100644 --- a/config/rootfiles/common/Net_SSLeay +++ b/config/rootfiles/common/Net_SSLeay @@ -7,79 +7,79 @@ usr/lib/perl5/site_perl/5.8.8/i586-linux/Net/SSLeay/Handle.pm #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/SSLeay.bs usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/SSLeay.so usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/autosplit.ix -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/debug_read.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https2.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx2.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/dump_peer_certificate.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/http_cat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/https_cat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/httpx_cat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/make_form.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/make_headers.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/new_x_ctx.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/open_proxy_tcp_connection.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/open_tcp_connection.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx3.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx4.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/randomize.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_cert_and_key.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_proxy.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_server_cert_and_key.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_CRLF.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_all.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_until.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_write_CRLF.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_write_all.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/sslcat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_CRLF.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_all.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_until.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_write_CRLF.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_write_all.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcpcat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcpxcat.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_X509_lookup.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_nothing.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_read.al -#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_write.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/debug_read.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https2.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_https4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx2.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/do_httpx4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/dump_peer_certificate.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_http4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_https4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/get_httpx4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_http4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_https4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/head_httpx4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/http_cat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/https_cat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/httpx_cat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/make_form.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/make_headers.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/new_x_ctx.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/open_proxy_tcp_connection.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/open_tcp_connection.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_http4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_https4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/post_httpx4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_http4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_https4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx3.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/put_httpx4.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/randomize.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_cert_and_key.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_proxy.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/set_server_cert_and_key.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_CRLF.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_all.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_read_until.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_write_CRLF.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/ssl_write_all.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/sslcat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_CRLF.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_all.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_read_until.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_write_CRLF.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcp_write_all.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcpcat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/tcpxcat.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_X509_lookup.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_nothing.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_read.al +usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/SSLeay/want_write.al #usr/share/man/man3/Net::SSLeay.3 #usr/share/man/man3/Net::SSLeay::Handle.3 diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 9dbeeeee9c..a6abb6f734 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1247,9 +1247,7 @@ etc/httpd/conf/global.conf etc/httpd/conf/hostname.conf etc/httpd/conf/listen.conf etc/httpd/conf/loadmodule.conf -etc/httpd/conf/mod_info.conf etc/httpd/conf/mod_log_config.conf -etc/httpd/conf/mod_status.conf etc/httpd/conf/server-tuning.conf etc/httpd/conf/ssl-global.conf etc/httpd/conf/uid.conf diff --git a/config/rootfiles/common/usbutils b/config/rootfiles/common/usbutils new file mode 100644 index 0000000000..8699f573eb --- /dev/null +++ b/config/rootfiles/common/usbutils @@ -0,0 +1,3 @@ +#usr/man/man8/lsusb.8 +usr/sbin/lsusb +usr/sbin/update-usbids diff --git a/config/rootfiles/packages/java b/config/rootfiles/packages/java index 820e7f1d06..806cf4e3e9 100644 --- a/config/rootfiles/packages/java +++ b/config/rootfiles/packages/java @@ -22,7 +22,7 @@ usr/java/javaws/javaws #usr/java/lib usr/java/lib/applet #usr/java/lib/audio -usr/java/lib/audio/soundbank.gm +#usr/java/lib/audio/soundbank.gm usr/java/lib/charsets.jar usr/java/lib/classlist #usr/java/lib/cmm @@ -115,7 +115,7 @@ usr/java/lib/i386/libunpack.so usr/java/lib/i386/libverify.so usr/java/lib/i386/libzip.so #usr/java/lib/i386/motif21 -usr/java/lib/i386/motif21/libmawt.so +#usr/java/lib/i386/motif21/libmawt.so usr/java/lib/i386/native_threads usr/java/lib/i386/native_threads/libhpi.so #usr/java/lib/i386/server @@ -129,93 +129,93 @@ usr/java/lib/im/indicim.jar usr/java/lib/im/thaiim.jar #usr/java/lib/images #usr/java/lib/images/cursors -usr/java/lib/images/cursors/cursors.properties -usr/java/lib/images/cursors/invalid32x32.gif -usr/java/lib/images/cursors/motif_CopyDrop32x32.gif -usr/java/lib/images/cursors/motif_CopyNoDrop32x32.gif -usr/java/lib/images/cursors/motif_LinkDrop32x32.gif -usr/java/lib/images/cursors/motif_LinkNoDrop32x32.gif -usr/java/lib/images/cursors/motif_MoveDrop32x32.gif -usr/java/lib/images/cursors/motif_MoveNoDrop32x32.gif +#usr/java/lib/images/cursors/cursors.properties +#usr/java/lib/images/cursors/invalid32x32.gif +#usr/java/lib/images/cursors/motif_CopyDrop32x32.gif +#usr/java/lib/images/cursors/motif_CopyNoDrop32x32.gif +#usr/java/lib/images/cursors/motif_LinkDrop32x32.gif +#usr/java/lib/images/cursors/motif_LinkNoDrop32x32.gif +#usr/java/lib/images/cursors/motif_MoveDrop32x32.gif +#usr/java/lib/images/cursors/motif_MoveNoDrop32x32.gif #usr/java/lib/images/icons -usr/java/lib/images/icons/sun-java.png -usr/java/lib/images/icons/sun-java_HighContrast.png -usr/java/lib/images/icons/sun-java_HighContrastInverse.png -usr/java/lib/images/icons/sun-java_LowContrast.png +#usr/java/lib/images/icons/sun-java.png +#usr/java/lib/images/icons/sun-java_HighContrast.png +#usr/java/lib/images/icons/sun-java_HighContrastInverse.png +#usr/java/lib/images/icons/sun-java_LowContrast.png #usr/java/lib/javaws usr/java/lib/javaws.jar #usr/java/lib/javaws/Java1.5.ico usr/java/lib/javaws/messages.properties -usr/java/lib/javaws/messages_de.properties -usr/java/lib/javaws/messages_es.properties -usr/java/lib/javaws/messages_fr.properties -usr/java/lib/javaws/messages_it.properties -usr/java/lib/javaws/messages_ja.properties -usr/java/lib/javaws/messages_ko.properties -usr/java/lib/javaws/messages_sv.properties -usr/java/lib/javaws/messages_zh_CN.properties -usr/java/lib/javaws/messages_zh_HK.properties -usr/java/lib/javaws/messages_zh_TW.properties -usr/java/lib/javaws/miniSplash.jpg +#usr/java/lib/javaws/messages_de.properties +#usr/java/lib/javaws/messages_es.properties +#usr/java/lib/javaws/messages_fr.properties +#usr/java/lib/javaws/messages_it.properties +#usr/java/lib/javaws/messages_ja.properties +#usr/java/lib/javaws/messages_ko.properties +#usr/java/lib/javaws/messages_sv.properties +#usr/java/lib/javaws/messages_zh_CN.properties +#usr/java/lib/javaws/messages_zh_HK.properties +#usr/java/lib/javaws/messages_zh_TW.properties +#usr/java/lib/javaws/miniSplash.jpg usr/java/lib/jce.jar usr/java/lib/jsse.jar usr/java/lib/jvm.hprof.txt #usr/java/lib/locale -usr/java/lib/locale/de -usr/java/lib/locale/de/LC_MESSAGES -usr/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/es -usr/java/lib/locale/es/LC_MESSAGES -usr/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/fr -usr/java/lib/locale/fr/LC_MESSAGES -usr/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/it -usr/java/lib/locale/it/LC_MESSAGES -usr/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/ja -usr/java/lib/locale/ja/LC_MESSAGES -usr/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/ko -usr/java/lib/locale/ko.UTF-8 -usr/java/lib/locale/ko.UTF-8/LC_MESSAGES -usr/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/ko/LC_MESSAGES -usr/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/sv -usr/java/lib/locale/sv/LC_MESSAGES -usr/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/zh -usr/java/lib/locale/zh.GBK -usr/java/lib/locale/zh.GBK/LC_MESSAGES -usr/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/zh/LC_MESSAGES -usr/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/zh_HK.BIG5HK -usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES -usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/zh_TW -usr/java/lib/locale/zh_TW.BIG5 -usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES -usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/locale/zh_TW/LC_MESSAGES -usr/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/de +#usr/java/lib/locale/de/LC_MESSAGES +#usr/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/es +#usr/java/lib/locale/es/LC_MESSAGES +#usr/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/fr +#usr/java/lib/locale/fr/LC_MESSAGES +#usr/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/it +#usr/java/lib/locale/it/LC_MESSAGES +#usr/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/ja +#usr/java/lib/locale/ja/LC_MESSAGES +#usr/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/ko +#usr/java/lib/locale/ko.UTF-8 +#usr/java/lib/locale/ko.UTF-8/LC_MESSAGES +#usr/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/ko/LC_MESSAGES +#usr/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/sv +#usr/java/lib/locale/sv/LC_MESSAGES +#usr/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/zh +#usr/java/lib/locale/zh.GBK +#usr/java/lib/locale/zh.GBK/LC_MESSAGES +#usr/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/zh/LC_MESSAGES +#usr/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/zh_HK.BIG5HK +#usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES +#usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/zh_TW +#usr/java/lib/locale/zh_TW.BIG5 +#usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES +#usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo +#usr/java/lib/locale/zh_TW/LC_MESSAGES +#usr/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo usr/java/lib/logging.properties usr/java/lib/management -usr/java/lib/management/jmxremote.access -usr/java/lib/management/jmxremote.password.template -usr/java/lib/management/management.properties -usr/java/lib/management/snmp.acl.template +#usr/java/lib/management/jmxremote.access +#usr/java/lib/management/jmxremote.password.template +#usr/java/lib/management/management.properties +#usr/java/lib/management/snmp.acl.template usr/java/lib/net.properties -usr/java/lib/oblique-fonts -usr/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf -usr/java/lib/oblique-fonts/LucidaSansOblique.ttf -usr/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf -usr/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf -usr/java/lib/oblique-fonts/fonts.dir +#usr/java/lib/oblique-fonts +#usr/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf +#usr/java/lib/oblique-fonts/LucidaSansOblique.ttf +#usr/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf +#usr/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf +#usr/java/lib/oblique-fonts/fonts.dir usr/java/lib/plugin.jar -usr/java/lib/psfont.properties.ja -usr/java/lib/psfontj2d.properties +#usr/java/lib/psfont.properties.ja +#usr/java/lib/psfontj2d.properties usr/java/lib/rt.jar usr/java/lib/security usr/java/lib/security/US_export_policy.jar @@ -224,431 +224,431 @@ usr/java/lib/security/java.policy usr/java/lib/security/java.security usr/java/lib/security/javaws.policy usr/java/lib/security/local_policy.jar -usr/java/lib/sound.properties -usr/java/lib/zi -usr/java/lib/zi/Africa -usr/java/lib/zi/Africa/Abidjan -usr/java/lib/zi/Africa/Accra -usr/java/lib/zi/Africa/Addis_Ababa -usr/java/lib/zi/Africa/Algiers -usr/java/lib/zi/Africa/Asmera -usr/java/lib/zi/Africa/Bamako -usr/java/lib/zi/Africa/Bangui -usr/java/lib/zi/Africa/Banjul -usr/java/lib/zi/Africa/Bissau -usr/java/lib/zi/Africa/Blantyre -usr/java/lib/zi/Africa/Brazzaville -usr/java/lib/zi/Africa/Bujumbura -usr/java/lib/zi/Africa/Cairo -usr/java/lib/zi/Africa/Casablanca -usr/java/lib/zi/Africa/Ceuta -usr/java/lib/zi/Africa/Conakry -usr/java/lib/zi/Africa/Dakar -usr/java/lib/zi/Africa/Dar_es_Salaam -usr/java/lib/zi/Africa/Djibouti -usr/java/lib/zi/Africa/Douala -usr/java/lib/zi/Africa/El_Aaiun -usr/java/lib/zi/Africa/Freetown -usr/java/lib/zi/Africa/Gaborone -usr/java/lib/zi/Africa/Harare -usr/java/lib/zi/Africa/Johannesburg -usr/java/lib/zi/Africa/Kampala -usr/java/lib/zi/Africa/Khartoum -usr/java/lib/zi/Africa/Kigali -usr/java/lib/zi/Africa/Kinshasa -usr/java/lib/zi/Africa/Lagos -usr/java/lib/zi/Africa/Libreville -usr/java/lib/zi/Africa/Lome -usr/java/lib/zi/Africa/Luanda -usr/java/lib/zi/Africa/Lubumbashi -usr/java/lib/zi/Africa/Lusaka -usr/java/lib/zi/Africa/Malabo -usr/java/lib/zi/Africa/Maputo -usr/java/lib/zi/Africa/Maseru -usr/java/lib/zi/Africa/Mbabane -usr/java/lib/zi/Africa/Mogadishu -usr/java/lib/zi/Africa/Monrovia -usr/java/lib/zi/Africa/Nairobi -usr/java/lib/zi/Africa/Ndjamena -usr/java/lib/zi/Africa/Niamey -usr/java/lib/zi/Africa/Nouakchott -usr/java/lib/zi/Africa/Ouagadougou -usr/java/lib/zi/Africa/Porto-Novo -usr/java/lib/zi/Africa/Sao_Tome -usr/java/lib/zi/Africa/Tripoli -usr/java/lib/zi/Africa/Tunis -usr/java/lib/zi/Africa/Windhoek -usr/java/lib/zi/America -usr/java/lib/zi/America/Adak -usr/java/lib/zi/America/Anchorage -usr/java/lib/zi/America/Anguilla -usr/java/lib/zi/America/Antigua -usr/java/lib/zi/America/Araguaina -usr/java/lib/zi/America/Argentina -usr/java/lib/zi/America/Argentina/Buenos_Aires -usr/java/lib/zi/America/Argentina/Catamarca -usr/java/lib/zi/America/Argentina/Cordoba -usr/java/lib/zi/America/Argentina/Jujuy -usr/java/lib/zi/America/Argentina/La_Rioja -usr/java/lib/zi/America/Argentina/Mendoza -usr/java/lib/zi/America/Argentina/Rio_Gallegos -usr/java/lib/zi/America/Argentina/San_Juan -usr/java/lib/zi/America/Argentina/Tucuman -usr/java/lib/zi/America/Argentina/Ushuaia -usr/java/lib/zi/America/Aruba -usr/java/lib/zi/America/Asuncion -usr/java/lib/zi/America/Bahia -usr/java/lib/zi/America/Barbados -usr/java/lib/zi/America/Belem -usr/java/lib/zi/America/Belize -usr/java/lib/zi/America/Boa_Vista -usr/java/lib/zi/America/Bogota -usr/java/lib/zi/America/Boise -usr/java/lib/zi/America/Cambridge_Bay -usr/java/lib/zi/America/Campo_Grande -usr/java/lib/zi/America/Cancun -usr/java/lib/zi/America/Caracas -usr/java/lib/zi/America/Cayenne -usr/java/lib/zi/America/Cayman -usr/java/lib/zi/America/Chicago -usr/java/lib/zi/America/Chihuahua -usr/java/lib/zi/America/Coral_Harbour -usr/java/lib/zi/America/Costa_Rica -usr/java/lib/zi/America/Cuiaba -usr/java/lib/zi/America/Curacao -usr/java/lib/zi/America/Danmarkshavn -usr/java/lib/zi/America/Dawson -usr/java/lib/zi/America/Dawson_Creek -usr/java/lib/zi/America/Denver -usr/java/lib/zi/America/Detroit -usr/java/lib/zi/America/Dominica -usr/java/lib/zi/America/Edmonton -usr/java/lib/zi/America/Eirunepe -usr/java/lib/zi/America/El_Salvador -usr/java/lib/zi/America/Fortaleza -usr/java/lib/zi/America/Glace_Bay -usr/java/lib/zi/America/Godthab -usr/java/lib/zi/America/Goose_Bay -usr/java/lib/zi/America/Grand_Turk -usr/java/lib/zi/America/Grenada -usr/java/lib/zi/America/Guadeloupe -usr/java/lib/zi/America/Guatemala -usr/java/lib/zi/America/Guayaquil -usr/java/lib/zi/America/Guyana -usr/java/lib/zi/America/Halifax -usr/java/lib/zi/America/Havana -usr/java/lib/zi/America/Hermosillo -usr/java/lib/zi/America/Indiana -usr/java/lib/zi/America/Indiana/Indianapolis -usr/java/lib/zi/America/Indiana/Knox -usr/java/lib/zi/America/Indiana/Marengo -usr/java/lib/zi/America/Indiana/Vevay -usr/java/lib/zi/America/Inuvik -usr/java/lib/zi/America/Iqaluit -usr/java/lib/zi/America/Jamaica -usr/java/lib/zi/America/Juneau -usr/java/lib/zi/America/Kentucky -usr/java/lib/zi/America/Kentucky/Louisville -usr/java/lib/zi/America/Kentucky/Monticello -usr/java/lib/zi/America/La_Paz -usr/java/lib/zi/America/Lima -usr/java/lib/zi/America/Los_Angeles -usr/java/lib/zi/America/Maceio -usr/java/lib/zi/America/Managua -usr/java/lib/zi/America/Manaus -usr/java/lib/zi/America/Martinique -usr/java/lib/zi/America/Mazatlan -usr/java/lib/zi/America/Menominee -usr/java/lib/zi/America/Merida -usr/java/lib/zi/America/Mexico_City -usr/java/lib/zi/America/Miquelon -usr/java/lib/zi/America/Monterrey -usr/java/lib/zi/America/Montevideo -usr/java/lib/zi/America/Montreal -usr/java/lib/zi/America/Montserrat -usr/java/lib/zi/America/Nassau -usr/java/lib/zi/America/New_York -usr/java/lib/zi/America/Nipigon -usr/java/lib/zi/America/Nome -usr/java/lib/zi/America/Noronha -usr/java/lib/zi/America/North_Dakota -usr/java/lib/zi/America/North_Dakota/Center -usr/java/lib/zi/America/Panama -usr/java/lib/zi/America/Pangnirtung -usr/java/lib/zi/America/Paramaribo -usr/java/lib/zi/America/Phoenix -usr/java/lib/zi/America/Port-au-Prince -usr/java/lib/zi/America/Port_of_Spain -usr/java/lib/zi/America/Porto_Velho -usr/java/lib/zi/America/Puerto_Rico -usr/java/lib/zi/America/Rainy_River -usr/java/lib/zi/America/Rankin_Inlet -usr/java/lib/zi/America/Recife -usr/java/lib/zi/America/Regina -usr/java/lib/zi/America/Rio_Branco -usr/java/lib/zi/America/Santiago -usr/java/lib/zi/America/Santo_Domingo -usr/java/lib/zi/America/Sao_Paulo -usr/java/lib/zi/America/Scoresbysund -usr/java/lib/zi/America/St_Johns -usr/java/lib/zi/America/St_Kitts -usr/java/lib/zi/America/St_Lucia -usr/java/lib/zi/America/St_Thomas -usr/java/lib/zi/America/St_Vincent -usr/java/lib/zi/America/Swift_Current -usr/java/lib/zi/America/Tegucigalpa -usr/java/lib/zi/America/Thule -usr/java/lib/zi/America/Thunder_Bay -usr/java/lib/zi/America/Tijuana -usr/java/lib/zi/America/Toronto -usr/java/lib/zi/America/Tortola -usr/java/lib/zi/America/Vancouver -usr/java/lib/zi/America/Whitehorse -usr/java/lib/zi/America/Winnipeg -usr/java/lib/zi/America/Yakutat -usr/java/lib/zi/America/Yellowknife -usr/java/lib/zi/Antarctica -usr/java/lib/zi/Antarctica/Casey -usr/java/lib/zi/Antarctica/Davis -usr/java/lib/zi/Antarctica/DumontDUrville -usr/java/lib/zi/Antarctica/Mawson -usr/java/lib/zi/Antarctica/McMurdo -usr/java/lib/zi/Antarctica/Palmer -usr/java/lib/zi/Antarctica/Rothera -usr/java/lib/zi/Antarctica/Syowa -usr/java/lib/zi/Antarctica/Vostok -usr/java/lib/zi/Asia -usr/java/lib/zi/Asia/Aden -usr/java/lib/zi/Asia/Almaty -usr/java/lib/zi/Asia/Amman -usr/java/lib/zi/Asia/Anadyr -usr/java/lib/zi/Asia/Aqtau -usr/java/lib/zi/Asia/Aqtobe -usr/java/lib/zi/Asia/Ashgabat -usr/java/lib/zi/Asia/Baghdad -usr/java/lib/zi/Asia/Bahrain -usr/java/lib/zi/Asia/Baku -usr/java/lib/zi/Asia/Bangkok -usr/java/lib/zi/Asia/Beirut -usr/java/lib/zi/Asia/Bishkek -usr/java/lib/zi/Asia/Brunei -usr/java/lib/zi/Asia/Calcutta -usr/java/lib/zi/Asia/Choibalsan -usr/java/lib/zi/Asia/Chongqing -usr/java/lib/zi/Asia/Colombo -usr/java/lib/zi/Asia/Damascus -usr/java/lib/zi/Asia/Dhaka -usr/java/lib/zi/Asia/Dili -usr/java/lib/zi/Asia/Dubai -usr/java/lib/zi/Asia/Dushanbe -usr/java/lib/zi/Asia/Gaza -usr/java/lib/zi/Asia/Harbin -usr/java/lib/zi/Asia/Hong_Kong -usr/java/lib/zi/Asia/Hovd -usr/java/lib/zi/Asia/Irkutsk -usr/java/lib/zi/Asia/Jakarta -usr/java/lib/zi/Asia/Jayapura -usr/java/lib/zi/Asia/Jerusalem -usr/java/lib/zi/Asia/Kabul -usr/java/lib/zi/Asia/Kamchatka -usr/java/lib/zi/Asia/Karachi -usr/java/lib/zi/Asia/Kashgar -usr/java/lib/zi/Asia/Katmandu -usr/java/lib/zi/Asia/Krasnoyarsk -usr/java/lib/zi/Asia/Kuala_Lumpur -usr/java/lib/zi/Asia/Kuching -usr/java/lib/zi/Asia/Kuwait -usr/java/lib/zi/Asia/Macau -usr/java/lib/zi/Asia/Magadan -usr/java/lib/zi/Asia/Makassar -usr/java/lib/zi/Asia/Manila -usr/java/lib/zi/Asia/Muscat -usr/java/lib/zi/Asia/Nicosia -usr/java/lib/zi/Asia/Novosibirsk -usr/java/lib/zi/Asia/Omsk -usr/java/lib/zi/Asia/Oral -usr/java/lib/zi/Asia/Phnom_Penh -usr/java/lib/zi/Asia/Pontianak -usr/java/lib/zi/Asia/Pyongyang -usr/java/lib/zi/Asia/Qatar -usr/java/lib/zi/Asia/Qyzylorda -usr/java/lib/zi/Asia/Rangoon -usr/java/lib/zi/Asia/Riyadh -usr/java/lib/zi/Asia/Riyadh87 -usr/java/lib/zi/Asia/Riyadh88 -usr/java/lib/zi/Asia/Riyadh89 -usr/java/lib/zi/Asia/Saigon -usr/java/lib/zi/Asia/Sakhalin -usr/java/lib/zi/Asia/Samarkand -usr/java/lib/zi/Asia/Seoul -usr/java/lib/zi/Asia/Shanghai -usr/java/lib/zi/Asia/Singapore -usr/java/lib/zi/Asia/Taipei -usr/java/lib/zi/Asia/Tashkent -usr/java/lib/zi/Asia/Tbilisi -usr/java/lib/zi/Asia/Tehran -usr/java/lib/zi/Asia/Thimphu -usr/java/lib/zi/Asia/Tokyo -usr/java/lib/zi/Asia/Ulaanbaatar -usr/java/lib/zi/Asia/Urumqi -usr/java/lib/zi/Asia/Vientiane -usr/java/lib/zi/Asia/Vladivostok -usr/java/lib/zi/Asia/Yakutsk -usr/java/lib/zi/Asia/Yekaterinburg -usr/java/lib/zi/Asia/Yerevan -usr/java/lib/zi/Atlantic -usr/java/lib/zi/Atlantic/Azores -usr/java/lib/zi/Atlantic/Bermuda -usr/java/lib/zi/Atlantic/Canary -usr/java/lib/zi/Atlantic/Cape_Verde -usr/java/lib/zi/Atlantic/Faeroe -usr/java/lib/zi/Atlantic/Madeira -usr/java/lib/zi/Atlantic/Reykjavik -usr/java/lib/zi/Atlantic/South_Georgia -usr/java/lib/zi/Atlantic/St_Helena -usr/java/lib/zi/Atlantic/Stanley -usr/java/lib/zi/Australia -usr/java/lib/zi/Australia/Adelaide -usr/java/lib/zi/Australia/Brisbane -usr/java/lib/zi/Australia/Broken_Hill -usr/java/lib/zi/Australia/Currie -usr/java/lib/zi/Australia/Darwin -usr/java/lib/zi/Australia/Hobart -usr/java/lib/zi/Australia/Lindeman -usr/java/lib/zi/Australia/Lord_Howe -usr/java/lib/zi/Australia/Melbourne -usr/java/lib/zi/Australia/Perth -usr/java/lib/zi/Australia/Sydney -usr/java/lib/zi/CET -usr/java/lib/zi/EET -usr/java/lib/zi/Etc -##usr/java/lib/zi/Etc/GMT -##usr/java/lib/zi/Etc/GMT1 -##usr/java/lib/zi/Etc/GMT10 -##usr/java/lib/zi/Etc/GMT11 -##usr/java/lib/zi/Etc/GMT12 -##usr/java/lib/zi/Etc/GMT2 -##usr/java/lib/zi/Etc/GMT3 -##usr/java/lib/zi/Etc/GMT4 -##usr/java/lib/zi/Etc/GMT5 -##usr/java/lib/zi/Etc/GMT6 -##usr/java/lib/zi/Etc/GMT7 -##usr/java/lib/zi/Etc/GMT8 -##usr/java/lib/zi/Etc/GMT9 -##usr/java/lib/zi/Etc/GMT-1 -##usr/java/lib/zi/Etc/GMT-10 -##usr/java/lib/zi/Etc/GMT-11 -##usr/java/lib/zi/Etc/GMT-12 -##usr/java/lib/zi/Etc/GMT-13 -##usr/java/lib/zi/Etc/GMT-14 -##usr/java/lib/zi/Etc/GMT-2 -##usr/java/lib/zi/Etc/GMT-3 -##usr/java/lib/zi/Etc/GMT-4 -##usr/java/lib/zi/Etc/GMT-5 -##usr/java/lib/zi/Etc/GMT-6 -##usr/java/lib/zi/Etc/GMT-7 -##usr/java/lib/zi/Etc/GMT-8 -##usr/java/lib/zi/Etc/GMT-9 -##usr/java/lib/zi/Etc/UCT -##usr/java/lib/zi/Etc/UTC -usr/java/lib/zi/Europe -usr/java/lib/zi/Europe/Amsterdam -usr/java/lib/zi/Europe/Andorra -usr/java/lib/zi/Europe/Athens -usr/java/lib/zi/Europe/Belgrade -usr/java/lib/zi/Europe/Berlin -usr/java/lib/zi/Europe/Brussels -usr/java/lib/zi/Europe/Bucharest -usr/java/lib/zi/Europe/Budapest -usr/java/lib/zi/Europe/Chisinau -usr/java/lib/zi/Europe/Copenhagen -usr/java/lib/zi/Europe/Dublin -usr/java/lib/zi/Europe/Gibraltar -usr/java/lib/zi/Europe/Helsinki -usr/java/lib/zi/Europe/Istanbul -usr/java/lib/zi/Europe/Kaliningrad -usr/java/lib/zi/Europe/Kiev -usr/java/lib/zi/Europe/Lisbon -usr/java/lib/zi/Europe/London -usr/java/lib/zi/Europe/Luxembourg -usr/java/lib/zi/Europe/Madrid -usr/java/lib/zi/Europe/Malta -usr/java/lib/zi/Europe/Minsk -usr/java/lib/zi/Europe/Monaco -usr/java/lib/zi/Europe/Moscow -usr/java/lib/zi/Europe/Oslo -usr/java/lib/zi/Europe/Paris -usr/java/lib/zi/Europe/Prague -usr/java/lib/zi/Europe/Riga -usr/java/lib/zi/Europe/Rome -usr/java/lib/zi/Europe/Samara -usr/java/lib/zi/Europe/Simferopol -usr/java/lib/zi/Europe/Sofia -usr/java/lib/zi/Europe/Stockholm -usr/java/lib/zi/Europe/Tallinn -usr/java/lib/zi/Europe/Tirane -usr/java/lib/zi/Europe/Uzhgorod -usr/java/lib/zi/Europe/Vaduz -usr/java/lib/zi/Europe/Vienna -usr/java/lib/zi/Europe/Vilnius -usr/java/lib/zi/Europe/Warsaw -usr/java/lib/zi/Europe/Zaporozhye -usr/java/lib/zi/Europe/Zurich -usr/java/lib/zi/GMT -usr/java/lib/zi/Indian -usr/java/lib/zi/Indian/Antananarivo -usr/java/lib/zi/Indian/Chagos -usr/java/lib/zi/Indian/Christmas -usr/java/lib/zi/Indian/Cocos -usr/java/lib/zi/Indian/Comoro -usr/java/lib/zi/Indian/Kerguelen -usr/java/lib/zi/Indian/Mahe -usr/java/lib/zi/Indian/Maldives -usr/java/lib/zi/Indian/Mauritius -usr/java/lib/zi/Indian/Mayotte -usr/java/lib/zi/Indian/Reunion -usr/java/lib/zi/MET -usr/java/lib/zi/Pacific -usr/java/lib/zi/Pacific/Apia -usr/java/lib/zi/Pacific/Auckland -usr/java/lib/zi/Pacific/Chatham -usr/java/lib/zi/Pacific/Easter -usr/java/lib/zi/Pacific/Efate -usr/java/lib/zi/Pacific/Enderbury -usr/java/lib/zi/Pacific/Fakaofo -usr/java/lib/zi/Pacific/Fiji -usr/java/lib/zi/Pacific/Funafuti -usr/java/lib/zi/Pacific/Galapagos -usr/java/lib/zi/Pacific/Gambier -usr/java/lib/zi/Pacific/Guadalcanal -usr/java/lib/zi/Pacific/Guam -usr/java/lib/zi/Pacific/Honolulu -usr/java/lib/zi/Pacific/Johnston -usr/java/lib/zi/Pacific/Kiritimati -usr/java/lib/zi/Pacific/Kosrae -usr/java/lib/zi/Pacific/Kwajalein -usr/java/lib/zi/Pacific/Majuro -usr/java/lib/zi/Pacific/Marquesas -usr/java/lib/zi/Pacific/Midway -usr/java/lib/zi/Pacific/Nauru -usr/java/lib/zi/Pacific/Niue -usr/java/lib/zi/Pacific/Norfolk -usr/java/lib/zi/Pacific/Noumea -usr/java/lib/zi/Pacific/Pago_Pago -usr/java/lib/zi/Pacific/Palau -usr/java/lib/zi/Pacific/Pitcairn -usr/java/lib/zi/Pacific/Ponape -usr/java/lib/zi/Pacific/Port_Moresby -usr/java/lib/zi/Pacific/Rarotonga -usr/java/lib/zi/Pacific/Saipan -usr/java/lib/zi/Pacific/Tahiti -usr/java/lib/zi/Pacific/Tarawa -usr/java/lib/zi/Pacific/Tongatapu -usr/java/lib/zi/Pacific/Truk -usr/java/lib/zi/Pacific/Wake -usr/java/lib/zi/Pacific/Wallis -usr/java/lib/zi/WET -usr/java/lib/zi/ZoneInfoMappings +#usr/java/lib/sound.properties +#usr/java/lib/zi +#usr/java/lib/zi/Africa +#usr/java/lib/zi/Africa/Abidjan +#usr/java/lib/zi/Africa/Accra +#usr/java/lib/zi/Africa/Addis_Ababa +#usr/java/lib/zi/Africa/Algiers +#usr/java/lib/zi/Africa/Asmera +#usr/java/lib/zi/Africa/Bamako +#usr/java/lib/zi/Africa/Bangui +#usr/java/lib/zi/Africa/Banjul +#usr/java/lib/zi/Africa/Bissau +#usr/java/lib/zi/Africa/Blantyre +#usr/java/lib/zi/Africa/Brazzaville +#usr/java/lib/zi/Africa/Bujumbura +#usr/java/lib/zi/Africa/Cairo +#usr/java/lib/zi/Africa/Casablanca +#usr/java/lib/zi/Africa/Ceuta +#usr/java/lib/zi/Africa/Conakry +#usr/java/lib/zi/Africa/Dakar +#usr/java/lib/zi/Africa/Dar_es_Salaam +#usr/java/lib/zi/Africa/Djibouti +#usr/java/lib/zi/Africa/Douala +#usr/java/lib/zi/Africa/El_Aaiun +#usr/java/lib/zi/Africa/Freetown +#usr/java/lib/zi/Africa/Gaborone +#usr/java/lib/zi/Africa/Harare +#usr/java/lib/zi/Africa/Johannesburg +#usr/java/lib/zi/Africa/Kampala +#usr/java/lib/zi/Africa/Khartoum +#usr/java/lib/zi/Africa/Kigali +#usr/java/lib/zi/Africa/Kinshasa +#usr/java/lib/zi/Africa/Lagos +#usr/java/lib/zi/Africa/Libreville +#usr/java/lib/zi/Africa/Lome +#usr/java/lib/zi/Africa/Luanda +#usr/java/lib/zi/Africa/Lubumbashi +#usr/java/lib/zi/Africa/Lusaka +#usr/java/lib/zi/Africa/Malabo +#usr/java/lib/zi/Africa/Maputo +#usr/java/lib/zi/Africa/Maseru +#usr/java/lib/zi/Africa/Mbabane +#usr/java/lib/zi/Africa/Mogadishu +#usr/java/lib/zi/Africa/Monrovia +#usr/java/lib/zi/Africa/Nairobi +#usr/java/lib/zi/Africa/Ndjamena +#usr/java/lib/zi/Africa/Niamey +#usr/java/lib/zi/Africa/Nouakchott +#usr/java/lib/zi/Africa/Ouagadougou +#usr/java/lib/zi/Africa/Porto-Novo +#usr/java/lib/zi/Africa/Sao_Tome +#usr/java/lib/zi/Africa/Tripoli +#usr/java/lib/zi/Africa/Tunis +#usr/java/lib/zi/Africa/Windhoek +#usr/java/lib/zi/America +#usr/java/lib/zi/America/Adak +#usr/java/lib/zi/America/Anchorage +#usr/java/lib/zi/America/Anguilla +#usr/java/lib/zi/America/Antigua +#usr/java/lib/zi/America/Araguaina +#usr/java/lib/zi/America/Argentina +#usr/java/lib/zi/America/Argentina/Buenos_Aires +#usr/java/lib/zi/America/Argentina/Catamarca +#usr/java/lib/zi/America/Argentina/Cordoba +#usr/java/lib/zi/America/Argentina/Jujuy +#usr/java/lib/zi/America/Argentina/La_Rioja +#usr/java/lib/zi/America/Argentina/Mendoza +#usr/java/lib/zi/America/Argentina/Rio_Gallegos +#usr/java/lib/zi/America/Argentina/San_Juan +#usr/java/lib/zi/America/Argentina/Tucuman +#usr/java/lib/zi/America/Argentina/Ushuaia +#usr/java/lib/zi/America/Aruba +#usr/java/lib/zi/America/Asuncion +#usr/java/lib/zi/America/Bahia +#usr/java/lib/zi/America/Barbados +#usr/java/lib/zi/America/Belem +#usr/java/lib/zi/America/Belize +#usr/java/lib/zi/America/Boa_Vista +#usr/java/lib/zi/America/Bogota +#usr/java/lib/zi/America/Boise +#usr/java/lib/zi/America/Cambridge_Bay +#usr/java/lib/zi/America/Campo_Grande +#usr/java/lib/zi/America/Cancun +#usr/java/lib/zi/America/Caracas +#usr/java/lib/zi/America/Cayenne +#usr/java/lib/zi/America/Cayman +#usr/java/lib/zi/America/Chicago +#usr/java/lib/zi/America/Chihuahua +#usr/java/lib/zi/America/Coral_Harbour +#usr/java/lib/zi/America/Costa_Rica +#usr/java/lib/zi/America/Cuiaba +#usr/java/lib/zi/America/Curacao +#usr/java/lib/zi/America/Danmarkshavn +#usr/java/lib/zi/America/Dawson +#usr/java/lib/zi/America/Dawson_Creek +#usr/java/lib/zi/America/Denver +#usr/java/lib/zi/America/Detroit +#usr/java/lib/zi/America/Dominica +#usr/java/lib/zi/America/Edmonton +#usr/java/lib/zi/America/Eirunepe +#usr/java/lib/zi/America/El_Salvador +#usr/java/lib/zi/America/Fortaleza +#usr/java/lib/zi/America/Glace_Bay +#usr/java/lib/zi/America/Godthab +#usr/java/lib/zi/America/Goose_Bay +#usr/java/lib/zi/America/Grand_Turk +#usr/java/lib/zi/America/Grenada +#usr/java/lib/zi/America/Guadeloupe +#usr/java/lib/zi/America/Guatemala +#usr/java/lib/zi/America/Guayaquil +#usr/java/lib/zi/America/Guyana +#usr/java/lib/zi/America/Halifax +#usr/java/lib/zi/America/Havana +#usr/java/lib/zi/America/Hermosillo +#usr/java/lib/zi/America/Indiana +#usr/java/lib/zi/America/Indiana/Indianapolis +#usr/java/lib/zi/America/Indiana/Knox +#usr/java/lib/zi/America/Indiana/Marengo +#usr/java/lib/zi/America/Indiana/Vevay +#usr/java/lib/zi/America/Inuvik +#usr/java/lib/zi/America/Iqaluit +#usr/java/lib/zi/America/Jamaica +#usr/java/lib/zi/America/Juneau +#usr/java/lib/zi/America/Kentucky +#usr/java/lib/zi/America/Kentucky/Louisville +#usr/java/lib/zi/America/Kentucky/Monticello +#usr/java/lib/zi/America/La_Paz +#usr/java/lib/zi/America/Lima +#usr/java/lib/zi/America/Los_Angeles +#usr/java/lib/zi/America/Maceio +#usr/java/lib/zi/America/Managua +#usr/java/lib/zi/America/Manaus +#usr/java/lib/zi/America/Martinique +#usr/java/lib/zi/America/Mazatlan +#usr/java/lib/zi/America/Menominee +#usr/java/lib/zi/America/Merida +#usr/java/lib/zi/America/Mexico_City +#usr/java/lib/zi/America/Miquelon +#usr/java/lib/zi/America/Monterrey +#usr/java/lib/zi/America/Montevideo +#usr/java/lib/zi/America/Montreal +#usr/java/lib/zi/America/Montserrat +#usr/java/lib/zi/America/Nassau +#usr/java/lib/zi/America/New_York +#usr/java/lib/zi/America/Nipigon +#usr/java/lib/zi/America/Nome +#usr/java/lib/zi/America/Noronha +#usr/java/lib/zi/America/North_Dakota +#usr/java/lib/zi/America/North_Dakota/Center +#usr/java/lib/zi/America/Panama +#usr/java/lib/zi/America/Pangnirtung +#usr/java/lib/zi/America/Paramaribo +#usr/java/lib/zi/America/Phoenix +#usr/java/lib/zi/America/Port-au-Prince +#usr/java/lib/zi/America/Port_of_Spain +#usr/java/lib/zi/America/Porto_Velho +#usr/java/lib/zi/America/Puerto_Rico +#usr/java/lib/zi/America/Rainy_River +#usr/java/lib/zi/America/Rankin_Inlet +#usr/java/lib/zi/America/Recife +#usr/java/lib/zi/America/Regina +#usr/java/lib/zi/America/Rio_Branco +#usr/java/lib/zi/America/Santiago +#usr/java/lib/zi/America/Santo_Domingo +#usr/java/lib/zi/America/Sao_Paulo +#usr/java/lib/zi/America/Scoresbysund +#usr/java/lib/zi/America/St_Johns +#usr/java/lib/zi/America/St_Kitts +#usr/java/lib/zi/America/St_Lucia +#usr/java/lib/zi/America/St_Thomas +#usr/java/lib/zi/America/St_Vincent +#usr/java/lib/zi/America/Swift_Current +#usr/java/lib/zi/America/Tegucigalpa +#usr/java/lib/zi/America/Thule +#usr/java/lib/zi/America/Thunder_Bay +#usr/java/lib/zi/America/Tijuana +#usr/java/lib/zi/America/Toronto +#usr/java/lib/zi/America/Tortola +#usr/java/lib/zi/America/Vancouver +#usr/java/lib/zi/America/Whitehorse +#usr/java/lib/zi/America/Winnipeg +#usr/java/lib/zi/America/Yakutat +#usr/java/lib/zi/America/Yellowknife +#usr/java/lib/zi/Antarctica +#usr/java/lib/zi/Antarctica/Casey +#usr/java/lib/zi/Antarctica/Davis +#usr/java/lib/zi/Antarctica/DumontDUrville +#usr/java/lib/zi/Antarctica/Mawson +#usr/java/lib/zi/Antarctica/McMurdo +#usr/java/lib/zi/Antarctica/Palmer +#usr/java/lib/zi/Antarctica/Rothera +#usr/java/lib/zi/Antarctica/Syowa +#usr/java/lib/zi/Antarctica/Vostok +#usr/java/lib/zi/Asia +#usr/java/lib/zi/Asia/Aden +#usr/java/lib/zi/Asia/Almaty +#usr/java/lib/zi/Asia/Amman +#usr/java/lib/zi/Asia/Anadyr +#usr/java/lib/zi/Asia/Aqtau +#usr/java/lib/zi/Asia/Aqtobe +#usr/java/lib/zi/Asia/Ashgabat +#usr/java/lib/zi/Asia/Baghdad +#usr/java/lib/zi/Asia/Bahrain +#usr/java/lib/zi/Asia/Baku +#usr/java/lib/zi/Asia/Bangkok +#usr/java/lib/zi/Asia/Beirut +#usr/java/lib/zi/Asia/Bishkek +#usr/java/lib/zi/Asia/Brunei +#usr/java/lib/zi/Asia/Calcutta +#usr/java/lib/zi/Asia/Choibalsan +#usr/java/lib/zi/Asia/Chongqing +#usr/java/lib/zi/Asia/Colombo +#usr/java/lib/zi/Asia/Damascus +#usr/java/lib/zi/Asia/Dhaka +#usr/java/lib/zi/Asia/Dili +#usr/java/lib/zi/Asia/Dubai +#usr/java/lib/zi/Asia/Dushanbe +#usr/java/lib/zi/Asia/Gaza +#usr/java/lib/zi/Asia/Harbin +#usr/java/lib/zi/Asia/Hong_Kong +#usr/java/lib/zi/Asia/Hovd +#usr/java/lib/zi/Asia/Irkutsk +#usr/java/lib/zi/Asia/Jakarta +#usr/java/lib/zi/Asia/Jayapura +#usr/java/lib/zi/Asia/Jerusalem +#usr/java/lib/zi/Asia/Kabul +#usr/java/lib/zi/Asia/Kamchatka +#usr/java/lib/zi/Asia/Karachi +#usr/java/lib/zi/Asia/Kashgar +#usr/java/lib/zi/Asia/Katmandu +#usr/java/lib/zi/Asia/Krasnoyarsk +#usr/java/lib/zi/Asia/Kuala_Lumpur +#usr/java/lib/zi/Asia/Kuching +#usr/java/lib/zi/Asia/Kuwait +#usr/java/lib/zi/Asia/Macau +#usr/java/lib/zi/Asia/Magadan +#usr/java/lib/zi/Asia/Makassar +#usr/java/lib/zi/Asia/Manila +#usr/java/lib/zi/Asia/Muscat +#usr/java/lib/zi/Asia/Nicosia +#usr/java/lib/zi/Asia/Novosibirsk +#usr/java/lib/zi/Asia/Omsk +#usr/java/lib/zi/Asia/Oral +#usr/java/lib/zi/Asia/Phnom_Penh +#usr/java/lib/zi/Asia/Pontianak +#usr/java/lib/zi/Asia/Pyongyang +#usr/java/lib/zi/Asia/Qatar +#usr/java/lib/zi/Asia/Qyzylorda +#usr/java/lib/zi/Asia/Rangoon +#usr/java/lib/zi/Asia/Riyadh +#usr/java/lib/zi/Asia/Riyadh87 +#usr/java/lib/zi/Asia/Riyadh88 +#usr/java/lib/zi/Asia/Riyadh89 +#usr/java/lib/zi/Asia/Saigon +#usr/java/lib/zi/Asia/Sakhalin +#usr/java/lib/zi/Asia/Samarkand +#usr/java/lib/zi/Asia/Seoul +#usr/java/lib/zi/Asia/Shanghai +#usr/java/lib/zi/Asia/Singapore +#usr/java/lib/zi/Asia/Taipei +#usr/java/lib/zi/Asia/Tashkent +#usr/java/lib/zi/Asia/Tbilisi +#usr/java/lib/zi/Asia/Tehran +#usr/java/lib/zi/Asia/Thimphu +#usr/java/lib/zi/Asia/Tokyo +#usr/java/lib/zi/Asia/Ulaanbaatar +#usr/java/lib/zi/Asia/Urumqi +#usr/java/lib/zi/Asia/Vientiane +#usr/java/lib/zi/Asia/Vladivostok +#usr/java/lib/zi/Asia/Yakutsk +#usr/java/lib/zi/Asia/Yekaterinburg +#usr/java/lib/zi/Asia/Yerevan +#usr/java/lib/zi/Atlantic +#usr/java/lib/zi/Atlantic/Azores +#usr/java/lib/zi/Atlantic/Bermuda +#usr/java/lib/zi/Atlantic/Canary +#usr/java/lib/zi/Atlantic/Cape_Verde +#usr/java/lib/zi/Atlantic/Faeroe +#usr/java/lib/zi/Atlantic/Madeira +#usr/java/lib/zi/Atlantic/Reykjavik +#usr/java/lib/zi/Atlantic/South_Georgia +#usr/java/lib/zi/Atlantic/St_Helena +#usr/java/lib/zi/Atlantic/Stanley +#usr/java/lib/zi/Australia +#usr/java/lib/zi/Australia/Adelaide +#usr/java/lib/zi/Australia/Brisbane +#usr/java/lib/zi/Australia/Broken_Hill +#usr/java/lib/zi/Australia/Currie +#usr/java/lib/zi/Australia/Darwin +#usr/java/lib/zi/Australia/Hobart +#usr/java/lib/zi/Australia/Lindeman +#usr/java/lib/zi/Australia/Lord_Howe +#usr/java/lib/zi/Australia/Melbourne +#usr/java/lib/zi/Australia/Perth +#usr/java/lib/zi/Australia/Sydney +#usr/java/lib/zi/CET +#usr/java/lib/zi/EET +#usr/java/lib/zi/Etc +#usr/java/lib/zi/Etc/GMT +#usr/java/lib/zi/Etc/GMT1 +#usr/java/lib/zi/Etc/GMT10 +#usr/java/lib/zi/Etc/GMT11 +#usr/java/lib/zi/Etc/GMT12 +#usr/java/lib/zi/Etc/GMT2 +#usr/java/lib/zi/Etc/GMT3 +#usr/java/lib/zi/Etc/GMT4 +#usr/java/lib/zi/Etc/GMT5 +#usr/java/lib/zi/Etc/GMT6 +#usr/java/lib/zi/Etc/GMT7 +#usr/java/lib/zi/Etc/GMT8 +#usr/java/lib/zi/Etc/GMT9 +#usr/java/lib/zi/Etc/GMT-1 +#usr/java/lib/zi/Etc/GMT-10 +#usr/java/lib/zi/Etc/GMT-11 +#usr/java/lib/zi/Etc/GMT-12 +#usr/java/lib/zi/Etc/GMT-13 +#usr/java/lib/zi/Etc/GMT-14 +#usr/java/lib/zi/Etc/GMT-2 +#usr/java/lib/zi/Etc/GMT-3 +#usr/java/lib/zi/Etc/GMT-4 +#usr/java/lib/zi/Etc/GMT-5 +#usr/java/lib/zi/Etc/GMT-6 +#usr/java/lib/zi/Etc/GMT-7 +#usr/java/lib/zi/Etc/GMT-8 +#usr/java/lib/zi/Etc/GMT-9 +#usr/java/lib/zi/Etc/UCT +#usr/java/lib/zi/Etc/UTC +#usr/java/lib/zi/Europe +#usr/java/lib/zi/Europe/Amsterdam +#usr/java/lib/zi/Europe/Andorra +#usr/java/lib/zi/Europe/Athens +#usr/java/lib/zi/Europe/Belgrade +#usr/java/lib/zi/Europe/Berlin +#usr/java/lib/zi/Europe/Brussels +#usr/java/lib/zi/Europe/Bucharest +#usr/java/lib/zi/Europe/Budapest +#usr/java/lib/zi/Europe/Chisinau +#usr/java/lib/zi/Europe/Copenhagen +#usr/java/lib/zi/Europe/Dublin +#usr/java/lib/zi/Europe/Gibraltar +#usr/java/lib/zi/Europe/Helsinki +#usr/java/lib/zi/Europe/Istanbul +#usr/java/lib/zi/Europe/Kaliningrad +#usr/java/lib/zi/Europe/Kiev +#usr/java/lib/zi/Europe/Lisbon +#usr/java/lib/zi/Europe/London +#usr/java/lib/zi/Europe/Luxembourg +#usr/java/lib/zi/Europe/Madrid +#usr/java/lib/zi/Europe/Malta +#usr/java/lib/zi/Europe/Minsk +#usr/java/lib/zi/Europe/Monaco +#usr/java/lib/zi/Europe/Moscow +#usr/java/lib/zi/Europe/Oslo +#usr/java/lib/zi/Europe/Paris +#usr/java/lib/zi/Europe/Prague +#usr/java/lib/zi/Europe/Riga +#usr/java/lib/zi/Europe/Rome +#usr/java/lib/zi/Europe/Samara +#usr/java/lib/zi/Europe/Simferopol +#usr/java/lib/zi/Europe/Sofia +#usr/java/lib/zi/Europe/Stockholm +#usr/java/lib/zi/Europe/Tallinn +#usr/java/lib/zi/Europe/Tirane +#usr/java/lib/zi/Europe/Uzhgorod +#usr/java/lib/zi/Europe/Vaduz +#usr/java/lib/zi/Europe/Vienna +#usr/java/lib/zi/Europe/Vilnius +#usr/java/lib/zi/Europe/Warsaw +#usr/java/lib/zi/Europe/Zaporozhye +#usr/java/lib/zi/Europe/Zurich +#usr/java/lib/zi/GMT +#usr/java/lib/zi/Indian +#usr/java/lib/zi/Indian/Antananarivo +#usr/java/lib/zi/Indian/Chagos +#usr/java/lib/zi/Indian/Christmas +#usr/java/lib/zi/Indian/Cocos +#usr/java/lib/zi/Indian/Comoro +#usr/java/lib/zi/Indian/Kerguelen +#usr/java/lib/zi/Indian/Mahe +#usr/java/lib/zi/Indian/Maldives +#usr/java/lib/zi/Indian/Mauritius +#usr/java/lib/zi/Indian/Mayotte +#usr/java/lib/zi/Indian/Reunion +#usr/java/lib/zi/MET +#usr/java/lib/zi/Pacific +#usr/java/lib/zi/Pacific/Apia +#usr/java/lib/zi/Pacific/Auckland +#usr/java/lib/zi/Pacific/Chatham +#usr/java/lib/zi/Pacific/Easter +#usr/java/lib/zi/Pacific/Efate +#usr/java/lib/zi/Pacific/Enderbury +#usr/java/lib/zi/Pacific/Fakaofo +#usr/java/lib/zi/Pacific/Fiji +#usr/java/lib/zi/Pacific/Funafuti +#usr/java/lib/zi/Pacific/Galapagos +#usr/java/lib/zi/Pacific/Gambier +#usr/java/lib/zi/Pacific/Guadalcanal +#usr/java/lib/zi/Pacific/Guam +#usr/java/lib/zi/Pacific/Honolulu +#usr/java/lib/zi/Pacific/Johnston +#usr/java/lib/zi/Pacific/Kiritimati +#usr/java/lib/zi/Pacific/Kosrae +#usr/java/lib/zi/Pacific/Kwajalein +#usr/java/lib/zi/Pacific/Majuro +#usr/java/lib/zi/Pacific/Marquesas +#usr/java/lib/zi/Pacific/Midway +#usr/java/lib/zi/Pacific/Nauru +#usr/java/lib/zi/Pacific/Niue +#usr/java/lib/zi/Pacific/Norfolk +#usr/java/lib/zi/Pacific/Noumea +#usr/java/lib/zi/Pacific/Pago_Pago +#usr/java/lib/zi/Pacific/Palau +#usr/java/lib/zi/Pacific/Pitcairn +#usr/java/lib/zi/Pacific/Ponape +#usr/java/lib/zi/Pacific/Port_Moresby +#usr/java/lib/zi/Pacific/Rarotonga +#usr/java/lib/zi/Pacific/Saipan +#usr/java/lib/zi/Pacific/Tahiti +#usr/java/lib/zi/Pacific/Tarawa +#usr/java/lib/zi/Pacific/Tongatapu +#usr/java/lib/zi/Pacific/Truk +#usr/java/lib/zi/Pacific/Wake +#usr/java/lib/zi/Pacific/Wallis +#usr/java/lib/zi/WET +#usr/java/lib/zi/ZoneInfoMappings #usr/java/licenses #usr/java/licenses/CHANGES #usr/java/licenses/COPYRIGHT diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 74d37460a7..688989e685 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -175,6 +175,7 @@ * module-init-tools-3.2.2 * mp3blaster-3.2.3 * mpg123-0.59r +* mpg123-0.60 * mtd-CVS-20070507 * mtools-3.9.10 * mysql-5.0.24a @@ -252,6 +253,7 @@ * udev-096 * udev-096-klibc * unzip552 +* usbutils-0.72 * util-linux-2.12r * vim-7.0 * vlan.1.9 @@ -259,6 +261,7 @@ * web-cyradm-0.5.5-CVS-for-ipfire * wget-1.10.2 * whatmask-1.2 +* which-2.16 * wireless_tools.28 * xmbmon205 * zaptel-1.4.0 diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 27524729d6..5e600ed569 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -657,12 +657,20 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '' } &Header::openbox('100%', 'center', $Lang::tr{'info'}); +&overviewgraph($qossettings{'RED_DEV'}); +&overviewgraph($qossettings{'IMQ_DEV'}); print <  Unterklasse hinzufuegen |  Regel hinzufuegen |  Bearbeiten |  Loeschen   TOS-Bits:  0 - Deaktiviert | 8 - Minimale Verzoegerung | 4 - Maximaler Durchsatz | 2 - Maximale Zuverlaessigkeit | 1 - Minimale Kosten   END ; +if (( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'RED_DEV'}.png") && ( -e "/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'IMQ_DEV'}.png")) { + print < + +END +;} print "\t"; &Header::closebox(); @@ -1413,3 +1421,54 @@ sub validsubclass { } } } + +sub overviewgraph { + $qossettings{'DEV'} = shift; + if ( $qossettings{'DEV'} eq $qossettings{'RED_DEV'} ) { + $qossettings{'CLASSPRFX'} = '1'; + } else { + $qossettings{'CLASSPRFX'} = '2'; + } + my $ERROR=""; + my $count="1"; + my $color="#000000"; + my @command=("/srv/web/ipfire/html/graphs/qos-graph-$qossettings{'DEV'}.png", + "--start", "-3240", "-aPNG", "-i", "-z", + "--alt-y-grid", "-w 600", "-h 150", "-r", + "--color", "SHADEA#EAE9EE", + "--color", "SHADEB#EAE9EE", + "--color", "BACK#FFFFFF", + "-t Auslastung auf ($qossettings{'DEV'})" + ); + open( FILE, "< $classfile" ) or die "Unable to read $classfile"; + @classes = ; + close FILE; + foreach $classentry (sort @classes) + { + @classline = split( /\;/, $classentry ); + if ( $classline[0] eq $qossettings{'DEV'} ) + { + $color=random_hex_color(6); + push(@command, "DEF:$classline[1]=/var/log/rrd/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bits:AVERAGE"); + + if ($count eq "1") { + push(@command, "AREA:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j"); + } else { + push(@command, "STACK:$classline[1]$color:Klasse $classline[1] - $classline[8]\\j"); + } + $count++; + } + } + RRDs::graph (@command); + $ERROR = RRDs::error; + print "$ERROR"; +} + +sub random_hex_color { + my $size = shift; + $size = 6 if $size !~ /^3|6$/; + my @hex = ( 0 .. 9, 'a' .. 'f' ); + my @color; + push @color, @hex[rand(@hex)] for 1 .. $size; + return join('', '#', @color); +} diff --git a/lfs/usbutils b/lfs/usbutils new file mode 100644 index 0000000000..ff4574bfe6 --- /dev/null +++ b/lfs/usbutils @@ -0,0 +1,81 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.72 + +THISAPP = usbutils-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ee345fe605ffcfce843dae4aed81122b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i 's|DEST=|&/usr/share/hwdata/|' update-usbids.sh + cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share/hwdata + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + cd $(DIR_APP) && install -v -m755 update-usbids.sh /usr/sbin/update-usbids + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/which b/lfs/which new file mode 100644 index 0000000000..b9627d4484 --- /dev/null +++ b/lfs/which @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.16 + +THISAPP = which-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 830b83af48347a9a3520f561e47cbc9b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7a5f5c8424..e73e676479 100755 --- a/make.sh +++ b/make.sh @@ -372,6 +372,7 @@ buildipfire() { ipfiremake newt ipfiremake libcap ipfiremake pciutils + ipfiremake usbutils ipfiremake libxml2 ipfiremake libxslt ipfiremake BerkeleyDB @@ -533,6 +534,7 @@ buildipfire() { ipfiremake vsftpd ipfiremake alsa ipfiremake mp3blaster + ipfiremake which } buildinstaller() { diff --git a/src/initscripts/init.d/alsa b/src/initscripts/init.d/alsa index fe7077ad5e..4d54c33f64 100644 --- a/src/initscripts/init.d/alsa +++ b/src/initscripts/init.d/alsa @@ -10,13 +10,20 @@ . $rc_functions case "$1" in + start) + boot_mesg "Starting ALSA..." + modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 + modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 + (exit ${failed}) + evaluate_retval + ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." loadproc /usr/sbin/alsactl store ;; *) - echo "Usage: $0 stop" + echo "Usage: $0 (start|stop)" exit 1 ;; esac diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index e8e83711c1..d300dfbc0f 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -177,8 +177,7 @@ int main(int argc, char *argv[]) goto EXIT; if (!unattended) { - rc = newtWinMenu("Language selection", - "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8, + rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8, langnames, &choice, "Ok", NULL); } @@ -208,7 +207,6 @@ int main(int argc, char *argv[]) // Starting hardware detection runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]); - runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]); /* CDROM INSTALL */ if (installtype == CDROM_INSTALL) { @@ -643,12 +641,8 @@ EXIT: newtFinished(); if (!unattended) { - // Copy our scanned nics to the disk and lock because scan doesn't work in chroot - system("touch /harddisk/var/ipfire/ethernet/scan_lock"); - system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics"); if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL")) printf("Unable to run setup.\n"); - system("rm -f /harddisk/var/ipfire/ethernet/scan_lock"); } if (system("/bin/umount /harddisk/proc")) diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh index e5fda71aa6..b56cde02b8 100644 --- a/src/install+setup/install/probehw.sh +++ b/src/install+setup/install/probehw.sh @@ -14,6 +14,8 @@ for MODULE in $(kudzu -qps -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq echo " --> ecode: $?" done +sleep 10 + if [ $# -eq 0 ]; then exit 0 fi diff --git a/src/install+setup/install/probenic.sh b/src/install+setup/install/probenic.sh index c09ac16e14..4bf997bb7f 100644 --- a/src/install+setup/install/probenic.sh +++ b/src/install+setup/install/probenic.sh @@ -1,11 +1,5 @@ #!/bin/sh -case "$1" in - install) - kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /tmp/scanned_nics 2>/dev/null - ;; - "") - kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null - ;; -esac +kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null + exit 0 diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 3e935e4878..46fb4c91db 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -11,7 +11,7 @@ SUID_PROGS = setdmzholes setportfw setfilters setxtaccess \ restartsyslogd logwatch openvpnctrl outgoingfwctrl \ restartwireless getipstat qosctrl launch-ether-wake \ redctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ - smartctrl clamavctrl pakfire + smartctrl clamavctrl pakfire mpfirectrl install : all install -m 755 $(PROGS) /usr/local/bin @@ -120,3 +120,6 @@ getipstat: getipstat.c setuid.o ../install+setup/libsmooth/varval.o pakfire: pakfire.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ pakfire.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + +mpfirectrl: mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/mpfirectrl.c b/src/misc-progs/mpfirectrl.c new file mode 100644 index 0000000000..bcf1663ca3 --- /dev/null +++ b/src/misc-progs/mpfirectrl.c @@ -0,0 +1,40 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include +#include +#include +#include +#include +#include +#include "setuid.h" + +int main(int argc, char *argv[]) { + int i; + char command[1024]; + char add[STRING_SIZE]; + + if (!(initsetuid())) + exit(1); + + snprintf(command, STRING_SIZE, "/var/ipfire/mpfire/bin/mpfire.pl"); + + for (i = 1; i < argc; i++) { + if (strstr(argv[i], "&&")){ + fprintf (stderr, "Bad Argument!\n"); + exit (1); + } + if (strstr(argv[i], "|")){ + fprintf (stderr, "Bad Argument!\n"); + exit (1); + } + sprintf(add, " %s", argv[i]); + strcat(command, add); + } + + return safe_system(command); +} diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 8493540670..af25245b09 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -177,9 +177,7 @@ return 0; if (strcmp(argv[1], "enable")==0) { safe_system("touch /var/ipfire/samba/enable"); -safe_system("/etc/rc.d/init.d/samba start "); -safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/S50samba"); -safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/K50samba"); +safe_system("/etc/rc.d/init.d/samba start"); safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S50samba"); safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/K50samba"); return 0; @@ -189,8 +187,6 @@ if (strcmp(argv[1], "disable")==0) { safe_system("unlink /var/ipfire/samba/enable"); safe_system("/etc/rc.d/init.d/samba stop"); -safe_system("unlink /etc/rc.d/rc2.d/S50samba"); -safe_system("unlink /etc/rc.d/rc2.d/K50samba"); safe_system("unlink /etc/rc.d/rc3.d/S50samba"); safe_system("unlink /etc/rc.d/rc3.d/K50samba"); return 0; diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh index ae4eb4d652..87ea5b8b21 100644 --- a/src/paks/alsa/install.sh +++ b/src/paks/alsa/install.sh @@ -4,5 +4,6 @@ extract_files touch /etc/asound.state +ln -sf ../init.d/alsa /etc/rc.d/rc3.d/S65alsa ln -sf ../init.d/alsa /etc/rc.d/rc0.d/K35alsa ln -sf ../init.d/alsa /etc/rc.d/rc6.d/K35alsa -- 2.39.2