[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, pakfire3, updated. fea5b857299d1ca862c7f3beaa9177c4c0c02ecf
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, pakfire3 has been updated via fea5b857299d1ca862c7f3beaa9177c4c0c02ecf (commit) via 6875db473a858250fdfdfdb7a9b2f25fa218833c (commit) via 7e6f64ea475b063ab9eb74a80398afe3ab33b6a1 (commit) via ca8e0b97d1e06ee87f0801ca9962b6f41829620d (commit) via 88af830315fbb554192944d47dc4ab6be642e02b (commit) via ca23dbe2faead9baadd28c3f64de3f0d49688b02 (commit) via 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c (commit) via b571e4c234092bf3a6d209482b99946a1c7948d9 (commit) via 81f77047dbe9f840977e59619720ae7823dd87ab (commit) via 9c27eca8e4b7b722fd86add8b6659633ac7c63bc (commit) via d96ec7d78c273f80292d2a5fdc4569477bef7b55 (commit) via 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a (commit) via f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 (commit) via dabe2eeb0deb3e28becf673ec13420b0e9574c22 (commit) via 94a4640d3a41b9aba5b1e998d78db63f32c70df1 (commit) via 210673317524fce2073b908a8d920016614f5d72 (commit) via 9473df1ae828f3c110acc300209209214f025a98 (commit) via 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf (commit) via 32c21db1c43be6d2d569cc8d1f92efabdf8885da (commit) via 6f52b3df16e7cb95d435f65846abb8dde68824e4 (commit) via a97f6dd36bb55b933e45e6563bb87b4f973bc604 (commit) via 54b07019a0ab741cd898c63717d157b8d097ec5c (commit) via be9b380a7fc8b902a5ecaaea1627ee67f4454147 (commit) via 7374af87763ac2beb4a0cfaf19c3bc2180b581d3 (commit) via 4439f0b9525ae7528d597e89a64f783eb2903826 (commit) via 784bac5f3cb75ee3c2baee42e2428ebd812fee08 (commit) via 2f7e68cde0470f082bc90e79cdbc18b436a66ba9 (commit) via 46c2a9e3532bc2b8af8714ef1e2039a80cfb99e8 (commit) from ea9cfe078429c1a8f6d32ac32ef422c821e0e9a1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit fea5b857299d1ca862c7f3beaa9177c4c0c02ecf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 15 12:49:42 2011 +0200
core50: add python and gettext.
commit 6875db473a858250fdfdfdb7a9b2f25fa218833c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 15 12:48:41 2011 +0200
sqlite: update to 3.7.6.3.
commit 7e6f64ea475b063ab9eb74a80398afe3ab33b6a1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 15 11:01:26 2011 +0200
python: update to 2.7.2.
commit ca8e0b97d1e06ee87f0801ca9962b6f41829620d Merge: ea9cfe0 88af830 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 15 08:23:18 2011 +0200
Merge branch 'master' into pakfire3
-----------------------------------------------------------------------
Summary of changes: config/client175/site.conf | 12 +- config/httpd/server-tuning.conf | 4 +- config/mpfire/mpd.conf | 1 - config/mpfire/webradio | 1 + config/rootfiles/common/apache2 | 75 ++- config/rootfiles/common/python | 47 ++- config/rootfiles/core/48/exclude | 2 +- config/rootfiles/core/49/exclude | 2 +- config/rootfiles/core/49/filelists/files | 3 + config/rootfiles/core/50/exclude | 2 + config/rootfiles/core/{44 => 50}/filelists/apache2 | 0 config/rootfiles/core/50/filelists/files | 1 + config/rootfiles/core/50/filelists/gettext | 1 + config/rootfiles/core/{49 => 50}/filelists/icons | 0 config/rootfiles/core/50/filelists/python | 1 + config/rootfiles/core/{44 => 50}/meta | 0 config/rootfiles/core/{48 => 50}/update.sh | 2 +- config/rootfiles/packages/clamav | 7 +- config/rootfiles/packages/client175 | 3 + config/rootfiles/packages/cups | 3 +- config/rootfiles/packages/ipfireseeder | 2 +- config/rootfiles/packages/libmpdclient | 3 +- config/rootfiles/packages/qemu | 15 +- config/rootfiles/packages/sane | 593 +++++++++++--------- config/rootfiles/packages/sqlite | 4 +- html/cgi-bin/logs.cgi/log.dat | 2 +- html/cgi-bin/qos.cgi | 5 +- langs/de/cgi-bin/de.pl | 2 +- lfs/apache2 | 4 +- lfs/binutils | 4 +- lfs/clamav | 6 +- lfs/client175 | 10 +- lfs/cups | 8 +- lfs/ipfireseeder | 6 +- lfs/libmpdclient | 8 +- lfs/make | 4 +- lfs/mpc | 8 +- lfs/mpd | 17 +- lfs/mpfire | 4 +- lfs/python | 8 +- lfs/qemu | 11 +- lfs/rsync | 8 +- lfs/sane | 34 +- lfs/sqlite | 8 +- make.sh | 7 +- src/paks/mpfire/install.sh | 6 +- ....7.1-gdbm-1.patch => Python-2.7.2-gdbm-1.patch} | 0 src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch | 28 + 48 files changed, 571 insertions(+), 411 deletions(-) create mode 100644 config/rootfiles/core/50/exclude copy config/rootfiles/core/{44 => 50}/filelists/apache2 (100%) create mode 100644 config/rootfiles/core/50/filelists/files create mode 120000 config/rootfiles/core/50/filelists/gettext rename config/rootfiles/core/{49 => 50}/filelists/icons (100%) create mode 120000 config/rootfiles/core/50/filelists/python copy config/rootfiles/core/{44 => 50}/meta (100%) copy config/rootfiles/core/{48 => 50}/update.sh (99%) rename src/patches/{Python-2.7.1-gdbm-1.patch => Python-2.7.2-gdbm-1.patch} (100%) create mode 100644 src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
Difference in files: diff --git a/config/client175/site.conf b/config/client175/site.conf index f98d8e8..9abe832 100644 --- a/config/client175/site.conf +++ b/config/client175/site.conf @@ -1,7 +1,4 @@ # Edit this file as needed and save it as: site.conf -# # and ; at the begining of lines indicate comments. Remove the ; to -# activate a setting. -# # The application will work without it but tag editing will not work # without saving this file as site.conf with the correct music_directory # set. @@ -12,6 +9,7 @@ # from this server via the music_directory option configured below. mpd_host: "localhost" mpd_port: 6600 +;server_root: "/client175"
# Location of the music directory, required for editing tags. This variable # is also used to identify the folder for a given file in local cover lookups. @@ -21,17 +19,17 @@ music_directory: "/var/mp3" # to limit which one it listens on. "0.0.0.0" listens on all interfaces. server.socket_host: "0.0.0.0"
-# Don't run this as root in order to use port 80! This app was not built +# Don't run this as root in order to use port 80! This app was not built # to be secure, it must be run with limited access. Default is port 8080. server.socket_port: 8800
# Setting the 'run_as' variable will allow you to start the process as root # and drop the privelages to a restricted user account during server startup. -# This feature is useful when starting client175 during the init process +# This feature is useful when starting client175 during the init process # and/or when starting as root to run on port 80. ;run_as: "user"
-# Setting environment to production removes the verbose console output +# Setting environment to production removes the verbose console output # and disables auto-reload on file changes. environment: "production"
@@ -41,7 +39,7 @@ environment: "production" include_playlist_counts: True
# List of local locations to search for cover art. The server will check -# these locations for covers before using web services. The following +# these locations for covers before using web services. The following # variables are available fo substitution: # {folder} Folder a given file is in # {artist} Artist name diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 9cb7662..183ce80 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -18,8 +18,8 @@ MaxKeepAliveRequests 100 KeepAliveTimeout 15
MinSpareServers 1 -MaxSpareServers 2 -StartServers 2 +MaxSpareServers 10 +StartServers 1 MaxClients 10 MaxRequestsPerChild 100
diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf index 10da064..d66481e 100644 --- a/config/mpfire/mpd.conf +++ b/config/mpfire/mpd.conf @@ -7,7 +7,6 @@ port "6600" music_directory "/var/mp3" playlist_directory "/var/ipfire/mpfire" log_file "/var/log/mpd.log" -error_file "/var/log/mpd.error.log" pid_file "/var/run/mpd.pid" ##########################################################
diff --git a/config/mpfire/webradio b/config/mpfire/webradio index e11f6e3..402c31a 100644 --- a/config/mpfire/webradio +++ b/config/mpfire/webradio @@ -10,4 +10,5 @@ rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ demovibes.de:8000/necta128.ogg|Nectarine Demoscene Radio|http://www.scenemusic.eu/ +r1.scenesat.com:8000/scenesathi|SceneSat Radio|http://www.scenesat.com radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index be4648b..b2462e1 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -323,12 +323,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/developer/debugging.html.en #srv/web/ipfire/manual/developer/documenting.html #srv/web/ipfire/manual/developer/documenting.html.en +#srv/web/ipfire/manual/developer/documenting.html.zh-cn #srv/web/ipfire/manual/developer/filters.html #srv/web/ipfire/manual/developer/filters.html.en #srv/web/ipfire/manual/developer/hooks.html #srv/web/ipfire/manual/developer/hooks.html.en #srv/web/ipfire/manual/developer/index.html #srv/web/ipfire/manual/developer/index.html.en +#srv/web/ipfire/manual/developer/index.html.zh-cn #srv/web/ipfire/manual/developer/modules.html #srv/web/ipfire/manual/developer/modules.html.en #srv/web/ipfire/manual/developer/modules.html.ja.utf8 @@ -355,6 +357,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/faq/index.html #srv/web/ipfire/manual/faq/index.html.en #srv/web/ipfire/manual/faq/index.html.tr.utf8 +#srv/web/ipfire/manual/faq/index.html.zh-cn #srv/web/ipfire/manual/filter.html #srv/web/ipfire/manual/filter.html.en #srv/web/ipfire/manual/filter.html.es @@ -378,11 +381,13 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/handler.html.ko.euc-kr #srv/web/ipfire/manual/handler.html.ru.koi8-r #srv/web/ipfire/manual/handler.html.tr.utf8 +#srv/web/ipfire/manual/handler.html.zh-cn #srv/web/ipfire/manual/howto #srv/web/ipfire/manual/howto/access.html #srv/web/ipfire/manual/howto/access.html.en #srv/web/ipfire/manual/howto/auth.html #srv/web/ipfire/manual/howto/auth.html.en +#srv/web/ipfire/manual/howto/auth.html.fr #srv/web/ipfire/manual/howto/auth.html.ja.utf8 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr #srv/web/ipfire/manual/howto/auth.html.tr.utf8 @@ -392,6 +397,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html #srv/web/ipfire/manual/howto/htaccess.html.en +#srv/web/ipfire/manual/howto/htaccess.html.fr #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br @@ -399,6 +405,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/howto/index.html.en #srv/web/ipfire/manual/howto/index.html.ja.utf8 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr +#srv/web/ipfire/manual/howto/index.html.zh-cn #srv/web/ipfire/manual/howto/public_html.html #srv/web/ipfire/manual/howto/public_html.html.en #srv/web/ipfire/manual/howto/public_html.html.ja.utf8 @@ -432,6 +439,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif #srv/web/ipfire/manual/images/mod_rewrite_fig2.png #srv/web/ipfire/manual/images/pixel.gif +#srv/web/ipfire/manual/images/rewrite_rule_flow.png #srv/web/ipfire/manual/images/right.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.png @@ -440,6 +448,8 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/images/ssl_intro_fig3.gif #srv/web/ipfire/manual/images/ssl_intro_fig3.png #srv/web/ipfire/manual/images/sub.gif +#srv/web/ipfire/manual/images/syntax_rewritecond.png +#srv/web/ipfire/manual/images/syntax_rewriterule.png #srv/web/ipfire/manual/images/up.gif #srv/web/ipfire/manual/index.html #srv/web/ipfire/manual/index.html.de @@ -450,6 +460,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/index.html.ko.euc-kr #srv/web/ipfire/manual/index.html.pt-br #srv/web/ipfire/manual/index.html.tr.utf8 +#srv/web/ipfire/manual/index.html.zh-cn #srv/web/ipfire/manual/install.html #srv/web/ipfire/manual/install.html.de #srv/web/ipfire/manual/install.html.en @@ -479,6 +490,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/misc/index.html.en #srv/web/ipfire/manual/misc/index.html.ko.euc-kr #srv/web/ipfire/manual/misc/index.html.tr.utf8 +#srv/web/ipfire/manual/misc/index.html.zh-cn #srv/web/ipfire/manual/misc/password_encryptions.html #srv/web/ipfire/manual/misc/password_encryptions.html.en #srv/web/ipfire/manual/misc/perf-tuning.html @@ -504,6 +516,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/core.html #srv/web/ipfire/manual/mod/core.html.de #srv/web/ipfire/manual/mod/core.html.en +#srv/web/ipfire/manual/mod/core.html.fr #srv/web/ipfire/manual/mod/core.html.ja.utf8 #srv/web/ipfire/manual/mod/core.html.tr.utf8 #srv/web/ipfire/manual/mod/directive-dict.html @@ -519,6 +532,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr #srv/web/ipfire/manual/mod/directives.html.ru.koi8-r #srv/web/ipfire/manual/mod/directives.html.tr.utf8 +#srv/web/ipfire/manual/mod/directives.html.zh-cn #srv/web/ipfire/manual/mod/event.html #srv/web/ipfire/manual/mod/event.html.en #srv/web/ipfire/manual/mod/index.html @@ -528,6 +542,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/index.html.ja.utf8 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr #srv/web/ipfire/manual/mod/index.html.tr.utf8 +#srv/web/ipfire/manual/mod/index.html.zh-cn #srv/web/ipfire/manual/mod/mod_actions.html #srv/web/ipfire/manual/mod/mod_actions.html.de #srv/web/ipfire/manual/mod/mod_actions.html.en @@ -544,13 +559,16 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_auth_basic.html #srv/web/ipfire/manual/mod/mod_auth_basic.html.en +#srv/web/ipfire/manual/mod/mod_auth_basic.html.fr #srv/web/ipfire/manual/mod/mod_auth_basic.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_auth_digest.html #srv/web/ipfire/manual/mod/mod_auth_digest.html.en +#srv/web/ipfire/manual/mod/mod_auth_digest.html.fr #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authn_alias.html #srv/web/ipfire/manual/mod/mod_authn_alias.html.en +#srv/web/ipfire/manual/mod/mod_authn_alias.html.fr #srv/web/ipfire/manual/mod/mod_authn_anon.html #srv/web/ipfire/manual/mod/mod_authn_anon.html.en #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8 @@ -567,10 +585,12 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_authn_default.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authn_file.html #srv/web/ipfire/manual/mod/mod_authn_file.html.en +#srv/web/ipfire/manual/mod/mod_authn_file.html.fr #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authnz_ldap.html #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en +#srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr #srv/web/ipfire/manual/mod/mod_authz_dbm.html #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr @@ -596,6 +616,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html #srv/web/ipfire/manual/mod/mod_autoindex.html.en +#srv/web/ipfire/manual/mod/mod_autoindex.html.fr #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8 @@ -724,6 +745,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en #srv/web/ipfire/manual/mod/mod_proxy.html #srv/web/ipfire/manual/mod/mod_proxy.html.en +#srv/web/ipfire/manual/mod/mod_proxy.html.fr #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en @@ -738,12 +760,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en #srv/web/ipfire/manual/mod/mod_proxy_http.html #srv/web/ipfire/manual/mod/mod_proxy_http.html.en +#srv/web/ipfire/manual/mod/mod_proxy_http.html.fr #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en #srv/web/ipfire/manual/mod/mod_reqtimeout.html #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en #srv/web/ipfire/manual/mod/mod_rewrite.html #srv/web/ipfire/manual/mod/mod_rewrite.html.en +#srv/web/ipfire/manual/mod/mod_rewrite.html.fr #srv/web/ipfire/manual/mod/mod_setenvif.html #srv/web/ipfire/manual/mod/mod_setenvif.html.en #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8 @@ -769,6 +793,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_substitute.html.en #srv/web/ipfire/manual/mod/mod_suexec.html #srv/web/ipfire/manual/mod/mod_suexec.html.en +#srv/web/ipfire/manual/mod/mod_suexec.html.fr #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8 @@ -821,6 +846,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr #srv/web/ipfire/manual/mod/quickreference.html.ru.koi8-r #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8 +#srv/web/ipfire/manual/mod/quickreference.html.zh-cn #srv/web/ipfire/manual/mod/worker.html #srv/web/ipfire/manual/mod/worker.html.de #srv/web/ipfire/manual/mod/worker.html.en @@ -834,6 +860,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mpm.html.ja.utf8 #srv/web/ipfire/manual/mpm.html.ko.euc-kr #srv/web/ipfire/manual/mpm.html.tr.utf8 +#srv/web/ipfire/manual/mpm.html.zh-cn #srv/web/ipfire/manual/new_features_2_0.html #srv/web/ipfire/manual/new_features_2_0.html.de #srv/web/ipfire/manual/new_features_2_0.html.en @@ -856,6 +883,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/platform/index.html #srv/web/ipfire/manual/platform/index.html.en #srv/web/ipfire/manual/platform/index.html.ko.euc-kr +#srv/web/ipfire/manual/platform/index.html.zh-cn #srv/web/ipfire/manual/platform/netware.html #srv/web/ipfire/manual/platform/netware.html.en #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr @@ -917,6 +945,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/programs/index.html.ko.euc-kr #srv/web/ipfire/manual/programs/index.html.ru.koi8-r #srv/web/ipfire/manual/programs/index.html.tr.utf8 +#srv/web/ipfire/manual/programs/index.html.zh-cn #srv/web/ipfire/manual/programs/logresolve.html #srv/web/ipfire/manual/programs/logresolve.html.en #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr @@ -934,19 +963,36 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr #srv/web/ipfire/manual/programs/suexec.html.tr.utf8 #srv/web/ipfire/manual/rewrite +#srv/web/ipfire/manual/rewrite/access.html +#srv/web/ipfire/manual/rewrite/access.html.en +#srv/web/ipfire/manual/rewrite/advanced.html +#srv/web/ipfire/manual/rewrite/advanced.html.en +#srv/web/ipfire/manual/rewrite/avoid.html +#srv/web/ipfire/manual/rewrite/avoid.html.en +#srv/web/ipfire/manual/rewrite/flags.html +#srv/web/ipfire/manual/rewrite/flags.html.en +#srv/web/ipfire/manual/rewrite/flags.html.fr +#srv/web/ipfire/manual/rewrite/htaccess.html +#srv/web/ipfire/manual/rewrite/htaccess.html.en #srv/web/ipfire/manual/rewrite/index.html #srv/web/ipfire/manual/rewrite/index.html.en +#srv/web/ipfire/manual/rewrite/index.html.fr #srv/web/ipfire/manual/rewrite/index.html.tr.utf8 -#srv/web/ipfire/manual/rewrite/rewrite_flags.html -#srv/web/ipfire/manual/rewrite/rewrite_flags.html.en -#srv/web/ipfire/manual/rewrite/rewrite_guide.html -#srv/web/ipfire/manual/rewrite/rewrite_guide.html.en -#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html -#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html.en -#srv/web/ipfire/manual/rewrite/rewrite_intro.html -#srv/web/ipfire/manual/rewrite/rewrite_intro.html.en -#srv/web/ipfire/manual/rewrite/rewrite_tech.html -#srv/web/ipfire/manual/rewrite/rewrite_tech.html.en +#srv/web/ipfire/manual/rewrite/index.html.zh-cn +#srv/web/ipfire/manual/rewrite/intro.html +#srv/web/ipfire/manual/rewrite/intro.html.en +#srv/web/ipfire/manual/rewrite/intro.html.fr +#srv/web/ipfire/manual/rewrite/proxy.html +#srv/web/ipfire/manual/rewrite/proxy.html.en +#srv/web/ipfire/manual/rewrite/remapping.html +#srv/web/ipfire/manual/rewrite/remapping.html.en +#srv/web/ipfire/manual/rewrite/rewritemap.html +#srv/web/ipfire/manual/rewrite/rewritemap.html.en +#srv/web/ipfire/manual/rewrite/tech.html +#srv/web/ipfire/manual/rewrite/tech.html.en +#srv/web/ipfire/manual/rewrite/tech.html.fr +#srv/web/ipfire/manual/rewrite/vhosts.html +#srv/web/ipfire/manual/rewrite/vhosts.html.en #srv/web/ipfire/manual/sections.html #srv/web/ipfire/manual/sections.html.en #srv/web/ipfire/manual/sections.html.fr @@ -965,11 +1011,13 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/sitemap.html.ja.utf8 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr #srv/web/ipfire/manual/sitemap.html.tr.utf8 +#srv/web/ipfire/manual/sitemap.html.zh-cn #srv/web/ipfire/manual/ssl #srv/web/ipfire/manual/ssl/index.html #srv/web/ipfire/manual/ssl/index.html.en #srv/web/ipfire/manual/ssl/index.html.ja.utf8 #srv/web/ipfire/manual/ssl/index.html.tr.utf8 +#srv/web/ipfire/manual/ssl/index.html.zh-cn #srv/web/ipfire/manual/ssl/ssl_compat.html #srv/web/ipfire/manual/ssl/ssl_compat.html.en #srv/web/ipfire/manual/ssl/ssl_faq.html @@ -1010,6 +1058,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/style/xsl/util #srv/web/ipfire/manual/suexec.html #srv/web/ipfire/manual/suexec.html.en +#srv/web/ipfire/manual/suexec.html.fr #srv/web/ipfire/manual/suexec.html.ja.utf8 #srv/web/ipfire/manual/suexec.html.ko.euc-kr #srv/web/ipfire/manual/suexec.html.tr.utf8 @@ -1048,6 +1097,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr #srv/web/ipfire/manual/vhosts/index.html.ru.koi8-r #srv/web/ipfire/manual/vhosts/index.html.tr.utf8 +#srv/web/ipfire/manual/vhosts/index.html.zh-cn #srv/web/ipfire/manual/vhosts/ip-based.html #srv/web/ipfire/manual/vhosts/ip-based.html.en #srv/web/ipfire/manual/vhosts/ip-based.html.fr @@ -1262,12 +1312,12 @@ usr/lib/apache/mod_vhost_alias.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.4.2 +usr/lib/libapr-1.so.0.4.5 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.3.10 +usr/lib/libaprutil-1.so.0.3.12 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab @@ -1333,7 +1383,6 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi srv/web/ipfire/cgi-bin/iptables.cgi srv/web/ipfire/cgi-bin/logs.cgi srv/web/ipfire/cgi-bin/mac.cgi -#srv/web/ipfire/cgi-bin/mdstat.cgi srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/memory.cgi srv/web/ipfire/cgi-bin/modem.cgi diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index b5fa08f..c6421cb 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -1815,7 +1815,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.1-py2.7.egg-info +usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1882,7 +1882,6 @@ usr/lib/python2.7/lib-dynload/termios.so usr/lib/python2.7/lib-dynload/time.so usr/lib/python2.7/lib-dynload/unicodedata.so usr/lib/python2.7/lib-dynload/zlib.so -#usr/lib/python2.7/lib-old #usr/lib/python2.7/lib-tk #usr/lib/python2.7/lib-tk/Canvas.py #usr/lib/python2.7/lib-tk/Canvas.pyc @@ -1974,12 +1973,15 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.1.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.1.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo +#usr/lib/python2.7/lib2to3/__main__.py +#usr/lib/python2.7/lib2to3/__main__.pyc +#usr/lib/python2.7/lib2to3/__main__.pyo #usr/lib/python2.7/lib2to3/btm_matcher.py #usr/lib/python2.7/lib2to3/btm_matcher.pyc #usr/lib/python2.7/lib2to3/btm_matcher.pyo @@ -2643,9 +2645,33 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/buffer_tests.pyo #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/check_soundcard.vbs -#usr/lib/python2.7/test/cjkencodings_test.py -#usr/lib/python2.7/test/cjkencodings_test.pyc -#usr/lib/python2.7/test/cjkencodings_test.pyo +#usr/lib/python2.7/test/cjkencodings +#usr/lib/python2.7/test/cjkencodings/big5-utf8.txt +#usr/lib/python2.7/test/cjkencodings/big5.txt +#usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt +#usr/lib/python2.7/test/cjkencodings/big5hkscs.txt +#usr/lib/python2.7/test/cjkencodings/cp949-utf8.txt +#usr/lib/python2.7/test/cjkencodings/cp949.txt +#usr/lib/python2.7/test/cjkencodings/euc_jisx0213-utf8.txt +#usr/lib/python2.7/test/cjkencodings/euc_jisx0213.txt +#usr/lib/python2.7/test/cjkencodings/euc_jp-utf8.txt +#usr/lib/python2.7/test/cjkencodings/euc_jp.txt +#usr/lib/python2.7/test/cjkencodings/euc_kr-utf8.txt +#usr/lib/python2.7/test/cjkencodings/euc_kr.txt +#usr/lib/python2.7/test/cjkencodings/gb18030-utf8.txt +#usr/lib/python2.7/test/cjkencodings/gb18030.txt +#usr/lib/python2.7/test/cjkencodings/gb2312-utf8.txt +#usr/lib/python2.7/test/cjkencodings/gb2312.txt +#usr/lib/python2.7/test/cjkencodings/gbk-utf8.txt +#usr/lib/python2.7/test/cjkencodings/gbk.txt +#usr/lib/python2.7/test/cjkencodings/hz-utf8.txt +#usr/lib/python2.7/test/cjkencodings/hz.txt +#usr/lib/python2.7/test/cjkencodings/johab-utf8.txt +#usr/lib/python2.7/test/cjkencodings/johab.txt +#usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt +#usr/lib/python2.7/test/cjkencodings/shift_jis.txt +#usr/lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt +#usr/lib/python2.7/test/cjkencodings/shift_jisx0213.txt #usr/lib/python2.7/test/cmath_testcases.txt #usr/lib/python2.7/test/curses_tests.py #usr/lib/python2.7/test/curses_tests.pyc @@ -2894,6 +2920,10 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo +#usr/lib/python2.7/test/subprocessdata +#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py +#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc +#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo #usr/lib/python2.7/test/svn_python_org_https_cert.pem #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc @@ -3542,6 +3572,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_modulefinder.py #usr/lib/python2.7/test/test_modulefinder.pyc #usr/lib/python2.7/test/test_modulefinder.pyo +#usr/lib/python2.7/test/test_msilib.py +#usr/lib/python2.7/test/test_msilib.pyc +#usr/lib/python2.7/test/test_msilib.pyo #usr/lib/python2.7/test/test_multibytecodec.py #usr/lib/python2.7/test/test_multibytecodec.pyc #usr/lib/python2.7/test/test_multibytecodec.pyo diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude index 6fe46b4..ce199d8 100644 --- a/config/rootfiles/core/48/exclude +++ b/config/rootfiles/core/48/exclude @@ -1 +1 @@ -/srv/web/ipfire/html/proxy.pac +srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude index 6fe46b4..ce199d8 100644 --- a/config/rootfiles/core/49/exclude +++ b/config/rootfiles/core/49/exclude @@ -1 +1 @@ -/srv/web/ipfire/html/proxy.pac +srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 032958b..3bc88dd 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives @@ -6,9 +7,11 @@ var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons deleted file mode 100644 index 52b22e0..0000000 --- a/config/rootfiles/core/49/filelists/icons +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/images/delete.gif -srv/web/ipfire/html/images/document-save.png -srv/web/ipfire/html/images/edit.gif -srv/web/ipfire/html/images/floppy.gif -srv/web/ipfire/html/images/forward.gif -srv/web/ipfire/html/images/info.gif -srv/web/ipfire/html/images/list-add.png -srv/web/ipfire/html/images/list-remove.png -srv/web/ipfire/html/images/package-x-generic.png -srv/web/ipfire/html/images/reload.gif -srv/web/ipfire/html/images/stock_ok.png -srv/web/ipfire/html/images/stock_stop.png -srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude new file mode 100644 index 0000000..bb0d8c8 --- /dev/null +++ b/config/rootfiles/core/50/exclude @@ -0,0 +1,2 @@ +srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/50/filelists/apache2 b/config/rootfiles/core/50/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/50/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/50/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/50/filelists/gettext b/config/rootfiles/core/50/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/core/50/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons new file mode 100644 index 0000000..52b22e0 --- /dev/null +++ b/config/rootfiles/core/50/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/filelists/python b/config/rootfiles/core/50/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/50/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/core/50/meta b/config/rootfiles/core/50/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/50/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh new file mode 100644 index 0000000..6c0c2ea --- /dev/null +++ b/config/rootfiles/core/50/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=50 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index fae43b8..b08aec6 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,18 +10,19 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.9 +usr/lib/libclamav.so.6.1.10 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.9 +usr/lib/libclamunrar.so.6.1.10 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.9 +usr/lib/libclamunrar_iface.so.6.1.10 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav +#usr/share/man/man1/clambc.1 #usr/share/man/man1/clamconf.1 #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175 index e659623..6e366c2 100644 --- a/config/rootfiles/packages/client175 +++ b/config/rootfiles/packages/client175 @@ -46,6 +46,7 @@ srv/client175/cherrypy/process/wspbus.py #srv/client175/cherrypy/wsgiserver srv/client175/cherrypy/wsgiserver/__init__.py srv/client175/covers.py +srv/client175/httpd.conf.example srv/client175/lyricwiki.py #srv/client175/metadata srv/client175/metadata/COPYING @@ -99,6 +100,7 @@ srv/client175/site.conf srv/client175/static/COPYING.txt srv/client175/static/Thumbs.db srv/client175/static/covers +srv/client175/static/covers/album_blank.png #srv/client175/static/ext srv/client175/static/ext/ext-all-debug.js srv/client175/static/ext/ext-all.js @@ -2844,6 +2846,7 @@ srv/client175/static/icons/fugue/folder-horizontal.png srv/client175/static/icons/fugue/folder-microphone.png srv/client175/static/icons/fugue/folder-open-document-music.png srv/client175/static/icons/fugue/folder-open.png +srv/client175/static/icons/fugue/gear.png srv/client175/static/icons/fugue/globe--plus.png srv/client175/static/icons/fugue/home.png srv/client175/static/icons/fugue/information-frame.png diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index d83113c..6bf7e69 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -883,7 +883,6 @@ usr/share/doc/cups/help #usr/share/doc/cups/help/man-cupsenable.html #usr/share/doc/cups/help/man-cupstestdsc.html #usr/share/doc/cups/help/man-cupstestppd.html -#usr/share/doc/cups/help/man-drv.html #usr/share/doc/cups/help/man-filter.html #usr/share/doc/cups/help/man-lp.html #usr/share/doc/cups/help/man-lpadmin.html @@ -948,6 +947,7 @@ usr/share/doc/cups/images #usr/share/doc/cups/images/cups-postscript-chain.png #usr/share/doc/cups/images/cups-raster-chain.png #usr/share/doc/cups/images/cups.png +#usr/share/doc/cups/images/generic.png #usr/share/doc/cups/images/left.gif #usr/share/doc/cups/images/raster.png #usr/share/doc/cups/images/right.gif @@ -1012,7 +1012,6 @@ usr/share/doc/cups/robots.txt #usr/share/man/man5/printers.conf.5.gz #usr/share/man/man5/subscriptions.conf.5.gz #usr/share/man/man7/backend.7.gz -#usr/share/man/man7/drv.7.gz #usr/share/man/man7/filter.7.gz #usr/share/man/man7/notifier.7.gz #usr/share/man/man8/accept.8.gz diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 866d173..f103232 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core49.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/config/rootfiles/packages/libmpdclient b/config/rootfiles/packages/libmpdclient index ac22426..df102d7 100644 --- a/config/rootfiles/packages/libmpdclient +++ b/config/rootfiles/packages/libmpdclient @@ -24,6 +24,7 @@ #usr/include/mpd/response.h #usr/include/mpd/search.h #usr/include/mpd/send.h +#usr/include/mpd/settings.h #usr/include/mpd/song.h #usr/include/mpd/stats.h #usr/include/mpd/status.h @@ -34,7 +35,7 @@ #usr/lib/libmpdclient.la usr/lib/libmpdclient.so usr/lib/libmpdclient.so.2 -usr/lib/libmpdclient.so.2.0.0 +usr/lib/libmpdclient.so.2.0.1 #usr/lib/pkgconfig/libmpdclient.pc #usr/share/doc/libmpdclient #usr/share/doc/libmpdclient/COPYING diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 27d82a3..d061319 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,11 +1,20 @@ +#etc/qemu +etc/qemu/target-x86_64.conf usr/bin/qemu usr/bin/qemu-i386 usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd +#usr/share/doc/qemu +#usr/share/doc/qemu/qemu-doc.html +#usr/share/doc/qemu/qemu-tech.html +#usr/share/man/man1/qemu-img.1 +#usr/share/man/man1/qemu.1 +#usr/share/man/man8/qemu-nbd.8 usr/share/qemu usr/share/qemu/bamboo.dtb usr/share/qemu/bios.bin +usr/share/qemu/gpxe-eepro100-80861209.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/common @@ -50,11 +59,13 @@ usr/share/qemu/openbios-sparc64 usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin usr/share/qemu/pxe-e1000.bin -usr/share/qemu/pxe-i82559er.bin usr/share/qemu/pxe-ne2k_pci.bin usr/share/qemu/pxe-pcnet.bin usr/share/qemu/pxe-rtl8139.bin usr/share/qemu/pxe-virtio.bin +usr/share/qemu/s390-zipl.rom usr/share/qemu/vgabios-cirrus.bin +usr/share/qemu/vgabios-qxl.bin +usr/share/qemu/vgabios-stdvga.bin +usr/share/qemu/vgabios-vmware.bin usr/share/qemu/vgabios.bin -usr/share/qemu/video.x diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane index 8e91815..411243e 100644 --- a/config/rootfiles/packages/sane +++ b/config/rootfiles/packages/sane @@ -1,104 +1,6 @@ -usr/bin/gamma4scanimage -usr/bin/sane-config -usr/bin/sane-find-scanner -usr/bin/scanimage -#usr/doc/sane-1.0.19 -usr/doc/sane-1.0.19/AUTHORS -usr/doc/sane-1.0.19/COPYING -usr/doc/sane-1.0.19/ChangeLog -usr/doc/sane-1.0.19/LICENSE -usr/doc/sane-1.0.19/NEWS -usr/doc/sane-1.0.19/PROBLEMS -usr/doc/sane-1.0.19/PROJECTS -usr/doc/sane-1.0.19/README -#usr/doc/sane-1.0.19/README.aix -#usr/doc/sane-1.0.19/README.beos -#usr/doc/sane-1.0.19/README.darwin -#usr/doc/sane-1.0.19/README.djpeg -#usr/doc/sane-1.0.19/README.freebsd -#usr/doc/sane-1.0.19/README.hp-ux -usr/doc/sane-1.0.19/README.linux -#usr/doc/sane-1.0.19/README.netbsd -#usr/doc/sane-1.0.19/README.openbsd -#usr/doc/sane-1.0.19/README.os2 -#usr/doc/sane-1.0.19/README.solaris -#usr/doc/sane-1.0.19/README.unixware2 -#usr/doc/sane-1.0.19/README.unixware7 -usr/doc/sane-1.0.19/README.windows -#usr/doc/sane-1.0.19/README.zeta -usr/doc/sane-1.0.19/backend-writing.txt -#usr/doc/sane-1.0.19/canon -usr/doc/sane-1.0.19/canon/canon.changes -usr/doc/sane-1.0.19/canon/canon.install2700F.txt -#usr/doc/sane-1.0.19/gt68xx -usr/doc/sane-1.0.19/gt68xx/gt68xx.CHANGES -usr/doc/sane-1.0.19/gt68xx/gt68xx.TODO -#usr/doc/sane-1.0.19/leo -usr/doc/sane-1.0.19/leo/leo.txt -#usr/doc/sane-1.0.19/matsushita -usr/doc/sane-1.0.19/matsushita/matsushita.txt -#usr/doc/sane-1.0.19/mustek -usr/doc/sane-1.0.19/mustek/mustek.CHANGES -#usr/doc/sane-1.0.19/mustek_usb -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.CHANGES -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.TODO -#usr/doc/sane-1.0.19/mustek_usb2 -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.CHANGES -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.TODO -#usr/doc/sane-1.0.19/niash -usr/doc/sane-1.0.19/niash/niash.TODO -#usr/doc/sane-1.0.19/plustek -usr/doc/sane-1.0.19/plustek/FAQ -usr/doc/sane-1.0.19/plustek/MakeModule.sh -#usr/doc/sane-1.0.19/plustek/Makefile.kernel24 -usr/doc/sane-1.0.19/plustek/Makefile.kernel26 -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.changes -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB.changes -usr/doc/sane-1.0.19/plustek/Plustek-USB.txt -usr/doc/sane-1.0.19/sane-backends-external.html -usr/doc/sane-1.0.19/sane-backends.html -usr/doc/sane-1.0.19/sane-mfgs-external.html -usr/doc/sane-1.0.19/sane-mfgs.html -#usr/doc/sane-1.0.19/sceptre -usr/doc/sane-1.0.19/sceptre/s1200.txt -#usr/doc/sane-1.0.19/teco -usr/doc/sane-1.0.19/teco/teco1.txt -usr/doc/sane-1.0.19/teco/teco2.txt -usr/doc/sane-1.0.19/teco/teco3.txt -#usr/doc/sane-1.0.19/u12 -usr/doc/sane-1.0.19/u12/U12.changes -usr/doc/sane-1.0.19/u12/U12.todo -#usr/doc/sane-1.0.19/umax -usr/doc/sane-1.0.19/umax/negative-types.txt -usr/doc/sane-1.0.19/umax/sane-logo.jpg -usr/doc/sane-1.0.19/umax/sane-umax-advanced-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-advanced.jpg -usr/doc/sane-1.0.19/umax/sane-umax-astra-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-config-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-histogram.jpg -usr/doc/sane-1.0.19/umax/sane-umax-mirage-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-not-listed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-others-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-parport-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-powerlook-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-scanner-clones-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-speed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text2.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text4.jpg -usr/doc/sane-1.0.19/umax/sane-umax-uc-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-vista-doc.html -usr/doc/sane-1.0.19/umax/sane-umax.jpg -usr/doc/sane-1.0.19/umax/umax.BUGS -usr/doc/sane-1.0.19/umax/umax.CHANGES -usr/doc/sane-1.0.19/umax/umax.FAQ -usr/doc/sane-1.0.19/umax/umax.TODO +etc/rc.d/rc0.d/K10sane +etc/rc.d/rc3.d/S95sane +etc/rc.d/rc6.d/K10sane #etc/sane.d etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf @@ -109,14 +11,17 @@ etc/sane.d/avision.conf etc/sane.d/bh.conf etc/sane.d/canon.conf etc/sane.d/canon630u.conf +etc/sane.d/canon_dr.conf etc/sane.d/cardscan.conf etc/sane.d/coolscan.conf etc/sane.d/coolscan2.conf +etc/sane.d/coolscan3.conf etc/sane.d/dc210.conf etc/sane.d/dc240.conf etc/sane.d/dc25.conf etc/sane.d/dell1600n_net.conf etc/sane.d/dll.conf +etc/sane.d/dll.d etc/sane.d/dmc.conf etc/sane.d/epjitsu.conf etc/sane.d/epson.conf @@ -130,21 +35,27 @@ etc/sane.d/hp4200.conf etc/sane.d/hp5400.conf etc/sane.d/hs2p.conf etc/sane.d/ibm.conf +etc/sane.d/kodak.conf etc/sane.d/leo.conf etc/sane.d/lexmark.conf etc/sane.d/ma1509.conf +etc/sane.d/magicolor.conf etc/sane.d/matsushita.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf etc/sane.d/mustek.conf +etc/sane.d/mustek_pp.conf etc/sane.d/mustek_usb.conf etc/sane.d/nec.conf etc/sane.d/net.conf +etc/sane.d/p5.conf etc/sane.d/pie.conf +etc/sane.d/pixma.conf etc/sane.d/plustek.conf etc/sane.d/plustek_pp.conf etc/sane.d/qcam.conf etc/sane.d/ricoh.conf +etc/sane.d/rts8891.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf etc/sane.d/sceptre.conf @@ -163,414 +74,546 @@ etc/sane.d/u12.conf etc/sane.d/umax.conf etc/sane.d/umax1220u.conf etc/sane.d/umax_pp.conf -etc/sane.d/v4l.conf +etc/sane.d/xerox_mfp.conf +usr/bin/gamma4scanimage +usr/bin/sane-config +usr/bin/sane-find-scanner +usr/bin/scanimage +usr/doc/sane-1.0.22 +usr/doc/sane-1.0.22/AUTHORS +usr/doc/sane-1.0.22/COPYING +usr/doc/sane-1.0.22/ChangeLog +usr/doc/sane-1.0.22/LICENSE +usr/doc/sane-1.0.22/NEWS +usr/doc/sane-1.0.22/PROBLEMS +usr/doc/sane-1.0.22/PROJECTS +usr/doc/sane-1.0.22/README +#usr/doc/sane-1.0.22/README.aix +#usr/doc/sane-1.0.22/README.beos +#usr/doc/sane-1.0.22/README.darwin +usr/doc/sane-1.0.22/README.djpeg +#usr/doc/sane-1.0.22/README.freebsd +#usr/doc/sane-1.0.22/README.hp-ux +usr/doc/sane-1.0.22/README.linux +#usr/doc/sane-1.0.22/README.netbsd +#usr/doc/sane-1.0.22/README.openbsd +#usr/doc/sane-1.0.22/README.os2 +#usr/doc/sane-1.0.22/README.solaris +#usr/doc/sane-1.0.22/README.unixware2 +#usr/doc/sane-1.0.22/README.unixware7 +#usr/doc/sane-1.0.22/README.windows +#usr/doc/sane-1.0.22/README.zeta +#usr/doc/sane-1.0.22/backend-writing.txt +usr/doc/sane-1.0.22/canon +usr/doc/sane-1.0.22/canon/canon.changes +usr/doc/sane-1.0.22/canon/canon.install2700F.txt +#usr/doc/sane-1.0.22/gt68xx +usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES +usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO +#usr/doc/sane-1.0.22/leo +usr/doc/sane-1.0.22/leo/leo.txt +#usr/doc/sane-1.0.22/matsushita +usr/doc/sane-1.0.22/matsushita/matsushita.txt +#usr/doc/sane-1.0.22/mustek +usr/doc/sane-1.0.22/mustek/mustek.CHANGES +#usr/doc/sane-1.0.22/mustek_usb +usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES +usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO +#usr/doc/sane-1.0.22/mustek_usb2 +usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES +usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO +#usr/doc/sane-1.0.22/niash +usr/doc/sane-1.0.22/niash/niash.TODO +#usr/doc/sane-1.0.22/plustek +usr/doc/sane-1.0.22/plustek/FAQ +usr/doc/sane-1.0.22/plustek/MakeModule.sh +#usr/doc/sane-1.0.22/plustek/Makefile.kernel24 +usr/doc/sane-1.0.22/plustek/Makefile.kernel26 +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt +usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt +usr/doc/sane-1.0.22/plustek/Plustek-USB.changes +usr/doc/sane-1.0.22/plustek/Plustek-USB.txt +usr/doc/sane-1.0.22/sane-backends-external.html +usr/doc/sane-1.0.22/sane-backends.html +usr/doc/sane-1.0.22/sane-mfgs-external.html +usr/doc/sane-1.0.22/sane-mfgs.html +#usr/doc/sane-1.0.22/sceptre +usr/doc/sane-1.0.22/sceptre/s1200.txt +#usr/doc/sane-1.0.22/teco +usr/doc/sane-1.0.22/teco/teco1.txt +usr/doc/sane-1.0.22/teco/teco2.txt +usr/doc/sane-1.0.22/teco/teco3.txt +#usr/doc/sane-1.0.22/u12 +usr/doc/sane-1.0.22/u12/U12.changes +usr/doc/sane-1.0.22/u12/U12.todo +#usr/doc/sane-1.0.22/umax +usr/doc/sane-1.0.22/umax/negative-types.txt +usr/doc/sane-1.0.22/umax/sane-logo.jpg +usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg +usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg +usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg +usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html +usr/doc/sane-1.0.22/umax/sane-umax.jpg +usr/doc/sane-1.0.22/umax/umax.BUGS +usr/doc/sane-1.0.22/umax/umax.CHANGES +usr/doc/sane-1.0.22/umax/umax.FAQ +usr/doc/sane-1.0.22/umax/umax.TODO #usr/include/sane usr/include/sane/sane.h usr/include/sane/saneopts.h -usr/lib/libsane.la +#usr/lib/libsane.la usr/lib/libsane.so usr/lib/libsane.so.1 -usr/lib/libsane.so.1.0.19 +usr/lib/libsane.so.1.0.22 #usr/lib/sane #usr/lib/sane/libsane-abaton.la usr/lib/sane/libsane-abaton.so usr/lib/sane/libsane-abaton.so.1 -usr/lib/sane/libsane-abaton.so.1.0.19 +usr/lib/sane/libsane-abaton.so.1.0.22 #usr/lib/sane/libsane-agfafocus.la usr/lib/sane/libsane-agfafocus.so usr/lib/sane/libsane-agfafocus.so.1 -usr/lib/sane/libsane-agfafocus.so.1.0.19 +usr/lib/sane/libsane-agfafocus.so.1.0.22 #usr/lib/sane/libsane-apple.la usr/lib/sane/libsane-apple.so usr/lib/sane/libsane-apple.so.1 -usr/lib/sane/libsane-apple.so.1.0.19 +usr/lib/sane/libsane-apple.so.1.0.22 #usr/lib/sane/libsane-artec.la usr/lib/sane/libsane-artec.so usr/lib/sane/libsane-artec.so.1 -usr/lib/sane/libsane-artec.so.1.0.19 +usr/lib/sane/libsane-artec.so.1.0.22 #usr/lib/sane/libsane-artec_eplus48u.la usr/lib/sane/libsane-artec_eplus48u.so usr/lib/sane/libsane-artec_eplus48u.so.1 -usr/lib/sane/libsane-artec_eplus48u.so.1.0.19 +usr/lib/sane/libsane-artec_eplus48u.so.1.0.22 #usr/lib/sane/libsane-as6e.la usr/lib/sane/libsane-as6e.so usr/lib/sane/libsane-as6e.so.1 -usr/lib/sane/libsane-as6e.so.1.0.19 +usr/lib/sane/libsane-as6e.so.1.0.22 #usr/lib/sane/libsane-avision.la usr/lib/sane/libsane-avision.so usr/lib/sane/libsane-avision.so.1 -usr/lib/sane/libsane-avision.so.1.0.19 +usr/lib/sane/libsane-avision.so.1.0.22 #usr/lib/sane/libsane-bh.la usr/lib/sane/libsane-bh.so usr/lib/sane/libsane-bh.so.1 -usr/lib/sane/libsane-bh.so.1.0.19 +usr/lib/sane/libsane-bh.so.1.0.22 #usr/lib/sane/libsane-canon.la usr/lib/sane/libsane-canon.so usr/lib/sane/libsane-canon.so.1 -usr/lib/sane/libsane-canon.so.1.0.19 +usr/lib/sane/libsane-canon.so.1.0.22 #usr/lib/sane/libsane-canon630u.la usr/lib/sane/libsane-canon630u.so usr/lib/sane/libsane-canon630u.so.1 -usr/lib/sane/libsane-canon630u.so.1.0.19 +usr/lib/sane/libsane-canon630u.so.1.0.22 +#usr/lib/sane/libsane-canon_dr.la +usr/lib/sane/libsane-canon_dr.so +usr/lib/sane/libsane-canon_dr.so.1 +usr/lib/sane/libsane-canon_dr.so.1.0.22 #usr/lib/sane/libsane-cardscan.la usr/lib/sane/libsane-cardscan.so usr/lib/sane/libsane-cardscan.so.1 -usr/lib/sane/libsane-cardscan.so.1.0.19 +usr/lib/sane/libsane-cardscan.so.1.0.22 #usr/lib/sane/libsane-coolscan.la usr/lib/sane/libsane-coolscan.so usr/lib/sane/libsane-coolscan.so.1 -usr/lib/sane/libsane-coolscan.so.1.0.19 +usr/lib/sane/libsane-coolscan.so.1.0.22 #usr/lib/sane/libsane-coolscan2.la usr/lib/sane/libsane-coolscan2.so usr/lib/sane/libsane-coolscan2.so.1 -usr/lib/sane/libsane-coolscan2.so.1.0.19 +usr/lib/sane/libsane-coolscan2.so.1.0.22 +#usr/lib/sane/libsane-coolscan3.la +usr/lib/sane/libsane-coolscan3.so +usr/lib/sane/libsane-coolscan3.so.1 +usr/lib/sane/libsane-coolscan3.so.1.0.22 #usr/lib/sane/libsane-dc210.la usr/lib/sane/libsane-dc210.so usr/lib/sane/libsane-dc210.so.1 -usr/lib/sane/libsane-dc210.so.1.0.19 +usr/lib/sane/libsane-dc210.so.1.0.22 #usr/lib/sane/libsane-dc240.la usr/lib/sane/libsane-dc240.so usr/lib/sane/libsane-dc240.so.1 -usr/lib/sane/libsane-dc240.so.1.0.19 +usr/lib/sane/libsane-dc240.so.1.0.22 #usr/lib/sane/libsane-dc25.la usr/lib/sane/libsane-dc25.so usr/lib/sane/libsane-dc25.so.1 -usr/lib/sane/libsane-dc25.so.1.0.19 +usr/lib/sane/libsane-dc25.so.1.0.22 #usr/lib/sane/libsane-dell1600n_net.la usr/lib/sane/libsane-dell1600n_net.so usr/lib/sane/libsane-dell1600n_net.so.1 -usr/lib/sane/libsane-dell1600n_net.so.1.0.19 +usr/lib/sane/libsane-dell1600n_net.so.1.0.22 #usr/lib/sane/libsane-dll.la usr/lib/sane/libsane-dll.so usr/lib/sane/libsane-dll.so.1 -usr/lib/sane/libsane-dll.so.1.0.19 +usr/lib/sane/libsane-dll.so.1.0.22 #usr/lib/sane/libsane-dmc.la usr/lib/sane/libsane-dmc.so usr/lib/sane/libsane-dmc.so.1 -usr/lib/sane/libsane-dmc.so.1.0.19 +usr/lib/sane/libsane-dmc.so.1.0.22 #usr/lib/sane/libsane-epjitsu.la usr/lib/sane/libsane-epjitsu.so usr/lib/sane/libsane-epjitsu.so.1 -usr/lib/sane/libsane-epjitsu.so.1.0.19 +usr/lib/sane/libsane-epjitsu.so.1.0.22 #usr/lib/sane/libsane-epson.la usr/lib/sane/libsane-epson.so usr/lib/sane/libsane-epson.so.1 -usr/lib/sane/libsane-epson.so.1.0.19 +usr/lib/sane/libsane-epson.so.1.0.22 #usr/lib/sane/libsane-epson2.la usr/lib/sane/libsane-epson2.so usr/lib/sane/libsane-epson2.so.1 -usr/lib/sane/libsane-epson2.so.1.0.19 +usr/lib/sane/libsane-epson2.so.1.0.22 #usr/lib/sane/libsane-fujitsu.la usr/lib/sane/libsane-fujitsu.so usr/lib/sane/libsane-fujitsu.so.1 -usr/lib/sane/libsane-fujitsu.so.1.0.19 +usr/lib/sane/libsane-fujitsu.so.1.0.22 #usr/lib/sane/libsane-genesys.la usr/lib/sane/libsane-genesys.so usr/lib/sane/libsane-genesys.so.1 -usr/lib/sane/libsane-genesys.so.1.0.19 +usr/lib/sane/libsane-genesys.so.1.0.22 #usr/lib/sane/libsane-gt68xx.la usr/lib/sane/libsane-gt68xx.so usr/lib/sane/libsane-gt68xx.so.1 -usr/lib/sane/libsane-gt68xx.so.1.0.19 +usr/lib/sane/libsane-gt68xx.so.1.0.22 #usr/lib/sane/libsane-hp.la usr/lib/sane/libsane-hp.so usr/lib/sane/libsane-hp.so.1 -usr/lib/sane/libsane-hp.so.1.0.19 +usr/lib/sane/libsane-hp.so.1.0.22 #usr/lib/sane/libsane-hp3500.la usr/lib/sane/libsane-hp3500.so usr/lib/sane/libsane-hp3500.so.1 -usr/lib/sane/libsane-hp3500.so.1.0.19 +usr/lib/sane/libsane-hp3500.so.1.0.22 #usr/lib/sane/libsane-hp3900.la usr/lib/sane/libsane-hp3900.so usr/lib/sane/libsane-hp3900.so.1 -usr/lib/sane/libsane-hp3900.so.1.0.19 +usr/lib/sane/libsane-hp3900.so.1.0.22 #usr/lib/sane/libsane-hp4200.la usr/lib/sane/libsane-hp4200.so usr/lib/sane/libsane-hp4200.so.1 -usr/lib/sane/libsane-hp4200.so.1.0.19 +usr/lib/sane/libsane-hp4200.so.1.0.22 #usr/lib/sane/libsane-hp5400.la usr/lib/sane/libsane-hp5400.so usr/lib/sane/libsane-hp5400.so.1 -usr/lib/sane/libsane-hp5400.so.1.0.19 +usr/lib/sane/libsane-hp5400.so.1.0.22 #usr/lib/sane/libsane-hp5590.la usr/lib/sane/libsane-hp5590.so usr/lib/sane/libsane-hp5590.so.1 -usr/lib/sane/libsane-hp5590.so.1.0.19 +usr/lib/sane/libsane-hp5590.so.1.0.22 #usr/lib/sane/libsane-hpljm1005.la usr/lib/sane/libsane-hpljm1005.so usr/lib/sane/libsane-hpljm1005.so.1 -usr/lib/sane/libsane-hpljm1005.so.1.0.19 +usr/lib/sane/libsane-hpljm1005.so.1.0.22 #usr/lib/sane/libsane-hs2p.la usr/lib/sane/libsane-hs2p.so usr/lib/sane/libsane-hs2p.so.1 -usr/lib/sane/libsane-hs2p.so.1.0.19 +usr/lib/sane/libsane-hs2p.so.1.0.22 #usr/lib/sane/libsane-ibm.la usr/lib/sane/libsane-ibm.so usr/lib/sane/libsane-ibm.so.1 -usr/lib/sane/libsane-ibm.so.1.0.19 +usr/lib/sane/libsane-ibm.so.1.0.22 +#usr/lib/sane/libsane-kodak.la +usr/lib/sane/libsane-kodak.so +usr/lib/sane/libsane-kodak.so.1 +usr/lib/sane/libsane-kodak.so.1.0.22 +#usr/lib/sane/libsane-kvs1025.la +usr/lib/sane/libsane-kvs1025.so +usr/lib/sane/libsane-kvs1025.so.1 +usr/lib/sane/libsane-kvs1025.so.1.0.22 +#usr/lib/sane/libsane-kvs20xx.la +usr/lib/sane/libsane-kvs20xx.so +usr/lib/sane/libsane-kvs20xx.so.1 +usr/lib/sane/libsane-kvs20xx.so.1.0.22 #usr/lib/sane/libsane-leo.la usr/lib/sane/libsane-leo.so usr/lib/sane/libsane-leo.so.1 -usr/lib/sane/libsane-leo.so.1.0.19 +usr/lib/sane/libsane-leo.so.1.0.22 #usr/lib/sane/libsane-lexmark.la usr/lib/sane/libsane-lexmark.so usr/lib/sane/libsane-lexmark.so.1 -usr/lib/sane/libsane-lexmark.so.1.0.19 +usr/lib/sane/libsane-lexmark.so.1.0.22 #usr/lib/sane/libsane-ma1509.la usr/lib/sane/libsane-ma1509.so usr/lib/sane/libsane-ma1509.so.1 -usr/lib/sane/libsane-ma1509.so.1.0.19 +usr/lib/sane/libsane-ma1509.so.1.0.22 +#usr/lib/sane/libsane-magicolor.la +usr/lib/sane/libsane-magicolor.so +usr/lib/sane/libsane-magicolor.so.1 +usr/lib/sane/libsane-magicolor.so.1.0.22 #usr/lib/sane/libsane-matsushita.la usr/lib/sane/libsane-matsushita.so usr/lib/sane/libsane-matsushita.so.1 -usr/lib/sane/libsane-matsushita.so.1.0.19 +usr/lib/sane/libsane-matsushita.so.1.0.22 #usr/lib/sane/libsane-microtek.la usr/lib/sane/libsane-microtek.so usr/lib/sane/libsane-microtek.so.1 -usr/lib/sane/libsane-microtek.so.1.0.19 +usr/lib/sane/libsane-microtek.so.1.0.22 #usr/lib/sane/libsane-microtek2.la usr/lib/sane/libsane-microtek2.so usr/lib/sane/libsane-microtek2.so.1 -usr/lib/sane/libsane-microtek2.so.1.0.19 +usr/lib/sane/libsane-microtek2.so.1.0.22 #usr/lib/sane/libsane-mustek.la usr/lib/sane/libsane-mustek.so usr/lib/sane/libsane-mustek.so.1 -usr/lib/sane/libsane-mustek.so.1.0.19 +usr/lib/sane/libsane-mustek.so.1.0.22 +#usr/lib/sane/libsane-mustek_pp.la +usr/lib/sane/libsane-mustek_pp.so +usr/lib/sane/libsane-mustek_pp.so.1 +usr/lib/sane/libsane-mustek_pp.so.1.0.22 #usr/lib/sane/libsane-mustek_usb.la usr/lib/sane/libsane-mustek_usb.so usr/lib/sane/libsane-mustek_usb.so.1 -usr/lib/sane/libsane-mustek_usb.so.1.0.19 -#usr/lib/sane/libsane-mustek_usb2.la -usr/lib/sane/libsane-mustek_usb2.so -usr/lib/sane/libsane-mustek_usb2.so.1 -usr/lib/sane/libsane-mustek_usb2.so.1.0.19 +usr/lib/sane/libsane-mustek_usb.so.1.0.22 #usr/lib/sane/libsane-nec.la usr/lib/sane/libsane-nec.so usr/lib/sane/libsane-nec.so.1 -usr/lib/sane/libsane-nec.so.1.0.19 +usr/lib/sane/libsane-nec.so.1.0.22 #usr/lib/sane/libsane-net.la usr/lib/sane/libsane-net.so usr/lib/sane/libsane-net.so.1 -usr/lib/sane/libsane-net.so.1.0.19 +usr/lib/sane/libsane-net.so.1.0.22 #usr/lib/sane/libsane-niash.la usr/lib/sane/libsane-niash.so usr/lib/sane/libsane-niash.so.1 -usr/lib/sane/libsane-niash.so.1.0.19 +usr/lib/sane/libsane-niash.so.1.0.22 +#usr/lib/sane/libsane-p5.la +usr/lib/sane/libsane-p5.so +usr/lib/sane/libsane-p5.so.1 +usr/lib/sane/libsane-p5.so.1.0.22 #usr/lib/sane/libsane-pie.la usr/lib/sane/libsane-pie.so usr/lib/sane/libsane-pie.so.1 -usr/lib/sane/libsane-pie.so.1.0.19 +usr/lib/sane/libsane-pie.so.1.0.22 #usr/lib/sane/libsane-pixma.la usr/lib/sane/libsane-pixma.so usr/lib/sane/libsane-pixma.so.1 -usr/lib/sane/libsane-pixma.so.1.0.19 +usr/lib/sane/libsane-pixma.so.1.0.22 #usr/lib/sane/libsane-plustek.la usr/lib/sane/libsane-plustek.so usr/lib/sane/libsane-plustek.so.1 -usr/lib/sane/libsane-plustek.so.1.0.19 +usr/lib/sane/libsane-plustek.so.1.0.22 #usr/lib/sane/libsane-plustek_pp.la usr/lib/sane/libsane-plustek_pp.so usr/lib/sane/libsane-plustek_pp.so.1 -usr/lib/sane/libsane-plustek_pp.so.1.0.19 +usr/lib/sane/libsane-plustek_pp.so.1.0.22 #usr/lib/sane/libsane-qcam.la usr/lib/sane/libsane-qcam.so usr/lib/sane/libsane-qcam.so.1 -usr/lib/sane/libsane-qcam.so.1.0.19 +usr/lib/sane/libsane-qcam.so.1.0.22 #usr/lib/sane/libsane-ricoh.la usr/lib/sane/libsane-ricoh.so usr/lib/sane/libsane-ricoh.so.1 -usr/lib/sane/libsane-ricoh.so.1.0.19 +usr/lib/sane/libsane-ricoh.so.1.0.22 +#usr/lib/sane/libsane-rts8891.la +usr/lib/sane/libsane-rts8891.so +usr/lib/sane/libsane-rts8891.so.1 +usr/lib/sane/libsane-rts8891.so.1.0.22 #usr/lib/sane/libsane-s9036.la usr/lib/sane/libsane-s9036.so usr/lib/sane/libsane-s9036.so.1 -usr/lib/sane/libsane-s9036.so.1.0.19 +usr/lib/sane/libsane-s9036.so.1.0.22 #usr/lib/sane/libsane-sceptre.la usr/lib/sane/libsane-sceptre.so usr/lib/sane/libsane-sceptre.so.1 -usr/lib/sane/libsane-sceptre.so.1.0.19 +usr/lib/sane/libsane-sceptre.so.1.0.22 #usr/lib/sane/libsane-sharp.la usr/lib/sane/libsane-sharp.so usr/lib/sane/libsane-sharp.so.1 -usr/lib/sane/libsane-sharp.so.1.0.19 +usr/lib/sane/libsane-sharp.so.1.0.22 #usr/lib/sane/libsane-sm3600.la usr/lib/sane/libsane-sm3600.so usr/lib/sane/libsane-sm3600.so.1 -usr/lib/sane/libsane-sm3600.so.1.0.19 +usr/lib/sane/libsane-sm3600.so.1.0.22 #usr/lib/sane/libsane-sm3840.la usr/lib/sane/libsane-sm3840.so usr/lib/sane/libsane-sm3840.so.1 -usr/lib/sane/libsane-sm3840.so.1.0.19 +usr/lib/sane/libsane-sm3840.so.1.0.22 #usr/lib/sane/libsane-snapscan.la usr/lib/sane/libsane-snapscan.so usr/lib/sane/libsane-snapscan.so.1 -usr/lib/sane/libsane-snapscan.so.1.0.19 +usr/lib/sane/libsane-snapscan.so.1.0.22 #usr/lib/sane/libsane-sp15c.la usr/lib/sane/libsane-sp15c.so usr/lib/sane/libsane-sp15c.so.1 -usr/lib/sane/libsane-sp15c.so.1.0.19 +usr/lib/sane/libsane-sp15c.so.1.0.22 #usr/lib/sane/libsane-st400.la usr/lib/sane/libsane-st400.so usr/lib/sane/libsane-st400.so.1 -usr/lib/sane/libsane-st400.so.1.0.19 +usr/lib/sane/libsane-st400.so.1.0.22 #usr/lib/sane/libsane-stv680.la usr/lib/sane/libsane-stv680.so usr/lib/sane/libsane-stv680.so.1 -usr/lib/sane/libsane-stv680.so.1.0.19 +usr/lib/sane/libsane-stv680.so.1.0.22 #usr/lib/sane/libsane-tamarack.la usr/lib/sane/libsane-tamarack.so usr/lib/sane/libsane-tamarack.so.1 -usr/lib/sane/libsane-tamarack.so.1.0.19 +usr/lib/sane/libsane-tamarack.so.1.0.22 #usr/lib/sane/libsane-teco1.la usr/lib/sane/libsane-teco1.so usr/lib/sane/libsane-teco1.so.1 -usr/lib/sane/libsane-teco1.so.1.0.19 +usr/lib/sane/libsane-teco1.so.1.0.22 #usr/lib/sane/libsane-teco2.la usr/lib/sane/libsane-teco2.so usr/lib/sane/libsane-teco2.so.1 -usr/lib/sane/libsane-teco2.so.1.0.19 +usr/lib/sane/libsane-teco2.so.1.0.22 #usr/lib/sane/libsane-teco3.la usr/lib/sane/libsane-teco3.so usr/lib/sane/libsane-teco3.so.1 -usr/lib/sane/libsane-teco3.so.1.0.19 +usr/lib/sane/libsane-teco3.so.1.0.22 #usr/lib/sane/libsane-test.la usr/lib/sane/libsane-test.so usr/lib/sane/libsane-test.so.1 -usr/lib/sane/libsane-test.so.1.0.19 +usr/lib/sane/libsane-test.so.1.0.22 #usr/lib/sane/libsane-u12.la usr/lib/sane/libsane-u12.so usr/lib/sane/libsane-u12.so.1 -usr/lib/sane/libsane-u12.so.1.0.19 +usr/lib/sane/libsane-u12.so.1.0.22 #usr/lib/sane/libsane-umax.la usr/lib/sane/libsane-umax.so usr/lib/sane/libsane-umax.so.1 -usr/lib/sane/libsane-umax.so.1.0.19 +usr/lib/sane/libsane-umax.so.1.0.22 #usr/lib/sane/libsane-umax1220u.la usr/lib/sane/libsane-umax1220u.so usr/lib/sane/libsane-umax1220u.so.1 -usr/lib/sane/libsane-umax1220u.so.1.0.19 +usr/lib/sane/libsane-umax1220u.so.1.0.22 #usr/lib/sane/libsane-umax_pp.la usr/lib/sane/libsane-umax_pp.so usr/lib/sane/libsane-umax_pp.so.1 -usr/lib/sane/libsane-umax_pp.so.1.0.19 -#usr/lib/sane/libsane-v4l.la -usr/lib/sane/libsane-v4l.so -usr/lib/sane/libsane-v4l.so.1 -usr/lib/sane/libsane-v4l.so.1.0.19 +usr/lib/sane/libsane-umax_pp.so.1.0.22 +#usr/lib/sane/libsane-xerox_mfp.la +usr/lib/sane/libsane-xerox_mfp.so +usr/lib/sane/libsane-xerox_mfp.so.1 +usr/lib/sane/libsane-xerox_mfp.so.1.0.22 usr/sbin/saned #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo #usr/share/locale/da/LC_MESSAGES/sane-backends.mo usr/share/locale/de/LC_MESSAGES/sane-backends.mo +#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo #usr/share/locale/eo/LC_MESSAGES/sane-backends.mo #usr/share/locale/es/LC_MESSAGES/sane-backends.mo #usr/share/locale/fi/LC_MESSAGES/sane-backends.mo #usr/share/locale/fr/LC_MESSAGES/sane-backends.mo +#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo #usr/share/locale/it/LC_MESSAGES/sane-backends.mo +#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo #usr/share/locale/nb/LC_MESSAGES/sane-backends.mo #usr/share/locale/nl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pt/LC_MESSAGES/sane-backends.mo #usr/share/locale/ru/LC_MESSAGES/sane-backends.mo #usr/share/locale/sv/LC_MESSAGES/sane-backends.mo -usr/share/man/man1/gamma4scanimage.1 -usr/share/man/man1/sane-config.1 -usr/share/man/man1/sane-find-scanner.1 -usr/share/man/man1/scanimage.1 -usr/share/man/man5/sane-abaton.5 -usr/share/man/man5/sane-agfafocus.5 -usr/share/man/man5/sane-apple.5 -usr/share/man/man5/sane-artec.5 -usr/share/man/man5/sane-artec_eplus48u.5 -usr/share/man/man5/sane-as6e.5 -usr/share/man/man5/sane-avision.5 -usr/share/man/man5/sane-bh.5 -usr/share/man/man5/sane-canon.5 -usr/share/man/man5/sane-canon630u.5 -usr/share/man/man5/sane-canon_pp.5 -usr/share/man/man5/sane-cardscan.5 -usr/share/man/man5/sane-coolscan.5 -usr/share/man/man5/sane-coolscan2.5 -usr/share/man/man5/sane-dc210.5 -usr/share/man/man5/sane-dc240.5 -usr/share/man/man5/sane-dc25.5 -usr/share/man/man5/sane-dll.5 -usr/share/man/man5/sane-dmc.5 -usr/share/man/man5/sane-epjitsu.5 -usr/share/man/man5/sane-epson.5 -usr/share/man/man5/sane-fujitsu.5 -usr/share/man/man5/sane-genesys.5 -usr/share/man/man5/sane-gphoto2.5 -usr/share/man/man5/sane-gt68xx.5 -usr/share/man/man5/sane-hp.5 -usr/share/man/man5/sane-hp3500.5 -usr/share/man/man5/sane-hp3900.5 -usr/share/man/man5/sane-hp4200.5 -usr/share/man/man5/sane-hp5400.5 -usr/share/man/man5/sane-hp5590.5 -usr/share/man/man5/sane-hpljm1005.5 -usr/share/man/man5/sane-hpsj5s.5 -usr/share/man/man5/sane-hs2p.5 -usr/share/man/man5/sane-ibm.5 -usr/share/man/man5/sane-leo.5 -usr/share/man/man5/sane-lexmark.5 -usr/share/man/man5/sane-ma1509.5 -usr/share/man/man5/sane-matsushita.5 -usr/share/man/man5/sane-microtek.5 -usr/share/man/man5/sane-microtek2.5 -usr/share/man/man5/sane-mustek.5 -usr/share/man/man5/sane-mustek_pp.5 -usr/share/man/man5/sane-mustek_usb.5 -usr/share/man/man5/sane-mustek_usb2.5 -usr/share/man/man5/sane-nec.5 -usr/share/man/man5/sane-net.5 -usr/share/man/man5/sane-niash.5 -usr/share/man/man5/sane-pie.5 -usr/share/man/man5/sane-pint.5 -usr/share/man/man5/sane-pixma.5 -usr/share/man/man5/sane-plustek.5 -usr/share/man/man5/sane-plustek_pp.5 -usr/share/man/man5/sane-pnm.5 -usr/share/man/man5/sane-qcam.5 -usr/share/man/man5/sane-ricoh.5 -usr/share/man/man5/sane-s9036.5 -usr/share/man/man5/sane-sceptre.5 -usr/share/man/man5/sane-scsi.5 -usr/share/man/man5/sane-sharp.5 -usr/share/man/man5/sane-sm3600.5 -usr/share/man/man5/sane-sm3840.5 -usr/share/man/man5/sane-snapscan.5 -usr/share/man/man5/sane-sp15c.5 -usr/share/man/man5/sane-st400.5 -usr/share/man/man5/sane-stv680.5 -usr/share/man/man5/sane-tamarack.5 -usr/share/man/man5/sane-teco1.5 -usr/share/man/man5/sane-teco2.5 -usr/share/man/man5/sane-teco3.5 -usr/share/man/man5/sane-test.5 -usr/share/man/man5/sane-u12.5 -usr/share/man/man5/sane-umax.5 -usr/share/man/man5/sane-umax1220u.5 -usr/share/man/man5/sane-umax_pp.5 -usr/share/man/man5/sane-usb.5 -usr/share/man/man5/sane-v4l.5 -usr/share/man/man7/sane.7 -usr/share/man/man8/saned.8 +#usr/share/locale/uk/LC_MESSAGES/sane-backends.mo +#usr/share/man/man1/gamma4scanimage.1 +#usr/share/man/man1/sane-config.1 +#usr/share/man/man1/sane-find-scanner.1 +#usr/share/man/man1/scanimage.1 +#usr/share/man/man5/sane-abaton.5 +#usr/share/man/man5/sane-agfafocus.5 +#usr/share/man/man5/sane-apple.5 +#usr/share/man/man5/sane-artec.5 +#usr/share/man/man5/sane-artec_eplus48u.5 +#usr/share/man/man5/sane-as6e.5 +#usr/share/man/man5/sane-avision.5 +#usr/share/man/man5/sane-bh.5 +#usr/share/man/man5/sane-canon.5 +#usr/share/man/man5/sane-canon630u.5 +#usr/share/man/man5/sane-canon_dr.5 +#usr/share/man/man5/sane-cardscan.5 +#usr/share/man/man5/sane-coolscan.5 +#usr/share/man/man5/sane-coolscan2.5 +#usr/share/man/man5/sane-coolscan3.5 +#usr/share/man/man5/sane-dc210.5 +#usr/share/man/man5/sane-dc240.5 +#usr/share/man/man5/sane-dc25.5 +#usr/share/man/man5/sane-dll.5 +#usr/share/man/man5/sane-dmc.5 +#usr/share/man/man5/sane-epjitsu.5 +#usr/share/man/man5/sane-epson.5 +#usr/share/man/man5/sane-epson2.5 +#usr/share/man/man5/sane-fujitsu.5 +#usr/share/man/man5/sane-genesys.5 +#usr/share/man/man5/sane-gt68xx.5 +#usr/share/man/man5/sane-hp.5 +#usr/share/man/man5/sane-hp3500.5 +#usr/share/man/man5/sane-hp3900.5 +#usr/share/man/man5/sane-hp4200.5 +#usr/share/man/man5/sane-hp5400.5 +#usr/share/man/man5/sane-hp5590.5 +#usr/share/man/man5/sane-hpljm1005.5 +#usr/share/man/man5/sane-hs2p.5 +#usr/share/man/man5/sane-ibm.5 +#usr/share/man/man5/sane-kodak.5 +#usr/share/man/man5/sane-kvs1025.5 +#usr/share/man/man5/sane-kvs20xx.5 +#usr/share/man/man5/sane-leo.5 +#usr/share/man/man5/sane-lexmark.5 +#usr/share/man/man5/sane-ma1509.5 +#usr/share/man/man5/sane-magicolor.5 +#usr/share/man/man5/sane-matsushita.5 +#usr/share/man/man5/sane-microtek.5 +#usr/share/man/man5/sane-microtek2.5 +#usr/share/man/man5/sane-mustek.5 +#usr/share/man/man5/sane-mustek_pp.5 +#usr/share/man/man5/sane-mustek_usb.5 +#usr/share/man/man5/sane-nec.5 +#usr/share/man/man5/sane-net.5 +#usr/share/man/man5/sane-niash.5 +#usr/share/man/man5/sane-p5.5 +#usr/share/man/man5/sane-pie.5 +#usr/share/man/man5/sane-pixma.5 +#usr/share/man/man5/sane-plustek.5 +#usr/share/man/man5/sane-plustek_pp.5 +#usr/share/man/man5/sane-qcam.5 +#usr/share/man/man5/sane-ricoh.5 +#usr/share/man/man5/sane-rts8891.5 +#usr/share/man/man5/sane-s9036.5 +#usr/share/man/man5/sane-sceptre.5 +#usr/share/man/man5/sane-scsi.5 +#usr/share/man/man5/sane-sharp.5 +#usr/share/man/man5/sane-sm3600.5 +#usr/share/man/man5/sane-sm3840.5 +#usr/share/man/man5/sane-snapscan.5 +#usr/share/man/man5/sane-sp15c.5 +#usr/share/man/man5/sane-st400.5 +#usr/share/man/man5/sane-stv680.5 +#usr/share/man/man5/sane-tamarack.5 +#usr/share/man/man5/sane-teco1.5 +#usr/share/man/man5/sane-teco2.5 +#usr/share/man/man5/sane-teco3.5 +#usr/share/man/man5/sane-test.5 +#usr/share/man/man5/sane-u12.5 +#usr/share/man/man5/sane-umax.5 +#usr/share/man/man5/sane-umax1220u.5 +#usr/share/man/man5/sane-umax_pp.5 +#usr/share/man/man5/sane-usb.5 +#usr/share/man/man5/sane-xerox_mfp.5 +#usr/share/man/man7/sane.7 +#usr/share/man/man8/saned.8 #usr/share/sane usr/share/sane/artec_eplus48u usr/share/sane/epjitsu usr/share/sane/gt68xx usr/share/sane/snapscan +#usr/var +#usr/var/lock usr/var/lock/sane -etc/sane.d/mustek_pp.conf -#usr/lib/sane/libsane-mustek_pp.la -usr/lib/sane/libsane-mustek_pp.so -usr/lib/sane/libsane-mustek_pp.so.1 -usr/lib/sane/libsane-mustek_pp.so.1.0.19 +var/ipfire/backup/addons/includes/sane etc/rc.d/init.d/sane -etc/rc.d/rc3.d/S95sane -etc/rc.d/rc0.d/K10sane -etc/rc.d/rc6.d/K10sane usr/local/bin/sanedloop -var/ipfire/backup/addons/includes/sane -#usr/var -#usr/var/lock diff --git a/config/rootfiles/packages/sqlite b/config/rootfiles/packages/sqlite index b4b53cf..f3b0b36 100644 --- a/config/rootfiles/packages/sqlite +++ b/config/rootfiles/packages/sqlite @@ -7,6 +7,4 @@ usr/lib/libsqlite3.so usr/lib/libsqlite3.so.0 usr/lib/libsqlite3.so.0.8.6 #usr/lib/pkgconfig/sqlite3.pc -#usr/lib/tcl8.4/sqlite3 -usr/lib/tcl8.4/sqlite3/libtclsqlite3.so -usr/lib/tcl8.4/sqlite3/pkgIndex.tcl +#usr/share/man/man1/sqlite3.1 diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index fea9e6b..5757080 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -60,7 +60,7 @@ my %sections = ( 'ssh' => '(sshd(?:(.*))?[.*]: )', 'auth' => '(\w+(pam_unix)[.*]: )', 'kernel' => '(kernel: (?!DROP_))', - 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |vpnwatch: )', + 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon[.*]: |vpnwatch: )', 'openvpn' => '(openvpnserver)[.*]: ', 'pakfire' => '(pakfire:) ', 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 60c75d7..844058d 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -531,7 +531,7 @@ END open( FILE, "> $level7file" ) or die "Unable to write $level7file"; print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; -102;$qossettings{'RED_DEV'};sip;;; +102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; 103;$qossettings{'RED_DEV'};ssh;;; 103;$qossettings{'RED_DEV'};rdp;;; @@ -540,6 +540,7 @@ END 104;$qossettings{'RED_DEV'};pop3;;; 120;$qossettings{'RED_DEV'};applejuice;;; 120;$qossettings{'RED_DEV'};bittorrent;;; +200;imq0;rtp;;; 200;imq0;skypetoskype;;; 203;imq0;ssh;;; 203;imq0;rdp;;; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b78efc5..cf35ff0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1355,7 +1355,7 @@ 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ', 'pakfire installed addons' => 'Installierte Addons:', 'pakfire last core list update' => 'Letztes Corelisten Update vor', -'pakfire last package update' => 'Letztes Pakelisten Update vor', +'pakfire last package update' => 'Letztes Paketlisten Update vor', 'pakfire last serverlist update' => 'Letztes Serverlisten Update vor', 'pakfire last update' => 'Letzes Update vor', 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.', diff --git a/lfs/apache2 b/lfs/apache2 index 7b5b791..80e96b7 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@
include Config
-VER = 2.2.17 +VER = 2.2.19
THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
-$(DL_FILE)_MD5 = 16eadc59ea6b38af33874d300973202e +$(DL_FILE)_MD5 = 832f96a6ec4b8fc7cf49b9efd4e89060 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET) diff --git a/lfs/binutils b/lfs/binutils index 25145cc..464ac52 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -54,7 +54,7 @@ endif else ifeq "$(PASS)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools1 - EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror + EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof EXTRA_MAKE = LDFLAGS="-all-static" EXTRA_INSTALL = else diff --git a/lfs/clamav b/lfs/clamav index a9d9709..6226fe4 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@
include Config
-VER = 0.97 +VER = 0.97.1
THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 15 +PAK_VER = 16
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b +$(DL_FILE)_MD5 = 4f3fb74ff1098c25eef8e10721478c29
install : $(TARGET)
diff --git a/lfs/client175 b/lfs/client175 index 7f39508..ef2b487 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,7 +24,7 @@
include Config
-VER = 0.5a +VER = 0.7
THISAPP = client175_$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = client175 -PAK_VER = 2 +PAK_VER = 3
DEPS = "mpfire"
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8 +$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb + install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) @rm -rf /srv/client175 mkdir -pv /srv/client175
cd $(DIR_APP) && mv -vf * /srv/client175 + cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/
install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \ diff --git a/lfs/cups b/lfs/cups index e8d9cc0..e7fd085 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.4.4 +VER = 1.4.6
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 6 +PAK_VER = 7
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d +$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1
install : $(TARGET)
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 2292c3e..e08e51e 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00
THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core49.iso.torrent
DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 24 +PAK_VER = 25
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e +$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1
install : $(TARGET)
diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 1778beb..e2e8bde 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.1 +VER = 2.4
THISAPP = libmpdclient-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpdclient -PAK_VER = 1 +PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 67efa0c3d107c090ef277dfb3442d1e3 +$(DL_FILE)_MD5 = 8c166c5212dd95d538d3a35bb9ad4634
install : $(TARGET)
diff --git a/lfs/make b/lfs/make index 3a3c18a..ba34283 100644 --- a/lfs/make +++ b/lfs/make @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -43,7 +43,7 @@ ifeq "$(ROOT)" "" EXTRA_MAKE = EXTRA_INSTALL = else - TARGET = $(DIR_INFO)/$(THISAPP)-tools + TARGET = $(DIR_INFO)/$(THISAPP)-tools-pass$(PASS) EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_MAKE = EXTRA_INSTALL = diff --git a/lfs/mpc b/lfs/mpc index 0cd871e..f3e4848 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 0.19 +VER = 0.20
THISAPP = mpc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpc -PAK_VER = 4 +PAK_VER = 5
DEPS = "mpd libmpdclient"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ab2967d9ec719b06a86f3b4121be654 +$(DL_FILE)_MD5 = 24c81ad6afe6099e8d7a6826ef4b7105
install : $(TARGET)
diff --git a/lfs/mpd b/lfs/mpd index e6d86ab..7cd616e 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@
include Config
-VER = 0.15.12 +VER = 0.16.2
THISAPP = mpd-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 11 +PAK_VER = 12
DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c +$(DL_FILE)_MD5 = a75ad715cc381dc5efeff6dbf313a954
install : $(TARGET)
@@ -76,8 +76,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-ipv6 \ + --sysconfdir=/etc \ + --disable-sqlite cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/mpfire b/lfs/mpfire index 5a8b85f..facb179 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -30,7 +30,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 10 +PAK_VER = 11
DEPS = "mpd mpc"
diff --git a/lfs/python b/lfs/python index 9677d49..0deaadd 100644 --- a/lfs/python +++ b/lfs/python @@ -24,10 +24,10 @@
include Config
-VER = 2.7.1 +VER = 2.7.2
THISAPP = Python-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = aa27bc25725137ba155910bd8e5ddc4f +$(DL_FILE)_MD5 = 75c87a80c6ddb0b785a57ea3583e04fa
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/qemu b/lfs/qemu index 7925f0d..03c20d5 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@
include Config
-VER = 0.12.3 +VER = 0.14.1
THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 10 +PAK_VER = 11
DEPS = "sdl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1 +$(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640
install : $(TARGET)
@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(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) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch + + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --target-list="i386-linux-user i386-softmmu" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/rsync b/lfs/rsync index a68e191..e151987 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.0.7 +VER = 3.0.8
THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 5 +PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b53525900817cf1ba7ad3a516ab5bfe9 +$(DL_FILE)_MD5 = 0ee8346ce16bdfe4c88a236e94c752b4
install : $(TARGET)
diff --git a/lfs/sane b/lfs/sane index 742fc70..96341b6 100644 --- a/lfs/sane +++ b/lfs/sane @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,23 +24,16 @@
include Config
-VER = 1.0.19 +VER = 1.0.22
THISAPP = sane-$(VER) DL_FILE = sane-backends-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/sane-backends-$(VER) -ifeq "$(KMOD)" "1" -ifeq "$(SMP)" "1" -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp -else -TARGET = $(DIR_INFO)/$(THISAPP)-kmod -endif -else TARGET = $(DIR_INFO)/$(THISAPP) -endif + PROG = sane -PAK_VER = 1 +PAK_VER = 2
DEPS = "libtiff"
@@ -52,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f +$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5
install : $(TARGET)
@@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(KMOD)" "1" - cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \ - $(DIR_APP)/backend/Makefile -ifeq "$(SMP)" "1" - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/ -else - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/ -endif -else cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --disable-ipv6 \ --enable-parport-directio @@ -112,7 +90,5 @@ else ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane install -v -m 644 $(DIR_SRC)/config/backup/includes/sane \ /var/ipfire/backup/addons/includes/sane -endif @rm -rf $(DIR_APP) @$(POSTBUILD) - \ No newline at end of file diff --git a/lfs/sqlite b/lfs/sqlite index d8aa063..5bc694a 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,9 +24,9 @@
include Config
-VER = 3.7.3 +VER = 3070603
-THISAPP = sqlite-$(VER) +THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5437978aae90350cf984993091e0d695 +$(DL_FILE)_MD5 = 7eb41eea5ffa5cbe359a48629084c425
install : $(TARGET)
diff --git a/make.sh b/make.sh index 0f369b3..1d760a2 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="49" # Core Level (Filename) -PAKFIRE_CORE="48" # Core Level (PAKFIRE) +CORE="50" # Core Level (Filename) +PAKFIRE_CORE="49" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -247,6 +247,7 @@ buildtoolchain() { NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} lfsmake1 ccache PASS=1 + lfsmake1 make PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -270,7 +271,7 @@ buildtoolchain() { lfsmake1 grep lfsmake1 gzip lfsmake1 m4 - lfsmake1 make + lfsmake1 make PASS=2 lfsmake1 patch lfsmake1 perl lfsmake1 sed diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh index e09fca4..f8f833d 100644 --- a/src/paks/mpfire/install.sh +++ b/src/paks/mpfire/install.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2007-2011 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -28,7 +28,9 @@ ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf chmod 755 /srv/web/ipfire/html/images/mpfire -touch /var/log/mpd.error.log touch /var/log/mpd.log restore_backup ${NAME} +# comment removed option from config +sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf +# /etc/init.d/mpd start diff --git a/src/patches/Python-2.7.1-gdbm-1.patch b/src/patches/Python-2.7.1-gdbm-1.patch deleted file mode 100644 index c72b452..0000000 --- a/src/patches/Python-2.7.1-gdbm-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py ---- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 -+++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 -@@ -1125,7 +1125,7 @@ - 'ndbm'): - ndbm_libs = ['ndbm'] - else: -- ndbm_libs = [] -+ ndbm_libs = ['gdbm', 'gdbm_compat' ] - print "building dbm using ndbm" - dbmext = Extension('dbm', ['dbmmodule.c'], - define_macros=[ -@@ -1140,7 +1140,7 @@ - if self.compiler.find_library_file(lib_dirs, - 'gdbm_compat'): - gdbm_libs.append('gdbm_compat') -- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: -+ if find_file("ndbm.h", inc_dirs, []) is not None: - print "building dbm using gdbm" - dbmext = Extension( - 'dbm', ['dbmmodule.c'], diff --git a/src/patches/Python-2.7.2-gdbm-1.patch b/src/patches/Python-2.7.2-gdbm-1.patch new file mode 100644 index 0000000..c72b452 --- /dev/null +++ b/src/patches/Python-2.7.2-gdbm-1.patch @@ -0,0 +1,21 @@ +diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py +--- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 ++++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 +@@ -1125,7 +1125,7 @@ + 'ndbm'): + ndbm_libs = ['ndbm'] + else: +- ndbm_libs = [] ++ ndbm_libs = ['gdbm', 'gdbm_compat' ] + print "building dbm using ndbm" + dbmext = Extension('dbm', ['dbmmodule.c'], + define_macros=[ +@@ -1140,7 +1140,7 @@ + if self.compiler.find_library_file(lib_dirs, + 'gdbm_compat'): + gdbm_libs.append('gdbm_compat') +- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: ++ if find_file("ndbm.h", inc_dirs, []) is not None: + print "building dbm using gdbm" + dbmext = Extension( + 'dbm', ['dbmmodule.c'], diff --git a/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch new file mode 100644 index 0000000..31dde45 --- /dev/null +++ b/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch @@ -0,0 +1,28 @@ +diff -Naur qemu-0.14.1.org/hw/virtio-9p-local.c qemu-0.14.1/hw/virtio-9p-local.c +--- qemu-0.14.1.org/hw/virtio-9p-local.c 2011-05-06 21:01:43.000000000 +0200 ++++ qemu-0.14.1/hw/virtio-9p-local.c 2011-05-18 14:04:32.432444320 +0200 +@@ -10,6 +10,7 @@ + * the COPYING file in the top-level directory. + * + */ ++ + #include "virtio.h" + #include "virtio-9p.h" + #include "virtio-9p-xattr.h" +@@ -20,6 +21,16 @@ + #include <sys/un.h> + #include <attr/xattr.h> + ++#ifndef AT_FDCWD ++/* Copied from linux/include/linux/fcntl.h * because direct include fails */ ++#define AT_FDCWD -100 /* Special value used to indicate ++ openat should use the current ++ working directory. */ ++#define AT_SYMLINK_NOFOLLOW 0x100 /* Do not follow symbolic links. */ ++#define AT_REMOVEDIR 0x200 /* Remove directory instead of ++ unlinking file. */ ++#define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ ++#endif + + static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf) + {
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org