* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. af7e2f072f35bcaaefb5f7a81861f421f50dc40d
@ 2017-04-03 21:06 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-04-03 21:06 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 471576 bytes --]
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, master has been updated
via af7e2f072f35bcaaefb5f7a81861f421f50dc40d (commit)
via 7ea716b46b2308f6939cb1f9ade1dc2484e5fc6d (commit)
via bffe0abd5950fb3786e0f0d1785f8dc2091571ac (commit)
via 24a80f0c22d2e3c3654ba0168dfd49f4a4de2185 (commit)
via a5c0ef3679d59f081b8c4e3d4dca96feb058b7b4 (commit)
via 39e71549764d91324cfc5b43e824ff0080bf8f02 (commit)
via 183b23b5ca703bd0ee837e135c84a9b91b1fcb91 (commit)
via 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878 (commit)
via 776363274f82bb389b040bfe8f281edf5307e047 (commit)
via 21094f574e5a607159f25e77e25334d52ea31a7b (commit)
via 109b1914d1743e85727b01cd7388b19c278a60c2 (commit)
via baa8a93fd1817f4ad75aa1c22533a64a9c75b1c4 (commit)
via 0be884d6b222193419ddd3fdff02e7348fe92faf (commit)
via 2170bad5b99a10eff615e7e8c8b289e073985fc9 (commit)
via 4a0d69ca464aba3f27e7e2a98247f1630ef664bb (commit)
via 128db1a3632fdd4ff95fa0bb865e25cc861f471c (commit)
via c20b20092fb7c9263a9cdb17656eb517f3a5cdff (commit)
via 5012e53c290b0bb60c4b4617f4ccaa7b63a6927f (commit)
via 0a7dca2c5f8284ff61d78c1f851b4716f7f3d9df (commit)
via e0174da88ba1e1d36f57b6349544059f08fca164 (commit)
via cda384a280b11461f4114faf4c86c8589df15eb0 (commit)
via e89b407f8894a1378ef9afbdd79180ed3d99a89c (commit)
via 8714488c7369816fb96e8a9802330851f0c13c4d (commit)
via 65c3b7c913760c88f7cbdfccc775d34dfc7fe232 (commit)
via a249ccd2e4e56798fcfe01b24a180eb461999626 (commit)
via d38ed86f8b56436e420eb5f89dcb2393450939e4 (commit)
via 373c0c7bed5f24762285ce0e31858a2bc79bcdc8 (commit)
via 0f1cda211c441d17e212ee7c881e0d0014238155 (commit)
via 3baa3661a16c7ed2024dc2d8526502cad2eb6e55 (commit)
via d04e15178d976abb0049c05900e2b56b6c655a81 (commit)
via a3fd3c237d07106063378ea2b6a1493119a3f2fc (commit)
via acf0e4d2daa279b0e28bbbf213501e7a320cbffc (commit)
via ad898e7f46ef659a639ea23768ffd394057a7064 (commit)
via 713151aaa8a4d3af467081912bca7991db4d5af6 (commit)
via 2bfd31a26187d65236ee6e0a0d22def30e25b0e5 (commit)
via 6006aa84d7770857cbee4d7b9aa65f69ec5b715d (commit)
via f07f9c8ed3b543f804670baac900c630f491e2ac (commit)
via 198b6f65d43905a4586aa7cf37f142264a8e4f5b (commit)
via 530188483521ffe055141c635530cf4e80955374 (commit)
via edda4a223bba278c24ac093baed89249d0b30083 (commit)
via bd2a7a8fd3ab37d3d2f28a56494e147005902ead (commit)
via 9016d19e0e22c14974f2283c5661f9c2fe17ab6c (commit)
via 7e8a2556e55f3023e257348dae447321c0034870 (commit)
via a5754e5da1830180d488306b10d3688babd6a4b8 (commit)
via 586761dd73fa21f39b22f0cb8b5d1112cfb7ce64 (commit)
via de63e05b49ae04b883e1c5b6d628cd9fba923408 (commit)
via dd1884ddb309b2bdee985f0805ab893bac1e45bd (commit)
via da5c2f96303d544989f39dda6561964578a41034 (commit)
via 4fa43dd1009a24083db4c8e075ba09d115530c3f (commit)
via 9f312b3dde6578c6a3710694ec2e1df3ae677a9a (commit)
via e5379b19813b57c337b00ac0c37c48ad606854d5 (commit)
via 41e5aa4a8809a199dd120cb913270b561bce6a94 (commit)
via 112fb61b69f58f23b978cdd2982a57644e8e79dd (commit)
via da6608ef68b8f7beee31a3d957c3e986d4d54a26 (commit)
via f09be2a5350b53ec191dcdebe4c105e7835022e5 (commit)
via 17f7f41e4147c5653591c1413e576d72461cc1cb (commit)
via 5021ee33de34ca1cfb4747c9741f7ac6bd08f9e7 (commit)
via 7d9b033b79af8124853a0aac6992389ea8595172 (commit)
via 896209f6f147d6213fe790c2e6e538440fa66612 (commit)
via 89760da44254a7eb74ab0cee02c93763a036e50f (commit)
via 8bcca7ca0a042e94e030f03492becd0026afad02 (commit)
via 746b72fea87b21ac18730adb20b8d2cf0500a9d8 (commit)
via ff0f73305cc7ae85cc18b1e3500285c47597bb23 (commit)
via 76589562ea8921d8d5b5f009f568c67a5be41e7c (commit)
via f809bfb9673a9a9d027ebe5983c4c9ff5fe4e2e7 (commit)
via 9a05980e552f21a91c0141990a3e4581be89d914 (commit)
via c016773b9816ad9be4ffc8643c30457e87c094e3 (commit)
via e432689aa99ec262879081fc80161c31b8c4a890 (commit)
via 63de1e482a176380bde444cd50ff4285137ba960 (commit)
via e8607830b0ef884e180df5ea908c2e48547e16bd (commit)
via 89009f82ea4861a14dcb90c2185bdcd82d3703f4 (commit)
via f70723ea1d8a4c5c7e5a57323df6aae4722ceacc (commit)
via 9a2d1df7c268c5e98b9262f122eb75f283d4311e (commit)
via 2b5aece94e44357fca0771712755da535493c1d6 (commit)
via 30aff66aa1a2ea44fb25e8db7f2b1b8fb0595121 (commit)
via 06c99e6d4d6e65dea00ea94585a30c08635b29d0 (commit)
via 2e57eb171395c80658249a476b69a8a4ad21b2e1 (commit)
via 7f328d35400a8612a96eeacc6756187255f329d8 (commit)
via 5c9d32f693b57a55b9864e64122813932fb4fe5b (commit)
via e043c60be5713614d15938d4ec135f5bd2f1ea95 (commit)
via 466c6dd2cadc29a635fa2ef3e63057fde3f95b2c (commit)
via a0851cf32881fecd7b00610c0fc89f46de67d376 (commit)
via 87f382731fecd9818bf81e4fae8450107b601cd4 (commit)
via 8ab50dba65e02cbfd4edb2ce81e32caef22ff193 (commit)
via 5283818233fe07b1efd52a53b8d894960843629e (commit)
via 3a8b6ae05d4eb722ca67cd4ce393a9e424160100 (commit)
via 6d390861b97cc76a2b5690c8fbe5cdc1b0b68b04 (commit)
via 74eaa64e4ba95d94a387e8756d954a1b5b0f9b13 (commit)
via dc9baa5496ea41b890927098e222e297e99a1db0 (commit)
via f79869bf421437654fde325b4eb262ebe3dbe292 (commit)
via 8fa8cd3b7e10ee7564465de4af60164c32a813ab (commit)
via 610b34069c6f6ebd857f5cd0c4d3b70e4b4c0143 (commit)
via e215aaed48d8dfe3c7f6dd2bc649fb5b7547eef3 (commit)
via 939fbafccdacfb0c078daa166829311366257b8c (commit)
via 47b6926102a00809aa8929ddd86907aa168850a0 (commit)
via e804a70256d72c7ad76913bde373f2f97f84c21f (commit)
via 5f53bd1c13f6ef6387313768bd8cd250499f66cb (commit)
via c5480346b1ace5d630d5a82e73077bd48e9bf42c (commit)
via f475a017a25a93a80630e7cf4a3c566f4a7a2e0a (commit)
via e7301348846afeb0e7f27d801bac2f19763e1c53 (commit)
via ba43a6fee28b7e00c4f5cead38107b3d0300a242 (commit)
via df7f06eceb31dc8c0392b84d91dc24756bebe947 (commit)
via f22bfcf48c6e3014615254922cb4515afec172a7 (commit)
via c08b75dbb5fbd3b47adcc0a39bea5d7b1752e948 (commit)
via dbb35fa6a4c969696411334280d2e688fc79062e (commit)
via 7db55a67798656f851689863d8401839c8f385a2 (commit)
via afb143bd7cd9cdf1c68e33f3f7e2f9cad1900c22 (commit)
via db8a26e71877cc698ead7cc6191a020eaa5648bc (commit)
via 1f68460f5afd37e4a58959a006e09f10fe1c0cff (commit)
via c8b7d517d0e687d72bc71816f0f26581a0145edf (commit)
via 6a4df2fd3b375c77bbdb99a0bb8b952f7116a3f8 (commit)
via be2732c2171613d98f830ef0f6da313424060c3b (commit)
via 38888b3d927ddd5b47de337cf197494d4a53de7b (commit)
via 629fcb1d47d686c6182b3ed9e0e49650f40cc6e1 (commit)
via 33f53d55ccec436a6cbd80ea469ea4a558528798 (commit)
via c6060f2dcf49f2a20406485d0507cb14a513b44b (commit)
via cb144b4f8a854d911401b9ed6d7ef2916eb2dc50 (commit)
via 1d8dab5404b4e1a662e6f0398a552f8f6251bee6 (commit)
via 8bc8c282c9b7ef2280e7102e2824047975a9bb4c (commit)
via 7861ea5cf71b7ab9edfd5a98ac3fa83911eddf37 (commit)
via d46244f399e2bb27faac6581ebcd50e908288358 (commit)
via 5f8203b2bdb8fbba0258736c6e049e0ecac5f5b2 (commit)
via ee072e104cf147338893ce2e845044da1af3b594 (commit)
via 460a510b169b85c818af94eeb78b4ba691d9a107 (commit)
via bdd2de73285cd08af4e762bd0ad258a10edf2940 (commit)
via e8689bfac85b09c3cdf5565c10c2e33de3f0694a (commit)
via 2a54bc30b955ba8b157e3b1e6fc4dd9abb643730 (commit)
via 6516848bedc536bb479fd130934d2c5a6b2370ef (commit)
via b1a2ddc87323324eb4175d9388244ff2461d5948 (commit)
via d2e4dc253b08e9115d6007f15d8b179ec2c176e8 (commit)
via e01b933cc28814d8650f829712639b4eb0d991e6 (commit)
via 8057ab15b9efeecf8eca7ad4ebba170f141bd3de (commit)
via 1ee1666ee45268db405a66b8ec05501c718e7702 (commit)
via dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 (commit)
via ef784313d101fee621e3273cf14eb59cf43bbb10 (commit)
via c72bbdb029e24c366d75ecafea6a6c333b574ed2 (commit)
via c008a5a00e963796a11ea6e1f59f0e801fa1a088 (commit)
via d9dc3749190b9f372fd6eeb7324645dfe3de6fa2 (commit)
via a0a33a8f104ca44195ec04528113373b54a4c735 (commit)
via 40065ca77362f6191279331b18781ef64e3fb588 (commit)
via 4b5952148cad19a2b4ad88fa96b558730964d2d6 (commit)
via 6c31e0993c33155c8514b83a291f0772e021b402 (commit)
via a713ac8c483cff08fe69ad8e4e35f994a673af43 (commit)
from 8bbcfa1152f87e8092c91284e25184ae52914e6d (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 af7e2f072f35bcaaefb5f7a81861f421f50dc40d
Merge: 8bbcfa1 7ea716b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 3 23:04:59 2017 +0200
Merge branch 'next'
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 20 +-
config/cfgroot/graphs.pl | 200 +---
config/etc/sysctl.conf | 5 +
config/firewall/ipsec-block | 41 +-
config/httpd/server-tuning.conf | 5 +-
config/rootfiles/common/armv5tel/initscripts | 56 -
config/rootfiles/common/armv5tel/lm_sensors | 3 +-
config/rootfiles/common/attr | 11 +-
config/rootfiles/common/cairo | 24 +-
config/rootfiles/common/fontconfig | 486 +++++----
config/rootfiles/common/freetype | 60 +-
config/rootfiles/common/gnutls | 1116 ++++++++++++++++++++
config/rootfiles/common/i586/initscripts | 57 -
config/rootfiles/common/i586/lm_sensors | 3 +-
config/rootfiles/common/lcms2 | 15 +
config/rootfiles/common/nettle | 7 +-
config/rootfiles/common/pixman | 2 +-
config/rootfiles/common/poppler | 174 +++
config/rootfiles/common/qpdf | 44 +
config/rootfiles/common/unbound | 2 +-
config/rootfiles/common/x86_64/gcc | 4 +-
config/rootfiles/common/x86_64/initscripts | 57 -
config/rootfiles/common/x86_64/lm_sensors | 3 +-
config/rootfiles/core/{109 => 110}/exclude | 0
.../77 => core/110}/filelists/armv5tel/lm_sensors | 0
config/rootfiles/core/{109 => 110}/filelists/bind | 0
.../{oldcore/66 => core/110}/filelists/cairo | 0
.../66 => core/110}/filelists/conntrack-tools | 0
config/rootfiles/core/110/filelists/files | 23 +
.../{oldcore/66 => core/110}/filelists/fontconfig | 0
config/rootfiles/core/110/filelists/freetype | 1 +
config/rootfiles/core/110/filelists/gnutls | 1 +
.../rootfiles/core/110/filelists/i586/lm_sensors | 1 +
config/rootfiles/core/110/filelists/lcms2 | 1 +
.../{oldcore/101 => core/110}/filelists/nettle | 0
.../{oldcore/100 => core/110}/filelists/ntp | 0
.../{oldcore/100 => core/110}/filelists/openssh | 0
.../{oldcore/66 => core/110}/filelists/pixman | 0
config/rootfiles/core/110/filelists/poppler | 1 +
config/rootfiles/core/110/filelists/qpdf | 1 +
config/rootfiles/core/{109 => 110}/filelists/squid | 0
.../{oldcore/106 => core/110}/filelists/strongswan | 0
.../rootfiles/core/{109 => 110}/filelists/unbound | 0
.../{oldcore/104 => core/110}/filelists/wget | 0
.../rootfiles/core/110/filelists/x86_64/lm_sensors | 1 +
config/rootfiles/core/{109 => 110}/meta | 0
config/rootfiles/core/{109 => 110}/update.sh | 13 +-
config/rootfiles/{core => oldcore}/109/exclude | 0
.../{core => oldcore}/109/filelists/GeoIP | 0
.../rootfiles/{core => oldcore}/109/filelists/bind | 0
.../{core => oldcore}/109/filelists/files | 0
.../{core => oldcore}/109/filelists/libpcap | 0
.../{core => oldcore}/109/filelists/libpng | 0
.../{core => oldcore}/109/filelists/openssl | 0
.../{core => oldcore}/109/filelists/snort | 0
.../{core => oldcore}/109/filelists/squid | 0
.../{core => oldcore}/109/filelists/sysklogd | 0
.../{core => oldcore}/109/filelists/unbound | 0
config/rootfiles/{core => oldcore}/109/meta | 0
config/rootfiles/{core => oldcore}/109/update.sh | 0
config/rootfiles/packages/avahi | 34 +-
config/rootfiles/packages/cups | 104 +-
config/rootfiles/packages/cups-filters | 144 +++
.../rootfiles/packages/epson-inkjet-printer-escpr | 515 +++++++++
config/rootfiles/packages/ffmpeg | 229 +++-
config/rootfiles/packages/ffmpeg-libs | 245 ++++-
config/rootfiles/packages/ghostscript | 809 ++++++--------
config/rootfiles/packages/keepalived | 1 +
config/rootfiles/packages/mc | 10 +
config/rootfiles/packages/motion | 45 +-
config/rootfiles/packages/mpd | 1 +
config/rootfiles/packages/qemu | 1 -
config/rootfiles/packages/sane | 5 +-
doc/language_issues.es | 5 +
doc/language_issues.fr | 5 +
doc/language_issues.it | 5 +
doc/language_issues.nl | 5 +
doc/language_issues.pl | 5 +
doc/language_issues.ru | 5 +
doc/language_issues.tr | 5 +
doc/language_missings | 20 +
html/cgi-bin/entropy.cgi | 2 +-
html/cgi-bin/hardwaregraphs.cgi | 4 +-
html/cgi-bin/index.cgi | 8 +
html/cgi-bin/netovpnsrv.cgi | 2 +-
html/cgi-bin/qos.cgi | 4 +-
html/cgi-bin/system.cgi | 4 +-
html/cgi-bin/vpnmain.cgi | 52 +-
html/html/themes/darkdos/include/style.css | 5 +
html/html/themes/ipfire-legacy/include/style.css | 5 +
html/html/themes/ipfire/include/css/style.css | 5 +
html/html/themes/maniac/include/style.css | 5 +
langs/de/cgi-bin/de.pl | 7 +-
langs/en/cgi-bin/en.pl | 5 +
langs/it/cgi-bin/it.pl | 26 +-
lfs/Config | 7 +
lfs/alsa | 2 +
lfs/amavisd | 4 +
lfs/apcupsd | 12 +-
lfs/asterisk | 3 +
lfs/avahi | 4 +-
lfs/bind | 4 +-
lfs/bluetooth | 4 +
lfs/cairo | 11 +-
lfs/clamav | 3 +-
lfs/client175 | 4 +
lfs/conntrack-tools | 6 +-
lfs/cpufrequtils | 4 +
lfs/cups | 23 +-
lfs/{bird => cups-filters} | 24 +-
lfs/cyrus-imapd | 4 +
lfs/cyrus-sasl | 4 +
lfs/dbus | 4 +
lfs/dnsdist | 4 +
lfs/{gutenprint => epson-inkjet-printer-escpr} | 19 +-
lfs/fetchmail | 4 +
lfs/ffmpeg | 34 +-
lfs/ffmpeg-libs | 6 +-
lfs/flash-images | 2 +-
lfs/fontconfig | 7 +-
lfs/freeradius | 3 +
lfs/freetype | 9 +-
lfs/ghostscript | 29 +-
lfs/gnump3d | 4 +
lfs/{bird => gnutls} | 26 +-
lfs/guardian | 3 +
lfs/haproxy | 5 +-
lfs/hostapd | 2 +
lfs/imspector | 3 +
lfs/initscripts | 8 +-
lfs/keepalived | 6 +-
lfs/lcd4linux | 4 +
lfs/lcdproc | 4 +
lfs/{file => lcms2} | 8 +-
lfs/lcr | 3 +
lfs/libvirt | 5 +-
lfs/lm_sensors | 6 +-
lfs/mc | 8 +-
lfs/mediatomb | 4 +
lfs/miau | 4 +
lfs/minidlna | 4 +
lfs/miniupnpd | 3 +
lfs/monit | 3 +
lfs/motion | 15 +-
lfs/mpd | 31 +-
lfs/mysql | 4 +
lfs/netsnmpd | 5 +-
lfs/nettle | 12 +-
lfs/nfs | 2 +
lfs/ntp | 6 +-
lfs/nut | 4 +
lfs/openssh | 4 +-
lfs/openvmtools | 2 +
lfs/pixman | 4 +-
lfs/{bird => poppler} | 26 +-
lfs/postfix | 4 +
lfs/pound | 4 +
lfs/qemu | 2 +-
lfs/{file => qpdf} | 8 +-
lfs/rpcbind | 2 +
lfs/rtpproxy | 2 +
lfs/samba | 3 +
lfs/sane | 4 +
lfs/spamassassin | 4 +
lfs/squid | 8 +-
lfs/sslh | 4 +
lfs/strongswan | 3 +-
lfs/stunnel | 4 +
lfs/tcpdump | 7 +-
lfs/tftpd | 2 +
lfs/tor | 3 +
lfs/transmission | 3 +
lfs/unbound | 7 +-
lfs/vdr | 3 +
lfs/vdradmin | 4 +
lfs/vsftpd | 4 +
lfs/watchdog | 2 +
lfs/wget | 6 +-
lfs/xinetd | 4 +
make.sh | 28 +-
src/initscripts/init.d/applejuice | 53 -
src/initscripts/{init.d => }/networking/any | 0
src/initscripts/{init.d => }/networking/dhcpcd.exe | 0
.../{init.d => }/networking/functions.network | 0
src/initscripts/{init.d => }/networking/red | 3 +
.../networking/red.down/05-update-dns-forwarders | 0
.../{init.d => }/networking/red.down/10-ipsec | 0
.../{init.d => }/networking/red.down/10-miniupnpd | 0
.../{init.d => }/networking/red.down/10-ovpn | 0
.../networking/red.down/10-static-routes | 0
.../{init.d => }/networking/red.down/20-firewall | 0
.../networking/red.up/01-conntrack-cleanup | 0
.../networking/red.up/05-update-dns-forwarders | 0
.../{init.d => }/networking/red.up/10-miniupnpd | 0
.../{init.d => }/networking/red.up/10-multicast | 0
.../networking/red.up/10-static-routes | 0
.../{init.d => }/networking/red.up/20-firewall | 0
.../{init.d => }/networking/red.up/30-ddns | 0
.../{init.d => }/networking/red.up/35-guardian | 0
.../{init.d => }/networking/red.up/50-ipsec | 0
.../{init.d => }/networking/red.up/50-ovpn | 0
.../{init.d => }/networking/red.up/98-leds | 0
.../{init.d => }/networking/red.up/99-fireinfo | 0
.../networking/red.up/99-geoip-database | 0
.../networking/red.up/99-pakfire-update | 0
.../{init.d => }/networking/wpa_supplicant.exe | 0
src/initscripts/{init.d => packages}/alsa | 0
src/initscripts/{init.d => packages}/amavisd | 0
src/initscripts/{init.d => packages}/apcupsd | 0
src/initscripts/{init.d => packages}/asterisk | 0
src/initscripts/{init.d => packages}/bluetooth | 0
src/initscripts/{init.d => packages}/clamav | 0
src/initscripts/{init.d => packages}/client175 | 0
src/initscripts/{init.d => packages}/cpufreq | 0
src/initscripts/{init.d => packages}/cups | 0
src/initscripts/{init.d => packages}/cyrus-imapd | 0
src/initscripts/{init.d => packages}/cyrus-sasl | 0
src/initscripts/{init.d => packages}/dnsdist | 0
src/initscripts/{init.d => packages}/fetchmail | 0
src/initscripts/{init.d => packages}/freeradius | 0
src/initscripts/{init.d => packages}/gnump3d | 0
src/initscripts/{init.d => packages}/guardian | 0
src/initscripts/{init.d => packages}/haproxy | 0
src/initscripts/{init.d => packages}/hostapd | 0
src/initscripts/{init.d => packages}/imspector | 0
src/initscripts/{init.d => packages}/keepalived | 0
src/initscripts/{init.d => packages}/lcd4linux | 0
src/initscripts/{init.d => packages}/lcdproc | 0
src/initscripts/{init.d => packages}/lcr | 0
src/initscripts/{init.d => packages}/libvirtd | 0
src/initscripts/{init.d => packages}/mediatomb | 0
src/initscripts/{init.d => packages}/messagebus | 0
src/initscripts/{init.d => packages}/miau | 0
src/initscripts/{init.d => packages}/minidlna | 0
src/initscripts/{init.d => packages}/miniupnpd | 0
src/initscripts/{init.d => packages}/monit | 0
src/initscripts/{init.d => packages}/motion | 0
src/initscripts/{init.d => packages}/mpd | 0
src/initscripts/{init.d => packages}/mysql | 0
src/initscripts/{init.d => packages}/netsnmpd | 0
src/initscripts/{init.d => packages}/nfs-server | 0
src/initscripts/{init.d => packages}/nut | 0
src/initscripts/{init.d => packages}/openvmtools | 0
src/initscripts/{init.d => packages}/postfix | 0
src/initscripts/{init.d => packages}/pound | 0
src/initscripts/{init.d => packages}/rpcbind | 0
src/initscripts/{init.d => packages}/rtpproxy | 0
src/initscripts/{init.d => packages}/samba | 0
src/initscripts/{init.d => packages}/sane | 0
src/initscripts/{init.d => packages}/spamassassin | 0
src/initscripts/{init.d => packages}/sslh | 0
src/initscripts/{init.d => packages}/stunnel | 0
src/initscripts/{init.d => packages}/tftpd | 0
src/initscripts/{init.d => packages}/tor | 0
src/initscripts/{init.d => packages}/transmission | 0
src/initscripts/{init.d => packages}/vdr | 0
src/initscripts/{init.d => packages}/vdradmin | 0
src/initscripts/{init.d => packages}/virtlogd | 0
src/initscripts/{init.d => packages}/vsftpd | 0
src/initscripts/{init.d => packages}/watchdog | 0
src/initscripts/{init.d => packages}/xinetd | 0
src/initscripts/{init.d => system}/acpid | 0
src/initscripts/{init.d => system}/apache | 0
src/initscripts/{init.d => system}/beep | 0
src/initscripts/{init.d => system}/checkfs | 0
src/initscripts/{init.d => system}/cleanfs | 0
src/initscripts/{init.d => system}/collectd | 0
src/initscripts/{init.d => system}/connectd | 0
src/initscripts/{init.d => system}/console | 0
src/initscripts/{init.d => system}/dhcp | 0
src/initscripts/{init.d => system}/dhcrelay | 0
src/initscripts/{init.d => system}/fcron | 0
src/initscripts/{init.d => system}/fireinfo | 0
src/initscripts/{init.d => system}/firewall | 0
src/initscripts/{init.d => system}/firstsetup | 0
src/initscripts/{init.d => system}/fsresize | 0
src/initscripts/{init.d => system}/functions | 0
src/initscripts/{init.d => system}/halt | 0
src/initscripts/{init.d => system}/ipsec | 0
src/initscripts/{init.d => system}/leds | 0
src/initscripts/{init.d => system}/localnet | 0
src/initscripts/{init.d => system}/mISDN | 0
src/initscripts/{init.d => system}/modules | 0
src/initscripts/{init.d => system}/mountfs | 0
src/initscripts/{init.d => system}/mountkernfs | 0
src/initscripts/{init.d => system}/mounttmpfs | 0
src/initscripts/{init.d => system}/network | 0
src/initscripts/{init.d => system}/network-trigger | 0
src/initscripts/{init.d => system}/ntp | 0
src/initscripts/{init.d => system}/partresize | 0
src/initscripts/{init.d => system}/random | 0
src/initscripts/{init.d => system}/rc | 0
src/initscripts/{init.d => system}/reboot | 0
src/initscripts/{init.d => system}/rngd | 0
src/initscripts/{init.d => system}/sendsignals | 0
src/initscripts/{init.d => system}/setclock | 0
src/initscripts/{init.d => system}/smartenabler | 0
src/initscripts/{init.d => system}/snort | 0
src/initscripts/{init.d => system}/squid | 0
src/initscripts/{init.d => system}/sshd | 0
src/initscripts/{init.d => system}/static-routes | 0
src/initscripts/{init.d => system}/swap | 0
src/initscripts/{init.d => system}/swconfig | 0
src/initscripts/{init.d => system}/sysctl | 0
src/initscripts/{init.d => system}/sysklogd | 0
src/initscripts/{init.d => system}/template | 0
src/initscripts/{init.d => system}/udev | 0
src/initscripts/{init.d => system}/udev_retry | 0
src/initscripts/{init.d => system}/unbound | 100 +-
src/initscripts/{init.d => system}/upnpd | 0
src/initscripts/{init.d => system}/vnstat | 0
src/initscripts/{init.d => system}/waitdrives | 0
src/initscripts/{init.d => system}/wlanclient | 0
...=> squid-3.5.25-fix-max-file-descriptors.patch} | 0
src/patches/strongswan-disable-ipv6.patch | 24 +
...ting-validator-permissive-mode-at-runtime.patch | 43 +
src/scripts/xt_geoip_update | 2 +-
src/setup/netstuff.c | 5 +-
318 files changed, 4045 insertions(+), 1552 deletions(-)
create mode 100644 config/rootfiles/common/gnutls
create mode 100644 config/rootfiles/common/lcms2
create mode 100644 config/rootfiles/common/poppler
create mode 100644 config/rootfiles/common/qpdf
copy config/rootfiles/core/{109 => 110}/exclude (100%)
copy config/rootfiles/{oldcore/77 => core/110}/filelists/armv5tel/lm_sensors (100%)
copy config/rootfiles/core/{109 => 110}/filelists/bind (100%)
copy config/rootfiles/{oldcore/66 => core/110}/filelists/cairo (100%)
copy config/rootfiles/{oldcore/66 => core/110}/filelists/conntrack-tools (100%)
create mode 100644 config/rootfiles/core/110/filelists/files
copy config/rootfiles/{oldcore/66 => core/110}/filelists/fontconfig (100%)
create mode 120000 config/rootfiles/core/110/filelists/freetype
create mode 120000 config/rootfiles/core/110/filelists/gnutls
create mode 120000 config/rootfiles/core/110/filelists/i586/lm_sensors
create mode 120000 config/rootfiles/core/110/filelists/lcms2
copy config/rootfiles/{oldcore/101 => core/110}/filelists/nettle (100%)
copy config/rootfiles/{oldcore/100 => core/110}/filelists/ntp (100%)
copy config/rootfiles/{oldcore/100 => core/110}/filelists/openssh (100%)
copy config/rootfiles/{oldcore/66 => core/110}/filelists/pixman (100%)
create mode 120000 config/rootfiles/core/110/filelists/poppler
create mode 120000 config/rootfiles/core/110/filelists/qpdf
copy config/rootfiles/core/{109 => 110}/filelists/squid (100%)
copy config/rootfiles/{oldcore/106 => core/110}/filelists/strongswan (100%)
copy config/rootfiles/core/{109 => 110}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/104 => core/110}/filelists/wget (100%)
create mode 120000 config/rootfiles/core/110/filelists/x86_64/lm_sensors
copy config/rootfiles/core/{109 => 110}/meta (100%)
copy config/rootfiles/core/{109 => 110}/update.sh (91%)
rename config/rootfiles/{core => oldcore}/109/exclude (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/GeoIP (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/libpcap (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/libpng (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/snort (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/sysklogd (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/109/meta (100%)
rename config/rootfiles/{core => oldcore}/109/update.sh (100%)
create mode 100644 config/rootfiles/packages/cups-filters
create mode 100644 config/rootfiles/packages/epson-inkjet-printer-escpr
copy lfs/{bird => cups-filters} (87%)
copy lfs/{gutenprint => epson-inkjet-printer-escpr} (88%)
copy lfs/{bird => gnutls} (89%)
copy lfs/{file => lcms2} (94%)
copy lfs/{bird => poppler} (90%)
copy lfs/{file => qpdf} (94%)
delete mode 100644 src/initscripts/init.d/applejuice
rename src/initscripts/{init.d => }/networking/any (100%)
rename src/initscripts/{init.d => }/networking/dhcpcd.exe (100%)
rename src/initscripts/{init.d => }/networking/functions.network (100%)
rename src/initscripts/{init.d => }/networking/red (99%)
rename src/initscripts/{init.d => }/networking/red.down/05-update-dns-forwarders (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-ipsec (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-miniupnpd (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-ovpn (100%)
rename src/initscripts/{init.d => }/networking/red.down/10-static-routes (100%)
rename src/initscripts/{init.d => }/networking/red.down/20-firewall (100%)
rename src/initscripts/{init.d => }/networking/red.up/01-conntrack-cleanup (100%)
rename src/initscripts/{init.d => }/networking/red.up/05-update-dns-forwarders (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-miniupnpd (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-multicast (100%)
rename src/initscripts/{init.d => }/networking/red.up/10-static-routes (100%)
rename src/initscripts/{init.d => }/networking/red.up/20-firewall (100%)
rename src/initscripts/{init.d => }/networking/red.up/30-ddns (100%)
rename src/initscripts/{init.d => }/networking/red.up/35-guardian (100%)
rename src/initscripts/{init.d => }/networking/red.up/50-ipsec (100%)
rename src/initscripts/{init.d => }/networking/red.up/50-ovpn (100%)
rename src/initscripts/{init.d => }/networking/red.up/98-leds (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-fireinfo (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-geoip-database (100%)
rename src/initscripts/{init.d => }/networking/red.up/99-pakfire-update (100%)
rename src/initscripts/{init.d => }/networking/wpa_supplicant.exe (100%)
rename src/initscripts/{init.d => packages}/alsa (100%)
rename src/initscripts/{init.d => packages}/amavisd (100%)
rename src/initscripts/{init.d => packages}/apcupsd (100%)
rename src/initscripts/{init.d => packages}/asterisk (100%)
rename src/initscripts/{init.d => packages}/bluetooth (100%)
rename src/initscripts/{init.d => packages}/clamav (100%)
rename src/initscripts/{init.d => packages}/client175 (100%)
rename src/initscripts/{init.d => packages}/cpufreq (100%)
rename src/initscripts/{init.d => packages}/cups (100%)
rename src/initscripts/{init.d => packages}/cyrus-imapd (100%)
rename src/initscripts/{init.d => packages}/cyrus-sasl (100%)
rename src/initscripts/{init.d => packages}/dnsdist (100%)
rename src/initscripts/{init.d => packages}/fetchmail (100%)
rename src/initscripts/{init.d => packages}/freeradius (100%)
rename src/initscripts/{init.d => packages}/gnump3d (100%)
rename src/initscripts/{init.d => packages}/guardian (100%)
rename src/initscripts/{init.d => packages}/haproxy (100%)
rename src/initscripts/{init.d => packages}/hostapd (100%)
rename src/initscripts/{init.d => packages}/imspector (100%)
rename src/initscripts/{init.d => packages}/keepalived (100%)
rename src/initscripts/{init.d => packages}/lcd4linux (100%)
rename src/initscripts/{init.d => packages}/lcdproc (100%)
rename src/initscripts/{init.d => packages}/lcr (100%)
rename src/initscripts/{init.d => packages}/libvirtd (100%)
rename src/initscripts/{init.d => packages}/mediatomb (100%)
rename src/initscripts/{init.d => packages}/messagebus (100%)
rename src/initscripts/{init.d => packages}/miau (100%)
rename src/initscripts/{init.d => packages}/minidlna (100%)
rename src/initscripts/{init.d => packages}/miniupnpd (100%)
rename src/initscripts/{init.d => packages}/monit (100%)
rename src/initscripts/{init.d => packages}/motion (100%)
rename src/initscripts/{init.d => packages}/mpd (100%)
rename src/initscripts/{init.d => packages}/mysql (100%)
rename src/initscripts/{init.d => packages}/netsnmpd (100%)
rename src/initscripts/{init.d => packages}/nfs-server (100%)
rename src/initscripts/{init.d => packages}/nut (100%)
rename src/initscripts/{init.d => packages}/openvmtools (100%)
rename src/initscripts/{init.d => packages}/postfix (100%)
rename src/initscripts/{init.d => packages}/pound (100%)
rename src/initscripts/{init.d => packages}/rpcbind (100%)
rename src/initscripts/{init.d => packages}/rtpproxy (100%)
rename src/initscripts/{init.d => packages}/samba (100%)
rename src/initscripts/{init.d => packages}/sane (100%)
rename src/initscripts/{init.d => packages}/spamassassin (100%)
rename src/initscripts/{init.d => packages}/sslh (100%)
rename src/initscripts/{init.d => packages}/stunnel (100%)
rename src/initscripts/{init.d => packages}/tftpd (100%)
rename src/initscripts/{init.d => packages}/tor (100%)
rename src/initscripts/{init.d => packages}/transmission (100%)
rename src/initscripts/{init.d => packages}/vdr (100%)
rename src/initscripts/{init.d => packages}/vdradmin (100%)
rename src/initscripts/{init.d => packages}/virtlogd (100%)
rename src/initscripts/{init.d => packages}/vsftpd (100%)
rename src/initscripts/{init.d => packages}/watchdog (100%)
rename src/initscripts/{init.d => packages}/xinetd (100%)
rename src/initscripts/{init.d => system}/acpid (100%)
rename src/initscripts/{init.d => system}/apache (100%)
rename src/initscripts/{init.d => system}/beep (100%)
rename src/initscripts/{init.d => system}/checkfs (100%)
rename src/initscripts/{init.d => system}/cleanfs (100%)
rename src/initscripts/{init.d => system}/collectd (100%)
rename src/initscripts/{init.d => system}/connectd (100%)
rename src/initscripts/{init.d => system}/console (100%)
rename src/initscripts/{init.d => system}/dhcp (100%)
rename src/initscripts/{init.d => system}/dhcrelay (100%)
rename src/initscripts/{init.d => system}/fcron (100%)
rename src/initscripts/{init.d => system}/fireinfo (100%)
rename src/initscripts/{init.d => system}/firewall (100%)
rename src/initscripts/{init.d => system}/firstsetup (100%)
rename src/initscripts/{init.d => system}/fsresize (100%)
rename src/initscripts/{init.d => system}/functions (100%)
rename src/initscripts/{init.d => system}/halt (100%)
rename src/initscripts/{init.d => system}/ipsec (100%)
rename src/initscripts/{init.d => system}/leds (100%)
rename src/initscripts/{init.d => system}/localnet (100%)
rename src/initscripts/{init.d => system}/mISDN (100%)
rename src/initscripts/{init.d => system}/modules (100%)
rename src/initscripts/{init.d => system}/mountfs (100%)
rename src/initscripts/{init.d => system}/mountkernfs (100%)
rename src/initscripts/{init.d => system}/mounttmpfs (100%)
rename src/initscripts/{init.d => system}/network (100%)
rename src/initscripts/{init.d => system}/network-trigger (100%)
rename src/initscripts/{init.d => system}/ntp (100%)
rename src/initscripts/{init.d => system}/partresize (100%)
rename src/initscripts/{init.d => system}/random (100%)
rename src/initscripts/{init.d => system}/rc (100%)
rename src/initscripts/{init.d => system}/reboot (100%)
rename src/initscripts/{init.d => system}/rngd (100%)
rename src/initscripts/{init.d => system}/sendsignals (100%)
rename src/initscripts/{init.d => system}/setclock (100%)
rename src/initscripts/{init.d => system}/smartenabler (100%)
rename src/initscripts/{init.d => system}/snort (100%)
rename src/initscripts/{init.d => system}/squid (100%)
rename src/initscripts/{init.d => system}/sshd (100%)
rename src/initscripts/{init.d => system}/static-routes (100%)
rename src/initscripts/{init.d => system}/swap (100%)
rename src/initscripts/{init.d => system}/swconfig (100%)
rename src/initscripts/{init.d => system}/sysctl (100%)
rename src/initscripts/{init.d => system}/sysklogd (100%)
rename src/initscripts/{init.d => system}/template (100%)
rename src/initscripts/{init.d => system}/udev (100%)
rename src/initscripts/{init.d => system}/udev_retry (100%)
rename src/initscripts/{init.d => system}/unbound (82%)
rename src/initscripts/{init.d => system}/upnpd (100%)
rename src/initscripts/{init.d => system}/vnstat (100%)
rename src/initscripts/{init.d => system}/waitdrives (100%)
rename src/initscripts/{init.d => system}/wlanclient (100%)
rename src/patches/{squid-3.5.24-fix-max-file-descriptors.patch => squid-3.5.25-fix-max-file-descriptors.patch} (100%)
create mode 100644 src/patches/strongswan-disable-ipv6.patch
create mode 100644 src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 081e4e3..5e5417d 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -553,10 +553,10 @@ sub check_net_internal{
$cidr=&iporsubtocidr($cidr);
#check if we use one of ipfire's networks (green,orange,blue)
&readhash("${General::swroot}/ethernet/settings", \%ownnet);
- if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
- if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
- if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
- if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
+ if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+ if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+ if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+ if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
}
sub validport
@@ -1128,4 +1128,16 @@ sub get_red_interface() {
return $interface;
}
+sub dnssec_status() {
+ my $path = "${General::swroot}/red/dnssec-status";
+
+ open(STATUS, $path) or return 0;
+ my $status = <STATUS>;
+ close(STATUS);
+
+ chomp($status);
+
+ return $status;
+}
+
1;
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index c3fb43e..7b92992 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -31,6 +31,30 @@ require "${General::swroot}/header.pl";
my $ERROR;
+my @GRAPH_ARGS = (
+ # Output format
+ "--imgformat", "PNG",
+
+ # No border
+ "--border", "0",
+
+ # For a more 'organic' look
+ "--slope-mode",
+
+ # HxW define the size of the output image
+ "--full-size-mode",
+
+ # Watermark
+ "-W www.ipfire.org",
+
+ # Default size
+ "-w 910",
+ "-h 300",
+
+ # Use alternative grid
+ "--alt-y-grid",
+);
+
# Read the global settings files to get the current theme and after this load
# colors for this theme
@@ -77,11 +101,6 @@ foreach (@sensorsdir){
# 3 if given is the height of the iframe default if nothing is given
sub makegraphbox {
- my $height = 285;
- my $width = 700;
-
- if ( $_[3] ne "" ){ $height = $_[3]; }
-
print "<center>";
print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
print " - ";
@@ -93,7 +112,7 @@ sub makegraphbox {
print " - ";
print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
print "<br></center>";
- print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
+ print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]." scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
}
# Generate the CPU Graph for the current period of time for values given by
@@ -103,16 +122,10 @@ sub updatecpugraph {
my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
@@ -237,16 +250,10 @@ sub updatecpugraph {
sub updateloadgraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-r",
"-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -275,16 +282,10 @@ sub updateloadgraph {
sub updatememorygraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
@@ -337,16 +338,10 @@ sub updatememorygraph {
sub updateswapgraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-u 100",
"-r",
@@ -395,16 +390,10 @@ sub updateprocessescpugraph {
my $count="0";
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-r",
"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -448,16 +437,10 @@ sub updateprocessesmemorygraph {
my $count="0";
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-r",
"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -498,16 +481,10 @@ sub updatediskgraph {
my $disk = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -548,16 +525,10 @@ sub updateifgraph {
my $interface = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -591,16 +562,10 @@ sub updatevpngraph {
my $interface = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -634,16 +599,10 @@ sub updatevpnn2ngraph {
my $interface = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -704,16 +663,10 @@ sub updatevpnn2ngraph {
sub updatefwhitsgraph {
my $period = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -766,16 +719,10 @@ sub updatepinggraph {
my $period = $_[1];
my $host = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-l 0",
"-r",
"-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -812,16 +759,10 @@ sub updatewirelessgraph {
my $period = $_[1];
my $interface = $_[0];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v dBm",
"--color=SHADEA".$color{"color19"},
@@ -855,16 +796,10 @@ sub updatehddgraph {
my $disk = $_[0];
my $period = $_[1];
RRDs::graph(
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v Celsius",
@@ -895,16 +830,10 @@ sub updatehwtempgraph {
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"--color=SHADEA".$color{"color19"},
@@ -948,16 +877,10 @@ sub updatehwfangraph {
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"--color=SHADEA".$color{"color19"},
@@ -1001,16 +924,10 @@ sub updatehwvoltgraph {
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"--color=SHADEA".$color{"color19"},
@@ -1074,16 +991,10 @@ sub updateqosgraph {
my $color="#000000";
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
@@ -1133,16 +1044,10 @@ sub updatecpufreqgraph {
my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"},
"-v MHz",
@@ -1178,16 +1083,10 @@ sub updatethermaltempgraph {
my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null | wc -l`;
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 125",
"-r",
"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
"-v Grad Celsius",
@@ -1237,16 +1136,10 @@ sub getprocesses {
sub updateentropygraph {
my $period = $_[0];
my @command = (
+ @GRAPH_ARGS,
"-",
"--start",
"-1".$period,
- "-aPNG",
- "-i",
- "-z",
- "-W www.ipfire.org",
- "--alt-y-grid",
- "-w 600",
- "-h 225",
"-r",
"--lower-limit","0",
"-t $Lang::tr{'entropy'}",
@@ -1259,6 +1152,7 @@ sub updateentropygraph {
"GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
"GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
"GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
+ "--color=BACK".$color{"color21"},
);
RRDs::graph (@command);
diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index e2e3d81..ad56240 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -34,3 +34,8 @@ net.ipv6.conf.default.disable_ipv6 = 1
# Enable netfilter accounting
net.netfilter.nf_conntrack_acct=1
+
+# Disable netfilter on bridges.
+net.bridge.bridge-nf-call-ip6tables = 0
+net.bridge.bridge-nf-call-iptables = 0
+net.bridge.bridge-nf-call-arptables = 0
diff --git a/config/firewall/ipsec-block b/config/firewall/ipsec-block
index 9fa8e1a..96682b8 100644
--- a/config/firewall/ipsec-block
+++ b/config/firewall/ipsec-block
@@ -23,23 +23,43 @@ VPN_CONFIG="/var/ipfire/vpn/config"
block_subnet() {
local subnet="${1}"
+ local action="${2}"
# Don't block a wildcard subnet
if [ "${subnet}" = "0.0.0.0/0" ] || [ "${subnet}" = "0.0.0.0/0.0.0.0" ]; then
return 0
fi
- iptables -A IPSECBLOCK -d "${subnet}" -j REJECT --reject-with icmp-net-unreachable
+ case "${action}" in
+ reject)
+ iptables -A IPSECBLOCK -d "${subnet}" -j REJECT --reject-with icmp-net-unreachable
+ ;;
+ drop)
+ iptables -A IPSECBLOCK -d "${subnet}" -j DROP
+ ;;
+ *)
+ return 1
+ ;;
+ esac
+
+ return 0
}
block_ipsec() {
# Flush all exists rules
iptables -F IPSECBLOCK
- local id status name lefthost type ctype unknown1 unknown2 unknown3
- local leftsubnets unknown4 righthost rightsubnets rest
- while IFS="," read -r id status name lefthost type ctype unkown1 unknown2 unknown3 \
- leftsubnets unknown4 righthost rightsubnets rest; do
+ local action
+
+ local vars="id status name lefthost type ctype x1 x2 x3 leftsubnets"
+ vars="${vars} x4 righthost rightsubnets x5 x6 x7 x8 x9 x10 x11 x12"
+ vars="${vars} x13 x14 x15 x16 x17 x18 x19 x20 x21 proto x22 x23 x24"
+ vars="${vars} route rest"
+
+ # Register local variables
+ local ${vars}
+
+ while IFS="," read -r ${vars}; do
# Check if the connection is enabled
[ "${status}" = "on" ] || continue
@@ -49,9 +69,18 @@ block_ipsec() {
# Split multiple subnets
rightsubnets="${rightsubnets//\|/ }"
+ case "${route}" in
+ route)
+ action="drop"
+ ;;
+ *)
+ action="reject"
+ ;;
+ esac
+
local rightsubnet
for rightsubnet in ${rightsubnets}; do
- block_subnet "${rightsubnet}"
+ block_subnet "${rightsubnet}" "${action}"
done
done < "${VPN_CONFIG}"
}
diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 183ce80..8f1eae5 100644
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -19,9 +19,8 @@ KeepAliveTimeout 15
MinSpareServers 1
MaxSpareServers 10
-StartServers 1
-MaxClients 10
-MaxRequestsPerChild 100
+StartServers 2
+MaxClients 1000
#
# The following directives modify normal HTTP response behavior to
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index e1e78dc..1e67c36 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -3,65 +3,30 @@ etc/init.d
#etc/rc.d/helper
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -98,52 +63,31 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/swconfig
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors
index 4d17590..998b02e 100644
--- a/config/rootfiles/common/armv5tel/lm_sensors
+++ b/config/rootfiles/common/armv5tel/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
#usr/man/man1/sensors.1
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
#usr/man/man8/isadump.8
#usr/man/man8/isaset.8
#usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
#usr/man/man8/sensors-detect.8
usr/sbin/fancontrol
usr/sbin/pwmconfig
diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr
index d24d133..6a594f7 100644
--- a/config/rootfiles/common/attr
+++ b/config/rootfiles/common/attr
@@ -8,7 +8,7 @@ usr/bin/setfattr
#usr/include/attr/xattr.h
#usr/lib/libattr.a
#usr/lib/libattr.la
-usr/lib/libattr.so
+#usr/lib/libattr.so
usr/lib/libattr.so.1
usr/lib/libattr.so.1.1.0
#usr/share/doc/attr
@@ -29,16 +29,7 @@ usr/lib/libattr.so.1.1.0
#usr/share/man/man1/getfattr.1
#usr/share/man/man1/setfattr.1
#usr/share/man/man2/fgetxattr.2
-#usr/share/man/man2/fremovexattr.2
#usr/share/man/man2/fsetxattr.2
-#usr/share/man/man2/getxattr.2
-#usr/share/man/man2/llistxattr.2
-#usr/share/man/man2/lgetxattr.2
-#usr/share/man/man2/listxattr.2
-#usr/share/man/man2/lremovexattr.2
-#usr/share/man/man2/lsetxattr.2
-#usr/share/man/man2/removexattr.2
-#usr/share/man/man2/setxattr.2
#usr/share/man/man3/attr_get.3
#usr/share/man/man3/attr_getf.3
#usr/share/man/man3/attr_list.3
diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo
index ca09099..12934ce 100644
--- a/config/rootfiles/common/cairo
+++ b/config/rootfiles/common/cairo
@@ -7,36 +7,38 @@
#usr/include/cairo/cairo-pdf.h
#usr/include/cairo/cairo-ps.h
#usr/include/cairo/cairo-script-interpreter.h
+#usr/include/cairo/cairo-script.h
#usr/include/cairo/cairo-svg.h
#usr/include/cairo/cairo-version.h
#usr/include/cairo/cairo.h
#usr/lib/cairo
#usr/lib/cairo/libcairo-trace.a
#usr/lib/cairo/libcairo-trace.la
-usr/lib/cairo/libcairo-trace.so
+#usr/lib/cairo/libcairo-trace.so
usr/lib/cairo/libcairo-trace.so.0
usr/lib/cairo/libcairo-trace.so.0.0.0
#usr/lib/libcairo-gobject.a
#usr/lib/libcairo-gobject.la
-usr/lib/libcairo-gobject.so
+#usr/lib/libcairo-gobject.so
usr/lib/libcairo-gobject.so.2
-usr/lib/libcairo-gobject.so.2.11000.2
+usr/lib/libcairo-gobject.so.2.11400.8
#usr/lib/libcairo-script-interpreter.a
#usr/lib/libcairo-script-interpreter.la
-usr/lib/libcairo-script-interpreter.so
+#usr/lib/libcairo-script-interpreter.so
usr/lib/libcairo-script-interpreter.so.2
-usr/lib/libcairo-script-interpreter.so.2.11000.2
+usr/lib/libcairo-script-interpreter.so.2.11400.8
#usr/lib/libcairo.a
#usr/lib/libcairo.la
#usr/lib/libcairo.so
usr/lib/libcairo.so.2
-usr/lib/libcairo.so.2.11000.2
+usr/lib/libcairo.so.2.11400.8
#usr/lib/pkgconfig/cairo-fc.pc
#usr/lib/pkgconfig/cairo-ft.pc
#usr/lib/pkgconfig/cairo-gobject.pc
#usr/lib/pkgconfig/cairo-pdf.pc
#usr/lib/pkgconfig/cairo-png.pc
#usr/lib/pkgconfig/cairo-ps.pc
+#usr/lib/pkgconfig/cairo-script.pc
#usr/lib/pkgconfig/cairo-svg.pc
#usr/lib/pkgconfig/cairo.pc
#usr/share/gtk-doc/html/cairo
@@ -58,16 +60,20 @@ usr/lib/libcairo.so.2.11000.2
#usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
#usr/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Raster-Sources.html
#usr/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-Regions.html
#usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-Transformations.html
#usr/share/gtk-doc/html/cairo/cairo-Types.html
#usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
#usr/share/gtk-doc/html/cairo/cairo-Version-Information.html
#usr/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
#usr/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
#usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html
#usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
#usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
@@ -81,10 +87,11 @@ usr/lib/libcairo.so.2.11000.2
#usr/share/gtk-doc/html/cairo/cairo-support.html
#usr/share/gtk-doc/html/cairo/cairo-surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-text.html
-#usr/share/gtk-doc/html/cairo/cairo.devhelp
#usr/share/gtk-doc/html/cairo/cairo.devhelp2
#usr/share/gtk-doc/html/cairo/home.png
#usr/share/gtk-doc/html/cairo/index-1.10.html
+#usr/share/gtk-doc/html/cairo/index-1.12.html
+#usr/share/gtk-doc/html/cairo/index-1.14.html
#usr/share/gtk-doc/html/cairo/index-1.2.html
#usr/share/gtk-doc/html/cairo/index-1.4.html
#usr/share/gtk-doc/html/cairo/index-1.6.html
@@ -93,7 +100,10 @@ usr/lib/libcairo.so.2.11000.2
#usr/share/gtk-doc/html/cairo/index.html
#usr/share/gtk-doc/html/cairo/index.sgml
#usr/share/gtk-doc/html/cairo/language-bindings.html
+#usr/share/gtk-doc/html/cairo/left-insensitive.png
#usr/share/gtk-doc/html/cairo/left.png
+#usr/share/gtk-doc/html/cairo/right-insensitive.png
#usr/share/gtk-doc/html/cairo/right.png
#usr/share/gtk-doc/html/cairo/style.css
+#usr/share/gtk-doc/html/cairo/up-insensitive.png
#usr/share/gtk-doc/html/cairo/up.png
diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig
index ade611e..e567d6d 100644
--- a/config/rootfiles/common/fontconfig
+++ b/config/rootfiles/common/fontconfig
@@ -1,33 +1,7 @@
#etc/fonts
-#etc/fonts/conf.avail
-etc/fonts/conf.avail/10-autohint.conf
-etc/fonts/conf.avail/10-no-sub-pixel.conf
-etc/fonts/conf.avail/10-sub-pixel-bgr.conf
-etc/fonts/conf.avail/10-sub-pixel-rgb.conf
-etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
-etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
-etc/fonts/conf.avail/10-unhinted.conf
-etc/fonts/conf.avail/20-fix-globaladvance.conf
-etc/fonts/conf.avail/20-unhint-small-vera.conf
-etc/fonts/conf.avail/25-unhint-nonlatin.conf
-etc/fonts/conf.avail/30-metric-aliases.conf
-etc/fonts/conf.avail/30-urw-aliases.conf
-etc/fonts/conf.avail/40-nonlatin.conf
-etc/fonts/conf.avail/45-latin.conf
-etc/fonts/conf.avail/49-sansserif.conf
-etc/fonts/conf.avail/50-user.conf
-etc/fonts/conf.avail/51-local.conf
-etc/fonts/conf.avail/60-latin.conf
-etc/fonts/conf.avail/65-fonts-persian.conf
-etc/fonts/conf.avail/65-khmer.conf
-etc/fonts/conf.avail/65-nonlatin.conf
-etc/fonts/conf.avail/69-unifont.conf
-etc/fonts/conf.avail/70-no-bitmaps.conf
-etc/fonts/conf.avail/70-yes-bitmaps.conf
-etc/fonts/conf.avail/80-delicious.conf
-etc/fonts/conf.avail/90-synthetic.conf
#etc/fonts/conf.d
-etc/fonts/conf.d/20-fix-globaladvance.conf
+etc/fonts/conf.d/10-hinting-slight.conf
+etc/fonts/conf.d/10-scale-bitmap-fonts.conf
etc/fonts/conf.d/20-unhint-small-vera.conf
etc/fonts/conf.d/30-metric-aliases.conf
etc/fonts/conf.d/30-urw-aliases.conf
@@ -44,208 +18,275 @@ etc/fonts/conf.d/80-delicious.conf
etc/fonts/conf.d/90-synthetic.conf
#etc/fonts/conf.d/README
etc/fonts/fonts.conf
-etc/fonts/fonts.dtd
usr/bin/fc-cache
usr/bin/fc-cat
usr/bin/fc-list
usr/bin/fc-match
+usr/bin/fc-pattern
+usr/bin/fc-query
+usr/bin/fc-scan
+usr/bin/fc-validate
#usr/include/fontconfig
#usr/include/fontconfig/fcfreetype.h
#usr/include/fontconfig/fcprivate.h
#usr/include/fontconfig/fontconfig.h
-#usr/lib/libfontconfig.a
#usr/lib/libfontconfig.la
-usr/lib/libfontconfig.so
+#usr/lib/libfontconfig.so
usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.3.0
-usr/lib/pkgconfig/fontconfig.pc
+usr/lib/libfontconfig.so.1.9.2
+#usr/lib/pkgconfig/fontconfig.pc
#usr/share/doc/fontconfig
#usr/share/doc/fontconfig/fontconfig-devel
#usr/share/doc/fontconfig/fontconfig-devel.pdf
#usr/share/doc/fontconfig/fontconfig-devel.txt
-#usr/share/doc/fontconfig/fontconfig-devel/index.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1034.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1056.html
-#usr/share/doc/fontconfig/fontconfig-devel/r108.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1099.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1127.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1148.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1171.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1237.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1260.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1283.html
-#usr/share/doc/fontconfig/fontconfig-devel/r129.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1309.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1336.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1367.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1389.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1412.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1434.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1460.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1482.html
-#usr/share/doc/fontconfig/fontconfig-devel/r150.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1505.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1529.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1552.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1577.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1602.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1627.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1652.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1677.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1699.html
-#usr/share/doc/fontconfig/fontconfig-devel/r171.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1724.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1749.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1774.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1801.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1829.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1858.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1883.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1905.html
-#usr/share/doc/fontconfig/fontconfig-devel/r192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1927.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1950.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1976.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2002.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2032.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2057.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2081.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2110.html
-#usr/share/doc/fontconfig/fontconfig-devel/r213.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2131.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2155.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2178.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2201.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2227.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2256.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2286.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2316.html
-#usr/share/doc/fontconfig/fontconfig-devel/r234.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2349.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2370.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2391.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2413.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2434.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2456.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2478.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2501.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2522.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2544.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2566.html
-#usr/share/doc/fontconfig/fontconfig-devel/r258.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2588.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2609.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2631.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2655.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2676.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2698.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2721.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2744.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2767.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2788.html
-#usr/share/doc/fontconfig/fontconfig-devel/r279.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2817.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2842.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2873.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2911.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2942.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2969.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2993.html
-#usr/share/doc/fontconfig/fontconfig-devel/r301.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3021.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3045.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3069.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3094.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3118.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3142.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3164.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3213.html
-#usr/share/doc/fontconfig/fontconfig-devel/r323.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3234.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3257.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3283.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3305.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3327.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3349.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3371.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3393.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3414.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3435.html
-#usr/share/doc/fontconfig/fontconfig-devel/r344.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3460.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3496.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3518.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3553.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3581.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3607.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3629.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3656.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3683.html
-#usr/share/doc/fontconfig/fontconfig-devel/r369.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3708.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3733.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3755.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3778.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3805.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3827.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3852.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3873.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3898.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3923.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3948.html
-#usr/share/doc/fontconfig/fontconfig-devel/r397.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3973.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3999.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4021.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4043.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4065.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4090.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4119.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4144.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4176.html
-#usr/share/doc/fontconfig/fontconfig-devel/r418.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4209.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4245.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4267.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4289.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4311.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4334.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4356.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4380.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4405.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4430.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4457.html
-#usr/share/doc/fontconfig/fontconfig-devel/r446.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4484.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4509.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4530.html
-#usr/share/doc/fontconfig/fontconfig-devel/r475.html
-#usr/share/doc/fontconfig/fontconfig-devel/r570.html
-#usr/share/doc/fontconfig/fontconfig-devel/r600.html
-#usr/share/doc/fontconfig/fontconfig-devel/r707.html
-#usr/share/doc/fontconfig/fontconfig-devel/r759.html
-#usr/share/doc/fontconfig/fontconfig-devel/r782.html
-#usr/share/doc/fontconfig/fontconfig-devel/r807.html
-#usr/share/doc/fontconfig/fontconfig-devel/r828.html
-#usr/share/doc/fontconfig/fontconfig-devel/r856.html
-#usr/share/doc/fontconfig/fontconfig-devel/r878.html
-#usr/share/doc/fontconfig/fontconfig-devel/r902.html
-#usr/share/doc/fontconfig/fontconfig-devel/r923.html
-#usr/share/doc/fontconfig/fontconfig-devel/r944.html
-#usr/share/doc/fontconfig/fontconfig-devel/r967.html
-#usr/share/doc/fontconfig/fontconfig-devel/r999.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomiclock.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachedir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachesubdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdirsave.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdirscan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfileisdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfilescan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfini.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontlist.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontmatch.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsort.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetversion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinit.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcislower.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsethash.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameconstant.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameparse.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrdirname.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrfree.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrstr.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fctolower.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf16len.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf8len.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
+#usr/share/doc/fontconfig/fontconfig-devel/ln12.html
+#usr/share/doc/fontconfig/fontconfig-devel/t1.html
#usr/share/doc/fontconfig/fontconfig-devel/x102.html
#usr/share/doc/fontconfig/fontconfig-devel/x19.html
#usr/share/doc/fontconfig/fontconfig-devel/x31.html
#usr/share/doc/fontconfig/fontconfig-user.html
#usr/share/doc/fontconfig/fontconfig-user.pdf
#usr/share/doc/fontconfig/fontconfig-user.txt
+#usr/share/fontconfig
+#usr/share/fontconfig/conf.avail
+#usr/share/fontconfig/conf.avail/10-autohint.conf
+#usr/share/fontconfig/conf.avail/10-hinting-full.conf
+#usr/share/fontconfig/conf.avail/10-hinting-medium.conf
+#usr/share/fontconfig/conf.avail/10-hinting-none.conf
+#usr/share/fontconfig/conf.avail/10-hinting-slight.conf
+#usr/share/fontconfig/conf.avail/10-no-sub-pixel.conf
+#usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+#usr/share/fontconfig/conf.avail/10-unhinted.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
+#usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
+#usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+#usr/share/fontconfig/conf.avail/30-metric-aliases.conf
+#usr/share/fontconfig/conf.avail/30-urw-aliases.conf
+#usr/share/fontconfig/conf.avail/40-nonlatin.conf
+#usr/share/fontconfig/conf.avail/45-latin.conf
+#usr/share/fontconfig/conf.avail/49-sansserif.conf
+#usr/share/fontconfig/conf.avail/50-user.conf
+#usr/share/fontconfig/conf.avail/51-local.conf
+#usr/share/fontconfig/conf.avail/60-latin.conf
+#usr/share/fontconfig/conf.avail/65-fonts-persian.conf
+#usr/share/fontconfig/conf.avail/65-khmer.conf
+#usr/share/fontconfig/conf.avail/65-nonlatin.conf
+#usr/share/fontconfig/conf.avail/69-unifont.conf
+#usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
+#usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
+#usr/share/fontconfig/conf.avail/80-delicious.conf
+#usr/share/fontconfig/conf.avail/90-synthetic.conf
#usr/share/man/man1/fc-cache.1
#usr/share/man/man1/fc-cat.1
#usr/share/man/man1/fc-list.1
#usr/share/man/man1/fc-match.1
+#usr/share/man/man1/fc-pattern.1
+#usr/share/man/man1/fc-query.1
+#usr/share/man/man1/fc-scan.1
+#usr/share/man/man1/fc-validate.1
#usr/share/man/man3/FcAtomicCreate.3
#usr/share/man/man3/FcAtomicDeleteNew.3
#usr/share/man/man3/FcAtomicDestroy.3
@@ -259,6 +300,7 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcBlanksDestroy.3
#usr/share/man/man3/FcBlanksIsMember.3
#usr/share/man/man3/FcCacheCopySet.3
+#usr/share/man/man3/FcCacheCreateTagFile.3
#usr/share/man/man3/FcCacheDir.3
#usr/share/man/man3/FcCacheNumFont.3
#usr/share/man/man3/FcCacheNumSubdir.3
@@ -268,6 +310,7 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcCharSetCount.3
#usr/share/man/man3/FcCharSetCoverage.3
#usr/share/man/man3/FcCharSetCreate.3
+#usr/share/man/man3/FcCharSetDelChar.3
#usr/share/man/man3/FcCharSetDestroy.3
#usr/share/man/man3/FcCharSetEqual.3
#usr/share/man/man3/FcCharSetFirstPage.3
@@ -275,6 +318,7 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcCharSetIntersect.3
#usr/share/man/man3/FcCharSetIntersectCount.3
#usr/share/man/man3/FcCharSetIsSubset.3
+#usr/share/man/man3/FcCharSetMerge.3
#usr/share/man/man3/FcCharSetNew.3
#usr/share/man/man3/FcCharSetNextPage.3
#usr/share/man/man3/FcCharSetSubtract.3
@@ -297,17 +341,22 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcConfigGetFontDirs.3
#usr/share/man/man3/FcConfigGetFonts.3
#usr/share/man/man3/FcConfigGetRescanInterval.3
+#usr/share/man/man3/FcConfigGetSysRoot.3
#usr/share/man/man3/FcConfigHome.3
#usr/share/man/man3/FcConfigParseAndLoad.3
+#usr/share/man/man3/FcConfigReference.3
#usr/share/man/man3/FcConfigSetCurrent.3
#usr/share/man/man3/FcConfigSetRescanInterval.3
+#usr/share/man/man3/FcConfigSetSysRoot.3
#usr/share/man/man3/FcConfigSubstitute.3
#usr/share/man/man3/FcConfigSubstituteWithPat.3
#usr/share/man/man3/FcConfigUptoDate.3
#usr/share/man/man3/FcDefaultSubstitute.3
+#usr/share/man/man3/FcDirCacheClean.3
#usr/share/man/man3/FcDirCacheLoad.3
#usr/share/man/man3/FcDirCacheLoadFile.3
#usr/share/man/man3/FcDirCacheRead.3
+#usr/share/man/man3/FcDirCacheRescan.3
#usr/share/man/man3/FcDirCacheUnlink.3
#usr/share/man/man3/FcDirCacheUnload.3
#usr/share/man/man3/FcDirCacheValid.3
@@ -333,6 +382,7 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcFreeTypeCharSetAndSpacing.3
#usr/share/man/man3/FcFreeTypeQuery.3
#usr/share/man/man3/FcFreeTypeQueryFace.3
+#usr/share/man/man3/FcGetDefaultLangs.3
#usr/share/man/man3/FcGetLangs.3
#usr/share/man/man3/FcGetVersion.3
#usr/share/man/man3/FcInit.3
@@ -343,15 +393,20 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcIsLower.3
#usr/share/man/man3/FcIsUpper.3
#usr/share/man/man3/FcLangGetCharSet.3
+#usr/share/man/man3/FcLangNormalize.3
#usr/share/man/man3/FcLangSetAdd.3
#usr/share/man/man3/FcLangSetCompare.3
#usr/share/man/man3/FcLangSetContains.3
#usr/share/man/man3/FcLangSetCopy.3
#usr/share/man/man3/FcLangSetCreate.3
+#usr/share/man/man3/FcLangSetDel.3
#usr/share/man/man3/FcLangSetDestroy.3
#usr/share/man/man3/FcLangSetEqual.3
+#usr/share/man/man3/FcLangSetGetLangs.3
#usr/share/man/man3/FcLangSetHasLang.3
#usr/share/man/man3/FcLangSetHash.3
+#usr/share/man/man3/FcLangSetSubtract.3
+#usr/share/man/man3/FcLangSetUnion.3
#usr/share/man/man3/FcMatrixCopy.3
#usr/share/man/man3/FcMatrixEqual.3
#usr/share/man/man3/FcMatrixInit.3
@@ -382,21 +437,30 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcPatternDuplicate.3
#usr/share/man/man3/FcPatternEqual.3
#usr/share/man/man3/FcPatternEqualSubset.3
+#usr/share/man/man3/FcPatternFilter.3
+#usr/share/man/man3/FcPatternFormat.3
#usr/share/man/man3/FcPatternGet-Type.3
#usr/share/man/man3/FcPatternGet.3
#usr/share/man/man3/FcPatternHash.3
#usr/share/man/man3/FcPatternPrint.3
#usr/share/man/man3/FcPatternReference.3
#usr/share/man/man3/FcPatternRemove.3
+#usr/share/man/man3/FcRangeCopy.3
+#usr/share/man/man3/FcRangeCreateDouble.3
+#usr/share/man/man3/FcRangeCreateInteger.3
+#usr/share/man/man3/FcRangeDestroy.3
+#usr/share/man/man3/FcRangeGetDouble.3
#usr/share/man/man3/FcStrBasename.3
#usr/share/man/man3/FcStrCmp.3
#usr/share/man/man3/FcStrCmpIgnoreCase.3
#usr/share/man/man3/FcStrCopy.3
#usr/share/man/man3/FcStrCopyFilename.3
+#usr/share/man/man3/FcStrDirname.3
#usr/share/man/man3/FcStrDowncase.3
#usr/share/man/man3/FcStrFree.3
#usr/share/man/man3/FcStrListCreate.3
#usr/share/man/man3/FcStrListDone.3
+#usr/share/man/man3/FcStrListFirst.3
#usr/share/man/man3/FcStrListNext.3
#usr/share/man/man3/FcStrPlus.3
#usr/share/man/man3/FcStrSetAdd.3
@@ -418,7 +482,11 @@ usr/lib/pkgconfig/fontconfig.pc
#usr/share/man/man3/FcValueEqual.3
#usr/share/man/man3/FcValuePrint.3
#usr/share/man/man3/FcValueSave.3
+#usr/share/man/man3/FcWeightFromOpenType.3
+#usr/share/man/man3/FcWeightToOpenType.3
#usr/share/man/man5/fonts-conf.5
-#usr/var
-#usr/var/cache
-usr/var/cache/fontconfig
+#usr/share/xml
+#usr/share/xml/fontconfig
+usr/share/xml/fontconfig/fonts.dtd
+var/cache/fontconfig
+var/cache/fontconfig/CACHEDIR.TAG
diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype
index 9731f28..38bff84 100644
--- a/config/rootfiles/common/freetype
+++ b/config/rootfiles/common/freetype
@@ -1,14 +1,6 @@
#usr/bin/freetype-config
#usr/include/freetype2
#usr/include/freetype2/freetype
-#usr/include/freetype2/freetype/cache
-#usr/include/freetype2/freetype/cache/ftccache.h
-#usr/include/freetype2/freetype/cache/ftccmap.h
-#usr/include/freetype2/freetype/cache/ftcglyph.h
-#usr/include/freetype2/freetype/cache/ftcimage.h
-#usr/include/freetype2/freetype/cache/ftcmanag.h
-#usr/include/freetype2/freetype/cache/ftcmru.h
-#usr/include/freetype2/freetype/cache/ftcsbits.h
#usr/include/freetype2/freetype/config
#usr/include/freetype2/freetype/config/ftconfig.h
#usr/include/freetype2/freetype/config/ftheader.h
@@ -16,17 +8,26 @@
#usr/include/freetype2/freetype/config/ftoption.h
#usr/include/freetype2/freetype/config/ftstdlib.h
#usr/include/freetype2/freetype/freetype.h
+#usr/include/freetype2/freetype/ftadvanc.h
+#usr/include/freetype2/freetype/ftautoh.h
#usr/include/freetype2/freetype/ftbbox.h
#usr/include/freetype2/freetype/ftbdf.h
#usr/include/freetype2/freetype/ftbitmap.h
+#usr/include/freetype2/freetype/ftbzip2.h
#usr/include/freetype2/freetype/ftcache.h
+#usr/include/freetype2/freetype/ftcffdrv.h
#usr/include/freetype2/freetype/ftchapters.h
+#usr/include/freetype2/freetype/ftcid.h
#usr/include/freetype2/freetype/fterrdef.h
#usr/include/freetype2/freetype/fterrors.h
+#usr/include/freetype2/freetype/ftfntfmt.h
+#usr/include/freetype2/freetype/ftgasp.h
#usr/include/freetype2/freetype/ftglyph.h
+#usr/include/freetype2/freetype/ftgxval.h
#usr/include/freetype2/freetype/ftgzip.h
#usr/include/freetype2/freetype/ftimage.h
#usr/include/freetype2/freetype/ftincrem.h
+#usr/include/freetype2/freetype/ftlcdfil.h
#usr/include/freetype2/freetype/ftlist.h
#usr/include/freetype2/freetype/ftlzw.h
#usr/include/freetype2/freetype/ftmac.h
@@ -41,55 +42,22 @@
#usr/include/freetype2/freetype/ftsnames.h
#usr/include/freetype2/freetype/ftstroke.h
#usr/include/freetype2/freetype/ftsynth.h
-#usr/include/freetype2/freetype/ftsysio.h
-#usr/include/freetype2/freetype/ftsysmem.h
#usr/include/freetype2/freetype/ftsystem.h
#usr/include/freetype2/freetype/fttrigon.h
+#usr/include/freetype2/freetype/ftttdrv.h
#usr/include/freetype2/freetype/fttypes.h
#usr/include/freetype2/freetype/ftwinfnt.h
-#usr/include/freetype2/freetype/ftxf86.h
-#usr/include/freetype2/freetype/internal
-#usr/include/freetype2/freetype/internal/autohint.h
-#usr/include/freetype2/freetype/internal/ftcalc.h
-#usr/include/freetype2/freetype/internal/ftdebug.h
-#usr/include/freetype2/freetype/internal/ftdriver.h
-#usr/include/freetype2/freetype/internal/ftgloadr.h
-#usr/include/freetype2/freetype/internal/ftmemory.h
-#usr/include/freetype2/freetype/internal/ftobjs.h
-#usr/include/freetype2/freetype/internal/ftrfork.h
-#usr/include/freetype2/freetype/internal/ftserv.h
-#usr/include/freetype2/freetype/internal/ftstream.h
-#usr/include/freetype2/freetype/internal/fttrace.h
-#usr/include/freetype2/freetype/internal/ftvalid.h
-#usr/include/freetype2/freetype/internal/internal.h
-#usr/include/freetype2/freetype/internal/pcftypes.h
-#usr/include/freetype2/freetype/internal/psaux.h
-#usr/include/freetype2/freetype/internal/pshints.h
-#usr/include/freetype2/freetype/internal/sfnt.h
-#usr/include/freetype2/freetype/internal/svbdf.h
-#usr/include/freetype2/freetype/internal/svgldict.h
-#usr/include/freetype2/freetype/internal/svmm.h
-#usr/include/freetype2/freetype/internal/svotval.h
-#usr/include/freetype2/freetype/internal/svpfr.h
-#usr/include/freetype2/freetype/internal/svpostnm.h
-#usr/include/freetype2/freetype/internal/svpscmap.h
-#usr/include/freetype2/freetype/internal/svpsinfo.h
-#usr/include/freetype2/freetype/internal/svsfnt.h
-#usr/include/freetype2/freetype/internal/svttcmap.h
-#usr/include/freetype2/freetype/internal/svwinfnt.h
-#usr/include/freetype2/freetype/internal/svxf86nm.h
-#usr/include/freetype2/freetype/internal/t1types.h
-#usr/include/freetype2/freetype/internal/tttypes.h
#usr/include/freetype2/freetype/t1tables.h
#usr/include/freetype2/freetype/ttnameid.h
#usr/include/freetype2/freetype/tttables.h
#usr/include/freetype2/freetype/tttags.h
#usr/include/freetype2/freetype/ttunpat.h
-#usr/include/ft2build.h
+#usr/include/freetype2/ft2build.h
#usr/lib/libfreetype.a
#usr/lib/libfreetype.la
-usr/lib/libfreetype.so
+#usr/lib/libfreetype.so
usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.3.8
+usr/lib/libfreetype.so.6.13.0
#usr/lib/pkgconfig/freetype2.pc
#usr/share/aclocal/freetype2.m4
+#usr/share/man/man1/freetype-config.1
diff --git a/config/rootfiles/common/gnutls b/config/rootfiles/common/gnutls
new file mode 100644
index 0000000..e43b913
--- /dev/null
+++ b/config/rootfiles/common/gnutls
@@ -0,0 +1,1116 @@
+usr/bin/certtool
+usr/bin/danetool
+usr/bin/gnutls-cli
+usr/bin/gnutls-cli-debug
+usr/bin/gnutls-serv
+usr/bin/ocsptool
+usr/bin/psktool
+usr/bin/srptool
+#usr/include/gnutls
+#usr/include/gnutls/abstract.h
+#usr/include/gnutls/compat.h
+#usr/include/gnutls/crypto.h
+#usr/include/gnutls/dane.h
+#usr/include/gnutls/dtls.h
+#usr/include/gnutls/gnutls.h
+#usr/include/gnutls/gnutlsxx.h
+#usr/include/gnutls/ocsp.h
+#usr/include/gnutls/openpgp.h
+#usr/include/gnutls/pkcs11.h
+#usr/include/gnutls/pkcs12.h
+#usr/include/gnutls/pkcs7.h
+#usr/include/gnutls/self-test.h
+#usr/include/gnutls/socket.h
+#usr/include/gnutls/system-keys.h
+#usr/include/gnutls/tpm.h
+#usr/include/gnutls/urls.h
+#usr/include/gnutls/x509-ext.h
+#usr/include/gnutls/x509.h
+#usr/lib/libgnutls-dane.la
+#usr/lib/libgnutls-dane.so
+usr/lib/libgnutls-dane.so.0
+usr/lib/libgnutls-dane.so.0.4.1
+#usr/lib/libgnutls.la
+#usr/lib/libgnutls.so
+usr/lib/libgnutls.so.30
+usr/lib/libgnutls.so.30.14.0
+#usr/lib/libgnutlsxx.la
+#usr/lib/libgnutlsxx.so
+usr/lib/libgnutlsxx.so.28
+usr/lib/libgnutlsxx.so.28.1.0
+#usr/lib/pkgconfig/gnutls-dane.pc
+#usr/lib/pkgconfig/gnutls.pc
+#usr/share/info/gnutls-client-server-use-case.png
+#usr/share/info/gnutls-guile.info
+#usr/share/info/gnutls-handshake-sequence.png
+#usr/share/info/gnutls-handshake-state.png
+#usr/share/info/gnutls-internals.png
+#usr/share/info/gnutls-layers.png
+#usr/share/info/gnutls-logo.png
+#usr/share/info/gnutls-modauth.png
+#usr/share/info/gnutls-x509.png
+#usr/share/info/gnutls.info
+#usr/share/info/gnutls.info-1
+#usr/share/info/gnutls.info-2
+#usr/share/info/gnutls.info-3
+#usr/share/info/gnutls.info-4
+#usr/share/info/gnutls.info-5
+#usr/share/info/gnutls.info-6
+#usr/share/info/pkcs11-vision.png
+#usr/share/locale/cs/LC_MESSAGES/gnutls.mo
+#usr/share/locale/de/LC_MESSAGES/gnutls.mo
+#usr/share/locale/en(a)boldquot/LC_MESSAGES/gnutls.mo
+#usr/share/locale/en(a)quot/LC_MESSAGES/gnutls.mo
+#usr/share/locale/eo/LC_MESSAGES/gnutls.mo
+#usr/share/locale/fi/LC_MESSAGES/gnutls.mo
+#usr/share/locale/fr/LC_MESSAGES/gnutls.mo
+#usr/share/locale/it/LC_MESSAGES/gnutls.mo
+#usr/share/locale/ms/LC_MESSAGES/gnutls.mo
+#usr/share/locale/nl/LC_MESSAGES/gnutls.mo
+#usr/share/locale/pl/LC_MESSAGES/gnutls.mo
+#usr/share/locale/sv/LC_MESSAGES/gnutls.mo
+#usr/share/locale/uk/LC_MESSAGES/gnutls.mo
+#usr/share/locale/vi/LC_MESSAGES/gnutls.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/gnutls.mo
+#usr/share/man/man1/certtool.1
+#usr/share/man/man1/danetool.1
+#usr/share/man/man1/gnutls-cli-debug.1
+#usr/share/man/man1/gnutls-cli.1
+#usr/share/man/man1/gnutls-serv.1
+#usr/share/man/man1/ocsptool.1
+#usr/share/man/man1/p11tool.1
+#usr/share/man/man1/psktool.1
+#usr/share/man/man1/srptool.1
+#usr/share/man/man1/tpmtool.1
+#usr/share/man/man3/dane_cert_type_name.3
+#usr/share/man/man3/dane_cert_usage_name.3
+#usr/share/man/man3/dane_match_type_name.3
+#usr/share/man/man3/dane_query_data.3
+#usr/share/man/man3/dane_query_deinit.3
+#usr/share/man/man3/dane_query_entries.3
+#usr/share/man/man3/dane_query_status.3
+#usr/share/man/man3/dane_query_tlsa.3
+#usr/share/man/man3/dane_query_to_raw_tlsa.3
+#usr/share/man/man3/dane_raw_tlsa.3
+#usr/share/man/man3/dane_state_deinit.3
+#usr/share/man/man3/dane_state_init.3
+#usr/share/man/man3/dane_state_set_dlv_file.3
+#usr/share/man/man3/dane_strerror.3
+#usr/share/man/man3/dane_verification_status_print.3
+#usr/share/man/man3/dane_verify_crt.3
+#usr/share/man/man3/dane_verify_crt_raw.3
+#usr/share/man/man3/dane_verify_session_crt.3
+#usr/share/man/man3/gnutls_aead_cipher_decrypt.3
+#usr/share/man/man3/gnutls_aead_cipher_deinit.3
+#usr/share/man/man3/gnutls_aead_cipher_encrypt.3
+#usr/share/man/man3/gnutls_aead_cipher_init.3
+#usr/share/man/man3/gnutls_alert_get.3
+#usr/share/man/man3/gnutls_alert_get_name.3
+#usr/share/man/man3/gnutls_alert_get_strname.3
+#usr/share/man/man3/gnutls_alert_send.3
+#usr/share/man/man3/gnutls_alert_send_appropriate.3
+#usr/share/man/man3/gnutls_alpn_get_selected_protocol.3
+#usr/share/man/man3/gnutls_alpn_set_protocols.3
+#usr/share/man/man3/gnutls_anon_allocate_client_credentials.3
+#usr/share/man/man3/gnutls_anon_allocate_server_credentials.3
+#usr/share/man/man3/gnutls_anon_free_client_credentials.3
+#usr/share/man/man3/gnutls_anon_free_server_credentials.3
+#usr/share/man/man3/gnutls_anon_set_params_function.3
+#usr/share/man/man3/gnutls_anon_set_server_dh_params.3
+#usr/share/man/man3/gnutls_anon_set_server_known_dh_params.3
+#usr/share/man/man3/gnutls_anon_set_server_params_function.3
+#usr/share/man/man3/gnutls_auth_client_get_type.3
+#usr/share/man/man3/gnutls_auth_get_type.3
+#usr/share/man/man3/gnutls_auth_server_get_type.3
+#usr/share/man/man3/gnutls_buffer_append_data.3
+#usr/share/man/man3/gnutls_bye.3
+#usr/share/man/man3/gnutls_certificate_activation_time_peers.3
+#usr/share/man/man3/gnutls_certificate_allocate_credentials.3
+#usr/share/man/man3/gnutls_certificate_client_get_request_status.3
+#usr/share/man/man3/gnutls_certificate_expiration_time_peers.3
+#usr/share/man/man3/gnutls_certificate_free_ca_names.3
+#usr/share/man/man3/gnutls_certificate_free_cas.3
+#usr/share/man/man3/gnutls_certificate_free_credentials.3
+#usr/share/man/man3/gnutls_certificate_free_crls.3
+#usr/share/man/man3/gnutls_certificate_free_keys.3
+#usr/share/man/man3/gnutls_certificate_get_crt_raw.3
+#usr/share/man/man3/gnutls_certificate_get_issuer.3
+#usr/share/man/man3/gnutls_certificate_get_ours.3
+#usr/share/man/man3/gnutls_certificate_get_peers.3
+#usr/share/man/man3/gnutls_certificate_get_peers_subkey_id.3
+#usr/share/man/man3/gnutls_certificate_get_trust_list.3
+#usr/share/man/man3/gnutls_certificate_get_verify_flags.3
+#usr/share/man/man3/gnutls_certificate_get_x509_crt.3
+#usr/share/man/man3/gnutls_certificate_get_x509_key.3
+#usr/share/man/man3/gnutls_certificate_send_x509_rdn_sequence.3
+#usr/share/man/man3/gnutls_certificate_server_set_request.3
+#usr/share/man/man3/gnutls_certificate_set_dh_params.3
+#usr/share/man/man3/gnutls_certificate_set_flags.3
+#usr/share/man/man3/gnutls_certificate_set_key.3
+#usr/share/man/man3/gnutls_certificate_set_known_dh_params.3
+#usr/share/man/man3/gnutls_certificate_set_ocsp_status_request_file.3
+#usr/share/man/man3/gnutls_certificate_set_ocsp_status_request_function.3
+#usr/share/man/man3/gnutls_certificate_set_ocsp_status_request_function2.3
+#usr/share/man/man3/gnutls_certificate_set_params_function.3
+#usr/share/man/man3/gnutls_certificate_set_pin_function.3
+#usr/share/man/man3/gnutls_certificate_set_retrieve_function.3
+#usr/share/man/man3/gnutls_certificate_set_retrieve_function2.3
+#usr/share/man/man3/gnutls_certificate_set_trust_list.3
+#usr/share/man/man3/gnutls_certificate_set_verify_flags.3
+#usr/share/man/man3/gnutls_certificate_set_verify_function.3
+#usr/share/man/man3/gnutls_certificate_set_verify_limits.3
+#usr/share/man/man3/gnutls_certificate_set_x509_crl.3
+#usr/share/man/man3/gnutls_certificate_set_x509_crl_file.3
+#usr/share/man/man3/gnutls_certificate_set_x509_crl_mem.3
+#usr/share/man/man3/gnutls_certificate_set_x509_key.3
+#usr/share/man/man3/gnutls_certificate_set_x509_key_file.3
+#usr/share/man/man3/gnutls_certificate_set_x509_key_file2.3
+#usr/share/man/man3/gnutls_certificate_set_x509_key_mem.3
+#usr/share/man/man3/gnutls_certificate_set_x509_key_mem2.3
+#usr/share/man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3
+#usr/share/man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
+#usr/share/man/man3/gnutls_certificate_set_x509_system_trust.3
+#usr/share/man/man3/gnutls_certificate_set_x509_trust.3
+#usr/share/man/man3/gnutls_certificate_set_x509_trust_dir.3
+#usr/share/man/man3/gnutls_certificate_set_x509_trust_file.3
+#usr/share/man/man3/gnutls_certificate_set_x509_trust_mem.3
+#usr/share/man/man3/gnutls_certificate_type_get.3
+#usr/share/man/man3/gnutls_certificate_type_get_id.3
+#usr/share/man/man3/gnutls_certificate_type_get_name.3
+#usr/share/man/man3/gnutls_certificate_type_list.3
+#usr/share/man/man3/gnutls_certificate_verification_status_print.3
+#usr/share/man/man3/gnutls_certificate_verify_peers.3
+#usr/share/man/man3/gnutls_certificate_verify_peers2.3
+#usr/share/man/man3/gnutls_certificate_verify_peers3.3
+#usr/share/man/man3/gnutls_check_version.3
+#usr/share/man/man3/gnutls_cipher_add_auth.3
+#usr/share/man/man3/gnutls_cipher_decrypt.3
+#usr/share/man/man3/gnutls_cipher_decrypt2.3
+#usr/share/man/man3/gnutls_cipher_deinit.3
+#usr/share/man/man3/gnutls_cipher_encrypt.3
+#usr/share/man/man3/gnutls_cipher_encrypt2.3
+#usr/share/man/man3/gnutls_cipher_get.3
+#usr/share/man/man3/gnutls_cipher_get_block_size.3
+#usr/share/man/man3/gnutls_cipher_get_id.3
+#usr/share/man/man3/gnutls_cipher_get_iv_size.3
+#usr/share/man/man3/gnutls_cipher_get_key_size.3
+#usr/share/man/man3/gnutls_cipher_get_name.3
+#usr/share/man/man3/gnutls_cipher_get_tag_size.3
+#usr/share/man/man3/gnutls_cipher_init.3
+#usr/share/man/man3/gnutls_cipher_list.3
+#usr/share/man/man3/gnutls_cipher_set_iv.3
+#usr/share/man/man3/gnutls_cipher_suite_get_name.3
+#usr/share/man/man3/gnutls_cipher_suite_info.3
+#usr/share/man/man3/gnutls_cipher_tag.3
+#usr/share/man/man3/gnutls_compression_get.3
+#usr/share/man/man3/gnutls_compression_get_id.3
+#usr/share/man/man3/gnutls_compression_get_name.3
+#usr/share/man/man3/gnutls_compression_list.3
+#usr/share/man/man3/gnutls_credentials_clear.3
+#usr/share/man/man3/gnutls_credentials_get.3
+#usr/share/man/man3/gnutls_credentials_set.3
+#usr/share/man/man3/gnutls_crypto_register_aead_cipher.3
+#usr/share/man/man3/gnutls_crypto_register_cipher.3
+#usr/share/man/man3/gnutls_crypto_register_digest.3
+#usr/share/man/man3/gnutls_crypto_register_mac.3
+#usr/share/man/man3/gnutls_db_check_entry.3
+#usr/share/man/man3/gnutls_db_check_entry_time.3
+#usr/share/man/man3/gnutls_db_get_default_cache_expiration.3
+#usr/share/man/man3/gnutls_db_get_ptr.3
+#usr/share/man/man3/gnutls_db_remove_session.3
+#usr/share/man/man3/gnutls_db_set_cache_expiration.3
+#usr/share/man/man3/gnutls_db_set_ptr.3
+#usr/share/man/man3/gnutls_db_set_remove_function.3
+#usr/share/man/man3/gnutls_db_set_retrieve_function.3
+#usr/share/man/man3/gnutls_db_set_store_function.3
+#usr/share/man/man3/gnutls_decode_ber_digest_info.3
+#usr/share/man/man3/gnutls_deinit.3
+#usr/share/man/man3/gnutls_dh_get_group.3
+#usr/share/man/man3/gnutls_dh_get_peers_public_bits.3
+#usr/share/man/man3/gnutls_dh_get_prime_bits.3
+#usr/share/man/man3/gnutls_dh_get_pubkey.3
+#usr/share/man/man3/gnutls_dh_get_secret_bits.3
+#usr/share/man/man3/gnutls_dh_params_cpy.3
+#usr/share/man/man3/gnutls_dh_params_deinit.3
+#usr/share/man/man3/gnutls_dh_params_export2_pkcs3.3
+#usr/share/man/man3/gnutls_dh_params_export_pkcs3.3
+#usr/share/man/man3/gnutls_dh_params_export_raw.3
+#usr/share/man/man3/gnutls_dh_params_generate2.3
+#usr/share/man/man3/gnutls_dh_params_import_dsa.3
+#usr/share/man/man3/gnutls_dh_params_import_pkcs3.3
+#usr/share/man/man3/gnutls_dh_params_import_raw.3
+#usr/share/man/man3/gnutls_dh_params_import_raw2.3
+#usr/share/man/man3/gnutls_dh_params_init.3
+#usr/share/man/man3/gnutls_dh_set_prime_bits.3
+#usr/share/man/man3/gnutls_digest_get_id.3
+#usr/share/man/man3/gnutls_digest_get_name.3
+#usr/share/man/man3/gnutls_digest_get_oid.3
+#usr/share/man/man3/gnutls_digest_list.3
+#usr/share/man/man3/gnutls_dtls_cookie_send.3
+#usr/share/man/man3/gnutls_dtls_cookie_verify.3
+#usr/share/man/man3/gnutls_dtls_get_data_mtu.3
+#usr/share/man/man3/gnutls_dtls_get_mtu.3
+#usr/share/man/man3/gnutls_dtls_get_timeout.3
+#usr/share/man/man3/gnutls_dtls_prestate_set.3
+#usr/share/man/man3/gnutls_dtls_set_data_mtu.3
+#usr/share/man/man3/gnutls_dtls_set_mtu.3
+#usr/share/man/man3/gnutls_dtls_set_timeouts.3
+#usr/share/man/man3/gnutls_ecc_curve_get.3
+#usr/share/man/man3/gnutls_ecc_curve_get_id.3
+#usr/share/man/man3/gnutls_ecc_curve_get_name.3
+#usr/share/man/man3/gnutls_ecc_curve_get_oid.3
+#usr/share/man/man3/gnutls_ecc_curve_get_pk.3
+#usr/share/man/man3/gnutls_ecc_curve_get_size.3
+#usr/share/man/man3/gnutls_ecc_curve_list.3
+#usr/share/man/man3/gnutls_encode_ber_digest_info.3
+#usr/share/man/man3/gnutls_error_is_fatal.3
+#usr/share/man/man3/gnutls_error_to_alert.3
+#usr/share/man/man3/gnutls_est_record_overhead_size.3
+#usr/share/man/man3/gnutls_ext_get_data.3
+#usr/share/man/man3/gnutls_ext_get_name.3
+#usr/share/man/man3/gnutls_ext_register.3
+#usr/share/man/man3/gnutls_ext_set_data.3
+#usr/share/man/man3/gnutls_fingerprint.3
+#usr/share/man/man3/gnutls_fips140_mode_enabled.3
+#usr/share/man/man3/gnutls_global_deinit.3
+#usr/share/man/man3/gnutls_global_init.3
+#usr/share/man/man3/gnutls_global_set_audit_log_function.3
+#usr/share/man/man3/gnutls_global_set_log_function.3
+#usr/share/man/man3/gnutls_global_set_log_level.3
+#usr/share/man/man3/gnutls_global_set_mem_functions.3
+#usr/share/man/man3/gnutls_global_set_mutex.3
+#usr/share/man/man3/gnutls_global_set_time_function.3
+#usr/share/man/man3/gnutls_handshake.3
+#usr/share/man/man3/gnutls_handshake_description_get_name.3
+#usr/share/man/man3/gnutls_handshake_get_last_in.3
+#usr/share/man/man3/gnutls_handshake_get_last_out.3
+#usr/share/man/man3/gnutls_handshake_set_hook_function.3
+#usr/share/man/man3/gnutls_handshake_set_max_packet_length.3
+#usr/share/man/man3/gnutls_handshake_set_post_client_hello_function.3
+#usr/share/man/man3/gnutls_handshake_set_private_extensions.3
+#usr/share/man/man3/gnutls_handshake_set_random.3
+#usr/share/man/man3/gnutls_handshake_set_timeout.3
+#usr/share/man/man3/gnutls_hash.3
+#usr/share/man/man3/gnutls_hash_deinit.3
+#usr/share/man/man3/gnutls_hash_fast.3
+#usr/share/man/man3/gnutls_hash_get_len.3
+#usr/share/man/man3/gnutls_hash_init.3
+#usr/share/man/man3/gnutls_hash_output.3
+#usr/share/man/man3/gnutls_heartbeat_allowed.3
+#usr/share/man/man3/gnutls_heartbeat_enable.3
+#usr/share/man/man3/gnutls_heartbeat_get_timeout.3
+#usr/share/man/man3/gnutls_heartbeat_ping.3
+#usr/share/man/man3/gnutls_heartbeat_pong.3
+#usr/share/man/man3/gnutls_heartbeat_set_timeouts.3
+#usr/share/man/man3/gnutls_hex2bin.3
+#usr/share/man/man3/gnutls_hex_decode.3
+#usr/share/man/man3/gnutls_hex_decode2.3
+#usr/share/man/man3/gnutls_hex_encode.3
+#usr/share/man/man3/gnutls_hex_encode2.3
+#usr/share/man/man3/gnutls_hmac.3
+#usr/share/man/man3/gnutls_hmac_deinit.3
+#usr/share/man/man3/gnutls_hmac_fast.3
+#usr/share/man/man3/gnutls_hmac_get_len.3
+#usr/share/man/man3/gnutls_hmac_init.3
+#usr/share/man/man3/gnutls_hmac_output.3
+#usr/share/man/man3/gnutls_hmac_set_nonce.3
+#usr/share/man/man3/gnutls_idna_map.3
+#usr/share/man/man3/gnutls_idna_reverse_map.3
+#usr/share/man/man3/gnutls_init.3
+#usr/share/man/man3/gnutls_key_generate.3
+#usr/share/man/man3/gnutls_kx_get.3
+#usr/share/man/man3/gnutls_kx_get_id.3
+#usr/share/man/man3/gnutls_kx_get_name.3
+#usr/share/man/man3/gnutls_kx_list.3
+#usr/share/man/man3/gnutls_load_file.3
+#usr/share/man/man3/gnutls_mac_get.3
+#usr/share/man/man3/gnutls_mac_get_id.3
+#usr/share/man/man3/gnutls_mac_get_key_size.3
+#usr/share/man/man3/gnutls_mac_get_name.3
+#usr/share/man/man3/gnutls_mac_get_nonce_size.3
+#usr/share/man/man3/gnutls_mac_list.3
+#usr/share/man/man3/gnutls_memcmp.3
+#usr/share/man/man3/gnutls_memset.3
+#usr/share/man/man3/gnutls_ocsp_req_add_cert.3
+#usr/share/man/man3/gnutls_ocsp_req_add_cert_id.3
+#usr/share/man/man3/gnutls_ocsp_req_deinit.3
+#usr/share/man/man3/gnutls_ocsp_req_export.3
+#usr/share/man/man3/gnutls_ocsp_req_get_cert_id.3
+#usr/share/man/man3/gnutls_ocsp_req_get_extension.3
+#usr/share/man/man3/gnutls_ocsp_req_get_nonce.3
+#usr/share/man/man3/gnutls_ocsp_req_get_version.3
+#usr/share/man/man3/gnutls_ocsp_req_import.3
+#usr/share/man/man3/gnutls_ocsp_req_init.3
+#usr/share/man/man3/gnutls_ocsp_req_print.3
+#usr/share/man/man3/gnutls_ocsp_req_randomize_nonce.3
+#usr/share/man/man3/gnutls_ocsp_req_set_extension.3
+#usr/share/man/man3/gnutls_ocsp_req_set_nonce.3
+#usr/share/man/man3/gnutls_ocsp_resp_check_crt.3
+#usr/share/man/man3/gnutls_ocsp_resp_deinit.3
+#usr/share/man/man3/gnutls_ocsp_resp_export.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_certs.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_extension.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_nonce.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_produced.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_responder.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_responder2.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_responder_raw_id.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_response.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_signature.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_signature_algorithm.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_single.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_status.3
+#usr/share/man/man3/gnutls_ocsp_resp_get_version.3
+#usr/share/man/man3/gnutls_ocsp_resp_import.3
+#usr/share/man/man3/gnutls_ocsp_resp_init.3
+#usr/share/man/man3/gnutls_ocsp_resp_print.3
+#usr/share/man/man3/gnutls_ocsp_resp_verify.3
+#usr/share/man/man3/gnutls_ocsp_resp_verify_direct.3
+#usr/share/man/man3/gnutls_ocsp_status_request_enable_client.3
+#usr/share/man/man3/gnutls_ocsp_status_request_get.3
+#usr/share/man/man3/gnutls_ocsp_status_request_is_checked.3
+#usr/share/man/man3/gnutls_oid_to_digest.3
+#usr/share/man/man3/gnutls_oid_to_ecc_curve.3
+#usr/share/man/man3/gnutls_oid_to_mac.3
+#usr/share/man/man3/gnutls_oid_to_pk.3
+#usr/share/man/man3/gnutls_oid_to_sign.3
+#usr/share/man/man3/gnutls_openpgp_privkey_sign_hash.3
+#usr/share/man/man3/gnutls_openpgp_send_cert.3
+#usr/share/man/man3/gnutls_packet_deinit.3
+#usr/share/man/man3/gnutls_packet_get.3
+#usr/share/man/man3/gnutls_pcert_deinit.3
+#usr/share/man/man3/gnutls_pcert_export_openpgp.3
+#usr/share/man/man3/gnutls_pcert_export_x509.3
+#usr/share/man/man3/gnutls_pcert_import_openpgp.3
+#usr/share/man/man3/gnutls_pcert_import_openpgp_raw.3
+#usr/share/man/man3/gnutls_pcert_import_x509.3
+#usr/share/man/man3/gnutls_pcert_import_x509_list.3
+#usr/share/man/man3/gnutls_pcert_import_x509_raw.3
+#usr/share/man/man3/gnutls_pcert_list_import_x509_raw.3
+#usr/share/man/man3/gnutls_pem_base64_decode.3
+#usr/share/man/man3/gnutls_pem_base64_decode2.3
+#usr/share/man/man3/gnutls_pem_base64_encode.3
+#usr/share/man/man3/gnutls_pem_base64_encode2.3
+#usr/share/man/man3/gnutls_perror.3
+#usr/share/man/man3/gnutls_pk_algorithm_get_name.3
+#usr/share/man/man3/gnutls_pk_bits_to_sec_param.3
+#usr/share/man/man3/gnutls_pk_get_id.3
+#usr/share/man/man3/gnutls_pk_get_name.3
+#usr/share/man/man3/gnutls_pk_get_oid.3
+#usr/share/man/man3/gnutls_pk_list.3
+#usr/share/man/man3/gnutls_pk_to_sign.3
+#usr/share/man/man3/gnutls_pkcs11_add_provider.3
+#usr/share/man/man3/gnutls_pkcs11_copy_attached_extension.3
+#usr/share/man/man3/gnutls_pkcs11_copy_pubkey.3
+#usr/share/man/man3/gnutls_pkcs11_copy_secret_key.3
+#usr/share/man/man3/gnutls_pkcs11_copy_x509_crt.3
+#usr/share/man/man3/gnutls_pkcs11_copy_x509_crt2.3
+#usr/share/man/man3/gnutls_pkcs11_copy_x509_privkey.3
+#usr/share/man/man3/gnutls_pkcs11_copy_x509_privkey2.3
+#usr/share/man/man3/gnutls_pkcs11_crt_is_known.3
+#usr/share/man/man3/gnutls_pkcs11_deinit.3
+#usr/share/man/man3/gnutls_pkcs11_delete_url.3
+#usr/share/man/man3/gnutls_pkcs11_get_pin_function.3
+#usr/share/man/man3/gnutls_pkcs11_get_raw_issuer.3
+#usr/share/man/man3/gnutls_pkcs11_get_raw_issuer_by_dn.3
+#usr/share/man/man3/gnutls_pkcs11_get_raw_issuer_by_subject_key_id.3
+#usr/share/man/man3/gnutls_pkcs11_init.3
+#usr/share/man/man3/gnutls_pkcs11_obj_deinit.3
+#usr/share/man/man3/gnutls_pkcs11_obj_export.3
+#usr/share/man/man3/gnutls_pkcs11_obj_export2.3
+#usr/share/man/man3/gnutls_pkcs11_obj_export3.3
+#usr/share/man/man3/gnutls_pkcs11_obj_export_url.3
+#usr/share/man/man3/gnutls_pkcs11_obj_flags_get_str.3
+#usr/share/man/man3/gnutls_pkcs11_obj_get_exts.3
+#usr/share/man/man3/gnutls_pkcs11_obj_get_flags.3
+#usr/share/man/man3/gnutls_pkcs11_obj_get_info.3
+#usr/share/man/man3/gnutls_pkcs11_obj_get_type.3
+#usr/share/man/man3/gnutls_pkcs11_obj_import_url.3
+#usr/share/man/man3/gnutls_pkcs11_obj_init.3
+#usr/share/man/man3/gnutls_pkcs11_obj_list_import_url3.3
+#usr/share/man/man3/gnutls_pkcs11_obj_list_import_url4.3
+#usr/share/man/man3/gnutls_pkcs11_obj_set_info.3
+#usr/share/man/man3/gnutls_pkcs11_obj_set_pin_function.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_cpy.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_deinit.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_export_pubkey.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_export_url.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_generate.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_generate2.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_generate3.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_get_info.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_import_url.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_init.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_set_pin_function.3
+#usr/share/man/man3/gnutls_pkcs11_privkey_status.3
+#usr/share/man/man3/gnutls_pkcs11_reinit.3
+#usr/share/man/man3/gnutls_pkcs11_set_pin_function.3
+#usr/share/man/man3/gnutls_pkcs11_set_token_function.3
+#usr/share/man/man3/gnutls_pkcs11_token_get_flags.3
+#usr/share/man/man3/gnutls_pkcs11_token_get_info.3
+#usr/share/man/man3/gnutls_pkcs11_token_get_mechanism.3
+#usr/share/man/man3/gnutls_pkcs11_token_get_random.3
+#usr/share/man/man3/gnutls_pkcs11_token_get_url.3
+#usr/share/man/man3/gnutls_pkcs11_token_init.3
+#usr/share/man/man3/gnutls_pkcs11_token_set_pin.3
+#usr/share/man/man3/gnutls_pkcs11_type_get_name.3
+#usr/share/man/man3/gnutls_pkcs12_bag_decrypt.3
+#usr/share/man/man3/gnutls_pkcs12_bag_deinit.3
+#usr/share/man/man3/gnutls_pkcs12_bag_enc_info.3
+#usr/share/man/man3/gnutls_pkcs12_bag_encrypt.3
+#usr/share/man/man3/gnutls_pkcs12_bag_get_count.3
+#usr/share/man/man3/gnutls_pkcs12_bag_get_data.3
+#usr/share/man/man3/gnutls_pkcs12_bag_get_friendly_name.3
+#usr/share/man/man3/gnutls_pkcs12_bag_get_key_id.3
+#usr/share/man/man3/gnutls_pkcs12_bag_get_type.3
+#usr/share/man/man3/gnutls_pkcs12_bag_init.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_crl.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_crt.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_data.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_friendly_name.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_key_id.3
+#usr/share/man/man3/gnutls_pkcs12_bag_set_privkey.3
+#usr/share/man/man3/gnutls_pkcs12_deinit.3
+#usr/share/man/man3/gnutls_pkcs12_export.3
+#usr/share/man/man3/gnutls_pkcs12_export2.3
+#usr/share/man/man3/gnutls_pkcs12_generate_mac.3
+#usr/share/man/man3/gnutls_pkcs12_generate_mac2.3
+#usr/share/man/man3/gnutls_pkcs12_get_bag.3
+#usr/share/man/man3/gnutls_pkcs12_import.3
+#usr/share/man/man3/gnutls_pkcs12_init.3
+#usr/share/man/man3/gnutls_pkcs12_mac_info.3
+#usr/share/man/man3/gnutls_pkcs12_set_bag.3
+#usr/share/man/man3/gnutls_pkcs12_simple_parse.3
+#usr/share/man/man3/gnutls_pkcs12_verify_mac.3
+#usr/share/man/man3/gnutls_pkcs7_add_attr.3
+#usr/share/man/man3/gnutls_pkcs7_attrs_deinit.3
+#usr/share/man/man3/gnutls_pkcs7_deinit.3
+#usr/share/man/man3/gnutls_pkcs7_delete_crl.3
+#usr/share/man/man3/gnutls_pkcs7_delete_crt.3
+#usr/share/man/man3/gnutls_pkcs7_export.3
+#usr/share/man/man3/gnutls_pkcs7_export2.3
+#usr/share/man/man3/gnutls_pkcs7_get_attr.3
+#usr/share/man/man3/gnutls_pkcs7_get_crl_count.3
+#usr/share/man/man3/gnutls_pkcs7_get_crl_raw.3
+#usr/share/man/man3/gnutls_pkcs7_get_crl_raw2.3
+#usr/share/man/man3/gnutls_pkcs7_get_crt_count.3
+#usr/share/man/man3/gnutls_pkcs7_get_crt_raw.3
+#usr/share/man/man3/gnutls_pkcs7_get_crt_raw2.3
+#usr/share/man/man3/gnutls_pkcs7_get_embedded_data.3
+#usr/share/man/man3/gnutls_pkcs7_get_embedded_data_oid.3
+#usr/share/man/man3/gnutls_pkcs7_get_signature_count.3
+#usr/share/man/man3/gnutls_pkcs7_get_signature_info.3
+#usr/share/man/man3/gnutls_pkcs7_import.3
+#usr/share/man/man3/gnutls_pkcs7_init.3
+#usr/share/man/man3/gnutls_pkcs7_print.3
+#usr/share/man/man3/gnutls_pkcs7_set_crl.3
+#usr/share/man/man3/gnutls_pkcs7_set_crl_raw.3
+#usr/share/man/man3/gnutls_pkcs7_set_crt.3
+#usr/share/man/man3/gnutls_pkcs7_set_crt_raw.3
+#usr/share/man/man3/gnutls_pkcs7_sign.3
+#usr/share/man/man3/gnutls_pkcs7_signature_info_deinit.3
+#usr/share/man/man3/gnutls_pkcs7_verify.3
+#usr/share/man/man3/gnutls_pkcs7_verify_direct.3
+#usr/share/man/man3/gnutls_pkcs8_info.3
+#usr/share/man/man3/gnutls_pkcs_schema_get_name.3
+#usr/share/man/man3/gnutls_pkcs_schema_get_oid.3
+#usr/share/man/man3/gnutls_prf.3
+#usr/share/man/man3/gnutls_prf_raw.3
+#usr/share/man/man3/gnutls_prf_rfc5705.3
+#usr/share/man/man3/gnutls_priority_certificate_type_list.3
+#usr/share/man/man3/gnutls_priority_cipher_list.3
+#usr/share/man/man3/gnutls_priority_compression_list.3
+#usr/share/man/man3/gnutls_priority_deinit.3
+#usr/share/man/man3/gnutls_priority_ecc_curve_list.3
+#usr/share/man/man3/gnutls_priority_get_cipher_suite_index.3
+#usr/share/man/man3/gnutls_priority_init.3
+#usr/share/man/man3/gnutls_priority_kx_list.3
+#usr/share/man/man3/gnutls_priority_mac_list.3
+#usr/share/man/man3/gnutls_priority_protocol_list.3
+#usr/share/man/man3/gnutls_priority_set.3
+#usr/share/man/man3/gnutls_priority_set_direct.3
+#usr/share/man/man3/gnutls_priority_sign_list.3
+#usr/share/man/man3/gnutls_priority_string_list.3
+#usr/share/man/man3/gnutls_privkey_decrypt_data.3
+#usr/share/man/man3/gnutls_privkey_deinit.3
+#usr/share/man/man3/gnutls_privkey_export_dsa_raw.3
+#usr/share/man/man3/gnutls_privkey_export_ecc_raw.3
+#usr/share/man/man3/gnutls_privkey_export_openpgp.3
+#usr/share/man/man3/gnutls_privkey_export_pkcs11.3
+#usr/share/man/man3/gnutls_privkey_export_rsa_raw.3
+#usr/share/man/man3/gnutls_privkey_export_x509.3
+#usr/share/man/man3/gnutls_privkey_generate.3
+#usr/share/man/man3/gnutls_privkey_generate2.3
+#usr/share/man/man3/gnutls_privkey_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_privkey_get_seed.3
+#usr/share/man/man3/gnutls_privkey_get_type.3
+#usr/share/man/man3/gnutls_privkey_import_dsa_raw.3
+#usr/share/man/man3/gnutls_privkey_import_ecc_raw.3
+#usr/share/man/man3/gnutls_privkey_import_ext.3
+#usr/share/man/man3/gnutls_privkey_import_ext2.3
+#usr/share/man/man3/gnutls_privkey_import_ext3.3
+#usr/share/man/man3/gnutls_privkey_import_openpgp.3
+#usr/share/man/man3/gnutls_privkey_import_openpgp_raw.3
+#usr/share/man/man3/gnutls_privkey_import_pkcs11.3
+#usr/share/man/man3/gnutls_privkey_import_pkcs11_url.3
+#usr/share/man/man3/gnutls_privkey_import_rsa_raw.3
+#usr/share/man/man3/gnutls_privkey_import_tpm_raw.3
+#usr/share/man/man3/gnutls_privkey_import_tpm_url.3
+#usr/share/man/man3/gnutls_privkey_import_url.3
+#usr/share/man/man3/gnutls_privkey_import_x509.3
+#usr/share/man/man3/gnutls_privkey_import_x509_raw.3
+#usr/share/man/man3/gnutls_privkey_init.3
+#usr/share/man/man3/gnutls_privkey_set_flags.3
+#usr/share/man/man3/gnutls_privkey_set_pin_function.3
+#usr/share/man/man3/gnutls_privkey_sign_data.3
+#usr/share/man/man3/gnutls_privkey_sign_hash.3
+#usr/share/man/man3/gnutls_privkey_status.3
+#usr/share/man/man3/gnutls_privkey_verify_params.3
+#usr/share/man/man3/gnutls_privkey_verify_seed.3
+#usr/share/man/man3/gnutls_protocol_get_id.3
+#usr/share/man/man3/gnutls_protocol_get_name.3
+#usr/share/man/man3/gnutls_protocol_get_version.3
+#usr/share/man/man3/gnutls_protocol_list.3
+#usr/share/man/man3/gnutls_psk_allocate_client_credentials.3
+#usr/share/man/man3/gnutls_psk_allocate_server_credentials.3
+#usr/share/man/man3/gnutls_psk_client_get_hint.3
+#usr/share/man/man3/gnutls_psk_free_client_credentials.3
+#usr/share/man/man3/gnutls_psk_free_server_credentials.3
+#usr/share/man/man3/gnutls_psk_server_get_username.3
+#usr/share/man/man3/gnutls_psk_set_client_credentials.3
+#usr/share/man/man3/gnutls_psk_set_client_credentials_function.3
+#usr/share/man/man3/gnutls_psk_set_params_function.3
+#usr/share/man/man3/gnutls_psk_set_server_credentials_file.3
+#usr/share/man/man3/gnutls_psk_set_server_credentials_function.3
+#usr/share/man/man3/gnutls_psk_set_server_credentials_hint.3
+#usr/share/man/man3/gnutls_psk_set_server_dh_params.3
+#usr/share/man/man3/gnutls_psk_set_server_known_dh_params.3
+#usr/share/man/man3/gnutls_psk_set_server_params_function.3
+#usr/share/man/man3/gnutls_pubkey_deinit.3
+#usr/share/man/man3/gnutls_pubkey_encrypt_data.3
+#usr/share/man/man3/gnutls_pubkey_export.3
+#usr/share/man/man3/gnutls_pubkey_export2.3
+#usr/share/man/man3/gnutls_pubkey_export_dsa_raw.3
+#usr/share/man/man3/gnutls_pubkey_export_ecc_raw.3
+#usr/share/man/man3/gnutls_pubkey_export_ecc_x962.3
+#usr/share/man/man3/gnutls_pubkey_export_rsa_raw.3
+#usr/share/man/man3/gnutls_pubkey_get_key_id.3
+#usr/share/man/man3/gnutls_pubkey_get_key_usage.3
+#usr/share/man/man3/gnutls_pubkey_get_openpgp_key_id.3
+#usr/share/man/man3/gnutls_pubkey_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3
+#usr/share/man/man3/gnutls_pubkey_import.3
+#usr/share/man/man3/gnutls_pubkey_import_dsa_raw.3
+#usr/share/man/man3/gnutls_pubkey_import_ecc_raw.3
+#usr/share/man/man3/gnutls_pubkey_import_ecc_x962.3
+#usr/share/man/man3/gnutls_pubkey_import_openpgp.3
+#usr/share/man/man3/gnutls_pubkey_import_openpgp_raw.3
+#usr/share/man/man3/gnutls_pubkey_import_pkcs11.3
+#usr/share/man/man3/gnutls_pubkey_import_privkey.3
+#usr/share/man/man3/gnutls_pubkey_import_rsa_raw.3
+#usr/share/man/man3/gnutls_pubkey_import_tpm_raw.3
+#usr/share/man/man3/gnutls_pubkey_import_tpm_url.3
+#usr/share/man/man3/gnutls_pubkey_import_url.3
+#usr/share/man/man3/gnutls_pubkey_import_x509.3
+#usr/share/man/man3/gnutls_pubkey_import_x509_crq.3
+#usr/share/man/man3/gnutls_pubkey_import_x509_raw.3
+#usr/share/man/man3/gnutls_pubkey_init.3
+#usr/share/man/man3/gnutls_pubkey_print.3
+#usr/share/man/man3/gnutls_pubkey_set_key_usage.3
+#usr/share/man/man3/gnutls_pubkey_set_pin_function.3
+#usr/share/man/man3/gnutls_pubkey_verify_data2.3
+#usr/share/man/man3/gnutls_pubkey_verify_hash2.3
+#usr/share/man/man3/gnutls_pubkey_verify_params.3
+#usr/share/man/man3/gnutls_random_art.3
+#usr/share/man/man3/gnutls_range_split.3
+#usr/share/man/man3/gnutls_record_can_use_length_hiding.3
+#usr/share/man/man3/gnutls_record_check_corked.3
+#usr/share/man/man3/gnutls_record_check_pending.3
+#usr/share/man/man3/gnutls_record_cork.3
+#usr/share/man/man3/gnutls_record_disable_padding.3
+#usr/share/man/man3/gnutls_record_discard_queued.3
+#usr/share/man/man3/gnutls_record_get_direction.3
+#usr/share/man/man3/gnutls_record_get_discarded.3
+#usr/share/man/man3/gnutls_record_get_max_size.3
+#usr/share/man/man3/gnutls_record_get_state.3
+#usr/share/man/man3/gnutls_record_overhead_size.3
+#usr/share/man/man3/gnutls_record_recv.3
+#usr/share/man/man3/gnutls_record_recv_packet.3
+#usr/share/man/man3/gnutls_record_recv_seq.3
+#usr/share/man/man3/gnutls_record_send.3
+#usr/share/man/man3/gnutls_record_send_range.3
+#usr/share/man/man3/gnutls_record_set_max_size.3
+#usr/share/man/man3/gnutls_record_set_state.3
+#usr/share/man/man3/gnutls_record_set_timeout.3
+#usr/share/man/man3/gnutls_record_uncork.3
+#usr/share/man/man3/gnutls_register_custom_url.3
+#usr/share/man/man3/gnutls_rehandshake.3
+#usr/share/man/man3/gnutls_rnd.3
+#usr/share/man/man3/gnutls_rnd_refresh.3
+#usr/share/man/man3/gnutls_safe_renegotiation_status.3
+#usr/share/man/man3/gnutls_sec_param_get_name.3
+#usr/share/man/man3/gnutls_sec_param_to_pk_bits.3
+#usr/share/man/man3/gnutls_sec_param_to_symmetric_bits.3
+#usr/share/man/man3/gnutls_server_name_get.3
+#usr/share/man/man3/gnutls_server_name_set.3
+#usr/share/man/man3/gnutls_session_channel_binding.3
+#usr/share/man/man3/gnutls_session_enable_compatibility_mode.3
+#usr/share/man/man3/gnutls_session_etm_status.3
+#usr/share/man/man3/gnutls_session_ext_master_secret_status.3
+#usr/share/man/man3/gnutls_session_ext_register.3
+#usr/share/man/man3/gnutls_session_force_valid.3
+#usr/share/man/man3/gnutls_session_get_data.3
+#usr/share/man/man3/gnutls_session_get_data2.3
+#usr/share/man/man3/gnutls_session_get_desc.3
+#usr/share/man/man3/gnutls_session_get_flags.3
+#usr/share/man/man3/gnutls_session_get_id.3
+#usr/share/man/man3/gnutls_session_get_id2.3
+#usr/share/man/man3/gnutls_session_get_master_secret.3
+#usr/share/man/man3/gnutls_session_get_ptr.3
+#usr/share/man/man3/gnutls_session_get_random.3
+#usr/share/man/man3/gnutls_session_get_verify_cert_status.3
+#usr/share/man/man3/gnutls_session_is_resumed.3
+#usr/share/man/man3/gnutls_session_resumption_requested.3
+#usr/share/man/man3/gnutls_session_set_data.3
+#usr/share/man/man3/gnutls_session_set_id.3
+#usr/share/man/man3/gnutls_session_set_premaster.3
+#usr/share/man/man3/gnutls_session_set_ptr.3
+#usr/share/man/man3/gnutls_session_set_verify_cert.3
+#usr/share/man/man3/gnutls_session_set_verify_cert2.3
+#usr/share/man/man3/gnutls_session_set_verify_function.3
+#usr/share/man/man3/gnutls_session_supplemental_register.3
+#usr/share/man/man3/gnutls_session_ticket_enable_client.3
+#usr/share/man/man3/gnutls_session_ticket_enable_server.3
+#usr/share/man/man3/gnutls_session_ticket_key_generate.3
+#usr/share/man/man3/gnutls_set_default_priority.3
+#usr/share/man/man3/gnutls_sign_algorithm_get.3
+#usr/share/man/man3/gnutls_sign_algorithm_get_client.3
+#usr/share/man/man3/gnutls_sign_algorithm_get_requested.3
+#usr/share/man/man3/gnutls_sign_get_hash_algorithm.3
+#usr/share/man/man3/gnutls_sign_get_id.3
+#usr/share/man/man3/gnutls_sign_get_name.3
+#usr/share/man/man3/gnutls_sign_get_oid.3
+#usr/share/man/man3/gnutls_sign_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_sign_is_secure.3
+#usr/share/man/man3/gnutls_sign_list.3
+#usr/share/man/man3/gnutls_srp_allocate_client_credentials.3
+#usr/share/man/man3/gnutls_srp_allocate_server_credentials.3
+#usr/share/man/man3/gnutls_srp_base64_decode.3
+#usr/share/man/man3/gnutls_srp_base64_decode2.3
+#usr/share/man/man3/gnutls_srp_base64_encode.3
+#usr/share/man/man3/gnutls_srp_base64_encode2.3
+#usr/share/man/man3/gnutls_srp_free_client_credentials.3
+#usr/share/man/man3/gnutls_srp_free_server_credentials.3
+#usr/share/man/man3/gnutls_srp_server_get_username.3
+#usr/share/man/man3/gnutls_srp_set_client_credentials.3
+#usr/share/man/man3/gnutls_srp_set_client_credentials_function.3
+#usr/share/man/man3/gnutls_srp_set_prime_bits.3
+#usr/share/man/man3/gnutls_srp_set_server_credentials_file.3
+#usr/share/man/man3/gnutls_srp_set_server_credentials_function.3
+#usr/share/man/man3/gnutls_srp_set_server_fake_salt_seed.3
+#usr/share/man/man3/gnutls_srp_verifier.3
+#usr/share/man/man3/gnutls_srtp_get_keys.3
+#usr/share/man/man3/gnutls_srtp_get_mki.3
+#usr/share/man/man3/gnutls_srtp_get_profile_id.3
+#usr/share/man/man3/gnutls_srtp_get_profile_name.3
+#usr/share/man/man3/gnutls_srtp_get_selected_profile.3
+#usr/share/man/man3/gnutls_srtp_set_mki.3
+#usr/share/man/man3/gnutls_srtp_set_profile.3
+#usr/share/man/man3/gnutls_srtp_set_profile_direct.3
+#usr/share/man/man3/gnutls_store_commitment.3
+#usr/share/man/man3/gnutls_store_pubkey.3
+#usr/share/man/man3/gnutls_strerror.3
+#usr/share/man/man3/gnutls_strerror_name.3
+#usr/share/man/man3/gnutls_subject_alt_names_deinit.3
+#usr/share/man/man3/gnutls_subject_alt_names_get.3
+#usr/share/man/man3/gnutls_subject_alt_names_init.3
+#usr/share/man/man3/gnutls_subject_alt_names_set.3
+#usr/share/man/man3/gnutls_supplemental_get_name.3
+#usr/share/man/man3/gnutls_supplemental_recv.3
+#usr/share/man/man3/gnutls_supplemental_register.3
+#usr/share/man/man3/gnutls_supplemental_send.3
+#usr/share/man/man3/gnutls_system_key_add_x509.3
+#usr/share/man/man3/gnutls_system_key_delete.3
+#usr/share/man/man3/gnutls_system_key_iter_deinit.3
+#usr/share/man/man3/gnutls_system_key_iter_get_info.3
+#usr/share/man/man3/gnutls_system_recv_timeout.3
+#usr/share/man/man3/gnutls_tdb_deinit.3
+#usr/share/man/man3/gnutls_tdb_init.3
+#usr/share/man/man3/gnutls_tdb_set_store_commitment_func.3
+#usr/share/man/man3/gnutls_tdb_set_store_func.3
+#usr/share/man/man3/gnutls_tdb_set_verify_func.3
+#usr/share/man/man3/gnutls_tpm_get_registered.3
+#usr/share/man/man3/gnutls_tpm_key_list_deinit.3
+#usr/share/man/man3/gnutls_tpm_key_list_get_url.3
+#usr/share/man/man3/gnutls_tpm_privkey_delete.3
+#usr/share/man/man3/gnutls_tpm_privkey_generate.3
+#usr/share/man/man3/gnutls_transport_get_int.3
+#usr/share/man/man3/gnutls_transport_get_int2.3
+#usr/share/man/man3/gnutls_transport_get_ptr.3
+#usr/share/man/man3/gnutls_transport_get_ptr2.3
+#usr/share/man/man3/gnutls_transport_set_errno.3
+#usr/share/man/man3/gnutls_transport_set_errno_function.3
+#usr/share/man/man3/gnutls_transport_set_fastopen.3
+#usr/share/man/man3/gnutls_transport_set_int.3
+#usr/share/man/man3/gnutls_transport_set_int2.3
+#usr/share/man/man3/gnutls_transport_set_ptr.3
+#usr/share/man/man3/gnutls_transport_set_ptr2.3
+#usr/share/man/man3/gnutls_transport_set_pull_function.3
+#usr/share/man/man3/gnutls_transport_set_pull_timeout_function.3
+#usr/share/man/man3/gnutls_transport_set_push_function.3
+#usr/share/man/man3/gnutls_transport_set_vec_push_function.3
+#usr/share/man/man3/gnutls_url_is_supported.3
+#usr/share/man/man3/gnutls_utf8_password_normalize.3
+#usr/share/man/man3/gnutls_verify_stored_pubkey.3
+#usr/share/man/man3/gnutls_x509_aia_deinit.3
+#usr/share/man/man3/gnutls_x509_aia_get.3
+#usr/share/man/man3/gnutls_x509_aia_init.3
+#usr/share/man/man3/gnutls_x509_aia_set.3
+#usr/share/man/man3/gnutls_x509_aki_deinit.3
+#usr/share/man/man3/gnutls_x509_aki_get_cert_issuer.3
+#usr/share/man/man3/gnutls_x509_aki_get_id.3
+#usr/share/man/man3/gnutls_x509_aki_init.3
+#usr/share/man/man3/gnutls_x509_aki_set_cert_issuer.3
+#usr/share/man/man3/gnutls_x509_aki_set_id.3
+#usr/share/man/man3/gnutls_x509_cidr_to_rfc5280.3
+#usr/share/man/man3/gnutls_x509_crl_check_issuer.3
+#usr/share/man/man3/gnutls_x509_crl_deinit.3
+#usr/share/man/man3/gnutls_x509_crl_dist_points_deinit.3
+#usr/share/man/man3/gnutls_x509_crl_dist_points_get.3
+#usr/share/man/man3/gnutls_x509_crl_dist_points_init.3
+#usr/share/man/man3/gnutls_x509_crl_dist_points_set.3
+#usr/share/man/man3/gnutls_x509_crl_export.3
+#usr/share/man/man3/gnutls_x509_crl_export2.3
+#usr/share/man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
+#usr/share/man/man3/gnutls_x509_crl_get_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_crl_get_crt_count.3
+#usr/share/man/man3/gnutls_x509_crl_get_crt_serial.3
+#usr/share/man/man3/gnutls_x509_crl_get_dn_oid.3
+#usr/share/man/man3/gnutls_x509_crl_get_extension_data.3
+#usr/share/man/man3/gnutls_x509_crl_get_extension_data2.3
+#usr/share/man/man3/gnutls_x509_crl_get_extension_info.3
+#usr/share/man/man3/gnutls_x509_crl_get_extension_oid.3
+#usr/share/man/man3/gnutls_x509_crl_get_issuer_dn.3
+#usr/share/man/man3/gnutls_x509_crl_get_issuer_dn2.3
+#usr/share/man/man3/gnutls_x509_crl_get_issuer_dn3.3
+#usr/share/man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crl_get_next_update.3
+#usr/share/man/man3/gnutls_x509_crl_get_number.3
+#usr/share/man/man3/gnutls_x509_crl_get_raw_issuer_dn.3
+#usr/share/man/man3/gnutls_x509_crl_get_signature.3
+#usr/share/man/man3/gnutls_x509_crl_get_signature_algorithm.3
+#usr/share/man/man3/gnutls_x509_crl_get_signature_oid.3
+#usr/share/man/man3/gnutls_x509_crl_get_this_update.3
+#usr/share/man/man3/gnutls_x509_crl_get_version.3
+#usr/share/man/man3/gnutls_x509_crl_import.3
+#usr/share/man/man3/gnutls_x509_crl_init.3
+#usr/share/man/man3/gnutls_x509_crl_iter_crt_serial.3
+#usr/share/man/man3/gnutls_x509_crl_iter_deinit.3
+#usr/share/man/man3/gnutls_x509_crl_list_import.3
+#usr/share/man/man3/gnutls_x509_crl_list_import2.3
+#usr/share/man/man3/gnutls_x509_crl_print.3
+#usr/share/man/man3/gnutls_x509_crl_privkey_sign.3
+#usr/share/man/man3/gnutls_x509_crl_set_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_crl_set_crt.3
+#usr/share/man/man3/gnutls_x509_crl_set_crt_serial.3
+#usr/share/man/man3/gnutls_x509_crl_set_next_update.3
+#usr/share/man/man3/gnutls_x509_crl_set_number.3
+#usr/share/man/man3/gnutls_x509_crl_set_this_update.3
+#usr/share/man/man3/gnutls_x509_crl_set_version.3
+#usr/share/man/man3/gnutls_x509_crl_sign.3
+#usr/share/man/man3/gnutls_x509_crl_sign2.3
+#usr/share/man/man3/gnutls_x509_crl_verify.3
+#usr/share/man/man3/gnutls_x509_crq_deinit.3
+#usr/share/man/man3/gnutls_x509_crq_export.3
+#usr/share/man/man3/gnutls_x509_crq_export2.3
+#usr/share/man/man3/gnutls_x509_crq_get_attribute_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_attribute_data.3
+#usr/share/man/man3/gnutls_x509_crq_get_attribute_info.3
+#usr/share/man/man3/gnutls_x509_crq_get_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_crq_get_challenge_password.3
+#usr/share/man/man3/gnutls_x509_crq_get_dn.3
+#usr/share/man/man3/gnutls_x509_crq_get_dn2.3
+#usr/share/man/man3/gnutls_x509_crq_get_dn3.3
+#usr/share/man/man3/gnutls_x509_crq_get_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_dn_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_extension_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_extension_by_oid2.3
+#usr/share/man/man3/gnutls_x509_crq_get_extension_data.3
+#usr/share/man/man3/gnutls_x509_crq_get_extension_data2.3
+#usr/share/man/man3/gnutls_x509_crq_get_extension_info.3
+#usr/share/man/man3/gnutls_x509_crq_get_key_id.3
+#usr/share/man/man3/gnutls_x509_crq_get_key_purpose_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_key_rsa_raw.3
+#usr/share/man/man3/gnutls_x509_crq_get_key_usage.3
+#usr/share/man/man3/gnutls_x509_crq_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_x509_crq_get_pk_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_crq_get_signature_algorithm.3
+#usr/share/man/man3/gnutls_x509_crq_get_signature_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_subject_alt_name.3
+#usr/share/man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3
+#usr/share/man/man3/gnutls_x509_crq_get_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_crq_get_version.3
+#usr/share/man/man3/gnutls_x509_crq_import.3
+#usr/share/man/man3/gnutls_x509_crq_init.3
+#usr/share/man/man3/gnutls_x509_crq_print.3
+#usr/share/man/man3/gnutls_x509_crq_privkey_sign.3
+#usr/share/man/man3/gnutls_x509_crq_set_attribute_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_set_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_crq_set_challenge_password.3
+#usr/share/man/man3/gnutls_x509_crq_set_dn.3
+#usr/share/man/man3/gnutls_x509_crq_set_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_set_extension_by_oid.3
+#usr/share/man/man3/gnutls_x509_crq_set_key.3
+#usr/share/man/man3/gnutls_x509_crq_set_key_purpose_oid.3
+#usr/share/man/man3/gnutls_x509_crq_set_key_rsa_raw.3
+#usr/share/man/man3/gnutls_x509_crq_set_key_usage.3
+#usr/share/man/man3/gnutls_x509_crq_set_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_crq_set_pubkey.3
+#usr/share/man/man3/gnutls_x509_crq_set_subject_alt_name.3
+#usr/share/man/man3/gnutls_x509_crq_set_subject_alt_othername.3
+#usr/share/man/man3/gnutls_x509_crq_set_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_crq_set_version.3
+#usr/share/man/man3/gnutls_x509_crq_sign.3
+#usr/share/man/man3/gnutls_x509_crq_sign2.3
+#usr/share/man/man3/gnutls_x509_crq_verify.3
+#usr/share/man/man3/gnutls_x509_crt_check_email.3
+#usr/share/man/man3/gnutls_x509_crt_check_hostname.3
+#usr/share/man/man3/gnutls_x509_crt_check_hostname2.3
+#usr/share/man/man3/gnutls_x509_crt_check_issuer.3
+#usr/share/man/man3/gnutls_x509_crt_check_key_purpose.3
+#usr/share/man/man3/gnutls_x509_crt_check_revocation.3
+#usr/share/man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
+#usr/share/man/man3/gnutls_x509_crt_deinit.3
+#usr/share/man/man3/gnutls_x509_crt_equals.3
+#usr/share/man/man3/gnutls_x509_crt_equals2.3
+#usr/share/man/man3/gnutls_x509_crt_export.3
+#usr/share/man/man3/gnutls_x509_crt_export2.3
+#usr/share/man/man3/gnutls_x509_crt_get_activation_time.3
+#usr/share/man/man3/gnutls_x509_crt_get_authority_info_access.3
+#usr/share/man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3
+#usr/share/man/man3/gnutls_x509_crt_get_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_crt_get_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_crt_get_ca_status.3
+#usr/share/man/man3/gnutls_x509_crt_get_crl_dist_points.3
+#usr/share/man/man3/gnutls_x509_crt_get_dn.3
+#usr/share/man/man3/gnutls_x509_crt_get_dn2.3
+#usr/share/man/man3/gnutls_x509_crt_get_dn3.3
+#usr/share/man/man3/gnutls_x509_crt_get_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_dn_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_expiration_time.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_by_oid2.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_data.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_data2.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_info.3
+#usr/share/man/man3/gnutls_x509_crt_get_extension_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_fingerprint.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_alt_name.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_alt_name2.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_dn.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_dn2.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_dn3.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_issuer_unique_id.3
+#usr/share/man/man3/gnutls_x509_crt_get_key_id.3
+#usr/share/man/man3/gnutls_x509_crt_get_key_purpose_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_key_usage.3
+#usr/share/man/man3/gnutls_x509_crt_get_name_constraints.3
+#usr/share/man/man3/gnutls_x509_crt_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
+#usr/share/man/man3/gnutls_x509_crt_get_pk_ecc_raw.3
+#usr/share/man/man3/gnutls_x509_crt_get_pk_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
+#usr/share/man/man3/gnutls_x509_crt_get_policy.3
+#usr/share/man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3
+#usr/share/man/man3/gnutls_x509_crt_get_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_crt_get_proxy.3
+#usr/share/man/man3/gnutls_x509_crt_get_raw_dn.3
+#usr/share/man/man3/gnutls_x509_crt_get_raw_issuer_dn.3
+#usr/share/man/man3/gnutls_x509_crt_get_serial.3
+#usr/share/man/man3/gnutls_x509_crt_get_signature.3
+#usr/share/man/man3/gnutls_x509_crt_get_signature_algorithm.3
+#usr/share/man/man3/gnutls_x509_crt_get_signature_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject_alt_name.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject_alt_name2.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject_key_id.3
+#usr/share/man/man3/gnutls_x509_crt_get_subject_unique_id.3
+#usr/share/man/man3/gnutls_x509_crt_get_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_crt_get_version.3
+#usr/share/man/man3/gnutls_x509_crt_import.3
+#usr/share/man/man3/gnutls_x509_crt_import_pkcs11.3
+#usr/share/man/man3/gnutls_x509_crt_import_url.3
+#usr/share/man/man3/gnutls_x509_crt_init.3
+#usr/share/man/man3/gnutls_x509_crt_list_import.3
+#usr/share/man/man3/gnutls_x509_crt_list_import2.3
+#usr/share/man/man3/gnutls_x509_crt_list_import_pkcs11.3
+#usr/share/man/man3/gnutls_x509_crt_list_verify.3
+#usr/share/man/man3/gnutls_x509_crt_print.3
+#usr/share/man/man3/gnutls_x509_crt_privkey_sign.3
+#usr/share/man/man3/gnutls_x509_crt_set_activation_time.3
+#usr/share/man/man3/gnutls_x509_crt_set_authority_info_access.3
+#usr/share/man/man3/gnutls_x509_crt_set_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_crt_set_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_crt_set_ca_status.3
+#usr/share/man/man3/gnutls_x509_crt_set_crl_dist_points.3
+#usr/share/man/man3/gnutls_x509_crt_set_crl_dist_points2.3
+#usr/share/man/man3/gnutls_x509_crt_set_crq.3
+#usr/share/man/man3/gnutls_x509_crt_set_crq_extension_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_set_crq_extensions.3
+#usr/share/man/man3/gnutls_x509_crt_set_dn.3
+#usr/share/man/man3/gnutls_x509_crt_set_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_set_expiration_time.3
+#usr/share/man/man3/gnutls_x509_crt_set_extension_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_set_issuer_alt_name.3
+#usr/share/man/man3/gnutls_x509_crt_set_issuer_alt_othername.3
+#usr/share/man/man3/gnutls_x509_crt_set_issuer_dn.3
+#usr/share/man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
+#usr/share/man/man3/gnutls_x509_crt_set_issuer_unique_id.3
+#usr/share/man/man3/gnutls_x509_crt_set_key.3
+#usr/share/man/man3/gnutls_x509_crt_set_key_purpose_oid.3
+#usr/share/man/man3/gnutls_x509_crt_set_key_usage.3
+#usr/share/man/man3/gnutls_x509_crt_set_name_constraints.3
+#usr/share/man/man3/gnutls_x509_crt_set_pin_function.3
+#usr/share/man/man3/gnutls_x509_crt_set_policy.3
+#usr/share/man/man3/gnutls_x509_crt_set_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_crt_set_proxy.3
+#usr/share/man/man3/gnutls_x509_crt_set_proxy_dn.3
+#usr/share/man/man3/gnutls_x509_crt_set_pubkey.3
+#usr/share/man/man3/gnutls_x509_crt_set_serial.3
+#usr/share/man/man3/gnutls_x509_crt_set_subject_alt_name.3
+#usr/share/man/man3/gnutls_x509_crt_set_subject_alt_othername.3
+#usr/share/man/man3/gnutls_x509_crt_set_subject_alternative_name.3
+#usr/share/man/man3/gnutls_x509_crt_set_subject_key_id.3
+#usr/share/man/man3/gnutls_x509_crt_set_subject_unique_id.3
+#usr/share/man/man3/gnutls_x509_crt_set_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_crt_set_version.3
+#usr/share/man/man3/gnutls_x509_crt_sign.3
+#usr/share/man/man3/gnutls_x509_crt_sign2.3
+#usr/share/man/man3/gnutls_x509_crt_verify.3
+#usr/share/man/man3/gnutls_x509_crt_verify_data2.3
+#usr/share/man/man3/gnutls_x509_dn_deinit.3
+#usr/share/man/man3/gnutls_x509_dn_export.3
+#usr/share/man/man3/gnutls_x509_dn_export2.3
+#usr/share/man/man3/gnutls_x509_dn_get_rdn_ava.3
+#usr/share/man/man3/gnutls_x509_dn_get_str.3
+#usr/share/man/man3/gnutls_x509_dn_get_str2.3
+#usr/share/man/man3/gnutls_x509_dn_import.3
+#usr/share/man/man3/gnutls_x509_dn_init.3
+#usr/share/man/man3/gnutls_x509_dn_oid_known.3
+#usr/share/man/man3/gnutls_x509_dn_oid_name.3
+#usr/share/man/man3/gnutls_x509_dn_set_str.3
+#usr/share/man/man3/gnutls_x509_ext_deinit.3
+#usr/share/man/man3/gnutls_x509_ext_export_aia.3
+#usr/share/man/man3/gnutls_x509_ext_export_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_ext_export_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_ext_export_crl_dist_points.3
+#usr/share/man/man3/gnutls_x509_ext_export_key_purposes.3
+#usr/share/man/man3/gnutls_x509_ext_export_key_usage.3
+#usr/share/man/man3/gnutls_x509_ext_export_name_constraints.3
+#usr/share/man/man3/gnutls_x509_ext_export_policies.3
+#usr/share/man/man3/gnutls_x509_ext_export_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_ext_export_proxy.3
+#usr/share/man/man3/gnutls_x509_ext_export_subject_alt_names.3
+#usr/share/man/man3/gnutls_x509_ext_export_subject_key_id.3
+#usr/share/man/man3/gnutls_x509_ext_export_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_ext_import_aia.3
+#usr/share/man/man3/gnutls_x509_ext_import_authority_key_id.3
+#usr/share/man/man3/gnutls_x509_ext_import_basic_constraints.3
+#usr/share/man/man3/gnutls_x509_ext_import_crl_dist_points.3
+#usr/share/man/man3/gnutls_x509_ext_import_key_purposes.3
+#usr/share/man/man3/gnutls_x509_ext_import_key_usage.3
+#usr/share/man/man3/gnutls_x509_ext_import_name_constraints.3
+#usr/share/man/man3/gnutls_x509_ext_import_policies.3
+#usr/share/man/man3/gnutls_x509_ext_import_private_key_usage_period.3
+#usr/share/man/man3/gnutls_x509_ext_import_proxy.3
+#usr/share/man/man3/gnutls_x509_ext_import_subject_alt_names.3
+#usr/share/man/man3/gnutls_x509_ext_import_subject_key_id.3
+#usr/share/man/man3/gnutls_x509_ext_import_tlsfeatures.3
+#usr/share/man/man3/gnutls_x509_ext_print.3
+#usr/share/man/man3/gnutls_x509_key_purpose_deinit.3
+#usr/share/man/man3/gnutls_x509_key_purpose_get.3
+#usr/share/man/man3/gnutls_x509_key_purpose_init.3
+#usr/share/man/man3/gnutls_x509_key_purpose_set.3
+#usr/share/man/man3/gnutls_x509_name_constraints_add_excluded.3
+#usr/share/man/man3/gnutls_x509_name_constraints_add_permitted.3
+#usr/share/man/man3/gnutls_x509_name_constraints_check.3
+#usr/share/man/man3/gnutls_x509_name_constraints_check_crt.3
+#usr/share/man/man3/gnutls_x509_name_constraints_deinit.3
+#usr/share/man/man3/gnutls_x509_name_constraints_get_excluded.3
+#usr/share/man/man3/gnutls_x509_name_constraints_get_permitted.3
+#usr/share/man/man3/gnutls_x509_name_constraints_init.3
+#usr/share/man/man3/gnutls_x509_othername_to_virtual.3
+#usr/share/man/man3/gnutls_x509_policies_deinit.3
+#usr/share/man/man3/gnutls_x509_policies_get.3
+#usr/share/man/man3/gnutls_x509_policies_init.3
+#usr/share/man/man3/gnutls_x509_policies_set.3
+#usr/share/man/man3/gnutls_x509_policy_release.3
+#usr/share/man/man3/gnutls_x509_privkey_cpy.3
+#usr/share/man/man3/gnutls_x509_privkey_deinit.3
+#usr/share/man/man3/gnutls_x509_privkey_export.3
+#usr/share/man/man3/gnutls_x509_privkey_export2.3
+#usr/share/man/man3/gnutls_x509_privkey_export2_pkcs8.3
+#usr/share/man/man3/gnutls_x509_privkey_export_dsa_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_export_ecc_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_export_pkcs8.3
+#usr/share/man/man3/gnutls_x509_privkey_export_rsa_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_export_rsa_raw2.3
+#usr/share/man/man3/gnutls_x509_privkey_fix.3
+#usr/share/man/man3/gnutls_x509_privkey_generate.3
+#usr/share/man/man3/gnutls_x509_privkey_generate2.3
+#usr/share/man/man3/gnutls_x509_privkey_get_key_id.3
+#usr/share/man/man3/gnutls_x509_privkey_get_pk_algorithm.3
+#usr/share/man/man3/gnutls_x509_privkey_get_pk_algorithm2.3
+#usr/share/man/man3/gnutls_x509_privkey_get_seed.3
+#usr/share/man/man3/gnutls_x509_privkey_import.3
+#usr/share/man/man3/gnutls_x509_privkey_import2.3
+#usr/share/man/man3/gnutls_x509_privkey_import_dsa_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_import_ecc_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_import_openssl.3
+#usr/share/man/man3/gnutls_x509_privkey_import_pkcs8.3
+#usr/share/man/man3/gnutls_x509_privkey_import_rsa_raw.3
+#usr/share/man/man3/gnutls_x509_privkey_import_rsa_raw2.3
+#usr/share/man/man3/gnutls_x509_privkey_init.3
+#usr/share/man/man3/gnutls_x509_privkey_sec_param.3
+#usr/share/man/man3/gnutls_x509_privkey_set_flags.3
+#usr/share/man/man3/gnutls_x509_privkey_set_pin_function.3
+#usr/share/man/man3/gnutls_x509_privkey_sign_data.3
+#usr/share/man/man3/gnutls_x509_privkey_sign_hash.3
+#usr/share/man/man3/gnutls_x509_privkey_verify_params.3
+#usr/share/man/man3/gnutls_x509_privkey_verify_seed.3
+#usr/share/man/man3/gnutls_x509_rdn_get.3
+#usr/share/man/man3/gnutls_x509_rdn_get2.3
+#usr/share/man/man3/gnutls_x509_rdn_get_by_oid.3
+#usr/share/man/man3/gnutls_x509_rdn_get_oid.3
+#usr/share/man/man3/gnutls_x509_tlsfeatures_add.3
+#usr/share/man/man3/gnutls_x509_tlsfeatures_check_crt.3
+#usr/share/man/man3/gnutls_x509_tlsfeatures_deinit.3
+#usr/share/man/man3/gnutls_x509_tlsfeatures_get.3
+#usr/share/man/man3/gnutls_x509_tlsfeatures_init.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_cas.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_crls.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_named_crt.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_system_trust.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_trust_dir.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_trust_file.3
+#usr/share/man/man3/gnutls_x509_trust_list_add_trust_mem.3
+#usr/share/man/man3/gnutls_x509_trust_list_deinit.3
+#usr/share/man/man3/gnutls_x509_trust_list_get_issuer.3
+#usr/share/man/man3/gnutls_x509_trust_list_get_issuer_by_dn.3
+#usr/share/man/man3/gnutls_x509_trust_list_get_issuer_by_subject_key_id.3
+#usr/share/man/man3/gnutls_x509_trust_list_init.3
+#usr/share/man/man3/gnutls_x509_trust_list_iter_deinit.3
+#usr/share/man/man3/gnutls_x509_trust_list_iter_get_ca.3
+#usr/share/man/man3/gnutls_x509_trust_list_remove_cas.3
+#usr/share/man/man3/gnutls_x509_trust_list_remove_trust_file.3
+#usr/share/man/man3/gnutls_x509_trust_list_remove_trust_mem.3
+#usr/share/man/man3/gnutls_x509_trust_list_verify_crt.3
+#usr/share/man/man3/gnutls_x509_trust_list_verify_crt2.3
+#usr/share/man/man3/gnutls_x509_trust_list_verify_named_crt.3
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 75aad17..760a128 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors
index f23b97c..9936e04 100644
--- a/config/rootfiles/common/i586/lm_sensors
+++ b/config/rootfiles/common/i586/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
#usr/man/man1/sensors.1
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
#usr/man/man8/isadump.8
#usr/man/man8/isaset.8
#usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
#usr/man/man8/sensors-detect.8
usr/sbin/fancontrol
usr/sbin/isadump
diff --git a/config/rootfiles/common/lcms2 b/config/rootfiles/common/lcms2
new file mode 100644
index 0000000..2ea5915
--- /dev/null
+++ b/config/rootfiles/common/lcms2
@@ -0,0 +1,15 @@
+#usr/bin/jpgicc
+#usr/bin/linkicc
+#usr/bin/psicc
+#usr/bin/tificc
+#usr/bin/transicc
+#usr/include/lcms2.h
+#usr/include/lcms2_plugin.h
+#usr/lib/liblcms2.a
+#usr/lib/liblcms2.la
+#usr/lib/liblcms2.so
+usr/lib/liblcms2.so.2
+usr/lib/liblcms2.so.2.0.8
+#usr/lib/pkgconfig/lcms2.pc
+#usr/share/man/man1/jpgicc.1
+#usr/share/man/man1/tificc.1
diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle
index 5d5777b..3f23cb7 100644
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -39,6 +39,7 @@
#usr/include/nettle/md4.h
#usr/include/nettle/md5-compat.h
#usr/include/nettle/md5.h
+#usr/include/nettle/memops.h
#usr/include/nettle/memxor.h
#usr/include/nettle/nettle-meta.h
#usr/include/nettle/nettle-stdint.h
@@ -63,11 +64,9 @@
#usr/include/nettle/yarrow.h
usr/lib/libhogweed.so
usr/lib/libhogweed.so.4
-usr/lib/libhogweed.so.4.2
+usr/lib/libhogweed.so.4.3
#usr/lib/libnettle.so
usr/lib/libnettle.so.6
-usr/lib/libnettle.so.6.2
+usr/lib/libnettle.so.6.3
#usr/lib/pkgconfig/hogweed.pc
#usr/lib/pkgconfig/nettle.pc
-usr/share/doc/nettle-3.2
-#usr/share/info/nettle.info
diff --git a/config/rootfiles/common/pixman b/config/rootfiles/common/pixman
index ea44cd8..34b2a3f 100644
--- a/config/rootfiles/common/pixman
+++ b/config/rootfiles/common/pixman
@@ -5,5 +5,5 @@
#usr/lib/libpixman-1.la
usr/lib/libpixman-1.so
usr/lib/libpixman-1.so.0
-usr/lib/libpixman-1.so.0.26.0
+usr/lib/libpixman-1.so.0.34.0
#usr/lib/pkgconfig/pixman-1.pc
diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
new file mode 100644
index 0000000..6a21261
--- /dev/null
+++ b/config/rootfiles/common/poppler
@@ -0,0 +1,174 @@
+usr/bin/pdfdetach
+usr/bin/pdffonts
+usr/bin/pdfimages
+usr/bin/pdfinfo
+usr/bin/pdfseparate
+usr/bin/pdftocairo
+usr/bin/pdftohtml
+usr/bin/pdftoppm
+usr/bin/pdftops
+usr/bin/pdftotext
+usr/bin/pdfunite
+#usr/include/poppler
+#usr/include/poppler/Annot.h
+#usr/include/poppler/Array.h
+#usr/include/poppler/BuiltinFont.h
+#usr/include/poppler/BuiltinFontTables.h
+#usr/include/poppler/CMap.h
+#usr/include/poppler/CachedFile.h
+#usr/include/poppler/Catalog.h
+#usr/include/poppler/CharCodeToUnicode.h
+#usr/include/poppler/CharTypes.h
+#usr/include/poppler/CompactFontTables.h
+#usr/include/poppler/DateInfo.h
+#usr/include/poppler/Decrypt.h
+#usr/include/poppler/Dict.h
+#usr/include/poppler/Error.h
+#usr/include/poppler/ErrorCodes.h
+#usr/include/poppler/FileSpec.h
+#usr/include/poppler/FontEncodingTables.h
+#usr/include/poppler/FontInfo.h
+#usr/include/poppler/Form.h
+#usr/include/poppler/Function.h
+#usr/include/poppler/Gfx.h
+#usr/include/poppler/GfxFont.h
+#usr/include/poppler/GfxState.h
+#usr/include/poppler/GfxState_helpers.h
+#usr/include/poppler/GlobalParams.h
+#usr/include/poppler/Hints.h
+#usr/include/poppler/JArithmeticDecoder.h
+#usr/include/poppler/JBIG2Stream.h
+#usr/include/poppler/Lexer.h
+#usr/include/poppler/Linearization.h
+#usr/include/poppler/Link.h
+#usr/include/poppler/LocalPDFDocBuilder.h
+#usr/include/poppler/MarkedContentOutputDev.h
+#usr/include/poppler/Movie.h
+#usr/include/poppler/NameToCharCode.h
+#usr/include/poppler/NameToUnicodeTable.h
+#usr/include/poppler/Object.h
+#usr/include/poppler/OptionalContent.h
+#usr/include/poppler/Outline.h
+#usr/include/poppler/OutputDev.h
+#usr/include/poppler/PDFDoc.h
+#usr/include/poppler/PDFDocBuilder.h
+#usr/include/poppler/PDFDocEncoding.h
+#usr/include/poppler/PDFDocFactory.h
+#usr/include/poppler/PSOutputDev.h
+#usr/include/poppler/PSTokenizer.h
+#usr/include/poppler/Page.h
+#usr/include/poppler/PageTransition.h
+#usr/include/poppler/Parser.h
+#usr/include/poppler/PopplerCache.h
+#usr/include/poppler/PreScanOutputDev.h
+#usr/include/poppler/ProfileData.h
+#usr/include/poppler/Rendition.h
+#usr/include/poppler/SecurityHandler.h
+#usr/include/poppler/SignatureInfo.h
+#usr/include/poppler/Sound.h
+#usr/include/poppler/SplashOutputDev.h
+#usr/include/poppler/StdinCachedFile.h
+#usr/include/poppler/StdinPDFDocBuilder.h
+#usr/include/poppler/Stream-CCITT.h
+#usr/include/poppler/Stream.h
+#usr/include/poppler/StructElement.h
+#usr/include/poppler/StructTreeRoot.h
+#usr/include/poppler/TextOutputDev.h
+#usr/include/poppler/UTF.h
+#usr/include/poppler/UTF8.h
+#usr/include/poppler/UnicodeCClassTables.h
+#usr/include/poppler/UnicodeCompTables.h
+#usr/include/poppler/UnicodeDecompTables.h
+#usr/include/poppler/UnicodeMap.h
+#usr/include/poppler/UnicodeMapTables.h
+#usr/include/poppler/UnicodeTypeTable.h
+#usr/include/poppler/ViewerPreferences.h
+#usr/include/poppler/XRef.h
+#usr/include/poppler/XpdfPluginAPI.h
+#usr/include/poppler/cpp
+#usr/include/poppler/cpp/poppler-document.h
+#usr/include/poppler/cpp/poppler-embedded-file.h
+#usr/include/poppler/cpp/poppler-font.h
+#usr/include/poppler/cpp/poppler-global.h
+#usr/include/poppler/cpp/poppler-image.h
+#usr/include/poppler/cpp/poppler-page-renderer.h
+#usr/include/poppler/cpp/poppler-page-transition.h
+#usr/include/poppler/cpp/poppler-page.h
+#usr/include/poppler/cpp/poppler-rectangle.h
+#usr/include/poppler/cpp/poppler-toc.h
+#usr/include/poppler/cpp/poppler-version.h
+#usr/include/poppler/fofi
+#usr/include/poppler/fofi/FoFiBase.h
+#usr/include/poppler/fofi/FoFiEncodings.h
+#usr/include/poppler/fofi/FoFiIdentifier.h
+#usr/include/poppler/fofi/FoFiTrueType.h
+#usr/include/poppler/fofi/FoFiType1.h
+#usr/include/poppler/fofi/FoFiType1C.h
+#usr/include/poppler/goo
+#usr/include/poppler/goo/FixedPoint.h
+#usr/include/poppler/goo/GooHash.h
+#usr/include/poppler/goo/GooLikely.h
+#usr/include/poppler/goo/GooList.h
+#usr/include/poppler/goo/GooMutex.h
+#usr/include/poppler/goo/GooString.h
+#usr/include/poppler/goo/GooTimer.h
+#usr/include/poppler/goo/ImgWriter.h
+#usr/include/poppler/goo/JpegWriter.h
+#usr/include/poppler/goo/NetPBMWriter.h
+#usr/include/poppler/goo/PNGWriter.h
+#usr/include/poppler/goo/TiffWriter.h
+#usr/include/poppler/goo/gfile.h
+#usr/include/poppler/goo/gmem.h
+#usr/include/poppler/goo/grandom.h
+#usr/include/poppler/goo/gstrtod.h
+#usr/include/poppler/goo/gtypes.h
+#usr/include/poppler/poppler-config.h
+#usr/include/poppler/splash
+#usr/include/poppler/splash/Splash.h
+#usr/include/poppler/splash/SplashBitmap.h
+#usr/include/poppler/splash/SplashClip.h
+#usr/include/poppler/splash/SplashErrorCodes.h
+#usr/include/poppler/splash/SplashFTFont.h
+#usr/include/poppler/splash/SplashFTFontEngine.h
+#usr/include/poppler/splash/SplashFTFontFile.h
+#usr/include/poppler/splash/SplashFont.h
+#usr/include/poppler/splash/SplashFontEngine.h
+#usr/include/poppler/splash/SplashFontFile.h
+#usr/include/poppler/splash/SplashFontFileID.h
+#usr/include/poppler/splash/SplashGlyphBitmap.h
+#usr/include/poppler/splash/SplashMath.h
+#usr/include/poppler/splash/SplashPath.h
+#usr/include/poppler/splash/SplashPattern.h
+#usr/include/poppler/splash/SplashScreen.h
+#usr/include/poppler/splash/SplashState.h
+#usr/include/poppler/splash/SplashT1Font.h
+#usr/include/poppler/splash/SplashT1FontEngine.h
+#usr/include/poppler/splash/SplashT1FontFile.h
+#usr/include/poppler/splash/SplashTypes.h
+#usr/include/poppler/splash/SplashXPath.h
+#usr/include/poppler/splash/SplashXPathScanner.h
+#usr/lib/libpoppler-cpp.a
+#usr/lib/libpoppler-cpp.la
+#usr/lib/libpoppler-cpp.so
+usr/lib/libpoppler-cpp.so.0
+usr/lib/libpoppler-cpp.so.0.3.0
+#usr/lib/libpoppler.a
+#usr/lib/libpoppler.la
+#usr/lib/libpoppler.so
+usr/lib/libpoppler.so.66
+usr/lib/libpoppler.so.66.0.0
+#usr/lib/pkgconfig/poppler-cairo.pc
+#usr/lib/pkgconfig/poppler-cpp.pc
+#usr/lib/pkgconfig/poppler-splash.pc
+#usr/lib/pkgconfig/poppler.pc
+#usr/share/man/man1/pdfdetach.1
+#usr/share/man/man1/pdffonts.1
+#usr/share/man/man1/pdfimages.1
+#usr/share/man/man1/pdfinfo.1
+#usr/share/man/man1/pdfseparate.1
+#usr/share/man/man1/pdftocairo.1
+#usr/share/man/man1/pdftohtml.1
+#usr/share/man/man1/pdftoppm.1
+#usr/share/man/man1/pdftops.1
+#usr/share/man/man1/pdftotext.1
+#usr/share/man/man1/pdfunite.1
diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf
new file mode 100644
index 0000000..9776c16
--- /dev/null
+++ b/config/rootfiles/common/qpdf
@@ -0,0 +1,44 @@
+usr/bin/fix-qdf
+usr/bin/qpdf
+#usr/bin/zlib-flate
+#usr/include/qpdf
+#usr/include/qpdf/Buffer.hh
+#usr/include/qpdf/BufferInputSource.hh
+#usr/include/qpdf/Constants.h
+#usr/include/qpdf/DLL.h
+#usr/include/qpdf/FileInputSource.hh
+#usr/include/qpdf/InputSource.hh
+#usr/include/qpdf/Pipeline.hh
+#usr/include/qpdf/Pl_Buffer.hh
+#usr/include/qpdf/Pl_Concatenate.hh
+#usr/include/qpdf/Pl_Count.hh
+#usr/include/qpdf/Pl_Discard.hh
+#usr/include/qpdf/Pl_Flate.hh
+#usr/include/qpdf/Pl_StdioFile.hh
+#usr/include/qpdf/PointerHolder.hh
+#usr/include/qpdf/QPDF.hh
+#usr/include/qpdf/QPDFExc.hh
+#usr/include/qpdf/QPDFObjGen.hh
+#usr/include/qpdf/QPDFObject.hh
+#usr/include/qpdf/QPDFObjectHandle.hh
+#usr/include/qpdf/QPDFTokenizer.hh
+#usr/include/qpdf/QPDFWriter.hh
+#usr/include/qpdf/QPDFXRefEntry.hh
+#usr/include/qpdf/QTC.hh
+#usr/include/qpdf/QUtil.hh
+#usr/include/qpdf/RandomDataProvider.hh
+#usr/include/qpdf/Types.h
+#usr/include/qpdf/qpdf-c.h
+#usr/lib/libqpdf.a
+#usr/lib/libqpdf.la
+#usr/lib/libqpdf.so
+usr/lib/libqpdf.so.17
+usr/lib/libqpdf.so.17.0.0
+#usr/lib/pkgconfig/libqpdf.pc
+#usr/share/doc/qpdf
+#usr/share/doc/qpdf/qpdf-manual.html
+#usr/share/doc/qpdf/qpdf-manual.pdf
+#usr/share/doc/qpdf/stylesheet.css
+#usr/share/man/man1/fix-qdf.1
+#usr/share/man/man1/qpdf.1
+#usr/share/man/man1/zlib-flate.1
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index c31b8a6..a94ea25 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -10,7 +10,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.2
-usr/lib/libunbound.so.2.4.3
+usr/lib/libunbound.so.2.4.4
usr/sbin/unbound
usr/sbin/unbound-anchor
usr/sbin/unbound-checkconf
diff --git a/config/rootfiles/common/x86_64/gcc b/config/rootfiles/common/x86_64/gcc
index e378d93..55d07af 100644
--- a/config/rootfiles/common/x86_64/gcc
+++ b/config/rootfiles/common/x86_64/gcc
@@ -1138,8 +1138,8 @@ usr/lib/libquadmath.so.0.0.0
#usr/lib/libssp.a
#usr/lib/libssp.la
#usr/lib/libssp.so
-#usr/lib/libssp.so.0
-#usr/lib/libssp.so.0.0.0
+usr/lib/libssp.so.0
+usr/lib/libssp.so.0.0.0
#usr/lib/libssp_nonshared.a
#usr/lib/libssp_nonshared.la
#usr/lib/libstdc++.a
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 75aad17..760a128 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -4,66 +4,30 @@ etc/init.d
etc/rc.d/helper/getdnsfromdhcpc.pl
#etc/rc.d/init.d
etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
etc/rc.d/init.d/fireinfo
etc/rc.d/init.d/firewall
etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
etc/rc.d/init.d/fsresize
etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-geoip-database
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
etc/rc.d/init.d/random
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/unbound
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors
index f23b97c..9936e04 100644
--- a/config/rootfiles/common/x86_64/lm_sensors
+++ b/config/rootfiles/common/x86_64/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
#usr/man/man1/sensors.1
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
#usr/man/man8/isadump.8
#usr/man/man8/isaset.8
#usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
#usr/man/man8/sensors-detect.8
usr/sbin/fancontrol
usr/sbin/isadump
diff --git a/config/rootfiles/core/109/exclude b/config/rootfiles/core/110/exclude
similarity index 100%
rename from config/rootfiles/core/109/exclude
rename to config/rootfiles/core/110/exclude
diff --git a/config/rootfiles/core/110/filelists/armv5tel/lm_sensors b/config/rootfiles/core/110/filelists/armv5tel/lm_sensors
new file mode 120000
index 0000000..eec84cd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/armv5tel/lm_sensors
@@ -0,0 +1 @@
+../../../../common/armv5tel/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/bind b/config/rootfiles/core/110/filelists/bind
similarity index 100%
rename from config/rootfiles/core/109/filelists/bind
rename to config/rootfiles/core/110/filelists/bind
diff --git a/config/rootfiles/core/110/filelists/cairo b/config/rootfiles/core/110/filelists/cairo
new file mode 120000
index 0000000..bf48d25
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/cairo
@@ -0,0 +1 @@
+../../../common/cairo
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/conntrack-tools b/config/rootfiles/core/110/filelists/conntrack-tools
new file mode 120000
index 0000000..88fbe06
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/conntrack-tools
@@ -0,0 +1 @@
+../../../common/conntrack-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files
new file mode 100644
index 0000000..4a7d710
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/files
@@ -0,0 +1,23 @@
+etc/system-release
+etc/issue
+etc/httpd/conf/server-tuning.conf
+etc/rc.d/init.d/unbound
+etc/sysctl.conf
+srv/web/ipfire/cgi-bin/entropy.cgi
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/netovpnsrv.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/html/themes/darkdos/include/style.css
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/maniac/include/style.css
+usr/lib/firewall/ipsec-block
+usr/lib/libssp.so.0
+usr/lib/libssp.so.0.0.0
+usr/local/bin/xt_geoip_update
+usr/sbin/setup
+var/ipfire/langs
+var/ipfire/general-functions.pl
+var/ipfire/graphs.pl
diff --git a/config/rootfiles/core/110/filelists/fontconfig b/config/rootfiles/core/110/filelists/fontconfig
new file mode 120000
index 0000000..6daeffd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/fontconfig
@@ -0,0 +1 @@
+../../../common/fontconfig
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/freetype b/config/rootfiles/core/110/filelists/freetype
new file mode 120000
index 0000000..79ec5c4
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/freetype
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/gnutls b/config/rootfiles/core/110/filelists/gnutls
new file mode 120000
index 0000000..8dbe60b
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/i586/lm_sensors b/config/rootfiles/core/110/filelists/i586/lm_sensors
new file mode 120000
index 0000000..b7f0101
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/i586/lm_sensors
@@ -0,0 +1 @@
+../../../../common/i586//lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/lcms2 b/config/rootfiles/core/110/filelists/lcms2
new file mode 120000
index 0000000..f72a394
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/lcms2
@@ -0,0 +1 @@
+../../../common/lcms2
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/nettle b/config/rootfiles/core/110/filelists/nettle
new file mode 120000
index 0000000..f0dba7a
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/nettle
@@ -0,0 +1 @@
+../../../common/nettle
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/ntp b/config/rootfiles/core/110/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/openssh b/config/rootfiles/core/110/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/pixman b/config/rootfiles/core/110/filelists/pixman
new file mode 120000
index 0000000..fdb6346
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/pixman
@@ -0,0 +1 @@
+../../../common/pixman
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/poppler b/config/rootfiles/core/110/filelists/poppler
new file mode 120000
index 0000000..39aa6c2
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/qpdf b/config/rootfiles/core/110/filelists/qpdf
new file mode 120000
index 0000000..2d6c43d
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/qpdf
@@ -0,0 +1 @@
+../../../common/qpdf
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/squid b/config/rootfiles/core/110/filelists/squid
similarity index 100%
rename from config/rootfiles/core/109/filelists/squid
rename to config/rootfiles/core/110/filelists/squid
diff --git a/config/rootfiles/core/110/filelists/strongswan b/config/rootfiles/core/110/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/unbound b/config/rootfiles/core/110/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/109/filelists/unbound
rename to config/rootfiles/core/110/filelists/unbound
diff --git a/config/rootfiles/core/110/filelists/wget b/config/rootfiles/core/110/filelists/wget
new file mode 120000
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/x86_64/lm_sensors b/config/rootfiles/core/110/filelists/x86_64/lm_sensors
new file mode 120000
index 0000000..fd435d4
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/x86_64/lm_sensors
@@ -0,0 +1 @@
+../../../../common/x86_64//lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/core/109/meta b/config/rootfiles/core/110/meta
similarity index 100%
rename from config/rootfiles/core/109/meta
rename to config/rootfiles/core/110/meta
diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
new file mode 100644
index 0000000..84e0ddf
--- /dev/null
+++ b/config/rootfiles/core/110/update.sh
@@ -0,0 +1,67 @@
+#!/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) 2017 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=110
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/squid stop
+/etc/init.d/unbound stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/sshd restart
+/etc/init.d/squid start
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/109/exclude b/config/rootfiles/oldcore/109/exclude
new file mode 100644
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/109/exclude
@@ -0,0 +1,30 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/109/filelists/GeoIP b/config/rootfiles/oldcore/109/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/109/filelists/GeoIP
rename to config/rootfiles/oldcore/109/filelists/GeoIP
diff --git a/config/rootfiles/oldcore/109/filelists/bind b/config/rootfiles/oldcore/109/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/oldcore/109/filelists/files
similarity index 100%
rename from config/rootfiles/core/109/filelists/files
rename to config/rootfiles/oldcore/109/filelists/files
diff --git a/config/rootfiles/core/109/filelists/libpcap b/config/rootfiles/oldcore/109/filelists/libpcap
similarity index 100%
rename from config/rootfiles/core/109/filelists/libpcap
rename to config/rootfiles/oldcore/109/filelists/libpcap
diff --git a/config/rootfiles/core/109/filelists/libpng b/config/rootfiles/oldcore/109/filelists/libpng
similarity index 100%
rename from config/rootfiles/core/109/filelists/libpng
rename to config/rootfiles/oldcore/109/filelists/libpng
diff --git a/config/rootfiles/core/109/filelists/openssl b/config/rootfiles/oldcore/109/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/109/filelists/openssl
rename to config/rootfiles/oldcore/109/filelists/openssl
diff --git a/config/rootfiles/core/109/filelists/snort b/config/rootfiles/oldcore/109/filelists/snort
similarity index 100%
rename from config/rootfiles/core/109/filelists/snort
rename to config/rootfiles/oldcore/109/filelists/snort
diff --git a/config/rootfiles/oldcore/109/filelists/squid b/config/rootfiles/oldcore/109/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/sysklogd b/config/rootfiles/oldcore/109/filelists/sysklogd
similarity index 100%
rename from config/rootfiles/core/109/filelists/sysklogd
rename to config/rootfiles/oldcore/109/filelists/sysklogd
diff --git a/config/rootfiles/oldcore/109/filelists/unbound b/config/rootfiles/oldcore/109/filelists/unbound
new file mode 120000
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/meta b/config/rootfiles/oldcore/109/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/109/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/109/update.sh b/config/rootfiles/oldcore/109/update.sh
similarity index 100%
rename from config/rootfiles/core/109/update.sh
rename to config/rootfiles/oldcore/109/update.sh
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index dc2c56d..4a3b572 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,7 +7,7 @@ etc/avahi/services
etc/avahi/services/sftp-ssh.service
etc/avahi/services/smb.service
etc/avahi/services/ssh.service
-#etc/dbus-1/system.d/avahi-dbus.conf
+etc/dbus-1/system.d/avahi-dbus.conf
etc/rc.d/init.d/avahi
usr/bin/avahi-browse
usr/bin/avahi-browse-domains
@@ -95,16 +95,19 @@ usr/share/avahi
usr/share/avahi/avahi-service.dtd
usr/share/avahi/service-types
#usr/share/dbus-1/interfaces
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
-#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
-#usr/share/dbus-1/system-services
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
+#usr/share/locale/ach
+#usr/share/locale/ach/LC_MESSAGES
+#usr/share/locale/ach/LC_MESSAGES/avahi.mo
+#usr/share/locale/ar/LC_MESSAGES/avahi.mo
#usr/share/locale/bg/LC_MESSAGES/avahi.mo
#usr/share/locale/ca/LC_MESSAGES/avahi.mo
#usr/share/locale/cs/LC_MESSAGES/avahi.mo
@@ -117,7 +120,10 @@ usr/share/avahi/service-types
#usr/share/locale/en_NZ
#usr/share/locale/en_NZ/LC_MESSAGES
#usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo
+#usr/share/locale/eo/LC_MESSAGES/avahi.mo
#usr/share/locale/es/LC_MESSAGES/avahi.mo
+#usr/share/locale/et/LC_MESSAGES/avahi.mo
+#usr/share/locale/fa/LC_MESSAGES/avahi.mo
#usr/share/locale/fi/LC_MESSAGES/avahi.mo
#usr/share/locale/fo
#usr/share/locale/fo/LC_MESSAGES
@@ -129,16 +135,20 @@ usr/share/avahi/service-types
#usr/share/locale/id/LC_MESSAGES/avahi.mo
#usr/share/locale/it/LC_MESSAGES/avahi.mo
#usr/share/locale/ja/LC_MESSAGES/avahi.mo
+#usr/share/locale/ko/LC_MESSAGES/avahi.mo
+#usr/share/locale/lv/LC_MESSAGES/avahi.mo
#usr/share/locale/ms/LC_MESSAGES/avahi.mo
#usr/share/locale/nl/LC_MESSAGES/avahi.mo
#usr/share/locale/pl/LC_MESSAGES/avahi.mo
#usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo
#usr/share/locale/ro/LC_MESSAGES/avahi.mo
#usr/share/locale/ru/LC_MESSAGES/avahi.mo
+#usr/share/locale/sk/LC_MESSAGES/avahi.mo
#usr/share/locale/sl/LC_MESSAGES/avahi.mo
#usr/share/locale/sr/LC_MESSAGES/avahi.mo
#usr/share/locale/sr(a)latin/LC_MESSAGES/avahi.mo
#usr/share/locale/sv/LC_MESSAGES/avahi.mo
+#usr/share/locale/tr/LC_MESSAGES/avahi.mo
#usr/share/locale/uk/LC_MESSAGES/avahi.mo
#usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
#usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
@@ -160,5 +170,3 @@ usr/share/avahi/service-types
#usr/share/man/man8/avahi-daemon.8
#usr/share/man/man8/avahi-dnsconfd.8
#usr/share/man/man8/avahi-dnsconfd.action.8
-#usr/var/run
-etc/rc.d/init.d/avahi
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 0604867..3881d4a 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+etc/dbus-1/system.d/cups.conf
etc/pam.d/cups
etc/rc.d/init.d/cups
#etc/rc0.d
@@ -15,6 +16,7 @@ usr/bin/cancel
#usr/bin/cups-config
usr/bin/cupstestdsc
usr/bin/cupstestppd
+usr/bin/ippfind
usr/bin/ipptool
usr/bin/lp
usr/bin/lpoptions
@@ -31,17 +33,13 @@ usr/bin/ppdpo
#usr/include/cups/adminutil.h
#usr/include/cups/array.h
#usr/include/cups/backend.h
-#usr/include/cups/cgi.h
#usr/include/cups/cups.h
#usr/include/cups/dir.h
#usr/include/cups/file.h
-#usr/include/cups/help-index.h
#usr/include/cups/http.h
#usr/include/cups/ipp.h
#usr/include/cups/language.h
-#usr/include/cups/mime.h
#usr/include/cups/ppd.h
-#usr/include/cups/ppdc.h
#usr/include/cups/pwg.h
#usr/include/cups/raster.h
#usr/include/cups/sidechannel.h
@@ -49,8 +47,11 @@ usr/bin/ppdpo
#usr/include/cups/versioning.h
usr/lib/cups
usr/lib/cups/backend
+usr/lib/cups/backend/dnssd
usr/lib/cups/backend/http
+usr/lib/cups/backend/https
usr/lib/cups/backend/ipp
+usr/lib/cups/backend/ipps
usr/lib/cups/backend/lpd
usr/lib/cups/backend/smb
usr/lib/cups/backend/snmp
@@ -81,6 +82,7 @@ usr/lib/cups/monitor
usr/lib/cups/monitor/bcp
usr/lib/cups/monitor/tbcp
usr/lib/cups/notifier
+usr/lib/cups/notifier/dbus
usr/lib/cups/notifier/mailto
usr/lib/cups/notifier/rss
#usr/lib/libcups.so
@@ -109,14 +111,7 @@ usr/sbin/lpmove
usr/sbin/reject
usr/share/cups
usr/share/cups/banners
-usr/share/cups/banners/classified
-usr/share/cups/banners/confidential
-usr/share/cups/banners/secret
-usr/share/cups/banners/standard
-usr/share/cups/banners/topsecret
-usr/share/cups/banners/unclassified
usr/share/cups/data
-usr/share/cups/data/testprint
usr/share/cups/drv
usr/share/cups/drv/sample.drv
usr/share/cups/examples
@@ -218,6 +213,7 @@ usr/share/cups/templates/de/error.tmpl
usr/share/cups/templates/de/header.tmpl
usr/share/cups/templates/de/help-header.tmpl
usr/share/cups/templates/de/help-printable.tmpl
+usr/share/cups/templates/de/help-trailer.tmpl
usr/share/cups/templates/de/job-cancel.tmpl
usr/share/cups/templates/de/job-hold.tmpl
usr/share/cups/templates/de/job-move.tmpl
@@ -446,6 +442,77 @@ usr/share/cups/templates/printer-stop.tmpl
usr/share/cups/templates/printer.tmpl
usr/share/cups/templates/printers-header.tmpl
usr/share/cups/templates/printers.tmpl
+usr/share/cups/templates/pt_BR
+usr/share/cups/templates/pt_BR/add-class.tmpl
+usr/share/cups/templates/pt_BR/add-printer.tmpl
+usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl
+usr/share/cups/templates/pt_BR/admin.tmpl
+usr/share/cups/templates/pt_BR/choose-device.tmpl
+usr/share/cups/templates/pt_BR/choose-make.tmpl
+usr/share/cups/templates/pt_BR/choose-model.tmpl
+usr/share/cups/templates/pt_BR/choose-serial.tmpl
+usr/share/cups/templates/pt_BR/choose-uri.tmpl
+usr/share/cups/templates/pt_BR/class-added.tmpl
+usr/share/cups/templates/pt_BR/class-confirm.tmpl
+usr/share/cups/templates/pt_BR/class-deleted.tmpl
+usr/share/cups/templates/pt_BR/class-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/class-modified.tmpl
+usr/share/cups/templates/pt_BR/class.tmpl
+usr/share/cups/templates/pt_BR/classes-header.tmpl
+usr/share/cups/templates/pt_BR/classes.tmpl
+usr/share/cups/templates/pt_BR/command.tmpl
+usr/share/cups/templates/pt_BR/edit-config.tmpl
+usr/share/cups/templates/pt_BR/error-op.tmpl
+usr/share/cups/templates/pt_BR/error.tmpl
+usr/share/cups/templates/pt_BR/header.tmpl
+usr/share/cups/templates/pt_BR/help-header.tmpl
+usr/share/cups/templates/pt_BR/help-printable.tmpl
+usr/share/cups/templates/pt_BR/help-trailer.tmpl
+usr/share/cups/templates/pt_BR/job-cancel.tmpl
+usr/share/cups/templates/pt_BR/job-hold.tmpl
+usr/share/cups/templates/pt_BR/job-move.tmpl
+usr/share/cups/templates/pt_BR/job-moved.tmpl
+usr/share/cups/templates/pt_BR/job-release.tmpl
+usr/share/cups/templates/pt_BR/job-restart.tmpl
+usr/share/cups/templates/pt_BR/jobs-header.tmpl
+usr/share/cups/templates/pt_BR/jobs.tmpl
+usr/share/cups/templates/pt_BR/list-available-printers.tmpl
+usr/share/cups/templates/pt_BR/modify-class.tmpl
+usr/share/cups/templates/pt_BR/modify-printer.tmpl
+usr/share/cups/templates/pt_BR/norestart.tmpl
+usr/share/cups/templates/pt_BR/option-boolean.tmpl
+usr/share/cups/templates/pt_BR/option-conflict.tmpl
+usr/share/cups/templates/pt_BR/option-header.tmpl
+usr/share/cups/templates/pt_BR/option-pickmany.tmpl
+usr/share/cups/templates/pt_BR/option-pickone.tmpl
+usr/share/cups/templates/pt_BR/option-trailer.tmpl
+usr/share/cups/templates/pt_BR/pager.tmpl
+usr/share/cups/templates/pt_BR/printer-accept.tmpl
+usr/share/cups/templates/pt_BR/printer-added.tmpl
+usr/share/cups/templates/pt_BR/printer-cancel-jobs.tmpl
+usr/share/cups/templates/pt_BR/printer-configured.tmpl
+usr/share/cups/templates/pt_BR/printer-confirm.tmpl
+usr/share/cups/templates/pt_BR/printer-default.tmpl
+usr/share/cups/templates/pt_BR/printer-deleted.tmpl
+usr/share/cups/templates/pt_BR/printer-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/printer-modified.tmpl
+usr/share/cups/templates/pt_BR/printer-reject.tmpl
+usr/share/cups/templates/pt_BR/printer-start.tmpl
+usr/share/cups/templates/pt_BR/printer-stop.tmpl
+usr/share/cups/templates/pt_BR/printer.tmpl
+usr/share/cups/templates/pt_BR/printers-header.tmpl
+usr/share/cups/templates/pt_BR/printers.tmpl
+usr/share/cups/templates/pt_BR/restart.tmpl
+usr/share/cups/templates/pt_BR/samba-export.tmpl
+usr/share/cups/templates/pt_BR/samba-exported.tmpl
+usr/share/cups/templates/pt_BR/search.tmpl
+usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl
+usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
+usr/share/cups/templates/pt_BR/subscription-added.tmpl
+usr/share/cups/templates/pt_BR/subscription-canceled.tmpl
+usr/share/cups/templates/pt_BR/test-page.tmpl
+usr/share/cups/templates/pt_BR/trailer.tmpl
+usr/share/cups/templates/pt_BR/users.tmpl
usr/share/cups/templates/restart.tmpl
usr/share/cups/templates/ru
usr/share/cups/templates/ru/add-class.tmpl
@@ -472,6 +539,7 @@ usr/share/cups/templates/ru/error.tmpl
usr/share/cups/templates/ru/header.tmpl
usr/share/cups/templates/ru/help-header.tmpl
usr/share/cups/templates/ru/help-printable.tmpl
+usr/share/cups/templates/ru/help-trailer.tmpl
usr/share/cups/templates/ru/job-cancel.tmpl
usr/share/cups/templates/ru/job-hold.tmpl
usr/share/cups/templates/ru/job-move.tmpl
@@ -539,19 +607,17 @@ usr/share/doc/cups/es
usr/share/doc/cups/es/index.html
usr/share/doc/cups/help
usr/share/doc/cups/help/accounting.html
+usr/share/doc/cups/help/api-admin.html
usr/share/doc/cups/help/api-array.html
-usr/share/doc/cups/help/api-cgi.html
usr/share/doc/cups/help/api-cups.html
-usr/share/doc/cups/help/api-driver.html
usr/share/doc/cups/help/api-filedir.html
usr/share/doc/cups/help/api-filter.html
usr/share/doc/cups/help/api-httpipp.html
-usr/share/doc/cups/help/api-mime.html
usr/share/doc/cups/help/api-overview.html
usr/share/doc/cups/help/api-ppd.html
-usr/share/doc/cups/help/api-ppdc.html
usr/share/doc/cups/help/api-raster.html
usr/share/doc/cups/help/cgi.html
+usr/share/doc/cups/help/encryption.html
usr/share/doc/cups/help/glossary.html
usr/share/doc/cups/help/kerberos.html
usr/share/doc/cups/help/license.html
@@ -607,7 +673,6 @@ usr/share/doc/cups/help/ref-ppdcfile.html
usr/share/doc/cups/help/security.html
usr/share/doc/cups/help/sharing.html
usr/share/doc/cups/help/spec-banner.html
-usr/share/doc/cups/help/spec-cmp.html
usr/share/doc/cups/help/spec-command.html
usr/share/doc/cups/help/spec-design.html
usr/share/doc/cups/help/spec-ipp.html
@@ -638,6 +703,8 @@ usr/share/doc/cups/images/wait.gif
usr/share/doc/cups/index.html
usr/share/doc/cups/ja
usr/share/doc/cups/ja/index.html
+usr/share/doc/cups/pt_BR
+usr/share/doc/cups/pt_BR/index.html
usr/share/doc/cups/robots.txt
usr/share/doc/cups/ru
usr/share/doc/cups/ru/index.html
@@ -648,12 +715,14 @@ usr/share/locale/es/cups_es.po
usr/share/locale/fr/cups_fr.po
usr/share/locale/it/cups_it.po
usr/share/locale/ja/cups_ja.po
+usr/share/locale/pt_BR/cups_pt_BR.po
usr/share/locale/ru/cups_ru.po
#usr/share/man/man1/cancel.1.gz
#usr/share/man/man1/cups-config.1.gz
#usr/share/man/man1/cups.1.gz
#usr/share/man/man1/cupstestdsc.1.gz
#usr/share/man/man1/cupstestppd.1.gz
+#usr/share/man/man1/ippfind.1.gz
#usr/share/man/man1/ipptool.1.gz
#usr/share/man/man1/lp.1.gz
#usr/share/man/man1/lpoptions.1.gz
@@ -706,11 +775,12 @@ var/cache/cups
var/cache/cups/rss
#var/ipfire/cups
var/ipfire/cups/cups-files.conf
+var/ipfire/cups/cups-files.conf.default
var/ipfire/cups/cupsd.conf
#var/ipfire/cups/cupsd.conf.default
-var/ipfire/cups/interfaces
var/ipfire/cups/ppd
var/ipfire/cups/snmp.conf
+var/ipfire/cups/snmp.conf.default
var/ipfire/cups/ssl
var/log/cups
var/spool/cups
diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters
new file mode 100644
index 0000000..85564ce
--- /dev/null
+++ b/config/rootfiles/packages/cups-filters
@@ -0,0 +1,144 @@
+etc/fonts/conf.d/99pdftoopvp.conf
+#etc/rc.d/init.d/cups-browsed
+#etc/rc0.d/K35cups-browsed
+#etc/rc2.d/K35cups-browsed
+#etc/rc2.d/S82cups-browsed
+#etc/rc3.d/K35cups-browsed
+#etc/rc3.d/S82cups-browsed
+#etc/rc5.d/K35cups-browsed
+#etc/rc5.d/S82cups-browsed
+usr/bin/driverless
+usr/bin/foomatic-rip
+usr/bin/ttfread
+#usr/include/cupsfilters
+#usr/include/cupsfilters/colord.h
+#usr/include/cupsfilters/colormanager.h
+#usr/include/cupsfilters/driver.h
+#usr/include/cupsfilters/image.h
+#usr/include/cupsfilters/ppdgenerator.h
+#usr/include/cupsfilters/raster.h
+#usr/include/fontembed
+#usr/include/fontembed/bitset.h
+#usr/include/fontembed/embed.h
+#usr/include/fontembed/fontfile.h
+#usr/include/fontembed/iofn.h
+#usr/include/fontembed/sfnt.h
+usr/lib/cups/backend/beh
+usr/lib/cups/backend/driverless
+usr/lib/cups/backend/implicitclass
+usr/lib/cups/backend/parallel
+usr/lib/cups/backend/serial
+usr/lib/cups/driver/driverless
+usr/lib/cups/filter/bannertopdf
+usr/lib/cups/filter/brftoembosser
+usr/lib/cups/filter/commandtoescpx
+usr/lib/cups/filter/commandtopclx
+usr/lib/cups/filter/foomatic-rip
+usr/lib/cups/filter/gstopdf
+usr/lib/cups/filter/gstopxl
+usr/lib/cups/filter/gstoraster
+usr/lib/cups/filter/imagetobrf
+usr/lib/cups/filter/imagetopdf
+usr/lib/cups/filter/imagetops
+usr/lib/cups/filter/imagetoraster
+usr/lib/cups/filter/imagetoubrl
+usr/lib/cups/filter/imageubrltoindexv3
+usr/lib/cups/filter/imageubrltoindexv4
+usr/lib/cups/filter/pdftoopvp
+usr/lib/cups/filter/pdftopdf
+usr/lib/cups/filter/pdftops
+usr/lib/cups/filter/pdftoraster
+usr/lib/cups/filter/rastertoescpx
+usr/lib/cups/filter/rastertopclx
+usr/lib/cups/filter/rastertopdf
+usr/lib/cups/filter/rastertops
+usr/lib/cups/filter/sys5ippprinter
+usr/lib/cups/filter/textbrftoindexv3
+usr/lib/cups/filter/textbrftoindexv4
+usr/lib/cups/filter/texttobrf
+usr/lib/cups/filter/texttopdf
+usr/lib/cups/filter/texttops
+usr/lib/cups/filter/texttotext
+#usr/lib/libcupsfilters.a
+#usr/lib/libcupsfilters.la
+#usr/lib/libcupsfilters.so
+usr/lib/libcupsfilters.so.1
+usr/lib/libcupsfilters.so.1.0.0
+#usr/lib/libfontembed.a
+#usr/lib/libfontembed.la
+#usr/lib/libfontembed.so
+usr/lib/libfontembed.so.1
+usr/lib/libfontembed.so.1.0.0
+#usr/lib/pkgconfig/libcupsfilters.pc
+#usr/lib/pkgconfig/libfontembed.pc
+#usr/sbin/cups-browsed
+usr/share/cups/banners/classified
+usr/share/cups/banners/confidential
+usr/share/cups/banners/form
+usr/share/cups/banners/secret
+usr/share/cups/banners/standard
+usr/share/cups/banners/topsecret
+usr/share/cups/banners/unclassified
+usr/share/cups/braille
+usr/share/cups/braille/cups-braille.sh
+usr/share/cups/braille/index.sh
+usr/share/cups/braille/indexv3.sh
+usr/share/cups/braille/indexv4.sh
+usr/share/cups/charsets
+usr/share/cups/charsets/pdf.utf-8
+usr/share/cups/charsets/pdf.utf-8.heavy
+usr/share/cups/charsets/pdf.utf-8.simple
+usr/share/cups/data/classified.pdf
+usr/share/cups/data/confidential.pdf
+usr/share/cups/data/default-testpage.pdf
+usr/share/cups/data/default.pdf
+usr/share/cups/data/form_english.pdf
+usr/share/cups/data/form_english_in.odt
+usr/share/cups/data/form_russian.pdf
+usr/share/cups/data/form_russian_in.odt
+usr/share/cups/data/secret.pdf
+usr/share/cups/data/standard.pdf
+usr/share/cups/data/testprint
+usr/share/cups/data/topsecret.pdf
+usr/share/cups/data/unclassified.pdf
+usr/share/cups/drv/cupsfilters.drv
+usr/share/cups/drv/generic-brf.drv
+usr/share/cups/drv/indexv3.drv
+usr/share/cups/drv/indexv4.drv
+usr/share/cups/mime/braille.convs
+usr/share/cups/mime/braille.types
+usr/share/cups/mime/cupsfilters-ghostscript.convs
+usr/share/cups/mime/cupsfilters-poppler.convs
+usr/share/cups/mime/cupsfilters.convs
+usr/share/cups/mime/cupsfilters.types
+usr/share/cups/ppdc/braille.defs
+usr/share/cups/ppdc/escp.h
+usr/share/cups/ppdc/fr-braille.po
+usr/share/cups/ppdc/imagemagick.defs
+usr/share/cups/ppdc/index.defs
+usr/share/cups/ppdc/liblouis.defs
+usr/share/cups/ppdc/liblouis1.defs
+usr/share/cups/ppdc/liblouis2.defs
+usr/share/cups/ppdc/liblouis3.defs
+usr/share/cups/ppdc/liblouis4.defs
+usr/share/cups/ppdc/media-braille.defs
+usr/share/cups/ppdc/pcl.h
+#usr/share/doc/cups-filters
+#usr/share/doc/cups-filters/AUTHORS
+#usr/share/doc/cups-filters/COPYING
+#usr/share/doc/cups-filters/INSTALL
+#usr/share/doc/cups-filters/NEWS
+#usr/share/doc/cups-filters/README
+#usr/share/man/man1/driverless.1
+#usr/share/man/man1/foomatic-rip.1
+#usr/share/man/man5/cups-browsed.conf.5
+#usr/share/man/man8/cups-browsed.8
+#usr/share/ppd
+usr/share/ppd/cupsfilters
+usr/share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd
+usr/share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd
+usr/share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
+usr/share/ppd/cupsfilters/Ricoh-PDF_Printer-PDF.ppd
+usr/share/ppd/cupsfilters/pxlcolor.ppd
+usr/share/ppd/cupsfilters/pxlmono.ppd
+#var/ipfire/cups/cups-browsed.conf
diff --git a/config/rootfiles/packages/epson-inkjet-printer-escpr b/config/rootfiles/packages/epson-inkjet-printer-escpr
new file mode 100644
index 0000000..0039203
--- /dev/null
+++ b/config/rootfiles/packages/epson-inkjet-printer-escpr
@@ -0,0 +1,515 @@
+usr/lib/cups/filter/epson-escpr
+usr/lib/cups/filter/epson-escpr-wrapper
+#usr/lib/libescpr.a
+#usr/lib/libescpr.la
+#usr/lib/libescpr.so
+usr/lib/libescpr.so.1
+usr/lib/libescpr.so.1.0.0
+usr/share/ppd/Epson
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_1430-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_630-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_710-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_720-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_730-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_810-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_830-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Artisan_837-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-150-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-330-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-330S-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-340-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-350-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-360_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-370_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-500-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-520-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-600-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-720-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-810-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-820-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-10VA_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-30VA_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-703A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-704A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-705A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-706A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-707A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-708A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-777A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-801A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-802A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-803A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-804A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-805A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-806A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-807A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-903A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-903F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-904A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-904F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-905A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-905F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-906F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-907F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-976A3_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-16500_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2500_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2550_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2600_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2650_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L1455_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L364_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L380_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L382_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L386_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L395_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L455_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L475_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L485_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L486_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L495_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L565_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L575_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L605_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L655_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L805_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L810_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M200_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M205_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-301_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-303_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-400_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_510-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_520-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_560W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_570-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_620F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_650FN-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_700FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_900WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_940FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_OFFICE_960FWD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME_Office_600F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-NX230_TX230-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-NX430_TX435-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PF-70_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PF-71_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PF-81_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-400_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A750-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A820-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A840-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A840S-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A890-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A920-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A940-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A950-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-A970-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-D600-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-D800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-D870-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-G4500-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-G850-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-T960-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PM-T990-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-046A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-047A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-048A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-049A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-1600F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-1700F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-205_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-404A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-405A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-434A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-435A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-436A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-437A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-501A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-502A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-503A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-504A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-505F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-535F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-5600-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-5V-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-601F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-602F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-603F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-605F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-673F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-675F_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-7V-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-A620-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-A640-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-A650-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-A720-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-A740-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-B700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-B750F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-FA700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-G5300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M160T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M350F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M5040F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M5041F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M650A-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M650F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M7050FP-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M7050FX-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M7050_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M740F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M741F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M840F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M860F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S160T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050PS-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050X-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S740-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S840-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S840X-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S860-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_500-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_Deluxe-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_Express-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_210-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_215-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_225-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_235-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_240-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_245-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_250-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_260-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_270-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_280-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_290-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_310-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2900-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX3700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX3800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX3900-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX4200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX4800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX4900-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX5000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX5900-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX6000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX7300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX7400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX7700-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX7800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX8300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX8400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX9300F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX9400Fax-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX3800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX4000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX4200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX4800-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX5000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX7400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX8400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_DX9400F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX210-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX230-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX330-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX410-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX420-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX430-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX510-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX620-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_NX635-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX300F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX305-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX305_Plus-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX310FN-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX320FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX525WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX535WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX600FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX610FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX620FWD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX630FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX635FWD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX925-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_BX935-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX300F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX320F-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX510FN-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX515FN-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX525FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX600FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX610FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Office_TX620FWD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_1400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_1410-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_1430-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_1500-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX650-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX660-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX700W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX710W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX720WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX730-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX800FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX810FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX820FWD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_PX830-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R1900-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R2000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R240-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R250-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R260-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R265-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R270-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R2880-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R3000-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R340-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R350-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R360-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R380-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_R390-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX520-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX560-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX580-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX585-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX590-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX595-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX610-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX640-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX650-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX680-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX685-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_RX690-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX650-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX700W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX710W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX720WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX730-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX800FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_Photo_TX810FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX210-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX218-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX230-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX235-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX410-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX420W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX430-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX440-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX510W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX525WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX535WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX600FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX610FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_SX620FW-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX200-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX210-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX220-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX230-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX235-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX400-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX410-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX420W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX430-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX550W-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_TX560WD-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX220_NX220-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX320_WorkForce320-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX420_NX420-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX720_Artisan720-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX820_Artisan830-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-100_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2510_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2520_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2530_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2540_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2630_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2650_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3520_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3530_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3540_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3620_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3640_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-4630_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-4640_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5110_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5190_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5620_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5690_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6090_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6590_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7110_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7510_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7511_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7515_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7520_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7521_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7525_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7610_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7620_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-8010_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-8090_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-8510_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-8590_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-M1560_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-M5190_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-M5690_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-R4640_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-R5190_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-R5690_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-R8590_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4010_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4011_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4015_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4020_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4022_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4023_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4025_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4090_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4091_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4092_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4095_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4511_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4515_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4520_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4521_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4525_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4530_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4531_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4532_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4533_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4535_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4540_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4545_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4590_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4592_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-4595_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4011_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4015_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4095_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4521_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4525_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WP-M4595_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_310-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_320-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_435-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_500-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_520-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_545-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_600-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_610-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_620-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_630-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_645-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_840-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WorkForce_845-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-200_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-201_204_208_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-202_203_206_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-205_207_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-211_214_216_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-212_213_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-215_217_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-220_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-225_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-235_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-240_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-243_245_247_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-312_313_315_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-322_323_325_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-330_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-332_335_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-340_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-342_343_345_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-400_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-402_403_405_406_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-410_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-412_413_415_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-420_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-422_423_425_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-430_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-432_435_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-440_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-442_445_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-510_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-530_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-55_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-600_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-610_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-620_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-630_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-700_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-710_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-720_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-750_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-760_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-800_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-810_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-820_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-830_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-860_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-900_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-950_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-960_Series-epson-escpr-en.ppd
diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
index d403ca1..7fc5e14 100644
--- a/config/rootfiles/packages/ffmpeg
+++ b/config/rootfiles/packages/ffmpeg
@@ -1,64 +1,237 @@
usr/bin/ffmpeg
-usr/bin/ffplay
+usr/bin/ffprobe
usr/bin/ffserver
#usr/include/libavcodec
#usr/include/libavcodec/avcodec.h
-#usr/include/libavcodec/opt.h
+#usr/include/libavcodec/avdct.h
+#usr/include/libavcodec/avfft.h
+#usr/include/libavcodec/d3d11va.h
+#usr/include/libavcodec/dirac.h
+#usr/include/libavcodec/dv_profile.h
+#usr/include/libavcodec/dxva2.h
+#usr/include/libavcodec/jni.h
+#usr/include/libavcodec/mediacodec.h
+#usr/include/libavcodec/qsv.h
+#usr/include/libavcodec/vaapi.h
+#usr/include/libavcodec/vda.h
+#usr/include/libavcodec/vdpau.h
+#usr/include/libavcodec/version.h
+#usr/include/libavcodec/videotoolbox.h
+#usr/include/libavcodec/vorbis_parser.h
+#usr/include/libavcodec/xvmc.h
#usr/include/libavdevice
#usr/include/libavdevice/avdevice.h
+#usr/include/libavdevice/version.h
+#usr/include/libavfilter
+#usr/include/libavfilter/avfilter.h
+#usr/include/libavfilter/avfiltergraph.h
+#usr/include/libavfilter/buffersink.h
+#usr/include/libavfilter/buffersrc.h
+#usr/include/libavfilter/version.h
#usr/include/libavformat
#usr/include/libavformat/avformat.h
#usr/include/libavformat/avio.h
-#usr/include/libavformat/rtsp.h
-#usr/include/libavformat/rtspcodes.h
+#usr/include/libavformat/version.h
#usr/include/libavutil
#usr/include/libavutil/adler32.h
+#usr/include/libavutil/aes.h
+#usr/include/libavutil/aes_ctr.h
+#usr/include/libavutil/attributes.h
+#usr/include/libavutil/audio_fifo.h
+#usr/include/libavutil/avassert.h
+#usr/include/libavutil/avconfig.h
#usr/include/libavutil/avstring.h
#usr/include/libavutil/avutil.h
#usr/include/libavutil/base64.h
+#usr/include/libavutil/blowfish.h
+#usr/include/libavutil/bprint.h
+#usr/include/libavutil/bswap.h
+#usr/include/libavutil/buffer.h
+#usr/include/libavutil/camellia.h
+#usr/include/libavutil/cast5.h
+#usr/include/libavutil/channel_layout.h
#usr/include/libavutil/common.h
+#usr/include/libavutil/cpu.h
#usr/include/libavutil/crc.h
+#usr/include/libavutil/des.h
+#usr/include/libavutil/dict.h
+#usr/include/libavutil/display.h
+#usr/include/libavutil/downmix_info.h
+#usr/include/libavutil/error.h
+#usr/include/libavutil/eval.h
+#usr/include/libavutil/ffversion.h
#usr/include/libavutil/fifo.h
-#usr/include/libavutil/intfloat_readwrite.h
+#usr/include/libavutil/file.h
+#usr/include/libavutil/frame.h
+#usr/include/libavutil/hash.h
+#usr/include/libavutil/hmac.h
+#usr/include/libavutil/hwcontext.h
+#usr/include/libavutil/hwcontext_cuda.h
+#usr/include/libavutil/hwcontext_dxva2.h
+#usr/include/libavutil/hwcontext_qsv.h
+#usr/include/libavutil/hwcontext_vaapi.h
+#usr/include/libavutil/hwcontext_vdpau.h
+#usr/include/libavutil/imgutils.h
+#usr/include/libavutil/intfloat.h
+#usr/include/libavutil/intreadwrite.h
+#usr/include/libavutil/lfg.h
#usr/include/libavutil/log.h
#usr/include/libavutil/lzo.h
+#usr/include/libavutil/macros.h
+#usr/include/libavutil/mastering_display_metadata.h
#usr/include/libavutil/mathematics.h
#usr/include/libavutil/md5.h
#usr/include/libavutil/mem.h
-#usr/include/libavutil/random.h
+#usr/include/libavutil/motion_vector.h
+#usr/include/libavutil/murmur3.h
+#usr/include/libavutil/opt.h
+#usr/include/libavutil/parseutils.h
+#usr/include/libavutil/pixdesc.h
+#usr/include/libavutil/pixelutils.h
+#usr/include/libavutil/pixfmt.h
+#usr/include/libavutil/random_seed.h
#usr/include/libavutil/rational.h
-#usr/include/libavutil/sha1.h
+#usr/include/libavutil/rc4.h
+#usr/include/libavutil/replaygain.h
+#usr/include/libavutil/ripemd.h
+#usr/include/libavutil/samplefmt.h
+#usr/include/libavutil/sha.h
+#usr/include/libavutil/sha512.h
+#usr/include/libavutil/stereo3d.h
+#usr/include/libavutil/tea.h
+#usr/include/libavutil/threadmessage.h
+#usr/include/libavutil/time.h
+#usr/include/libavutil/timecode.h
+#usr/include/libavutil/timestamp.h
+#usr/include/libavutil/tree.h
+#usr/include/libavutil/twofish.h
+#usr/include/libavutil/version.h
+#usr/include/libavutil/xtea.h
+#usr/include/libpostproc
+#usr/include/libpostproc/postprocess.h
+#usr/include/libpostproc/version.h
+#usr/include/libswresample
+#usr/include/libswresample/swresample.h
+#usr/include/libswresample/version.h
+#usr/include/libswscale
+#usr/include/libswscale/swscale.h
+#usr/include/libswscale/version.h
#usr/lib/libavcodec.a
#usr/lib/libavcodec.so
-#usr/lib/libavcodec.so.51
-#usr/lib/libavcodec.so.51.54.0
+#usr/lib/libavcodec.so.57
+#usr/lib/libavcodec.so.57.64.101
#usr/lib/libavdevice.a
#usr/lib/libavdevice.so
-#usr/lib/libavdevice.so.52
-#usr/lib/libavdevice.so.52.0.0
+#usr/lib/libavdevice.so.57
+#usr/lib/libavdevice.so.57.1.100
+#usr/lib/libavfilter.a
+#usr/lib/libavfilter.so
+#usr/lib/libavfilter.so.6
+#usr/lib/libavfilter.so.6.65.100
#usr/lib/libavformat.a
#usr/lib/libavformat.so
-#usr/lib/libavformat.so.52
-#usr/lib/libavformat.so.52.13.0
+#usr/lib/libavformat.so.57
+#usr/lib/libavformat.so.57.56.101
#usr/lib/libavutil.a
#usr/lib/libavutil.so
-#usr/lib/libavutil.so.49
-#usr/lib/libavutil.so.49.6.0
-#usr/lib/pkgconfig
+#usr/lib/libavutil.so.55
+#usr/lib/libavutil.so.55.34.101
+#usr/lib/libpostproc.a
+#usr/lib/libpostproc.so
+#usr/lib/libpostproc.so.54
+#usr/lib/libpostproc.so.54.1.100
+#usr/lib/libswresample.a
+#usr/lib/libswresample.so
+#usr/lib/libswresample.so.2
+#usr/lib/libswresample.so.2.3.100
+#usr/lib/libswscale.a
+#usr/lib/libswscale.so
+#usr/lib/libswscale.so.4
+#usr/lib/libswscale.so.4.2.100
#usr/lib/pkgconfig/libavcodec.pc
#usr/lib/pkgconfig/libavdevice.pc
+#usr/lib/pkgconfig/libavfilter.pc
#usr/lib/pkgconfig/libavformat.pc
#usr/lib/pkgconfig/libavutil.pc
-#usr/lib/vhook
-#usr/lib/vhook/drawtext.so
-#usr/lib/vhook/fish.so
-#usr/lib/vhook/null.so
-#usr/lib/vhook/ppm.so
-#usr/lib/vhook/watermark.so
-#usr/include/libpostproc
-#usr/include/libpostproc/postprocess.h
-#usr/lib/libpostproc.a
-#usr/lib/libpostproc.so
-#usr/lib/libpostproc.so.51
-#usr/lib/libpostproc.so.51.1.0
#usr/lib/pkgconfig/libpostproc.pc
+#usr/lib/pkgconfig/libswresample.pc
+#usr/lib/pkgconfig/libswscale.pc
+#usr/share/doc/ffmpeg
+#usr/share/doc/ffmpeg/developer.html
+#usr/share/doc/ffmpeg/faq.html
+#usr/share/doc/ffmpeg/fate.html
+#usr/share/doc/ffmpeg/ffmpeg-all.html
+#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html
+#usr/share/doc/ffmpeg/ffmpeg-codecs.html
+#usr/share/doc/ffmpeg/ffmpeg-devices.html
+#usr/share/doc/ffmpeg/ffmpeg-filters.html
+#usr/share/doc/ffmpeg/ffmpeg-formats.html
+#usr/share/doc/ffmpeg/ffmpeg-protocols.html
+#usr/share/doc/ffmpeg/ffmpeg-resampler.html
+#usr/share/doc/ffmpeg/ffmpeg-scaler.html
+#usr/share/doc/ffmpeg/ffmpeg-utils.html
+#usr/share/doc/ffmpeg/ffmpeg.html
+#usr/share/doc/ffmpeg/ffprobe-all.html
+#usr/share/doc/ffmpeg/ffprobe.html
+#usr/share/doc/ffmpeg/ffserver-all.html
+#usr/share/doc/ffmpeg/ffserver.html
+#usr/share/doc/ffmpeg/general.html
+#usr/share/doc/ffmpeg/git-howto.html
+#usr/share/doc/ffmpeg/libavcodec.html
+#usr/share/doc/ffmpeg/libavdevice.html
+#usr/share/doc/ffmpeg/libavfilter.html
+#usr/share/doc/ffmpeg/libavformat.html
+#usr/share/doc/ffmpeg/libavutil.html
+#usr/share/doc/ffmpeg/libswresample.html
+#usr/share/doc/ffmpeg/libswscale.html
+#usr/share/doc/ffmpeg/nut.html
+#usr/share/doc/ffmpeg/platform.html
+#usr/share/ffmpeg
+#usr/share/ffmpeg/examples
+#usr/share/ffmpeg/examples/Makefile
+#usr/share/ffmpeg/examples/README
+#usr/share/ffmpeg/examples/avio_dir_cmd.c
+#usr/share/ffmpeg/examples/avio_reading.c
+#usr/share/ffmpeg/examples/decoding_encoding.c
+#usr/share/ffmpeg/examples/demuxing_decoding.c
+#usr/share/ffmpeg/examples/extract_mvs.c
+#usr/share/ffmpeg/examples/filter_audio.c
+#usr/share/ffmpeg/examples/filtering_audio.c
+#usr/share/ffmpeg/examples/filtering_video.c
+#usr/share/ffmpeg/examples/http_multiclient.c
+#usr/share/ffmpeg/examples/metadata.c
+#usr/share/ffmpeg/examples/muxing.c
+#usr/share/ffmpeg/examples/qsvdec.c
+#usr/share/ffmpeg/examples/remuxing.c
+#usr/share/ffmpeg/examples/resampling_audio.c
+#usr/share/ffmpeg/examples/scaling_video.c
+#usr/share/ffmpeg/examples/transcode_aac.c
+#usr/share/ffmpeg/examples/transcoding.c
+#usr/share/ffmpeg/ffprobe.xsd
+#usr/share/ffmpeg/libvpx-1080p.ffpreset
+#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset
+#usr/share/ffmpeg/libvpx-360p.ffpreset
+#usr/share/ffmpeg/libvpx-720p.ffpreset
+#usr/share/ffmpeg/libvpx-720p50_60.ffpreset
+#usr/share/man/man1/ffmpeg-all.1
+#usr/share/man/man1/ffmpeg-bitstream-filters.1
+#usr/share/man/man1/ffmpeg-codecs.1
+#usr/share/man/man1/ffmpeg-devices.1
+#usr/share/man/man1/ffmpeg-filters.1
+#usr/share/man/man1/ffmpeg-formats.1
+#usr/share/man/man1/ffmpeg-protocols.1
+#usr/share/man/man1/ffmpeg-resampler.1
+#usr/share/man/man1/ffmpeg-scaler.1
+#usr/share/man/man1/ffmpeg-utils.1
+#usr/share/man/man1/ffmpeg.1
+#usr/share/man/man1/ffprobe-all.1
+#usr/share/man/man1/ffprobe.1
+#usr/share/man/man1/ffserver-all.1
+#usr/share/man/man1/ffserver.1
+#usr/share/man/man3/libavcodec.3
+#usr/share/man/man3/libavdevice.3
+#usr/share/man/man3/libavfilter.3
+#usr/share/man/man3/libavformat.3
+#usr/share/man/man3/libavutil.3
+#usr/share/man/man3/libswresample.3
+#usr/share/man/man3/libswscale.3
diff --git a/config/rootfiles/packages/ffmpeg-libs b/config/rootfiles/packages/ffmpeg-libs
index a58dcd5..7a512f9 100644
--- a/config/rootfiles/packages/ffmpeg-libs
+++ b/config/rootfiles/packages/ffmpeg-libs
@@ -1,64 +1,237 @@
#usr/bin/ffmpeg
-#usr/bin/ffplay
+#usr/bin/ffprobe
#usr/bin/ffserver
#usr/include/libavcodec
#usr/include/libavcodec/avcodec.h
-#usr/include/libavcodec/opt.h
+#usr/include/libavcodec/avdct.h
+#usr/include/libavcodec/avfft.h
+#usr/include/libavcodec/d3d11va.h
+#usr/include/libavcodec/dirac.h
+#usr/include/libavcodec/dv_profile.h
+#usr/include/libavcodec/dxva2.h
+#usr/include/libavcodec/jni.h
+#usr/include/libavcodec/mediacodec.h
+#usr/include/libavcodec/qsv.h
+#usr/include/libavcodec/vaapi.h
+#usr/include/libavcodec/vda.h
+#usr/include/libavcodec/vdpau.h
+#usr/include/libavcodec/version.h
+#usr/include/libavcodec/videotoolbox.h
+#usr/include/libavcodec/vorbis_parser.h
+#usr/include/libavcodec/xvmc.h
#usr/include/libavdevice
#usr/include/libavdevice/avdevice.h
+#usr/include/libavdevice/version.h
+#usr/include/libavfilter
+#usr/include/libavfilter/avfilter.h
+#usr/include/libavfilter/avfiltergraph.h
+#usr/include/libavfilter/buffersink.h
+#usr/include/libavfilter/buffersrc.h
+#usr/include/libavfilter/version.h
#usr/include/libavformat
#usr/include/libavformat/avformat.h
#usr/include/libavformat/avio.h
-#usr/include/libavformat/rtsp.h
-#usr/include/libavformat/rtspcodes.h
+#usr/include/libavformat/version.h
#usr/include/libavutil
#usr/include/libavutil/adler32.h
+#usr/include/libavutil/aes.h
+#usr/include/libavutil/aes_ctr.h
+#usr/include/libavutil/attributes.h
+#usr/include/libavutil/audio_fifo.h
+#usr/include/libavutil/avassert.h
+#usr/include/libavutil/avconfig.h
#usr/include/libavutil/avstring.h
#usr/include/libavutil/avutil.h
#usr/include/libavutil/base64.h
+#usr/include/libavutil/blowfish.h
+#usr/include/libavutil/bprint.h
+#usr/include/libavutil/bswap.h
+#usr/include/libavutil/buffer.h
+#usr/include/libavutil/camellia.h
+#usr/include/libavutil/cast5.h
+#usr/include/libavutil/channel_layout.h
#usr/include/libavutil/common.h
+#usr/include/libavutil/cpu.h
#usr/include/libavutil/crc.h
+#usr/include/libavutil/des.h
+#usr/include/libavutil/dict.h
+#usr/include/libavutil/display.h
+#usr/include/libavutil/downmix_info.h
+#usr/include/libavutil/error.h
+#usr/include/libavutil/eval.h
+#usr/include/libavutil/ffversion.h
#usr/include/libavutil/fifo.h
-#usr/include/libavutil/intfloat_readwrite.h
+#usr/include/libavutil/file.h
+#usr/include/libavutil/frame.h
+#usr/include/libavutil/hash.h
+#usr/include/libavutil/hmac.h
+#usr/include/libavutil/hwcontext.h
+#usr/include/libavutil/hwcontext_cuda.h
+#usr/include/libavutil/hwcontext_dxva2.h
+#usr/include/libavutil/hwcontext_qsv.h
+#usr/include/libavutil/hwcontext_vaapi.h
+#usr/include/libavutil/hwcontext_vdpau.h
+#usr/include/libavutil/imgutils.h
+#usr/include/libavutil/intfloat.h
+#usr/include/libavutil/intreadwrite.h
+#usr/include/libavutil/lfg.h
#usr/include/libavutil/log.h
#usr/include/libavutil/lzo.h
+#usr/include/libavutil/macros.h
+#usr/include/libavutil/mastering_display_metadata.h
#usr/include/libavutil/mathematics.h
#usr/include/libavutil/md5.h
#usr/include/libavutil/mem.h
-#usr/include/libavutil/random.h
+#usr/include/libavutil/motion_vector.h
+#usr/include/libavutil/murmur3.h
+#usr/include/libavutil/opt.h
+#usr/include/libavutil/parseutils.h
+#usr/include/libavutil/pixdesc.h
+#usr/include/libavutil/pixelutils.h
+#usr/include/libavutil/pixfmt.h
+#usr/include/libavutil/random_seed.h
#usr/include/libavutil/rational.h
-#usr/include/libavutil/sha1.h
+#usr/include/libavutil/rc4.h
+#usr/include/libavutil/replaygain.h
+#usr/include/libavutil/ripemd.h
+#usr/include/libavutil/samplefmt.h
+#usr/include/libavutil/sha.h
+#usr/include/libavutil/sha512.h
+#usr/include/libavutil/stereo3d.h
+#usr/include/libavutil/tea.h
+#usr/include/libavutil/threadmessage.h
+#usr/include/libavutil/time.h
+#usr/include/libavutil/timecode.h
+#usr/include/libavutil/timestamp.h
+#usr/include/libavutil/tree.h
+#usr/include/libavutil/twofish.h
+#usr/include/libavutil/version.h
+#usr/include/libavutil/xtea.h
+#usr/include/libpostproc
+#usr/include/libpostproc/postprocess.h
+#usr/include/libpostproc/version.h
+#usr/include/libswresample
+#usr/include/libswresample/swresample.h
+#usr/include/libswresample/version.h
+#usr/include/libswscale
+#usr/include/libswscale/swscale.h
+#usr/include/libswscale/version.h
#usr/lib/libavcodec.a
-usr/lib/libavcodec.so
-usr/lib/libavcodec.so.51
-usr/lib/libavcodec.so.51.54.0
+#usr/lib/libavcodec.so
+usr/lib/libavcodec.so.57
+usr/lib/libavcodec.so.57.64.101
#usr/lib/libavdevice.a
-usr/lib/libavdevice.so
-usr/lib/libavdevice.so.52
-usr/lib/libavdevice.so.52.0.0
+#usr/lib/libavdevice.so
+usr/lib/libavdevice.so.57
+usr/lib/libavdevice.so.57.1.100
+#usr/lib/libavfilter.a
+#usr/lib/libavfilter.so
+usr/lib/libavfilter.so.6
+usr/lib/libavfilter.so.6.65.100
#usr/lib/libavformat.a
-usr/lib/libavformat.so
-usr/lib/libavformat.so.52
-usr/lib/libavformat.so.52.13.0
+#usr/lib/libavformat.so
+usr/lib/libavformat.so.57
+usr/lib/libavformat.so.57.56.101
#usr/lib/libavutil.a
-usr/lib/libavutil.so
-usr/lib/libavutil.so.49
-usr/lib/libavutil.so.49.6.0
-#usr/lib/pkgconfig
-usr/lib/pkgconfig/libavcodec.pc
-usr/lib/pkgconfig/libavdevice.pc
-usr/lib/pkgconfig/libavformat.pc
-usr/lib/pkgconfig/libavutil.pc
-#usr/lib/vhook
-usr/lib/vhook/drawtext.so
-usr/lib/vhook/fish.so
-usr/lib/vhook/null.so
-usr/lib/vhook/ppm.so
-usr/lib/vhook/watermark.so
-#usr/include/libpostproc
-#usr/include/libpostproc/postprocess.h
+#usr/lib/libavutil.so
+usr/lib/libavutil.so.55
+usr/lib/libavutil.so.55.34.101
#usr/lib/libpostproc.a
-usr/lib/libpostproc.so
-usr/lib/libpostproc.so.51
-usr/lib/libpostproc.so.51.1.0
-usr/lib/pkgconfig/libpostproc.pc
+#usr/lib/libpostproc.so
+usr/lib/libpostproc.so.54
+usr/lib/libpostproc.so.54.1.100
+#usr/lib/libswresample.a
+#usr/lib/libswresample.so
+usr/lib/libswresample.so.2
+usr/lib/libswresample.so.2.3.100
+#usr/lib/libswscale.a
+#usr/lib/libswscale.so
+usr/lib/libswscale.so.4
+usr/lib/libswscale.so.4.2.100
+#usr/lib/pkgconfig/libavcodec.pc
+#usr/lib/pkgconfig/libavdevice.pc
+#usr/lib/pkgconfig/libavfilter.pc
+#usr/lib/pkgconfig/libavformat.pc
+#usr/lib/pkgconfig/libavutil.pc
+#usr/lib/pkgconfig/libpostproc.pc
+#usr/lib/pkgconfig/libswresample.pc
+#usr/lib/pkgconfig/libswscale.pc
+#usr/share/doc/ffmpeg
+#usr/share/doc/ffmpeg/developer.html
+#usr/share/doc/ffmpeg/faq.html
+#usr/share/doc/ffmpeg/fate.html
+#usr/share/doc/ffmpeg/ffmpeg-all.html
+#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html
+#usr/share/doc/ffmpeg/ffmpeg-codecs.html
+#usr/share/doc/ffmpeg/ffmpeg-devices.html
+#usr/share/doc/ffmpeg/ffmpeg-filters.html
+#usr/share/doc/ffmpeg/ffmpeg-formats.html
+#usr/share/doc/ffmpeg/ffmpeg-protocols.html
+#usr/share/doc/ffmpeg/ffmpeg-resampler.html
+#usr/share/doc/ffmpeg/ffmpeg-scaler.html
+#usr/share/doc/ffmpeg/ffmpeg-utils.html
+#usr/share/doc/ffmpeg/ffmpeg.html
+#usr/share/doc/ffmpeg/ffprobe-all.html
+#usr/share/doc/ffmpeg/ffprobe.html
+#usr/share/doc/ffmpeg/ffserver-all.html
+#usr/share/doc/ffmpeg/ffserver.html
+#usr/share/doc/ffmpeg/general.html
+#usr/share/doc/ffmpeg/git-howto.html
+#usr/share/doc/ffmpeg/libavcodec.html
+#usr/share/doc/ffmpeg/libavdevice.html
+#usr/share/doc/ffmpeg/libavfilter.html
+#usr/share/doc/ffmpeg/libavformat.html
+#usr/share/doc/ffmpeg/libavutil.html
+#usr/share/doc/ffmpeg/libswresample.html
+#usr/share/doc/ffmpeg/libswscale.html
+#usr/share/doc/ffmpeg/nut.html
+#usr/share/doc/ffmpeg/platform.html
+#usr/share/ffmpeg
+#usr/share/ffmpeg/examples
+#usr/share/ffmpeg/examples/Makefile
+#usr/share/ffmpeg/examples/README
+#usr/share/ffmpeg/examples/avio_dir_cmd.c
+#usr/share/ffmpeg/examples/avio_reading.c
+#usr/share/ffmpeg/examples/decoding_encoding.c
+#usr/share/ffmpeg/examples/demuxing_decoding.c
+#usr/share/ffmpeg/examples/extract_mvs.c
+#usr/share/ffmpeg/examples/filter_audio.c
+#usr/share/ffmpeg/examples/filtering_audio.c
+#usr/share/ffmpeg/examples/filtering_video.c
+#usr/share/ffmpeg/examples/http_multiclient.c
+#usr/share/ffmpeg/examples/metadata.c
+#usr/share/ffmpeg/examples/muxing.c
+#usr/share/ffmpeg/examples/qsvdec.c
+#usr/share/ffmpeg/examples/remuxing.c
+#usr/share/ffmpeg/examples/resampling_audio.c
+#usr/share/ffmpeg/examples/scaling_video.c
+#usr/share/ffmpeg/examples/transcode_aac.c
+#usr/share/ffmpeg/examples/transcoding.c
+#usr/share/ffmpeg/ffprobe.xsd
+#usr/share/ffmpeg/libvpx-1080p.ffpreset
+#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset
+#usr/share/ffmpeg/libvpx-360p.ffpreset
+#usr/share/ffmpeg/libvpx-720p.ffpreset
+#usr/share/ffmpeg/libvpx-720p50_60.ffpreset
+#usr/share/man/man1/ffmpeg-all.1
+#usr/share/man/man1/ffmpeg-bitstream-filters.1
+#usr/share/man/man1/ffmpeg-codecs.1
+#usr/share/man/man1/ffmpeg-devices.1
+#usr/share/man/man1/ffmpeg-filters.1
+#usr/share/man/man1/ffmpeg-formats.1
+#usr/share/man/man1/ffmpeg-protocols.1
+#usr/share/man/man1/ffmpeg-resampler.1
+#usr/share/man/man1/ffmpeg-scaler.1
+#usr/share/man/man1/ffmpeg-utils.1
+#usr/share/man/man1/ffmpeg.1
+#usr/share/man/man1/ffprobe-all.1
+#usr/share/man/man1/ffprobe.1
+#usr/share/man/man1/ffserver-all.1
+#usr/share/man/man1/ffserver.1
+#usr/share/man/man3/libavcodec.3
+#usr/share/man/man3/libavdevice.3
+#usr/share/man/man3/libavfilter.3
+#usr/share/man/man3/libavformat.3
+#usr/share/man/man3/libavutil.3
+#usr/share/man/man3/libswresample.3
+#usr/share/man/man3/libswscale.3
diff --git a/config/rootfiles/packages/ghostscript b/config/rootfiles/packages/ghostscript
index a94877c..c15ec1a 100644
--- a/config/rootfiles/packages/ghostscript
+++ b/config/rootfiles/packages/ghostscript
@@ -1,7 +1,5 @@
-usr/bin/bdftops
usr/bin/dvipdf
usr/bin/eps2eps
-usr/bin/fixmswrd.pl
usr/bin/font2c
usr/bin/gs
usr/bin/gsbj
@@ -13,9 +11,9 @@ usr/bin/gsnd
usr/bin/lprsetup.sh
usr/bin/pdf2dsc
usr/bin/pdf2ps
-usr/bin/pdfopt
usr/bin/pf2afm
usr/bin/pfbtopfa
+usr/bin/pphs
usr/bin/printafm
usr/bin/ps2ascii
usr/bin/ps2epsi
@@ -25,512 +23,272 @@ usr/bin/ps2pdf13
usr/bin/ps2pdf14
usr/bin/ps2pdfwr
usr/bin/ps2ps
-usr/bin/pv.sh
+usr/bin/ps2ps2
usr/bin/unix-lpr.sh
usr/bin/wftopfa
-usr/lib/cups/filter/pstopxl
-usr/lib/cups/filter/pstoraster
-#usr/man/de
-#usr/man/de/man1
-#usr/man/de/man1/dvipdf.1
-#usr/man/de/man1/eps2eps.1
-#usr/man/de/man1/font2c.1
-#usr/man/de/man1/gsbj.1
-#usr/man/de/man1/gsdj.1
-#usr/man/de/man1/gsdj500.1
-#usr/man/de/man1/gslj.1
-#usr/man/de/man1/gsnd.1
-#usr/man/de/man1/pdf2dsc.1
-#usr/man/de/man1/pdf2ps.1
-#usr/man/de/man1/pdfopt.1
-#usr/man/de/man1/printafm.1
-#usr/man/de/man1/ps2ascii.1
-#usr/man/de/man1/ps2pdf.1
-#usr/man/de/man1/ps2pdf12.1
-#usr/man/de/man1/ps2pdf13.1
-#usr/man/de/man1/ps2ps.1
-#usr/man/de/man1/wftopfa.1
-#usr/man/man1/dvipdf.1
-#usr/man/man1/eps2eps.1
-#usr/man/man1/font2c.1
-#usr/man/man1/gs.1
-#usr/man/man1/gsbj.1
-#usr/man/man1/gsdj.1
-#usr/man/man1/gsdj500.1
-#usr/man/man1/gslj.1
-#usr/man/man1/gslp.1
-#usr/man/man1/gsnd.1
-#usr/man/man1/pdf2dsc.1
-#usr/man/man1/pdf2ps.1
-#usr/man/man1/pdfopt.1
-#usr/man/man1/pf2afm.1
-#usr/man/man1/pfbtopfa.1
-#usr/man/man1/printafm.1
-#usr/man/man1/ps2ascii.1
-#usr/man/man1/ps2epsi.1
-#usr/man/man1/ps2pdf.1
-#usr/man/man1/ps2pdf12.1
-#usr/man/man1/ps2pdf13.1
-#usr/man/man1/ps2pdfwr.1
-#usr/man/man1/ps2ps.1
-#usr/man/man1/wftopfa.1
-usr/share/cups/model/pxlcolor.ppd
-usr/share/cups/model/pxlmono.ppd
#usr/share/ghostscript
-#usr/share/ghostscript/8.15
-#usr/share/ghostscript/8.15/Resource
-#usr/share/ghostscript/8.15/Resource/CMap
-usr/share/ghostscript/8.15/Resource/CMap/78-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/78-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/78-H
-usr/share/ghostscript/8.15/Resource/CMap/78-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/78-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/78-V
-usr/share/ghostscript/8.15/Resource/CMap/78ms-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/78ms-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/83pv-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/90ms-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/90ms-RKSJ-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/90ms-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/90msp-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/90msp-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/90pv-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/90pv-RKSJ-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/90pv-RKSJ-UCS2C
-usr/share/ghostscript/8.15/Resource/CMap/90pv-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/Add-H
-usr/share/ghostscript/8.15/Resource/CMap/Add-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/Add-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/Add-V
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-CNS1-B5pc
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-CNS1-H-CID
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-CNS1-H-Host
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-CNS1-H-Mac
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-GB1-GBK-EUC
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-GB1-GBpc-EUC
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-GB1-H-CID
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-GB1-H-Host
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-GB1-H-Mac
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-0
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-1
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-2
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-90ms-RKSJ
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-90pv-RKSJ
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-H-CID
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-H-Host
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-H-Mac
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-PS-H
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-PS-V
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Japan1-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Korea1-H-CID
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Korea1-H-Host
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Korea1-KSCms-UHC
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Korea1-KSCpc-EUC
-usr/share/ghostscript/8.15/Resource/CMap/Adobe-Korea1-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/B5pc-H
-usr/share/ghostscript/8.15/Resource/CMap/B5pc-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/B5pc-UCS2C
-usr/share/ghostscript/8.15/Resource/CMap/B5pc-V
-usr/share/ghostscript/8.15/Resource/CMap/CNS-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/CNS-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/ETHK-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/ETHK-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/ETen-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/ETen-B5-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/ETen-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/ETenms-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/ETenms-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/Ext-H
-usr/share/ghostscript/8.15/Resource/CMap/Ext-RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/Ext-RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/Ext-V
-usr/share/ghostscript/8.15/Resource/CMap/GB-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/GB-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/GBK-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/GBK-EUC-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/GBK-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/GBK2K-H
-usr/share/ghostscript/8.15/Resource/CMap/GBK2K-V
-usr/share/ghostscript/8.15/Resource/CMap/GBKp-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/GBKp-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/GBT-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/GBT-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/GBpc-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/GBpc-EUC-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/GBpc-EUC-UCS2C
-usr/share/ghostscript/8.15/Resource/CMap/GBpc-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/H
-usr/share/ghostscript/8.15/Resource/CMap/HKdla-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKdla-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/HKdlb-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKdlb-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/HKgccs-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKgccs-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/HKm314-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKm314-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/HKm471-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKm471-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/HKscs-B5-H
-usr/share/ghostscript/8.15/Resource/CMap/HKscs-B5-V
-usr/share/ghostscript/8.15/Resource/CMap/Hankaku
-usr/share/ghostscript/8.15/Resource/CMap/Hiragana
-usr/share/ghostscript/8.15/Resource/CMap/Identity-H
-usr/share/ghostscript/8.15/Resource/CMap/Identity-V
-usr/share/ghostscript/8.15/Resource/CMap/KSC-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/KSC-EUC-V
-usr/share/ghostscript/8.15/Resource/CMap/KSC-Johab-H
-usr/share/ghostscript/8.15/Resource/CMap/KSC-Johab-V
-usr/share/ghostscript/8.15/Resource/CMap/KSCms-UHC-H
-usr/share/ghostscript/8.15/Resource/CMap/KSCms-UHC-HW-H
-usr/share/ghostscript/8.15/Resource/CMap/KSCms-UHC-HW-V
-usr/share/ghostscript/8.15/Resource/CMap/KSCms-UHC-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/KSCms-UHC-V
-usr/share/ghostscript/8.15/Resource/CMap/KSCpc-EUC-H
-usr/share/ghostscript/8.15/Resource/CMap/KSCpc-EUC-UCS2
-usr/share/ghostscript/8.15/Resource/CMap/KSCpc-EUC-UCS2C
-usr/share/ghostscript/8.15/Resource/CMap/Katakana
-usr/share/ghostscript/8.15/Resource/CMap/NWP-H
-usr/share/ghostscript/8.15/Resource/CMap/NWP-V
-usr/share/ghostscript/8.15/Resource/CMap/RKSJ-H
-usr/share/ghostscript/8.15/Resource/CMap/RKSJ-V
-usr/share/ghostscript/8.15/Resource/CMap/Roman
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-90ms-RKSJ
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-90pv-RKSJ
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-B5pc
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-GBK-EUC
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-GBpc-EUC
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-KSCms-UHC
-usr/share/ghostscript/8.15/Resource/CMap/UCS2-KSCpc-EUC
-usr/share/ghostscript/8.15/Resource/CMap/UniCNS-UCS2-H
-usr/share/ghostscript/8.15/Resource/CMap/UniCNS-UCS2-V
-usr/share/ghostscript/8.15/Resource/CMap/UniGB-UCS2-H
-usr/share/ghostscript/8.15/Resource/CMap/UniGB-UCS2-V
-usr/share/ghostscript/8.15/Resource/CMap/UniHojo-UCS2-H
-usr/share/ghostscript/8.15/Resource/CMap/UniJIS-UCS2-H
-usr/share/ghostscript/8.15/Resource/CMap/UniJIS-UCS2-HW-H
-usr/share/ghostscript/8.15/Resource/CMap/UniJIS-UCS2-HW-V
-usr/share/ghostscript/8.15/Resource/CMap/UniJIS-UCS2-V
-usr/share/ghostscript/8.15/Resource/CMap/UniKS-UCS2-H
-usr/share/ghostscript/8.15/Resource/CMap/UniKS-UCS2-V
-usr/share/ghostscript/8.15/Resource/CMap/V
-usr/share/ghostscript/8.15/Resource/CMap/WP-Symbol
-usr/share/ghostscript/8.15/Resource/ColorSpace
-usr/share/ghostscript/8.15/Resource/ColorSpace/DefaultCMYK
-usr/share/ghostscript/8.15/Resource/ColorSpace/DefaultGray
-usr/share/ghostscript/8.15/Resource/ColorSpace/DefaultRGB
-usr/share/ghostscript/8.15/Resource/Decoding
-usr/share/ghostscript/8.15/Resource/Decoding/Latin1
-usr/share/ghostscript/8.15/Resource/Decoding/StandardEncoding
-usr/share/ghostscript/8.15/Resource/Decoding/Unicode
-#usr/share/ghostscript/8.15/doc
-#usr/share/ghostscript/8.15/doc/API.htm
-#usr/share/ghostscript/8.15/doc/Bug-form.htm
-#usr/share/ghostscript/8.15/doc/Bug-info.htm
-#usr/share/ghostscript/8.15/doc/C-style.htm
-#usr/share/ghostscript/8.15/doc/Changes.htm
-#usr/share/ghostscript/8.15/doc/Commprod.htm
-#usr/share/ghostscript/8.15/doc/DLL.htm
-#usr/share/ghostscript/8.15/doc/Develop.htm
-#usr/share/ghostscript/8.15/doc/Devices.htm
-#usr/share/ghostscript/8.15/doc/Drivers.htm
-#usr/share/ghostscript/8.15/doc/Fonts.htm
-#usr/share/ghostscript/8.15/doc/Helpers.htm
-#usr/share/ghostscript/8.15/doc/Hershey.htm
-#usr/share/ghostscript/8.15/doc/History1.htm
-#usr/share/ghostscript/8.15/doc/History2.htm
-#usr/share/ghostscript/8.15/doc/History3.htm
-#usr/share/ghostscript/8.15/doc/History4.htm
-#usr/share/ghostscript/8.15/doc/History5.htm
-#usr/share/ghostscript/8.15/doc/History6.htm
-#usr/share/ghostscript/8.15/doc/Htmstyle.htm
-#usr/share/ghostscript/8.15/doc/Humor.htm
-#usr/share/ghostscript/8.15/doc/Install.htm
-#usr/share/ghostscript/8.15/doc/Language.htm
-#usr/share/ghostscript/8.15/doc/Lib.htm
-#usr/share/ghostscript/8.15/doc/Maintain.htm
-#usr/share/ghostscript/8.15/doc/Make.htm
-#usr/share/ghostscript/8.15/doc/News.htm
-#usr/share/ghostscript/8.15/doc/Projects.htm
-#usr/share/ghostscript/8.15/doc/Ps-style.htm
-#usr/share/ghostscript/8.15/doc/Ps2epsi.htm
-#usr/share/ghostscript/8.15/doc/Ps2pdf.htm
-#usr/share/ghostscript/8.15/doc/Psfiles.htm
-#usr/share/ghostscript/8.15/doc/README
-#usr/share/ghostscript/8.15/doc/Readme.htm
-#usr/share/ghostscript/8.15/doc/Release.htm
-#usr/share/ghostscript/8.15/doc/Source.htm
-#usr/share/ghostscript/8.15/doc/Tester.htm
-#usr/share/ghostscript/8.15/doc/Unix-lpr.htm
-#usr/share/ghostscript/8.15/doc/Use.htm
-#usr/share/ghostscript/8.15/doc/Xfonts.htm
-#usr/share/ghostscript/8.15/doc/gs.css
-#usr/share/ghostscript/8.15/doc/index.html
-#usr/share/ghostscript/8.15/examples
-#usr/share/ghostscript/8.15/examples/alphabet.ps
-#usr/share/ghostscript/8.15/examples/colorcir.ps
-#usr/share/ghostscript/8.15/examples/doretree.ps
-#usr/share/ghostscript/8.15/examples/escher.ps
-#usr/share/ghostscript/8.15/examples/golfer.eps
-#usr/share/ghostscript/8.15/examples/grayalph.ps
-#usr/share/ghostscript/8.15/examples/ridt91.eps
-#usr/share/ghostscript/8.15/examples/snowflak.ps
-#usr/share/ghostscript/8.15/examples/tiger.eps
-#usr/share/ghostscript/8.15/examples/vasarely.ps
-#usr/share/ghostscript/8.15/examples/waterfal.ps
-#usr/share/ghostscript/8.15/lib
-usr/share/ghostscript/8.15/lib/FAPIcidfmap
-usr/share/ghostscript/8.15/lib/FAPIconfig
-usr/share/ghostscript/8.15/lib/FAPIfontmap
-usr/share/ghostscript/8.15/lib/Fontmap
-usr/share/ghostscript/8.15/lib/Fontmap.GS
-usr/share/ghostscript/8.15/lib/PM760p.upp
-usr/share/ghostscript/8.15/lib/PM760pl.upp
-usr/share/ghostscript/8.15/lib/PM820p.upp
-usr/share/ghostscript/8.15/lib/PM820pl.upp
-usr/share/ghostscript/8.15/lib/Stc670p.upp
-usr/share/ghostscript/8.15/lib/Stc670pl.upp
-usr/share/ghostscript/8.15/lib/Stc680p.upp
-usr/share/ghostscript/8.15/lib/Stc680pl.upp
-usr/share/ghostscript/8.15/lib/Stc740p.upp
-usr/share/ghostscript/8.15/lib/Stc740pl.upp
-usr/share/ghostscript/8.15/lib/Stc760p.upp
-usr/share/ghostscript/8.15/lib/Stc760pl.upp
-usr/share/ghostscript/8.15/lib/Stc777p.upp
-usr/share/ghostscript/8.15/lib/Stc777pl.upp
-usr/share/ghostscript/8.15/lib/Stp720p.upp
-usr/share/ghostscript/8.15/lib/Stp720pl.upp
-usr/share/ghostscript/8.15/lib/Stp870p.upp
-usr/share/ghostscript/8.15/lib/Stp870pl.upp
-usr/share/ghostscript/8.15/lib/acctest.ps
-usr/share/ghostscript/8.15/lib/addxchar.ps
-usr/share/ghostscript/8.15/lib/align.ps
-usr/share/ghostscript/8.15/lib/bdftops.ps
-usr/share/ghostscript/8.15/lib/bj8.rpd
-usr/share/ghostscript/8.15/lib/bj8gc12f.upp
-usr/share/ghostscript/8.15/lib/bj8hg12f.upp
-usr/share/ghostscript/8.15/lib/bj8oh06n.upp
-usr/share/ghostscript/8.15/lib/bj8pa06n.upp
-usr/share/ghostscript/8.15/lib/bj8pp12f.upp
-usr/share/ghostscript/8.15/lib/bj8ts06n.upp
-usr/share/ghostscript/8.15/lib/bjc6000a1.upp
-usr/share/ghostscript/8.15/lib/bjc6000b1.upp
-usr/share/ghostscript/8.15/lib/bjc610a0.upp
-usr/share/ghostscript/8.15/lib/bjc610a1.upp
-usr/share/ghostscript/8.15/lib/bjc610a2.upp
-usr/share/ghostscript/8.15/lib/bjc610a3.upp
-usr/share/ghostscript/8.15/lib/bjc610a4.upp
-usr/share/ghostscript/8.15/lib/bjc610a5.upp
-usr/share/ghostscript/8.15/lib/bjc610a6.upp
-usr/share/ghostscript/8.15/lib/bjc610a7.upp
-usr/share/ghostscript/8.15/lib/bjc610a8.upp
-usr/share/ghostscript/8.15/lib/bjc610b1.upp
-usr/share/ghostscript/8.15/lib/bjc610b2.upp
-usr/share/ghostscript/8.15/lib/bjc610b3.upp
-usr/share/ghostscript/8.15/lib/bjc610b4.upp
-usr/share/ghostscript/8.15/lib/bjc610b6.upp
-usr/share/ghostscript/8.15/lib/bjc610b7.upp
-usr/share/ghostscript/8.15/lib/bjc610b8.upp
-usr/share/ghostscript/8.15/lib/caption.ps
-usr/share/ghostscript/8.15/lib/cbjc600.ppd
-usr/share/ghostscript/8.15/lib/cbjc800.ppd
-usr/share/ghostscript/8.15/lib/cdj550.upp
-usr/share/ghostscript/8.15/lib/cdj690.upp
-usr/share/ghostscript/8.15/lib/cdj690ec.upp
-usr/share/ghostscript/8.15/lib/cid2code.ps
-usr/share/ghostscript/8.15/lib/cidfmap
-usr/share/ghostscript/8.15/lib/decrypt.ps
-usr/share/ghostscript/8.15/lib/dmp_init.ps
-usr/share/ghostscript/8.15/lib/dmp_site.ps
-usr/share/ghostscript/8.15/lib/dnj750c.upp
-usr/share/ghostscript/8.15/lib/dnj750m.upp
-usr/share/ghostscript/8.15/lib/docie.ps
-usr/share/ghostscript/8.15/lib/errpage.ps
-usr/share/ghostscript/8.15/lib/escp_24.src
-usr/share/ghostscript/8.15/lib/font2c.ps
-usr/share/ghostscript/8.15/lib/font2pcl.ps
-usr/share/ghostscript/8.15/lib/ghostpdf.ppd
-usr/share/ghostscript/8.15/lib/gs_agl.ps
-usr/share/ghostscript/8.15/lib/gs_btokn.ps
-usr/share/ghostscript/8.15/lib/gs_ccfnt.ps
-usr/share/ghostscript/8.15/lib/gs_ce_e.ps
-usr/share/ghostscript/8.15/lib/gs_cff.ps
-usr/share/ghostscript/8.15/lib/gs_cidcm.ps
-usr/share/ghostscript/8.15/lib/gs_ciddc.ps
-usr/share/ghostscript/8.15/lib/gs_cidfm.ps
-usr/share/ghostscript/8.15/lib/gs_cidfn.ps
-usr/share/ghostscript/8.15/lib/gs_cidtt.ps
-usr/share/ghostscript/8.15/lib/gs_ciecs2.ps
-usr/share/ghostscript/8.15/lib/gs_ciecs3.ps
-usr/share/ghostscript/8.15/lib/gs_cmap.ps
-usr/share/ghostscript/8.15/lib/gs_cmdl.ps
-usr/share/ghostscript/8.15/lib/gs_cspace.ps
-usr/share/ghostscript/8.15/lib/gs_css_e.ps
-usr/share/ghostscript/8.15/lib/gs_dbt_e.ps
-usr/share/ghostscript/8.15/lib/gs_devcs.ps
-usr/share/ghostscript/8.15/lib/gs_devn.ps
-usr/share/ghostscript/8.15/lib/gs_devpxl.ps
-usr/share/ghostscript/8.15/lib/gs_diskf.ps
-usr/share/ghostscript/8.15/lib/gs_diskn.ps
-usr/share/ghostscript/8.15/lib/gs_dpnxt.ps
-usr/share/ghostscript/8.15/lib/gs_dps.ps
-usr/share/ghostscript/8.15/lib/gs_dps1.ps
-usr/share/ghostscript/8.15/lib/gs_dps2.ps
-usr/share/ghostscript/8.15/lib/gs_dscp.ps
-usr/share/ghostscript/8.15/lib/gs_epsf.ps
-usr/share/ghostscript/8.15/lib/gs_fapi.ps
-usr/share/ghostscript/8.15/lib/gs_fform.ps
-usr/share/ghostscript/8.15/lib/gs_fntem.ps
-usr/share/ghostscript/8.15/lib/gs_fonts.ps
-usr/share/ghostscript/8.15/lib/gs_frsd.ps
-usr/share/ghostscript/8.15/lib/gs_icc.ps
-usr/share/ghostscript/8.15/lib/gs_il1_e.ps
-usr/share/ghostscript/8.15/lib/gs_il2_e.ps
-usr/share/ghostscript/8.15/lib/gs_img.ps
-usr/share/ghostscript/8.15/lib/gs_indxd.ps
-usr/share/ghostscript/8.15/lib/gs_init.ps
-usr/share/ghostscript/8.15/lib/gs_kanji.ps
-usr/share/ghostscript/8.15/lib/gs_ksb_e.ps
-usr/share/ghostscript/8.15/lib/gs_l.xbm
-usr/share/ghostscript/8.15/lib/gs_l.xpm
-usr/share/ghostscript/8.15/lib/gs_l2img.ps
-usr/share/ghostscript/8.15/lib/gs_l_m.xbm
-usr/share/ghostscript/8.15/lib/gs_lev2.ps
-usr/share/ghostscript/8.15/lib/gs_lgo_e.ps
-usr/share/ghostscript/8.15/lib/gs_lgx_e.ps
-usr/share/ghostscript/8.15/lib/gs_ll3.ps
-usr/share/ghostscript/8.15/lib/gs_m.xbm
-usr/share/ghostscript/8.15/lib/gs_m.xpm
-usr/share/ghostscript/8.15/lib/gs_m_m.xbm
-usr/share/ghostscript/8.15/lib/gs_mex_e.ps
-usr/share/ghostscript/8.15/lib/gs_mgl_e.ps
-usr/share/ghostscript/8.15/lib/gs_mro_e.ps
-usr/share/ghostscript/8.15/lib/gs_patrn.ps
-usr/share/ghostscript/8.15/lib/gs_pdf_e.ps
-usr/share/ghostscript/8.15/lib/gs_pdfwr.ps
-usr/share/ghostscript/8.15/lib/gs_pfile.ps
-usr/share/ghostscript/8.15/lib/gs_rdlin.ps
-usr/share/ghostscript/8.15/lib/gs_res.ps
-usr/share/ghostscript/8.15/lib/gs_resmp.ps
-usr/share/ghostscript/8.15/lib/gs_resst.ps
-usr/share/ghostscript/8.15/lib/gs_s.xbm
-usr/share/ghostscript/8.15/lib/gs_s.xpm
-usr/share/ghostscript/8.15/lib/gs_s_m.xbm
-usr/share/ghostscript/8.15/lib/gs_sepr.ps
-usr/share/ghostscript/8.15/lib/gs_setpd.ps
-usr/share/ghostscript/8.15/lib/gs_statd.ps
-usr/share/ghostscript/8.15/lib/gs_std_e.ps
-usr/share/ghostscript/8.15/lib/gs_stres.ps
-usr/share/ghostscript/8.15/lib/gs_sym_e.ps
-usr/share/ghostscript/8.15/lib/gs_t.xbm
-usr/share/ghostscript/8.15/lib/gs_t.xpm
-usr/share/ghostscript/8.15/lib/gs_t_m.xbm
-usr/share/ghostscript/8.15/lib/gs_trap.ps
-usr/share/ghostscript/8.15/lib/gs_ttf.ps
-usr/share/ghostscript/8.15/lib/gs_typ32.ps
-usr/share/ghostscript/8.15/lib/gs_typ42.ps
-usr/share/ghostscript/8.15/lib/gs_type1.ps
-usr/share/ghostscript/8.15/lib/gs_wan_e.ps
-usr/share/ghostscript/8.15/lib/gs_wl1_e.ps
-usr/share/ghostscript/8.15/lib/gs_wl2_e.ps
-usr/share/ghostscript/8.15/lib/gs_wl5_e.ps
-usr/share/ghostscript/8.15/lib/gslp.ps
-usr/share/ghostscript/8.15/lib/gsnup.ps
-usr/share/ghostscript/8.15/lib/ht_ccsto.ps
-usr/share/ghostscript/8.15/lib/image-qa.ps
-usr/share/ghostscript/8.15/lib/impath.ps
-usr/share/ghostscript/8.15/lib/jispaper.ps
-usr/share/ghostscript/8.15/lib/landscap.ps
-usr/share/ghostscript/8.15/lib/level1.ps
-usr/share/ghostscript/8.15/lib/lines.ps
-usr/share/ghostscript/8.15/lib/markhint.ps
-usr/share/ghostscript/8.15/lib/markpath.ps
-usr/share/ghostscript/8.15/lib/necp2x.upp
-usr/share/ghostscript/8.15/lib/necp2x6.upp
-usr/share/ghostscript/8.15/lib/packfile.ps
-usr/share/ghostscript/8.15/lib/pcharstr.ps
-usr/share/ghostscript/8.15/lib/pdf2dsc.ps
-usr/share/ghostscript/8.15/lib/pdf_base.ps
-usr/share/ghostscript/8.15/lib/pdf_draw.ps
-usr/share/ghostscript/8.15/lib/pdf_font.ps
-usr/share/ghostscript/8.15/lib/pdf_main.ps
-usr/share/ghostscript/8.15/lib/pdf_ops.ps
-usr/share/ghostscript/8.15/lib/pdf_rbld.ps
-usr/share/ghostscript/8.15/lib/pdf_sec.ps
-usr/share/ghostscript/8.15/lib/pdfopt.ps
-usr/share/ghostscript/8.15/lib/pdfwrite.ps
-usr/share/ghostscript/8.15/lib/pf2afm.ps
-usr/share/ghostscript/8.15/lib/pfbtopfa.ps
-usr/share/ghostscript/8.15/lib/ppath.ps
-usr/share/ghostscript/8.15/lib/prfont.ps
-usr/share/ghostscript/8.15/lib/printafm.ps
-usr/share/ghostscript/8.15/lib/ps2ai.ps
-usr/share/ghostscript/8.15/lib/ps2ascii.ps
-usr/share/ghostscript/8.15/lib/ps2epsi.ps
-usr/share/ghostscript/8.15/lib/quit.ps
-usr/share/ghostscript/8.15/lib/ras1.upp
-usr/share/ghostscript/8.15/lib/ras24.upp
-usr/share/ghostscript/8.15/lib/ras3.upp
-usr/share/ghostscript/8.15/lib/ras32.upp
-usr/share/ghostscript/8.15/lib/ras4.upp
-usr/share/ghostscript/8.15/lib/ras8m.upp
-usr/share/ghostscript/8.15/lib/rollconv.ps
-usr/share/ghostscript/8.15/lib/s400a1.upp
-usr/share/ghostscript/8.15/lib/s400b1.upp
-usr/share/ghostscript/8.15/lib/sharp.upp
-usr/share/ghostscript/8.15/lib/showchar.ps
-usr/share/ghostscript/8.15/lib/showpage.ps
-usr/share/ghostscript/8.15/lib/st640ih.upp
-usr/share/ghostscript/8.15/lib/st640ihg.upp
-usr/share/ghostscript/8.15/lib/st640p.upp
-usr/share/ghostscript/8.15/lib/st640pg.upp
-usr/share/ghostscript/8.15/lib/st640pl.upp
-usr/share/ghostscript/8.15/lib/st640plg.upp
-usr/share/ghostscript/8.15/lib/stc.upp
-usr/share/ghostscript/8.15/lib/stc1520h.upp
-usr/share/ghostscript/8.15/lib/stc2.upp
-usr/share/ghostscript/8.15/lib/stc200_h.upp
-usr/share/ghostscript/8.15/lib/stc2_h.upp
-usr/share/ghostscript/8.15/lib/stc2s_h.upp
-usr/share/ghostscript/8.15/lib/stc300.upp
-usr/share/ghostscript/8.15/lib/stc300bl.upp
-usr/share/ghostscript/8.15/lib/stc300bm.upp
-usr/share/ghostscript/8.15/lib/stc500p.upp
-usr/share/ghostscript/8.15/lib/stc500ph.upp
-usr/share/ghostscript/8.15/lib/stc600ih.upp
-usr/share/ghostscript/8.15/lib/stc600p.upp
-usr/share/ghostscript/8.15/lib/stc600pl.upp
-usr/share/ghostscript/8.15/lib/stc640p.upp
-usr/share/ghostscript/8.15/lib/stc740ih.upp
-usr/share/ghostscript/8.15/lib/stc800ih.upp
-usr/share/ghostscript/8.15/lib/stc800p.upp
-usr/share/ghostscript/8.15/lib/stc800pl.upp
-usr/share/ghostscript/8.15/lib/stc_h.upp
-usr/share/ghostscript/8.15/lib/stc_l.upp
-usr/share/ghostscript/8.15/lib/stcany.upp
-usr/share/ghostscript/8.15/lib/stcany_h.upp
-usr/share/ghostscript/8.15/lib/stcinfo.ps
-usr/share/ghostscript/8.15/lib/stcolor.ps
-usr/share/ghostscript/8.15/lib/stocht.ps
-usr/share/ghostscript/8.15/lib/traceimg.ps
-usr/share/ghostscript/8.15/lib/traceop.ps
-usr/share/ghostscript/8.15/lib/type1enc.ps
-usr/share/ghostscript/8.15/lib/type1ops.ps
-usr/share/ghostscript/8.15/lib/uninfo.ps
-usr/share/ghostscript/8.15/lib/unprot.ps
-usr/share/ghostscript/8.15/lib/viewcmyk.ps
-usr/share/ghostscript/8.15/lib/viewgif.ps
-usr/share/ghostscript/8.15/lib/viewjpeg.ps
-usr/share/ghostscript/8.15/lib/viewmiff.ps
-usr/share/ghostscript/8.15/lib/viewpbm.ps
-usr/share/ghostscript/8.15/lib/viewpcx.ps
-usr/share/ghostscript/8.15/lib/viewps2a.ps
-usr/share/ghostscript/8.15/lib/wftopfa.ps
-usr/share/ghostscript/8.15/lib/winmaps.ps
-usr/share/ghostscript/8.15/lib/wrfont.ps
-usr/share/ghostscript/8.15/lib/xlatmap
-usr/share/ghostscript/8.15/lib/zeroline.ps
+#usr/share/ghostscript/9.20
+#usr/share/ghostscript/9.20/doc
+#usr/share/ghostscript/9.20/doc/API.htm
+#usr/share/ghostscript/9.20/doc/AUTHORS
+#usr/share/ghostscript/9.20/doc/C-style.htm
+#usr/share/ghostscript/9.20/doc/COPYING
+#usr/share/ghostscript/9.20/doc/Changes.htm
+#usr/share/ghostscript/9.20/doc/Commprod.htm
+#usr/share/ghostscript/9.20/doc/DLL.htm
+#usr/share/ghostscript/9.20/doc/Deprecated.htm
+#usr/share/ghostscript/9.20/doc/Details.htm
+#usr/share/ghostscript/9.20/doc/Details8.htm
+#usr/share/ghostscript/9.20/doc/Details9.htm
+#usr/share/ghostscript/9.20/doc/Develop.htm
+#usr/share/ghostscript/9.20/doc/Devices.htm
+#usr/share/ghostscript/9.20/doc/Drivers.htm
+#usr/share/ghostscript/9.20/doc/Fonts.htm
+#usr/share/ghostscript/9.20/doc/GS9_Color_Management.pdf
+#usr/share/ghostscript/9.20/doc/GS9_Color_Management.tex
+#usr/share/ghostscript/9.20/doc/Helpers.htm
+#usr/share/ghostscript/9.20/doc/Hershey.htm
+#usr/share/ghostscript/9.20/doc/History1.htm
+#usr/share/ghostscript/9.20/doc/History2.htm
+#usr/share/ghostscript/9.20/doc/History3.htm
+#usr/share/ghostscript/9.20/doc/History4.htm
+#usr/share/ghostscript/9.20/doc/History5.htm
+#usr/share/ghostscript/9.20/doc/History6.htm
+#usr/share/ghostscript/9.20/doc/History7.htm
+#usr/share/ghostscript/9.20/doc/History8.htm
+#usr/share/ghostscript/9.20/doc/History9.htm
+#usr/share/ghostscript/9.20/doc/Install.htm
+#usr/share/ghostscript/9.20/doc/Issues.htm
+#usr/share/ghostscript/9.20/doc/Language.htm
+#usr/share/ghostscript/9.20/doc/Lib.htm
+#usr/share/ghostscript/9.20/doc/Make.htm
+#usr/share/ghostscript/9.20/doc/News.htm
+#usr/share/ghostscript/9.20/doc/Projects.htm
+#usr/share/ghostscript/9.20/doc/Ps-style.htm
+#usr/share/ghostscript/9.20/doc/Ps2epsi.htm
+#usr/share/ghostscript/9.20/doc/Psfiles.htm
+#usr/share/ghostscript/9.20/doc/Readme.htm
+#usr/share/ghostscript/9.20/doc/Release.htm
+#usr/share/ghostscript/9.20/doc/Source.htm
+#usr/share/ghostscript/9.20/doc/Unix-lpr.htm
+#usr/share/ghostscript/9.20/doc/Use.htm
+#usr/share/ghostscript/9.20/doc/WhatIsGS.htm
+#usr/share/ghostscript/9.20/doc/Xfonts.htm
+#usr/share/ghostscript/9.20/doc/gs-vms.hlp
+#usr/share/ghostscript/9.20/doc/gs.css
+#usr/share/ghostscript/9.20/doc/gsdoc.el
+#usr/share/ghostscript/9.20/doc/index.html
+#usr/share/ghostscript/9.20/doc/pscet_status.txt
+#usr/share/ghostscript/9.20/doc/thirdparty.htm
+#usr/share/ghostscript/9.20/examples
+#usr/share/ghostscript/9.20/examples/alphabet.ps
+#usr/share/ghostscript/9.20/examples/annots.pdf
+#usr/share/ghostscript/9.20/examples/cjk
+#usr/share/ghostscript/9.20/examples/cjk/all_ac1.ps
+#usr/share/ghostscript/9.20/examples/cjk/all_ag1.ps
+#usr/share/ghostscript/9.20/examples/cjk/all_aj1.ps
+#usr/share/ghostscript/9.20/examples/cjk/all_aj2.ps
+#usr/share/ghostscript/9.20/examples/cjk/all_ak1.ps
+#usr/share/ghostscript/9.20/examples/cjk/article9.ps
+#usr/share/ghostscript/9.20/examples/cjk/gscjk_ac.ps
+#usr/share/ghostscript/9.20/examples/cjk/gscjk_ag.ps
+#usr/share/ghostscript/9.20/examples/cjk/gscjk_aj.ps
+#usr/share/ghostscript/9.20/examples/cjk/gscjk_ak.ps
+#usr/share/ghostscript/9.20/examples/cjk/iso2022.ps
+#usr/share/ghostscript/9.20/examples/cjk/iso2022v.ps
+#usr/share/ghostscript/9.20/examples/colorcir.ps
+#usr/share/ghostscript/9.20/examples/doretree.ps
+#usr/share/ghostscript/9.20/examples/escher.ps
+#usr/share/ghostscript/9.20/examples/golfer.eps
+#usr/share/ghostscript/9.20/examples/grayalph.ps
+#usr/share/ghostscript/9.20/examples/ridt91.eps
+#usr/share/ghostscript/9.20/examples/snowflak.ps
+#usr/share/ghostscript/9.20/examples/text_graph_image_cmyk_rgb.pdf
+#usr/share/ghostscript/9.20/examples/text_graphic_image.pdf
+#usr/share/ghostscript/9.20/examples/tiger.eps
+#usr/share/ghostscript/9.20/examples/transparency_example.ps
+#usr/share/ghostscript/9.20/examples/vasarely.ps
+#usr/share/ghostscript/9.20/examples/waterfal.ps
+#usr/share/ghostscript/9.20/lib
+#usr/share/ghostscript/9.20/lib/PDFA_def.ps
+#usr/share/ghostscript/9.20/lib/PDFX_def.ps
+#usr/share/ghostscript/9.20/lib/PM760p.upp
+#usr/share/ghostscript/9.20/lib/PM760pl.upp
+#usr/share/ghostscript/9.20/lib/PM820p.upp
+#usr/share/ghostscript/9.20/lib/PM820pl.upp
+#usr/share/ghostscript/9.20/lib/Stc670p.upp
+#usr/share/ghostscript/9.20/lib/Stc670pl.upp
+#usr/share/ghostscript/9.20/lib/Stc680p.upp
+#usr/share/ghostscript/9.20/lib/Stc680pl.upp
+#usr/share/ghostscript/9.20/lib/Stc740p.upp
+#usr/share/ghostscript/9.20/lib/Stc740pl.upp
+#usr/share/ghostscript/9.20/lib/Stc760p.upp
+#usr/share/ghostscript/9.20/lib/Stc760pl.upp
+#usr/share/ghostscript/9.20/lib/Stc777p.upp
+#usr/share/ghostscript/9.20/lib/Stc777pl.upp
+#usr/share/ghostscript/9.20/lib/Stp720p.upp
+#usr/share/ghostscript/9.20/lib/Stp720pl.upp
+#usr/share/ghostscript/9.20/lib/Stp870p.upp
+#usr/share/ghostscript/9.20/lib/Stp870pl.upp
+#usr/share/ghostscript/9.20/lib/acctest.ps
+#usr/share/ghostscript/9.20/lib/addxchar.ps
+#usr/share/ghostscript/9.20/lib/align.ps
+#usr/share/ghostscript/9.20/lib/bj8.rpd
+#usr/share/ghostscript/9.20/lib/bj8gc12f.upp
+#usr/share/ghostscript/9.20/lib/bj8hg12f.upp
+#usr/share/ghostscript/9.20/lib/bj8oh06n.upp
+#usr/share/ghostscript/9.20/lib/bj8pa06n.upp
+#usr/share/ghostscript/9.20/lib/bj8pp12f.upp
+#usr/share/ghostscript/9.20/lib/bj8ts06n.upp
+#usr/share/ghostscript/9.20/lib/bjc6000a1.upp
+#usr/share/ghostscript/9.20/lib/bjc6000b1.upp
+#usr/share/ghostscript/9.20/lib/bjc610a0.upp
+#usr/share/ghostscript/9.20/lib/bjc610a1.upp
+#usr/share/ghostscript/9.20/lib/bjc610a2.upp
+#usr/share/ghostscript/9.20/lib/bjc610a3.upp
+#usr/share/ghostscript/9.20/lib/bjc610a4.upp
+#usr/share/ghostscript/9.20/lib/bjc610a5.upp
+#usr/share/ghostscript/9.20/lib/bjc610a6.upp
+#usr/share/ghostscript/9.20/lib/bjc610a7.upp
+#usr/share/ghostscript/9.20/lib/bjc610a8.upp
+#usr/share/ghostscript/9.20/lib/bjc610b1.upp
+#usr/share/ghostscript/9.20/lib/bjc610b2.upp
+#usr/share/ghostscript/9.20/lib/bjc610b3.upp
+#usr/share/ghostscript/9.20/lib/bjc610b4.upp
+#usr/share/ghostscript/9.20/lib/bjc610b6.upp
+#usr/share/ghostscript/9.20/lib/bjc610b7.upp
+#usr/share/ghostscript/9.20/lib/bjc610b8.upp
+#usr/share/ghostscript/9.20/lib/caption.ps
+#usr/share/ghostscript/9.20/lib/cbjc600.ppd
+#usr/share/ghostscript/9.20/lib/cbjc800.ppd
+#usr/share/ghostscript/9.20/lib/cdj550.upp
+#usr/share/ghostscript/9.20/lib/cdj690.upp
+#usr/share/ghostscript/9.20/lib/cdj690ec.upp
+#usr/share/ghostscript/9.20/lib/cid2code.ps
+#usr/share/ghostscript/9.20/lib/decrypt.ps
+#usr/share/ghostscript/9.20/lib/dmp_init.ps
+#usr/share/ghostscript/9.20/lib/dmp_site.ps
+#usr/share/ghostscript/9.20/lib/dnj750c.upp
+#usr/share/ghostscript/9.20/lib/dnj750m.upp
+#usr/share/ghostscript/9.20/lib/docie.ps
+#usr/share/ghostscript/9.20/lib/escp_24.src
+#usr/share/ghostscript/9.20/lib/font2c.ps
+#usr/share/ghostscript/9.20/lib/font2pcl.ps
+#usr/share/ghostscript/9.20/lib/ghostpdf.ppd
+#usr/share/ghostscript/9.20/lib/gs_ce_e.ps
+#usr/share/ghostscript/9.20/lib/gs_cmdl.ps
+#usr/share/ghostscript/9.20/lib/gs_il2_e.ps
+#usr/share/ghostscript/9.20/lib/gs_kanji.ps
+#usr/share/ghostscript/9.20/lib/gs_ksb_e.ps
+#usr/share/ghostscript/9.20/lib/gs_l.xbm
+#usr/share/ghostscript/9.20/lib/gs_l.xpm
+#usr/share/ghostscript/9.20/lib/gs_l_m.xbm
+#usr/share/ghostscript/9.20/lib/gs_lgo_e.ps
+#usr/share/ghostscript/9.20/lib/gs_lgx_e.ps
+#usr/share/ghostscript/9.20/lib/gs_m.xbm
+#usr/share/ghostscript/9.20/lib/gs_m.xpm
+#usr/share/ghostscript/9.20/lib/gs_m_m.xbm
+#usr/share/ghostscript/9.20/lib/gs_pfile.ps
+#usr/share/ghostscript/9.20/lib/gs_rdlin.ps
+#usr/share/ghostscript/9.20/lib/gs_s.xbm
+#usr/share/ghostscript/9.20/lib/gs_s.xpm
+#usr/share/ghostscript/9.20/lib/gs_s_m.xbm
+#usr/share/ghostscript/9.20/lib/gs_t.xbm
+#usr/share/ghostscript/9.20/lib/gs_t.xpm
+#usr/share/ghostscript/9.20/lib/gs_t_m.xbm
+#usr/share/ghostscript/9.20/lib/gs_wl1_e.ps
+#usr/share/ghostscript/9.20/lib/gs_wl2_e.ps
+#usr/share/ghostscript/9.20/lib/gs_wl5_e.ps
+#usr/share/ghostscript/9.20/lib/gslp.ps
+#usr/share/ghostscript/9.20/lib/gsnup.ps
+#usr/share/ghostscript/9.20/lib/ht_ccsto.ps
+#usr/share/ghostscript/9.20/lib/image-qa.ps
+#usr/share/ghostscript/9.20/lib/impath.ps
+#usr/share/ghostscript/9.20/lib/jispaper.ps
+#usr/share/ghostscript/9.20/lib/landscap.ps
+#usr/share/ghostscript/9.20/lib/level1.ps
+#usr/share/ghostscript/9.20/lib/lines.ps
+#usr/share/ghostscript/9.20/lib/markhint.ps
+#usr/share/ghostscript/9.20/lib/markpath.ps
+#usr/share/ghostscript/9.20/lib/mkcidfm.ps
+#usr/share/ghostscript/9.20/lib/necp2x.upp
+#usr/share/ghostscript/9.20/lib/necp2x6.upp
+#usr/share/ghostscript/9.20/lib/packfile.ps
+#usr/share/ghostscript/9.20/lib/pcharstr.ps
+#usr/share/ghostscript/9.20/lib/pdf2dsc.ps
+#usr/share/ghostscript/9.20/lib/pdfwrite.ps
+#usr/share/ghostscript/9.20/lib/pf2afm.ps
+#usr/share/ghostscript/9.20/lib/pfbtopfa.ps
+#usr/share/ghostscript/9.20/lib/ppath.ps
+#usr/share/ghostscript/9.20/lib/pphs.ps
+#usr/share/ghostscript/9.20/lib/prfont.ps
+#usr/share/ghostscript/9.20/lib/printafm.ps
+#usr/share/ghostscript/9.20/lib/ps2ai.ps
+#usr/share/ghostscript/9.20/lib/ps2ascii.ps
+#usr/share/ghostscript/9.20/lib/ps2epsi.ps
+#usr/share/ghostscript/9.20/lib/quit.ps
+#usr/share/ghostscript/9.20/lib/ras1.upp
+#usr/share/ghostscript/9.20/lib/ras24.upp
+#usr/share/ghostscript/9.20/lib/ras3.upp
+#usr/share/ghostscript/9.20/lib/ras32.upp
+#usr/share/ghostscript/9.20/lib/ras4.upp
+#usr/share/ghostscript/9.20/lib/ras8m.upp
+#usr/share/ghostscript/9.20/lib/rollconv.ps
+#usr/share/ghostscript/9.20/lib/s400a1.upp
+#usr/share/ghostscript/9.20/lib/s400b1.upp
+#usr/share/ghostscript/9.20/lib/sharp.upp
+#usr/share/ghostscript/9.20/lib/showchar.ps
+#usr/share/ghostscript/9.20/lib/showpage.ps
+#usr/share/ghostscript/9.20/lib/sipixa6.upp
+#usr/share/ghostscript/9.20/lib/st640ih.upp
+#usr/share/ghostscript/9.20/lib/st640ihg.upp
+#usr/share/ghostscript/9.20/lib/st640p.upp
+#usr/share/ghostscript/9.20/lib/st640pg.upp
+#usr/share/ghostscript/9.20/lib/st640pl.upp
+#usr/share/ghostscript/9.20/lib/st640plg.upp
+#usr/share/ghostscript/9.20/lib/stc.upp
+#usr/share/ghostscript/9.20/lib/stc1520h.upp
+#usr/share/ghostscript/9.20/lib/stc2.upp
+#usr/share/ghostscript/9.20/lib/stc200_h.upp
+#usr/share/ghostscript/9.20/lib/stc2_h.upp
+#usr/share/ghostscript/9.20/lib/stc2s_h.upp
+#usr/share/ghostscript/9.20/lib/stc300.upp
+#usr/share/ghostscript/9.20/lib/stc300bl.upp
+#usr/share/ghostscript/9.20/lib/stc300bm.upp
+#usr/share/ghostscript/9.20/lib/stc500p.upp
+#usr/share/ghostscript/9.20/lib/stc500ph.upp
+#usr/share/ghostscript/9.20/lib/stc600ih.upp
+#usr/share/ghostscript/9.20/lib/stc600p.upp
+#usr/share/ghostscript/9.20/lib/stc600pl.upp
+#usr/share/ghostscript/9.20/lib/stc640p.upp
+#usr/share/ghostscript/9.20/lib/stc740ih.upp
+#usr/share/ghostscript/9.20/lib/stc800ih.upp
+#usr/share/ghostscript/9.20/lib/stc800p.upp
+#usr/share/ghostscript/9.20/lib/stc800pl.upp
+#usr/share/ghostscript/9.20/lib/stc_h.upp
+#usr/share/ghostscript/9.20/lib/stc_l.upp
+#usr/share/ghostscript/9.20/lib/stcany.upp
+#usr/share/ghostscript/9.20/lib/stcany_h.upp
+#usr/share/ghostscript/9.20/lib/stcinfo.ps
+#usr/share/ghostscript/9.20/lib/stcolor.ps
+#usr/share/ghostscript/9.20/lib/stocht.ps
+#usr/share/ghostscript/9.20/lib/traceimg.ps
+#usr/share/ghostscript/9.20/lib/traceop.ps
+#usr/share/ghostscript/9.20/lib/type1enc.ps
+#usr/share/ghostscript/9.20/lib/type1ops.ps
+#usr/share/ghostscript/9.20/lib/uninfo.ps
+#usr/share/ghostscript/9.20/lib/unprot.ps
+#usr/share/ghostscript/9.20/lib/viewcmyk.ps
+#usr/share/ghostscript/9.20/lib/viewgif.ps
+#usr/share/ghostscript/9.20/lib/viewjpeg.ps
+#usr/share/ghostscript/9.20/lib/viewmiff.ps
+#usr/share/ghostscript/9.20/lib/viewpbm.ps
+#usr/share/ghostscript/9.20/lib/viewpcx.ps
+#usr/share/ghostscript/9.20/lib/viewps2a.ps
+#usr/share/ghostscript/9.20/lib/wftopfa.ps
+#usr/share/ghostscript/9.20/lib/winmaps.ps
+#usr/share/ghostscript/9.20/lib/wrfont.ps
+#usr/share/ghostscript/9.20/lib/zeroline.ps
#usr/share/ghostscript/fonts
#usr/share/ghostscript/fonts/COPYING
#usr/share/ghostscript/fonts/ChangeLog
@@ -688,4 +446,41 @@ usr/share/ghostscript/fonts/u004006t.pfm
usr/share/ghostscript/fonts/z003034l.afm
usr/share/ghostscript/fonts/z003034l.pfb
usr/share/ghostscript/fonts/z003034l.pfm
-var/ipfire/cups/pstoraster.convs
+#usr/share/man/de/man1/dvipdf.1
+#usr/share/man/de/man1/eps2eps.1
+#usr/share/man/de/man1/font2c.1
+#usr/share/man/de/man1/gsnd.1
+#usr/share/man/de/man1/pdf2dsc.1
+#usr/share/man/de/man1/pdf2ps.1
+#usr/share/man/de/man1/printafm.1
+#usr/share/man/de/man1/ps2ascii.1
+#usr/share/man/de/man1/ps2pdf.1
+#usr/share/man/de/man1/ps2pdf12.1
+#usr/share/man/de/man1/ps2pdf13.1
+#usr/share/man/de/man1/ps2pdf14.1
+#usr/share/man/de/man1/ps2ps.1
+#usr/share/man/de/man1/wftopfa.1
+#usr/share/man/man1/dvipdf.1
+#usr/share/man/man1/eps2eps.1
+#usr/share/man/man1/font2c.1
+#usr/share/man/man1/gs.1
+#usr/share/man/man1/gsbj.1
+#usr/share/man/man1/gsdj.1
+#usr/share/man/man1/gsdj500.1
+#usr/share/man/man1/gslj.1
+#usr/share/man/man1/gslp.1
+#usr/share/man/man1/gsnd.1
+#usr/share/man/man1/pdf2dsc.1
+#usr/share/man/man1/pdf2ps.1
+#usr/share/man/man1/pf2afm.1
+#usr/share/man/man1/pfbtopfa.1
+#usr/share/man/man1/printafm.1
+#usr/share/man/man1/ps2ascii.1
+#usr/share/man/man1/ps2epsi.1
+#usr/share/man/man1/ps2pdf.1
+#usr/share/man/man1/ps2pdf12.1
+#usr/share/man/man1/ps2pdf13.1
+#usr/share/man/man1/ps2pdf14.1
+#usr/share/man/man1/ps2pdfwr.1
+#usr/share/man/man1/ps2ps.1
+#usr/share/man/man1/wftopfa.1
diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived
index 88cfeed..fbf5702 100644
--- a/config/rootfiles/packages/keepalived
+++ b/config/rootfiles/packages/keepalived
@@ -27,6 +27,7 @@ etc/keepalived/samples
#etc/keepalived/samples/root.pem
#etc/keepalived/samples/sample.misccheck.smbcheck.sh
#etc/sysconfig/keepalived
+etc/rc.d/init.d/keepalived
usr/bin/genhash
usr/sbin/keepalived
#usr/share/man/man1/genhash.1
diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index baf8e06..820d233 100644
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -121,7 +121,13 @@ usr/share/mc/skins/modarin256root-defbg.ini
usr/share/mc/skins/modarin256root.ini
usr/share/mc/skins/nicedark.ini
usr/share/mc/skins/sand256.ini
+usr/share/mc/skins/seasons-autumn16M.ini
+usr/share/mc/skins/seasons-spring16M.ini
+usr/share/mc/skins/seasons-summer16M.ini
+usr/share/mc/skins/seasons-winter16M.ini
usr/share/mc/skins/xoria256.ini
+usr/share/mc/skins/yadt256-defbg.ini
+usr/share/mc/skins/yadt256.ini
#usr/share/mc/syntax
usr/share/mc/syntax/PKGBUILD.syntax
usr/share/mc/syntax/Syntax
@@ -176,6 +182,8 @@ usr/share/mc/syntax/named.syntax
usr/share/mc/syntax/nemerle.syntax
usr/share/mc/syntax/nroff.syntax
usr/share/mc/syntax/octave.syntax
+usr/share/mc/syntax/opencl.syntax
+usr/share/mc/syntax/osl.syntax
usr/share/mc/syntax/pascal.syntax
usr/share/mc/syntax/perl.syntax
usr/share/mc/syntax/php.syntax
@@ -185,6 +193,7 @@ usr/share/mc/syntax/procmail.syntax
usr/share/mc/syntax/properties.syntax
usr/share/mc/syntax/puppet.syntax
usr/share/mc/syntax/python.syntax
+usr/share/mc/syntax/r.syntax
usr/share/mc/syntax/ruby.syntax
usr/share/mc/syntax/sh.syntax
usr/share/mc/syntax/slang.syntax
@@ -201,5 +210,6 @@ usr/share/mc/syntax/unknown.syntax
usr/share/mc/syntax/verilog.syntax
usr/share/mc/syntax/vhdl.syntax
usr/share/mc/syntax/xml.syntax
+usr/share/mc/syntax/yaml.syntax
usr/share/mc/syntax/yum-repo.syntax
usr/share/mc/syntax/yxx.syntax
diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion
index aa3e5b7..82a8097 100644
--- a/config/rootfiles/packages/motion
+++ b/config/rootfiles/packages/motion
@@ -1,25 +1,32 @@
-#etc/motion-dist.conf
+etc/motion
etc/motion.conf
+etc/motion/camera1-dist.conf
+etc/motion/camera2-dist.conf
+etc/motion/camera3-dist.conf
+etc/motion/camera4-dist.conf
+#etc/motion/motion-dist.conf
usr/bin/motion
-#usr/share/doc/motion-3.2.12
-#usr/share/doc/motion-3.2.12/CHANGELOG
-#usr/share/doc/motion-3.2.12/COPYING
-#usr/share/doc/motion-3.2.12/CREDITS
-#usr/share/doc/motion-3.2.12/INSTALL
-#usr/share/doc/motion-3.2.12/README
-#usr/share/doc/motion-3.2.12/motion_guide.html
+#usr/share/doc/motion
+#usr/share/doc/motion/CHANGELOG
+#usr/share/doc/motion/COPYING
+#usr/share/doc/motion/CREDITS
+#usr/share/doc/motion/README.md
+#usr/share/doc/motion/mask1.png
+#usr/share/doc/motion/motion_guide.html
+#usr/share/doc/motion/normal.jpg
+#usr/share/doc/motion/outputmotion1.jpg
+#usr/share/doc/motion/outputnormal1.jpg
#usr/share/man/man1/motion.1
-#usr/share/motion-3.2.12
-#usr/share/motion-3.2.12/examples
-#usr/share/motion-3.2.12/examples/motion-dist.conf
-#usr/share/motion-3.2.12/examples/motion.init-Debian
-#usr/share/motion-3.2.12/examples/motion.init-Fedora
-#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh
-#usr/share/motion-3.2.12/examples/motion.init-RH
-#usr/share/motion-3.2.12/examples/thread1.conf
-#usr/share/motion-3.2.12/examples/thread2.conf
-#usr/share/motion-3.2.12/examples/thread3.conf
-#usr/share/motion-3.2.12/examples/thread4.conf
+#usr/share/motion
+#usr/share/motion/examples
+#usr/share/motion/examples/camera1-dist.conf
+#usr/share/motion/examples/camera2-dist.conf
+#usr/share/motion/examples/camera3-dist.conf
+#usr/share/motion/examples/camera4-dist.conf
+#usr/share/motion/examples/motion-dist.conf
+#usr/share/motion/examples/motion.init-Debian
+#usr/share/motion/examples/motion.init-FreeBSD.sh
+#usr/share/motion/examples/motion.service
var/ipfire/backup/addons/includes/motion
etc/rc.d/init.d/motion
etc/rc.d/rc0.d/K01motion
diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd
index ea96b69..c49d334 100644
--- a/config/rootfiles/packages/mpd
+++ b/config/rootfiles/packages/mpd
@@ -8,6 +8,7 @@ var/log/mpd.log
#usr/share/doc/mpd/NEWS
#usr/share/doc/mpd/COMMANDS
#usr/share/doc/mpd/README
+#usr/share/doc/mpd/README.md
#usr/share/doc/mpd/TODO
#usr/share/doc/mpd/UPGRADING
#usr/share/doc/mpd/mpdconf.example
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 022d4eb..1adb384 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -105,4 +105,3 @@ usr/share/qemu/vgabios-stdvga.bin
usr/share/qemu/vgabios-virtio.bin
usr/share/qemu/vgabios-vmware.bin
usr/share/qemu/vgabios.bin
-#usr/var/run
diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane
index 4fd9b98..7923427 100644
--- a/config/rootfiles/packages/sane
+++ b/config/rootfiles/packages/sane
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/sane
etc/rc.d/rc0.d/K10sane
etc/rc.d/rc3.d/S95sane
etc/rc.d/rc6.d/K10sane
@@ -514,6 +515,7 @@ usr/lib/sane/libsane-umax_pp.so.1.0.24
usr/lib/sane/libsane-xerox_mfp.so
usr/lib/sane/libsane-xerox_mfp.so.1
usr/lib/sane/libsane-xerox_mfp.so.1.0.24
+usr/local/bin/sanedloop
usr/sbin/saned
#usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
#usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
@@ -628,8 +630,7 @@ 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
var/ipfire/backup/addons/includes/sane
-etc/rc.d/init.d/sane
-usr/local/bin/sanedloop
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 60ba499..3dec2db 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -716,6 +716,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
@@ -1144,6 +1145,10 @@ WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 863b529..fa5387c 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -726,6 +726,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
@@ -1161,6 +1162,10 @@ WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 6efef40..09338a2 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -714,6 +714,7 @@ WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dl client arch insecure
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: email config
WARNING: untranslated string: email empty field
WARNING: untranslated string: email invalid
@@ -819,6 +820,10 @@ WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all
WARNING: untranslated string: vpn force mobike
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c9b10dc..3390ef3 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -721,6 +721,7 @@ WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dl client arch insecure
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
@@ -867,6 +868,10 @@ WARNING: untranslated string: uncheck all
WARNING: untranslated string: upload dh key
WARNING: untranslated string: vendor
WARNING: untranslated string: vpn force mobike
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 60ba499..3dec2db 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -716,6 +716,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
@@ -1144,6 +1145,10 @@ WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 255df2f..303e19b 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -720,6 +720,7 @@ WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: dnssec information
WARNING: untranslated string: dnssec not supported
WARNING: untranslated string: dnssec validating
@@ -1139,6 +1140,10 @@ WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 8cf2dfe..af17e37 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -706,6 +706,7 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: application layer gateways
WARNING: untranslated string: bytes
+WARNING: untranslated string: dnssec disabled warning
WARNING: untranslated string: fwhost cust geoipgrp
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: guardian
@@ -752,4 +753,8 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
+WARNING: untranslated string: vpn on-demand
+WARNING: untranslated string: vpn start action
+WARNING: untranslated string: vpn start action route
+WARNING: untranslated string: vpn start action start
WARNING: untranslated string: vpn statistics n2n
diff --git a/doc/language_missings b/doc/language_missings
index 32e1e48..a6c7188 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -106,6 +106,7 @@
< dnsforward forward_server
< dnsforward zone
< dnssec aware
+< dnssec disabled warning
< dnssec information
< dnssec not supported
< dnssec validating
@@ -561,6 +562,10 @@
< vendor
< visit us at
< vpn keyexchange
+< vpn on-demand
+< vpn start action
+< vpn start action route
+< vpn start action start
< vpn statistic n2n
< vpn statistic rw
< wlanap access point
@@ -717,6 +722,7 @@
< dnsforward forward_server
< dnsforward zone
< dnssec aware
+< dnssec disabled warning
< dnssec information
< dnssec not supported
< dnssec validating
@@ -1175,6 +1181,10 @@
< vendor
< visit us at
< vpn keyexchange
+< vpn on-demand
+< vpn start action
+< vpn start action route
+< vpn start action start
< vpn statistic n2n
< vpn statistic rw
< wlanap country
@@ -1310,6 +1320,7 @@
< dnsforward forward_server
< dnsforward zone
< dnssec aware
+< dnssec disabled warning
< dnssec information
< dnssec not supported
< dnssec validating
@@ -1754,6 +1765,10 @@
< vendor
< visit us at
< vpn keyexchange
+< vpn on-demand
+< vpn start action
+< vpn start action route
+< vpn start action start
< vpn statistic n2n
< vpn statistic rw
< wlanap country
@@ -1892,6 +1907,7 @@
< dnsforward forward_server
< dnsforward zone
< dnssec aware
+< dnssec disabled warning
< dnssec information
< dnssec not supported
< dnssec validating
@@ -2338,6 +2354,10 @@
< vendor
< visit us at
< vpn keyexchange
+< vpn on-demand
+< vpn start action
+< vpn start action route
+< vpn start action start
< vpn statistic n2n
< vpn statistic rw
< week-graph
diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
index 8e016b6..e5db5c2 100644
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'center', $Lang::tr{'entropy'});
- &Graphs::makegraphbox("entropy.cgi", "day", '', 350);
+ &Graphs::makegraphbox("entropy.cgi", "day");
&Header::closebox();
# Check for hardware support.
diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index b0a5d3a..7b5a848 100644
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -113,7 +113,7 @@ if ( $querry[0] =~ "hwtemp"){
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-* 2>/dev/null` ) {
&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
- &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day","375");
+ &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");
Header::closebox();
}
@@ -125,7 +125,7 @@ if ( $querry[0] =~ "hwtemp"){
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-* 2>/dev/null` ) {
&Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
- &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","435");
+ &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day");
&Header::closebox();
}
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index c142a65..7c17462 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -425,6 +425,9 @@ END
if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
$activecolor = $Header::colourgreen;
$activestatus = $Lang::tr{'capsopen'};
+ } elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
+ $activecolor = $Header::colourorange;
+ $activestatus = $Lang::tr{'vpn on-demand'};
}
}
}
@@ -497,6 +500,11 @@ END
&Header::closebox();
}
+my $dnssec_status = &General::dnssec_status();
+if ($dnssec_status eq "off") {
+ $warnmessage .= "<li>$Lang::tr{'dnssec disabled warning'}</li>";
+}
+
# Fireinfo
if ( ! -e "/var/ipfire/main/send_profile") {
$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index 15a95b6..ddf4177 100755
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/html/cgi-bin/netovpnsrv.cgi
@@ -59,7 +59,7 @@ if ( $querry[0] ne ""){
if (@vpns){
foreach (@vpns) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
- &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320);
+ &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day");
&Header::closebox();
}
}else{
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 590ad15..071b93f 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -770,10 +770,10 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq ''
}
&Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}");
- &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325");
+ &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour");
&Header::closebox();
&Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}");
- &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325");
+ &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour");
&Header::closebox();
&showclasses($qossettings{'RED_DEV'});
diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index a0e7655..487ba99 100644
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -57,12 +57,12 @@ if ( $querry[0] =~ "cpufreq"){
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
- &Graphs::makegraphbox("system.cgi","cpu","day","325");
+ &Graphs::makegraphbox("system.cgi","cpu","day");
&Header::closebox();
if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
&Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
- &Graphs::makegraphbox("system.cgi","cpufreq","day","325");
+ &Graphs::makegraphbox("system.cgi","cpufreq","day");
&Header::closebox();
}
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index f1cffb8..f4eccb1 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -108,6 +108,7 @@ $cgiparams{'RW_NET'} = '';
$cgiparams{'DPD_DELAY'} = '30';
$cgiparams{'DPD_TIMEOUT'} = '120';
$cgiparams{'FORCE_MOBIKE'} = 'off';
+$cgiparams{'START_ACTION'} = 'start';
&Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
###
@@ -401,12 +402,23 @@ sub writeipsecfiles {
print CONF "\trightrsasigkey=%cert\n";
}
+ my $start_action = $lconfighash{$key}[33];
+ if (!$start_action) {
+ $start_action = "start";
+ }
+
# Automatically start only if a net-to-net connection
if ($lconfighash{$key}[3] eq 'host') {
print CONF "\tauto=add\n";
print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n";
} else {
- print CONF "\tauto=start\n";
+ print CONF "\tauto=$start_action\n";
+
+ # If in on-demand mode, we terminate the tunnel
+ # after 15 min of no traffic
+ if ($start_action eq 'route') {
+ print CONF "\tinactivity=900\n";
+ }
}
# Fragmentation
@@ -1778,7 +1790,7 @@ END
my $key = $cgiparams{'KEY'};
if (! $key) {
$key = &General::findhasharraykey (\%confighash);
- foreach my $i (0 .. 32) { $confighash{$key}[$i] = "";}
+ foreach my $i (0 .. 33) { $confighash{$key}[$i] = "";}
}
$confighash{$key}[0] = $cgiparams{'ENABLED'};
$confighash{$key}[1] = $cgiparams{'NAME'};
@@ -2256,6 +2268,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
$confighash{$cgiparams{'KEY'}}[30] = $cgiparams{'DPD_TIMEOUT'};
$confighash{$cgiparams{'KEY'}}[31] = $cgiparams{'DPD_DELAY'};
$confighash{$cgiparams{'KEY'}}[32] = $cgiparams{'FORCE_MOBIKE'};
+ $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'};
&General::writehasharray("${General::swroot}/vpn/config", \%confighash);
&writeipsecfiles();
if (&vpnenabled) {
@@ -2283,6 +2296,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
$cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30];
$cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31];
$cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32];
+ $cgiparams{'START_ACTION'} = $confighash{$cgiparams{'KEY'}}[33];
if (!$cgiparams{'DPD_DELAY'}) {
$cgiparams{'DPD_DELAY'} = 30;
@@ -2291,6 +2305,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
if (!$cgiparams{'DPD_TIMEOUT'}) {
$cgiparams{'DPD_TIMEOUT'} = 120;
}
+
+ if (!$cgiparams{'START_ACTION'}) {
+ $cgiparams{'START_ACTION'} = "start";
+ }
}
ADVANCED_ERROR:
@@ -2387,6 +2405,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
$selected{'DPD_ACTION'}{'none'} = '';
$selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";
+ $selected{'START_ACTION'}{'route'} = '';
+ $selected{'START_ACTION'}{'start'} = '';
+ $selected{'START_ACTION'}{$cgiparams{'START_ACTION'}} = "selected='selected'";
+
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'ipsec'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -2406,7 +2428,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
}
&Header::openbox('100%', 'left', "$Lang::tr{'advanced'}:");
- print <<EOF
+ print <<EOF;
<form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ADVANCED' value='yes' />
<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
@@ -2599,9 +2621,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
IKE+ESP: $Lang::tr{'use only proposed settings'}
</label>
</td>
+ <td>
+ <label>$Lang::tr{'vpn start action'}</label>
+ <select name="START_ACTION">
+ <option value="route" $selected{'START_ACTION'}{'route'}>$Lang::tr{'vpn start action route'}</option>
+ <option value="start" $selected{'START_ACTION'}{'start'}>$Lang::tr{'vpn start action start'}</option>
+ </select>
+ </td>
</tr>
<tr>
- <td>
+ <td colspan="2">
<label>
<input type='checkbox' name='PFS' $checked{'PFS'} />
$Lang::tr{'pfs yes no'}
@@ -2609,7 +2638,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
</td>
</tr>
<tr>
- <td>
+ <td colspan="2">
<label>
<input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} />
$Lang::tr{'vpn payload compression'}
@@ -2617,20 +2646,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
</td>
</tr>
<tr>
- <td>
+ <td colspan="2">
<label>
<input type='checkbox' name='FORCE_MOBIKE' $checked{'FORCE_MOBIKE'} />
$Lang::tr{'vpn force mobike'}
</label>
</td>
</tr>
-EOF
-;
-
- print <<EOF;
<tr>
- <td align='left' colspan='1'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'required field'}</td>
- <td align='right' colspan='2'>
+ <td align='left'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'required field'}</td>
+ <td align='right'>
<input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' />
</td>
@@ -2780,6 +2805,9 @@ END
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
$col1="bgcolor='${Header::colourgreen}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+ } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
+ $col1="bgcolor='${Header::colourorange}'";
+ $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";
}
}
# move to blue if really down
diff --git a/html/html/themes/darkdos/include/style.css b/html/html/themes/darkdos/include/style.css
index cc4b3c9..b885067 100644
--- a/html/html/themes/darkdos/include/style.css
+++ b/html/html/themes/darkdos/include/style.css
@@ -466,3 +466,8 @@ table.fw-nat tbody tr td {
#rx_kbs { color: green; }
#tx_kbs { color: red; }
+
+iframe.graph {
+ width: 100%;
+ min-height: 300px;
+}
diff --git a/html/html/themes/ipfire-legacy/include/style.css b/html/html/themes/ipfire-legacy/include/style.css
index 288a0fe..2e9ea92 100644
--- a/html/html/themes/ipfire-legacy/include/style.css
+++ b/html/html/themes/ipfire-legacy/include/style.css
@@ -443,3 +443,8 @@ table.fw-nat tbody tr td {
#rx_kbs { color: green; }
#tx_kbs { color: red; }
+
+iframe.graph {
+ min-height: 285px;
+ width: 750px;
+}
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 1cc18f8..9421fc1 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -327,3 +327,8 @@ table {
table.fw-nat tbody tr td {
height: 2.25em;
}
+
+iframe.graph {
+ width: 100%;
+ min-height: 300px;
+}
diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css
index 3cb2741..27d3982 100644
--- a/html/html/themes/maniac/include/style.css
+++ b/html/html/themes/maniac/include/style.css
@@ -472,3 +472,8 @@ table.fw-nat tbody tr td {
#rx_kbs { color: green; }
#tx_kbs { color: red; }
+
+iframe.graph {
+ width: 100%;
+ min-height: 300px;
+}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 261b92f..bda0e26 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -767,6 +767,7 @@
'dnsforward forward_server' => 'DNS-Server',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC-aware',
+'dnssec disabled warning' => 'WARNING: DNSSEC wurde deaktiviert',
'dnssec information' => 'DNSSEC-Informationen',
'dnssec not supported' => 'DNSSEC wird nicht unterstützt',
'dnssec validating' => 'DNSSEC-validierend',
@@ -1913,7 +1914,7 @@
'red1' => 'ROT',
'references' => 'Referenzen',
'refresh' => 'Aktualisieren',
-'refresh index page while connected' => 'Aktualisere index.cgi Seite während der Verbindung',
+'refresh index page while connected' => 'Aktualisiere index.cgi Seite während der Verbindung',
'refresh update list' => 'Aktualisiere Update-Liste',
'registered user rules' => 'Sourcefire VRT Regeln für registrierte Benutzer',
'released' => 'Freigegeben',
@@ -2615,9 +2616,13 @@
'vpn on blue' => 'VPN auf BLAU',
'vpn on green' => 'VPN auf GRÜN',
'vpn on orange' => 'VPN auf ORANGE',
+'vpn on-demand' => 'ON DEMAND',
'vpn payload compression' => 'Datennutzlast-Kompression aushandeln',
'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>',
'vpn remote id' => 'Remote ID',
+'vpn start action' => 'Startaktion',
+'vpn start action route' => 'On Demand',
+'vpn start action start' => 'Immer An',
'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik',
'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik',
'vpn subjectaltname' => 'Subjekt Alternativer Name',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a04d994..6608ceb 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -792,6 +792,7 @@
'dnsforward forward_server' => 'Nameserver',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC Aware',
+'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',
'dnssec information' => 'DNSSEC Information',
'dnssec not supported' => 'DNSSEC Not supported',
'dnssec validating' => 'DNSSEC Validating',
@@ -2660,9 +2661,13 @@
'vpn on blue' => 'VPN on BLUE',
'vpn on green' => 'VPN on GREEN',
'vpn on orange' => 'VPN on ORANGE',
+'vpn on-demand' => 'ON-DEMAND',
'vpn payload compression' => 'Negotiate payload compression',
'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>',
'vpn remote id' => 'Remote ID',
+'vpn start action' => 'Start Action',
+'vpn start action route' => 'On Demand',
+'vpn start action start' => 'Always On',
'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics',
'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics',
'vpn subjectaltname' => 'Subject Alt Name',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index b039cdb..36698fd 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -124,7 +124,7 @@
'advproxy IDENT unauthorized users' => 'Gli utenti non autorizzati (uno per riga)',
'advproxy IDENT use negative access list' => 'Utilizzare il controllo degli accessi negativo',
'advproxy IDENT use positive access list' => 'Utilizzare il controllo degli accessi positivo',
-'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull utente',
+'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull\'utente',
'advproxy LDAP ADS' => 'Active Directory',
'advproxy LDAP NDS' => 'Novell eDirectory',
'advproxy LDAP V2' => 'LDAP versione 2',
@@ -210,7 +210,7 @@
'advproxy cre disabled' => 'The management interface has been disabled by the administrator',
'advproxy cre group definitions' => 'Definizioni del gruppo in classe',
'advproxy cre supervisors' => 'Indirizzi IP Supervisore (uno per riga)',
-'advproxy destination ports' => 'Porte di destinatinazione',
+'advproxy destination ports' => 'Porte di destinazione',
'advproxy download throttling' => 'Limiti Download',
'advproxy enabled' => 'Abilitato',
'advproxy enabled on' => 'Abilitato su',
@@ -392,7 +392,7 @@
'backup explain key no2' => 'legacy floppy backups are not concerned with this key.',
'backup export key' => 'Export key',
'backup extract key' => 'Extract key',
-'backup from' => 'Backup from',
+'backup from' => 'Backup del',
'backup generate key' => 'Generate key',
'backup import dat file' => 'Import a backup (.dat) file',
'backup import key' => 'Import key',
@@ -407,7 +407,7 @@
'backup to floppy' => 'Backup to floppy',
'backupaddon' => 'Addon Backup',
'backupprofile' => 'In case reconnection fails, switch to profile',
-'backups' => 'backups',
+'backups' => 'Backups',
'backupwarning' => 'Per favore prima di ripristinare il backup del sistema e/o il backup addon, Si prega di mantenere il nome del file originale, di quando é stato scaricato.',
'bad characters in' => 'Bad characters in ',
'bad characters in script field' => 'Bad characters in script field',
@@ -923,7 +923,7 @@
'fireinfo is disabled' => 'Fireinfo is disabled',
'fireinfo is enabled' => 'Fireinfo is enabled',
'fireinfo is submitted' => 'Your profile is submitted to the fireinfo service.',
-'fireinfo is submitted button' => 'No, I do not want to send my profile anymore',
+'fireinfo is submitted button' => 'No, non voglio più inviare il mio profilo',
'fireinfo kernel version' => 'Kernel version',
'fireinfo not submitted' => 'Your profile is not submitted to the fireinfo service.',
'fireinfo not submitted button' => 'Yes, I want to send my profile',
@@ -1950,13 +1950,13 @@
'server reserved' => 'The connection name server is reserved and not allowed',
'server restart' => 'You are not able to save any changes while the OpenVPN server is running.',
'server string' => 'Server String',
-'service' => 'Service',
+'service' => 'Servizio',
'service added' => 'Custom network service added',
'service name' => 'Service name:',
'service removed' => 'Custom network service removed',
'service updated' => 'Custom network service updated',
'servicename' => 'Service Name',
-'services' => 'Servizio',
+'services' => 'Servizi',
'services settings' => 'Firewall-Impostazioni Servizi',
'set' => 'set',
'set time now' => 'Set time now',
@@ -1967,7 +1967,7 @@
'shared' => 'shared',
'sharename' => 'Sharename',
'shares' => 'Shares',
-'show ajax speedmeter in footer' => 'Mostra la velocita tramita Ajax',
+'show ajax speedmeter in footer' => 'Mostra la velocità tramite Ajax',
'show areas' => 'show areas',
'show ca certificate' => 'Show CA certificate',
'show certificate' => 'Show file',
@@ -2100,7 +2100,7 @@
'test email was sent' => 'Testemail was send successfully',
'the following update was successfully installed' => 'The following update was successfully installed',
'the statistics were last updated at' => 'The statistics were last updated at',
-'theme' => 'Teme Grafico',
+'theme' => 'Tema grafico',
'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.',
'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.',
'there was no file upload' => 'There was no file upload.',
@@ -2377,7 +2377,7 @@
'urlfilter category log' => 'Dividere log per categorie',
'urlfilter category name error' => 'Blacklist category name required',
'urlfilter client' => 'Client',
-'urlfilter configuration' => 'Configurazione filttri per URL',
+'urlfilter configuration' => 'Configurazione filtri per URL',
'urlfilter constraint definition' => 'Impostazione',
'urlfilter constraint outside' => 'outside',
'urlfilter constraint within' => 'within',
@@ -2601,7 +2601,7 @@
'wireless' => 'Wireless',
'wireless config added' => 'Wireless config added',
'wireless config changed' => 'Wireless config changed',
-'wireless configuration' => 'Configuratione Wireless',
+'wireless configuration' => 'Configurazione Wireless',
'wlan client' => 'Wireless client',
'wlan client advanced settings' => 'impostazioni avanzate Wireless client',
'wlan client and' => 'and',
@@ -2619,7 +2619,7 @@
'wlan client group cipher' => 'Group cipher',
'wlan client group key algorithm' => 'GKA',
'wlan client invalid key length' => 'Invalid key length.',
-'wlan client new entry' => 'Crea nuova configuratione wireless client',
+'wlan client new entry' => 'Crea nuova configurazione wireless client',
'wlan client new network' => 'Nuovo network',
'wlan client pairwise cipher' => 'Pairwise cipher',
'wlan client pairwise key algorithm' => 'PKA',
@@ -2642,7 +2642,7 @@
'wlanap informations' => 'Informationi',
'wlanap interface' => 'Selezione interfaccia',
'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Deve contenere dai 6 ai 63 caratteri.',
-'wlanap link dhcp' => 'Configuratione Wireless Lan DHCP',
+'wlanap link dhcp' => 'Configurazione Wireless Lan DHCP',
'wlanap link wireless' => 'Activate Wireless Lan clients',
'wlanap no interface' => 'Selected interface is not a Wirless Lan card!',
'wlanap none' => 'none',
diff --git a/lfs/Config b/lfs/Config
index 4de8bd3..3101d8b 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -206,3 +206,10 @@ define PAK
-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
< /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
endef
+
+define INSTALL_INITSCRIPT
+ install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1) /etc/rc.d/init.d/$(1)
+endef
+
+test:
+ $(call INSTALL_INITSCRIPT,hostapd)
diff --git a/lfs/alsa b/lfs/alsa
index b9c3bb4..72ea70d 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -99,5 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/alsa-firmware-$(FVER) && ./configure
cd $(DIR_SRC)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/alsa-firmware-$(FVER) && make install
+ # install initscript
+ $(call INSTALL_INITSCRIPT,alsa)
@rm -rf $(DIR_SRC)/alsa*
@$(POSTBUILD)
diff --git a/lfs/amavisd b/lfs/amavisd
index 39464e4..7230c0c 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -80,6 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && cp -f amavisd /usr/bin
chown root.root /usr/bin/amavisd
chmod 755 /usr/bin/amavisd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,amavisd)
+
cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc
chown root.root /etc/amavisd.conf
chmod 644 /etc/amavisd.conf
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 4e9137b..ce36c3c 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)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.14.10
+VER = 3.14.14
THISAPP = apcupsd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = apcupsd
-PAK_VER = 5
+PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23
+$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980
install : $(TARGET)
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-cgi-bin=/srv/web/ipfire/cgi-bin
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,apcupsd)
+
ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd
diff --git a/lfs/asterisk b/lfs/asterisk
index a0276bc..31f6ec0 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -152,6 +152,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# generate softlink (or asterisk will not work properly)
ln -sf /var/ipfire/asterisk /etc/asterisk
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,asterisk)
+
# make asterisk start with reboot
ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc0.d/K30asterisk
ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc6.d/K30asterisk
diff --git a/lfs/avahi b/lfs/avahi
index 0ffbd32..adcb84c 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -24,7 +24,7 @@
include Config
-VER = 0.6.31
+VER = 0.6.32
THISAPP = avahi-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2f22745b8f7368ad5a0a3fddac343f2d
+$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013
install : $(TARGET)
diff --git a/lfs/bind b/lfs/bind
index d25c2df..e178219 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.11.0-P2
+VER = 9.11.0-P3
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b8ccec541de18ac2716e7a8268baaaba
+$(DL_FILE)_MD5 = 311787a0a69345a1f1cf7869b0266bf0
install : $(TARGET)
diff --git a/lfs/bluetooth b/lfs/bluetooth
index dc5eec7..2c57809 100644
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -125,5 +125,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown nobody:nobody /var/ipfire/bluetooth/settings
chmod 644 /var/ipfire/bluetooth/settings
install -v -m 644 $(DIR_SRC)/config/backup/includes/bluetooth /var/ipfire/backup/addons/includes/bluetooth
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,bluetooth)
+
@rm -rf $(DIR_SRC)/bluez*
@$(POSTBUILD)
diff --git a/lfs/cairo b/lfs/cairo
index 591549a..a5772af 100644
--- a/lfs/cairo
+++ b/lfs/cairo
@@ -24,10 +24,10 @@
include Config
-VER = 1.10.2
+VER = 1.14.8
THISAPP = cairo-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+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 = f101a9e88b783337b20b2e26dfd26d5f
+$(DL_FILE)_MD5 = 4ef0db2eacb271c74f8a3fd87822aa98
install : $(TARGET)
@@ -69,8 +69,9 @@ $(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 --disable-win32 --disable-os2 --disable-beos
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr \
+ --disable-win32 --disable-os2 --disable-beos
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/clamav b/lfs/clamav
index 2cd5e49..650faec 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -95,7 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -rfv /usr/share/clamav/*.cvd
mkdir -p /var/run/clamav
chown clamav:clamav /var/run/clamav
-
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,clamav)
# Disable PaX mprotect for clamd, clamscan and freshclam
paxctl -cm /usr/sbin/clamd
paxctl -cm /usr/bin/clamscan
diff --git a/lfs/client175 b/lfs/client175
index ef2b487..cc462d0 100644
--- a/lfs/client175
+++ b/lfs/client175
@@ -89,5 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/var/ipfire/backup/addons/includes/client175
chown -R nobody:nobody /srv/client175
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,client175)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools
index d9a60bc..d8a1099 100644
--- a/lfs/conntrack-tools
+++ b/lfs/conntrack-tools
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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.2
+VER = 1.4.4
THISAPP = conntrack-tools-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b1f9d006e7bf000a77395ff7cd3fac16
+$(DL_FILE)_MD5 = acd9e0b27cf16ae3092ba900e4d7560e
install : $(TARGET)
diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils
index 5a82c33..d558efa 100644
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -82,5 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cpufreq)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/cups b/lfs/cups
index 49b275a..47f71f8 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,17 +24,17 @@
include Config
-VER = 2.0.4
+VER = 2.2.2
THISAPP = cups-$(VER)
-DL_FILE = $(THISAPP)-source.tar.bz2
+DL_FILE = $(THISAPP)-source.tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
-PAK_VER = 13
+PAK_VER = 15
-DEPS = "ghostscript"
+DEPS = "avahi cups-filters dbus ghostscript krb5 libtiff"
###############################################################################
# Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f5c847d9a4fac6c4c66fb0526a7afaae
+$(DL_FILE)_MD5 = 036f6bda6202ae3e280ac00c710b5ca4
install : $(TARGET)
@@ -76,22 +76,25 @@ $(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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
--sysconfdir=/var/ipfire \
--localstatedir=/var \
- --enable-libusb \
- --disable-dbus \
- --disable-avahi
+ --enable-debug \
+ --enable-avahi \
+ --enable-dbus \
+ --enable-gnutls \
+ --enable-libusb
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
+ # install initscript
+ $(call INSTALL_INITSCRIPT,cups)
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
@rm -rf $(DIR_APP)
diff --git a/lfs/cups-filters b/lfs/cups-filters
new file mode 100644
index 0000000..84d7e8e
--- /dev/null
+++ b/lfs/cups-filters
@@ -0,0 +1,91 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2015 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.13.4
+
+THISAPP = cups-filters-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = cups-filters
+PAK_VER = 1
+
+DEPS = "cups ghostscript"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a288a63ca44ad6e776cf1e86a457f836
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-pdftops=hybrid \
+ --disable-ijs \
+ --disable-mutool
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index f4c855c..e6452ae 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -105,5 +105,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown cyrus.mail /var/imap/socket
install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
/var/ipfire/backup/addons/includes/cyrus-imapd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cyrus-imapd)
+
@rm -rf $(DIR_APP) /usr/include/com_err.h
@$(POSTBUILD)
diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 84f49d9..757f742 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -96,6 +96,10 @@ ifeq "$(PASS)" ""
install -v -m700 -d /var/lib/sasl
-mkdir /var/run/saslauthd
cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,cyrus-sasl)
+
else
# WITH LDAP SUPPORT AT THIS TIME
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/lfs/dbus b/lfs/dbus
index 3a43106..fdbad47 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -82,5 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,messagebus)
+
@rm -rf $(DIR_SRC)/dbus*
@$(POSTBUILD)
diff --git a/lfs/dnsdist b/lfs/dnsdist
index a5d9fea..aeb11c8 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,dnsdist)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr
new file mode 100644
index 0000000..f4104db
--- /dev/null
+++ b/lfs/epson-inkjet-printer-escpr
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# 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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.6.12
+LSB = 1lsb3.2
+
+THISAPP = epson-inkjet-printer-escpr-$(VER)
+DL_FILE = $(THISAPP)-$(LSB).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = epson-inkjet-printer-escpr
+PAK_VER = 2
+
+DEPS = "cups"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = fddedddd1424402d8ec8297536c751a0
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP)
+ cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && make # doesn't support parallel build
+ cd $(DIR_APP) && make install CUPS_PPD_DIR=/usr/share/ppd/Epson
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/fetchmail b/lfs/fetchmail
index 66b9a65..ab271b0 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -96,5 +96,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/fetchmail \
/var/ipfire/backup/addons/includes/fetchmail
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,fetchmail)
+
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index b383886..cd9e8b6 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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,20 +24,17 @@
include Config
-VER = 2008-04-13
-THISAPP = ffmpeg-export-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+VER = 3.2.4
+THISAPP = ffmpeg-$(VER)
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ffmpeg
-PAK_VER = 5
+PAK_VER = 6
DEPS = "ffmpeg-libs sdl lame libvorbis xvid"
-# Don't use PIC for libavcodec
-CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
-
###############################################################################
# Top-level Rules
###############################################################################
@@ -46,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
+$(DL_FILE)_MD5 = 39fd71024ac76ba35f04397021af5606
install : $(TARGET)
@@ -78,15 +75,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- ln -s $(THISAPP) /usr/src/ffmpeg
- cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
- --enable-shared \
- --enable-postproc \
- --enable-pthreads \
- --enable-gpl
- cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_SRC)/ffmpeg && make install
- cd $(DIR_SRC)/ffmpeg && make install-libs
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr \
+ --enable-shared \
+ --enable-postproc \
+ --enable-pthreads \
+ --enable-gpl
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ cd $(DIR_APP) && make install-libs
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs
index b29c978..0ed657f 100644
--- a/lfs/ffmpeg-libs
+++ b/lfs/ffmpeg-libs
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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,10 +24,10 @@
include Config
-VER = 2008-04-13
+VER = 3.2.4
THISAPP = ffmpeg-export-$(VER)
PROG = ffmpeg-libs
-PAK_VER = 5
+PAK_VER = 6
DEPS = ""
diff --git a/lfs/flash-images b/lfs/flash-images
index d10fc9b..4a1a4d6 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -193,7 +193,7 @@ endif
-e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
# Install GRUB
- grub-install --force --recheck --no-floppy \
+ grub-install --force --recheck --no-floppy --target=i386-pc \
--root-directory=$(MNThdd) $(DEVICE)
endif
diff --git a/lfs/fontconfig b/lfs/fontconfig
index 6f0850b..7867022 100644
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -24,7 +24,7 @@
include Config
-VER = 2.5.91
+VER = 2.12.1
THISAPP = fontconfig-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ff5536b58e91a034ed18e7d53e04a689
+$(DL_FILE)_MD5 = ce55e525c37147eee14cc2de6cc09f6c
install : $(TARGET)
@@ -70,7 +70,8 @@ $(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 --sysconfdir=/etc
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/freeradius b/lfs/freeradius
index d9a80c6..a07a535 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -133,5 +133,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/freeradius \
/var/ipfire/backup/addons/includes/freeradius
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,freeradius)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/freetype b/lfs/freetype
index dbe8d17..ba80297 100644
--- a/lfs/freetype
+++ b/lfs/freetype
@@ -24,10 +24,10 @@
include Config
-VER = 2.1.10
+VER = 2.7.1
THISAPP = freetype-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
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 = a4012e7d1f6400df44a16743b11b8423
+$(DL_FILE)_MD5 = 78701bee8d249578d83bb9a2f3aa3616
install : $(TARGET)
@@ -69,8 +69,7 @@ $(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) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/ghostscript b/lfs/ghostscript
index f76a1b6..4d82eb7 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -24,17 +24,17 @@
include Config
-VER = 8.15.1
+VER = 9.20
-THISAPP = espgs-$(VER)
-DL_FILE = $(THISAPP)-source.tar.bz2
+THISAPP = ghostscript-$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/espgs-$(VER)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ghostscript
-PAK_VER = 1
+PAK_VER = 2
-DEPS = ""
+DEPS = "dbus libtiff"
###############################################################################
# Top-level Rules
@@ -48,7 +48,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
ghostscript-fonts-std-8.11.tar.gz = $(URL_IPFIRE)/ghostscript-fonts-std-8.11.tar.gz
gnu-gs-fonts-other-6.0.tar.gz = $(URL_IPFIRE)/gnu-gs-fonts-other-6.0.tar.gz
-$(DL_FILE)_MD5 = 2a21136953c3559e6088522753b06b1f
+$(DL_FILE)_MD5 = 93c5987cd3ab341108be1ebbaadc24fe
ghostscript-fonts-std-8.11.tar.gz_MD5 = 6865682b095f8c4500c54b285ff05ef6
gnu-gs-fonts-other-6.0.tar.gz_MD5 = 33457d3f37de7ef03d2eea05a9e6aa4f
@@ -82,14 +82,19 @@ $(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) && sed -i "s/bbox.dev$/x11.dev/" Makefile.in
- cd $(DIR_APP) && ./configure --prefix=/usr --enable-threads --without-omni
- cd $(DIR_APP) && make
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --with-system-libtiff \
+ --with-install-cups
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- rmdir -v /usr/lib/ghostscript/8.15 /usr/lib/ghostscript
+
+ # Install fonts
tar xfz $(DIR_SRC)/cache/ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript
tar xfz $(DIR_SRC)/cache/gnu-gs-fonts-other-6.0.tar.gz -C /usr/share/ghostscript
chown -v root:root /usr/share/ghostscript/fonts/*
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/gnump3d b/lfs/gnump3d
index ca14c27..0022b4e 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -91,5 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown nobody.nobody /var/mp3
install -m 644 $(DIR_SRC)/config/gnump3d/gnump3d.conf /etc/gnump3d/
ln -sf /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,gnump3d)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/gnutls b/lfs/gnutls
new file mode 100644
index 0000000..e32c842
--- /dev/null
+++ b/lfs/gnutls
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.5.9
+
+THISAPP = gnutls-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0ab25eb6a1509345dd085bc21a387951
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --with-included-libtasn1 \
+ --with-included-unistring \
+ --without-p11-kit \
+ --disable-openssl-compatibility \
+ --disable-guile
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/guardian b/lfs/guardian
index d363419..2120a08 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -93,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /var/log/guardian
touch /var/log/guardian/guardian.log
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,guardian)
+
# Create symlinks for runlevel interaction.
ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc3.d/S45guardian
ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc0.d/K76guardian
diff --git a/lfs/haproxy b/lfs/haproxy
index 4af2273..0e5a067 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -91,9 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/haproxy \
/var/ipfire/backup/addons/includes/haproxy
- # Restore initscript
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/haproxy \
- /etc/rc.d/init.d/haproxy
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,haproxy)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/hostapd b/lfs/hostapd
index a4fe99a..1a2436c 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -83,6 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/hostapd && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
+ # install initscript
+ $(call INSTALL_INITSCRIPT,hostapd)
mkdir -p /var/ipfire/wlanap
touch /var/ipfire/wlanap/settings
cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf
diff --git a/lfs/imspector b/lfs/imspector
index 5cea872..d4aa9b1 100644
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
chown nobody:nobody -R /var/log/imspector
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,imspector)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/initscripts b/lfs/initscripts
index c5baf68..ef7114c 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -64,22 +64,22 @@ $(TARGET) :
# Create default ramdisk configuration
echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
- for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
+ for i in $(DIR_SRC)/src/initscripts/system/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/; \
done
chmod 644 /etc/rc.d/init.d/functions
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/*; do \
if [ -f $$i ]; then \
install -v -m 754 $$i /etc/rc.d/init.d/networking/; \
fi; \
done
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.up/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/red.up/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.up/; \
done
- for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.down/*; do \
+ for i in $(DIR_SRC)/src/initscripts/networking/red.down/*; do \
install -v -m 754 $$i /etc/rc.d/init.d/networking/red.down/; \
done
diff --git a/lfs/keepalived b/lfs/keepalived
index 2054a54..257ceb2 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -85,8 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/keepalived \
/var/ipfire/backup/addons/includes/keepalived
- # Restore initscript
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/keepalived \
- /etc/rc.d/init.d/keepalived
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,keepalived)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/lcd4linux b/lfs/lcd4linux
index a736381..31bcf12 100644
--- a/lfs/lcd4linux
+++ b/lfs/lcd4linux
@@ -80,6 +80,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcd4linux)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 83b2437..e408294 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -93,6 +93,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
-mkdir -pv /etc/lcdproc
cp -vf $(DIR_SRC)/config/lcdproc/{LCDd,lcdproc}.conf /etc/lcdproc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcdproc)
+
ln -sf ../init.d/lcdproc /etc/rc.d/rc3.d/S60lcdproc
ln -sf ../init.d/lcdproc /etc/rc.d/rc0.d/K40lcdproc
ln -sf ../init.d/lcdproc /etc/rc.d/rc6.d/K40lcdproc
diff --git a/lfs/lcms2 b/lfs/lcms2
new file mode 100644
index 0000000..7209022
--- /dev/null
+++ b/lfs/lcms2
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.8
+
+THISAPP = lcms2-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 87a5913f1a52464190bb655ad230539c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/lcr b/lfs/lcr
index 321be97..7ada81d 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -91,5 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/var/ipfire/lcr/routing.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
/var/ipfire/backup/addons/includes/lcr
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,lcr)
+
@rm -rf $(DIR_SRC)/lcr
@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index 996d32e..5a9548d 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -89,8 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
- install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,libvirtd)
+ $(call INSTALL_INITSCRIPT,virtlogd)
mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
# Backup
install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt
diff --git a/lfs/lm_sensors b/lfs/lm_sensors
index f343a2f..2c4d2ef 100644
--- a/lfs/lm_sensors
+++ b/lfs/lm_sensors
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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.3.4
+VER = 3.4.0
THISAPP = lm_sensors-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 60cfb98ab7a8915c3ac684af5459de2e
+$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a
install : $(TARGET)
diff --git a/lfs/mc b/lfs/mc
index d5d57bf..1680a96 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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 = 4.8.18
+VER = 4.8.19
THISAPP = mc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mc
-PAK_VER = 14
+PAK_VER = 15
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 85ff9279f912c5482fe9f110f8892c96
+$(DL_FILE)_MD5 = 57209d138c0adcb9ea01dfe6bbb4cb87
install : $(TARGET)
diff --git a/lfs/mediatomb b/lfs/mediatomb
index 5811a0a..c36710a 100644
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -85,5 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/mediatomb \
/var/ipfire/backup/addons/includes/mediatomb
echo Folder for music files > /var/mp3/info
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mediatomb)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/miau b/lfs/miau
index c3ca754..8106587 100644
--- a/lfs/miau
+++ b/lfs/miau
@@ -85,6 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir /opt/miau/config
install -v -m 640 $(DIR_SRC)/config/miau/miaurc \
/opt/miau/config/miaurc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,miau)
+
ln -sf ../init.d/miau /etc/rc.d/rc3.d/S60miau
ln -sf ../init.d/miau /etc/rc.d/rc0.d/K01miau
ln -sf ../init.d/miau /etc/rc.d/rc6.d/K01miau
diff --git a/lfs/minidlna b/lfs/minidlna
index 1c3f61c..3302cdd 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -83,5 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install configuration.
install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,minidlna)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 18b8c39..0e2c890 100644
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -81,5 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /etc/miniupnpd
cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,miniupnpd)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/monit b/lfs/monit
index 2735e15..cfa9699 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -89,6 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install default configuration
install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,monit)
+
# Install start links and backup include file.
ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit
ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit
diff --git a/lfs/motion b/lfs/motion
index 39c6b73..d226c1c 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2017 Michael Tremer & Christian Schmidt #
# #
# 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,16 +24,16 @@
include Config
-VER = 3.2.12
+VER = 4.0.1
-THISAPP = motion-$(VER)
+THISAPP = motion-release-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = motion
-PAK_VER = 1
+PAK_VER = 2
DEPS = "ffmpeg"
###############################################################################
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1ba0065ed50509aaffb171594c689f46
+$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f
install : $(TARGET)
@@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#Install obsolete V4L1 videodev.h
cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
+ cd $(DIR_APP) && autoreconf -fiv
+
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@@ -91,5 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#Remove obsolete V4L1 videodev.h
rm -f /usr/include/linux/videodev.h
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,motion)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/mpd b/lfs/mpd
index 7b2c54d..3213b27 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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.16.5
+VER = 0.20.6
THISAPP = mpd-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
-PAK_VER = 14
+PAK_VER = 15
DEPS = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f7564cff12035f6a1112cce770655df7
+$(DL_FILE)_MD5 = 1197a2190fc8ddfccbf4bba3b749cea4
install : $(TARGET)
@@ -77,12 +77,25 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr \
- --disable-ipv6 \
- --sysconfdir=/etc \
- --disable-sqlite
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-ipv6 \
+ --sysconfdir=/etc \
+ --disable-sqlite \
+ --enable-id3 \
+ --enable-vorbis \
+ --enable-expat \
+ --enable-ffmpeg \
+ --enable-flac \
+ --enable-lame-encoder \
+ --enable-upnp \
+ --disable-icu
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mpd)
+
@rm -rf $(DIR_APP)
touch /var/log/mpd.error.log
touch /var/log/mpd.log
diff --git a/lfs/mysql b/lfs/mysql
index edcd651..089516e 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -102,5 +102,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m755 -o mysql -g mysql -d /var/run/mysql
install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \
/var/ipfire/backup/addons/includes/mysql
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,mysql)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index b513678..1e59457 100644
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -90,7 +90,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \
/var/ipfire/backup/addons/includes/netsnmpd
- install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,netsnmpd)
+
ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd
ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd
ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd
diff --git a/lfs/nettle b/lfs/nettle
index d0a3e5a..96f0e32 100644
--- a/lfs/nettle
+++ b/lfs/nettle
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2017 IPFire Team <info(a)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.2
+VER = 3.3
THISAPP = nettle-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = afb15b4764ebf1b4e6d06c62bd4d29e4
+$(DL_FILE)_MD5 = 10f969f78a463704ae73529978148dbe
install : $(TARGET)
@@ -70,10 +70,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-documentation \
+ --disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
chmod -v 755 /usr/lib/lib{hogweed,nettle}.so
- install -v -m755 -d /usr/share/doc/nettle-3.2
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/nfs b/lfs/nfs
index 23a1773..2a8e331 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -98,5 +98,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,nfs-server)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ntp b/lfs/ntp
index 572bb88..1f1c524 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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 = 4.2.8p9
+VER = 4.2.8p10
THISAPP = ntp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 857452b05f5f2e033786f77ade1974ed
+$(DL_FILE)_MD5 = 745384ed0dedb3f66b33fe84d66466f9
install : $(TARGET)
diff --git a/lfs/nut b/lfs/nut
index c64c5a2..2045dce 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -84,6 +84,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
# sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules
-mkdir -p /var/state/ups
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,nut)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \
/var/ipfire/backup/addons/includes/nut
@rm -rf $(DIR_APP)
diff --git a/lfs/openssh b/lfs/openssh
index 371d0df..005e4df 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 7.3p1
+VER = 7.4p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dfadd9f035d38ce5d58a3bf130b86d08
+$(DL_FILE)_MD5 = b2db2a83caf66a208bb78d6d287cdaa3
install : $(TARGET)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 72101d5..1cf9427 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -90,6 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-xerces-c --without-xerces
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,openvmtools)
ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
diff --git a/lfs/pixman b/lfs/pixman
index 1cb2a08..e06e0c4 100644
--- a/lfs/pixman
+++ b/lfs/pixman
@@ -24,7 +24,7 @@
include Config
-VER = 0.26.0
+VER = 0.34.0
THISAPP = pixman-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6563b6400b9fa23b47fd52105faf72b4
+$(DL_FILE)_MD5 = e80ebae4da01e77f68744319f01d52a3
install : $(TARGET)
diff --git a/lfs/poppler b/lfs/poppler
new file mode 100644
index 0000000..3207e5d
--- /dev/null
+++ b/lfs/poppler
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.52.0
+
+THISAPP = poppler-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = dfdd55d5df39685bbb82b0c08fa4ef66
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=/usr \
+ --enable-cairo-output \
+ --enable-cms=lcms2 \
+ --enable-libjpeg \
+ --enable-libpng \
+ --enable-xpdf-headers
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/postfix b/lfs/postfix
index b8029f7..3758b9c 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -116,5 +116,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \
/var/ipfire/backup/addons/includes/postfix
mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,postfix)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/pound b/lfs/pound
index 3860122..b4206d0 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-dh=1024
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,pound)
+
install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
/var/ipfire/backup/addons/includes/pound
diff --git a/lfs/qemu b/lfs/qemu
index 26c2f24..57d79a3 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
- --enable-kvm --disable-bluez --disable-attr \
+ --localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/qpdf b/lfs/qpdf
new file mode 100644
index 0000000..44cd23f
--- /dev/null
+++ b/lfs/qpdf
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 6.0.0
+
+THISAPP = qpdf-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = e014bd3ecf1c4d1a520bbc14d84ac20e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/rpcbind b/lfs/rpcbind
index e7f9eff..046121f 100644
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -82,5 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,rpcbind)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/rtpproxy b/lfs/rtpproxy
index 88715dd..be276c6 100644
--- a/lfs/rtpproxy
+++ b/lfs/rtpproxy
@@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,rtpproxy)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/samba b/lfs/samba
index 74a1b76..076152f 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -136,5 +136,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chmod 750 /var/lib/samba/winbindd_privileged
chgrp wbpriv /var/lib/samba/winbindd_privileged
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,samba)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/sane b/lfs/sane
index 64f3375..9e456f0 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -85,6 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
chmod 4755 /usr/bin/scanimage
cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,sane)
+
ln -sf ../init.d/sane /etc/rc.d/rc3.d/S95sane
ln -sf ../init.d/sane /etc/rc.d/rc0.d/K10sane
ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 02d60fe..75944a7 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -80,5 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && yes 'n' | perl Makefile.PL
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,spamassassin)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/squid b/lfs/squid
index 4a8d9d8..70d83b0 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
include Config
-VER = 3.5.24
+VER = 3.5.25
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3fae511e16b6379b61c011914673973d
+$(DL_FILE)_MD5 = 6b7dd7b42b1adacf08f3155640ea2782
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.24-fix-max-file-descriptors.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.25-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
@@ -147,7 +147,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
cp -f $(DIR_SRC)/config/updxlrator/checkdeaddl /var/ipfire/updatexlrator/bin/checkdeaddl
- cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
+ cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator/updxlrator-lib.pl
chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
/var/ipfire/updatexlrator/bin/download \
diff --git a/lfs/sslh b/lfs/sslh
index f4201c3..8262a5f 100644
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -79,5 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,sslh)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index 9e8f155..fffa9af 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-disable-ipv6.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
cd $(DIR_APP) && ./configure \
@@ -108,8 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Remove all library files we don't want or need.
rm -vf /usr/lib/ipsec/plugins/*.{,l}a
- -rm -rfv /etc/rc*.d/*ipsec
- cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
rm -f /etc/ipsec.conf /etc/ipsec.secrets
ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets
diff --git a/lfs/stunnel b/lfs/stunnel
index 4585151..684e452 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -88,6 +88,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m750 -o stunnel -g stunnel -d /var/lib/stunnel/run
chown -v stunnel:stunnel /var/lib/stunnel
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,stunnel)
+
+
# Install default configuration
-mkdir -pv /etc/stunnel
install -v -m 644 $(DIR_SRC)/config/stunnel/stunnel.conf \
diff --git a/lfs/tcpdump b/lfs/tcpdump
index cfeaffa..42536f1 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -24,7 +24,7 @@
include Config
-VER = 4.8.1
+VER = 4.9.0
THISAPP = tcpdump-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tcpdump
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 32f57943649f276e09236ba66622bb0c
+$(DL_FILE)_MD5 = 2b83364eef53b63ca3181b4eb56dab0c
install : $(TARGET)
@@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
- --disable-nls \
--with-crypto \
--without-smi
diff --git a/lfs/tftpd b/lfs/tftpd
index 2ebf84a..e0cd93b 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -81,5 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,tftpd)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/tor b/lfs/tor
index be812e0..4da2c7c 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -107,6 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/tor/defaults-torrc \
/usr/share/tor/defaults-torrc
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,tor)
+
# Install start links and backup include file.
ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor
ln -sf ../init.d/tor /etc/rc.d/rc0.d/K40tor
diff --git a/lfs/transmission b/lfs/transmission
index 36eb3c4..79ebaa1 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -88,6 +88,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -vf $(DIR_SRC)/config/transmission/* /etc/transmission/
chown -Rv nobody.nobody /etc/transmission
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,transmission)
+
# Install backup include
install -v -m 644 $(DIR_SRC)/config/backup/includes/transmission \
/var/ipfire/backup/addons/includes/transmission
diff --git a/lfs/unbound b/lfs/unbound
index 3494a7b..f361f24 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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.6.0
+VER = 1.6.1
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78409eccf7260d260b6463f85e59c66b
+$(DL_FILE)_MD5 = aa808f33d94a36c9312d1b8ad8805e14
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/lfs/vdr b/lfs/vdr
index 52ecdd5..99e8104 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -131,6 +131,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h
ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vdr)
+
# Install start links and backup include file.
ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr
ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr
diff --git a/lfs/vdradmin b/lfs/vdradmin
index b38ecca..bca5c58 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
export "LANG=de_DE"
cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
cd $(DIR_APP) && ./install-ipfire.sh
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vdradmin)
+
install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
/etc/vdradmin/vdradmind.conf
mkdir -pv /var/log/vdradmin
diff --git a/lfs/vsftpd b/lfs/vsftpd
index 7284be9..07dda30 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -87,6 +87,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5
cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc
cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,vsftpd)
+
ln -sf ../init.d/vsftpd /etc/rc.d/rc3.d/S65vsftpd
ln -sf ../init.d/vsftpd /etc/rc.d/rc0.d/K35vsftpd
ln -sf ../init.d/vsftpd /etc/rc.d/rc6.d/K35vsftpd
diff --git a/lfs/watchdog b/lfs/watchdog
index 70bf692..9bef907 100644
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,watchdog)
install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \
/var/ipfire/backup/addons/includes/watchdog
@rm -rf $(DIR_APP)
diff --git a/lfs/wget b/lfs/wget
index c22a978..8d3d13c 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)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.18
+VER = 1.19.1
THISAPP = wget-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec
+$(DL_FILE)_MD5 = d30d82186b93fcabb4116ff513bfa9bd
install : $(TARGET)
diff --git a/lfs/xinetd b/lfs/xinetd
index 62f34ea..42d9288 100644
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -81,5 +81,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make install
-mkdir -pv /etc/xinetd.d
cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf
+
+ #install initscripts
+ $(call INSTALL_INITSCRIPT,xinetd)
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index cf27c23..183ee7d 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="109" # Core Level (Filename)
-PAKFIRE_CORE="109" # Core Level (PAKFIRE)
+CORE="110" # Core Level (Filename)
+PAKFIRE_CORE="110" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -393,6 +393,7 @@ buildipfire() {
LOGFILE="$BASEDIR/log/_build.ipfire.log"
export LOGFILE
ipfiremake configroot
+ ipfiremake initscripts
ipfiremake backup
ipfiremake pkg-config
ipfiremake libusb
@@ -487,12 +488,17 @@ buildipfire() {
ipfiremake libgpg-error
ipfiremake libgcrypt
ipfiremake libassuan
+ ipfiremake nettle
+ ipfiremake libevent
+ ipfiremake libevent2
+ ipfiremake expat
+ ipfiremake unbound
+ ipfiremake gnutls
ipfiremake bind
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake boost
ipfiremake linux-atm
- ipfiremake expat
ipfiremake gdbm
ipfiremake pam
ipfiremake curl
@@ -539,10 +545,6 @@ buildipfire() {
ipfiremake arping
ipfiremake beep
ipfiremake dvdrtools
- ipfiremake nettle
- ipfiremake libevent
- ipfiremake libevent2
- ipfiremake unbound
ipfiremake dosfstools
ipfiremake reiserfsprogs
ipfiremake xfsprogs
@@ -562,7 +564,6 @@ buildipfire() {
ipfiremake hdparm
ipfiremake sdparm
ipfiremake mtools
- ipfiremake initscripts
ipfiremake whatmask
ipfiremake conntrack-tools
ipfiremake libupnp
@@ -645,8 +646,16 @@ buildipfire() {
ipfiremake pammysql
ipfiremake mpage
ipfiremake dbus
+ ipfiremake intltool
+ ipfiremake libdaemon
+ ipfiremake avahi
ipfiremake cups
ipfiremake ghostscript
+ ipfiremake lcms2
+ ipfiremake qpdf
+ ipfiremake poppler
+ ipfiremake cups-filters
+ ipfiremake epson-inkjet-printer-escpr
ipfiremake foomatic
ipfiremake hplip
ipfiremake cifs-utils
@@ -811,7 +820,6 @@ buildipfire() {
ipfiremake python-lzma
ipfiremake python-progressbar
ipfiremake python-xattr
- ipfiremake intltool
ipfiremake ddns
ipfiremake transmission
ipfiremake dpfhack
@@ -830,8 +838,6 @@ buildipfire() {
ipfiremake libstatgrab
ipfiremake sarg
ipfiremake check_mk_agent
- ipfiremake libdaemon
- ipfiremake avahi
ipfiremake nginx
ipfiremake sendEmail
ipfiremake sysbench
diff --git a/src/initscripts/init.d/applejuice b/src/initscripts/init.d/applejuice
deleted file mode 100644
index d8bbc8c..0000000
--- a/src/initscripts/init.d/applejuice
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/applejuice
-#
-# Description : Applejuice Init script
-#
-# Authors : Michael Tremer - www.ipfire.org
-#
-# Version : 01.00
-#
-# Notes :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-eval $(/usr/local/bin/readhash /var/ipfire/applejuice/settings)
-
-
-case "${1}" in
- start)
- boot_mesg "Starting Applejuice Core..."
- cd /opt/applejuice
- screen -dmS ajcore /usr/bin/java -Xmx${RAMSIZE} -Djava.library.path=. -jar ajcore.jar
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping Applejuice Core..."
- killproc /usr/bin/java
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/bin/java
- ;;
-
- core)
- screen -x ajcore
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|status|core}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/applejuice
diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/networking/any
similarity index 100%
rename from src/initscripts/init.d/networking/any
rename to src/initscripts/networking/any
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
similarity index 100%
rename from src/initscripts/init.d/networking/dhcpcd.exe
rename to src/initscripts/networking/dhcpcd.exe
diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/networking/functions.network
similarity index 100%
rename from src/initscripts/init.d/networking/functions.network
rename to src/initscripts/networking/functions.network
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/networking/red
similarity index 99%
rename from src/initscripts/init.d/networking/red
rename to src/initscripts/networking/red
index 9dfbad6..00e739c 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/networking/red
@@ -124,6 +124,9 @@ case "${1}" in
echo -n "${DNS2}" > /var/ipfire/red/dns2
touch /var/ipfire/red/active
+ # Create route to default gateway
+ ip route add ${GATEWAY} dev ${DEVICE}
+
boot_mesg "Setting up default gateway ${GATEWAY}..."
ip route add default via ${GATEWAY} dev ${DEVICE}
evaluate_retval
diff --git a/src/initscripts/init.d/networking/red.down/05-update-dns-forwarders b/src/initscripts/networking/red.down/05-update-dns-forwarders
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/05-update-dns-forwarders
rename to src/initscripts/networking/red.down/05-update-dns-forwarders
diff --git a/src/initscripts/init.d/networking/red.down/10-ipsec b/src/initscripts/networking/red.down/10-ipsec
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-ipsec
rename to src/initscripts/networking/red.down/10-ipsec
diff --git a/src/initscripts/init.d/networking/red.down/10-miniupnpd b/src/initscripts/networking/red.down/10-miniupnpd
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-miniupnpd
rename to src/initscripts/networking/red.down/10-miniupnpd
diff --git a/src/initscripts/init.d/networking/red.down/10-ovpn b/src/initscripts/networking/red.down/10-ovpn
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-ovpn
rename to src/initscripts/networking/red.down/10-ovpn
diff --git a/src/initscripts/init.d/networking/red.down/10-static-routes b/src/initscripts/networking/red.down/10-static-routes
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/10-static-routes
rename to src/initscripts/networking/red.down/10-static-routes
diff --git a/src/initscripts/init.d/networking/red.down/20-firewall b/src/initscripts/networking/red.down/20-firewall
similarity index 100%
rename from src/initscripts/init.d/networking/red.down/20-firewall
rename to src/initscripts/networking/red.down/20-firewall
diff --git a/src/initscripts/init.d/networking/red.up/01-conntrack-cleanup b/src/initscripts/networking/red.up/01-conntrack-cleanup
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/01-conntrack-cleanup
rename to src/initscripts/networking/red.up/01-conntrack-cleanup
diff --git a/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders b/src/initscripts/networking/red.up/05-update-dns-forwarders
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/05-update-dns-forwarders
rename to src/initscripts/networking/red.up/05-update-dns-forwarders
diff --git a/src/initscripts/init.d/networking/red.up/10-miniupnpd b/src/initscripts/networking/red.up/10-miniupnpd
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-miniupnpd
rename to src/initscripts/networking/red.up/10-miniupnpd
diff --git a/src/initscripts/init.d/networking/red.up/10-multicast b/src/initscripts/networking/red.up/10-multicast
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-multicast
rename to src/initscripts/networking/red.up/10-multicast
diff --git a/src/initscripts/init.d/networking/red.up/10-static-routes b/src/initscripts/networking/red.up/10-static-routes
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/10-static-routes
rename to src/initscripts/networking/red.up/10-static-routes
diff --git a/src/initscripts/init.d/networking/red.up/20-firewall b/src/initscripts/networking/red.up/20-firewall
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/20-firewall
rename to src/initscripts/networking/red.up/20-firewall
diff --git a/src/initscripts/init.d/networking/red.up/30-ddns b/src/initscripts/networking/red.up/30-ddns
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/30-ddns
rename to src/initscripts/networking/red.up/30-ddns
diff --git a/src/initscripts/init.d/networking/red.up/35-guardian b/src/initscripts/networking/red.up/35-guardian
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/35-guardian
rename to src/initscripts/networking/red.up/35-guardian
diff --git a/src/initscripts/init.d/networking/red.up/50-ipsec b/src/initscripts/networking/red.up/50-ipsec
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/50-ipsec
rename to src/initscripts/networking/red.up/50-ipsec
diff --git a/src/initscripts/init.d/networking/red.up/50-ovpn b/src/initscripts/networking/red.up/50-ovpn
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/50-ovpn
rename to src/initscripts/networking/red.up/50-ovpn
diff --git a/src/initscripts/init.d/networking/red.up/98-leds b/src/initscripts/networking/red.up/98-leds
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/98-leds
rename to src/initscripts/networking/red.up/98-leds
diff --git a/src/initscripts/init.d/networking/red.up/99-fireinfo b/src/initscripts/networking/red.up/99-fireinfo
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-fireinfo
rename to src/initscripts/networking/red.up/99-fireinfo
diff --git a/src/initscripts/init.d/networking/red.up/99-geoip-database b/src/initscripts/networking/red.up/99-geoip-database
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-geoip-database
rename to src/initscripts/networking/red.up/99-geoip-database
diff --git a/src/initscripts/init.d/networking/red.up/99-pakfire-update b/src/initscripts/networking/red.up/99-pakfire-update
similarity index 100%
rename from src/initscripts/init.d/networking/red.up/99-pakfire-update
rename to src/initscripts/networking/red.up/99-pakfire-update
diff --git a/src/initscripts/init.d/networking/wpa_supplicant.exe b/src/initscripts/networking/wpa_supplicant.exe
similarity index 100%
rename from src/initscripts/init.d/networking/wpa_supplicant.exe
rename to src/initscripts/networking/wpa_supplicant.exe
diff --git a/src/initscripts/init.d/alsa b/src/initscripts/packages/alsa
similarity index 100%
rename from src/initscripts/init.d/alsa
rename to src/initscripts/packages/alsa
diff --git a/src/initscripts/init.d/amavisd b/src/initscripts/packages/amavisd
similarity index 100%
rename from src/initscripts/init.d/amavisd
rename to src/initscripts/packages/amavisd
diff --git a/src/initscripts/init.d/apcupsd b/src/initscripts/packages/apcupsd
similarity index 100%
rename from src/initscripts/init.d/apcupsd
rename to src/initscripts/packages/apcupsd
diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/packages/asterisk
similarity index 100%
rename from src/initscripts/init.d/asterisk
rename to src/initscripts/packages/asterisk
diff --git a/src/initscripts/init.d/bluetooth b/src/initscripts/packages/bluetooth
similarity index 100%
rename from src/initscripts/init.d/bluetooth
rename to src/initscripts/packages/bluetooth
diff --git a/src/initscripts/init.d/clamav b/src/initscripts/packages/clamav
similarity index 100%
rename from src/initscripts/init.d/clamav
rename to src/initscripts/packages/clamav
diff --git a/src/initscripts/init.d/client175 b/src/initscripts/packages/client175
similarity index 100%
rename from src/initscripts/init.d/client175
rename to src/initscripts/packages/client175
diff --git a/src/initscripts/init.d/cpufreq b/src/initscripts/packages/cpufreq
similarity index 100%
rename from src/initscripts/init.d/cpufreq
rename to src/initscripts/packages/cpufreq
diff --git a/src/initscripts/init.d/cups b/src/initscripts/packages/cups
similarity index 100%
rename from src/initscripts/init.d/cups
rename to src/initscripts/packages/cups
diff --git a/src/initscripts/init.d/cyrus-imapd b/src/initscripts/packages/cyrus-imapd
similarity index 100%
rename from src/initscripts/init.d/cyrus-imapd
rename to src/initscripts/packages/cyrus-imapd
diff --git a/src/initscripts/init.d/cyrus-sasl b/src/initscripts/packages/cyrus-sasl
similarity index 100%
rename from src/initscripts/init.d/cyrus-sasl
rename to src/initscripts/packages/cyrus-sasl
diff --git a/src/initscripts/init.d/dnsdist b/src/initscripts/packages/dnsdist
similarity index 100%
rename from src/initscripts/init.d/dnsdist
rename to src/initscripts/packages/dnsdist
diff --git a/src/initscripts/init.d/fetchmail b/src/initscripts/packages/fetchmail
similarity index 100%
rename from src/initscripts/init.d/fetchmail
rename to src/initscripts/packages/fetchmail
diff --git a/src/initscripts/init.d/freeradius b/src/initscripts/packages/freeradius
similarity index 100%
rename from src/initscripts/init.d/freeradius
rename to src/initscripts/packages/freeradius
diff --git a/src/initscripts/init.d/gnump3d b/src/initscripts/packages/gnump3d
similarity index 100%
rename from src/initscripts/init.d/gnump3d
rename to src/initscripts/packages/gnump3d
diff --git a/src/initscripts/init.d/guardian b/src/initscripts/packages/guardian
similarity index 100%
rename from src/initscripts/init.d/guardian
rename to src/initscripts/packages/guardian
diff --git a/src/initscripts/init.d/haproxy b/src/initscripts/packages/haproxy
similarity index 100%
rename from src/initscripts/init.d/haproxy
rename to src/initscripts/packages/haproxy
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/packages/hostapd
similarity index 100%
rename from src/initscripts/init.d/hostapd
rename to src/initscripts/packages/hostapd
diff --git a/src/initscripts/init.d/imspector b/src/initscripts/packages/imspector
similarity index 100%
rename from src/initscripts/init.d/imspector
rename to src/initscripts/packages/imspector
diff --git a/src/initscripts/init.d/keepalived b/src/initscripts/packages/keepalived
similarity index 100%
rename from src/initscripts/init.d/keepalived
rename to src/initscripts/packages/keepalived
diff --git a/src/initscripts/init.d/lcd4linux b/src/initscripts/packages/lcd4linux
similarity index 100%
rename from src/initscripts/init.d/lcd4linux
rename to src/initscripts/packages/lcd4linux
diff --git a/src/initscripts/init.d/lcdproc b/src/initscripts/packages/lcdproc
similarity index 100%
rename from src/initscripts/init.d/lcdproc
rename to src/initscripts/packages/lcdproc
diff --git a/src/initscripts/init.d/lcr b/src/initscripts/packages/lcr
similarity index 100%
rename from src/initscripts/init.d/lcr
rename to src/initscripts/packages/lcr
diff --git a/src/initscripts/init.d/libvirtd b/src/initscripts/packages/libvirtd
similarity index 100%
rename from src/initscripts/init.d/libvirtd
rename to src/initscripts/packages/libvirtd
diff --git a/src/initscripts/init.d/mediatomb b/src/initscripts/packages/mediatomb
similarity index 100%
rename from src/initscripts/init.d/mediatomb
rename to src/initscripts/packages/mediatomb
diff --git a/src/initscripts/init.d/messagebus b/src/initscripts/packages/messagebus
similarity index 100%
rename from src/initscripts/init.d/messagebus
rename to src/initscripts/packages/messagebus
diff --git a/src/initscripts/init.d/miau b/src/initscripts/packages/miau
similarity index 100%
rename from src/initscripts/init.d/miau
rename to src/initscripts/packages/miau
diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/packages/minidlna
similarity index 100%
rename from src/initscripts/init.d/minidlna
rename to src/initscripts/packages/minidlna
diff --git a/src/initscripts/init.d/miniupnpd b/src/initscripts/packages/miniupnpd
similarity index 100%
rename from src/initscripts/init.d/miniupnpd
rename to src/initscripts/packages/miniupnpd
diff --git a/src/initscripts/init.d/monit b/src/initscripts/packages/monit
similarity index 100%
rename from src/initscripts/init.d/monit
rename to src/initscripts/packages/monit
diff --git a/src/initscripts/init.d/motion b/src/initscripts/packages/motion
similarity index 100%
rename from src/initscripts/init.d/motion
rename to src/initscripts/packages/motion
diff --git a/src/initscripts/init.d/mpd b/src/initscripts/packages/mpd
similarity index 100%
rename from src/initscripts/init.d/mpd
rename to src/initscripts/packages/mpd
diff --git a/src/initscripts/init.d/mysql b/src/initscripts/packages/mysql
similarity index 100%
rename from src/initscripts/init.d/mysql
rename to src/initscripts/packages/mysql
diff --git a/src/initscripts/init.d/netsnmpd b/src/initscripts/packages/netsnmpd
similarity index 100%
rename from src/initscripts/init.d/netsnmpd
rename to src/initscripts/packages/netsnmpd
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/packages/nfs-server
similarity index 100%
rename from src/initscripts/init.d/nfs-server
rename to src/initscripts/packages/nfs-server
diff --git a/src/initscripts/init.d/nut b/src/initscripts/packages/nut
similarity index 100%
rename from src/initscripts/init.d/nut
rename to src/initscripts/packages/nut
diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/packages/openvmtools
similarity index 100%
rename from src/initscripts/init.d/openvmtools
rename to src/initscripts/packages/openvmtools
diff --git a/src/initscripts/init.d/postfix b/src/initscripts/packages/postfix
similarity index 100%
rename from src/initscripts/init.d/postfix
rename to src/initscripts/packages/postfix
diff --git a/src/initscripts/init.d/pound b/src/initscripts/packages/pound
similarity index 100%
rename from src/initscripts/init.d/pound
rename to src/initscripts/packages/pound
diff --git a/src/initscripts/init.d/rpcbind b/src/initscripts/packages/rpcbind
similarity index 100%
rename from src/initscripts/init.d/rpcbind
rename to src/initscripts/packages/rpcbind
diff --git a/src/initscripts/init.d/rtpproxy b/src/initscripts/packages/rtpproxy
similarity index 100%
rename from src/initscripts/init.d/rtpproxy
rename to src/initscripts/packages/rtpproxy
diff --git a/src/initscripts/init.d/samba b/src/initscripts/packages/samba
similarity index 100%
rename from src/initscripts/init.d/samba
rename to src/initscripts/packages/samba
diff --git a/src/initscripts/init.d/sane b/src/initscripts/packages/sane
similarity index 100%
rename from src/initscripts/init.d/sane
rename to src/initscripts/packages/sane
diff --git a/src/initscripts/init.d/spamassassin b/src/initscripts/packages/spamassassin
similarity index 100%
rename from src/initscripts/init.d/spamassassin
rename to src/initscripts/packages/spamassassin
diff --git a/src/initscripts/init.d/sslh b/src/initscripts/packages/sslh
similarity index 100%
rename from src/initscripts/init.d/sslh
rename to src/initscripts/packages/sslh
diff --git a/src/initscripts/init.d/stunnel b/src/initscripts/packages/stunnel
similarity index 100%
rename from src/initscripts/init.d/stunnel
rename to src/initscripts/packages/stunnel
diff --git a/src/initscripts/init.d/tftpd b/src/initscripts/packages/tftpd
similarity index 100%
rename from src/initscripts/init.d/tftpd
rename to src/initscripts/packages/tftpd
diff --git a/src/initscripts/init.d/tor b/src/initscripts/packages/tor
similarity index 100%
rename from src/initscripts/init.d/tor
rename to src/initscripts/packages/tor
diff --git a/src/initscripts/init.d/transmission b/src/initscripts/packages/transmission
similarity index 100%
rename from src/initscripts/init.d/transmission
rename to src/initscripts/packages/transmission
diff --git a/src/initscripts/init.d/vdr b/src/initscripts/packages/vdr
similarity index 100%
rename from src/initscripts/init.d/vdr
rename to src/initscripts/packages/vdr
diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/packages/vdradmin
similarity index 100%
rename from src/initscripts/init.d/vdradmin
rename to src/initscripts/packages/vdradmin
diff --git a/src/initscripts/init.d/virtlogd b/src/initscripts/packages/virtlogd
similarity index 100%
rename from src/initscripts/init.d/virtlogd
rename to src/initscripts/packages/virtlogd
diff --git a/src/initscripts/init.d/vsftpd b/src/initscripts/packages/vsftpd
similarity index 100%
rename from src/initscripts/init.d/vsftpd
rename to src/initscripts/packages/vsftpd
diff --git a/src/initscripts/init.d/watchdog b/src/initscripts/packages/watchdog
similarity index 100%
rename from src/initscripts/init.d/watchdog
rename to src/initscripts/packages/watchdog
diff --git a/src/initscripts/init.d/xinetd b/src/initscripts/packages/xinetd
similarity index 100%
rename from src/initscripts/init.d/xinetd
rename to src/initscripts/packages/xinetd
diff --git a/src/initscripts/init.d/acpid b/src/initscripts/system/acpid
similarity index 100%
rename from src/initscripts/init.d/acpid
rename to src/initscripts/system/acpid
diff --git a/src/initscripts/init.d/apache b/src/initscripts/system/apache
similarity index 100%
rename from src/initscripts/init.d/apache
rename to src/initscripts/system/apache
diff --git a/src/initscripts/init.d/beep b/src/initscripts/system/beep
similarity index 100%
rename from src/initscripts/init.d/beep
rename to src/initscripts/system/beep
diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/system/checkfs
similarity index 100%
rename from src/initscripts/init.d/checkfs
rename to src/initscripts/system/checkfs
diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/system/cleanfs
similarity index 100%
rename from src/initscripts/init.d/cleanfs
rename to src/initscripts/system/cleanfs
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/system/collectd
similarity index 100%
rename from src/initscripts/init.d/collectd
rename to src/initscripts/system/collectd
diff --git a/src/initscripts/init.d/connectd b/src/initscripts/system/connectd
similarity index 100%
rename from src/initscripts/init.d/connectd
rename to src/initscripts/system/connectd
diff --git a/src/initscripts/init.d/console b/src/initscripts/system/console
similarity index 100%
rename from src/initscripts/init.d/console
rename to src/initscripts/system/console
diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/system/dhcp
similarity index 100%
rename from src/initscripts/init.d/dhcp
rename to src/initscripts/system/dhcp
diff --git a/src/initscripts/init.d/dhcrelay b/src/initscripts/system/dhcrelay
similarity index 100%
rename from src/initscripts/init.d/dhcrelay
rename to src/initscripts/system/dhcrelay
diff --git a/src/initscripts/init.d/fcron b/src/initscripts/system/fcron
similarity index 100%
rename from src/initscripts/init.d/fcron
rename to src/initscripts/system/fcron
diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/system/fireinfo
similarity index 100%
rename from src/initscripts/init.d/fireinfo
rename to src/initscripts/system/fireinfo
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/system/firewall
similarity index 100%
rename from src/initscripts/init.d/firewall
rename to src/initscripts/system/firewall
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/system/firstsetup
similarity index 100%
rename from src/initscripts/init.d/firstsetup
rename to src/initscripts/system/firstsetup
diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/system/fsresize
similarity index 100%
rename from src/initscripts/init.d/fsresize
rename to src/initscripts/system/fsresize
diff --git a/src/initscripts/init.d/functions b/src/initscripts/system/functions
similarity index 100%
rename from src/initscripts/init.d/functions
rename to src/initscripts/system/functions
diff --git a/src/initscripts/init.d/halt b/src/initscripts/system/halt
similarity index 100%
rename from src/initscripts/init.d/halt
rename to src/initscripts/system/halt
diff --git a/src/initscripts/init.d/ipsec b/src/initscripts/system/ipsec
similarity index 100%
rename from src/initscripts/init.d/ipsec
rename to src/initscripts/system/ipsec
diff --git a/src/initscripts/init.d/leds b/src/initscripts/system/leds
similarity index 100%
rename from src/initscripts/init.d/leds
rename to src/initscripts/system/leds
diff --git a/src/initscripts/init.d/localnet b/src/initscripts/system/localnet
similarity index 100%
rename from src/initscripts/init.d/localnet
rename to src/initscripts/system/localnet
diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/system/mISDN
similarity index 100%
rename from src/initscripts/init.d/mISDN
rename to src/initscripts/system/mISDN
diff --git a/src/initscripts/init.d/modules b/src/initscripts/system/modules
similarity index 100%
rename from src/initscripts/init.d/modules
rename to src/initscripts/system/modules
diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/system/mountfs
similarity index 100%
rename from src/initscripts/init.d/mountfs
rename to src/initscripts/system/mountfs
diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/system/mountkernfs
similarity index 100%
rename from src/initscripts/init.d/mountkernfs
rename to src/initscripts/system/mountkernfs
diff --git a/src/initscripts/init.d/mounttmpfs b/src/initscripts/system/mounttmpfs
similarity index 100%
rename from src/initscripts/init.d/mounttmpfs
rename to src/initscripts/system/mounttmpfs
diff --git a/src/initscripts/init.d/network b/src/initscripts/system/network
similarity index 100%
rename from src/initscripts/init.d/network
rename to src/initscripts/system/network
diff --git a/src/initscripts/init.d/network-trigger b/src/initscripts/system/network-trigger
similarity index 100%
rename from src/initscripts/init.d/network-trigger
rename to src/initscripts/system/network-trigger
diff --git a/src/initscripts/init.d/ntp b/src/initscripts/system/ntp
similarity index 100%
rename from src/initscripts/init.d/ntp
rename to src/initscripts/system/ntp
diff --git a/src/initscripts/init.d/partresize b/src/initscripts/system/partresize
similarity index 100%
rename from src/initscripts/init.d/partresize
rename to src/initscripts/system/partresize
diff --git a/src/initscripts/init.d/random b/src/initscripts/system/random
similarity index 100%
rename from src/initscripts/init.d/random
rename to src/initscripts/system/random
diff --git a/src/initscripts/init.d/rc b/src/initscripts/system/rc
similarity index 100%
rename from src/initscripts/init.d/rc
rename to src/initscripts/system/rc
diff --git a/src/initscripts/init.d/reboot b/src/initscripts/system/reboot
similarity index 100%
rename from src/initscripts/init.d/reboot
rename to src/initscripts/system/reboot
diff --git a/src/initscripts/init.d/rngd b/src/initscripts/system/rngd
similarity index 100%
rename from src/initscripts/init.d/rngd
rename to src/initscripts/system/rngd
diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/system/sendsignals
similarity index 100%
rename from src/initscripts/init.d/sendsignals
rename to src/initscripts/system/sendsignals
diff --git a/src/initscripts/init.d/setclock b/src/initscripts/system/setclock
similarity index 100%
rename from src/initscripts/init.d/setclock
rename to src/initscripts/system/setclock
diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/system/smartenabler
similarity index 100%
rename from src/initscripts/init.d/smartenabler
rename to src/initscripts/system/smartenabler
diff --git a/src/initscripts/init.d/snort b/src/initscripts/system/snort
similarity index 100%
rename from src/initscripts/init.d/snort
rename to src/initscripts/system/snort
diff --git a/src/initscripts/init.d/squid b/src/initscripts/system/squid
similarity index 100%
rename from src/initscripts/init.d/squid
rename to src/initscripts/system/squid
diff --git a/src/initscripts/init.d/sshd b/src/initscripts/system/sshd
similarity index 100%
rename from src/initscripts/init.d/sshd
rename to src/initscripts/system/sshd
diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/system/static-routes
similarity index 100%
rename from src/initscripts/init.d/static-routes
rename to src/initscripts/system/static-routes
diff --git a/src/initscripts/init.d/swap b/src/initscripts/system/swap
similarity index 100%
rename from src/initscripts/init.d/swap
rename to src/initscripts/system/swap
diff --git a/src/initscripts/init.d/swconfig b/src/initscripts/system/swconfig
similarity index 100%
rename from src/initscripts/init.d/swconfig
rename to src/initscripts/system/swconfig
diff --git a/src/initscripts/init.d/sysctl b/src/initscripts/system/sysctl
similarity index 100%
rename from src/initscripts/init.d/sysctl
rename to src/initscripts/system/sysctl
diff --git a/src/initscripts/init.d/sysklogd b/src/initscripts/system/sysklogd
similarity index 100%
rename from src/initscripts/init.d/sysklogd
rename to src/initscripts/system/sysklogd
diff --git a/src/initscripts/init.d/template b/src/initscripts/system/template
similarity index 100%
rename from src/initscripts/init.d/template
rename to src/initscripts/system/template
diff --git a/src/initscripts/init.d/udev b/src/initscripts/system/udev
similarity index 100%
rename from src/initscripts/init.d/udev
rename to src/initscripts/system/udev
diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/system/udev_retry
similarity index 100%
rename from src/initscripts/init.d/udev_retry
rename to src/initscripts/system/udev_retry
diff --git a/src/initscripts/init.d/unbound b/src/initscripts/system/unbound
similarity index 82%
rename from src/initscripts/init.d/unbound
rename to src/initscripts/system/unbound
index 8802781..a1763a1 100644
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/system/unbound
@@ -114,17 +114,38 @@ update_forwarders() {
echo_warning
fi
- if [ -n "${broken_forwarders}" -a -z "${forwarders}" ]; then
- boot_mesg "Falling back to recursor mode" ${WARNING}
- echo_warning
-
- elif [ -n "${forwarders}" ]; then
+ if [ -n "${forwarders}" ]; then
boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO}
echo_ok
+ # Make sure DNSSEC is activated
+ enable_dnssec
+
echo "${forwarders}" > /var/ipfire/red/dns
unbound-control -q forward ${forwarders}
return 0
+
+ # In case we have found no working forwarders
+ else
+ # Test if the recursor mode is available
+ if can_resolve_root +bufsize=${new_edns_buffer_size}; then
+ # Make sure DNSSEC is activated
+ enable_dnssec
+
+ boot_mesg "Falling back to recursor mode" ${WARNING}
+ echo_warning
+
+ # If not, we set DNSSEC in permissive mode and allow using all recursors
+ elif [ -n "${broken_forwarders}" ]; then
+ disable_dnssec
+
+ boot_mesg "DNSSEC has been set to permissive mode" ${FAILURE}
+ echo_failure
+
+ echo "${broken_forwarders}" > /var/ipfire/red/dns
+ unbound-control -q forward ${broken_forwarders}
+ return 0
+ fi
fi
fi
@@ -223,17 +244,29 @@ write_tuning_conf() {
# In the worst case scenario, unbound can use double the
# amount of memory allocated to a cache due to malloc overhead
+ # Even larger systems with more than 8GB of RAM
+ if [ ${mem} -ge 8192 ]; then
+ mem=1024
+
+ # Extra large systems with more than 4GB of RAM
+ elif [ ${mem} -ge 4096 ]; then
+ mem=512
+
# Large systems with more than 2GB of RAM
- if [ ${mem} -ge 2048 ]; then
+ elif [ ${mem} -ge 2048 ]; then
+ mem=256
+
+ # Medium systems with more than 1GB of RAM
+ elif [ ${mem} -ge 1024 ]; then
mem=128
# Small systems with less than 256MB of RAM
elif [ ${mem} -le 256 ]; then
- mem=8
+ mem=16
# Everything else
else
- mem=32
+ mem=64
fi
(
@@ -241,6 +274,7 @@ write_tuning_conf() {
# We run one thread per processor
echo "num-threads: ${processors}"
+ echo "so-reuseport: yes"
# Adjust number of slabs
echo "infra-cache-slabs: ${slabs}"
@@ -252,6 +286,14 @@ write_tuning_conf() {
echo "rrset-cache-size: $(( ${mem} / 2 ))m"
echo "msg-cache-size: $(( ${mem} / 4 ))m"
echo "key-cache-size: $(( ${mem} / 4 ))m"
+
+ # Increase parallel queries
+ echo "outgoing-range: 8192"
+ echo "num-queries-per-thread: 4096"
+
+ # Use larger send/receive buffers
+ echo "so-sndbuf: 4m"
+ echo "so-rcvbuf: 4m"
) > /etc/unbound/tuning.conf
}
@@ -370,6 +412,48 @@ ns_determine_edns_buffer_size() {
return 1
}
+get_root_nameservers() {
+ while read -r hostname ttl record address; do
+ # Searching for A records
+ [ "${record}" = "A" ] || continue
+
+ echo "${address}"
+ done < /etc/unbound/root.hints
+}
+
+can_resolve_root() {
+ local ns
+ for ns in $(get_root_nameservers); do
+ if dig @${ns} +dnssec SOA . $@ >/dev/null; then
+ return 0
+ fi
+ done
+
+ # none of the servers was reachable
+ return 1
+}
+
+enable_dnssec() {
+ local status=$(unbound-control get_option val-permissive-mode)
+
+ # Don't do anything if DNSSEC is already activated
+ [ "${status}" = "no" ] && return 0
+
+ # Log DNSSEC status
+ echo "on" > /var/ipfire/red/dnssec-status
+
+ # Activate DNSSEC and flush cache with any stale and unvalidated data
+ unbound-control -q set_option val-permissive-mode: no
+ unbound-control -q flush_zone .
+}
+
+disable_dnssec() {
+ # Log DNSSEC status
+ echo "off" > /var/ipfire/red/dnssec-status
+
+ unbound-control -q set_option val-permissive-mode: yes
+}
+
case "$1" in
start)
# Print a nicer messagen when unbound is already running
diff --git a/src/initscripts/init.d/upnpd b/src/initscripts/system/upnpd
similarity index 100%
rename from src/initscripts/init.d/upnpd
rename to src/initscripts/system/upnpd
diff --git a/src/initscripts/init.d/vnstat b/src/initscripts/system/vnstat
similarity index 100%
rename from src/initscripts/init.d/vnstat
rename to src/initscripts/system/vnstat
diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/system/waitdrives
similarity index 100%
rename from src/initscripts/init.d/waitdrives
rename to src/initscripts/system/waitdrives
diff --git a/src/initscripts/init.d/wlanclient b/src/initscripts/system/wlanclient
similarity index 100%
rename from src/initscripts/init.d/wlanclient
rename to src/initscripts/system/wlanclient
diff --git a/src/patches/squid-3.5.24-fix-max-file-descriptors.patch b/src/patches/squid-3.5.25-fix-max-file-descriptors.patch
similarity index 100%
rename from src/patches/squid-3.5.24-fix-max-file-descriptors.patch
rename to src/patches/squid-3.5.25-fix-max-file-descriptors.patch
diff --git a/src/patches/strongswan-disable-ipv6.patch b/src/patches/strongswan-disable-ipv6.patch
new file mode 100644
index 0000000..e459941
--- /dev/null
+++ b/src/patches/strongswan-disable-ipv6.patch
@@ -0,0 +1,24 @@
+diff --git a/conf/plugins/socket-default.opt b/conf/plugins/socket-default.opt
+index 483a0f03d584..6fc7c2db47a7 100644
+--- a/conf/plugins/socket-default.opt
++++ b/conf/plugins/socket-default.opt
+@@ -7,5 +7,5 @@ charon.plugins.socket-default.set_source = yes
+ charon.plugins.socket-default.use_ipv4 = yes
+ Listen on IPv4, if possible.
+
+-charon.plugins.socket-default.use_ipv6 = yes
++charon.plugins.socket-default.use_ipv6 = no
+ Listen on IPv6, if possible.
+diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
+index ba22b0c2bdb6..da6989d81d7a 100644
+--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
++++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
+@@ -748,7 +748,7 @@ static bool use_family(int family)
+ "%s.plugins.socket-default.use_ipv4", TRUE, lib->ns);
+ case AF_INET6:
+ return lib->settings->get_bool(lib->settings,
+- "%s.plugins.socket-default.use_ipv6", TRUE, lib->ns);
++ "%s.plugins.socket-default.use_ipv6", FALSE, lib->ns);
+ default:
+ return FALSE;
+ }
diff --git a/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch b/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
new file mode 100644
index 0000000..f476d08
--- /dev/null
+++ b/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
@@ -0,0 +1,43 @@
+diff --git a/validator/validator.c b/validator/validator.c
+index 676dcdf..7c19f3d 100644
+--- a/validator/validator.c
++++ b/validator/validator.c
+@@ -113,7 +113,7 @@ val_apply_cfg(struct module_env* env, struct val_env* val_env,
+ int c;
+ val_env->bogus_ttl = (uint32_t)cfg->bogus_ttl;
+ val_env->clean_additional = cfg->val_clean_additional;
+- val_env->permissive_mode = cfg->val_permissive_mode;
++ val_env->permissive_mode = &cfg->val_permissive_mode;
+ if(!env->anchors)
+ env->anchors = anchors_create();
+ if(!env->anchors) {
+@@ -170,7 +170,6 @@ val_init(struct module_env* env, int id)
+ }
+ env->modinfo[id] = (void*)val_env;
+ env->need_to_validate = 1;
+- val_env->permissive_mode = 0;
+ lock_basic_init(&val_env->bogus_lock);
+ lock_protect(&val_env->bogus_lock, &val_env->num_rrset_bogus,
+ sizeof(val_env->num_rrset_bogus));
+@@ -2084,7 +2083,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
+ }
+ }
+ /* If we are in permissive mode, bogus gets indeterminate */
+- if(ve->permissive_mode)
++ if(*ve->permissive_mode)
+ vq->orig_msg->rep->security = sec_status_indeterminate;
+ }
+
+diff --git a/validator/validator.h b/validator/validator.h
+index 23d3072..f8464b8 100644
+--- a/validator/validator.h
++++ b/validator/validator.h
+@@ -104,7 +104,7 @@ struct val_env {
+ * This allows an operator to run validation 'shadow' without
+ * hurting responses to clients.
+ */
+- int permissive_mode;
++ int* permissive_mode;
+
+ /**
+ * Number of entries in the NSEC3 maximum iteration count table.
diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 0ee7744..0aea4d0 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -25,7 +25,7 @@ TMP_FILE=$(mktemp -p $TMP_PATH)
SCRIPT_PATH=/usr/local/bin
DEST_PATH=/usr/share/xt_geoip
-DL_URL=http://geolite.maxmind.com/download/geoip/database
+DL_URL=https://geolite.maxmind.com/download/geoip/database
DL_FILE=GeoIPCountryCSV.zip
CSV_FILE=GeoIPCountryWhois.csv
diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c
index 000411c..66592bb 100644
--- a/src/setup/netstuff.c
+++ b/src/setup/netstuff.c
@@ -75,7 +75,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
int startstatictype = 0;
int startdhcptype = 0;
int startpppoetype = 0;
-
+ unsigned char buffer[sizeof(struct in_addr)];
+
/* Build some key strings. */
sprintf(addressfield, "%s_ADDRESS", colour);
sprintf(netmaskfield, "%s_NETMASK", colour);
@@ -184,7 +185,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
strcat(message, "\n");
error = 1;
}
- if (inet_addr(netmaskresult) == INADDR_NONE)
+ if (inet_pton(AF_INET, netmaskresult, &buffer) == 0)
{
strcat(message, _("Network mask"));
strcat(message, "\n");
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-03 21:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-03 21:06 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. af7e2f072f35bcaaefb5f7a81861f421f50dc40d git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox