[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc
by Arne Fitzenreiter 26 Feb '20
by Arne Fitzenreiter 26 Feb '20
26 Feb '20
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 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc (commit)
from 5ad31551cd8e22b9dcf19739e4369969514bdca8 (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 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 26 18:16:00 2020 +0000
make.sh: add core to version string
this make it easier to find the unstable and testing build for a core update in fireinfo.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index 2e396fd8e..07c0f52c2 100755
--- a/make.sh
+++ b/make.sh
@@ -515,7 +515,7 @@ prepareenv() {
system_release="${system_release} - ${GIT_BRANCH}"
;;
*)
- system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+ system_release="${system_release} - core${CORE} Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
;;
esac
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc
by Arne Fitzenreiter 26 Feb '20
by Arne Fitzenreiter 26 Feb '20
26 Feb '20
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, next has been updated
via 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc (commit)
from 5ad31551cd8e22b9dcf19739e4369969514bdca8 (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 9ff65bfac3f7de2bc1dc88e82b8315c4ef4c48cc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 26 18:16:00 2020 +0000
make.sh: add core to version string
this make it easier to find the unstable and testing build for a core update in fireinfo.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index 2e396fd8e..07c0f52c2 100755
--- a/make.sh
+++ b/make.sh
@@ -515,7 +515,7 @@ prepareenv() {
system_release="${system_release} - ${GIT_BRANCH}"
;;
*)
- system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+ system_release="${system_release} - core${CORE} Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
;;
esac
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5ad31551cd8e22b9dcf19739e4369969514bdca8
by Arne Fitzenreiter 26 Feb '20
by Arne Fitzenreiter 26 Feb '20
26 Feb '20
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 5ad31551cd8e22b9dcf19739e4369969514bdca8 (commit)
via f0e61c20b15ff13f90b4f776c9db90a28edd7107 (commit)
via 46ac0498640767683dc8d6dee791e7426f4e6f2b (commit)
via 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65 (commit)
via 712425ff0bbe96700de5a1b865d58730ba9c6b90 (commit)
via 6cd35da57ecf795a51d61cd848df77e6dd5fbd97 (commit)
via fd90cadc97559b1d78c202d5560a93a3ecabef5a (commit)
via 5cbcd514def1b63606d2139634a4f7a31af89205 (commit)
via 8d43248794b1abadf6e1c519b79a05bd5e64467c (commit)
via 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 (commit)
via 1eef496d47de2136929254b491f9b60fe6f8d5fc (commit)
via c7dd86b323fa3cdc030b0278bba233b69562d072 (commit)
via a62be8a2d9fecc59a7592f1a8347b0087148a896 (commit)
via 777ba8192ccda88d0fb66cb42b28ec2fd209db87 (commit)
via 8569b3e11be974db7d11da779ce8c66b4dadfa81 (commit)
via 2b6b6df32af111e54ec71678e4424bc729c85efc (commit)
via 068747163af47bffc8d34e312a90d2472d5f2367 (commit)
via 8f60b4ff30a70a50d859cc5b486b53ab7ca6e07d (commit)
via c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e (commit)
via 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb (commit)
via d875a2b157987307180ef0e578c4912ca5c388de (commit)
via 4105d223d759e421a9277e1532534c438cda5aba (commit)
via 4979531dac5c7d929dfc7f4ac8ff0281c195a526 (commit)
via 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee (commit)
via aef3c56c6536474dc861e256f4816d54f9776833 (commit)
via b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 (commit)
via 88cb5eb18744911513c08e851f945a548b324efc (commit)
via a8df6e7807528a475a958f0d8aa66494e59b1a8e (commit)
via 1466ab70c7bbbf477fbdef69117ada4251ff3a1a (commit)
via 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469 (commit)
via 56f4f279a5a5bfb2d919f2e603c8551f422e932f (commit)
via 130babccc8efbdd80a9358e1faf09faba6ee3e43 (commit)
via 08cf4d21540c4fe185db1f17ae365f7ab6adae27 (commit)
via f16ddb5fc74128e6387e736e4c7f66ace6d0b338 (commit)
via d553895700c1d4842cd62cceaea83f2fd0fd5195 (commit)
via 77ea7462bcc134b6147dd985abdd4e2311487515 (commit)
via 7b7789da2f79bf00c98139c17c18002388d4f0df (commit)
via c2c5bad960f03407b79e7b0afce45157363a55d0 (commit)
via b53d8ae99b8e2f4164824413b2f771ae54dbe9a7 (commit)
via 943eab6695bfd0ea20178e44effc97b4b61b0e14 (commit)
via 6f57c5e01f161afca2698003c6e9ca724d452953 (commit)
via 96bc01c954ba95b2ca800f62353a8f7eb2f1288b (commit)
via eb7066388b9df1db40afec42a3d4a36a14421994 (commit)
via 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 (commit)
via ff58943d8ec03f72609c9248b56f549f75baf505 (commit)
via e0dbe21e095efe06e4649857f52fe674a463db09 (commit)
via 2bafcf22ae0796eee0608ed83ad7e2ab5685317a (commit)
via 28db34f24769e4f01e504b3a2235c1f0813c9308 (commit)
via 3c7d55c55a17e33fd4e21d4d22dfb475ace4b571 (commit)
via fd1bc1515caa46d7d0540da649de9dec55fb1a1f (commit)
via 8485b98d6177606ff7725165e36baa2ca76aa307 (commit)
via 65b08a04dade4c549158da776aedc733a26f0c0f (commit)
via 7a68b87789e7d857c661ee3ac069fc42f75034f1 (commit)
via 962b7f817e2ebb823800e4bc714f68c0b12af3a6 (commit)
via d4b31f13d59c9fdc69d367b62c3c28c342940a22 (commit)
via bad2292034a61b6edc0fcd8a7ab1510a6626218a (commit)
via 674328ea046162b6293adf46996d6126ff5ae0ed (commit)
via 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60 (commit)
via 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f (commit)
via 040160c7ce19dcc34d97a74d371e9dbd3f0983e5 (commit)
via f48643e5b3a86c25a7387cf6c14e2807fdd8a482 (commit)
via 36e2e99285e86e46df33933a2783911118a504ce (commit)
via 152378c67419a1cbce57302490cf0c98263fbdf2 (commit)
via f61be862c6404df0692341d446ba031af3f18e54 (commit)
via 131f163ce8b12f2b9aefde91d203441257e2642a (commit)
via e63fc18d07266f87bfa606b7ae47ed1a6a28f051 (commit)
via e6f4991be209040f436d9be23b414a6dda1e7fa5 (commit)
via d8f7b45f3501edbac6101f79df5f80266b503cb5 (commit)
via b6ab15eaa2a899944c7edca99769fa4469f215d3 (commit)
via 8877c587cea024210a24c8212221d72209f9f2f0 (commit)
via 8d6012f0f54455f0b693f9d8f711ddc731e9051c (commit)
via dc1362e8884106ce71cba9ece1ddde9bc2424ac7 (commit)
via 8438e2e427e346b3609b1f752d874e40dc1d19f4 (commit)
via d120fd4a92338af978dc6d53a803a4d34e8fb99e (commit)
via a174e5e1f84e750e30c24824e20d87d0a98b7850 (commit)
via 2bc995c836acc63103df15e9da76ff5b97549184 (commit)
via ee4e219f5fa62ed8e6a4a7968b811479d57e8b9b (commit)
via 36cdd4e1f211edc870870826fa7e168bac1363d1 (commit)
via f85c916d7fdac9e8afea8a8bb75a51f62ec52ff0 (commit)
via af4370b4a80d46b2b042542be570cea54229b2c5 (commit)
via 1dc4f86e68910f05f6163d33b06d493c9f05892e (commit)
via be5ed5d01e45c6f467ad2e1350fcad968353ee67 (commit)
via 05948d0805342faa5d2516c120b0ac30e732172d (commit)
via 2acc41c04c3a62ed215c35ca0a47907f82122891 (commit)
via d5957c5cd28c33c4a5220ab1a61a679ae47c340a (commit)
via d6cc871067ef7f6cf69e261a84579b7403ffcee3 (commit)
via 1a65ea1b7291337e6de44a2d4696a00bbf23f7db (commit)
via ee9bc7c477408e6cabe79e56549355712caae97a (commit)
via 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 (commit)
via 975f78f7108aa558932a2d9c8c4015ac33be484e (commit)
via 03d651483ba6f329f1fc09b351b145f310d23fd6 (commit)
via 831ff05d898cbf3484922d33573ee067782eb663 (commit)
via 198c956bb74be7eeaa919c7de3fc3ada4ca52856 (commit)
from 57b17167eb6cdbc35bdcf7f6614f00d8ac50fdd1 (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 5ad31551cd8e22b9dcf19739e4369969514bdca8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 20:38:19 2020 +0000
dnsdist: a compile thread needs two gigabyte of ram
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f0e61c20b15ff13f90b4f776c9db90a28edd7107
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 20:35:57 2020 +0000
core142: replace "pakfire remove"
i have cut and paste this from older core but its not working
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 46ac0498640767683dc8d6dee791e7426f4e6f2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 06:55:30 2020 +0000
core142: remove dropped packages
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 06:41:14 2020 +0000
core142: fix typo
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 712425ff0bbe96700de5a1b865d58730ba9c6b90
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 24 18:51:24 2020 +0000
pakfire: Re-install previous core update when in testing mode
Fixes: #12302
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Tested-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6cd35da57ecf795a51d61cd848df77e6dd5fbd97
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 24 19:20:12 2020 +0000
core142: ship updated fireinfo.cgi
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fd90cadc97559b1d78c202d5560a93a3ecabef5a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 23 16:13:46 2020 +0100
fireinfo.cgi: Use pakfire lib to gather the pakfire version.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5cbcd514def1b63606d2139634a4f7a31af89205
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Feb 22 15:02:24 2020 +0100
ppp: Add upstream patch to fix bounds check in EAP code.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8d43248794b1abadf6e1c519b79a05bd5e64467c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 21 22:33:23 2020 +0100
w_scan: fix country and satalite selection menu
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 21 09:26:36 2020 +0100
u-boot: split rpi aarch64 quirk into parts
on of the changed variables was used before the old quirk.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1eef496d47de2136929254b491f9b60fe6f8d5fc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Feb 1 21:38:00 2020 +0000
Tor: update to 0.4.2.6
Please refer to https://blog.torproject.org/new-releases-tor-0426-0418
for release notes.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c7dd86b323fa3cdc030b0278bba233b69562d072
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 20 11:32:43 2020 +0000
core142: add changed u-boot files to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a62be8a2d9fecc59a7592f1a8347b0087148a896
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 20 12:24:36 2020 +0100
u-boot: add quirk for rpi on aarch64
the current rpi u-boot will not load the ramdisk correctly so the kernel will
crash with loaded ramdisk.
Remove ramdisk and replace root UUID by /dev/mmcblk0p3 if boot was on
armv8 and rpi.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 777ba8192ccda88d0fb66cb42b28ec2fd209db87
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 20 12:21:28 2020 +0100
u-boot: remove kirkwood kernel detection from bootscript
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8569b3e11be974db7d11da779ce8c66b4dadfa81
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 19 14:51:48 2020 +0000
red.up: move update-dns-forwareders behind the firewall
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2b6b6df32af111e54ec71678e4424bc729c85efc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 19 08:49:21 2020 +0000
flash-images: update the uENV root UUID also on arch64
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 068747163af47bffc8d34e312a90d2472d5f2367
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 18 17:13:48 2020 +0000
core142: add ppp to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8f60b4ff30a70a50d859cc5b486b53ab7ca6e07d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 18 11:18:13 2020 +0100
ppp: Update to 2.4.8
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 17 21:47:25 2020 +0000
elinks: suppress welcome dialog
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 17 11:59:32 2020 +0000
dehydrated: Fix various syntax errors
* The backup include file was missing a leading slash
which caused no files to be backed up.
* The shell escaping was broken so a new configuration file
was useless.
Fixes: #12297
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d875a2b157987307180ef0e578c4912ca5c388de
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 17 21:38:42 2020 +0000
paks: remove scripts for elinks and phpSANE
phpSANE is dropped long ago and elinks in core now.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4105d223d759e421a9277e1532534c438cda5aba
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 17 21:34:14 2020 +0000
paks: add/move extract_backup_includes to pak update scripts
this function allow to update the backup filelist before the backup was done in uninstall.sh at packet updates.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4979531dac5c7d929dfc7f4ac8ff0281c195a526
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 17 08:53:31 2020 +0000
core142: remove old ddns python-2.7 version
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 17 08:50:46 2020 +0000
ddns: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit aef3c56c6536474dc861e256f4816d54f9776833
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 11:44:17 2020 +0000
cyrus-imapd: Drop package
This package is outdated and unmaintained for many many years.
I am not sure if this even works and if there are any users.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b1a6c9f6243c3ae687fd18297848cc8e7510fbc2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 16:02:56 2020 +0000
core142: add cloudinit helper to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 88cb5eb18744911513c08e851f945a548b324efc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:08 2020 +0000
cloud-init: Disable using ISP nameservers
This is mostly aesthetic because there are no ISP nameservers
anyways that we could use here.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a8df6e7807528a475a958f0d8aa66494e59b1a8e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:07 2020 +0000
aws-setup: Remove some excessive whitespace
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1466ab70c7bbbf477fbdef69117ada4251ff3a1a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:59:06 2020 +0000
core142: add dns.cgi to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:06 2020 +0000
dns.cgi: Do not show table header if no servers are configured
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 56f4f279a5a5bfb2d919f2e603c8551f422e932f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 4 08:59:33 2020 +0100
guardian: Add upstream patch for HTTP parser.
Fixes #12289.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 130babccc8efbdd80a9358e1faf09faba6ee3e43
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:55:15 2020 +0000
core142: add ddns to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 08cf4d21540c4fe185db1f17ae365f7ab6adae27
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Feb 7 12:32:46 2020 +0100
ddns: Import latest upstream patches for ddns-013
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f16ddb5fc74128e6387e736e4c7f66ace6d0b338
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jan 31 07:13:31 2020 +0100
ddns: Update to 013
This is an update to the first python3-based release of ddns.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d553895700c1d4842cd62cceaea83f2fd0fd5195
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:49:52 2020 +0000
core142: add proxy.cgi tp updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 77ea7462bcc134b6147dd985abdd4e2311487515
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Feb 7 12:06:39 2020 +0100
proxy.cgi: Switch to MD5 hashed passwords for local user auth.
The former used default Crypt algorithmus only supports passwords up to
eight signs wheater MD5 does not have any limitation here.
Fixes 12290.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7b7789da2f79bf00c98139c17c18002388d4f0df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Feb 6 11:34:27 2020 +0000
libpciaccess: Update to 0.16
There are not rootfile changes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c2c5bad960f03407b79e7b0afce45157363a55d0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:33:35 2020 +0000
core142: add udev network-hotplug-bridges script to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b53d8ae99b8e2f4164824413b2f771ae54dbe9a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Feb 14 13:48:19 2020 +0000
udev: Set wireless interfaces into AP mode before adding to bridge
Wireless interfaces cannot be added to the bridge when they are
still running in station mode. At boot time, the interface will
be created and it is attempted to attach it to a bridge, which
fails.
This patch now checks whether the wireless interface is going to
be an access point, changes the mode accordingly and then attaches
the interface to the bridge.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 943eab6695bfd0ea20178e44effc97b4b61b0e14
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Feb 14 13:48:18 2020 +0000
udev: Add more logging to bridge hotplug script
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6f57c5e01f161afca2698003c6e9ca724d452953
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 16 12:05:03 2020 +0100
w_scan: Update to 20170107
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 96bc01c954ba95b2ca800f62353a8f7eb2f1288b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 16:26:35 2020 +0100
vdradmin: update to 3.6.10
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit eb7066388b9df1db40afec42a3d4a36a14421994
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 11:48:22 2020 +0100
vdr: update to 2.4.1
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 17:11:42 2020 +0000
make.sh remove extra PAKFIRE_CORE version for nightly builds
this is useless because the new nightly also copies the core updaters
to the unstable and testing pakfire trees.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ff58943d8ec03f72609c9248b56f549f75baf505
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 17:06:24 2020 +0000
kernel: cleanup unused kirkwood patches
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e0dbe21e095efe06e4649857f52fe674a463db09
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 17:01:02 2020 +0000
u-boot-kirkwood: drop package
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2bafcf22ae0796eee0608ed83ad7e2ab5685317a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:51 2020 +0000
Drop streamripper
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 28db34f24769e4f01e504b3a2235c1f0813c9308
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:49 2020 +0000
Drop rtpproxy
This probably has only been used by me and we do not need
it any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3c7d55c55a17e33fd4e21d4d22dfb475ace4b571
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:50 2020 +0000
Drop setserial
This package was used internally and we have no script that uses it
any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fd1bc1515caa46d7d0540da649de9dec55fb1a1f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:48 2020 +0000
Drop icegenerator
This is only useful with icecast.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8485b98d6177606ff7725165e36baa2ca76aa307
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:47 2020 +0000
Drop icecast
This is unmaintained for a very long time.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 65b08a04dade4c549158da776aedc733a26f0c0f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:45 2020 +0000
Drop ez-ipupdate
We do not use this at all any more, because it has been replaced
by ddns.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7a68b87789e7d857c661ee3ac069fc42f75034f1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:44 2020 +0000
Drop DirectFB
This package is not very useful on its own and nobody
seems to pull this as dependency any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 962b7f817e2ebb823800e4bc714f68c0b12af3a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:43 2020 +0000
Drop check_mk_agent
This add-on is unmaintained in IPFire.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d4b31f13d59c9fdc69d367b62c3c28c342940a22
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:42 2020 +0000
Drop multicat & bitstream
This reverts commit 0a21ce42e113f6c75f992d4ad1b88812ecc6b150.
These packages have never been updated and nodody in the team
is willing to support them.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bad2292034a61b6edc0fcd8a7ab1510a6626218a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:41 2020 +0000
Drop batctl
This package is no longer used. BATMAN is slightly out of fashion
and can be disabled in our kernel, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 674328ea046162b6293adf46996d6126ff5ae0ed
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 12 09:34:40 2020 +0000
Drop arm
This is a CLI tool for Tor which is no longer maintained upstream.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Feb 15 16:21:04 2020 +0100
make.sh: Build lua before haproxy.
In commit b6ab15eaa2a899944c7edca99769fa4469f215d3 lua support
for haproxy has been enabled, so lua now has to be compiled before
haproxy.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 11:17:27 2020 +0000
core142: add pakfire changes to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 040160c7ce19dcc34d97a74d371e9dbd3f0983e5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:53 2020 +0000
make.sh: Configure Pakfire to load packages from the correct tree
This will configure Pakfire that people who install a nightly
build will also get the packages for this build, etc.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f48643e5b3a86c25a7387cf6c14e2807fdd8a482
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:52 2020 +0000
make.sh: Cleanup code that builds ${SYSTEM_RELEASE}
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 36e2e99285e86e46df33933a2783911118a504ce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:51 2020 +0000
make.sh: Tidy up Git commands
No functional changes. Just making them shorter.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 152378c67419a1cbce57302490cf0c98263fbdf2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:50 2020 +0000
pakfire: Add version suffix when in a certain tree
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f61be862c6404df0692341d446ba031af3f18e54
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:49 2020 +0000
pakfire.cgi: Add UI to select repository
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 131f163ce8b12f2b9aefde91d203441257e2642a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:48 2020 +0000
pakfire.cgi: Rename %pakfiresettings to %cgiparams
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e63fc18d07266f87bfa606b7ae47ed1a6a28f051
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:47 2020 +0000
pakfire.cgi: Remove some old settings
These can no longer be modified in the GUI and are used nowhere.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e6f4991be209040f436d9be23b414a6dda1e7fa5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 14:28:46 2020 +0000
pakfire: Automatically compose $version
The tree in which pakfire is looking for packages and Core Updates
has been hardcoded into /opt/pakfire/etc/pakfire.conf.
This patch adds a new function which reads the system release
from /etc/system-release.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d8f7b45f3501edbac6101f79df5f80266b503cb5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 16:27:49 2020 +0000
dnsdist: Update to 1.4.0
This patch updates dnsdist to the latest release.
Additionally it includes /etc/sysconfig/dnsdist in the backup
and enables DNS-over-TLS.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b6ab15eaa2a899944c7edca99769fa4469f215d3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Feb 13 15:20:55 2020 +0000
haproxy: Update to 2.1.3
This updates haproxy to the latest version.
In addition, support for Lua scripts is compiled in.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8877c587cea024210a24c8212221d72209f9f2f0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Feb 14 13:10:11 2020 +0100
suricata: Update to 5.0.2
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8d6012f0f54455f0b693f9d8f711ddc731e9051c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 15 11:59:57 2020 +0100
kernel: update to 4.14.171
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit dc1362e8884106ce71cba9ece1ddde9bc2424ac7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 13 17:08:20 2020 +0000
kernel: armv5tel rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8438e2e427e346b3609b1f752d874e40dc1d19f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 13 16:57:36 2020 +0000
qemu: bump pak version
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d120fd4a92338af978dc6d53a803a4d34e8fb99e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Feb 6 17:26:38 2020 +0100
clamav: Update to 0.102.2
For details see:
https://blog.clamav.net/2020/02/clamav-01022-security-patch-released.html
"ClamAV 0.102.2 is a security patch release..."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a174e5e1f84e750e30c24824e20d87d0a98b7850
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 1 14:15:40 2020 +0000
Qemu: remove not needed files for aarch64 and PA-RISC
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2bc995c836acc63103df15e9da76ff5b97549184
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 1 14:15:39 2020 +0000
Qemu: Remove unneeded files
These are needed for s390, riscv and microblaze.
See
https://lists.fedoraproject.org/pipermail/packaging/2012-July/008557.html
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ee4e219f5fa62ed8e6a4a7968b811479d57e8b9b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 1 14:15:38 2020 +0000
Qemu: remove files for sparc
This is based on the debian package content (qemu-system-sparc)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 36cdd4e1f211edc870870826fa7e168bac1363d1
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Sat Feb 1 14:15:37 2020 +0000
Qemu: remove files only needed for Power PC
This is based on the debian package content (qemu-system-pcc)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f85c916d7fdac9e8afea8a8bb75a51f62ec52ff0
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Jan 28 18:27:36 2020 +0100
tmux: Update to 3.0.a
For details see:
https://raw.githubusercontent.com/tmux/tmux/3.0a/CHANGES
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit af4370b4a80d46b2b042542be570cea54229b2c5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 12 20:12:29 2020 +0000
core142: add squid to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1dc4f86e68910f05f6163d33b06d493c9f05892e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Jan 25 19:51:28 2020 +0100
squid: Update to 4.10
For details see:
http://www.squid-cache.org/Versions/v4/changesets/
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit be5ed5d01e45c6f467ad2e1350fcad968353ee67
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Jan 25 19:48:45 2020 +0100
mc: Update to 4.8.24
For details see:
http://midnight-commander.org/wiki/NEWS-4.8.24
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 05948d0805342faa5d2516c120b0ac30e732172d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 12 20:07:56 2020 +0000
core142: add suricata changes to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2acc41c04c3a62ed215c35ca0a47907f82122891
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Jan 23 12:24:48 2020 +0100
suricata: Enable RDP protocol parser.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d5957c5cd28c33c4a5220ab1a61a679ae47c340a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Jan 23 10:44:28 2020 +0100
ruleset-sources: Update snort dl urls.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d6cc871067ef7f6cf69e261a84579b7403ffcee3
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Jan 23 10:44:27 2020 +0100
suricata: Enable new and rust-depended protocol parsers.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1a65ea1b7291337e6de44a2d4696a00bbf23f7db
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Jan 23 10:44:26 2020 +0100
Suricata: Update to 5.0.1
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ee9bc7c477408e6cabe79e56549355712caae97a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 8 15:21:16 2020 +0100
kernel: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7d7f6104cdba2f52e71a83ed1372c5742304f3f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 8 11:51:43 2020 +0100
core142: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 975f78f7108aa558932a2d9c8c4015ac33be484e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 8 10:12:38 2020 +0100
core142: move 140/141 file to oldcore
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 03d651483ba6f329f1fc09b351b145f310d23fd6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 8 10:11:40 2020 +0100
core142: start updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 831ff05d898cbf3484922d33573ee067782eb663
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 6 15:09:52 2020 +0100
kernel: enable and enforce signed kernel modules
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 198c956bb74be7eeaa919c7de3fc3ada4ca52856
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 5 18:25:54 2020 +0100
kernel: update to 4.14.170
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/cyrus-imapd | 4 -
config/backup/includes/dehydrated | 2 +-
config/backup/includes/dnsdist | 1 +
config/cyrus-imapd/cyrus.conf | 38 -
config/cyrus-imapd/imapd.conf | 26 -
config/kernel/kernel.config.aarch64-ipfire | 37 +-
config/kernel/kernel.config.armv5tel-ipfire-multi | 38 +-
config/kernel/kernel.config.i586-ipfire | 41 +-
config/kernel/kernel.config.i586-ipfire-pae | 41 +-
config/kernel/kernel.config.x86_64-ipfire | 41 +-
config/kernel/x509.genkey | 17 +
config/rootfiles/common/aarch64/initscripts | 2 +-
config/rootfiles/common/aarch64/linux | 54 +-
config/rootfiles/common/armv5tel/initscripts | 2 +-
config/rootfiles/common/armv5tel/linux-multi | 57 +-
config/rootfiles/common/armv5tel/u-boot-kirkwood | 6 -
config/rootfiles/common/batctl | 2 -
config/rootfiles/common/bitstream | 138 --
config/rootfiles/common/ddns | 44 +-
config/rootfiles/common/elinks | 3 +
config/rootfiles/common/ez-ipupdate | 1 -
config/rootfiles/common/i586/initscripts | 2 +-
config/rootfiles/common/i586/linux | 41 +-
config/rootfiles/common/ppp | 24 +-
config/rootfiles/common/setserial | 2 -
config/rootfiles/common/x86_64/initscripts | 2 +-
config/rootfiles/common/x86_64/linux | 37 +-
config/rootfiles/core/{140 => 142}/exclude | 0
.../124 => core/142}/filelists/aarch64/linux | 0
.../142}/filelists/aarch64/linux-initrd | 0
.../129 => core/142}/filelists/aarch64/u-boot | 0
.../142}/filelists/armv5tel/linux-initrd-multi | 0
.../142}/filelists/armv5tel/linux-multi | 0
.../aarch64 => core/142/filelists/armv5tel}/u-boot | 0
.../{oldcore/104 => core/142}/filelists/ddns | 0
config/rootfiles/core/142/filelists/files | 15 +
.../{oldcore/100 => core/142}/filelists/i586/linux | 0
.../100 => core/142}/filelists/i586/linux-initrd | 0
.../{oldcore/125 => core/142}/filelists/ppp | 0
.../{oldcore/100 => core/142}/filelists/squid | 0
.../rootfiles/core/{141 => 142}/filelists/suricata | 0
.../100 => core/142}/filelists/x86_64/linux | 0
.../100 => core/142}/filelists/x86_64/linux-initrd | 0
.../rootfiles/{oldcore/137 => core/142}/update.sh | 47 +-
config/rootfiles/{core/141 => oldcore/140}/exclude | 0
.../{core => oldcore}/140/filelists/files | 0
config/rootfiles/{core => oldcore}/140/meta | 0
config/rootfiles/{core => oldcore}/140/update.sh | 0
config/rootfiles/{core/140 => oldcore/141}/exclude | 0
.../{core => oldcore}/141/filelists/aarch64/efivar | 0
.../{core => oldcore}/141/filelists/aarch64/gcc | 0
.../{core => oldcore}/141/filelists/aarch64/glibc | 0
.../141/filelists/aarch64/python3 | 0
.../{core => oldcore}/141/filelists/armv5tel/gcc | 0
.../{core => oldcore}/141/filelists/armv5tel/glibc | 0
.../141/filelists/armv5tel/pyhton3 | 0
.../rootfiles/{core => oldcore}/141/filelists/bind | 0
.../{core => oldcore}/141/filelists/elinks | 0
.../rootfiles/{core => oldcore}/141/filelists/file | 0
.../{core => oldcore}/141/filelists/files | 0
.../{core => oldcore}/141/filelists/geoip-database | 0
.../rootfiles/{core => oldcore}/141/filelists/glib | 0
.../{core => oldcore}/141/filelists/i586/gcc | 0
.../{core => oldcore}/141/filelists/i586/glibc | 0
.../{core => oldcore}/141/filelists/i586/python3 | 0
.../rootfiles/{core => oldcore}/141/filelists/knot | 0
.../{core => oldcore}/141/filelists/libhtp | 0
.../{core => oldcore}/141/filelists/libmpc | 0
.../rootfiles/{core => oldcore}/141/filelists/lvm2 | 0
.../{core => oldcore}/141/filelists/mdadm | 0
.../rootfiles/{core => oldcore}/141/filelists/mpfr | 0
.../{core => oldcore}/141/filelists/suricata | 0
.../{core => oldcore}/141/filelists/unbound | 0
.../{core => oldcore}/141/filelists/x86_64/efivar | 0
.../{core => oldcore}/141/filelists/x86_64/gcc | 0
.../{core => oldcore}/141/filelists/x86_64/glibc | 0
.../{core => oldcore}/141/filelists/x86_64/python3 | 0
config/rootfiles/{core => oldcore}/141/meta | 0
config/rootfiles/{core => oldcore}/141/update.sh | 0
config/rootfiles/packages/aarch64/directfb | 391 ----
.../packages/{armv5tel => aarch64}/vdr_dvbapi | 2 +-
config/rootfiles/packages/arm | 166 --
config/rootfiles/packages/armv5tel/directfb | 402 ----
config/rootfiles/packages/armv5tel/vdr_dvbapi | 2 +-
config/rootfiles/packages/armv7hl/directfb | 402 ----
config/rootfiles/packages/check_mk_agent | 3 -
config/rootfiles/packages/cyrus-imapd | 215 --
config/rootfiles/packages/i586/directfb | 397 ----
config/rootfiles/packages/i586/vdr_dvbapi | 4 +-
config/rootfiles/packages/icecast | 55 -
config/rootfiles/packages/icegenerator | 1 -
config/rootfiles/packages/linux-pae | 41 +-
config/rootfiles/packages/mc | 2 +
config/rootfiles/packages/multicat | 13 -
config/rootfiles/packages/qemu | 44 +-
config/rootfiles/packages/rtpproxy | 5 -
config/rootfiles/packages/streamripper | 14 -
config/rootfiles/packages/vdr | 5 +
config/rootfiles/packages/vdr_eepg | 2 +-
config/rootfiles/packages/vdr_epgsearch | 8 +-
config/rootfiles/packages/vdr_streamdev | 3 +-
config/rootfiles/packages/vdradmin | 10 +-
config/rootfiles/packages/x86_64/directfb | 397 ----
config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +-
config/suricata/ruleset-sources | 4 +-
config/suricata/suricata.yaml | 25 +-
config/u-boot/boot.cmd | 29 +-
config/u-boot/boot.scr | Bin 2607 -> 2915 bytes
config/udev/network-hotplug-bridges | 6 +
config/w_scan/w_scan_start | 13 +-
doc/language_issues.de | 5 +
doc/language_issues.en | 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 | 40 +
html/cgi-bin/dns.cgi | 71 +-
html/cgi-bin/fireinfo.cgi | 3 +-
html/cgi-bin/pakfire.cgi | 103 +-
html/cgi-bin/proxy.cgi | 8 +-
langs/en/cgi-bin/en.pl | 5 +
lfs/arm | 83 -
lfs/batctl | 79 -
lfs/bitstream | 84 -
lfs/check_mk_agent | 86 -
lfs/clamav | 6 +-
lfs/configroot | 1 +
lfs/cyrus-imapd | 115 --
lfs/ddns | 9 +-
lfs/dehydrated | 6 +-
lfs/directfb | 93 -
lfs/dnsdist | 9 +-
lfs/elinks | 6 +
lfs/ez-ipupdate | 79 -
lfs/flash-images | 2 +-
lfs/guardian | 5 +-
lfs/haproxy | 10 +-
lfs/icecast | 85 -
lfs/icegenerator | 85 -
lfs/libpciaccess | 10 +-
lfs/linux | 18 +-
lfs/mc | 6 +-
lfs/multicat | 84 -
lfs/ppp | 8 +-
lfs/qemu | 2 +-
lfs/rtpproxy | 87 -
lfs/setserial | 77 -
lfs/squid | 4 +-
lfs/stage2 | 4 +-
lfs/streamripper | 85 -
lfs/suricata | 10 +-
lfs/tmux | 11 +-
lfs/tor | 6 +-
lfs/u-boot-kirkwood | 115 --
lfs/vdr | 12 +-
lfs/vdr_dvbapi | 11 +-
lfs/vdr_eepg | 11 +-
lfs/vdr_epgsearch | 17 +-
lfs/vdr_streamdev | 17 +-
lfs/vdradmin | 8 +-
lfs/w_scan | 8 +-
lfs/xtables-addons | 11 +-
make.sh | 72 +-
src/initscripts/helper/aws-setup | 5 +-
src/initscripts/helper/azure-setup | 3 +
...ate-dns-forwarders => 22-update-dns-forwarders} | 0
src/initscripts/packages/cyrus-imapd | 38 -
src/initscripts/packages/rtpproxy | 66 -
src/initscripts/system/suricata | 10 +-
src/pakfire/lib/functions.pl | 62 +
src/pakfire/pakfire.conf | 2 -
src/paks/alsa/update.sh | 3 +-
src/paks/amazon-ssm-agent/uninstall.sh | 2 -
src/paks/amazon-ssm-agent/update.sh | 3 +-
src/paks/apcupsd/update.sh | 1 +
src/paks/asterisk/update.sh | 3 +-
src/paks/avahi/update.sh | 3 +-
src/paks/bird/uninstall.sh | 1 -
src/paks/bird/update.sh | 1 +
src/paks/check_mk_agent/install.sh | 36 -
src/paks/check_mk_agent/uninstall.sh | 35 -
src/paks/check_mk_agent/update.sh | 26 -
src/paks/cups/update.sh | 3 +-
src/paks/cyrus-imapd/install.sh | 30 -
src/paks/cyrus-imapd/uninstall.sh | 29 -
src/paks/cyrus-imapd/update.sh | 26 -
src/paks/dbus/update.sh | 1 +
src/paks/default/update.sh | 3 +-
src/paks/dnsdist/uninstall.sh | 4 +-
src/paks/dnsdist/update.sh | 1 +
src/paks/elinks/install.sh | 34 -
src/paks/elinks/uninstall.sh | 27 -
src/paks/elinks/update.sh | 26 -
src/paks/freeradius/update.sh | 3 +-
src/paks/frr/uninstall.sh | 3 +-
src/paks/frr/update.sh | 3 +-
src/paks/git/update.sh | 1 +
src/paks/gnump3d/update.sh | 3 +-
src/paks/guardian/update.sh | 3 +-
src/paks/haproxy/update.sh | 3 +-
src/paks/hostapd/update.sh | 3 +-
src/paks/igmpproxy/uninstall.sh | 3 +-
src/paks/igmpproxy/update.sh | 3 +-
src/paks/keepalived/update.sh | 3 +-
src/paks/libdaemon/update.sh | 3 +-
src/paks/libvirt/uninstall.sh | 3 +-
src/paks/mdns-repeater/update.sh | 4 +-
src/paks/minidlna/update.sh | 4 +-
src/paks/motion/update.sh | 3 +-
src/paks/mpfire/update.sh | 3 +-
src/paks/netsnmpd/uninstall.sh | 1 -
src/paks/netsnmpd/update.sh | 3 +-
src/paks/nfs/update.sh | 3 +-
src/paks/nginx/uninstall.sh | 1 -
src/paks/nginx/update.sh | 3 +-
src/paks/nut/update.sh | 3 +-
src/paks/phpSANE/install.sh | 26 -
src/paks/phpSANE/uninstall.sh | 25 -
src/paks/phpSANE/update.sh | 26 -
src/paks/postfix/uninstall.sh | 1 -
src/paks/postfix/update.sh | 3 +-
src/paks/qemu/update.sh | 3 +-
src/paks/rpcbind/update.sh | 3 +-
src/paks/rtpproxy/install.sh | 29 -
src/paks/rtpproxy/uninstall.sh | 27 -
src/paks/rtpproxy/update.sh | 26 -
src/paks/sarg/update.sh | 3 +-
src/paks/shairport-sync/update.sh | 4 +-
src/paks/squid-accounting/update.sh | 3 +-
src/paks/sslh/update.sh | 3 +-
src/paks/stunnel/update.sh | 3 +-
src/paks/tftpd/update.sh | 3 +-
src/paks/transmission/update.sh | 4 +-
src/paks/watchdog/update.sh | 3 +-
src/paks/wio/update.sh | 3 +-
src/paks/xinetd/update.sh | 3 +-
.../DirectFB-1.7.7-add-missing-davinci-files.patch | 1717 ----------------
src/patches/DirectFB-1.7.7-fix_mknod.patch | 22 -
src/patches/bitstream-makefile.patch | 7 -
.../cyrus-imapd-2.2.12-autocreate-0.9.4.diff | 2159 --------------------
src/patches/cyrus-imapd-2.2.12-gcc4.patch | 48 -
src/patches/ddns-012-noip-fix-handle-name.patch | 36 -
src/patches/ddns-012-noip-rename-provider.patch | 65 -
src/patches/ddns-013-dyfi-use-https.patch | 22 +
.../ez-ipupdate-3.0.11b8-zoneedit-server.patch | 13 -
src/patches/ez-ipupdate.formstring.patch | 11 -
src/patches/guardian-2.0.2-http-parser.patch | 45 +
.../linux-3.14.22-kirkwood_legacy_boot.patch | 1563 --------------
src/patches/linux/linux-4.14.40-kirkwood-dtb.patch | 59 -
src/patches/multicat-makefile.patch | 12 -
src/patches/ppp-2.4.7-openssl.patch | 110 -
.../ppp/0013-everywhere-O_CLOEXEC-harder.patch | 11 +-
...p-2.4.8-pppd-fix-bounds-check-in-eap-code.patch | 35 +
src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch | 82 -
src/patches/vdr-epgsearch-2.4.0-debian-paths.patch | 82 +
src/patches/vdr-streamdev_recordings-64.patch | 29 -
260 files changed, 1256 insertions(+), 10862 deletions(-)
delete mode 100644 config/backup/includes/cyrus-imapd
delete mode 100644 config/cyrus-imapd/cyrus.conf
delete mode 100644 config/cyrus-imapd/imapd.conf
create mode 100644 config/kernel/x509.genkey
delete mode 100644 config/rootfiles/common/armv5tel/u-boot-kirkwood
delete mode 100644 config/rootfiles/common/batctl
delete mode 100644 config/rootfiles/common/bitstream
delete mode 100644 config/rootfiles/common/ez-ipupdate
delete mode 100644 config/rootfiles/common/setserial
copy config/rootfiles/core/{140 => 142}/exclude (100%)
copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux (100%)
copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux-initrd (100%)
copy config/rootfiles/{oldcore/129 => core/142}/filelists/aarch64/u-boot (100%)
copy config/rootfiles/{oldcore/121 => core/142}/filelists/armv5tel/linux-initrd-multi (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/129/filelists/aarch64 => core/142/filelists/armv5tel}/u-boot (100%)
copy config/rootfiles/{oldcore/104 => core/142}/filelists/ddns (100%)
create mode 100644 config/rootfiles/core/142/filelists/files
copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux-initrd (100%)
copy config/rootfiles/{oldcore/125 => core/142}/filelists/ppp (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/squid (100%)
copy config/rootfiles/core/{141 => 142}/filelists/suricata (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux-initrd (100%)
copy config/rootfiles/{oldcore/137 => core/142}/update.sh (79%)
rename config/rootfiles/{core/141 => oldcore/140}/exclude (100%)
rename config/rootfiles/{core => oldcore}/140/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/140/meta (100%)
rename config/rootfiles/{core => oldcore}/140/update.sh (100%)
rename config/rootfiles/{core/140 => oldcore/141}/exclude (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/efivar (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/gcc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/glibc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/aarch64/python3 (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/gcc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/glibc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/armv5tel/pyhton3 (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/elinks (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/file (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/geoip-database (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/glib (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/i586/gcc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/i586/glibc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/i586/python3 (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/knot (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/libhtp (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/libmpc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/lvm2 (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/mdadm (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/mpfr (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/suricata (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/efivar (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/gcc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/glibc (100%)
rename config/rootfiles/{core => oldcore}/141/filelists/x86_64/python3 (100%)
rename config/rootfiles/{core => oldcore}/141/meta (100%)
rename config/rootfiles/{core => oldcore}/141/update.sh (100%)
delete mode 100644 config/rootfiles/packages/aarch64/directfb
copy config/rootfiles/packages/{armv5tel => aarch64}/vdr_dvbapi (64%)
delete mode 100644 config/rootfiles/packages/arm
delete mode 100644 config/rootfiles/packages/armv5tel/directfb
delete mode 100644 config/rootfiles/packages/armv7hl/directfb
delete mode 100644 config/rootfiles/packages/check_mk_agent
delete mode 100644 config/rootfiles/packages/cyrus-imapd
delete mode 100644 config/rootfiles/packages/i586/directfb
delete mode 100644 config/rootfiles/packages/icecast
delete mode 100644 config/rootfiles/packages/icegenerator
delete mode 100644 config/rootfiles/packages/multicat
delete mode 100644 config/rootfiles/packages/rtpproxy
delete mode 100644 config/rootfiles/packages/streamripper
delete mode 100644 config/rootfiles/packages/x86_64/directfb
delete mode 100644 lfs/arm
delete mode 100644 lfs/batctl
delete mode 100644 lfs/bitstream
delete mode 100644 lfs/check_mk_agent
delete mode 100644 lfs/cyrus-imapd
delete mode 100644 lfs/directfb
delete mode 100644 lfs/ez-ipupdate
delete mode 100644 lfs/icecast
delete mode 100644 lfs/icegenerator
delete mode 100644 lfs/multicat
delete mode 100644 lfs/rtpproxy
delete mode 100644 lfs/setserial
delete mode 100644 lfs/streamripper
delete mode 100644 lfs/u-boot-kirkwood
rename src/initscripts/networking/red.up/{05-update-dns-forwarders => 22-update-dns-forwarders} (100%)
delete mode 100644 src/initscripts/packages/cyrus-imapd
delete mode 100755 src/initscripts/packages/rtpproxy
delete mode 100644 src/paks/check_mk_agent/install.sh
delete mode 100644 src/paks/check_mk_agent/uninstall.sh
delete mode 100644 src/paks/check_mk_agent/update.sh
delete mode 100644 src/paks/cyrus-imapd/install.sh
delete mode 100644 src/paks/cyrus-imapd/uninstall.sh
delete mode 100644 src/paks/cyrus-imapd/update.sh
delete mode 100644 src/paks/elinks/install.sh
delete mode 100644 src/paks/elinks/uninstall.sh
delete mode 100644 src/paks/elinks/update.sh
delete mode 100644 src/paks/phpSANE/install.sh
delete mode 100644 src/paks/phpSANE/uninstall.sh
delete mode 100644 src/paks/phpSANE/update.sh
delete mode 100644 src/paks/rtpproxy/install.sh
delete mode 100644 src/paks/rtpproxy/uninstall.sh
delete mode 100644 src/paks/rtpproxy/update.sh
delete mode 100644 src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
delete mode 100644 src/patches/DirectFB-1.7.7-fix_mknod.patch
delete mode 100644 src/patches/bitstream-makefile.patch
delete mode 100644 src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
delete mode 100644 src/patches/cyrus-imapd-2.2.12-gcc4.patch
delete mode 100644 src/patches/ddns-012-noip-fix-handle-name.patch
delete mode 100644 src/patches/ddns-012-noip-rename-provider.patch
create mode 100644 src/patches/ddns-013-dyfi-use-https.patch
delete mode 100644 src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch
delete mode 100644 src/patches/ez-ipupdate.formstring.patch
create mode 100644 src/patches/guardian-2.0.2-http-parser.patch
delete mode 100644 src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
delete mode 100644 src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
delete mode 100644 src/patches/multicat-makefile.patch
delete mode 100644 src/patches/ppp-2.4.7-openssl.patch
create mode 100644 src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
delete mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
create mode 100644 src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch
Difference in files:
diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd
deleted file mode 100644
index bb1bb3b1c..000000000
--- a/config/backup/includes/cyrus-imapd
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/sieve
-/var/imap
-/var/ipfire/cyrusimap
-/var/log/imap
diff --git a/config/backup/includes/dehydrated b/config/backup/includes/dehydrated
index b5c64f5ef..86fdb9b42 100644
--- a/config/backup/includes/dehydrated
+++ b/config/backup/includes/dehydrated
@@ -1 +1 @@
-etc/dehydrated
+/etc/dehydrated
diff --git a/config/backup/includes/dnsdist b/config/backup/includes/dnsdist
index 8d9b82584..a88f27202 100644
--- a/config/backup/includes/dnsdist
+++ b/config/backup/includes/dnsdist
@@ -1 +1,2 @@
/etc/dnsdist.conf
+/etc/sysconfig/dnsdist
diff --git a/config/cyrus-imapd/cyrus.conf b/config/cyrus-imapd/cyrus.conf
deleted file mode 100644
index df83bd00b..000000000
--- a/config/cyrus-imapd/cyrus.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-START {
- # do not delete this entry!
- recover cmd="ctl_cyrusdb -r"
-
- # this is only necessary if using idled for IMAP IDLE
- idled cmd="idled"
-}
-
-# UNIX sockets start with a slash and are put into /var/imap/socket
-SERVICES {
- # add or remove based on preferences
- imap cmd="imapd" listen="imap" prefork=0
- imaps cmd="imapd -s" listen="imaps" prefork=0
- pop3 cmd="pop3d" listen="pop3" prefork=0
- pop3s cmd="pop3d -s" listen="pop3s" prefork=0
- #sieve cmd="timsieved" listen="127.0.0.1:2000" prefork=0
-
- # at least one LMTP is required for delivery
- #lmtp cmd="lmtpd" listen="127.0.0.1:24" prefork=0
- lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
-
- # this is only necessary if using notifications
- notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
-}
-
-EVENTS {
- # this is required
- checkpoint cmd="ctl_cyrusdb -c" period=30
-
- # this is only necessary if using duplicate delivery suppression
- delprune cmd="ctl_deliver -E 3" period=1440
-
- # this is only necessary if caching TLS sessions
- tlsprune cmd="tls_prune" period=1440
-
- # SQUAT failed, helps
- squatter cmd="squatter -r user" period=1440
-}
diff --git a/config/cyrus-imapd/imapd.conf b/config/cyrus-imapd/imapd.conf
deleted file mode 100644
index 9c7397981..000000000
--- a/config/cyrus-imapd/imapd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-postmaster: postmaster
-configdirectory: /var/imap
-partition-default: /var/log/imap
-admins: cyrus
-allowanonymouslogin: no
-allowplaintext: yes
-sasl_mech_list: PLAIN
-servername: localhost
-autocreatequota: 20000
-reject8bit: no
-quotawarn: 90
-timeout: 30
-poptimeout: 10
-dracinterval: 0
-drachost: localhost
-sasl_pwcheck_method: saslauthd
-sievedir: /usr/sieve
-sendmail: /usr/sbin/sendmail
-sieve_maxscriptsize: 32
-sieve_maxscripts: 5
-lmtpsocket: /var/imap/socket/lmtp
-unixhierarchysep: yes
-#echo tls_ca_file: /var/ipfire/cyrusimap/server.pem
-#echo tls_cert_file: /var/ipfire/cyrusimap/server.pem
-#echo tls_key_file: /var/ipfire/cyrusimap/server.pem
-#hashimapspool: yes
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index e79403bc7..32ad2df07 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.154-ipfire Kernel Configuration
+# Linux/arm64 4.14.166-ipfire Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -221,7 +221,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
# CONFIG_KPROBES is not set
@@ -306,7 +306,15 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -369,6 +377,7 @@ CONFIG_MQ_IOSCHED_KYBER=y
CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PADATA=y
+CONFIG_ASN1=y
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -2065,6 +2074,7 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_ALTERA_TSE=m
CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
@@ -6609,6 +6619,7 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
+# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
@@ -6621,10 +6632,11 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_KPP=m
CONFIG_CRYPTO_ACOMP2=y
-# CONFIG_CRYPTO_RSA is not set
+CONFIG_CRYPTO_RSA=y
# CONFIG_CRYPTO_DH is not set
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
@@ -6741,6 +6753,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
# CONFIG_CRYPTO_USER_API_RNG is not set
# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
@@ -6751,11 +6764,21 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=y
# CONFIG_CRYPTO_DEV_CHELSIO is not set
CONFIG_CRYPTO_DEV_VIRTIO=m
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS7_TEST_KEY=m
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
# CONFIG_ARM64_CRYPTO is not set
CONFIG_BINARY_PRINTF=y
@@ -6831,11 +6854,13 @@ CONFIG_DQL=y
CONFIG_GLOB=y
# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=m
+CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 7e9de39ea..cfa766005 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.154-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.166-ipfire-multi Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -218,7 +218,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HAVE_OPROFILE=y
@@ -301,7 +301,15 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -363,6 +371,7 @@ CONFIG_MQ_IOSCHED_KYBER=y
CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PADATA=y
+CONFIG_ASN1=y
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -2333,6 +2342,7 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_ALTERA_TSE=m
CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
@@ -7045,7 +7055,6 @@ CONFIG_ARM_UNWIND=y
CONFIG_OLD_MCOUNT=y
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
# CONFIG_DEBUG_UART_8250 is not set
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
@@ -7092,6 +7101,7 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
+# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
@@ -7104,10 +7114,11 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_KPP=m
CONFIG_CRYPTO_ACOMP2=y
-# CONFIG_CRYPTO_RSA is not set
+CONFIG_CRYPTO_RSA=y
# CONFIG_CRYPTO_DH is not set
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
@@ -7224,6 +7235,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
# CONFIG_CRYPTO_USER_API_RNG is not set
# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_MV_CESA=m
# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
@@ -7242,11 +7254,21 @@ CONFIG_CRYPTO_DEV_SUN4I_SS=y
CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
CONFIG_CRYPTO_DEV_ROCKCHIP=y
# CONFIG_CRYPTO_DEV_CHELSIO is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS7_TEST_KEY=m
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
CONFIG_ARM_CRYPTO=y
CONFIG_CRYPTO_SHA1_ARM=m
@@ -7327,11 +7349,13 @@ CONFIG_GLOB=y
# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
CONFIG_GENERIC_ATOMIC64=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=m
+CONFIG_OID_REGISTRY=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 2732bba42..4bb39fc20 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.154-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.170-ipfire Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -233,7 +233,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
@@ -334,7 +334,15 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -398,7 +406,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
-CONFIG_ASN1=m
+CONFIG_ASN1=y
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -6703,6 +6711,7 @@ CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -6766,6 +6775,7 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
+# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
@@ -6778,11 +6788,11 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_KPP=m
CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
@@ -6851,7 +6861,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
@@ -6908,6 +6918,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6928,11 +6939,21 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS7_TEST_KEY=m
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
@@ -7040,8 +7061,8 @@ CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
# CONFIG_DDR is not set
CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
+CONFIG_MPILIB=y
+CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 9b53ab35c..318384613 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.154-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.170-ipfire-pae Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -233,7 +233,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
@@ -335,7 +335,15 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -399,7 +407,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
-CONFIG_ASN1=m
+CONFIG_ASN1=y
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -6709,6 +6717,7 @@ CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -6772,6 +6781,7 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
+# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
@@ -6784,11 +6794,11 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_KPP=m
CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
@@ -6857,7 +6867,7 @@ CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
@@ -6914,6 +6924,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6933,11 +6944,21 @@ CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS7_TEST_KEY=m
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
@@ -7045,8 +7066,8 @@ CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
# CONFIG_DDR is not set
CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
+CONFIG_MPILIB=y
+CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 2fcf1e589..b16d13504 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.154-ipfire Kernel Configuration
+# Linux/x86 4.14.170-ipfire Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -242,7 +242,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLAB_FREELIST_HARDENED=y
CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
@@ -354,7 +354,15 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
# CONFIG_MODULE_COMPRESS_GZIP is not set
CONFIG_MODULE_COMPRESS_XZ=y
@@ -418,7 +426,7 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
-CONFIG_ASN1=m
+CONFIG_ASN1=y
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -6565,6 +6573,7 @@ CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -6630,6 +6639,7 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
+# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
CONFIG_CRYPTO_AEAD=y
@@ -6642,11 +6652,11 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
+CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_KPP=m
CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
@@ -6723,7 +6733,7 @@ CONFIG_CRYPTO_SHA1_MB=m
CONFIG_CRYPTO_SHA256_MB=m
CONFIG_CRYPTO_SHA512_MB=m
CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
@@ -6793,6 +6803,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6813,11 +6824,21 @@ CONFIG_CRYPTO_DEV_NITROX=m
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
#
# Certificates for signature checking
#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
@@ -6925,8 +6946,8 @@ CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
# CONFIG_DDR is not set
CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
+CONFIG_MPILIB=y
+CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
diff --git a/config/kernel/x509.genkey b/config/kernel/x509.genkey
new file mode 100644
index 000000000..9640ec6d0
--- /dev/null
+++ b/config/kernel/x509.genkey
@@ -0,0 +1,17 @@
+[ req ]
+default_bits = 4096
+distinguished_name = req_distinguished_name
+prompt = no
+string_mask = utf8only
+x509_extensions = myexts
+
+[ req_distinguished_name ]
+O = IPFire.org
+CN = Build time autogenerated kernel key
+emailAddress = development(a)lists.ipfire.org
+
+[ myexts ]
+basicConstraints=critical,CA:FALSE
+keyUsage=digitalSignature
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index ddf098ed4..34ea1433f 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
-etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/10-static-routes
etc/rc.d/init.d/networking/red.up/20-firewall
+etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/23-suricata
etc/rc.d/init.d/networking/red.up/24-RS-qos
etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index f9dc8555b..b130268a9 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -1946,6 +1946,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/certs
#lib/modules/KVER-ipfire/build/certs/Kconfig
#lib/modules/KVER-ipfire/build/certs/Makefile
+#lib/modules/KVER-ipfire/build/certs/signing_key.pem
+#lib/modules/KVER-ipfire/build/certs/signing_key.x509
#lib/modules/KVER-ipfire/build/crypto
#lib/modules/KVER-ipfire/build/crypto/Kconfig
#lib/modules/KVER-ipfire/build/crypto/Makefile
@@ -5975,8 +5977,15 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/armada/thermal.h
#lib/modules/KVER-ipfire/build/include/config/armv8
#lib/modules/KVER-ipfire/build/include/config/armv8/deprecated.h
+#lib/modules/KVER-ipfire/build/include/config/asn1.h
#lib/modules/KVER-ipfire/build/include/config/associative
#lib/modules/KVER-ipfire/build/include/config/associative/array.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h
#lib/modules/KVER-ipfire/build/include/config/async
#lib/modules/KVER-ipfire/build/include/config/async/core.h
#lib/modules/KVER-ipfire/build/include/config/async/memcpy.h
@@ -6444,6 +6453,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/cls/u32
#lib/modules/KVER-ipfire/build/include/config/cls/u32/mark.h
#lib/modules/KVER-ipfire/build/include/config/cls/u32/perf.h
+#lib/modules/KVER-ipfire/build/include/config/clz
+#lib/modules/KVER-ipfire/build/include/config/clz/tab.h
#lib/modules/KVER-ipfire/build/include/config/cma
#lib/modules/KVER-ipfire/build/include/config/cma.h
#lib/modules/KVER-ipfire/build/include/config/cma/alignment.h
@@ -6542,6 +6553,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/crypto/aead.h
#lib/modules/KVER-ipfire/build/include/config/crypto/aead2.h
#lib/modules/KVER-ipfire/build/include/config/crypto/aes.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/akcipher.h
#lib/modules/KVER-ipfire/build/include/config/crypto/akcipher2.h
#lib/modules/KVER-ipfire/build/include/config/crypto/algapi.h
#lib/modules/KVER-ipfire/build/include/config/crypto/algapi2.h
@@ -6588,7 +6600,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/crypto/gcm.h
#lib/modules/KVER-ipfire/build/include/config/crypto/gf128mul.h
#lib/modules/KVER-ipfire/build/include/config/crypto/ghash.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash
#lib/modules/KVER-ipfire/build/include/config/crypto/hash.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hw.h
@@ -6619,6 +6633,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/crypto/rng.h
#lib/modules/KVER-ipfire/build/include/config/crypto/rng/default.h
#lib/modules/KVER-ipfire/build/include/config/crypto/rng2.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/rsa.h
#lib/modules/KVER-ipfire/build/include/config/crypto/salsa20.h
#lib/modules/KVER-ipfire/build/include/config/crypto/seed.h
#lib/modules/KVER-ipfire/build/include/config/crypto/seqiv.h
@@ -7099,6 +7114,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/emac
#lib/modules/KVER-ipfire/build/include/config/emac/rockchip.h
#lib/modules/KVER-ipfire/build/include/config/embedded.h
+#lib/modules/KVER-ipfire/build/include/config/ena
+#lib/modules/KVER-ipfire/build/include/config/ena/ethernet.h
#lib/modules/KVER-ipfire/build/include/config/enable
#lib/modules/KVER-ipfire/build/include/config/enable/must
#lib/modules/KVER-ipfire/build/include/config/enable/must/check.h
@@ -7268,6 +7285,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/generic/clockevents/broadcast.h
#lib/modules/KVER-ipfire/build/include/config/generic/cpu
#lib/modules/KVER-ipfire/build/include/config/generic/cpu/autoprobe.h
+#lib/modules/KVER-ipfire/build/include/config/generic/cpu/vulnerabilities.h
#lib/modules/KVER-ipfire/build/include/config/generic/csum.h
#lib/modules/KVER-ipfire/build/include/config/generic/early
#lib/modules/KVER-ipfire/build/include/config/generic/early/ioremap.h
@@ -8383,6 +8401,13 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/module/compress
#lib/modules/KVER-ipfire/build/include/config/module/compress.h
#lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig
+#lib/modules/KVER-ipfire/build/include/config/module/sig.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h
#lib/modules/KVER-ipfire/build/include/config/module/srcversion
#lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h
#lib/modules/KVER-ipfire/build/include/config/module/unload.h
@@ -8418,6 +8443,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/mouse/synaptics/i2c.h
#lib/modules/KVER-ipfire/build/include/config/mouse/synaptics/usb.h
#lib/modules/KVER-ipfire/build/include/config/mouse/vsxxxaa.h
+#lib/modules/KVER-ipfire/build/include/config/mpilib.h
#lib/modules/KVER-ipfire/build/include/config/mpls
#lib/modules/KVER-ipfire/build/include/config/mpls.h
#lib/modules/KVER-ipfire/build/include/config/mpls/iptunnel.h
@@ -9205,6 +9231,11 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/pinctrl/sun8i/h3/r.h
#lib/modules/KVER-ipfire/build/include/config/pinctrl/sunxi.h
#lib/modules/KVER-ipfire/build/include/config/pinmux.h
+#lib/modules/KVER-ipfire/build/include/config/pkcs7
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/test
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/test/key.h
#lib/modules/KVER-ipfire/build/include/config/pl320
#lib/modules/KVER-ipfire/build/include/config/pl320/mbox.h
#lib/modules/KVER-ipfire/build/include/config/pl330
@@ -10200,6 +10231,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/sysfs
#lib/modules/KVER-ipfire/build/include/config/sysfs.h
#lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/system
+#lib/modules/KVER-ipfire/build/include/config/system/data
+#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h
#lib/modules/KVER-ipfire/build/include/config/systemport.h
#lib/modules/KVER-ipfire/build/include/config/sysvipc
#lib/modules/KVER-ipfire/build/include/config/sysvipc.h
@@ -10945,6 +10982,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/wlcore
#lib/modules/KVER-ipfire/build/include/config/wlcore.h
#lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h
+#lib/modules/KVER-ipfire/build/include/config/x509
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h
#lib/modules/KVER-ipfire/build/include/config/xfrm
#lib/modules/KVER-ipfire/build/include/config/xfrm.h
#lib/modules/KVER-ipfire/build/include/config/xfrm/algo.h
@@ -12730,7 +12770,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/linux/net.h
#lib/modules/KVER-ipfire/build/include/linux/netdev_features.h
#lib/modules/KVER-ipfire/build/include/linux/netdevice.h
-#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig
#lib/modules/KVER-ipfire/build/include/linux/netfilter
#lib/modules/KVER-ipfire/build/include/linux/netfilter.h
#lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset
@@ -13476,7 +13515,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/linux/sizes.h
#lib/modules/KVER-ipfire/build/include/linux/skb_array.h
#lib/modules/KVER-ipfire/build/include/linux/skbuff.h
-#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig
#lib/modules/KVER-ipfire/build/include/linux/slab.h
#lib/modules/KVER-ipfire/build/include/linux/slab_def.h
#lib/modules/KVER-ipfire/build/include/linux/slub_def.h
@@ -14290,7 +14328,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/net/route.h
#lib/modules/KVER-ipfire/build/include/net/rtnetlink.h
#lib/modules/KVER-ipfire/build/include/net/sch_generic.h
-#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig
#lib/modules/KVER-ipfire/build/include/net/scm.h
#lib/modules/KVER-ipfire/build/include/net/sctp
#lib/modules/KVER-ipfire/build/include/net/sctp/auth.h
@@ -15946,9 +15983,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/net/ncsi/Makefile
#lib/modules/KVER-ipfire/build/net/netfilter
#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig
-#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig
#lib/modules/KVER-ipfire/build/net/netfilter/Makefile
-#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig
#lib/modules/KVER-ipfire/build/net/netfilter/ipset
#lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig
#lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile
@@ -16123,6 +16158,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/Makefile.modsign
#lib/modules/KVER-ipfire/build/scripts/Makefile.ubsan
#lib/modules/KVER-ipfire/build/scripts/adjust_autoksyms.sh
+#lib/modules/KVER-ipfire/build/scripts/asn1_compiler
#lib/modules/KVER-ipfire/build/scripts/asn1_compiler.c
#lib/modules/KVER-ipfire/build/scripts/basic
#lib/modules/KVER-ipfire/build/scripts/basic/.gitignore
@@ -16285,6 +16321,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/dtc/util.h
#lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h
#lib/modules/KVER-ipfire/build/scripts/export_report.pl
+#lib/modules/KVER-ipfire/build/scripts/extract-cert
#lib/modules/KVER-ipfire/build/scripts/extract-cert.c
#lib/modules/KVER-ipfire/build/scripts/extract-ikconfig
#lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl
@@ -16466,6 +16503,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c
#lib/modules/KVER-ipfire/build/scripts/setlocalversion
#lib/modules/KVER-ipfire/build/scripts/show_delta
+#lib/modules/KVER-ipfire/build/scripts/sign-file
#lib/modules/KVER-ipfire/build/scripts/sign-file.c
#lib/modules/KVER-ipfire/build/scripts/sortextable
#lib/modules/KVER-ipfire/build/scripts/sortextable.c
@@ -17171,6 +17209,8 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/crypto/ansi_cprng.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/anubis.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/arc4.ko.xz
+#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/async_tx
#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_memcpy.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_pq.ko.xz
@@ -18258,6 +18298,9 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/alteon/acenic.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/altera
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/altera/altera_tse.ko.xz
+#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon
+#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon/ena
+#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amazon/ena/ena.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd/amd8111e.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/amd/pcnet32.ko.xz
@@ -19132,7 +19175,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/lzo
#lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/raid6
#lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index ddf098ed4..34ea1433f 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
-etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/10-static-routes
etc/rc.d/init.d/networking/red.up/20-firewall
+etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/23-suricata
etc/rc.d/init.d/networking/red.up/24-RS-qos
etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 890e3be21..37e8273d6 100644
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -492,6 +492,7 @@ boot/dtb-KVER-ipfire-multi
boot/vmlinuz-KVER-ipfire-multi
etc/modprobe.d/framebuffer.conf
etc/modprobe.d/ipv6.conf
+#lib/modules
#lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/build
#lib/modules/KVER-ipfire-multi/build/.config
@@ -2466,6 +2467,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/certs
#lib/modules/KVER-ipfire-multi/build/certs/Kconfig
#lib/modules/KVER-ipfire-multi/build/certs/Makefile
+#lib/modules/KVER-ipfire-multi/build/certs/signing_key.pem
+#lib/modules/KVER-ipfire-multi/build/certs/signing_key.x509
#lib/modules/KVER-ipfire-multi/build/crypto
#lib/modules/KVER-ipfire-multi/build/crypto/Kconfig
#lib/modules/KVER-ipfire-multi/build/crypto/Makefile
@@ -6546,8 +6549,15 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/armada375
#lib/modules/KVER-ipfire-multi/build/include/config/armada375/usbcluster
#lib/modules/KVER-ipfire-multi/build/include/config/armada375/usbcluster/phy.h
+#lib/modules/KVER-ipfire-multi/build/include/config/asn1.h
#lib/modules/KVER-ipfire-multi/build/include/config/associative
#lib/modules/KVER-ipfire-multi/build/include/config/associative/array.h
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/key
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/key/type.h
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public/key
+#lib/modules/KVER-ipfire-multi/build/include/config/asymmetric/public/key/subtype.h
#lib/modules/KVER-ipfire-multi/build/include/config/async
#lib/modules/KVER-ipfire-multi/build/include/config/async/core.h
#lib/modules/KVER-ipfire-multi/build/include/config/async/memcpy.h
@@ -7023,6 +7033,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/cls/u32
#lib/modules/KVER-ipfire-multi/build/include/config/cls/u32/mark.h
#lib/modules/KVER-ipfire-multi/build/include/config/cls/u32/perf.h
+#lib/modules/KVER-ipfire-multi/build/include/config/clz
+#lib/modules/KVER-ipfire-multi/build/include/config/clz/tab.h
#lib/modules/KVER-ipfire-multi/build/include/config/cma
#lib/modules/KVER-ipfire-multi/build/include/config/cma.h
#lib/modules/KVER-ipfire-multi/build/include/config/cma/alignment.h
@@ -7150,6 +7162,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/aes/arm.h
+#lib/modules/KVER-ipfire-multi/build/include/config/crypto/akcipher.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/akcipher2.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/algapi.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/algapi2.h
@@ -7211,7 +7224,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/gcm.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/gf128mul.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/ghash.h
+#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash.h
+#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash/info.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hash2.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hmac.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/hw.h
@@ -7242,6 +7257,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng/default.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/rng2.h
+#lib/modules/KVER-ipfire-multi/build/include/config/crypto/rsa.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/salsa20.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/seed.h
#lib/modules/KVER-ipfire-multi/build/include/config/crypto/seqiv.h
@@ -7296,9 +7312,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/debug/align/rodata.h
#lib/modules/KVER-ipfire-multi/build/include/config/debug/bugverbose.h
#lib/modules/KVER-ipfire-multi/build/include/config/debug/fs.h
-#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx
-#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx/uart
-#lib/modules/KVER-ipfire-multi/build/include/config/debug/imx/uart/port.h
#lib/modules/KVER-ipfire-multi/build/include/config/debug/kernel.h
#lib/modules/KVER-ipfire-multi/build/include/config/debug/ll
#lib/modules/KVER-ipfire-multi/build/include/config/debug/ll/include.h
@@ -7774,6 +7787,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/emac
#lib/modules/KVER-ipfire-multi/build/include/config/emac/rockchip.h
#lib/modules/KVER-ipfire-multi/build/include/config/embedded.h
+#lib/modules/KVER-ipfire-multi/build/include/config/ena
+#lib/modules/KVER-ipfire-multi/build/include/config/ena/ethernet.h
#lib/modules/KVER-ipfire-multi/build/include/config/enable
#lib/modules/KVER-ipfire-multi/build/include/config/enable/must
#lib/modules/KVER-ipfire-multi/build/include/config/enable/must/check.h
@@ -9152,6 +9167,13 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/module/compress
#lib/modules/KVER-ipfire-multi/build/include/config/module/compress.h
#lib/modules/KVER-ipfire-multi/build/include/config/module/compress/xz.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/all.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/force.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/hash.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/key.h
+#lib/modules/KVER-ipfire-multi/build/include/config/module/sig/sha512.h
#lib/modules/KVER-ipfire-multi/build/include/config/module/srcversion
#lib/modules/KVER-ipfire-multi/build/include/config/module/srcversion/all.h
#lib/modules/KVER-ipfire-multi/build/include/config/module/unload.h
@@ -9187,6 +9209,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/mouse/synaptics/i2c.h
#lib/modules/KVER-ipfire-multi/build/include/config/mouse/synaptics/usb.h
#lib/modules/KVER-ipfire-multi/build/include/config/mouse/vsxxxaa.h
+#lib/modules/KVER-ipfire-multi/build/include/config/mpilib.h
#lib/modules/KVER-ipfire-multi/build/include/config/mpls
#lib/modules/KVER-ipfire-multi/build/include/config/mpls.h
#lib/modules/KVER-ipfire-multi/build/include/config/mpls/iptunnel.h
@@ -10103,6 +10126,11 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/pj4b
#lib/modules/KVER-ipfire-multi/build/include/config/pj4b/errata
#lib/modules/KVER-ipfire-multi/build/include/config/pj4b/errata/4742.h
+#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7
+#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/message
+#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/message/parser.h
+#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/test
+#lib/modules/KVER-ipfire-multi/build/include/config/pkcs7/test/key.h
#lib/modules/KVER-ipfire-multi/build/include/config/pl310
#lib/modules/KVER-ipfire-multi/build/include/config/pl310/errata
#lib/modules/KVER-ipfire-multi/build/include/config/pl310/errata/588369.h
@@ -11202,6 +11230,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/sysfs
#lib/modules/KVER-ipfire-multi/build/include/config/sysfs.h
#lib/modules/KVER-ipfire-multi/build/include/config/sysfs/syscall.h
+#lib/modules/KVER-ipfire-multi/build/include/config/system
+#lib/modules/KVER-ipfire-multi/build/include/config/system/data
+#lib/modules/KVER-ipfire-multi/build/include/config/system/data/verification.h
+#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted
+#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted/keyring.h
+#lib/modules/KVER-ipfire-multi/build/include/config/system/trusted/keys.h
#lib/modules/KVER-ipfire-multi/build/include/config/systemport.h
#lib/modules/KVER-ipfire-multi/build/include/config/sysvipc
#lib/modules/KVER-ipfire-multi/build/include/config/sysvipc.h
@@ -11969,6 +12003,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/config/wlcore
#lib/modules/KVER-ipfire-multi/build/include/config/wlcore.h
#lib/modules/KVER-ipfire-multi/build/include/config/wlcore/sdio.h
+#lib/modules/KVER-ipfire-multi/build/include/config/x509
+#lib/modules/KVER-ipfire-multi/build/include/config/x509/certificate
+#lib/modules/KVER-ipfire-multi/build/include/config/x509/certificate/parser.h
#lib/modules/KVER-ipfire-multi/build/include/config/xfrm
#lib/modules/KVER-ipfire-multi/build/include/config/xfrm.h
#lib/modules/KVER-ipfire-multi/build/include/config/xfrm/algo.h
@@ -13765,7 +13802,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/linux/net.h
#lib/modules/KVER-ipfire-multi/build/include/linux/netdev_features.h
#lib/modules/KVER-ipfire-multi/build/include/linux/netdevice.h
-#lib/modules/KVER-ipfire-multi/build/include/linux/netdevice.h.orig
#lib/modules/KVER-ipfire-multi/build/include/linux/netfilter
#lib/modules/KVER-ipfire-multi/build/include/linux/netfilter.h
#lib/modules/KVER-ipfire-multi/build/include/linux/netfilter/ipset
@@ -14511,7 +14547,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/linux/sizes.h
#lib/modules/KVER-ipfire-multi/build/include/linux/skb_array.h
#lib/modules/KVER-ipfire-multi/build/include/linux/skbuff.h
-#lib/modules/KVER-ipfire-multi/build/include/linux/skbuff.h.orig
#lib/modules/KVER-ipfire-multi/build/include/linux/slab.h
#lib/modules/KVER-ipfire-multi/build/include/linux/slab_def.h
#lib/modules/KVER-ipfire-multi/build/include/linux/slub_def.h
@@ -15325,7 +15360,6 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/include/net/route.h
#lib/modules/KVER-ipfire-multi/build/include/net/rtnetlink.h
#lib/modules/KVER-ipfire-multi/build/include/net/sch_generic.h
-#lib/modules/KVER-ipfire-multi/build/include/net/sch_generic.h.orig
#lib/modules/KVER-ipfire-multi/build/include/net/scm.h
#lib/modules/KVER-ipfire-multi/build/include/net/sctp
#lib/modules/KVER-ipfire-multi/build/include/net/sctp/auth.h
@@ -16981,9 +17015,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/net/ncsi/Makefile
#lib/modules/KVER-ipfire-multi/build/net/netfilter
#lib/modules/KVER-ipfire-multi/build/net/netfilter/Kconfig
-#lib/modules/KVER-ipfire-multi/build/net/netfilter/Kconfig.orig
#lib/modules/KVER-ipfire-multi/build/net/netfilter/Makefile
-#lib/modules/KVER-ipfire-multi/build/net/netfilter/Makefile.orig
#lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset
#lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset/Kconfig
#lib/modules/KVER-ipfire-multi/build/net/netfilter/ipset/Makefile
@@ -17158,6 +17190,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/scripts/Makefile.modsign
#lib/modules/KVER-ipfire-multi/build/scripts/Makefile.ubsan
#lib/modules/KVER-ipfire-multi/build/scripts/adjust_autoksyms.sh
+#lib/modules/KVER-ipfire-multi/build/scripts/asn1_compiler
#lib/modules/KVER-ipfire-multi/build/scripts/asn1_compiler.c
#lib/modules/KVER-ipfire-multi/build/scripts/basic
#lib/modules/KVER-ipfire-multi/build/scripts/basic/.gitignore
@@ -17320,6 +17353,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/scripts/dtc/util.h
#lib/modules/KVER-ipfire-multi/build/scripts/dtc/version_gen.h
#lib/modules/KVER-ipfire-multi/build/scripts/export_report.pl
+#lib/modules/KVER-ipfire-multi/build/scripts/extract-cert
#lib/modules/KVER-ipfire-multi/build/scripts/extract-cert.c
#lib/modules/KVER-ipfire-multi/build/scripts/extract-ikconfig
#lib/modules/KVER-ipfire-multi/build/scripts/extract-module-sig.pl
@@ -17501,6 +17535,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire-multi/build/scripts/selinux/mdp/mdp.c
#lib/modules/KVER-ipfire-multi/build/scripts/setlocalversion
#lib/modules/KVER-ipfire-multi/build/scripts/show_delta
+#lib/modules/KVER-ipfire-multi/build/scripts/sign-file
#lib/modules/KVER-ipfire-multi/build/scripts/sign-file.c
#lib/modules/KVER-ipfire-multi/build/scripts/sortextable
#lib/modules/KVER-ipfire-multi/build/scripts/sortextable.c
@@ -18213,6 +18248,8 @@ lib/modules/KVER-ipfire-multi/kernel
#lib/modules/KVER-ipfire-multi/kernel/crypto/ansi_cprng.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/crypto/anubis.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/crypto/arc4.ko.xz
+#lib/modules/KVER-ipfire-multi/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire-multi/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx
#lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx/async_memcpy.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/crypto/async_tx/async_pq.ko.xz
@@ -19353,6 +19390,9 @@ lib/modules/KVER-ipfire-multi/kernel
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/alteon/acenic.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/altera
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/altera/altera_tse.ko.xz
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon/ena
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amazon/ena/ena.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd/amd8111e.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/amd/pcnet32.ko.xz
@@ -20270,7 +20310,6 @@ lib/modules/KVER-ipfire-multi/kernel
#lib/modules/KVER-ipfire-multi/kernel/lib/lz4/lz4hc_compress.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/lib/lzo
#lib/modules/KVER-ipfire-multi/kernel/lib/lzo/lzo_compress.ko.xz
-#lib/modules/KVER-ipfire-multi/kernel/lib/oid_registry.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/lib/parman.ko.xz
#lib/modules/KVER-ipfire-multi/kernel/lib/raid6
#lib/modules/KVER-ipfire-multi/kernel/lib/raid6/raid6_pq.ko.xz
diff --git a/config/rootfiles/common/armv5tel/u-boot-kirkwood b/config/rootfiles/common/armv5tel/u-boot-kirkwood
deleted file mode 100644
index 67af4fc3c..000000000
--- a/config/rootfiles/common/armv5tel/u-boot-kirkwood
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/share/u-boot/dreamplug
-usr/share/u-boot/dreamplug/u-boot.kwb
-#usr/share/u-boot/iconnect
-usr/share/u-boot/iconnect/u-boot.kwb
-#usr/share/u-boot/icybox
-usr/share/u-boot/icybox/u-boot.kwb
diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl
deleted file mode 100644
index a4f49c27e..000000000
--- a/config/rootfiles/common/batctl
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin/batctl
-#usr/share/man/man8/batctl.8
diff --git a/config/rootfiles/common/bitstream b/config/rootfiles/common/bitstream
deleted file mode 100644
index 583d8f21e..000000000
--- a/config/rootfiles/common/bitstream
+++ /dev/null
@@ -1,138 +0,0 @@
-#usr/include/bitstream
-#usr/include/bitstream/common.h
-#usr/include/bitstream/dvb
-#usr/include/bitstream/dvb/ci.h
-#usr/include/bitstream/dvb/si
-#usr/include/bitstream/dvb/si.h
-#usr/include/bitstream/dvb/si/bat.h
-#usr/include/bitstream/dvb/si/bat_print.h
-#usr/include/bitstream/dvb/si/datetime.h
-#usr/include/bitstream/dvb/si/desc_40.h
-#usr/include/bitstream/dvb/si/desc_41.h
-#usr/include/bitstream/dvb/si/desc_42.h
-#usr/include/bitstream/dvb/si/desc_43.h
-#usr/include/bitstream/dvb/si/desc_44.h
-#usr/include/bitstream/dvb/si/desc_45.h
-#usr/include/bitstream/dvb/si/desc_46.h
-#usr/include/bitstream/dvb/si/desc_47.h
-#usr/include/bitstream/dvb/si/desc_48.h
-#usr/include/bitstream/dvb/si/desc_49.h
-#usr/include/bitstream/dvb/si/desc_4a.h
-#usr/include/bitstream/dvb/si/desc_4b.h
-#usr/include/bitstream/dvb/si/desc_4c.h
-#usr/include/bitstream/dvb/si/desc_4d.h
-#usr/include/bitstream/dvb/si/desc_4e.h
-#usr/include/bitstream/dvb/si/desc_4f.h
-#usr/include/bitstream/dvb/si/desc_50.h
-#usr/include/bitstream/dvb/si/desc_51.h
-#usr/include/bitstream/dvb/si/desc_52.h
-#usr/include/bitstream/dvb/si/desc_53.h
-#usr/include/bitstream/dvb/si/desc_54.h
-#usr/include/bitstream/dvb/si/desc_55.h
-#usr/include/bitstream/dvb/si/desc_56.h
-#usr/include/bitstream/dvb/si/desc_57.h
-#usr/include/bitstream/dvb/si/desc_58.h
-#usr/include/bitstream/dvb/si/desc_59.h
-#usr/include/bitstream/dvb/si/desc_5a.h
-#usr/include/bitstream/dvb/si/desc_5b.h
-#usr/include/bitstream/dvb/si/desc_5c.h
-#usr/include/bitstream/dvb/si/desc_5d.h
-#usr/include/bitstream/dvb/si/desc_5e.h
-#usr/include/bitstream/dvb/si/desc_5f.h
-#usr/include/bitstream/dvb/si/desc_60.h
-#usr/include/bitstream/dvb/si/desc_61.h
-#usr/include/bitstream/dvb/si/desc_62.h
-#usr/include/bitstream/dvb/si/desc_63.h
-#usr/include/bitstream/dvb/si/desc_64.h
-#usr/include/bitstream/dvb/si/desc_65.h
-#usr/include/bitstream/dvb/si/desc_66.h
-#usr/include/bitstream/dvb/si/desc_67.h
-#usr/include/bitstream/dvb/si/desc_68.h
-#usr/include/bitstream/dvb/si/desc_69.h
-#usr/include/bitstream/dvb/si/desc_6a.h
-#usr/include/bitstream/dvb/si/desc_6b.h
-#usr/include/bitstream/dvb/si/desc_6c.h
-#usr/include/bitstream/dvb/si/desc_6d.h
-#usr/include/bitstream/dvb/si/desc_6e.h
-#usr/include/bitstream/dvb/si/desc_7a.h
-#usr/include/bitstream/dvb/si/desc_7b.h
-#usr/include/bitstream/dvb/si/desc_7c.h
-#usr/include/bitstream/dvb/si/desc_83p28.h
-#usr/include/bitstream/dvb/si/desc_88p28.h
-#usr/include/bitstream/dvb/si/descs_list.h
-#usr/include/bitstream/dvb/si/dit.h
-#usr/include/bitstream/dvb/si/dit_print.h
-#usr/include/bitstream/dvb/si/eit.h
-#usr/include/bitstream/dvb/si/eit_print.h
-#usr/include/bitstream/dvb/si/nit.h
-#usr/include/bitstream/dvb/si/nit_print.h
-#usr/include/bitstream/dvb/si/numbers.h
-#usr/include/bitstream/dvb/si/rst.h
-#usr/include/bitstream/dvb/si/rst_print.h
-#usr/include/bitstream/dvb/si/sdt.h
-#usr/include/bitstream/dvb/si/sdt_print.h
-#usr/include/bitstream/dvb/si/sit.h
-#usr/include/bitstream/dvb/si/sit_print.h
-#usr/include/bitstream/dvb/si/st.h
-#usr/include/bitstream/dvb/si/strings.h
-#usr/include/bitstream/dvb/si/tdt.h
-#usr/include/bitstream/dvb/si/tdt_print.h
-#usr/include/bitstream/dvb/si/tot.h
-#usr/include/bitstream/dvb/si/tot_print.h
-#usr/include/bitstream/dvb/si_print.h
-#usr/include/bitstream/dvb/sim.h
-#usr/include/bitstream/ietf
-#usr/include/bitstream/ietf/rtp.h
-#usr/include/bitstream/mpeg
-#usr/include/bitstream/mpeg/aac.h
-#usr/include/bitstream/mpeg/pes.h
-#usr/include/bitstream/mpeg/psi
-#usr/include/bitstream/mpeg/psi.h
-#usr/include/bitstream/mpeg/psi/cat.h
-#usr/include/bitstream/mpeg/psi/cat_print.h
-#usr/include/bitstream/mpeg/psi/desc_02.h
-#usr/include/bitstream/mpeg/psi/desc_03.h
-#usr/include/bitstream/mpeg/psi/desc_04.h
-#usr/include/bitstream/mpeg/psi/desc_05.h
-#usr/include/bitstream/mpeg/psi/desc_06.h
-#usr/include/bitstream/mpeg/psi/desc_07.h
-#usr/include/bitstream/mpeg/psi/desc_08.h
-#usr/include/bitstream/mpeg/psi/desc_09.h
-#usr/include/bitstream/mpeg/psi/desc_0a.h
-#usr/include/bitstream/mpeg/psi/desc_0b.h
-#usr/include/bitstream/mpeg/psi/desc_0c.h
-#usr/include/bitstream/mpeg/psi/desc_0d.h
-#usr/include/bitstream/mpeg/psi/desc_0e.h
-#usr/include/bitstream/mpeg/psi/desc_0f.h
-#usr/include/bitstream/mpeg/psi/desc_10.h
-#usr/include/bitstream/mpeg/psi/desc_11.h
-#usr/include/bitstream/mpeg/psi/desc_12.h
-#usr/include/bitstream/mpeg/psi/desc_1b.h
-#usr/include/bitstream/mpeg/psi/desc_1c.h
-#usr/include/bitstream/mpeg/psi/desc_1d.h
-#usr/include/bitstream/mpeg/psi/desc_1e.h
-#usr/include/bitstream/mpeg/psi/desc_1f.h
-#usr/include/bitstream/mpeg/psi/desc_20.h
-#usr/include/bitstream/mpeg/psi/desc_21.h
-#usr/include/bitstream/mpeg/psi/desc_22.h
-#usr/include/bitstream/mpeg/psi/desc_23.h
-#usr/include/bitstream/mpeg/psi/desc_24.h
-#usr/include/bitstream/mpeg/psi/desc_25.h
-#usr/include/bitstream/mpeg/psi/desc_26.h
-#usr/include/bitstream/mpeg/psi/desc_27.h
-#usr/include/bitstream/mpeg/psi/desc_28.h
-#usr/include/bitstream/mpeg/psi/desc_2a.h
-#usr/include/bitstream/mpeg/psi/desc_2b.h
-#usr/include/bitstream/mpeg/psi/desc_2c.h
-#usr/include/bitstream/mpeg/psi/descriptors.h
-#usr/include/bitstream/mpeg/psi/descs_list.h
-#usr/include/bitstream/mpeg/psi/descs_print.h
-#usr/include/bitstream/mpeg/psi/pat.h
-#usr/include/bitstream/mpeg/psi/pat_print.h
-#usr/include/bitstream/mpeg/psi/pmt.h
-#usr/include/bitstream/mpeg/psi/pmt_print.h
-#usr/include/bitstream/mpeg/psi/psi.h
-#usr/include/bitstream/mpeg/psi/tsdt.h
-#usr/include/bitstream/mpeg/psi/tsdt_print.h
-#usr/include/bitstream/mpeg/psi_print.h
-#usr/include/bitstream/mpeg/ts.h
diff --git a/config/rootfiles/common/ddns b/config/rootfiles/common/ddns
index 446656e8d..899c0ba98 100644
--- a/config/rootfiles/common/ddns
+++ b/config/rootfiles/common/ddns
@@ -1,37 +1,19 @@
usr/bin/ddns
-usr/lib/python2.7/site-packages/ddns
-usr/lib/python2.7/site-packages/ddns/__init__.py
-usr/lib/python2.7/site-packages/ddns/__init__.pyc
-usr/lib/python2.7/site-packages/ddns/__init__.pyo
-usr/lib/python2.7/site-packages/ddns/__version__.py
-usr/lib/python2.7/site-packages/ddns/__version__.pyc
-usr/lib/python2.7/site-packages/ddns/__version__.pyo
-usr/lib/python2.7/site-packages/ddns/database.py
-usr/lib/python2.7/site-packages/ddns/database.pyc
-usr/lib/python2.7/site-packages/ddns/database.pyo
-usr/lib/python2.7/site-packages/ddns/errors.py
-usr/lib/python2.7/site-packages/ddns/errors.pyc
-usr/lib/python2.7/site-packages/ddns/errors.pyo
-usr/lib/python2.7/site-packages/ddns/i18n.py
-usr/lib/python2.7/site-packages/ddns/i18n.pyc
-usr/lib/python2.7/site-packages/ddns/i18n.pyo
-usr/lib/python2.7/site-packages/ddns/providers.py
-usr/lib/python2.7/site-packages/ddns/providers.pyc
-usr/lib/python2.7/site-packages/ddns/providers.pyo
-usr/lib/python2.7/site-packages/ddns/system.py
-usr/lib/python2.7/site-packages/ddns/system.pyc
-usr/lib/python2.7/site-packages/ddns/system.pyo
+#usr/lib/python3.8/site-packages/ddns
+usr/lib/python3.8/site-packages/ddns/__init__.py
+usr/lib/python3.8/site-packages/ddns/__version__.py
+usr/lib/python3.8/site-packages/ddns/database.py
+usr/lib/python3.8/site-packages/ddns/errors.py
+usr/lib/python3.8/site-packages/ddns/i18n.py
+usr/lib/python3.8/site-packages/ddns/providers.py
+usr/lib/python3.8/site-packages/ddns/system.py
#usr/share/doc/ddns
#usr/share/doc/ddns/COPYING
#usr/share/locale/ar/LC_MESSAGES/ddns.mo
#usr/share/locale/ca/LC_MESSAGES/ddns.mo
-#usr/share/locale/cs_CZ
-#usr/share/locale/cs_CZ/LC_MESSAGES
#usr/share/locale/cs_CZ/LC_MESSAGES/ddns.mo
#usr/share/locale/da/LC_MESSAGES/ddns.mo
#usr/share/locale/de/LC_MESSAGES/ddns.mo
-#usr/share/locale/el_GR
-#usr/share/locale/el_GR/LC_MESSAGES
#usr/share/locale/el_GR/LC_MESSAGES/ddns.mo
#usr/share/locale/es/LC_MESSAGES/ddns.mo
#usr/share/locale/fa/LC_MESSAGES/ddns.mo
@@ -40,30 +22,20 @@ usr/lib/python2.7/site-packages/ddns/system.pyo
#usr/share/locale/id/LC_MESSAGES/ddns.mo
#usr/share/locale/it/LC_MESSAGES/ddns.mo
#usr/share/locale/ja/LC_MESSAGES/ddns.mo
-#usr/share/locale/km_KH
-#usr/share/locale/km_KH/LC_MESSAGES
#usr/share/locale/km_KH/LC_MESSAGES/ddns.mo
#usr/share/locale/nl/LC_MESSAGES/ddns.mo
#usr/share/locale/pl/LC_MESSAGES/ddns.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ddns.mo
#usr/share/locale/pt_PT/LC_MESSAGES/ddns.mo
-#usr/share/locale/ro_RO
-#usr/share/locale/ro_RO/LC_MESSAGES
#usr/share/locale/ro_RO/LC_MESSAGES/ddns.mo
#usr/share/locale/ru/LC_MESSAGES/ddns.mo
#usr/share/locale/sq/LC_MESSAGES/ddns.mo
#usr/share/locale/sv/LC_MESSAGES/ddns.mo
#usr/share/locale/th/LC_MESSAGES/ddns.mo
-#usr/share/locale/tk
-#usr/share/locale/tk/LC_MESSAGES
#usr/share/locale/tk/LC_MESSAGES/ddns.mo
#usr/share/locale/tr/LC_MESSAGES/ddns.mo
#usr/share/locale/uk/LC_MESSAGES/ddns.mo
-#usr/share/locale/uz@Latn
-#usr/share/locale/uz@Latn/LC_MESSAGES
#usr/share/locale/uz(a)Latn/LC_MESSAGES/ddns.mo
#usr/share/locale/vi/LC_MESSAGES/ddns.mo
-#usr/share/locale/zh
-#usr/share/locale/zh/LC_MESSAGES
#usr/share/locale/zh/LC_MESSAGES/ddns.mo
#var/ipfire/ddns/ddns.conf.sample
diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks
index 45c83b176..a29fe8e33 100644
--- a/config/rootfiles/common/elinks
+++ b/config/rootfiles/common/elinks
@@ -1,3 +1,6 @@
+#root/.elinks
+root/.elinks/bookmarks
+root/.elinks/globhist
usr/local/bin/elinks
#usr/local/etc
#usr/local/etc/elinks
diff --git a/config/rootfiles/common/ez-ipupdate b/config/rootfiles/common/ez-ipupdate
deleted file mode 100644
index 58125d790..000000000
--- a/config/rootfiles/common/ez-ipupdate
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ez-ipupdate
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index e666ed84e..9350b0e90 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
-etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/10-static-routes
etc/rc.d/init.d/networking/red.up/20-firewall
+etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/23-suricata
etc/rc.d/init.d/networking/red.up/24-RS-qos
etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 684dbe07b..e65260974 100644
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -2092,6 +2092,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/certs
#lib/modules/KVER-ipfire/build/certs/Kconfig
#lib/modules/KVER-ipfire/build/certs/Makefile
+#lib/modules/KVER-ipfire/build/certs/signing_key.pem
+#lib/modules/KVER-ipfire/build/certs/signing_key.x509
#lib/modules/KVER-ipfire/build/crypto
#lib/modules/KVER-ipfire/build/crypto/Kconfig
#lib/modules/KVER-ipfire/build/crypto/Makefile
@@ -6198,6 +6200,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/asus/nb/wmi.h
#lib/modules/KVER-ipfire/build/include/config/asus/wireless.h
#lib/modules/KVER-ipfire/build/include/config/asus/wmi.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h
#lib/modules/KVER-ipfire/build/include/config/async
#lib/modules/KVER-ipfire/build/include/config/async/core.h
#lib/modules/KVER-ipfire/build/include/config/async/memcpy.h
@@ -6853,7 +6861,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/crypto/glue
#lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper
#lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper/x86.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash
#lib/modules/KVER-ipfire/build/include/config/crypto/hash.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hw.h
@@ -9077,6 +9087,13 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/module/compress
#lib/modules/KVER-ipfire/build/include/config/module/compress.h
#lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig
+#lib/modules/KVER-ipfire/build/include/config/module/sig.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h
#lib/modules/KVER-ipfire/build/include/config/module/srcversion
#lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h
#lib/modules/KVER-ipfire/build/include/config/module/unload.h
@@ -10008,6 +10025,11 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/pinctrl/lewisburg.h
#lib/modules/KVER-ipfire/build/include/config/pinctrl/mcp23s08.h
#lib/modules/KVER-ipfire/build/include/config/pinmux.h
+#lib/modules/KVER-ipfire/build/include/config/pkcs7
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/test
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/test/key.h
#lib/modules/KVER-ipfire/build/include/config/plx
#lib/modules/KVER-ipfire/build/include/config/plx/hermes.h
#lib/modules/KVER-ipfire/build/include/config/pm
@@ -11265,6 +11287,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/sysfs
#lib/modules/KVER-ipfire/build/include/config/sysfs.h
#lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/system
+#lib/modules/KVER-ipfire/build/include/config/system/data
+#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h
#lib/modules/KVER-ipfire/build/include/config/sysvipc
#lib/modules/KVER-ipfire/build/include/config/sysvipc.h
#lib/modules/KVER-ipfire/build/include/config/sysvipc/sysctl.h
@@ -12118,6 +12146,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h
#lib/modules/KVER-ipfire/build/include/config/wmi
#lib/modules/KVER-ipfire/build/include/config/wmi/bmof.h
+#lib/modules/KVER-ipfire/build/include/config/x509
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h
#lib/modules/KVER-ipfire/build/include/config/x86
#lib/modules/KVER-ipfire/build/include/config/x86.h
#lib/modules/KVER-ipfire/build/include/config/x86/32
@@ -17577,6 +17608,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/dtc/util.h
#lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h
#lib/modules/KVER-ipfire/build/scripts/export_report.pl
+#lib/modules/KVER-ipfire/build/scripts/extract-cert
#lib/modules/KVER-ipfire/build/scripts/extract-cert.c
#lib/modules/KVER-ipfire/build/scripts/extract-ikconfig
#lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl
@@ -17758,6 +17790,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c
#lib/modules/KVER-ipfire/build/scripts/setlocalversion
#lib/modules/KVER-ipfire/build/scripts/show_delta
+#lib/modules/KVER-ipfire/build/scripts/sign-file
#lib/modules/KVER-ipfire/build/scripts/sign-file.c
#lib/modules/KVER-ipfire/build/scripts/sortextable
#lib/modules/KVER-ipfire/build/scripts/sortextable.c
@@ -18485,6 +18518,8 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/crypto/ansi_cprng.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/anubis.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/arc4.ko.xz
+#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/async_tx
#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_memcpy.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_pq.ko.xz
@@ -18527,12 +18562,10 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/rmd320.ko.xz
-#lib/modules/KVER-ipfire/kernel/crypto/rsa_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/salsa20_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/seed.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/serpent_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/sha3_generic.ko.xz
-#lib/modules/KVER-ipfire/kernel/crypto/sha512_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tcrypt.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tea.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tgr192.ko.xz
@@ -21202,7 +21235,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/842
#lib/modules/KVER-ipfire/kernel/lib/842/842_compress.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/842/842_decompress.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/asn1_decoder.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/cordic.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crc-itu-t.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crc7.ko.xz
@@ -21212,9 +21244,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/lzo
#lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/mpi
-#lib/modules/KVER-ipfire/kernel/lib/mpi/mpi.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/raid6
#lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz
diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index 46c2f83b3..f1f4f88f2 100644
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -33,18 +33,18 @@ etc/ppp/standardloginscript
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
usr/lib/pppd
-usr/lib/pppd/2.4.7
-#usr/lib/pppd/2.4.7/minconn.so
-#usr/lib/pppd/2.4.7/openl2tp.so
-#usr/lib/pppd/2.4.7/passprompt.so
-#usr/lib/pppd/2.4.7/passwordfd.so
-#usr/lib/pppd/2.4.7/pppoatm.so
-#usr/lib/pppd/2.4.7/pppol2tp.so
-#usr/lib/pppd/2.4.7/radattr.so
-#usr/lib/pppd/2.4.7/radius.so
-#usr/lib/pppd/2.4.7/radrealms.so
-#usr/lib/pppd/2.4.7/rp-pppoe.so
-#usr/lib/pppd/2.4.7/winbind.so
+usr/lib/pppd/2.4.8
+#usr/lib/pppd/2.4.8/minconn.so
+#usr/lib/pppd/2.4.8/openl2tp.so
+#usr/lib/pppd/2.4.8/passprompt.so
+#usr/lib/pppd/2.4.8/passwordfd.so
+#usr/lib/pppd/2.4.8/pppoatm.so
+#usr/lib/pppd/2.4.8/pppol2tp.so
+#usr/lib/pppd/2.4.8/radattr.so
+#usr/lib/pppd/2.4.8/radius.so
+#usr/lib/pppd/2.4.8/radrealms.so
+#usr/lib/pppd/2.4.8/rp-pppoe.so
+#usr/lib/pppd/2.4.8/winbind.so
usr/sbin/chat
usr/sbin/pppd
usr/sbin/pppdump
diff --git a/config/rootfiles/common/setserial b/config/rootfiles/common/setserial
deleted file mode 100644
index 72fc32ea3..000000000
--- a/config/rootfiles/common/setserial
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/setserial
-#usr/man/man8/setserial.8
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index e666ed84e..9350b0e90 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall
etc/rc.d/init.d/networking/red.down/99-beep
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
-etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/10-static-routes
etc/rc.d/init.d/networking/red.up/20-firewall
+etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/23-suricata
etc/rc.d/init.d/networking/red.up/24-RS-qos
etc/rc.d/init.d/networking/red.up/27-RS-squid
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 0ec85621a..a2d73b4e2 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -2097,6 +2097,8 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/certs
#lib/modules/KVER-ipfire/build/certs/Kconfig
#lib/modules/KVER-ipfire/build/certs/Makefile
+#lib/modules/KVER-ipfire/build/certs/signing_key.pem
+#lib/modules/KVER-ipfire/build/certs/signing_key.x509
#lib/modules/KVER-ipfire/build/crypto
#lib/modules/KVER-ipfire/build/crypto/Kconfig
#lib/modules/KVER-ipfire/build/crypto/Makefile
@@ -6232,6 +6234,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/asus/nb
#lib/modules/KVER-ipfire/build/include/config/asus/nb/wmi.h
#lib/modules/KVER-ipfire/build/include/config/asus/wmi.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/key/type.h
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key
+#lib/modules/KVER-ipfire/build/include/config/asymmetric/public/key/subtype.h
#lib/modules/KVER-ipfire/build/include/config/async
#lib/modules/KVER-ipfire/build/include/config/async/core.h
#lib/modules/KVER-ipfire/build/include/config/async/memcpy.h
@@ -6934,7 +6942,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/crypto/glue
#lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper
#lib/modules/KVER-ipfire/build/include/config/crypto/glue/helper/x86.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash
#lib/modules/KVER-ipfire/build/include/config/crypto/hash.h
+#lib/modules/KVER-ipfire/build/include/config/crypto/hash/info.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hash2.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hmac.h
#lib/modules/KVER-ipfire/build/include/config/crypto/hw.h
@@ -9132,6 +9142,13 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/module/compress
#lib/modules/KVER-ipfire/build/include/config/module/compress.h
#lib/modules/KVER-ipfire/build/include/config/module/compress/xz.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig
+#lib/modules/KVER-ipfire/build/include/config/module/sig.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/all.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/force.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/hash.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/key.h
+#lib/modules/KVER-ipfire/build/include/config/module/sig/sha512.h
#lib/modules/KVER-ipfire/build/include/config/module/srcversion
#lib/modules/KVER-ipfire/build/include/config/module/srcversion/all.h
#lib/modules/KVER-ipfire/build/include/config/module/unload.h
@@ -10042,6 +10059,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/pinctrl/mcp23s08.h
#lib/modules/KVER-ipfire/build/include/config/pinctrl/sunrisepoint.h
#lib/modules/KVER-ipfire/build/include/config/pinmux.h
+#lib/modules/KVER-ipfire/build/include/config/pkcs7
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message
+#lib/modules/KVER-ipfire/build/include/config/pkcs7/message/parser.h
#lib/modules/KVER-ipfire/build/include/config/plx
#lib/modules/KVER-ipfire/build/include/config/plx/hermes.h
#lib/modules/KVER-ipfire/build/include/config/pm
@@ -11238,6 +11258,12 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/sysfs
#lib/modules/KVER-ipfire/build/include/config/sysfs.h
#lib/modules/KVER-ipfire/build/include/config/sysfs/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/system
+#lib/modules/KVER-ipfire/build/include/config/system/data
+#lib/modules/KVER-ipfire/build/include/config/system/data/verification.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keyring.h
+#lib/modules/KVER-ipfire/build/include/config/system/trusted/keys.h
#lib/modules/KVER-ipfire/build/include/config/sysvipc
#lib/modules/KVER-ipfire/build/include/config/sysvipc.h
#lib/modules/KVER-ipfire/build/include/config/sysvipc/compat.h
@@ -12083,6 +12109,9 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/wlcore/sdio.h
#lib/modules/KVER-ipfire/build/include/config/wmi
#lib/modules/KVER-ipfire/build/include/config/wmi/bmof.h
+#lib/modules/KVER-ipfire/build/include/config/x509
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate
+#lib/modules/KVER-ipfire/build/include/config/x509/certificate/parser.h
#lib/modules/KVER-ipfire/build/include/config/x86
#lib/modules/KVER-ipfire/build/include/config/x86.h
#lib/modules/KVER-ipfire/build/include/config/x86/64
@@ -17592,6 +17621,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/dtc/util.h
#lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h
#lib/modules/KVER-ipfire/build/scripts/export_report.pl
+#lib/modules/KVER-ipfire/build/scripts/extract-cert
#lib/modules/KVER-ipfire/build/scripts/extract-cert.c
#lib/modules/KVER-ipfire/build/scripts/extract-ikconfig
#lib/modules/KVER-ipfire/build/scripts/extract-module-sig.pl
@@ -17773,6 +17803,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/scripts/selinux/mdp/mdp.c
#lib/modules/KVER-ipfire/build/scripts/setlocalversion
#lib/modules/KVER-ipfire/build/scripts/show_delta
+#lib/modules/KVER-ipfire/build/scripts/sign-file
#lib/modules/KVER-ipfire/build/scripts/sign-file.c
#lib/modules/KVER-ipfire/build/scripts/sortextable
#lib/modules/KVER-ipfire/build/scripts/sortextable.c
@@ -18567,12 +18598,10 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/rmd320.ko.xz
-#lib/modules/KVER-ipfire/kernel/crypto/rsa_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/salsa20_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/seed.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/serpent_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/sha3_generic.ko.xz
-#lib/modules/KVER-ipfire/kernel/crypto/sha512_generic.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tcrypt.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tea.ko.xz
#lib/modules/KVER-ipfire/kernel/crypto/tgr192.ko.xz
@@ -21194,7 +21223,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/kernel/trace
#lib/modules/KVER-ipfire/kernel/kernel/trace/ring_buffer_benchmark.ko.xz
#lib/modules/KVER-ipfire/kernel/lib
-#lib/modules/KVER-ipfire/kernel/lib/asn1_decoder.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/cordic.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crc-itu-t.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/crc4.ko.xz
@@ -21205,9 +21233,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/lib/lz4/lz4hc_compress.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/lzo
#lib/modules/KVER-ipfire/kernel/lib/lzo/lzo_compress.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/mpi
-#lib/modules/KVER-ipfire/kernel/lib/mpi/mpi.ko.xz
-#lib/modules/KVER-ipfire/kernel/lib/oid_registry.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/parman.ko.xz
#lib/modules/KVER-ipfire/kernel/lib/raid6
#lib/modules/KVER-ipfire/kernel/lib/raid6/raid6_pq.ko.xz
diff --git a/config/rootfiles/core/140/exclude b/config/rootfiles/core/142/exclude
similarity index 100%
rename from config/rootfiles/core/140/exclude
rename to config/rootfiles/core/142/exclude
diff --git a/config/rootfiles/core/142/filelists/aarch64/linux b/config/rootfiles/core/142/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/aarch64/linux-initrd b/config/rootfiles/core/142/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/aarch64/u-boot b/config/rootfiles/core/142/filelists/aarch64/u-boot
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/aarch64/u-boot
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/armv5tel/linux-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/armv5tel/u-boot b/config/rootfiles/core/142/filelists/armv5tel/u-boot
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/armv5tel/u-boot
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/142/filelists/ddns b/config/rootfiles/core/142/filelists/ddns
new file mode 120000
index 000000000..739516420
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
new file mode 100644
index 000000000..4d6c69adb
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/files
@@ -0,0 +1,15 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/helper/azure-setup
+etc/suricata/suricata.yaml
+lib/udev/network-hotplug-bridges
+opt/pakfire/etc/pakfire.conf
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/fireinfo.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/suricata/ruleset-sources
diff --git a/config/rootfiles/core/142/filelists/i586/linux b/config/rootfiles/core/142/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/i586/linux-initrd b/config/rootfiles/core/142/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/ppp b/config/rootfiles/core/142/filelists/ppp
new file mode 120000
index 000000000..4844a9b58
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/ppp
@@ -0,0 +1 @@
+../../../common/ppp
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/squid b/config/rootfiles/core/142/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/141/filelists/suricata b/config/rootfiles/core/142/filelists/suricata
similarity index 100%
rename from config/rootfiles/core/141/filelists/suricata
rename to config/rootfiles/core/142/filelists/suricata
diff --git a/config/rootfiles/core/142/filelists/x86_64/linux b/config/rootfiles/core/142/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/x86_64/linux-initrd b/config/rootfiles/core/142/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh
new file mode 100644
index 000000000..581e8fd19
--- /dev/null
+++ b/config/rootfiles/core/142/update.sh
@@ -0,0 +1,178 @@
+#!/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) 2020 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=142
+
+exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ # force fsck at next boot, this may fix free space on xfs
+ touch /forcefsck
+ # don't start pakfire again at error
+ killall -KILL pak_update
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
+# 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
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire-kirkwood)
+ exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1
+ ;;
+ *-ipfire*)
+ # Ok.
+ ;;
+ *)
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+# Remove files
+rm -rf /usr/lib/python2.7/site-packages/ddns
+rm -rf /usr/lib/pppd/2.4.7
+
+# Stop services
+
+# Extract files
+extract_files
+
+# move update forwarders below firewall
+mv -f /etc/rc.d/init.d/netowrking/red.up/05-update-dns-forwarders \
+ /etc/rc.d/init.d/netowrking/red.up/22-update-dns-forwarders
+
+# update linker config
+ldconfig
+
+# remove dropped packages
+for package in arm bitstream multicat check_mk_agent directfb \
+ icecast icegenerator rtpproxy streamripper \
+ cyrus-imapd; do
+ if [ -e /opt/pakfire/db/installed/meta-$package ]; then
+ stop_service $package
+ for i in $(cat /opt/pakfire/db/rootfiles/$package); do
+ rm -rfv /${i}
+ done
+ fi
+ rm -f /opt/pakfire/db/installed/meta-$package
+ rm -f /opt/pakfire/db/meta/meta-$package
+ rm -f /opt/pakfire/db/rootfiles/$package
+done
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ rm -rf /opt/pakfire/db/rootfiles/linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 25000 -o $ROOTSPACE -lt 120000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ touch /var/run/need_reboot
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ fi
+ else
+ touch /var/run/need_reboot
+ fi
+ ;;
+ *)
+ # This update needs a reboot...
+ touch /var/run/need_reboot
+ ;;
+esac
+
+# 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/core/141/exclude b/config/rootfiles/oldcore/140/exclude
similarity index 100%
rename from config/rootfiles/core/141/exclude
rename to config/rootfiles/oldcore/140/exclude
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/oldcore/140/filelists/files
similarity index 100%
rename from config/rootfiles/core/140/filelists/files
rename to config/rootfiles/oldcore/140/filelists/files
diff --git a/config/rootfiles/core/140/meta b/config/rootfiles/oldcore/140/meta
similarity index 100%
rename from config/rootfiles/core/140/meta
rename to config/rootfiles/oldcore/140/meta
diff --git a/config/rootfiles/core/140/update.sh b/config/rootfiles/oldcore/140/update.sh
similarity index 100%
rename from config/rootfiles/core/140/update.sh
rename to config/rootfiles/oldcore/140/update.sh
diff --git a/config/rootfiles/oldcore/141/exclude b/config/rootfiles/oldcore/141/exclude
new file mode 100644
index 000000000..b22159878
--- /dev/null
+++ b/config/rootfiles/oldcore/141/exclude
@@ -0,0 +1,28 @@
+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/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/141/filelists/aarch64/efivar b/config/rootfiles/oldcore/141/filelists/aarch64/efivar
similarity index 100%
rename from config/rootfiles/core/141/filelists/aarch64/efivar
rename to config/rootfiles/oldcore/141/filelists/aarch64/efivar
diff --git a/config/rootfiles/core/141/filelists/aarch64/gcc b/config/rootfiles/oldcore/141/filelists/aarch64/gcc
similarity index 100%
rename from config/rootfiles/core/141/filelists/aarch64/gcc
rename to config/rootfiles/oldcore/141/filelists/aarch64/gcc
diff --git a/config/rootfiles/core/141/filelists/aarch64/glibc b/config/rootfiles/oldcore/141/filelists/aarch64/glibc
similarity index 100%
rename from config/rootfiles/core/141/filelists/aarch64/glibc
rename to config/rootfiles/oldcore/141/filelists/aarch64/glibc
diff --git a/config/rootfiles/core/141/filelists/aarch64/python3 b/config/rootfiles/oldcore/141/filelists/aarch64/python3
similarity index 100%
rename from config/rootfiles/core/141/filelists/aarch64/python3
rename to config/rootfiles/oldcore/141/filelists/aarch64/python3
diff --git a/config/rootfiles/core/141/filelists/armv5tel/gcc b/config/rootfiles/oldcore/141/filelists/armv5tel/gcc
similarity index 100%
rename from config/rootfiles/core/141/filelists/armv5tel/gcc
rename to config/rootfiles/oldcore/141/filelists/armv5tel/gcc
diff --git a/config/rootfiles/core/141/filelists/armv5tel/glibc b/config/rootfiles/oldcore/141/filelists/armv5tel/glibc
similarity index 100%
rename from config/rootfiles/core/141/filelists/armv5tel/glibc
rename to config/rootfiles/oldcore/141/filelists/armv5tel/glibc
diff --git a/config/rootfiles/core/141/filelists/armv5tel/pyhton3 b/config/rootfiles/oldcore/141/filelists/armv5tel/pyhton3
similarity index 100%
rename from config/rootfiles/core/141/filelists/armv5tel/pyhton3
rename to config/rootfiles/oldcore/141/filelists/armv5tel/pyhton3
diff --git a/config/rootfiles/core/141/filelists/bind b/config/rootfiles/oldcore/141/filelists/bind
similarity index 100%
rename from config/rootfiles/core/141/filelists/bind
rename to config/rootfiles/oldcore/141/filelists/bind
diff --git a/config/rootfiles/core/141/filelists/elinks b/config/rootfiles/oldcore/141/filelists/elinks
similarity index 100%
rename from config/rootfiles/core/141/filelists/elinks
rename to config/rootfiles/oldcore/141/filelists/elinks
diff --git a/config/rootfiles/core/141/filelists/file b/config/rootfiles/oldcore/141/filelists/file
similarity index 100%
rename from config/rootfiles/core/141/filelists/file
rename to config/rootfiles/oldcore/141/filelists/file
diff --git a/config/rootfiles/core/141/filelists/files b/config/rootfiles/oldcore/141/filelists/files
similarity index 100%
rename from config/rootfiles/core/141/filelists/files
rename to config/rootfiles/oldcore/141/filelists/files
diff --git a/config/rootfiles/core/141/filelists/geoip-database b/config/rootfiles/oldcore/141/filelists/geoip-database
similarity index 100%
rename from config/rootfiles/core/141/filelists/geoip-database
rename to config/rootfiles/oldcore/141/filelists/geoip-database
diff --git a/config/rootfiles/core/141/filelists/glib b/config/rootfiles/oldcore/141/filelists/glib
similarity index 100%
rename from config/rootfiles/core/141/filelists/glib
rename to config/rootfiles/oldcore/141/filelists/glib
diff --git a/config/rootfiles/core/141/filelists/i586/gcc b/config/rootfiles/oldcore/141/filelists/i586/gcc
similarity index 100%
rename from config/rootfiles/core/141/filelists/i586/gcc
rename to config/rootfiles/oldcore/141/filelists/i586/gcc
diff --git a/config/rootfiles/core/141/filelists/i586/glibc b/config/rootfiles/oldcore/141/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/141/filelists/i586/glibc
rename to config/rootfiles/oldcore/141/filelists/i586/glibc
diff --git a/config/rootfiles/core/141/filelists/i586/python3 b/config/rootfiles/oldcore/141/filelists/i586/python3
similarity index 100%
rename from config/rootfiles/core/141/filelists/i586/python3
rename to config/rootfiles/oldcore/141/filelists/i586/python3
diff --git a/config/rootfiles/core/141/filelists/knot b/config/rootfiles/oldcore/141/filelists/knot
similarity index 100%
rename from config/rootfiles/core/141/filelists/knot
rename to config/rootfiles/oldcore/141/filelists/knot
diff --git a/config/rootfiles/core/141/filelists/libhtp b/config/rootfiles/oldcore/141/filelists/libhtp
similarity index 100%
rename from config/rootfiles/core/141/filelists/libhtp
rename to config/rootfiles/oldcore/141/filelists/libhtp
diff --git a/config/rootfiles/core/141/filelists/libmpc b/config/rootfiles/oldcore/141/filelists/libmpc
similarity index 100%
rename from config/rootfiles/core/141/filelists/libmpc
rename to config/rootfiles/oldcore/141/filelists/libmpc
diff --git a/config/rootfiles/core/141/filelists/lvm2 b/config/rootfiles/oldcore/141/filelists/lvm2
similarity index 100%
rename from config/rootfiles/core/141/filelists/lvm2
rename to config/rootfiles/oldcore/141/filelists/lvm2
diff --git a/config/rootfiles/core/141/filelists/mdadm b/config/rootfiles/oldcore/141/filelists/mdadm
similarity index 100%
rename from config/rootfiles/core/141/filelists/mdadm
rename to config/rootfiles/oldcore/141/filelists/mdadm
diff --git a/config/rootfiles/core/141/filelists/mpfr b/config/rootfiles/oldcore/141/filelists/mpfr
similarity index 100%
rename from config/rootfiles/core/141/filelists/mpfr
rename to config/rootfiles/oldcore/141/filelists/mpfr
diff --git a/config/rootfiles/oldcore/141/filelists/suricata b/config/rootfiles/oldcore/141/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/oldcore/141/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/141/filelists/unbound b/config/rootfiles/oldcore/141/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/141/filelists/unbound
rename to config/rootfiles/oldcore/141/filelists/unbound
diff --git a/config/rootfiles/core/141/filelists/x86_64/efivar b/config/rootfiles/oldcore/141/filelists/x86_64/efivar
similarity index 100%
rename from config/rootfiles/core/141/filelists/x86_64/efivar
rename to config/rootfiles/oldcore/141/filelists/x86_64/efivar
diff --git a/config/rootfiles/core/141/filelists/x86_64/gcc b/config/rootfiles/oldcore/141/filelists/x86_64/gcc
similarity index 100%
rename from config/rootfiles/core/141/filelists/x86_64/gcc
rename to config/rootfiles/oldcore/141/filelists/x86_64/gcc
diff --git a/config/rootfiles/core/141/filelists/x86_64/glibc b/config/rootfiles/oldcore/141/filelists/x86_64/glibc
similarity index 100%
rename from config/rootfiles/core/141/filelists/x86_64/glibc
rename to config/rootfiles/oldcore/141/filelists/x86_64/glibc
diff --git a/config/rootfiles/core/141/filelists/x86_64/python3 b/config/rootfiles/oldcore/141/filelists/x86_64/python3
similarity index 100%
rename from config/rootfiles/core/141/filelists/x86_64/python3
rename to config/rootfiles/oldcore/141/filelists/x86_64/python3
diff --git a/config/rootfiles/core/141/meta b/config/rootfiles/oldcore/141/meta
similarity index 100%
rename from config/rootfiles/core/141/meta
rename to config/rootfiles/oldcore/141/meta
diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/oldcore/141/update.sh
similarity index 100%
rename from config/rootfiles/core/141/update.sh
rename to config/rootfiles/oldcore/141/update.sh
diff --git a/config/rootfiles/packages/aarch64/directfb b/config/rootfiles/packages/aarch64/directfb
deleted file mode 100644
index a3004e5fa..000000000
--- a/config/rootfiles/packages/aarch64/directfb
+++ /dev/null
@@ -1,391 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-#usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi
new file mode 100644
index 000000000..2dd21fe99
--- /dev/null
+++ b/config/rootfiles/packages/aarch64/vdr_dvbapi
@@ -0,0 +1,3 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/config/rootfiles/packages/arm b/config/rootfiles/packages/arm
deleted file mode 100644
index eb9d128d4..000000000
--- a/config/rootfiles/packages/arm
+++ /dev/null
@@ -1,166 +0,0 @@
-usr/bin/arm
-#usr/share/arm
-#usr/share/arm-1.4.5.0-py2.7.egg-info
-usr/share/arm/TorCtl
-usr/share/arm/TorCtl/GeoIPSupport.py
-usr/share/arm/TorCtl/GeoIPSupport.pyc
-usr/share/arm/TorCtl/PathSupport.py
-usr/share/arm/TorCtl/PathSupport.pyc
-usr/share/arm/TorCtl/SQLSupport.py
-usr/share/arm/TorCtl/SQLSupport.pyc
-usr/share/arm/TorCtl/ScanSupport.py
-usr/share/arm/TorCtl/ScanSupport.pyc
-usr/share/arm/TorCtl/StatsSupport.py
-usr/share/arm/TorCtl/StatsSupport.pyc
-usr/share/arm/TorCtl/TorCtl.py
-usr/share/arm/TorCtl/TorCtl.pyc
-usr/share/arm/TorCtl/TorUtil.py
-usr/share/arm/TorCtl/TorUtil.pyc
-usr/share/arm/TorCtl/__init__.py
-usr/share/arm/TorCtl/__init__.pyc
-usr/share/arm/TorCtl/example.py
-usr/share/arm/TorCtl/example.pyc
-usr/share/arm/__init__.py
-usr/share/arm/__init__.pyc
-usr/share/arm/cli
-usr/share/arm/cli/__init__.py
-usr/share/arm/cli/__init__.pyc
-usr/share/arm/cli/configPanel.py
-usr/share/arm/cli/configPanel.pyc
-usr/share/arm/cli/connections
-usr/share/arm/cli/connections/__init__.py
-usr/share/arm/cli/connections/__init__.pyc
-usr/share/arm/cli/connections/circEntry.py
-usr/share/arm/cli/connections/circEntry.pyc
-usr/share/arm/cli/connections/connEntry.py
-usr/share/arm/cli/connections/connEntry.pyc
-usr/share/arm/cli/connections/connPanel.py
-usr/share/arm/cli/connections/connPanel.pyc
-usr/share/arm/cli/connections/countPopup.py
-usr/share/arm/cli/connections/countPopup.pyc
-usr/share/arm/cli/connections/descriptorPopup.py
-usr/share/arm/cli/connections/descriptorPopup.pyc
-usr/share/arm/cli/connections/entries.py
-usr/share/arm/cli/connections/entries.pyc
-usr/share/arm/cli/controller.py
-usr/share/arm/cli/controller.pyc
-usr/share/arm/cli/graphing
-usr/share/arm/cli/graphing/__init__.py
-usr/share/arm/cli/graphing/__init__.pyc
-usr/share/arm/cli/graphing/bandwidthStats.py
-usr/share/arm/cli/graphing/bandwidthStats.pyc
-usr/share/arm/cli/graphing/connStats.py
-usr/share/arm/cli/graphing/connStats.pyc
-usr/share/arm/cli/graphing/graphPanel.py
-usr/share/arm/cli/graphing/graphPanel.pyc
-usr/share/arm/cli/graphing/resourceStats.py
-usr/share/arm/cli/graphing/resourceStats.pyc
-usr/share/arm/cli/headerPanel.py
-usr/share/arm/cli/headerPanel.pyc
-usr/share/arm/cli/interpretorPanel.py
-usr/share/arm/cli/interpretorPanel.pyc
-usr/share/arm/cli/logPanel.py
-usr/share/arm/cli/logPanel.pyc
-usr/share/arm/cli/menu
-usr/share/arm/cli/menu/__init__.py
-usr/share/arm/cli/menu/__init__.pyc
-usr/share/arm/cli/menu/actions.py
-usr/share/arm/cli/menu/actions.pyc
-usr/share/arm/cli/menu/item.py
-usr/share/arm/cli/menu/item.pyc
-usr/share/arm/cli/menu/menu.py
-usr/share/arm/cli/menu/menu.pyc
-usr/share/arm/cli/popups.py
-usr/share/arm/cli/popups.pyc
-usr/share/arm/cli/torrcPanel.py
-usr/share/arm/cli/torrcPanel.pyc
-usr/share/arm/cli/wizard.py
-usr/share/arm/cli/wizard.pyc
-usr/share/arm/gui
-usr/share/arm/gui/__init__.py
-usr/share/arm/gui/__init__.pyc
-usr/share/arm/gui/arm.xml
-usr/share/arm/gui/configPanel.py
-usr/share/arm/gui/configPanel.pyc
-usr/share/arm/gui/connections
-usr/share/arm/gui/connections/__init__.py
-usr/share/arm/gui/connections/__init__.pyc
-usr/share/arm/gui/connections/circEntry.py
-usr/share/arm/gui/connections/circEntry.pyc
-usr/share/arm/gui/connections/connEntry.py
-usr/share/arm/gui/connections/connEntry.pyc
-usr/share/arm/gui/connections/connPanel.py
-usr/share/arm/gui/connections/connPanel.pyc
-usr/share/arm/gui/controller.py
-usr/share/arm/gui/controller.pyc
-usr/share/arm/gui/generalPanel.py
-usr/share/arm/gui/generalPanel.pyc
-usr/share/arm/gui/graphing
-usr/share/arm/gui/graphing/__init__.py
-usr/share/arm/gui/graphing/__init__.pyc
-usr/share/arm/gui/graphing/bandwidthStats.py
-usr/share/arm/gui/graphing/bandwidthStats.pyc
-usr/share/arm/gui/graphing/graphPanel.py
-usr/share/arm/gui/graphing/graphPanel.pyc
-usr/share/arm/gui/logPanel.py
-usr/share/arm/gui/logPanel.pyc
-usr/share/arm/prereq.py
-usr/share/arm/prereq.pyc
-#usr/share/arm/resources
-#usr/share/arm/resources/arm.1
-#usr/share/arm/resources/exitNotice
-#usr/share/arm/resources/exitNotice/how_tor_works_thumb.png
-#usr/share/arm/resources/exitNotice/index.html
-#usr/share/arm/resources/startTor
-#usr/share/arm/resources/tor-arm.desktop
-#usr/share/arm/resources/tor-arm.svg
-#usr/share/arm/resources/torConfigDesc.txt
-#usr/share/arm/resources/torrcOverride
-#usr/share/arm/resources/torrcOverride/override.c
-#usr/share/arm/resources/torrcOverride/override.h
-#usr/share/arm/resources/torrcOverride/override.py
-#usr/share/arm/resources/torrcTemplate.txt
-usr/share/arm/settings.cfg
-usr/share/arm/starter.py
-usr/share/arm/starter.pyc
-usr/share/arm/test.py
-usr/share/arm/test.pyc
-#usr/share/arm/uninstall
-usr/share/arm/util
-usr/share/arm/util/__init__.py
-usr/share/arm/util/__init__.pyc
-usr/share/arm/util/conf.py
-usr/share/arm/util/conf.pyc
-usr/share/arm/util/connections.py
-usr/share/arm/util/connections.pyc
-usr/share/arm/util/enum.py
-usr/share/arm/util/enum.pyc
-usr/share/arm/util/gtkTools.py
-usr/share/arm/util/gtkTools.pyc
-usr/share/arm/util/hostnames.py
-usr/share/arm/util/hostnames.pyc
-usr/share/arm/util/log.py
-usr/share/arm/util/log.pyc
-usr/share/arm/util/panel.py
-usr/share/arm/util/panel.pyc
-usr/share/arm/util/procName.py
-usr/share/arm/util/procName.pyc
-usr/share/arm/util/procTools.py
-usr/share/arm/util/procTools.pyc
-usr/share/arm/util/sysTools.py
-usr/share/arm/util/sysTools.pyc
-usr/share/arm/util/textInput.py
-usr/share/arm/util/textInput.pyc
-usr/share/arm/util/torConfig.py
-usr/share/arm/util/torConfig.pyc
-usr/share/arm/util/torInterpretor.py
-usr/share/arm/util/torInterpretor.pyc
-usr/share/arm/util/torTools.py
-usr/share/arm/util/torTools.pyc
-usr/share/arm/util/uiTools.py
-usr/share/arm/util/uiTools.pyc
-usr/share/arm/version.py
-usr/share/arm/version.pyc
-#usr/share/doc/arm
-#usr/share/doc/arm/armrc.sample
-#usr/share/man/man1/arm.1.gz
diff --git a/config/rootfiles/packages/armv5tel/directfb b/config/rootfiles/packages/armv5tel/directfb
deleted file mode 100644
index d77367ba0..000000000
--- a/config/rootfiles/packages/armv5tel/directfb
+++ /dev/null
@@ -1,402 +0,0 @@
-usr/bin/c64xdump
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-#usr/lib/libdavinci_c64x.la
-#usr/lib/libdavinci_c64x.so
-usr/lib/libdavinci_c64x.so.0
-usr/lib/libdavinci_c64x.so.0.0.0
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
index 074813795..2dd21fe99 100644
--- a/config/rootfiles/packages/armv5tel/vdr_dvbapi
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -1,3 +1,3 @@
etc/sysconfig/vdr-plugins.d/dvbapi.conf
etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/config/rootfiles/packages/armv7hl/directfb b/config/rootfiles/packages/armv7hl/directfb
deleted file mode 100644
index 9863c68af..000000000
--- a/config/rootfiles/packages/armv7hl/directfb
+++ /dev/null
@@ -1,402 +0,0 @@
-usr/bin/c64xdump
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-#usr/lib/libdavinci_c64x.la
-#usr/lib/libdavinci_c64x.so
-usr/lib/libdavinci_c64x.so.0
-usr/lib/libdavinci_c64x.so.0.0.0
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-#usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
deleted file mode 100644
index 1d68f74d6..000000000
--- a/config/rootfiles/packages/check_mk_agent
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/check_mk_agent
-etc/xinetd.d/check_mk_agent
-usr/bin/waitmax
diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd
deleted file mode 100644
index 54b9e917c..000000000
--- a/config/rootfiles/packages/cyrus-imapd
+++ /dev/null
@@ -1,215 +0,0 @@
-etc/rc.d/init.d/cyrus-imapd
-usr/bin/cyradm
-usr/bin/imtest
-usr/bin/installsieve
-usr/bin/lmtptest
-usr/bin/mkimap
-usr/bin/mupdatetest
-usr/bin/nntptest
-usr/bin/pop3test
-usr/bin/sieveshell
-usr/bin/sivtest
-usr/bin/smtptest
-usr/bin/synctest
-#usr/include/cyrus
-#usr/include/cyrus/acl.h
-#usr/include/cyrus/arrayu64.h
-#usr/include/cyrus/assert.h
-#usr/include/cyrus/auth.h
-#usr/include/cyrus/auth_pts.h
-#usr/include/cyrus/bitvector.h
-#usr/include/cyrus/bsearch.h
-#usr/include/cyrus/charset.h
-#usr/include/cyrus/chartable.h
-#usr/include/cyrus/command.h
-#usr/include/cyrus/crc32.h
-#usr/include/cyrus/cyr_lock.h
-#usr/include/cyrus/cyrusdb.h
-#usr/include/cyrus/exitcodes.h
-#usr/include/cyrus/glob.h
-#usr/include/cyrus/gmtoff.h
-#usr/include/cyrus/hash.h
-#usr/include/cyrus/hashu64.h
-#usr/include/cyrus/imapopts.h
-#usr/include/cyrus/imapurl.h
-#usr/include/cyrus/imclient.h
-#usr/include/cyrus/imparse.h
-#usr/include/cyrus/iostat.h
-#usr/include/cyrus/iptostring.h
-#usr/include/cyrus/libcyr_cfg.h
-#usr/include/cyrus/lsort.h
-#usr/include/cyrus/map.h
-#usr/include/cyrus/mappedfile.h
-#usr/include/cyrus/mkgmtime.h
-#usr/include/cyrus/mpool.h
-#usr/include/cyrus/nonblock.h
-#usr/include/cyrus/parseaddr.h
-#usr/include/cyrus/retry.h
-#usr/include/cyrus/rfc822tok.h
-#usr/include/cyrus/sieve
-#usr/include/cyrus/sieve/sieve_err.h
-#usr/include/cyrus/sieve/sieve_interface.h
-#usr/include/cyrus/signals.h
-#usr/include/cyrus/strarray.h
-#usr/include/cyrus/strhash.h
-#usr/include/cyrus/stristr.h
-#usr/include/cyrus/sysexits.h
-#usr/include/cyrus/times.h
-#usr/include/cyrus/tok.h
-#usr/include/cyrus/vparse.h
-#usr/include/cyrus/wildmat.h
-#usr/include/cyrus/xmalloc.h
-#usr/lib/cyrus
-usr/lib/cyrus/arbitron
-usr/lib/cyrus/chk_cyrus
-usr/lib/cyrus/ctl_cyrusdb
-usr/lib/cyrus/ctl_deliver
-usr/lib/cyrus/ctl_mboxlist
-usr/lib/cyrus/cvt_cyrusdb
-usr/lib/cyrus/cyr_dbtool
-usr/lib/cyrus/cyr_deny
-usr/lib/cyrus/cyr_df
-usr/lib/cyrus/cyr_expire
-usr/lib/cyrus/cyr_info
-usr/lib/cyrus/cyr_sequence
-usr/lib/cyrus/cyr_synclog
-usr/lib/cyrus/cyr_userseen
-usr/lib/cyrus/cyrdump
-usr/lib/cyrus/deliver
-usr/lib/cyrus/fud
-usr/lib/cyrus/idled
-usr/lib/cyrus/imapd
-usr/lib/cyrus/ipurge
-usr/lib/cyrus/lmtpd
-usr/lib/cyrus/lmtpproxyd
-usr/lib/cyrus/master
-usr/lib/cyrus/mbexamine
-usr/lib/cyrus/mbpath
-usr/lib/cyrus/mbtool
-usr/lib/cyrus/notifyd
-usr/lib/cyrus/pop3d
-usr/lib/cyrus/pop3proxyd
-usr/lib/cyrus/proxyd
-usr/lib/cyrus/quota
-usr/lib/cyrus/reconstruct
-usr/lib/cyrus/sievec
-usr/lib/cyrus/sieved
-usr/lib/cyrus/smmapd
-usr/lib/cyrus/squatter
-usr/lib/cyrus/timsieved
-usr/lib/cyrus/tls_prune
-usr/lib/cyrus/unexpunge
-#usr/lib/libcyrus.la
-#usr/lib/libcyrus.so
-usr/lib/libcyrus.so.0
-usr/lib/libcyrus.so.0.0.0
-#usr/lib/libcyrus_imap.la
-#usr/lib/libcyrus_imap.so
-usr/lib/libcyrus_imap.so.0
-usr/lib/libcyrus_imap.so.0.0.0
-#usr/lib/libcyrus_min.la
-#usr/lib/libcyrus_min.so
-usr/lib/libcyrus_min.so.0
-usr/lib/libcyrus_min.so.0.0.0
-#usr/lib/libcyrus_sieve.la
-#usr/lib/libcyrus_sieve.so
-usr/lib/libcyrus_sieve.so.0
-usr/lib/libcyrus_sieve.so.0.0.0
-#usr/lib/perl5/site_perl/5.30.0/Cyrus
-#usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator
-usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Daemon.pm
-usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Message.pm
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP.pm
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/Admin.pm
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/IMSP.pm
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/Shell.pm
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/SIEVE
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/SIEVE/managesieve.pm
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/.packlist
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
-#usr/lib/pkgconfig/libcyrus.pc
-#usr/lib/pkgconfig/libcyrus_min.pc
-#usr/lib/pkgconfig/libcyrus_sieve.pc
-#usr/share/man/man1/cyradm.1
-#usr/share/man/man1/imtest.1
-#usr/share/man/man1/installsieve.1
-#usr/share/man/man1/lmtptest.1
-#usr/share/man/man1/mupdatetest.1
-#usr/share/man/man1/nntptest.1
-#usr/share/man/man1/pop3test.1
-#usr/share/man/man1/sieveshell.1
-#usr/share/man/man1/sivtest.1
-#usr/share/man/man1/smtptest.1
-#usr/share/man/man3/Cyrus::Annotator::Daemon.3
-#usr/share/man/man3/Cyrus::Annotator::Message.3
-#usr/share/man/man3/Cyrus::IMAP.3
-#usr/share/man/man3/Cyrus::IMAP::Admin.3
-#usr/share/man/man3/Cyrus::IMAP::IMSP.3
-#usr/share/man/man3/Cyrus::IMAP::Shell.3
-#usr/share/man/man3/Cyrus::SIEVE::managesieve.3
-#usr/share/man/man3/imclient.3
-#usr/share/man/man5/cyrus.conf.5
-#usr/share/man/man5/imapd.conf.5
-#usr/share/man/man5/krb.equiv.5
-#usr/share/man/man8/arbitron.8
-#usr/share/man/man8/chk_cyrus.8
-#usr/share/man/man8/ctl_cyrusdb.8
-#usr/share/man/man8/ctl_deliver.8
-#usr/share/man/man8/ctl_mboxlist.8
-#usr/share/man/man8/cvt_cyrusdb.8
-#usr/share/man/man8/cyr_dbtool.8
-#usr/share/man/man8/cyr_deny.8
-#usr/share/man/man8/cyr_df.8
-#usr/share/man/man8/cyr_expire.8
-#usr/share/man/man8/cyr_info.8
-#usr/share/man/man8/cyr_synclog.8
-#usr/share/man/man8/deliver.8
-#usr/share/man/man8/fud.8
-#usr/share/man/man8/idled.8
-#usr/share/man/man8/imapd.8
-#usr/share/man/man8/ipurge.8
-#usr/share/man/man8/lmtpd.8
-#usr/share/man/man8/mbexamine.8
-#usr/share/man/man8/mbpath.8
-#usr/share/man/man8/notifyd.8
-#usr/share/man/man8/pop3d.8
-#usr/share/man/man8/quota.8
-#usr/share/man/man8/reconstruct.8
-#usr/share/man/man8/rmnews.8
-#usr/share/man/man8/smmapd.8
-#usr/share/man/man8/squatter.8
-#usr/share/man/man8/sync_client.8
-#usr/share/man/man8/sync_reset.8
-#usr/share/man/man8/sync_server.8
-#usr/share/man/man8/timsieved.8
-#usr/share/man/man8/tls_prune.8
-#usr/share/man/man8/unexpunge.8
-usr/sieve
-var/imap
-var/imap/db
-var/imap/log
-var/imap/msg
-var/imap/proc
-var/imap/ptclient
-var/imap/socket
-var/imap/sync
-var/ipfire/backup/addons/includes/cyrus-imapd
-var/ipfire/cyrusimap
-var/ipfire/cyrusimap/cyrus.conf
-var/ipfire/cyrusimap/imapd.conf
-var/log/imap
-var/log/imap/stage.
-var/log/imap/sync.
diff --git a/config/rootfiles/packages/i586/directfb b/config/rootfiles/packages/i586/directfb
deleted file mode 100644
index 9e61f8bf8..000000000
--- a/config/rootfiles/packages/i586/directfb
+++ /dev/null
@@ -1,397 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
index 5e06c12a4..db2bc1ee6 100644
--- a/config/rootfiles/packages/i586/vdr_dvbapi
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -1,4 +1,4 @@
etc/sysconfig/vdr-plugins.d/dvbapi.conf
etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse
diff --git a/config/rootfiles/packages/icecast b/config/rootfiles/packages/icecast
deleted file mode 100644
index 7a79bb518..000000000
--- a/config/rootfiles/packages/icecast
+++ /dev/null
@@ -1,55 +0,0 @@
-usr/bin/icecast
-usr/etc/icecast.xml
-#usr/share/doc/icecast
-#usr/share/doc/icecast/AUTHORS
-#usr/share/doc/icecast/COPYING
-#usr/share/doc/icecast/ChangeLog
-#usr/share/doc/icecast/NEWS
-#usr/share/doc/icecast/README
-#usr/share/doc/icecast/TODO
-usr/share/doc/icecast/icecast2_admin.html
-usr/share/doc/icecast/icecast2_basicsetup.html
-usr/share/doc/icecast/icecast2_changes.html
-usr/share/doc/icecast/icecast2_config_file.html
-usr/share/doc/icecast/icecast2_faq.html
-usr/share/doc/icecast/icecast2_glossary.html
-usr/share/doc/icecast/icecast2_introduction.html
-usr/share/doc/icecast/icecast2_listenerauth.html
-usr/share/doc/icecast/icecast2_relay.html
-usr/share/doc/icecast/icecast2_stats.html
-usr/share/doc/icecast/icecast2_win32.html
-usr/share/doc/icecast/icecast2_yp.html
-usr/share/doc/icecast/index.html
-usr/share/doc/icecast/listener_auth1.jpg
-usr/share/doc/icecast/listener_auth2.jpg
-usr/share/doc/icecast/listener_auth3.jpg
-#usr/share/icecast
-#usr/share/icecast/admin
-usr/share/icecast/admin/listclients.xsl
-usr/share/icecast/admin/listmounts.xsl
-usr/share/icecast/admin/manageauth.xsl
-usr/share/icecast/admin/moveclients.xsl
-usr/share/icecast/admin/response.xsl
-usr/share/icecast/admin/stats.xsl
-usr/share/icecast/admin/updatemetadata.xsl
-#usr/share/icecast/doc
-usr/share/icecast/doc/icecast.xml.dist
-usr/share/icecast/doc/icecast_minimal.xml.dist
-usr/share/icecast/doc/icecast_shoutcast_compat.xml.dist
-usr/share/icecast/doc/icecast_urlauth.xml.dist
-#usr/share/icecast/web
-usr/share/icecast/web/auth.xsl
-usr/share/icecast/web/corner_bottomleft.jpg
-usr/share/icecast/web/corner_bottomright.jpg
-usr/share/icecast/web/corner_topleft.jpg
-usr/share/icecast/web/corner_topright.jpg
-usr/share/icecast/web/icecast.png
-usr/share/icecast/web/key.gif
-usr/share/icecast/web/key.png
-usr/share/icecast/web/server_version.xsl
-usr/share/icecast/web/status.xsl
-usr/share/icecast/web/status2.xsl
-usr/share/icecast/web/style.css
-usr/share/icecast/web/tunein.png
-usr/share/doc/icecast/masterslave.png
-usr/share/doc/icecast/relay.png
diff --git a/config/rootfiles/packages/icegenerator b/config/rootfiles/packages/icegenerator
deleted file mode 100644
index 940c82947..000000000
--- a/config/rootfiles/packages/icegenerator
+++ /dev/null
@@ -1 +0,0 @@
-usr/local/bin/icegenerator
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index c0894cd1f..8c7b1f66b 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -2092,6 +2092,8 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/certs
#lib/modules/KVER-ipfire-pae/build/certs/Kconfig
#lib/modules/KVER-ipfire-pae/build/certs/Makefile
+#lib/modules/KVER-ipfire-pae/build/certs/signing_key.pem
+#lib/modules/KVER-ipfire-pae/build/certs/signing_key.x509
#lib/modules/KVER-ipfire-pae/build/crypto
#lib/modules/KVER-ipfire-pae/build/crypto/Kconfig
#lib/modules/KVER-ipfire-pae/build/crypto/Makefile
@@ -6204,6 +6206,12 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/asus/nb/wmi.h
#lib/modules/KVER-ipfire-pae/build/include/config/asus/wireless.h
#lib/modules/KVER-ipfire-pae/build/include/config/asus/wmi.h
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/key
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/key/type.h
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public/key
+#lib/modules/KVER-ipfire-pae/build/include/config/asymmetric/public/key/subtype.h
#lib/modules/KVER-ipfire-pae/build/include/config/async
#lib/modules/KVER-ipfire-pae/build/include/config/async/core.h
#lib/modules/KVER-ipfire-pae/build/include/config/async/memcpy.h
@@ -6862,7 +6870,9 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue/helper
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/glue/helper/x86.h
+#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash.h
+#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash/info.h
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hash2.h
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hmac.h
#lib/modules/KVER-ipfire-pae/build/include/config/crypto/hw.h
@@ -9076,6 +9086,13 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/module/compress
#lib/modules/KVER-ipfire-pae/build/include/config/module/compress.h
#lib/modules/KVER-ipfire-pae/build/include/config/module/compress/xz.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/all.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/force.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/hash.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/key.h
+#lib/modules/KVER-ipfire-pae/build/include/config/module/sig/sha512.h
#lib/modules/KVER-ipfire-pae/build/include/config/module/srcversion
#lib/modules/KVER-ipfire-pae/build/include/config/module/srcversion/all.h
#lib/modules/KVER-ipfire-pae/build/include/config/module/unload.h
@@ -10012,6 +10029,11 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/pinctrl/lewisburg.h
#lib/modules/KVER-ipfire-pae/build/include/config/pinctrl/mcp23s08.h
#lib/modules/KVER-ipfire-pae/build/include/config/pinmux.h
+#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7
+#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/message
+#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/message/parser.h
+#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/test
+#lib/modules/KVER-ipfire-pae/build/include/config/pkcs7/test/key.h
#lib/modules/KVER-ipfire-pae/build/include/config/plx
#lib/modules/KVER-ipfire-pae/build/include/config/plx/hermes.h
#lib/modules/KVER-ipfire-pae/build/include/config/pm
@@ -11268,6 +11290,12 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/sysfs
#lib/modules/KVER-ipfire-pae/build/include/config/sysfs.h
#lib/modules/KVER-ipfire-pae/build/include/config/sysfs/syscall.h
+#lib/modules/KVER-ipfire-pae/build/include/config/system
+#lib/modules/KVER-ipfire-pae/build/include/config/system/data
+#lib/modules/KVER-ipfire-pae/build/include/config/system/data/verification.h
+#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted
+#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted/keyring.h
+#lib/modules/KVER-ipfire-pae/build/include/config/system/trusted/keys.h
#lib/modules/KVER-ipfire-pae/build/include/config/sysvipc
#lib/modules/KVER-ipfire-pae/build/include/config/sysvipc.h
#lib/modules/KVER-ipfire-pae/build/include/config/sysvipc/sysctl.h
@@ -12121,6 +12149,9 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/include/config/wlcore/sdio.h
#lib/modules/KVER-ipfire-pae/build/include/config/wmi
#lib/modules/KVER-ipfire-pae/build/include/config/wmi/bmof.h
+#lib/modules/KVER-ipfire-pae/build/include/config/x509
+#lib/modules/KVER-ipfire-pae/build/include/config/x509/certificate
+#lib/modules/KVER-ipfire-pae/build/include/config/x509/certificate/parser.h
#lib/modules/KVER-ipfire-pae/build/include/config/x86
#lib/modules/KVER-ipfire-pae/build/include/config/x86.h
#lib/modules/KVER-ipfire-pae/build/include/config/x86/32
@@ -17647,6 +17678,7 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/scripts/dtc/util.h
#lib/modules/KVER-ipfire-pae/build/scripts/dtc/version_gen.h
#lib/modules/KVER-ipfire-pae/build/scripts/export_report.pl
+#lib/modules/KVER-ipfire-pae/build/scripts/extract-cert
#lib/modules/KVER-ipfire-pae/build/scripts/extract-cert.c
#lib/modules/KVER-ipfire-pae/build/scripts/extract-ikconfig
#lib/modules/KVER-ipfire-pae/build/scripts/extract-module-sig.pl
@@ -17828,6 +17860,7 @@ boot/vmlinuz-KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/build/scripts/selinux/mdp/mdp.c
#lib/modules/KVER-ipfire-pae/build/scripts/setlocalversion
#lib/modules/KVER-ipfire-pae/build/scripts/show_delta
+#lib/modules/KVER-ipfire-pae/build/scripts/sign-file
#lib/modules/KVER-ipfire-pae/build/scripts/sign-file.c
#lib/modules/KVER-ipfire-pae/build/scripts/sortextable
#lib/modules/KVER-ipfire-pae/build/scripts/sortextable.c
@@ -18555,6 +18588,8 @@ lib/modules/KVER-ipfire-pae/kernel
#lib/modules/KVER-ipfire-pae/kernel/crypto/ansi_cprng.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/anubis.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/arc4.ko.xz
+#lib/modules/KVER-ipfire-pae/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire-pae/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx
#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_memcpy.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_pq.ko.xz
@@ -18597,12 +18632,10 @@ lib/modules/KVER-ipfire-pae/kernel
#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd160.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd256.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd320.ko.xz
-#lib/modules/KVER-ipfire-pae/kernel/crypto/rsa_generic.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/salsa20_generic.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/seed.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/serpent_generic.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/sha3_generic.ko.xz
-#lib/modules/KVER-ipfire-pae/kernel/crypto/sha512_generic.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/tcrypt.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/tea.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/crypto/tgr192.ko.xz
@@ -21288,7 +21321,6 @@ lib/modules/KVER-ipfire-pae/kernel
#lib/modules/KVER-ipfire-pae/kernel/lib/842
#lib/modules/KVER-ipfire-pae/kernel/lib/842/842_compress.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/842/842_decompress.ko.xz
-#lib/modules/KVER-ipfire-pae/kernel/lib/asn1_decoder.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/cordic.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/crc-itu-t.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/crc4.ko.xz
@@ -21299,9 +21331,6 @@ lib/modules/KVER-ipfire-pae/kernel
#lib/modules/KVER-ipfire-pae/kernel/lib/lz4/lz4hc_compress.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/lzo
#lib/modules/KVER-ipfire-pae/kernel/lib/lzo/lzo_compress.ko.xz
-#lib/modules/KVER-ipfire-pae/kernel/lib/mpi
-#lib/modules/KVER-ipfire-pae/kernel/lib/mpi/mpi.ko.xz
-#lib/modules/KVER-ipfire-pae/kernel/lib/oid_registry.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/parman.ko.xz
#lib/modules/KVER-ipfire-pae/kernel/lib/raid6
#lib/modules/KVER-ipfire-pae/kernel/lib/raid6/raid6_pq.ko.xz
diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 73ff588c7..42a6aadf4 100644
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -111,6 +111,7 @@ usr/share/mc/skins/featured.ini
usr/share/mc/skins/gotar.ini
usr/share/mc/skins/gray-green-purple256.ini
usr/share/mc/skins/gray-orange-blue256.ini
+usr/share/mc/skins/julia256.ini
usr/share/mc/skins/mc46.ini
usr/share/mc/skins/modarcon16-defbg.ini
usr/share/mc/skins/modarcon16.ini
@@ -217,6 +218,7 @@ 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/yabasic.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/multicat b/config/rootfiles/packages/multicat
deleted file mode 100644
index 8d0600094..000000000
--- a/config/rootfiles/packages/multicat
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/aggregartp
-usr/bin/ingests
-usr/bin/lasts
-usr/bin/multicat
-usr/bin/multicat_validate
-usr/bin/offsets
-usr/bin/reordertp
-#usr/share/man/man1/aggregartp.1
-#usr/share/man/man1/ingests.1
-#usr/share/man/man1/lasts.1
-#usr/share/man/man1/multicat.1
-#usr/share/man/man1/offsets.1
-#usr/share/man/man1/reordertp.1
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index e5c0cd189..af9499d2a 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -48,13 +48,13 @@ usr/libexec/qemu-bridge-helper
#usr/share/icons/hicolor/scalable/apps
#usr/share/icons/hicolor/scalable/apps/qemu.svg
#usr/share/qemu
-usr/share/qemu/QEMU,cgthree.bin
-usr/share/qemu/QEMU,tcx.bin
-usr/share/qemu/bamboo.dtb
+#usr/share/qemu/QEMU,cgthree.bin
+#usr/share/qemu/QEMU,tcx.bin
+#usr/share/qemu/bamboo.dtb
usr/share/qemu/bios-256k.bin
usr/share/qemu/bios.bin
-usr/share/qemu/canyonlands.dtb
-usr/share/qemu/edk2-aarch64-code.fd
+#usr/share/qemu/canyonlands.dtb
+#usr/share/qemu/edk2-aarch64-code.fd
usr/share/qemu/edk2-arm-code.fd
usr/share/qemu/edk2-arm-vars.fd
usr/share/qemu/edk2-i386-code.fd
@@ -74,11 +74,11 @@ usr/share/qemu/efi-vmxnet3.rom
usr/share/qemu/firmware
usr/share/qemu/firmware/50-edk2-i386-secure.json
usr/share/qemu/firmware/50-edk2-x86_64-secure.json
-usr/share/qemu/firmware/60-edk2-aarch64.json
+#usr/share/qemu/firmware/60-edk2-aarch64.json
usr/share/qemu/firmware/60-edk2-arm.json
usr/share/qemu/firmware/60-edk2-i386.json
usr/share/qemu/firmware/60-edk2-x86_64.json
-usr/share/qemu/hppa-firmware.img
+#usr/share/qemu/hppa-firmware.img
usr/share/qemu/keymaps
usr/share/qemu/keymaps/ar
usr/share/qemu/keymaps/bepo
@@ -118,16 +118,16 @@ usr/share/qemu/kvmvapic.bin
usr/share/qemu/linuxboot.bin
usr/share/qemu/linuxboot_dma.bin
usr/share/qemu/multiboot.bin
-usr/share/qemu/openbios-ppc
-usr/share/qemu/openbios-sparc32
-usr/share/qemu/openbios-sparc64
-usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
-usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
-usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
-usr/share/qemu/palcode-clipper
-usr/share/qemu/petalogix-ml605.dtb
-usr/share/qemu/petalogix-s3adsp1800.dtb
-usr/share/qemu/ppc_rom.bin
+#usr/share/qemu/openbios-ppc
+#usr/share/qemu/openbios-sparc32
+#usr/share/qemu/openbios-sparc64
+#usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin
+#usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
+#usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin
+#usr/share/qemu/palcode-clipper
+#usr/share/qemu/petalogix-ml605.dtb
+#usr/share/qemu/petalogix-s3adsp1800.dtb
+#usr/share/qemu/ppc_rom.bin
usr/share/qemu/pvh.bin
usr/share/qemu/pxe-e1000.rom
usr/share/qemu/pxe-eepro100.rom
@@ -137,12 +137,12 @@ usr/share/qemu/pxe-rtl8139.rom
usr/share/qemu/pxe-virtio.rom
usr/share/qemu/qemu-nsis.bmp
usr/share/qemu/qemu_vga.ndrv
-usr/share/qemu/s390-ccw.img
-usr/share/qemu/s390-netboot.img
+#usr/share/qemu/s390-ccw.img
+#usr/share/qemu/s390-netboot.img
usr/share/qemu/sgabios.bin
-usr/share/qemu/skiboot.lid
-usr/share/qemu/slof.bin
-usr/share/qemu/spapr-rtas.bin
+#usr/share/qemu/skiboot.lid
+#usr/share/qemu/slof.bin
+#usr/share/qemu/spapr-rtas.bin
usr/share/qemu/trace-events-all
usr/share/qemu/u-boot-sam460-20100605.bin
usr/share/qemu/u-boot.e500
diff --git a/config/rootfiles/packages/rtpproxy b/config/rootfiles/packages/rtpproxy
deleted file mode 100644
index 6fcc1e44c..000000000
--- a/config/rootfiles/packages/rtpproxy
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/rc.d/init.d/rtpproxy
-usr/bin/makeann
-usr/bin/rtpproxy
-#usr/bin/rtpproxy_debug
-#usr/share/man/man8/rtpproxy.8
diff --git a/config/rootfiles/packages/streamripper b/config/rootfiles/packages/streamripper
deleted file mode 100644
index f3abba584..000000000
--- a/config/rootfiles/packages/streamripper
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/bin/agrep
-usr/bin/streamripper
-#usr/include/tre
-#usr/include/tre/regex.h
-#usr/include/tre/tre-config.h
-#usr/lib/libtre.a
-#usr/lib/libtre.la
-usr/lib/libtre.so
-usr/lib/libtre.so.4
-usr/lib/libtre.so.4.2.2
-#usr/lib/pkgconfig/tre.pc
-#usr/share/locale/fi/LC_MESSAGES/tre.mo
-#usr/share/man/man1/agrep.1
-#usr/share/man/man1/streamripper.1
diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index 4b6eaffe2..b08f1f04d 100644
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -5,7 +5,9 @@ etc/rc.d/rc6.d/K40vdr
etc/sysconfig/vdr
#etc/sysconfig/vdr-plugins.d
etc/vdr
+etc/vdr/camresponses.conf
etc/vdr/channels.conf
+etc/vdr/conf.d
etc/vdr/diseqc.conf
etc/vdr/keymacros.conf
etc/vdr/scr.conf
@@ -19,6 +21,7 @@ usr/bin/svdrpsend
#usr/include/libsi/si.h
#usr/include/libsi/util.h
#usr/include/vdr
+#usr/include/vdr/args.h
#usr/include/vdr/audio.h
#usr/include/vdr/channels.h
#usr/include/vdr/ci.h
@@ -42,12 +45,14 @@ usr/bin/svdrpsend
#usr/include/vdr/lirc.h
#usr/include/vdr/menu.h
#usr/include/vdr/menuitems.h
+#usr/include/vdr/mtd.h
#usr/include/vdr/nit.h
#usr/include/vdr/osd.h
#usr/include/vdr/osdbase.h
#usr/include/vdr/pat.h
#usr/include/vdr/player.h
#usr/include/vdr/plugin.h
+#usr/include/vdr/positioner.h
#usr/include/vdr/receiver.h
#usr/include/vdr/recorder.h
#usr/include/vdr/recording.h
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
index 17f7bc4af..8355a4614 100644
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.0.0
+usr/lib/vdr/libvdr-eepg.so.2.4.1
diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 193d79f9c..2402626dd 100644
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
etc/vdr/plugins/epgsearch
etc/vdr/plugins/epgsearch/conf.d
usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0
-usr/lib/vdr/libvdr-epgsearch.so.2.0.0
-usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0
-usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
+usr/lib/vdr/libvdr-epgsearch.so.2.4.1
+usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
+usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
#var/lib/vdr
#var/lib/vdr/data
var/lib/vdr/data/epgsearch
diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev
index 458e7d810..bd17db85c 100644
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -2,7 +2,6 @@ etc/sysconfig/vdr-plugins.d/streamdev-server.conf
#etc/vdr/plugins
etc/vdr/plugins/streamdev-server
etc/vdr/plugins/streamdev-server/streamdevhosts.conf
-#usr/lib/vdr
#usr/lib/vdr/bin
usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.0.0
+usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index 3dba2a03c..379349f65 100644
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/vdradmin
#etc/vdradmin
etc/vdradmin/vdradmind.conf
usr/bin/vdradmind
@@ -24,6 +25,7 @@ usr/share/locale/de/LC_MESSAGES/vdradmin.mo
#usr/share/locale/es/LC_MESSAGES/vdradmin.mo
#usr/share/locale/fi/LC_MESSAGES/vdradmin.mo
#usr/share/locale/fr/LC_MESSAGES/vdradmin.mo
+#usr/share/locale/hu/LC_MESSAGES/vdradmin.mo
#usr/share/locale/it/LC_MESSAGES/vdradmin.mo
#usr/share/locale/nl/LC_MESSAGES/vdradmin.mo
#usr/share/locale/ru/LC_MESSAGES/vdradmin.mo
@@ -174,12 +176,8 @@ usr/share/vdradmin
#usr/share/vdradmin/template/default/timer_new.html
#usr/share/vdradmin/template/default/tv.html
#usr/share/vdradmin/template/default/vdr_cmds.html
-etc/rc.d/init.d/vdradmin
+var/cache/vdradmin
+var/log/vdradmin
etc/rc.d/rc0.d/K01vdradmin
etc/rc.d/rc6.d/K01vdradmin
etc/rc.d/rc3.d/S99vdradmin
-#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
-var/cache/vdradmin
-var/log/vdradmin
-#var/run/vdradmin
diff --git a/config/rootfiles/packages/x86_64/directfb b/config/rootfiles/packages/x86_64/directfb
deleted file mode 100644
index dc291bf12..000000000
--- a/config/rootfiles/packages/x86_64/directfb
+++ /dev/null
@@ -1,397 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-#usr/share/directfb-1.7.7/cursor.dat
-#usr/share/directfb-1.7.7/cursor.png
-#usr/share/directfb-1.7.7/decker.dgiff
-#usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi
index 074813795..2dd21fe99 100644
--- a/config/rootfiles/packages/x86_64/vdr_dvbapi
+++ b/config/rootfiles/packages/x86_64/vdr_dvbapi
@@ -1,3 +1,3 @@
etc/sysconfig/vdr-plugins.d/dvbapi.conf
etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.4.1
diff --git a/config/suricata/ruleset-sources b/config/suricata/ruleset-sources
index ef8d8482b..814a3e0d1 100644
--- a/config/suricata/ruleset-sources
+++ b/config/suricata/ruleset-sources
@@ -1,8 +1,8 @@
# Ruleset for registered sourcefire users.
-registered = https://www.snort.org/rules/snortrules-snapshot-29150.tar.gz?oinkcode=<oinkcode>
+registered = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
# Ruleset for registered sourcefire users with valid subscription.
-subscripted = https://www.snort.org/rules/snortrules-snapshot-29150.tar.gz?oinkcode=<oinkcode>
+subscripted = https://www.snort.org/rules/snortrules-snapshot-29151.tar.gz?oinkcode=<oinkcode>
# Community rules from sourcefire.
community = https://www.snort.org/rules/community
diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index af9cb75a9..ed71898f4 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -148,7 +148,9 @@ nfq:
app-layer:
protocols:
krb5:
- enabled: no # Requires rust
+ enabled: yes
+ snmp:
+ enabled: yes
ikev2:
enabled: yes
tls:
@@ -156,6 +158,12 @@ app-layer:
detection-ports:
dp: "[443,444,465,853,993,995]"
+ # Generate JA3 fingerprint from client hello. If not specified it
+ # will be disabled by default, but enabled if rules require it.
+ #ja3-fingerprints: auto
+ # Generate JA3 fingerprint from client hello
+ ja3-fingerprints: no
+
# Completely stop processing TLS/SSL session after the handshake
# completed. If bypass is enabled this will also trigger flow
# bypass. If disabled (the default), TLS/SSL session is still
@@ -165,6 +173,8 @@ app-layer:
enabled: yes
ftp:
enabled: yes
+ rdp:
+ enabled: yes
ssh:
enabled: yes
smtp:
@@ -203,9 +213,10 @@ app-layer:
enabled: yes
detection-ports:
dp: 139, 445
- # smb2 detection is disabled internally inside the engine.
- #smb2:
- # enabled: yes
+ nfs:
+ enabled: yes
+ tftp:
+ enabled: yes
dns:
# memcaps. Globally and per flow/state.
global-memcap: 32mb
@@ -271,6 +282,12 @@ app-layer:
double-decode-path: no
double-decode-query: no
+ ntp:
+ enabled: yes
+ dhcp:
+ enabled: yes
+ sip:
+ enabled: yes
# Limit for the maximum number of asn1 frames to decode (default 256)
asn1-max-frames: 256
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index b86b6809a..3517fe946 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -11,14 +11,10 @@ if test ${boot_part} = ""; then
setenv boot_part ${dev_num}:1;
fi;
-if test ${soc} = "kirkwood"; then
- setenv kernel_type -kirkwood;
+if test ${cpu} = "armv8"; then
+ echo ;
else
- if test ${cpu} = "armv8"; then
- echo ;
- else
- setenv kernel_type -multi;
- fi;
+ setenv kernel_type -multi;
fi;
# Import uEnv txt...
@@ -38,6 +34,14 @@ if test "${board}" = "sunxi"; then
setenv fdtfile ${DTBSUNXI};
fi;
+# Quirk for RPi on aarch64 becuase u-boot cannot use the
+# initrd on aarch64 and without ramdisk no UUID
+if test ${cpu} = "armv8"; then
+ if test ${board} = "rpi"; then
+ setenv root_dev /dev/mmcblk0p3;
+ fi;
+fi;
+
# Check if serial console is enabled
if test "${SERIAL-CONSOLE}" = "ON"; then
if test ${console} = ""; then
@@ -91,7 +95,16 @@ if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel
else
echo Ramdisk not loaded...;
setenv ramdisk_addr -;
-fi ;
+fi;
+
+# Quirk for RPi on aarch64 becuase u-boot cannot use the
+# initrd on aarch64
+if test ${cpu} = "armv8"; then
+ if test ${board} = "rpi"; then
+ setenv ramdisk_addr -;
+ fi;
+fi;
+
bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index b3c6bc2c8..7fde534e3 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 5144a7712..33d6d65ba 100644
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -72,6 +72,7 @@ ZONE=$(detect_zone)
# Cannot proceed if we could not find a zone
if [ -z "${ZONE}" ]; then
+ logger "Could not find a bridged zone for ${INTERFACE}"
exit 0
fi
@@ -92,7 +93,12 @@ case "${MODE}" in
#ip link set "${BRIDGE}" up
fi
+ if grep -q "INTERFACE=${INTERFACE}" "/var/ipfire/wlanap/settings" 2>/dev/null; then
+ iw dev "${INTERFACE}" set type __ap
+ fi
+
# Attach the physical device
+ logger "Attach ${INTERFACE} to ${BRIDGE}"
ip link set dev "${INTERFACE}" master "${BRIDGE}"
ip link set dev "${INTERFACE}" up
;;
diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
index c424f5f14..26527b41a 100755
--- a/config/w_scan/w_scan_start
+++ b/config/w_scan/w_scan_start
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -19,9 +19,10 @@
# #
###############################################################################
###############################################################################
-# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc #
-# - 2013-04-20 Arne Fitzenreiter - path vdr 2 #
-# - 2012-11-15 Arne Fitzenreiter - inital vers.#
+# w_scan_start - 2020-02-21 Arne Fitzenreiter - update for 2017 wscan version #
+# - 2013-04-30 Arne Fitzenreiter - add atsc #
+# - 2013-04-20 Arne Fitzenreiter - path vdr 2 #
+# - 2012-11-15 Arne Fitzenreiter - inital vers. #
###############################################################################
err_msg ()
@@ -82,7 +83,7 @@ if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_S
# Generate and run separate country menubox and default germany
echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh
echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh
- $WSCAN -c? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh
+ $WSCAN -c? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh
echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh
sh /tmp/w_scan_countryselect.sh
chk_cancel
@@ -95,7 +96,7 @@ if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
# Generate and run separate satelite menubox and default astra
echo '#!/bin/bash' > /tmp/w_scan_satselect.sh
echo 'whiptail --checklist "\nSelect satellites" 19 70 10 \' >> /tmp/w_scan_satselect.sh
- $WSCAN -s? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh
+ $WSCAN -s? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh
echo ' 2>/tmp/w_scan_satellite' >> /tmp/w_scan_satselect.sh
sh /tmp/w_scan_satselect.sh
chk_cancel
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 89a703fcb..361133708 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -829,6 +829,11 @@ WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: not validating = Not validating
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 10c2f87ce..2fd69f430 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1440,12 +1440,17 @@ WARNING: untranslated string: pakfire core update level = Core-Update-Level
WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and <br /> click the plus to install.
WARNING: untranslated string: pakfire install package = You want to install the following packages:
WARNING: untranslated string: pakfire installed addons = Installed Addons:
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
WARNING: untranslated string: pakfire last core list update = Last core list update made
WARNING: untranslated string: pakfire last package update = Last packages list update made
WARNING: untranslated string: pakfire last serverlist update = Last server list update made
WARNING: untranslated string: pakfire last update = Last update made
WARNING: untranslated string: pakfire possible dependency = There may be depending packages, here is a list of packages that need to be installed.
WARNING: untranslated string: pakfire system state = System Status
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and <br /> click the minus to uninstall.
WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages:
WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully.
diff --git a/doc/language_issues.es b/doc/language_issues.es
index b97d017c3..af006fcdf 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1233,6 +1233,11 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no
WARNING: untranslated string: p2p block = P2P networks
WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: pptp netconfig = My Net Config
WARNING: untranslated string: pptp peer = Peer
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 8e9d7babb..928c37a46 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -861,6 +861,11 @@ WARNING: untranslated string: info messages = unknown string
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: not validating = Not validating
WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index a4ea5e618..6471e0d41 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1013,6 +1013,11 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: pptp netconfig = My Net Config
WARNING: untranslated string: pptp peer = Peer
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index ca1dee9b5..cc6cbe966 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1045,6 +1045,11 @@ WARNING: untranslated string: ovpn generating the root and host certificates = G
WARNING: untranslated string: ovpn ha = Hash algorithm
WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: pptp netconfig = My Net Config
WARNING: untranslated string: pptp peer = Peer
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index b97d017c3..af006fcdf 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1233,6 +1233,11 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no
WARNING: untranslated string: p2p block = P2P networks
WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: pptp netconfig = My Net Config
WARNING: untranslated string: pptp peer = Peer
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b76c83e56..a8cdef8b4 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1229,6 +1229,11 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
WARNING: untranslated string: p2p block = P2P networks
WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: pptp netconfig = My Net Config
WARNING: untranslated string: pptp peer = Peer
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ef28f6ac8..c6c6ad599 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -923,6 +923,11 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire tree = Repository
+WARNING: untranslated string: pakfire tree stable = Stable
+WARNING: untranslated string: pakfire tree testing = Testing
+WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
WARNING: untranslated string: ptr = PTR
diff --git a/doc/language_missings b/doc/language_missings
index 40724a80b..a427f5706 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -63,6 +63,11 @@
< notes
< not validating
< okay
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< quick control
< shaping add options
< show areas
@@ -705,6 +710,11 @@
< ovpn warning rfc3280
< p2p block
< p2p block save notice
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< pptp netconfig
< pptp peer
@@ -942,6 +952,11 @@
< dns use protocol for dns queries
< not validating
< okay
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< standard
< strict
< working
@@ -1182,6 +1197,11 @@
< ovpn error md5
< ovpn tls auth
< ovpn warning rfc3280
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< pptp netconfig
< pptp peer
@@ -1564,6 +1584,11 @@
< ovpn reneg sec
< ovpn tls auth
< ovpn warning rfc3280
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< pptp netconfig
< pptp peer
@@ -2285,6 +2310,11 @@
< ovpn warning rfc3280
< p2p block
< p2p block save notice
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< pptp netconfig
< pptp peer
@@ -3121,6 +3151,11 @@
< ovpn warning rfc3280
< p2p block
< p2p block save notice
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< pptp netconfig
< pptp peer
@@ -3429,6 +3464,11 @@
< ovpn error md5
< ovpn tls auth
< ovpn warning rfc3280
+< pakfire invalid tree
+< pakfire tree
+< pakfire tree stable
+< pakfire tree testing
+< pakfire tree unstable
< please reboot to apply your changes
< processor vulnerability mitigations
< ptr
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 4f3418a70..09fd50206 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -449,7 +449,7 @@ sub show_nameservers () {
$dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")";
}
-print <<END;
+ print <<END;
<table width='100%'>
<tr>
<td>
@@ -458,7 +458,36 @@ print <<END;
</td>
</tr>
</table>
+END
+
+ # Check the usage of ISP assigned nameservers is enabled.
+ my $id = 1;
+
+ # Loop through the array which stores the files.
+ foreach my $file (@ISP_nameserver_files) {
+ # Grab the address of the nameserver.
+ my $address = &General::grab_address_from_file($file);
+
+ # Check if we got an address.
+ if ($address) {
+ # Add the address to the hash of nameservers.
+ $dns_servers{$id} = [ "$address", "none",
+ ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
+ "$Lang::tr{'dns isp assigned nameserver'}" ];
+
+ # Increase id by one.
+ $id++;
+ }
+ }
+ # Check some DNS servers have been configured. In this case
+ # the hash contains at least one key.
+ my $server_amount;
+ if (keys %dns_servers) {
+ # Sort the keys by their ID and store them in an array.
+ my @keys = sort { $a <=> $b } keys %dns_servers;
+
+ print <<END;
<br>
<table class="tbl" width='100%'>
@@ -479,51 +508,23 @@ print <<END;
<strong>$Lang::tr{'remark'}</strong>
</td>
END
- # Check if the status should be displayed.
- if ($check_servers) {
-print <<END
+
+ # Check if the status should be displayed.
+ if ($check_servers) {
+ print <<END;
<td align="center">
<strong>$Lang::tr{'status'}</strong>
</td>
END
-;
- }
+ }
-print <<END
+ print <<END;
<td align="center" colspan="3">
<strong>$Lang::tr{'action'}</strong>
</td>
</tr>
END
-;
-
- # Check the usage of ISP assigned nameservers is enabled.
- my $id = 1;
-
- # Loop through the array which stores the files.
- foreach my $file (@ISP_nameserver_files) {
- # Grab the address of the nameserver.
- my $address = &General::grab_address_from_file($file);
-
- # Check if we got an address.
- if ($address) {
- # Add the address to the hash of nameservers.
- $dns_servers{$id} = [ "$address", "none",
- ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
- "$Lang::tr{'dns isp assigned nameserver'}" ];
-
- # Increase id by one.
- $id++;
- }
- }
-
- # Check some DNS servers have been configured. In this case
- # the hash contains at least one key.
- my $server_amount;
- if (keys %dns_servers) {
- # Sort the keys by their ID and store them in an array.
- my @keys = sort { $a <=> $b } keys %dns_servers;
# Loop through all entries of the array/hash.
foreach my $id (@keys) {
diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 08fee3d8a..967e250c7 100644
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -28,6 +28,7 @@ use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+require '/opt/pakfire/lib/functions.pl';
my $configfile = "/var/ipfire/main/send_profile";
@@ -84,7 +85,7 @@ if ($errormessage) {
}
my $ipfire_version = `cat /etc/system-release`;
-my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+my $pakfire_version = &Pakfire::make_version();
my $kernel_version = `uname -a`;
&Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'});
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index e6f3cda94..dacbe11f4 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -30,24 +30,23 @@ require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "/opt/pakfire/lib/functions.pl";
-my %pakfiresettings=();
+my %cgiparams=();
my $errormessage = '';
my %color = ();
+my %pakfiresettings = ();
my %mainsettings = ();
&Header::showhttpheaders();
-$pakfiresettings{'ACTION'} = '';
-$pakfiresettings{'VALID'} = '';
+$cgiparams{'ACTION'} = '';
+$cgiparams{'VALID'} = '';
-$pakfiresettings{'INSPAKS'} = '';
-$pakfiresettings{'DELPAKS'} = '';
-$pakfiresettings{'AUTOUPDATE'} = 'off';
-$pakfiresettings{'UUID'} = 'on';
+$cgiparams{'INSPAKS'} = '';
+$cgiparams{'DELPAKS'} = '';
sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
-&Header::getcgihash(\%pakfiresettings);
+&Header::getcgihash(\%cgiparams);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
@@ -55,17 +54,17 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
&Header::openpage($Lang::tr{'pakfire configuration'}, 1);
&Header::openbigbox('100%', 'left', '', $errormessage);
-if ($pakfiresettings{'ACTION'} eq 'install'){
- $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
- if ("$pakfiresettings{'FORCE'}" eq "on") {
- my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
+if ($cgiparams{'ACTION'} eq 'install'){
+ $cgiparams{'INSPAKS'} =~ s/\|/\ /g;
+ if ("$cgiparams{'FORCE'}" eq "on") {
+ my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $cgiparams{'INSPAKS'} &>/dev/null &";
system("$command");
system("/bin/sleep 1");
} else {
&Header::openbox("100%", "center", $Lang::tr{'request'});
- my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
+ my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $cgiparams{'INSPAKS'}`;
print <<END;
- <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
+ <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$cgiparams{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
<pre>
END
foreach (@output) {
@@ -77,7 +76,7 @@ END
<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
<tr><td colspan='2'>
<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='INSPAKS' value='$pakfiresettings{'INSPAKS'}' />
+ <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
<input type='hidden' name='FORCE' value='on' />
<input type='hidden' name='ACTION' value='install' />
<input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
@@ -94,18 +93,18 @@ END
&Header::closepage();
exit;
}
-} elsif ($pakfiresettings{'ACTION'} eq 'remove') {
+} elsif ($cgiparams{'ACTION'} eq 'remove') {
- $pakfiresettings{'DELPAKS'} =~ s/\|/\ /g;
- if ("$pakfiresettings{'FORCE'}" eq "on") {
- my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
+ $cgiparams{'DELPAKS'} =~ s/\|/\ /g;
+ if ("$cgiparams{'FORCE'}" eq "on") {
+ my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $cgiparams{'DELPAKS'} &>/dev/null &";
system("$command");
system("/bin/sleep 1");
} else {
&Header::openbox("100%", "center", $Lang::tr{'request'});
- my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
+ my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $cgiparams{'DELPAKS'}`;
print <<END;
- <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}
+ <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$cgiparams{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}
<pre>
END
foreach (@output) {
@@ -117,7 +116,7 @@ END
<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
<tr><td colspan='2'>
<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='DELPAKS' value='$pakfiresettings{'DELPAKS'}' />
+ <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
<input type='hidden' name='FORCE' value='on' />
<input type='hidden' name='ACTION' value='remove' />
<input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
@@ -135,23 +134,28 @@ END
exit;
}
-} elsif ($pakfiresettings{'ACTION'} eq 'update') {
+} elsif ($cgiparams{'ACTION'} eq 'update') {
system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
system("/bin/sleep 1");
-} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
+} elsif ($cgiparams{'ACTION'} eq 'upgrade') {
my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
system("$command");
system("/bin/sleep 1");
-} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
+} elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
+ $pakfiresettings{"TREE"} = $cgiparams{"TREE"};
- if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {
- system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1");
- } else {
- system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1");
+ # Check for valid input
+ if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) {
+ $errormessage .= $Lang::tr{'pakfire invalid tree'};
}
- &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+ unless ($errormessage) {
+ &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+
+ # Update lists
+ system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
+ }
}
&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
@@ -159,12 +163,11 @@ END
my %selected=();
my %checked=();
-$checked{'AUTOUPDATE'}{'off'} = '';
-$checked{'AUTOUPDATE'}{'on'} = '';
-$checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
-$checked{'UUID'}{'off'} = '';
-$checked{'UUID'}{'on'} = '';
-$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";
+$selected{"TREE"} = ();
+$selected{"TREE"}{"stable"} = "";
+$selected{"TREE"}{"testing"} = "";
+$selected{"TREE"}{"unstable"} = "";
+$selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected";
# DPC move error message to top so it is seen!
if ($errormessage) {
@@ -278,6 +281,34 @@ print <<END;
</table>
END
+&Header::closebox();
+&Header::openbox("100%", "center", "$Lang::tr{'settings'}");
+
+print <<END;
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='95%'>
+ <tr>
+ <td align='left' width='45%'>$Lang::tr{'pakfire tree'}</td>
+ <td width="55%" align="left">
+ <select name="TREE">
+ <option value="stable" $selected{"TREE"}{"stable"}>$Lang::tr{'pakfire tree stable'}</option>
+ <option value="testing" $selected{"TREE"}{"testing"}>$Lang::tr{'pakfire tree testing'}</option>
+ <option value="unstable" $selected{"TREE"}{"unstable"}>$Lang::tr{'pakfire tree unstable'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+ </td>
+ </tr>
+ </table>
+ </form>
+END
+
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index b63964081..06aca579b 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3945,7 +3945,13 @@ sub adduser
} else {
&deluser($str_user);
- my $htpasswd = new Apache::Htpasswd("$userdb");
+ my %htpasswd_options = (
+ passwdFile => "$userdb",
+ UseMD5 => 1,
+ );
+
+ my $htpasswd = new Apache::Htpasswd(\%htpasswd_options);
+
$htpasswd->htpasswd($str_user, $str_pass);
}
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 1f81108f1..a68c8f411 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1982,6 +1982,7 @@
'pakfire install description' => 'Please choose one or more items from the list below and <br /> click the plus to install.',
'pakfire install package' => 'You want to install the following packages: ',
'pakfire installed addons' => 'Installed Addons:',
+'pakfire invalid tree' => 'Invalid repository selected',
'pakfire last core list update' => 'Last core list update made',
'pakfire last package update' => 'Last packages list update made',
'pakfire last serverlist update' => 'Last server list update made',
@@ -1989,6 +1990,10 @@
'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
'pakfire register' => 'Register at pakfire-server:',
'pakfire system state' => 'System Status',
+'pakfire tree' => 'Repository',
+'pakfire tree stable' => 'Stable',
+'pakfire tree testing' => 'Testing',
+'pakfire tree unstable' => 'Unstable',
'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.',
'pakfire uninstall package' => 'You want to uninstall the following packages: ',
'pakfire update daily' => 'Search for updates daily:',
diff --git a/lfs/arm b/lfs/arm
deleted file mode 100644
index a8fae41df..000000000
--- a/lfs/arm
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.4.5.0
-
-THISAPP = arm-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/arm
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = arm
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = f85f306e50b90796ab7097d948e8fcf2
-
-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) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch
- cd $(DIR_APP) && ./install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/batctl b/lfs/batctl
deleted file mode 100644
index 36401609c..000000000
--- a/lfs/batctl
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 = 2014.3.0
-
-THISAPP = batctl-$(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 = 7d2b8c129424c014d020c4b1a2add31b
-
-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) && make $(MAKETUNING)
- cd $(DIR_APP) && make install PREFIX=/usr
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/bitstream b/lfs/bitstream
deleted file mode 100644
index f0ff34b09..000000000
--- a/lfs/bitstream
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.0
-
-THISAPP = bitstream-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = bitstream
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 5ba0c96d6c7c9131ba60a9a8fc147556
-
-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 jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bitstream-makefile.patch
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
deleted file mode 100644
index ab7f1da95..000000000
--- a/lfs/check_mk_agent
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.2.4p5
-
-THISAPP = check_mk_agent-$(VER)
-DL_FILE = check_mk-${VER}.tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/check_mk-${VER}
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = check_mk_agent
-PAK_VER = 4
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && tar xzf agents.tar.gz
- cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
- -mkdir /etc/xinetd.d
- cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
- cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
- cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/clamav b/lfs/clamav
index 9c0aab55f..debba0a7e 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.102.1
+VER = 0.102.2
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 48
+PAK_VER = 49
DEPS = ""
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3d5f5f10a1bea212823050286c8c5b96
+$(DL_FILE)_MD5 = ecf5dd2c5c43aeed1c4b458b2e689847
install : $(TARGET)
diff --git a/lfs/configroot b/lfs/configroot
index 6092f889b..2c9dbe0e3 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -133,6 +133,7 @@ $(TARGET) :
echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings
echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings
echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings
+ echo "TREE=$(PAKFIRE_TREE)" >> $(CONFIG_ROOT)/pakfire/settings
# Install snort to suricata converter.
cp $(DIR_SRC)/config/suricata/convert-snort /usr/sbin/convert-snort
diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
deleted file mode 100644
index 18b41ac7d..000000000
--- a/lfs/cyrus-imapd
+++ /dev/null
@@ -1,115 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 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.5.11
-
-THISAPP = cyrus-imapd-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = cyrus-imapd
-PAK_VER = 8
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --with-service-path=/usr/lib/cyrus \
- --with-cyrus-prefix=/usr/lib/cyrus \
- --sysconfdir=/var/ipfire/cyrusimap \
- --with-perl \
- --with-sasl \
- --with-syslogfacility=MAIL \
- --without-snmp \
- --enable-autocreate \
- --enable-idled
-
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- -mkdir /var/imap
- chown cyrus:mail /var/imap
- chmod 755 /var/imap
- -mkdir /var/log/imap
- chown cyrus:mail /var/log/imap
- chmod 750 /var/log/imap
- -mkdir /usr/sieve
- chown cyrus:mail /usr/sieve
- chmod 750 /usr/sieve
- -mkdir /var/ipfire/cyrusimap
- cp -f $(DIR_SRC)/config/cyrus-imapd/* /var/ipfire/cyrusimap
- cp -f $(DIR_APP)/tools/mkimap /usr/bin
- sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
- 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/ddns b/lfs/ddns
index 47817c058..0e045ddc4 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
include Config
-VER = 012
+VER = 013
THISAPP = ddns-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
+$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb
install : $(TARGET)
@@ -71,9 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- # Add upstream patch for fixing noip.com
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-rename-provider.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-fix-handle-name.patch
+ # Apply upstream patches.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure \
diff --git a/lfs/dehydrated b/lfs/dehydrated
index 232588461..fc82f270d 100644
--- a/lfs/dehydrated
+++ b/lfs/dehydrated
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = dehydrated
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install example configuration
cd $(DIR_APP) && sed \
- -e 's|^#CONFIG_D=|CONFIG_D="\${BASEDIR}/conf.d"|' \
- -e 's|^#HOOK=|HOOK="\${BASEDIR}/hook.sh"|' \
+ -e 's|^#CONFIG_D=|CONFIG_D="\$${BASEDIR}/conf.d"|' \
+ -e 's|^#HOOK=|HOOK="\$${BASEDIR}/hook.sh"|' \
docs/examples/config > /etc/dehydrated/config
# Install example hook
diff --git a/lfs/directfb b/lfs/directfb
deleted file mode 100644
index 8b2ff6022..000000000
--- a/lfs/directfb
+++ /dev/null
@@ -1,93 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.7.7
-
-THISAPP = DirectFB-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = directfb
-PAK_VER = 3
-
-DEPS = ""
-
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 152cf1863b1a3a28aa1370e9053440bf
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-fix_mknod.patch
-
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --disable-x11 \
- --enable-sdl \
- --enable-video4linux2
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 6a52f0f47..30eba4673 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
include Config
-VER = 1.3.3
+VER = 1.4.0
THISAPP = dnsdist-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,11 +33,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 i586
PROG = dnsdist
-PAK_VER = 3
+PAK_VER = 4
DEPS = ""
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048)))
###############################################################################
# Top-level Rules
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6bbcdf5296ac5303e88d779d1d57a4df
+$(DL_FILE)_MD5 = 0fecd7d600c1c094b9fffffd27c44369
install : $(TARGET)
@@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir=/etc \
--enable-openssl \
--disable-gnutls \
+ --enable-dns-over-tls \
--with-lua \
--without-net-snmp
diff --git a/lfs/elinks b/lfs/elinks
index 7c7f09cba..d6ec0875c 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -87,5 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /usr/local/etc/elinks
cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.conf
+ # Suppress first welcome dialog by creating bookmark
+ # and history files for root
+ mkdir -p /root/.elinks
+ touch /root/.elinks/bookmarks
+ touch /root/.elinks/globhist
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate
deleted file mode 100644
index bd2523607..000000000
--- a/lfs/ez-ipupdate
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.0.11b8
-
-THISAPP = ez-ipupdate-$(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 = 000211add4c4845ffa4211841bff4fb0
-
-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) && patch -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/flash-images b/lfs/flash-images
index 332bd1fdf..e4af896f1 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -215,7 +215,7 @@ endif
rm -f $(MNThdd)/etc/grub.d/11_linux_scon
endif
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_PLATFORM)" "arm"
# Insert the UUID to uENV.txt
sed -i $(MNThdd)/boot/uENV.txt \
-e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
diff --git a/lfs/guardian b/lfs/guardian
index a40480c0c..3e2c3347f 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = guardian
-PAK_VER = 18
+PAK_VER = 19
DEPS = "perl-inotify2 perl-Net-IP"
@@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axvf $(DIR_DL)/$(DL_FILE)
+ # Add upstream patches.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/guardian-2.0.2-http-parser.patch
+
# Adjust path for firewall binaries.
cd $(DIR_APP) && sed -i "s|/usr/sbin/|/sbin/|g" modules/IPtables.pm
diff --git a/lfs/haproxy b/lfs/haproxy
index 308d96edf..fadb084bd 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.5
+VER = 2.1.3
THISAPP = haproxy-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = haproxy
-PAK_VER = 12
+PAK_VER = 13
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 497c716adf4b056484601a887f34d152
+$(DL_FILE)_MD5 = bea4726d8c99f5d9bac0e62906a1f2d0
install : $(TARGET)
@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \
- USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
- ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
+ USE_LUA=1 USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
+ LUA_LIB_NAME="lua" ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
cd $(DIR_APP) && make install-bin install-man PREFIX=/usr
diff --git a/lfs/icecast b/lfs/icecast
deleted file mode 100644
index c59fba8f3..000000000
--- a/lfs/icecast
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.3.2
-
-THISAPP = icecast-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = icecast
-PAK_VER = 3
-
-DEPS = "libshout lame sox libvorbis libogg"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ff516b3ccd2bcc31e68f460cd316093f
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/icegenerator b/lfs/icegenerator
deleted file mode 100644
index 84cede07a..000000000
--- a/lfs/icegenerator
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.5.5-pre2
-
-THISAPP = icegenerator-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = icegenerator
-PAK_VER = 1
-
-DEPS = "icecast"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 71515d79bc43ca53baffc96c4ada946a
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --with-id3
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
index 571a71d6f..dd109220c 100644
--- a/lfs/libpciaccess
+++ b/lfs/libpciaccess
@@ -24,15 +24,15 @@
include Config
-VER = 0.13.4
+VER = 0.16
THISAPP = libpciaccess-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libpciaccess
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4
+$(DL_FILE)_MD5 = b34e2cbdd6aa8f9cc3fa613fd401a6d6
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
diff --git a/lfs/linux b/lfs/linux
index aac2c4868..4914f7ea2 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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,8 +24,8 @@
include Config
-VER = 4.14.154
-ARM_PATCHES = 4.14.154-ipfire0
+VER = 4.14.171
+ARM_PATCHES = 4.14.171-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 89
+PAK_VER = 91
DEPS = ""
HEADERS_ARCH = $(BUILD_PLATFORM)
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = d6cf4b51c1cd10bc48bac50f4557a0d9
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 539737e07e5634565b3f4f1b932c269b
+$(DL_FILE)_MD5 = b9b2c64eb3ae7fa6023d2b8c981b5ac4
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = f1d5d1dcb1d60c6f8476938070a65112
install : $(TARGET)
@@ -178,6 +178,9 @@ else
cd $(DIR_APP) && make clean
cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
+ # Copy Module signing key configuration
+ cp -f $(DIR_SRC)/config/kernel/x509.genkey $(DIR_APP)/certs/x509.genkey
+
# Remove modules folder if exists
rm -rf /lib/modules/$(VER)-$(VERSUFIX)
@@ -219,6 +222,9 @@ endif
cd $(DIR_APP) && cp -a --parents arch/$(HEADERS_ARCH)/include /lib/modules/$(VER)-$(VERSUFIX)/build
cd $(DIR_APP) && cp -a include /lib/modules/$(VER)-$(VERSUFIX)/build/include
+ # Copy module signing key for off tree modules
+ cd $(DIR_APP) && cp -f certs/signing_key.* /lib/modules/$(VER)-$(VERSUFIX)/build/certs/
+
# Install objtool
cd $(DIR_APP) && cp -a tools/objtool/objtool \
/lib/modules/$(VER)-$(VERSUFIX)/build/tools/objtool/ || :
diff --git a/lfs/mc b/lfs/mc
index ff23c4064..528cb4d4a 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -24,7 +24,7 @@
include Config
-VER = 4.8.23
+VER = 4.8.24
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 = 18
+PAK_VER = 19
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 466c3135f727f8ac2102d060a080ace3
+$(DL_FILE)_MD5 = 3a11df2dd379dd67c497c8d2c344715c
install : $(TARGET)
diff --git a/lfs/multicat b/lfs/multicat
deleted file mode 100644
index 827ff8efc..000000000
--- a/lfs/multicat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.0
-
-THISAPP = multicat-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = multicat
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 3aaa226a421c378c2ede0c8db8fd609c
-
-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 jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/multicat-makefile.patch
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/ppp b/lfs/ppp
index f02864cc0..cbac95067 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -24,12 +24,12 @@
include Config
-VER = 2.4.7
+VER = 2.4.8
THISAPP = ppp-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
+DIR_APP = $(DIR_SRC)/ppp-$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
CFLAGS += -fno-strict-aliasing
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78818f40e6d33a1d1de68a1551f6595a
+$(DL_FILE)_MD5 = fa325e90e43975a1bd7e1012c8676123
install : $(TARGET)
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp-2.4.7-openssl.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)"
diff --git a/lfs/qemu b/lfs/qemu
index a6b203029..8259ff70f 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = qemu
-PAK_VER = 25
+PAK_VER = 26
DEPS = "libusbredir spice libseccomp"
diff --git a/lfs/rtpproxy b/lfs/rtpproxy
deleted file mode 100644
index 204f44bca..000000000
--- a/lfs/rtpproxy
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.0.0
-
-THISAPP = rtpproxy-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = rtpproxy
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 8d36fcc1dd93994ac5376d145f19ac73
-
-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 $(MAKETUNING)
- cd $(DIR_APP) && make install
- #install initscripts
- $(call INSTALL_INITSCRIPT,rtpproxy)
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
-
diff --git a/lfs/setserial b/lfs/setserial
deleted file mode 100644
index 739e7f686..000000000
--- a/lfs/setserial
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.17
-
-THISAPP = setserial-$(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 = c4867d72c41564318e0107745eb7a0f2
-
-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 --disable-nls
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/squid b/lfs/squid
index 9801c153b..8553d7113 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
include Config
-VER = 4.9
+VER = 4.10
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5c2e335dd1e8ced9dda6e0e11894b344
+$(DL_FILE)_MD5 = af7ac6e70f9bd03ae4fcec0c9b99c38a
install : $(TARGET)
diff --git a/lfs/stage2 b/lfs/stage2
index 4b8f0bc81..355aeef54 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -147,6 +147,6 @@ endif
# Pakfire
-mkdir -pv /opt/pakfire/db/core
- echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+ echo "$(CORE)" > /opt/pakfire/db/core/mine
@$(POSTBUILD)
diff --git a/lfs/streamripper b/lfs/streamripper
deleted file mode 100644
index 223152acd..000000000
--- a/lfs/streamripper
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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.63.5
-
-THISAPP = streamripper-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = streamripper
-PAK_VER = 1
-
-DEPS = "libmad libogg libvorbis faad2"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 73a63383dca00615c3328cf51bf2fa56
-
-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)
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
- 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/suricata b/lfs/suricata
index b3d22003b..fdff36ca6 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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.1.6
+VER = 5.0.2
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = da5de1e8053f05cbd295793210117d34
+$(DL_FILE)_MD5 = 28470c05f0f1d3eae2a0c7312c3eabc3
install : $(TARGET)
@@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-python \
--with-libjansson-libraries=/usr/lib \
--with-libjansson-includes=/usr/include \
- --disable-suricata-update
+ --disable-suricata-update \
+ --enable-rust
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && make install-conf
diff --git a/lfs/tmux b/lfs/tmux
index d08904132..e91f5e0cf 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 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 = 2.7
+VER = 3.0a
THISAPP = tmux-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tmux
-PAK_VER = 6
+PAK_VER = 7
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bcdfcf910c94c3e02ce6b1c035880306
+$(DL_FILE)_MD5 = 003b7df5b12ba2553710492b89850ce5
install : $(TARGET)
@@ -77,6 +77,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) && ./autogen.sh
+
cd $(DIR_APP) && ./configure \
--prefix=/usr
diff --git a/lfs/tor b/lfs/tor
index b2a8d5ce0..cbe1a431b 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER = 0.4.2.5
+VER = 0.4.2.6
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 45
+PAK_VER = 46
DEPS = "libseccomp"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ea9e9078ff2e175332f0095c60284458
+$(DL_FILE)_MD5 = 33383c897640e6ea55ab82c80d772ee0
install : $(TARGET)
diff --git a/lfs/u-boot-kirkwood b/lfs/u-boot-kirkwood
deleted file mode 100644
index 49f458b28..000000000
--- a/lfs/u-boot-kirkwood
+++ /dev/null
@@ -1,115 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 = 2018.03
-
-THISAPP = u-boot-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)-kirkwood
-SUP_ARCH = armv5tel
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 02922bdf0ee003fe25bfc32749ffdeab
-
-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)
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
- # Dreamplug
- -mkdir -pv /usr/share/u-boot/dreamplug
- cd $(DIR_APP) && make CROSS_COMPILE="" dreamplug_config
- cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Globalscale Dreamplug - IPFire.org"!' .config
- cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
- cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
- cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
- /usr/share/u-boot/dreamplug
- cd $(DIR_APP) && make distclean
-
- # ICY-Box 6x20
- -mkdir -pv /usr/share/u-boot/icybox
- cd $(DIR_APP) && make CROSS_COMPILE="" ib62x0_config
- cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Raidsonic ICY-Box 62x0 - IPFire.org"!' .config
- cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
- cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
- cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
- /usr/share/u-boot/icybox
- cd $(DIR_APP) && make distclean
-
- # Iomega Iconnect
- -mkdir -pv /usr/share/u-boot/iconnect
- # Fix crash at env save because this uboot is larger than 512KB
- cd $(DIR_APP) && echo "#undef CONFIG_ENV_OFFSET" >> include/configs/iconnect.h
- cd $(DIR_APP) && echo "#define CONFIG_ENV_OFFSET 0xC0000" >> include/configs/iconnect.h
- cd $(DIR_APP) && make CROSS_COMPILE="" iconnect_config
- cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Iomega iConnect - IPFire.org"!' .config
- cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config
- cd $(DIR_APP) && sed -i -e 's!^# CONFIG_HUSH_PARSER is not set!CONFIG_HUSH_PARSER=y!' .config
- cd $(DIR_APP) && sed -i -e 's!^CONFIG_MTDPARTS_DEFAULT=.*!CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xC0000@0x0(uboot),0x40000@0xC0000(uboot_env),-@0x100000(rootfs)"!' .config
- cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
- cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" u-boot.kwb
- cd $(DIR_APP) && install -v -m 644 u-boot.kwb \
- /usr/share/u-boot/iconnect
- cd $(DIR_APP) && make distclean
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/vdr b/lfs/vdr
index f82df19fe..d444ae935 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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,11 +24,11 @@
include Config
-VER = 2.0.5
+VER = 2.4.1
# VDRPLUGVER must match with APIVERSION in config.h
# after change this update also all vdr plugins
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
THISAPP = vdr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -37,9 +37,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr
-PAK_VER = 9
-
-SUP_ARCH = none
+PAK_VER = 10
DEPS = "vdr_streamdev"
@@ -67,7 +65,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
+$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
install : $(TARGET)
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index d11a4b4dd..eed576124 100644
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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,8 +24,7 @@
include Config
-VER = 1.0.6
-SUP_ARCHES =
+VER = 2.2.5
THISAPP = vdr-plugin-dvbapi-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -34,11 +33,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_dvbapi
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
@@ -70,7 +69,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
+$(DL_FILE)_MD5 = cf35ed8a787c09676338ec16d231b61a
install : $(TARGET)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 4a3f811d8..75c70d521 100644
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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,9 +24,8 @@
include Config
-GIT_VER = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
+GIT_VER = 32b4e669bf8bc6e3336073616c121f10b8518fe8
VER = master
-SUP_ARCHES =
THISAPP = vdr-plugin-eepg-$(VER)
DL_FILE = vdr-plugin-eepg-$(GIT_VER).tar.bz2
@@ -37,11 +36,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_eepg
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
@@ -55,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0d8049949263f9a2b8deb2ae9919bc49
+$(DL_FILE)_MD5 = 53c5ec7358da2ce740a764f9d429d96f
install : $(TARGET)
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index 1a202b34b..7836d7c7d 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -24,21 +24,20 @@
include Config
-VER = 1.0.1.beta5
-SUP_ARCHES =
+VER = 2.4.0+git20191101
-THISAPP = vdr-epgsearch-$(VER)
-DL_FILE = $(THISAPP).tgz
+THISAPP = vdr-plugin-epgsearch_$(VER).orig
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/epgsearch-$(VER)
+DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_epgsearch
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
@@ -52,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc
+$(DL_FILE)_MD5 = cf7e8ca02af3068df2fa71c026c92390
install : $(TARGET)
@@ -85,7 +84,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 -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+ cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index c6d21f110..9e4cf7bdc 100644
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -25,21 +25,20 @@
include Config
VER = 0.6.1
-GIT_VER = 10db11ac
-SUP_ARCHES =
+GIT_VER = e2a9b979d3fb92967c7a6a8221e674eb7e55c813
-THISAPP = vdr-streamdev-$(GIT_VER)
-DL_FILE = $(THISAPP).tar.xz
+THISAPP = vdr-plugin-streamdev-$(GIT_VER)
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_streamdev
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.4.1
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
@@ -53,7 +52,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3
+$(DL_FILE)_MD5 = 2ac0a951d47808d00e97d42d59182e36
install : $(TARGET)
@@ -87,7 +86,7 @@ $(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/vdr-streamdev_recordings-64.patch
+# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch
cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile
cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
diff --git a/lfs/vdradmin b/lfs/vdradmin
index a78919f7e..de9680b1b 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -25,7 +25,7 @@
include Config
-VER = 3.6.9
+VER = 3.6.10
THISAPP = vdradmin-am-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdradmin
-PAK_VER = 5
+PAK_VER = 6
DEPS = "perl-gettext vdr vdr_epgsearch"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2
+$(DL_FILE)_MD5 = 467ff4a482be2a5331ad4224a1cb9d8e
install : $(TARGET)
diff --git a/lfs/w_scan b/lfs/w_scan
index 369c1554c..4b5229c3e 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -25,7 +25,7 @@
include Config
-VER = 20130331
+VER = 20170107
THISAPP = w_scan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = w_scan
-PAK_VER = 5
+PAK_VER = 7
DEPS = ""
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dfc14a4707321e068a594d6899398df8
+$(DL_FILE)_MD5 = c7f9adf92d46b8da5391be80be6fbd72
install : $(TARGET)
diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 2152fa5fd..651a13f9c 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -106,9 +106,14 @@ else
cd $(DIR_APP) && make $(MAKETUNING)
# Install the built kernel modules.
+ mkdir -p $(MODPATH)
cd $(DIR_APP) && for f in $$(ls extensions/*.ko); do \
- mkdir -p $(MODPATH); \
- install -m 644 $$f $(MODPATH); \
+ /lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
+ /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
+ /lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
+ $$f; \
+ xz $$f; \
+ install -m 644 $$f.xz $(MODPATH); \
done
endif
diff --git a/make.sh b/make.sh
index 030def904..2e396fd8e 100755
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -26,17 +26,18 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
# If you update the version don't forget to update backupiso and add it to core update
VERSION="2.25" # Version number
-CORE="141" # Core Level (Filename)
-PAKFIRE_CORE="141" # Core Level (PAKFIRE)
-GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
+CORE="142" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
MAX_RETRIES=1 # prefetch/check loop
BUILD_IMAGES=1 # Flash and Xen Downloader
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
-GIT_TAG=$(git tag | tail -1) # Git Tag
-GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
+
+# Information from Git
+GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
+GIT_TAG="$(git tag | tail -1)" # Git Tag
+GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
TOOLCHAINVER=20200108
@@ -507,19 +508,36 @@ prepareenv() {
rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
# Prepare string for /etc/system-release.
- SYSTEM_RELEASE="${NAME} ${VERSION} (${BUILD_ARCH})"
- if [ "$(git status -s | wc -l)" == "0" ]; then
- GIT_STATUS=""
- else
- GIT_STATUS="-dirty"
+ local system_release="${NAME} ${VERSION} (${BUILD_ARCH})"
+
+ case "${GIT_BRANCH}" in
+ core*|beta?|rc?)
+ system_release="${system_release} - ${GIT_BRANCH}"
+ ;;
+ *)
+ system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+ ;;
+ esac
+
+ # Append -dirty tag for local changes
+ if [ "$(git status -s | wc -l)" != "0" ]; then
+ system_release="${system_release}-dirty"
fi
- case "$GIT_BRANCH" in
- core*|beta?|rc?)
- SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
- ;;
- *)
- SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
- ;;
+
+ # Export variable
+ SYSTEM_RELEASE="${system_release}"
+
+ # Decide on PAKFIRE_TREE
+ case "${GIT_BRANCH}" in
+ core*)
+ PAKFIRE_TREE="stable"
+ ;;
+ master)
+ PAKFIRE_TREE="testing"
+ ;;
+ *)
+ PAKFIRE_TREE="unstable"
+ ;;
esac
# Setup ccache cache size
@@ -538,7 +556,7 @@ enterchroot() {
PS1="${PS1}" \
PATH="${PATH}" \
SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
- PAKFIRE_CORE="${PAKFIRE_CORE}" \
+ PAKFIRE_TREE="${PAKFIRE_TREE}" \
NAME="${NAME}" \
SNAME="${SNAME}" \
VERSION="${VERSION}" \
@@ -1267,7 +1285,6 @@ buildipfire() {
lfsmake2 fuse
lfsmake2 ntfs-3g
lfsmake2 ethtool
- lfsmake2 ez-ipupdate
lfsmake2 fcron
lfsmake2 perl-GD
lfsmake2 GD-Graph
@@ -1341,7 +1358,6 @@ buildipfire() {
lfsmake2 cairo
lfsmake2 pango
lfsmake2 rrdtool
- lfsmake2 setserial
lfsmake2 setup
lfsmake2 libdnet
lfsmake2 rust
@@ -1392,7 +1408,6 @@ buildipfire() {
lfsmake2 chkconfig
lfsmake2 postfix
lfsmake2 fetchmail
- lfsmake2 cyrus-imapd
lfsmake2 clamav
lfsmake2 perl-NetAddr-IP
lfsmake2 spamassassin
@@ -1454,7 +1469,6 @@ buildipfire() {
lfsmake2 icinga
lfsmake2 observium-agent
lfsmake2 ebtables
- lfsmake2 directfb
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
@@ -1464,8 +1478,6 @@ buildipfire() {
lfsmake2 vdr_dvbapi
lfsmake2 vdr_eepg
lfsmake2 w_scan
- lfsmake2 icecast
- lfsmake2 icegenerator
lfsmake2 mpd
lfsmake2 libmpdclient
lfsmake2 mpc
@@ -1493,7 +1505,6 @@ buildipfire() {
lfsmake2 iperf3
lfsmake2 7zip
lfsmake2 lynis
- lfsmake2 streamripper
lfsmake2 sshfs
lfsmake2 taglib
lfsmake2 sslh
@@ -1523,7 +1534,6 @@ buildipfire() {
lfsmake2 parted
lfsmake2 swig
lfsmake2 u-boot
- lfsmake2 u-boot-kirkwood
lfsmake2 u-boot-friendlyarm
lfsmake2 python-typing
lfsmake2 python-m2crypto
@@ -1565,7 +1575,6 @@ buildipfire() {
lfsmake2 stress
lfsmake2 libstatgrab
lfsmake2 sarg
- lfsmake2 check_mk_agent
lfsmake2 nginx
lfsmake2 sendEmail
lfsmake2 sysbench
@@ -1573,8 +1582,6 @@ buildipfire() {
lfsmake2 ltrace
lfsmake2 ipfire-netboot
lfsmake2 lcdproc
- lfsmake2 bitstream
- lfsmake2 multicat
lfsmake2 keepalived
lfsmake2 ipvsadm
lfsmake2 perl-Carp-Clan
@@ -1584,13 +1591,11 @@ buildipfire() {
lfsmake2 perl-TimeDate
lfsmake2 swatch
lfsmake2 tor
- lfsmake2 arm
lfsmake2 wavemon
lfsmake2 iptraf-ng
lfsmake2 iotop
lfsmake2 stunnel
lfsmake2 bacula
- lfsmake2 batctl
lfsmake2 perl-Font-TTF
lfsmake2 perl-IO-String
lfsmake2 perl-PDF-API2
@@ -1598,15 +1603,14 @@ buildipfire() {
lfsmake2 pigz
lfsmake2 tmux
lfsmake2 perl-Text-CSV_XS
+ lfsmake2 lua
lfsmake2 haproxy
lfsmake2 ipset
- lfsmake2 lua
lfsmake2 dnsdist
lfsmake2 bird
lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
- lfsmake2 rtpproxy
lfsmake2 util-macros
lfsmake2 libpciaccess
lfsmake2 libyajl
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index cee78a283..884319822 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -212,10 +212,11 @@ import_aws_configuration() {
# Save CONFIG_TYPE
echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings
-
-
# Actions performed only on the very first start
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+ # Disable using ISP nameservers
+ sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings
+
# Enable SSH
sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings
diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
index d84ec3aca..291b8e0a4 100644
--- a/src/initscripts/helper/azure-setup
+++ b/src/initscripts/helper/azure-setup
@@ -240,6 +240,9 @@ import_azure_configuration() {
# Actions performed only on the very first start
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+ # Disable using ISP nameservers
+ sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings
+
# Enable SSH
sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings
diff --git a/src/initscripts/networking/red.up/05-update-dns-forwarders b/src/initscripts/networking/red.up/22-update-dns-forwarders
similarity index 100%
rename from src/initscripts/networking/red.up/05-update-dns-forwarders
rename to src/initscripts/networking/red.up/22-update-dns-forwarders
diff --git a/src/initscripts/packages/cyrus-imapd b/src/initscripts/packages/cyrus-imapd
deleted file mode 100644
index 2f849c8a8..000000000
--- a/src/initscripts/packages/cyrus-imapd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/cyrus-imapd
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
- start)
- boot_mesg "Starting the Cyrus IMAP Server..."
- /usr/lib/cyrus/master &
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping the Cyrus IMAP Server..."
- killproc /usr/lib/cyrus/master
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- status)
- statusproc /usr/lib/cyrus/master
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/cyrus-imapd
diff --git a/src/initscripts/packages/rtpproxy b/src/initscripts/packages/rtpproxy
deleted file mode 100755
index 3ea72f5f0..000000000
--- a/src/initscripts/packages/rtpproxy
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/rtpproxy
-#
-# Description :
-#
-# Authors :
-#
-# Version : 00.00
-#
-# Notes :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-
-PORT_MIN=10000
-PORT_MAX=10100
-SOCKET="/var/run/rtpproxy.sock"
-LISTEN="${GREEN_ADDRESS}"
-CUSTOM_ARGS=""
-
-PIDFILE="/var/run/rtpproxy.pid"
-
-if [ -r "/etc/sysconfig/rtpproxy" ]; then
- . /etc/sysconfig/rtpproxy
-fi
-
-case "${1}" in
- start)
- boot_mesg "Starting rtpproxy..."
- loadproc /usr/bin/rtpproxy -u nobody -p ${PIDFILE} \
- -m ${PORT_MIN} -M ${PORT_MAX} -s ${SOCKET} \
- -l ${LISTEN} ${CUSTOM_ARGS}
- ;;
-
- stop)
- boot_mesg "Stopping rtpproxy..."
- killproc /usr/bin/rtpproxy
- ;;
-
- reload)
- boot_mesg "Reloading rtpproxy..."
- reloadproc /usr/bin/rtpproxy
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/bin/rtpproxy
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|reload|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/rtpproxy
diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index 5dc408262..29e58a7e2 100644
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -6,7 +6,7 @@
#
# Author : Stefan Schantl <stefan.schantl(a)ipfire.org>
#
-# Version : 01.02
+# Version : 01.03
#
# Notes :
#
@@ -159,11 +159,11 @@ case "$1" in
cpu_count=$(get_cpu_count)
# Numer of NFQUES.
- NFQUEUES=
+ NFQUEUES="-q 0"
- for i in $(seq 0 $((cpu_count-1)) ); do
- NFQUEUES+="-q $i "
- done
+ if [ $cpu_count -gt "1" ]; then
+ NFQUEUES+=":$(($cpu_count-1))"
+ fi
# Check if the IDS should be started.
if [ "$ENABLE_IDS" == "on" ]; then
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 61787757e..45e3427b1 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -70,6 +70,9 @@ my $bfile;
my %pakfiresettings = ();
&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+# Make version
+$Conf::version = &make_version();
+
sub message {
my $message = shift;
@@ -765,6 +768,12 @@ sub upgradecore {
getcoredb("noforce");
eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
if ("$core_release" > "$Conf::core_mine") {
+ # Safety check for lazy testers:
+ # Before we upgrade to the latest release, we re-install the previous release
+ # to make sure that the tester has always been on the latest version.
+ my $tree = &get_tree();
+ $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable");
+
message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release");
my @seq = `seq $Conf::core_mine $core_release`;
@@ -946,4 +955,57 @@ sub status {
exit 1;
}
+sub get_arch() {
+ # Append architecture
+ my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname();
+
+ # We only support armv5tel for all 32 bit arches
+ if ($machine =~ m/armv[567]/) {
+ return "armv5tel";
+
+ # We only support i586 for 32 bit x86
+ } elsif ($machine =~ m/i[0-9]86/) {
+ return "i586";
+ }
+
+ return $machine;
+}
+
+sub get_tree() {
+ # Return stable if nothing is set
+ return "stable" unless (defined $pakfiresettings{'TREE'});
+
+ return $pakfiresettings{'TREE'};
+}
+
+sub make_version() {
+ my $version = "";
+
+ # Open /etc/system-release
+ open(RELEASE, "</etc/system-release");
+ my $release = <RELEASE>;
+ close(RELEASE);
+
+ # Add the main relase
+ if ($release =~ m/IPFire ([\d\.]+)/) {
+ $version .= $1;
+ }
+
+ # Append suffix for tree
+ my $tree = &get_tree();
+ if ($tree eq "testing") {
+ $version .= ".1";
+ } elsif ($tree eq "unstable") {
+ $version .= ".2";
+ }
+
+ # Append architecture
+ my $arch = &get_arch();
+ if ($arch ne "i586") {
+ $version .= "-${arch}";
+ }
+
+ return $version;
+}
+
1;
diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index cfe48f575..9930f3771 100644
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -21,8 +21,6 @@
package Conf;
-$version = "@VERSION@";
-
$mainserver = "pakfire.ipfire.org";
$cachedir = "/opt/pakfire/cache";
diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh
index 79af981e8..14cf836b2 100644
--- a/src/paks/alsa/update.sh
+++ b/src/paks/alsa/update.sh
@@ -17,12 +17,13 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
mv /etc/asound.state /tmp
+extract_backup_includes
./uninstall.sh
./install.sh
mv /tmp/asound.state /etc
diff --git a/src/paks/amazon-ssm-agent/uninstall.sh b/src/paks/amazon-ssm-agent/uninstall.sh
index 48f160762..126160805 100644
--- a/src/paks/amazon-ssm-agent/uninstall.sh
+++ b/src/paks/amazon-ssm-agent/uninstall.sh
@@ -23,8 +23,6 @@
#
. /opt/pakfire/lib/functions.sh
-extract_backup_includes
-
stop_service ${NAME}
make_backup ${NAME}
diff --git a/src/paks/amazon-ssm-agent/update.sh b/src/paks/amazon-ssm-agent/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/amazon-ssm-agent/update.sh
+++ b/src/paks/amazon-ssm-agent/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/apcupsd/update.sh b/src/paks/apcupsd/update.sh
index 89c40d0d7..8df996766 100644
--- a/src/paks/apcupsd/update.sh
+++ b/src/paks/apcupsd/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/asterisk/update.sh b/src/paks/asterisk/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/asterisk/update.sh
+++ b/src/paks/asterisk/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/avahi/update.sh
+++ b/src/paks/avahi/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/bird/uninstall.sh b/src/paks/bird/uninstall.sh
index 4ba09c858..28792eaf0 100644
--- a/src/paks/bird/uninstall.sh
+++ b/src/paks/bird/uninstall.sh
@@ -27,7 +27,6 @@
stop_service "${NAME}"
# Create backup
-extract_backup_includes
make_backup "${NAME}"
# Remove all files
diff --git a/src/paks/bird/update.sh b/src/paks/bird/update.sh
index 89c40d0d7..8df996766 100644
--- a/src/paks/bird/update.sh
+++ b/src/paks/bird/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
deleted file mode 100644
index 6aed752a8..000000000
--- a/src/paks/check_mk_agent/install.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-
-mkdir -p /usr/lib/check_mk_agent/plugins
-
-if [[ -x /usr/sbin/xinetd ]];
-then
- if [[ -x /etc/init.d/xinetd ]]
- then
- /etc/init.d/xinetd restart
- fi
-fi
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
deleted file mode 100644
index 51449f55b..000000000
--- a/src/paks/check_mk_agent/uninstall.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_backup_includes
-make_backup ${NAME}
-remove_files
-
-if [[ -x /usr/sbin/xinetd ]];
-then
- if [[ -x /etc/init.d/xinetd ]]
- then
- /etc/init.d/xinetd restart
- fi
-fi
diff --git a/src/paks/check_mk_agent/update.sh b/src/paks/check_mk_agent/update.sh
deleted file mode 100644
index 89c40d0d7..000000000
--- a/src/paks/check_mk_agent/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/cups/update.sh b/src/paks/cups/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/cups/update.sh
+++ b/src/paks/cups/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/cyrus-imapd/install.sh b/src/paks/cyrus-imapd/install.sh
deleted file mode 100644
index a23153b7d..000000000
--- a/src/paks/cyrus-imapd/install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-start_service ${NAME}
-ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc0.d/K23cyrus-imapd
-ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc3.d/S37cyrus-imapd
-ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc6.d/K23cyrus-imapd
diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh
deleted file mode 100644
index e34fa5698..000000000
--- a/src/paks/cyrus-imapd/uninstall.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_backup_includes
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files
-rm -rfv /etc/rc.d/rc*.d/*cyrus-imapd
diff --git a/src/paks/cyrus-imapd/update.sh b/src/paks/cyrus-imapd/update.sh
deleted file mode 100644
index 89c40d0d7..000000000
--- a/src/paks/cyrus-imapd/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/dbus/update.sh b/src/paks/dbus/update.sh
index 9f2f69331..5082e497e 100644
--- a/src/paks/dbus/update.sh
+++ b/src/paks/dbus/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/default/update.sh
+++ b/src/paks/default/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh
index 966c525c4..41c600e77 100644
--- a/src/paks/dnsdist/uninstall.sh
+++ b/src/paks/dnsdist/uninstall.sh
@@ -17,14 +17,12 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-extract_backup_includes
-
stop_service ${NAME}
make_backup ${NAME}
diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh
index 89c40d0d7..8df996766 100644
--- a/src/paks/dnsdist/update.sh
+++ b/src/paks/dnsdist/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/elinks/install.sh b/src/paks/elinks/install.sh
deleted file mode 100644
index cd5a6cea5..000000000
--- a/src/paks/elinks/install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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 2 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) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-
-# Suppress first welcome dialog by creating bookmark
-# and history files for root
-mkdir -p /root/.elinks
-touch /root/.elinks/bookmarks
-touch /root/.elinks/globhist
-
-start_service --background ${NAME}
diff --git a/src/paks/elinks/uninstall.sh b/src/paks/elinks/uninstall.sh
deleted file mode 100644
index e296ccb19..000000000
--- a/src/paks/elinks/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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 2 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) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files
diff --git a/src/paks/elinks/update.sh b/src/paks/elinks/update.sh
deleted file mode 100644
index 1ad1831a7..000000000
--- a/src/paks/elinks/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007-2013 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/freeradius/update.sh b/src/paks/freeradius/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/freeradius/update.sh
+++ b/src/paks/freeradius/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/frr/uninstall.sh b/src/paks/frr/uninstall.sh
index 49e3fdd7d..835558ac4 100644
--- a/src/paks/frr/uninstall.sh
+++ b/src/paks/frr/uninstall.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -27,7 +27,6 @@
stop_service "${NAME}"
# Create backup
-extract_backup_includes
make_backup "${NAME}"
# Remove all files
diff --git a/src/paks/frr/update.sh b/src/paks/frr/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/frr/update.sh
+++ b/src/paks/frr/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/git/update.sh b/src/paks/git/update.sh
index 89c40d0d7..8df996766 100644
--- a/src/paks/git/update.sh
+++ b/src/paks/git/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/gnump3d/update.sh b/src/paks/gnump3d/update.sh
index 6e387001f..2031a9613 100644
--- a/src/paks/gnump3d/update.sh
+++ b/src/paks/gnump3d/update.sh
@@ -17,11 +17,12 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
#Remove userdate from rootfile
cat /opt/pakfire/db/rootfiles/gnump3d | \
grep -v "var/mp3" > /opt/pakfire/db/rootfiles/gnump3d.tmp
diff --git a/src/paks/guardian/update.sh b/src/paks/guardian/update.sh
index 4bec42b53..99776659c 100644
--- a/src/paks/guardian/update.sh
+++ b/src/paks/guardian/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2016 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/haproxy/update.sh b/src/paks/haproxy/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/haproxy/update.sh
+++ b/src/paks/haproxy/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh
index f81b04116..46deb04d1 100644
--- a/src/paks/hostapd/update.sh
+++ b/src/paks/hostapd/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2008 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+exctract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/igmpproxy/uninstall.sh b/src/paks/igmpproxy/uninstall.sh
index eb6ff5f9b..7685264c5 100644
--- a/src/paks/igmpproxy/uninstall.sh
+++ b/src/paks/igmpproxy/uninstall.sh
@@ -17,12 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
-extract_backup_includes
make_backup ${NAME}
remove_files
diff --git a/src/paks/igmpproxy/update.sh b/src/paks/igmpproxy/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/igmpproxy/update.sh
+++ b/src/paks/igmpproxy/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/keepalived/update.sh b/src/paks/keepalived/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/keepalived/update.sh
+++ b/src/paks/keepalived/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/libdaemon/update.sh b/src/paks/libdaemon/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/libdaemon/update.sh
+++ b/src/paks/libdaemon/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh
index 0d96e360d..ba1770553 100644
--- a/src/paks/libvirt/uninstall.sh
+++ b/src/paks/libvirt/uninstall.sh
@@ -17,14 +17,13 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service libvirtd
stop_service virtlogd
-extract_backup_includes
make_backup ${NAME}
remove_files
diff --git a/src/paks/mdns-repeater/update.sh b/src/paks/mdns-repeater/update.sh
index c6485bf0a..99776659c 100644
--- a/src/paks/mdns-repeater/update.sh
+++ b/src/paks/mdns-repeater/update.sh
@@ -17,11 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/minidlna/update.sh b/src/paks/minidlna/update.sh
index d5e61164c..99776659c 100644
--- a/src/paks/minidlna/update.sh
+++ b/src/paks/minidlna/update.sh
@@ -17,9 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
+. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/motion/update.sh b/src/paks/motion/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/motion/update.sh
+++ b/src/paks/motion/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/mpfire/update.sh
+++ b/src/paks/mpfire/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh
index 278218b26..a7b8a5370 100644
--- a/src/paks/netsnmpd/uninstall.sh
+++ b/src/paks/netsnmpd/uninstall.sh
@@ -22,7 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
-extract_backup_includes
stop_service ${NAME}
make_backup ${NAME}
remove_files
diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/netsnmpd/update.sh
+++ b/src/paks/netsnmpd/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/nfs/update.sh b/src/paks/nfs/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/nfs/update.sh
+++ b/src/paks/nfs/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/nginx/uninstall.sh b/src/paks/nginx/uninstall.sh
index 7c7bfe8b8..ded53f042 100644
--- a/src/paks/nginx/uninstall.sh
+++ b/src/paks/nginx/uninstall.sh
@@ -23,7 +23,6 @@
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
-extract_backup_includes
make_backup ${NAME}
remove_files
diff --git a/src/paks/nginx/update.sh b/src/paks/nginx/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/nginx/update.sh
+++ b/src/paks/nginx/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/nut/update.sh b/src/paks/nut/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/nut/update.sh
+++ b/src/paks/nut/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/phpSANE/install.sh b/src/paks/phpSANE/install.sh
deleted file mode 100644
index 6368c6e50..000000000
--- a/src/paks/phpSANE/install.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-/etc/init.d/apache reload
diff --git a/src/paks/phpSANE/uninstall.sh b/src/paks/phpSANE/uninstall.sh
deleted file mode 100644
index e5b5d7fe4..000000000
--- a/src/paks/phpSANE/uninstall.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-remove_files
diff --git a/src/paks/phpSANE/update.sh b/src/paks/phpSANE/update.sh
deleted file mode 100644
index 89c40d0d7..000000000
--- a/src/paks/phpSANE/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh
index bff411a91..ecf6b5b78 100644
--- a/src/paks/postfix/uninstall.sh
+++ b/src/paks/postfix/uninstall.sh
@@ -22,7 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
-extract_backup_includes
stop_service ${NAME}
make_backup ${NAME}
/usr/sbin/alternatives --remove sendmail /usr/sbin/sendmail.postfix
diff --git a/src/paks/postfix/update.sh b/src/paks/postfix/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/postfix/update.sh
+++ b/src/paks/postfix/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/qemu/update.sh b/src/paks/qemu/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/qemu/update.sh
+++ b/src/paks/qemu/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/rpcbind/update.sh b/src/paks/rpcbind/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/rpcbind/update.sh
+++ b/src/paks/rpcbind/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/rtpproxy/install.sh b/src/paks/rtpproxy/install.sh
deleted file mode 100644
index 02a521998..000000000
--- a/src/paks/rtpproxy/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-start_service ${NAME}
-ln -svf ../init.d/rtpproxy /etc/rc.d/rc0.d/K00rtpproxy
-ln -svf ../init.d/rtpproxy /etc/rc.d/rc3.d/S99rtpproxy
-ln -svf ../init.d/rtpproxy /etc/rc.d/rc6.d/K00rtpproxy
diff --git a/src/paks/rtpproxy/uninstall.sh b/src/paks/rtpproxy/uninstall.sh
deleted file mode 100644
index e9076d104..000000000
--- a/src/paks/rtpproxy/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-remove_files
-rm -rf /etc/rc.d/rc*.d/*rtpproxy
diff --git a/src/paks/rtpproxy/update.sh b/src/paks/rtpproxy/update.sh
deleted file mode 100644
index 89c40d0d7..000000000
--- a/src/paks/rtpproxy/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
diff --git a/src/paks/sarg/update.sh b/src/paks/sarg/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/sarg/update.sh
+++ b/src/paks/sarg/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/shairport-sync/update.sh b/src/paks/shairport-sync/update.sh
index c6485bf0a..99776659c 100644
--- a/src/paks/shairport-sync/update.sh
+++ b/src/paks/shairport-sync/update.sh
@@ -17,11 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/squid-accounting/update.sh b/src/paks/squid-accounting/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/squid-accounting/update.sh
+++ b/src/paks/squid-accounting/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/sslh/update.sh b/src/paks/sslh/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/sslh/update.sh
+++ b/src/paks/sslh/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/stunnel/update.sh b/src/paks/stunnel/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/stunnel/update.sh
+++ b/src/paks/stunnel/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/tftpd/update.sh b/src/paks/tftpd/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/tftpd/update.sh
+++ b/src/paks/tftpd/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/transmission/update.sh b/src/paks/transmission/update.sh
index c6485bf0a..99776659c 100644
--- a/src/paks/transmission/update.sh
+++ b/src/paks/transmission/update.sh
@@ -17,11 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/watchdog/update.sh b/src/paks/watchdog/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/watchdog/update.sh
+++ b/src/paks/watchdog/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/wio/update.sh b/src/paks/wio/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/wio/update.sh
+++ b/src/paks/wio/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/paks/xinetd/update.sh b/src/paks/xinetd/update.sh
index 89c40d0d7..99776659c 100644
--- a/src/paks/xinetd/update.sh
+++ b/src/paks/xinetd/update.sh
@@ -17,10 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
./install.sh
diff --git a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch b/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
deleted file mode 100644
index 078754ef3..000000000
--- a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
+++ /dev/null
@@ -1,1717 +0,0 @@
-From: Sebastian Ramacher <sramacher(a)debian.org>
-Date: Thu, 16 Mar 2017 20:53:09 +0100
-Subject: Add missing files from upstream
-
-Closes: #598976
----
- gfxdrivers/davinci/davinci_c64x.h | 935 +++++++++++++++++++++++++++++++++
- gfxdrivers/davinci/davinci_gfxdriver.h | 169 ++++++
- gfxdrivers/davinci/davincifb.h | 581 ++++++++++++++++++++
- 3 files changed, 1685 insertions(+)
- create mode 100644 gfxdrivers/davinci/davinci_c64x.h
- create mode 100644 gfxdrivers/davinci/davinci_gfxdriver.h
- create mode 100644 gfxdrivers/davinci/davincifb.h
-
-diff --git a/gfxdrivers/davinci/davinci_c64x.h b/gfxdrivers/davinci/davinci_c64x.h
-new file mode 100644
-index 0000000..682da22
---- /dev/null
-+++ b/gfxdrivers/davinci/davinci_c64x.h
-@@ -0,0 +1,935 @@
-+/*
-+ TI Davinci driver - C64X+ DSP Library
-+
-+ (c) Copyright 2008 directfb.org
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org> and
-+ Olaf Dreesen <olaf(a)directfb.org>.
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ version 2 as published by the Free Software Foundation.
-+
-+ This library 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 library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_C64X_H__
-+#define __DAVINCI_C64X_H__
-+
-+#include <unistd.h>
-+
-+#include <directfb.h>
-+
-+#include <direct/messages.h>
-+#include <direct/trace.h>
-+
-+#include <linux/c64x.h>
-+
-+#define mb() __asm__ __volatile__ ("" : : : "memory")
-+
-+/**********************************************************************************************************************/
-+
-+typedef struct {
-+ int magic;
-+
-+ int fd;
-+ c64xTaskControl *ctl;
-+ void *mem;
-+
-+ c64xTask *QueueL;
-+} DavinciC64x;
-+
-+typedef struct {
-+ int magic;
-+ unsigned int max_tasks;
-+ unsigned int num_tasks;
-+ c64xTask *tasks;
-+} DavinciC64xTasks;
-+
-+typedef enum {
-+ C64X_TEF_NONE = 0x0000,
-+ C64X_TEF_RESET = 0x0001
-+} DavinciC64xEmitFlags;
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_open ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_close ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks,
-+ unsigned int size );
-+
-+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x,
-+ DavinciC64xTasks *tasks,
-+ DavinciC64xEmitFlags flags );
-+
-+/**********************************************************************************************************************/
-+
-+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" };
-+
-+static inline c64xTask *
-+c64x_get_task( DavinciC64x *c64x )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+ c64xTask *task = &c64x->QueueL[idx];
-+ int loops = 0;
-+ uint32_t idle = 0;
-+
-+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */
-+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) {
-+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) {
-+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp];
-+
-+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n",
-+ ctl->QL_dsp,
-+ (dsp_task->c64x_function >> 2) & 0x3fff,
-+ state_names[dsp_task->c64x_function & 3],
-+ ctl->QL_arm,
-+ (task->c64x_function >> 2) & 0x3fff,
-+ state_names[task->c64x_function & 3] );
-+
-+ break;
-+ }
-+
-+ idle = ctl->idlecounter;
-+
-+ /* Queue is full, waiting 10-20ms should not be too bad. */
-+ if (loops++ > 10)
-+ usleep( 5000 );
-+ }
-+
-+ return task;
-+}
-+
-+static inline void
-+c64x_submit_task( DavinciC64x *c64x, c64xTask *task )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+
-+ mb();
-+
-+ ctl->QL_arm = next;
-+
-+ mb();
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_wb_inv_range( DavinciC64x *c64x,
-+ unsigned long start,
-+ u32 length,
-+ u32 func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = start;
-+ task->c64x_arg[1] = length;
-+ task->c64x_arg[2] = func;
-+
-+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_write_back_all( DavinciC64x *c64x )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_load_block__L( DavinciC64xTasks *tasks,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_load_block( DavinciC64x *c64x,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fetch_uyvy( DavinciC64x *c64x,
-+ unsigned long dest,
-+ unsigned long source,
-+ u32 pitch,
-+ u32 height,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = source;
-+ task->c64x_arg[2] = pitch;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_mc( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long source0,
-+ unsigned long source1,
-+ u32 spitch,
-+ u32 height,
-+ int func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = source0;
-+ task->c64x_arg[3] = source1;
-+ task->c64x_arg[4] = spitch;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = func | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame( DavinciC64x *c64x,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block( DavinciC64x *c64x,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_dva_idct( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+
-+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+ task->c64x_arg[3] = flags;
-+
-+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb( DavinciC64x *c64x,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32( DavinciC64x *c64x,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+#endif
-+
-diff --git a/gfxdrivers/davinci/davinci_gfxdriver.h b/gfxdrivers/davinci/davinci_gfxdriver.h
-new file mode 100644
-index 0000000..4ca79b3
---- /dev/null
-+++ b/gfxdrivers/davinci/davinci_gfxdriver.h
-@@ -0,0 +1,169 @@
-+/*
-+ TI Davinci driver - Graphics Driver
-+
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org>
-+
-+ Code is derived from VMWare driver.
-+
-+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org)
-+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_GFXDRIVER_H__
-+#define __DAVINCI_GFXDRIVER_H__
-+
-+#include <sys/ioctl.h>
-+#include <davincifb.h>
-+
-+#include <core/surface_buffer.h>
-+
-+#include "davincifb.h"
-+
-+#include "davinci_c64x.h"
-+
-+
-+typedef struct {
-+ /* validation flags */
-+ int v_flags;
-+
-+ /* cached/computed values */
-+ void *dst_addr;
-+ unsigned long dst_phys;
-+ unsigned int dst_size;
-+ unsigned long dst_pitch;
-+ DFBSurfacePixelFormat dst_format;
-+ unsigned long dst_bpp;
-+
-+ void *src_addr;
-+ unsigned long src_phys;
-+ unsigned long src_pitch;
-+ DFBSurfacePixelFormat src_format;
-+ unsigned long src_bpp;
-+
-+ unsigned long source_mult;
-+
-+ unsigned long fillcolor;
-+
-+ int blit_blend_sub_function;
-+ int draw_blend_sub_function;
-+
-+ DFBColor color;
-+ unsigned long color_argb;
-+ unsigned long colorkey;
-+
-+ DFBSurfaceBlittingFlags blitting_flags;
-+
-+ DFBRegion clip;
-+
-+ /** Add shared data here... **/
-+ struct fb_fix_screeninfo fix[4];
-+
-+ CoreSurfacePool *osd_pool;
-+ CoreSurfacePool *video_pool;
-+
-+ bool synced;
-+} DavinciDeviceData;
-+
-+
-+typedef struct {
-+ int num;
-+ int fd;
-+ void *mem;
-+ int size;
-+} DavinciFB;
-+
-+typedef struct {
-+ DavinciDeviceData *ddev;
-+
-+ CoreDFB *core;
-+
-+ CoreScreen *screen;
-+ CoreLayer *osd;
-+ CoreLayer *video;
-+
-+ DavinciFB fb[4];
-+
-+ DavinciC64x c64x;
-+ bool c64x_present;
-+
-+ DavinciC64xTasks tasks;
-+} DavinciDriverData;
-+
-+
-+static inline DFBResult
-+davincifb_pan_display( const DavinciFB *fb,
-+ struct fb_var_screeninfo *var,
-+ const CoreSurfaceBufferLock *lock,
-+ DFBSurfaceFlipFlags flags,
-+ int x,
-+ int y )
-+{
-+ int ret;
-+
-+ if (lock) {
-+#ifdef FBIO_SET_START
-+ CoreSurfaceBuffer *buffer = lock->buffer;
-+ struct fb_set_start set_start;
-+
-+ /* physical mode */
-+ set_start.offset = -1;
-+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0;
-+
-+ /* life's so easy */
-+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch;
-+
-+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start );
-+ if (ret < 0)
-+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n",
-+ set_start.physical, set_start.sync );
-+
-+ if (ret == 0) {
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+ }
-+
-+ /* fallback */
-+#endif
-+ var->xoffset = x; /* poor version */
-+ var->yoffset = y + lock->offset / lock->pitch;
-+ }
-+ else {
-+ var->xoffset = x;
-+ var->yoffset = y;
-+ }
-+
-+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW;
-+
-+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var );
-+ if (ret)
-+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n",
-+ fb->num, var->xoffset, var->yoffset );
-+
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+}
-+
-+#endif
-diff --git a/gfxdrivers/davinci/davincifb.h b/gfxdrivers/davinci/davincifb.h
-new file mode 100644
-index 0000000..35eb169
---- /dev/null
-+++ b/gfxdrivers/davinci/davincifb.h
-@@ -0,0 +1,581 @@
-+/*
-+ * Copyright (C) 2006 Texas Instruments Inc
-+ *
-+ * 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 2 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * File: davincifb.h
-+ */
-+
-+#ifndef DAVINVI_VPBE_H
-+#define DAVINVI_VPBE_H
-+
-+/* include Linux files */
-+#include <linux/fb.h>
-+
-+/* define the custom FBIO_WAITFORVSYNC ioctl */
-+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t)
-+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect)
-+
-+/* Backported IOCTLS. */
-+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t)
-+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t)
-+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params)
-+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t)
-+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params)
-+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t)
-+
-+typedef struct zoom_params {
-+ u_int32_t window_id;
-+ u_int32_t zoom_h;
-+ u_int32_t zoom_v;
-+} zoom_params_t;
-+
-+typedef struct vpfe_resizer_params
-+{
-+ u_int32_t rsz_cnt; //busy-lock
-+ u_int32_t out_size; //busy-lock
-+ u_int32_t in_start; //busy-lock
-+ u_int32_t in_size; //busy-lock
-+ u_int32_t sdr_inadd; //shadowed
-+ u_int32_t sdr_inoff; //shadowed
-+ u_int32_t sdr_outadd; //shadowed
-+ u_int32_t sdr_outoff; //shadowed
-+ u_int32_t hfilt[16]; //busy-lock
-+ u_int32_t vfilt[16]; //busy-lock
-+ u_int32_t yenh; //busy-lock
-+} vpfe_resizer_params_t;
-+
-+typedef struct fb_set_start {
-+ int offset; /* offset from smem_start */
-+ unsigned long physical; /* absolute physical address when offset < 0 */
-+
-+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all,
-+ output: sync counter of actual change or 0 if still pending */
-+} fb_set_start_t;
-+
-+
-+#ifdef _IOC_TYPECHECK
-+#undef _IOC_TYPECHECK
-+#define _IOC_TYPECHECK(x) (sizeof(x))
-+#endif
-+
-+#define RAM_CLUT_SIZE 256*3
-+#define FBIO_ENABLE_DISABLE_WIN \
-+ _IOW('F', 0x30, unsigned char)
-+#define FBIO_SET_BITMAP_BLEND_FACTOR \
-+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t)
-+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \
-+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE)
-+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \
-+ _IOW('F', 0x33, unsigned int)
-+#define FBIO_GET_BLINK_INTERVAL \
-+ _IOR('F', 0x34, vpbe_blink_option_t)
-+#define FBIO_SET_BLINK_INTERVAL \
-+ _IOW('F', 0x35, vpbe_blink_option_t)
-+#define FBIO_GET_VIDEO_CONFIG_PARAMS \
-+ _IOR('F', 0x36, vpbe_video_config_params_t)
-+#define FBIO_SET_VIDEO_CONFIG_PARAMS \
-+ _IOW('F', 0x37, vpbe_video_config_params_t)
-+#define FBIO_GET_BITMAP_CONFIG_PARAMS \
-+ _IOR('F', 0x38, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_BITMAP_CONFIG_PARAMS \
-+ _IOW('F', 0x39, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_DCLK \
-+ _IOW('F', 0x40, vpbe_dclk_t)
-+#define FBIO_SET_INTERFACE \
-+ _IOW('F', 0x41, unsigned char)
-+#define FBIO_GET_INTERFACE \
-+ _IOR('F', 0x42, unsigned char)
-+#define FBIO_QUERY_TIMING \
-+ _IOWR('F', 0x43, struct vpbe_mode_info)
-+#define FBIO_SET_TIMING \
-+ _IOW('F', 0x44, struct vpbe_fb_videomode)
-+#define FBIO_GET_TIMING \
-+ _IOR('F', 0x45, struct vpbe_fb_videomode)
-+#define FBIO_SET_VENC_CLK_SOURCE \
-+ _IOW('F', 0x46, unsigned char)
-+#define FBIO_SET_BACKG_COLOR \
-+ _IOW('F', 0x47, vpbe_backg_color_t)
-+#define FBIO_ENABLE_DISPLAY \
-+ _IOW('F', 0x48, unsigned char)
-+#define FBIO_SETPOS \
-+ _IOW('F', 0x49, u_int32_t)
-+#define FBIO_SET_CURSOR \
-+ _IOW('F', 0x50, struct fb_cursor)
-+#define FBIO_SET_START \
-+ _IOW('F', 0x66, struct fb_set_start)
-+
-+/*
-+ * Defines and Constants
-+ */
-+#ifdef __KERNEL__
-+#define DAVINCIFB_DEVICE "davincifb"
-+#define DAVINCIFB_DRIVER "davincifb"
-+
-+#define MULTIPLE_BUFFERING 1
-+
-+#ifdef MULTIPLE_BUFFERING
-+#define DOUBLE_BUF 2
-+#define TRIPLE_BUF 3
-+#else
-+#define DOUBLE_BUF 1
-+#define TRIPLE_BUF 1
-+#endif
-+
-+/* usage: if (is_win(info->fix.id, OSD0)) ... */
-+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0)
-+
-+/*
-+ * display controller register I/O routines
-+ */
-+u32 dispc_reg_in(u32 offset);
-+u32 dispc_reg_out(u32 offset, u32 val);
-+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask);
-+
-+#endif /*__KERNEL__*/
-+
-+/* Error return codes */
-+#define VPBE_INVALID_PARA_VALUE 700
-+#define VPBE_WRONG_WINDOW_ID 701
-+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702
-+#define VPBE_INSUFFICIENT_CLUT_VALUES 703
-+#define VPBE_CLUT_WRITE_TIMEOUT 704
-+#define VPBE_VID0_BUF_ADR_NULL 705
-+#define VPBE_WINDOW_NOT_DISABLED 706
-+#define VPBE_WINDOW_NOT_ENABLED 707
-+
-+#ifndef __KERNEL__
-+/* Window ID definations */
-+#define OSD0 0
-+#define VID0 1
-+#define OSD1 2
-+#define VID1 3
-+#endif
-+
-+/* There are 4 framebuffers, each represented by an fb_info and
-+ * a dm_win_info structure */
-+#define OSD0_FBNAME "dm_osd0_fb"
-+#define OSD1_FBNAME "dm_osd1_fb"
-+#define VID0_FBNAME "dm_vid0_fb"
-+#define VID1_FBNAME "dm_vid1_fb"
-+
-+/* FIXME: Digital LCD RGB matrix coefficients */
-+#define DLCD_DGY_VAL 0
-+#define DLCD_DRV_VAL 0
-+#define DLCD_DGU_VAL 0
-+#define DLCD_DBU_VAL 0
-+
-+/* Defines for bitmap format */
-+#define VPBE_BITMAP_BIT_1 1
-+#define VPBE_BITMAP_BIT_2 2
-+#define VPBE_BITMAP_BIT_4 4
-+#define VPBE_BITMAP_BIT_8 8
-+#define VPBE_BITMAP_RGB565 16
-+#define VPBE_VIDEO_YUV422 16
-+#define VPBE_VIDEO_RGB888 24
-+
-+/* Defines foe cursor parameter validation*/
-+#define MAX_CURSOR_WIDTH 0x3FF
-+#define MAX_CURSOR_HEIGHT 0x1FF
-+#define MAX_CURSOR_LINEWIDTH 7
-+
-+#define BASEX 0x80
-+#define BASEY 0x12
-+#define BASEX_DLCD 0x59
-+#define BASEY_DLCD 0x22
-+
-+/*
-+ * Enumerations
-+ */
-+/* Enum for blending factor */
-+typedef enum vpbe_blend_factor {
-+ OSD_CONTRIBUTION_ZERO = 0,
-+ OSD_CONTRIBUTION_1_BY_8 = 1,
-+ OSD_CONTRIBUTION_2_BY_8 = 2,
-+ OSD_CONTRIBUTION_3_BY_8 = 3,
-+ OSD_CONTRIBUTION_4_BY_8 = 4,
-+ OSD_CONTRIBUTION_5_BY_8 = 5,
-+ OSD_CONTRIBUTION_6_BY_8 = 6,
-+ OSD_CONTRIBUTION_ONE = 7
-+} vpbe_blend_factor_t;
-+
-+/* Enum for Boolean variables */
-+typedef enum {
-+ SET_0 = 0,
-+ SET_1 = 1
-+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT;
-+
-+/* Defines for Display Interface */
-+#define PRGB 0
-+#define COMPOSITE 1
-+#define SVIDEO 2
-+#define COMPONENT 3
-+#define RGB 4
-+#define YCC16 5
-+#define YCC8 6
-+#define SRGB 7
-+#define EPSON 8
-+#define CASIO1G 9
-+#define UDISP 10
-+#define STN 11
-+#define VPBE_MAX_INTERFACES 12
-+
-+/* Defines for Display Mode */
-+#define LCD 0
-+#define NTSC 1
-+#define PAL 2
-+#define P525 3
-+#define P625 4
-+
-+#define DEFAULT_MODE 0
-+#define P480 0
-+#define P400 1
-+#define P350 2
-+#define NON_EXISTING_MODE 255
-+/* Enable/Disable enum */
-+typedef enum {
-+ VPBE_DISABLE = 0,
-+ VPBE_ENABLE = 1
-+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING;
-+
-+typedef enum clk_source {
-+ CLK_SOURCE_CLK27 = 0,
-+ CLK_SOURCE_CLK54 = 1,
-+ CLK_SOURCE_VPBECLK = 2
-+} CLK_SOURCE;
-+
-+/*
-+ * Structures and Union Definitions
-+ */
-+
-+/* Structure for transparency and the blending factor for the bitmap window */
-+typedef struct vpbe_bitmap_blend_params {
-+ unsigned int colorkey; /* color key to be blend */
-+ unsigned int enable_colorkeying; /* enable color keying */
-+ unsigned int bf; /* valid range from 0 to 7 only. */
-+} vpbe_bitmap_blend_params_t;
-+
-+/* Structure for window expansion */
-+typedef struct vpbe_win_expansion {
-+ EXPANSION horizontal;
-+ EXPANSION vertical; /* 1: Enable 0:disable */
-+} vpbe_win_expansion_t;
-+
-+/* Structure for OSD window blinking options */
-+typedef struct vpbe_blink_option {
-+ BLINKING blinking; /* 1: Enable blinking 0: Disable */
-+ unsigned int interval; /* Valid only if blinking is 1 */
-+} vpbe_blink_option_t;
-+
-+/* Structure for DCLK parameters */
-+typedef struct vpbe_dclk {
-+ unsigned char dclk_pattern_width;
-+ unsigned int dclk_pattern0;
-+ unsigned int dclk_pattern1;
-+ unsigned int dclk_pattern2;
-+ unsigned int dclk_pattern3;
-+} vpbe_dclk_t;
-+
-+/* Structure for display format */
-+typedef struct vpbe_display_format {
-+ unsigned char interface; /* Output interface type */
-+ unsigned char mode; /* output mode */
-+} vpbe_display_format_t;
-+
-+/* Structure for background color */
-+typedef struct vpbe_backg_color {
-+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */
-+ unsigned char color_offset; /* index of color */
-+} vpbe_backg_color_t;
-+
-+/* Structure for Video window configurable parameters */
-+typedef struct vpbe_video_config_params {
-+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */
-+ /* 0: cb cr 1: cr cb */
-+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */
-+} vpbe_video_config_params_t;
-+
-+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/
-+typedef union vpbe_clut_idx {
-+ struct _for_4bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char bitmap_val_1;
-+ unsigned char bitmap_val_2;
-+ unsigned char bitmap_val_3;
-+ unsigned char bitmap_val_4;
-+ unsigned char bitmap_val_5;
-+ unsigned char bitmap_val_6;
-+ unsigned char bitmap_val_7;
-+ unsigned char bitmap_val_8;
-+ unsigned char bitmap_val_9;
-+ unsigned char bitmap_val_10;
-+ unsigned char bitmap_val_11;
-+ unsigned char bitmap_val_12;
-+ unsigned char bitmap_val_13;
-+ unsigned char bitmap_val_14;
-+ unsigned char bitmap_val_15;
-+ } for_4bit_bimap;
-+ struct _for_2bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[4];
-+ unsigned char bitmap_val_1;
-+ unsigned char dummy1[4];
-+ unsigned char bitmap_val_2;
-+ unsigned char dummy2[4];
-+ unsigned char bitmap_val_3;
-+ } for_2bit_bimap;
-+ struct _for_1bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[14];
-+ unsigned char bitmap_val_1;
-+ } for_1bit_bimap;
-+} vpbe_clut_idx_t;
-+
-+/* Structure for bitmap window configurable parameters */
-+typedef struct vpbe_bitmap_config_params {
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* Attenuation value for YUV o/p for bitmap window */
-+ unsigned char attenuation_enable;
-+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+} vpbe_bitmap_config_params_t;
-+
-+/* Unioun for video/OSD configuration parameters */
-+typedef union vpbe_conf_params {
-+
-+ struct vpbe_video_params {
-+ CB_CR_ORDER cb_cr_order;
-+ /* HZ/VT Expansion enable disable */
-+ vpbe_win_expansion_t exp_info;
-+ } video_params;
-+
-+ struct vpbe_bitmap_params {
-+ /* Attenuation value for YUV o/p */
-+ ATTENUATION attenuation_enable;
-+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* 0: OSD window is bitmap window */
-+ /* 1: OSD window is attribute window */
-+ ATTRIBUTE enable_attribute;
-+ /* To hold bps value.
-+ Used to switch back from attribute to bitmap. */
-+ unsigned int stored_bits_per_pixel;
-+ /* Blending information */
-+ vpbe_bitmap_blend_params_t blend_info;
-+ /* OSD Blinking information */
-+ vpbe_blink_option_t blink_info;
-+ } bitmap_params;
-+
-+} vpbe_conf_params_t;
-+
-+typedef struct vpbe_video_params vpbe_video_params_t;
-+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t;
-+
-+/* Structure to hold window position */
-+typedef struct vpbe_window_position {
-+ unsigned int xpos; /* X position of the window */
-+ unsigned int ypos; /* Y position of the window */
-+} vpbe_window_position_t;
-+
-+#ifdef __KERNEL__
-+/* Structure for each window */
-+typedef struct vpbe_dm_win_info {
-+ struct fb_info info;
-+ vpbe_window_position_t win_pos; /* X,Y position of window */
-+ /* Size of window is already there in var_info structure. */
-+
-+ dma_addr_t fb_base_phys; /*framebuffer area */
-+ unsigned int fb_base; /*window memory pointer */
-+ unsigned int fb_size; /*memory size */
-+ unsigned int pseudo_palette[17];
-+ int alloc_fb_mem;
-+ /*flag to identify if framebuffer area is fixed or not */
-+ unsigned long sdram_address;
-+ struct vpbe_dm_info *dm;
-+ unsigned char window_enable; /*Additions for all windows */
-+ zoom_params_t zoom; /*Zooming parameters */
-+ unsigned char field_frame_select; /*To select Field or frame */
-+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */
-+ vpbe_conf_params_t conf_params;
-+ /*window configuration parameter union pointer */
-+} vpbe_dm_win_info_t;
-+#endif /*__KERNEL__*/
-+
-+/*
-+ * Videmode structure for display interface and mode settings
-+ */
-+typedef struct vpbe_fb_videomode {
-+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */
-+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */
-+ unsigned int xres; /* X Resolution of the display */
-+ unsigned int yres; /* Y Resolution of the display */
-+ unsigned int fps; /* frames per second */
-+ /* Timing Parameters applicable for std = 0 only */
-+ unsigned int left_margin;
-+ unsigned int right_margin;
-+ unsigned int upper_margin;
-+ unsigned int lower_margin;
-+ unsigned int hsync_len;
-+ unsigned int vsync_len;
-+ unsigned int sync; /* 0: hsync -ve/vsync -ve */
-+ /*1: hsync -ve/vsync +ve */
-+ /*2: hsync +ve/vsync -ve */
-+ /*3: hsync +ve/vsync +ve */
-+ unsigned int basepx; /* Display x,y start position */
-+ unsigned int basepy;
-+/* 1= Mode s available in modelist 0=Mode is not available in modelist */
-+ unsigned int std;
-+} vpbe_fb_videomode_t;
-+
-+/* Structure to interface videomode to application*/
-+typedef struct vpbe_mode_info {
-+ vpbe_fb_videomode_t vid_mode;
-+ unsigned char interface;
-+ unsigned char mode_idx;
-+} vpbe_mode_info_t;
-+
-+#ifdef __KERNEL__
-+/*
-+ * Structure for the driver holding information of windows,
-+ * memory base addresses etc.
-+ */
-+typedef struct vpbe_dm_info {
-+ vpbe_dm_win_info_t *osd0;
-+ vpbe_dm_win_info_t *osd1;
-+ vpbe_dm_win_info_t *vid0;
-+ vpbe_dm_win_info_t *vid1;
-+
-+/* to map the registers */
-+ dma_addr_t mmio_base_phys;
-+ unsigned int mmio_base;
-+ unsigned int mmio_size;
-+
-+ wait_queue_head_t vsync_wait;
-+ unsigned int vsync_cnt;
-+ int timeout;
-+
-+ /* this is the function that configures the output device (NTSC/PAL/LCD)
-+ * for the required output format (composite/s-video/component/rgb)
-+ */
-+ void (*output_device_config) (void);
-+
-+ struct device *dev;
-+
-+ vpbe_backg_color_t backg; /* background color */
-+ vpbe_dclk_t dclk; /*DCLK parameters */
-+ vpbe_display_format_t display; /*Display interface and mode */
-+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */
-+ char ram_clut[256][3]; /*RAM CLUT array */
-+ struct fb_cursor cursor; /* cursor config params from fb.h */
-+/*Flag that indicates whether any of the display is enabled or not*/
-+ int display_enable;
-+} vpbe_dm_info_t;
-+
-+/*
-+ * Functions Definitions for 'davincifb' module
-+ */
-+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *);
-+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *);
-+void init_display_function(vpbe_display_format_t *);
-+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **);
-+void set_vid0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+void set_win_enable(char *, unsigned int);
-+int within_vid0_limits(u32, u32, u32, u32);
-+void vpbe_set_display_default(void);
-+#ifdef __KERNEL__
-+void set_win_position(char *, u32, u32, u32, u32);
-+void change_win_param(int);
-+void set_interlaced(char *, unsigned int);
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Function definations for 'osd' module
-+ */
-+
-+int vpbe_enable_window(vpbe_dm_win_info_t *);
-+int vpbe_disable_window(vpbe_dm_win_info_t *);
-+int vpbe_vid_osd_select_field_frame(u8 *, u8);
-+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *);
-+int vpbe_bitmap_set_ram_clut(void);
-+int vpbe_enable_disable_attribute_window(u32);
-+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_set_cursor_params(struct fb_cursor *);
-+int vpbe_set_vid_expansion(vpbe_win_expansion_t *);
-+int vpbe_set_dclk(vpbe_dclk_t *);
-+int vpbe_set_display_format(vpbe_display_format_t *);
-+int vpbe_set_backg_color(vpbe_backg_color_t *);
-+int vpbe_set_interface(u8);
-+int vpbe_query_mode(vpbe_mode_info_t *);
-+int vpbe_set_mode(struct vpbe_fb_videomode *);
-+int vpbe_set_venc_clk_source(u8);
-+void set_vid0_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+/*
-+ * Function definations for 'venc' module
-+ */
-+
-+void davincifb_ntsc_composite_config(void);
-+void davincifb_ntsc_svideo_config(void);
-+void davincifb_ntsc_component_config(void);
-+void davincifb_pal_composite_config(void);
-+void davincifb_pal_svideo_config(void);
-+void davincifb_pal_component_config(void);
-+
-+void vpbe_davincifb_ntsc_rgb_config(void);
-+void vpbe_davincifb_pal_rgb_config(void);
-+void vpbe_davincifb_525p_component_config(void);
-+void vpbe_davincifb_625p_component_config(void);
-+
-+void vpbe_enable_venc(int);
-+void vpbe_enable_dacs(int);
-+/*
-+ * Function definations for 'dlcd' module
-+ */
-+void vpbe_davincifb_480p_prgb_config(void);
-+void vpbe_davincifb_400p_prgb_config(void);
-+void vpbe_davincifb_350p_prgb_config(void);
-+void vpbe_set_display_timing(struct vpbe_fb_videomode *);
-+
-+void vpbe_enable_lcd(int);
-+/*
-+ * Following functions are not implemented
-+ */
-+void vpbe_davincifb_default_ycc16_config(void);
-+void vpbe_davincifb_default_ycc8_config(void);
-+void vpbe_davincifb_default_srgb_config(void);
-+void vpbe_davincifb_default_epson_config(void);
-+void vpbe_davincifb_default_casio_config(void);
-+void vpbe_davincifb_default_UDISP_config(void);
-+void vpbe_davincifb_default_STN_config(void);
-+#endif /*__KERNEL__*/
-+
-+#endif /* End of #ifndef DAVINCI_VPBE_H */
diff --git a/src/patches/DirectFB-1.7.7-fix_mknod.patch b/src/patches/DirectFB-1.7.7-fix_mknod.patch
deleted file mode 100644
index 12ac2cac5..000000000
--- a/src/patches/DirectFB-1.7.7-fix_mknod.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Multimedia Maintainers
- <pkg-multimedia-maintainers(a)lists.alioth.debian.org>
-Date: Thu, 16 Mar 2017 20:48:20 +0100
-Subject: _fix_mknod
-
----
- gfxdrivers/davinci/davinci_c64x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gfxdrivers/davinci/davinci_c64x.c b/gfxdrivers/davinci/davinci_c64x.c
-index 431ffdd..420b567 100644
---- a/gfxdrivers/davinci/davinci_c64x.c
-+++ b/gfxdrivers/davinci/davinci_c64x.c
-@@ -37,6 +37,8 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include <directfb_util.h>
diff --git a/src/patches/bitstream-makefile.patch b/src/patches/bitstream-makefile.patch
deleted file mode 100644
index 35aeac8d9..000000000
--- a/src/patches/bitstream-makefile.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.org 2013-06-14 12:59:46.000000000 +0200
-+++ Makefile 2013-06-14 13:00:01.000000000 +0200
-@@ -1,4 +1,4 @@
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- INCLUDE = $(subst //,/,$(DESTDIR)/$(PREFIX)/include/bitstream)
- VERSION = 1.0
diff --git a/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff b/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
deleted file mode 100644
index cb4c6c994..000000000
--- a/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
+++ /dev/null
@@ -1,2159 +0,0 @@
-diff -Naur cyrus-imapd-2.2.12/README.autocreate cyrus-imapd-2.2.12.autocreate2/README.autocreate
---- cyrus-imapd-2.2.12/README.autocreate 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/README.autocreate 2005-10-19 14:48:57.930991000 +0300
-@@ -0,0 +1,181 @@
-+Cyrus IMAP autocreate Inbox patch
-+----------------------------------
-+
-+NOTE : This patch has been created at the University of Athens. For more info, as well
-+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr
-+
-+The design of Cyrus IMAP server does not predict the automatic creation of users'
-+INBOX folders. The creation of a user's INBOX is considered to be an external task,
-+that has to be completed as part of the user e-mail account creation procedure.
-+Hence, to create a new e-mail account the site administrator has to
-+a) Include the new account in the user database for the authentication procedure
-+ (e.g. sasldb, shadow, mysql, ldap).
-+b) Create the corresponding INBOX folder.
-+
-+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder,
-+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf).
-+Unlike what uncareful readers may think, enabling the "autocreatequota" option, doesn't
-+lead to the automatic INBOX folder creation by Cyrus IMAP server.
-+In fact, "autocreate" means that the IMAP clients are allowed to automatically create
-+the user INBOX.
-+
-+This patch adds the functionality of automatic creation of the users' INBOX folders into
-+the Cyrus IMAP server. It is implemented as two features, namely the "create on login"
-+and "create on post".
-+
-+
-+
-+Create on login
-+===============
-+This feauture provides automatic creation of a user's INBOX folder when all of the
-+following requirements are met:
-+
-+i) The user has succesfully passed the authentication procedure.
-+
-+ii) The user's authorization ID (typically the same as the user's
-+authentication ID) doesn't belong to the imap_admins or admins
-+accounts (see imapd.conf).
-+
-+iii) The "autocreatequota" option in the imap configuration file
-+has been set to a non zero value.
-+
-+iv) The corresponding to the user's authorizationID INBOX folder
-+does not exist.
-+
-+The user's first login is the most typical case when all four requirements are met.
-+Note that if the authenticatedID is allowed to proxy to another account for which
-+all of the above requirements are met, the corresponding INBOX folder for that account
-+will be created.
-+
-+
-+
-+Create on post
-+==============
-+This feauture provides automatic creation of a user's INBOX folder when all of the
-+following requirements are met.
-+
-+i) An e-mail message addressed to the user has been received.
-+
-+ii) The recipient is not any of the imap_admins or admins accounts.
-+Note that passing e-mails to admins or imap_admins accounts from
-+the MTA to LMTP should be avoided in any case.
-+
-+iii) The recipient's INBOX does not exist.
-+
-+iv) The "autocreatequota" option in the imap configuration file
-+has been set to a non zero value.
-+
-+v) The "createonpost" option in the imap configuration file
-+has been switched on.
-+
-+
-+Besides the automatic creation of INBOX folder, additional functionalities are
-+provided:
-+
-+A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders"
-+configuration option. eg
-+
-+autocreateinboxfolders: sent|drafts|spam|templates
-+
-+B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders"
-+configuration option. eg
-+
-+autosubscribeinboxfolders: sent|spam
-+
-+Obviously, only subscription to subfolders included in the "autocreateinboxfolder"
-+list is meaningfull.
-+
-+C) Automatic subscription to shared folders (bulletin boards). The user gets
-+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders"
-+configuration option in imapd.conf.
-+eg autosubscribesharedfolders: public_folder | public_folder.subfolder
-+
-+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation
-+and the user must have the apropriate permissions in order to be able to subscribe to the
-+shared folder.
-+
-+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no
-+option. When set to yes, the user is automatically subscribed to all shared folders one
-+has permission to subscribe to. Please, note that when this option is set to yes, then
-+'autosubscribesharedfolders' option is overriden.
-+
-+D) Automatic creation of a predefined default sieve script.
-+
-+This is very useful when a default sieve script is used for every user. Usually, a
-+default anti-spam script may me be written in a file and copied to each user
-+sieve scripts upon the INBOX creation. The imapd.conf options that have been added
-+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and
-+'generate_compiled_sieve_script'.
-+
-+autocreate_sieve_script configuration option refers to the full path of the file
-+that contains the sieve script. The default value is null and if no file is defined,
-+then no default script is created upon INBOX creation. (The feature is disabled)
-+eg autocreate_sieve_script: /etc/default_sieve_script
-+
-+autocreate_sieve_compiledscript configuration option refers to the full path of the
-+file that contains the bytecode compiled sieve script. If this filename is defined
-+in imapd.conf and the file exists, then it is automatically copied in the user's sieve
-+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled
-+by the daemon.
-+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc
-+
-+generate_compiled_sieve_script is a boolean option that triggers the compilation of the
-+source sieve script to bytecode sieve script. The file that the bytecode script will
-+be saved is pointed by autocreate_sieve_compiledscript.
-+
-+Ways of compiling a sieve script :
-+1. Compile a sieve script using the standard sievec utility, distributed by CMU
-+2. Compile a sieve script using the compile_sieve utility, released by UoA. This
-+ tool is almost identical to the sievec utility, with the difference that it
-+ reads the input and output file from autocreate_sieve_script and
-+ autocreate_sieve_compiledscript options in imapd.conf
-+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be
-+ instructed to save the compiled script any time a compiled script does not exist.
-+
-+NOTES :
-+1. In order this functionality to work, the following requirements must have been met:
-+ - 'sieveusehomedir' option must be 'no' in the configuration (default).
-+ - 'sievedir' option must have a valid value.
-+2. Currently, this patch checks the validity of the source script while generating a
-+ bytecode compiled script, but not the validity of the bytecode sieve script file.
-+ The administrator should make sure that the provided files contain a valid sieve
-+ script as well as the compiled script is updated every time the source script changes.
-+
-+
-+
-+Issues to be considered
-+=======================
-+
-+I) In order to use the create on post feauture one should be absolutely sure that:
-+a) The MTA checks the validity of the e-mail recipient before sending the e-mail to
-+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be
-+able to use the account database as user mailbox database".
-+b) Only authorized accounts/services can talk to LMTP.
-+
-+II) Especially in the case of imap logins, the current patch implementation checks
-+for the INBOX folder existence upon login, causing an extra mailbox lookup in most
-+of the cases.
-+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and
-+check if the error is associated with an INBOX folder. However, this would mess up
-+Cyrus code. The way it was implemented may not have been the most performance
-+optimized, but it produces a much cleaner and simple patch.
-+
-+
-+
-+Virtual Domains Support
-+=======================
-+
-+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and
-+later. However, it is not possible to declare different INBOX subfolders to be created or
-+shared folders to be subscribed to for every domain.
-+
-+
-+
-+Things to be done
-+=================
-+
-+1. Support MURDER architecture.
-+
-+
-+For more information and updates please visit http://email.uoa.gr/autocreate
-+
-diff -Naur cyrus-imapd-2.2.12/imap/Makefile.in cyrus-imapd-2.2.12.autocreate2/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in 2004-05-28 21:03:02.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/imap/Makefile.in 2005-10-19 14:48:57.935240000 +0300
-@@ -104,7 +104,7 @@
- convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
- annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
- imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \
-- $(SEEN) $(IDLE)
-+ autosieve.o $(SEEN) $(IDLE)
-
- IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o
-
-@@ -122,7 +122,7 @@
- fud smmapd reconstruct quota mbpath ipurge \
- cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
- ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-- @IMAP_PROGS@
-+ compile_sieve @IMAP_PROGS@
-
- BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
- lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \
-@@ -188,7 +188,7 @@
- ### Services
- idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
- $(CC) $(LDFLAGS) -o idled \
-- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-+ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
- lmtpd: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \
- $(DEPLIBS) $(SERVICE)
-@@ -214,10 +214,10 @@
- $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
--imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-+imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o imapd \
- $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
-@@ -232,7 +232,7 @@
- proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o proxyd \
- $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
- proxyd.pure: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o proxyd.pure \
-@@ -244,7 +244,7 @@
- $(CC) $(LDFLAGS) -o mupdate \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- libimap.a $(DEPLIBS)
-@@ -252,92 +252,96 @@
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-
--pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-+pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
- nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
- smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
--fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-+fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
--smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-+smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
- $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-
- ### Command Line Utilities
--arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-+
-+compile_sieve: compile_sieve.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
-+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
-+chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(DEPLIBS)
-+deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o deliver deliver.o backend.o $(LMTPOBJS) \
-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
-- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
-- $(DEPLIBS) $(LIBS)
-+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
--tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
-+tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
-- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-
- ### Other Misc Targets
-
-diff -Naur cyrus-imapd-2.2.12/imap/autosieve.c cyrus-imapd-2.2.12.autocreate2/imap/autosieve.c
---- cyrus-imapd-2.2.12/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/autosieve.c 2005-10-19 14:48:57.940098000 +0300
-@@ -0,0 +1,587 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/uio.h>
-+#include <fcntl.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <syslog.h>
-+#include <com_err.h>
-+#include <config.h>
-+
-+#include "global.h"
-+#include "util.h"
-+#include "mailbox.h"
-+#include "imap_err.h"
-+#include "sieve_interface.h"
-+#include "script.h"
-+
-+#define TIMSIEVE_FAIL -1
-+#define TIMSIEVE_OK 0
-+#define MAX_FILENAME 1024
-+
-+static int get_script_name(char *sievename, size_t buflen, const char *filename);
-+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
-+int autoadd_sieve(char *userid, const char *source_script);
-+
-+static void fatal(const char *s, int code);
-+static void foo(void);
-+static int sieve_notify(void *ac __attribute__((unused)),
-+ void *interp_context __attribute__((unused)),
-+ void *script_context __attribute__((unused)),
-+ void *message_context __attribute__((unused)),
-+ const char **errmsg __attribute__((unused)));
-+static int mysieve_error(int lineno, const char *msg,
-+ void *i __attribute__((unused)), void *s);
-+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
-+
-+
-+sieve_vacation_t vacation2 = {
-+ 0, /* min response */
-+ 0, /* max response */
-+ (sieve_callback *) &foo, /* autorespond() */
-+ (sieve_callback *) &foo /* send_response() */
-+};
-+
-+
-+/*
-+ * Find the name of the sieve script
-+ * given the source script and compiled script names
-+ */
-+static int get_script_name(char *sievename, size_t buflen, const char *filename)
-+{
-+ char *p;
-+ int r;
-+
-+ p = strrchr(filename, '/');
-+ if (p == NULL)
-+ p = (char *) filename;
-+ else
-+ p++;
-+
-+ r = strlcpy(sievename, p, buflen) - buflen;
-+ return (r >= 0 || r == -buflen ? 1 : 0);
-+}
-+
-+
-+/*
-+ * Find the directory where the sieve scripts of the user
-+ * reside
-+ */
-+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir)
-+{
-+ char *user = NULL, *domain = NULL;
-+
-+ /* Setup the user and the domain */
-+ if(config_virtdomains && (domain = strchr(userid, '@'))) {
-+ user = (char *) xmalloc((domain - userid +1) * sizeof(char));
-+ strlcpy(user, userid, domain - userid + 1);
-+ domain++;
-+ } else
-+ user = userid;
-+
-+ /* Find the dir path where the sieve scripts of the user will reside */
-+ if (config_virtdomains && domain) {
-+ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/",
-+ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain), domain, dir_hash_c(user), user) >= buflen) {
-+ free(user);
-+ return 1;
-+ }
-+ } else {
-+ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/",
-+ sieve_dir, dir_hash_c(user), user) >= buflen)
-+ return 1;
-+ }
-+
-+ /* Free the xmalloced user memory, reserved above */
-+ if(user != userid)
-+ free(user);
-+
-+ return 0;
-+}
-+
-+int autoadd_sieve(char *userid, const char *source_script)
-+{
-+ sieve_script_t *s = NULL;
-+ bytecode_info_t *bc = NULL;
-+ char *err = NULL;
-+ FILE *in_stream, *out_fp;
-+ int out_fd, in_fd, r, k;
-+ int do_compile = 0;
-+ const char *sieve_dir = NULL;
-+ const char *compiled_source_script = NULL;
-+ char sievename[MAX_FILENAME];
-+ char sieve_script_name[MAX_FILENAME];
-+ char sieve_script_dir[MAX_FILENAME];
-+ char sieve_bcscript_name[MAX_FILENAME];
-+ char sieve_default[MAX_FILENAME];
-+ char sieve_tmpname[MAX_FILENAME];
-+ char sieve_bctmpname[MAX_FILENAME];
-+ char sieve_bclink_name[MAX_FILENAME];
-+ char buf[4096];
-+ mode_t oldmask;
-+ struct stat statbuf;
-+
-+ /* We don't support using the homedirectory, like timsieved */
-+ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) {
-+ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf");
-+ return 1;
-+ }
-+
-+ /* Check if sievedir is defined in imapd.conf */
-+ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) {
-+ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf");
-+ return 1;
-+ }
-+
-+ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */
-+ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) {
-+ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it");
-+ do_compile = 1;
-+ }
-+
-+ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory");
-+ return 1;
-+ }
-+
-+ if (get_script_name(sievename, sizeof(sievename), source_script)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script);
-+ return 1;
-+ }
-+
-+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+ return 1;
-+ }
-+
-+ /* Check if a default sieve filter alrady exists */
-+ if(!stat(sieve_default,&statbuf)) {
-+ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists");
-+ fclose(in_stream);
-+ return 1;
-+ }
-+
-+ /* Open the source script. if there is a problem with that exit */
-+ in_stream = fopen(source_script, "r");
-+ if(!in_stream) {
-+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script);
-+ return 1;
-+ }
-+
-+
-+ /*
-+ * At this point we start the modifications of the filesystem
-+ */
-+
-+ /* Create the directory where the sieve scripts will reside */
-+ r = cyrus_mkdir(sieve_script_dir, 0755);
-+ if(r == -1) {
-+ /* If this fails we just leave */
-+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name);
-+ return 1;
-+ }
-+
-+ /*
-+ * We open the file that will be used as the bc file. If this file exists, overwrite it
-+ * since something bad has happened. We open the file here so that this error checking is
-+ * done before we try to open the rest of the files to start copying etc.
-+ */
-+ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-+ if(out_fd < 0) {
-+ if(errno == EEXIST) {
-+ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname);
-+ } else if (errno == EACCES) {
-+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname);
-+ fclose(in_stream);
-+ return 1;
-+ } else {
-+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname);
-+ fclose(in_stream);
-+ return 1;
-+ }
-+ }
-+
-+ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) {
-+ while((r = read(in_fd, buf, sizeof(buf))) > 0) {
-+ if((k=write(out_fd, buf,r)) < 0) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno);
-+ close(out_fd);
-+ close(in_fd);
-+ fclose(in_stream);
-+ unlink(sieve_bctmpname);
-+ return 1;
-+ }
-+ }
-+
-+ if(r == 0) { /* EOF */
-+ close(out_fd);
-+ close(in_fd);
-+ } else if (r < 0) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it",
-+ compiled_source_script);
-+ close(in_fd);
-+ do_compile = 1;
-+ if(lseek(out_fd, 0, SEEK_SET)) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting");
-+ return 1;
-+ }
-+ }
-+ close(in_fd);
-+ } else {
-+ if(compiled_source_script)
-+ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script);
-+ do_compile = 1;
-+ }
-+
-+
-+ /* Because we failed to open a precompiled bc sieve script, we compile one */
-+ if(do_compile) {
-+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) {
-+ if(err && *err) {
-+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err);
-+ free(err);
-+ } else
-+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script");
-+
-+ unlink(sieve_bctmpname);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return 1;
-+ }
-+
-+ /* generate the bytecode */
-+ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) {
-+ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script");
-+ /* removing the copied script and cleaning up memory */
-+ unlink(sieve_bctmpname);
-+ sieve_script_free(&s);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return 1;
-+ }
-+
-+ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) {
-+ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script");
-+ /* removing the copied script and cleaning up memory */
-+ unlink(sieve_bctmpname);
-+ sieve_free_bytecode(&bc);
-+ sieve_script_free(&s);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return 1;
-+ }
-+
-+ /* clean up the memory */
-+ sieve_free_bytecode(&bc);
-+ sieve_script_free(&s);
-+ }
-+
-+ close(out_fd);
-+ rewind(in_stream);
-+
-+ /* Copy the initial script */
-+ oldmask = umask(077);
-+ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) {
-+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname);
-+ unlink(sieve_bctmpname);
-+ umask(oldmask);
-+ fclose(in_stream);
-+ return 1;
-+ }
-+ umask(oldmask);
-+
-+ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) {
-+ if( fwrite(buf,sizeof(char), r, out_fp) != r) {
-+ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname);
-+ fclose(out_fp);
-+ unlink(sieve_tmpname);
-+ unlink(sieve_bctmpname);
-+ fclose(in_stream);
-+ return 1;
-+ }
-+ }
-+
-+ if(feof(in_stream)) {
-+ fclose(out_fp);
-+ } else { /* ferror */
-+ fclose(out_fp);
-+ unlink(sieve_tmpname);
-+ unlink(sieve_bctmpname);
-+ fclose(in_stream);
-+ return 1;
-+ }
-+
-+ /* Renaming the necessary stuff */
-+ if(rename(sieve_tmpname, sieve_script_name)) {
-+ unlink(sieve_tmpname);
-+ unlink(sieve_bctmpname);
-+ return 1;
-+ }
-+
-+ if(rename(sieve_bctmpname, sieve_bcscript_name)) {
-+ unlink(sieve_bctmpname);
-+ unlink(sieve_bcscript_name);
-+ return 1;
-+ }
-+
-+ /* end now with the symlink */
-+ if(symlink(sieve_bclink_name, sieve_default)) {
-+ if(errno != EEXIST) {
-+ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link.");
-+ /* Lets delete the files */
-+ unlink(sieve_script_name);
-+ unlink(sieve_bcscript_name);
-+ }
-+ }
-+
-+ /*
-+ * If everything has succeeded AND we have compiled the script AND we have requested
-+ * to generate the global script so that it is not compiled each time then we create it.
-+ */
-+ if(do_compile &&
-+ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) {
-+
-+ if(!compiled_source_script) {
-+ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf");
-+ return 0;
-+ }
-+
-+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname))
-+ return 0;
-+
-+ /*
-+ * Copy everything from the newly created bc sieve sieve script.
-+ */
-+ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) {
-+ return 0;
-+ }
-+
-+ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) {
-+ if(errno == EEXIST) {
-+ /* Someone is already doing this so just bail out. */
-+ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname);
-+ close(in_fd);
-+ return 0;
-+ } else if (errno == EACCES) {
-+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname);
-+ close(in_fd);
-+ return 0;
-+ } else {
-+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname);
-+ close(in_fd);
-+ return 0;
-+ }
-+ }
-+
-+ while((r = read(in_fd, buf, sizeof(buf))) > 0) {
-+ if((k = write(out_fd,buf,r)) < 0) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
-+ close(out_fd);
-+ close(in_fd);
-+ unlink(sieve_tmpname);
-+ return 0;
-+ }
-+ }
-+
-+ if(r == 0 ) { /*EOF */
-+ close(out_fd);
-+ close(in_fd);
-+ } else if (r < 0) {
-+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
-+ close(out_fd);
-+ close(in_fd);
-+ unlink(sieve_tmpname);
-+ return 0;
-+ }
-+
-+ /* Rename the temporary created sieve script to its final name. */
-+ if(rename(sieve_tmpname, compiled_source_script)) {
-+ if(errno != EEXIST) {
-+ unlink(sieve_tmpname);
-+ unlink(compiled_source_script);
-+ }
-+ return 0;
-+ }
-+
-+ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script);
-+ }
-+
-+ return 0;
-+}
-+
-+static void fatal(const char *s, int code)
-+{
-+ printf("Fatal error: %s (%d)\r\n", s, code);
-+ exit(1);
-+}
-+
-+/* to make larry's stupid functions happy :) */
-+static void foo(void)
-+{
-+ fatal("stub function called", 0);
-+}
-+
-+static int sieve_notify(void *ac __attribute__((unused)),
-+ void *interp_context __attribute__((unused)),
-+ void *script_context __attribute__((unused)),
-+ void *message_context __attribute__((unused)),
-+ const char **errmsg __attribute__((unused)))
-+{
-+ fatal("stub function called", 0);
-+ return SIEVE_FAIL;
-+}
-+
-+static int mysieve_error(int lineno, const char *msg,
-+ void *i __attribute__((unused)), void *s)
-+{
-+ char buf[1024];
-+ char **errstr = (char **) s;
-+
-+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
-+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
-+ syslog(LOG_DEBUG, "%s", buf);
-+ strcat(*errstr, buf);
-+
-+ return SIEVE_OK;
-+}
-+
-+/* end the boilerplate */
-+
-+/* returns TRUE or FALSE */
-+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
-+{
-+ sieve_interp_t *i;
-+ sieve_script_t *s;
-+ int res;
-+
-+ res = sieve_interp_alloc(&i, NULL);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_redirect(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_discard(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_reject(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_fileinto(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_keep(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_imapflags(i, NULL);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_size(i, (sieve_get_size *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_header(i, (sieve_get_header *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_vacation(i, &vacation2);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_notify(i, &sieve_notify);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_parse_error(i, &mysieve_error);
-+ if (res != SIEVE_OK) {
-+ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ rewind(stream);
-+
-+ *errstr = (char *) xmalloc(20 * sizeof(char));
-+ strcpy(*errstr, "script errors:\r\n");
-+
-+ res = sieve_script_parse(i, stream, errstr, &s);
-+
-+ if (res == SIEVE_OK) {
-+ if(ret) {
-+ *ret = s;
-+ } else {
-+ sieve_script_free(&s);
-+ }
-+ free(*errstr);
-+ *errstr = NULL;
-+ }
-+
-+ /* free interpreter */
-+ sieve_interp_free(&i);
-+
-+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
-+}
-+
-+/*
-+ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of
-+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
-+ */
-+
-diff -Naur cyrus-imapd-2.2.12/imap/compile_sieve.c cyrus-imapd-2.2.12.autocreate2/imap/compile_sieve.c
---- cyrus-imapd-2.2.12/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/compile_sieve.c 2005-10-19 14:48:57.943407000 +0300
-@@ -0,0 +1,364 @@
-+/* This tool compiles the sieve script from a command
-+line so that it can be used wby the autoadd patch */
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <config.h>
-+#include <string.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/uio.h>
-+#include <fcntl.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <com_err.h>
-+
-+#include "global.h"
-+
-+#include "util.h"
-+#include "mailbox.h"
-+#include "imap_err.h"
-+#include "sieve_interface.h"
-+#include "script.h"
-+
-+#include <pwd.h>
-+
-+#define TIMSIEVE_FAIL -1
-+#define TIMSIEVE_OK 0
-+#define MAX_FILENAME_SIZE 100
-+
-+/* Needed by libconfig */
-+const int config_need_data = 0;
-+
-+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
-+
-+static void fatal(const char *s, int code)
-+{
-+ printf("Fatal error: %s (%d)\r\n", s, code);
-+
-+ exit(1);
-+}
-+
-+void usage(void)
-+{
-+ fprintf(stderr,
-+ "Usage:\n\tcompile_sieve [-C <altconfig>] [-i <infile> -o <outfile>]\n");
-+ exit(-1);
-+}
-+
-+
-+int main (int argc, char **argv)
-+{
-+
-+ sieve_script_t *s = NULL;
-+ bytecode_info_t *bc = NULL;
-+ char *err = NULL;
-+ FILE *in_stream;
-+ int out_fd,r, k, opt;
-+ char *source_script = NULL;
-+ char *compiled_source_script = NULL;
-+ mode_t oldmask;
-+ struct stat statbuf;
-+ char *alt_config = NULL;
-+ extern char *optarg;
-+ char sieve_tmpname[MAX_MAILBOX_NAME+1];
-+
-+ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
-+
-+ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) {
-+ switch (opt) {
-+ case 'C': /* alt config file */
-+ alt_config = optarg;
-+ break;
-+ case 'i': /* input script file */
-+ source_script = optarg;
-+ break;
-+ case 'o': /* output script file */
-+ compiled_source_script = optarg;
-+ break;
-+ default:
-+ usage();
-+ break;
-+ }
-+ }
-+
-+ if(source_script && !compiled_source_script) {
-+ fprintf(stderr, "No output file was defined\n");
-+ usage();
-+ } else if (!source_script && compiled_source_script) {
-+ fprintf(stderr, "No input file was defined\n");
-+ usage();
-+ }
-+
-+ /*
-+ * If no <infile> has been defined, then read them from
-+ * the configuration file.
-+ */
-+ if (!source_script && !compiled_source_script) {
-+ cyrus_init(alt_config, "compile_sieve", 0);
-+
-+ /* Initially check if we want to have the sieve script created */
-+ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) {
-+ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n");
-+ return 1;
-+ }
-+
-+ /* Check if we have an already compiled sieve script*/
-+ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) {
-+ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n");
-+ return 1;
-+ }
-+
-+ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) {
-+ /*
-+ * At this point the only think that is inconsistent is the directory
-+ * that was created. But if the user will have any sieve scripts then
-+ * they will eventually go there, so no big deal
-+ */
-+ fprintf(stderr,
-+ "In imapd.conf the full path of the filenames must be defined\n");
-+ return 1;
-+ }
-+ }
-+
-+ printf("input file : %s, output file : %s\n", source_script, compiled_source_script);
-+
-+
-+ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) {
-+ fprintf(stderr, "Filename %s is too big\n", compiled_source_script);
-+ return 1;
-+ }
-+
-+ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script);
-+
-+ in_stream = fopen(source_script,"r");
-+
-+ if(!in_stream) {
-+ fprintf(stderr,"Unable to open %s source sieve script\n",source_script);
-+ return;
-+ }
-+
-+ /*
-+ * We open the file that will be used as the bc file. If this file exists, overwrite it
-+ * since something bad has happened. We open the file here so that this error checking is
-+ * done before we try to open the rest of the files to start copying etc.
-+ */
-+ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-+ if(out_fd < 0) {
-+ if(errno == EEXIST) {
-+ fprintf(stderr, "File %s already exists\n", sieve_tmpname);
-+ } else if (errno == EACCES) {
-+ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n",
-+ sieve_tmpname);
-+ } else {
-+ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n",
-+ sieve_tmpname);
-+ }
-+
-+ fclose(in_stream);
-+ return 1;
-+ }
-+
-+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) {
-+ if(err && *err) {
-+ fprintf(stderr, "Error while parsing script %s\n",err);
-+ free(err);
-+ }
-+ else
-+ fprintf(stderr,"Error while parsing script\n");
-+ unlink(sieve_tmpname);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return;
-+ }
-+
-+
-+ /* generate the bytecode */
-+ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) {
-+ fprintf(stderr,"Error occured while compiling sieve script\n");
-+ /* removing the copied script and cleaning up memory */
-+ unlink(sieve_tmpname);
-+ sieve_script_free(&s);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return;
-+ }
-+ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) {
-+ fprintf(stderr, "Error occured while emitting sieve script\n");
-+ unlink(sieve_tmpname);
-+ sieve_free_bytecode(&bc);
-+ sieve_script_free(&s);
-+ fclose(in_stream);
-+ close(out_fd);
-+ return;
-+ }
-+
-+ /* clean up the memory */
-+ sieve_free_bytecode(&bc);
-+ sieve_script_free(&s);
-+
-+ close(out_fd);
-+
-+ if(rename(sieve_tmpname, compiled_source_script)) {
-+ if(errno != EEXIST) {
-+ unlink(sieve_tmpname);
-+ unlink(compiled_source_script);
-+ return 1;
-+ }
-+ }
-+ return 0;
-+}
-+
-+
-+/* to make larry's stupid functions happy :) */
-+static void foo(void)
-+{
-+ fatal("stub function called", 0);
-+}
-+
-+extern sieve_vacation_t vacation2;/* = {
-+ 0, / min response /
-+ 0, / max response /
-+ (sieve_callback *) &foo, / autorespond() /
-+ (sieve_callback *) &foo / send_response() /
-+}; */
-+
-+static int sieve_notify(void *ac __attribute__((unused)),
-+ void *interp_context __attribute__((unused)),
-+ void *script_context __attribute__((unused)),
-+ void *message_context __attribute__((unused)),
-+ const char **errmsg __attribute__((unused)))
-+{
-+ fatal("stub function called", 0);
-+ return SIEVE_FAIL;
-+}
-+
-+static int mysieve_error(int lineno, const char *msg,
-+ void *i __attribute__((unused)), void *s)
-+{
-+ char buf[1024];
-+ char **errstr = (char **) s;
-+
-+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
-+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
-+ fprintf(stderr, "%s\n", buf);
-+ strcat(*errstr, buf);
-+
-+ return SIEVE_OK;
-+}
-+
-+/* end the boilerplate */
-+
-+/* returns TRUE or FALSE */
-+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
-+{
-+ sieve_interp_t *i;
-+ sieve_script_t *s;
-+ int res;
-+
-+ res = sieve_interp_alloc(&i, NULL);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_redirect(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_redirect() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_discard(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_discard() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_reject(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_reject() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_fileinto(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+ res = sieve_register_keep(i, (sieve_callback *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_keep() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_imapflags(i, NULL);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_size(i, (sieve_get_size *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_size() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_header(i, (sieve_get_header *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_header() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_envelope() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_vacation(i, &vacation2);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_vacation() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_notify(i, &sieve_notify);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_notify() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ res = sieve_register_parse_error(i, &mysieve_error);
-+ if (res != SIEVE_OK) {
-+ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res);
-+ return TIMSIEVE_FAIL;
-+ }
-+
-+ rewind(stream);
-+
-+ *errstr = (char *) xmalloc(20 * sizeof(char));
-+ strcpy(*errstr, "script errors:\r\n");
-+
-+ res = sieve_script_parse(i, stream, errstr, &s);
-+
-+ if (res == SIEVE_OK) {
-+ if(ret) {
-+ *ret = s;
-+ } else {
-+ sieve_script_free(&s);
-+ }
-+ free(*errstr);
-+ *errstr = NULL;
-+ }
-+
-+ /* free interpreter */
-+ sieve_interp_free(&i);
-+
-+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
-+}
-+
-+
-+
-+
-+
-+
-diff -Naur cyrus-imapd-2.2.12/imap/imapd.c cyrus-imapd-2.2.12.autocreate2/imap/imapd.c
---- cyrus-imapd-2.2.12/imap/imapd.c 2005-02-14 08:39:55.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/imapd.c 2005-10-19 14:48:57.966749000 +0300
-@@ -158,6 +158,7 @@
- void motd_file(int fd);
- void shut_down(int code);
- void fatal(const char *s, int code);
-+void autocreate_inbox(void);
-
- void cmdloop(void);
- void cmd_login(char *tag, char *user);
-@@ -1693,6 +1694,42 @@
- }
-
- /*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+void autocreate_inbox()
-+{
-+ char inboxname[MAX_MAILBOX_NAME+1];
-+ int autocreatequota;
-+ int r;
-+
-+ /*
-+ * Exlude admin's accounts
-+ */
-+ if (imapd_userisadmin || imapd_userisproxyadmin)
-+ return;
-+
-+ /*
-+ * Exclude anonymous
-+ */
-+ if (!strcmp(imapd_userid, "anonymous"))
-+ return;
-+
-+ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) {
-+ /* This is actyally not required
-+ as long as the lenght of userid is ok */
-+ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace,
-+ "INBOX", imapd_userid, inboxname);
-+ if (!r)
-+ r = mboxlist_lookup(inboxname, NULL, NULL, NULL);
-+
-+ if (r == IMAP_MAILBOX_NONEXISTENT)
-+ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid,
-+ imapd_authstate, inboxname, autocreatequota);
-+ }
-+}
-+
-+
-+/*
- * Perform a LOGIN command
- */
- void cmd_login(char *tag, char *user)
-@@ -1848,6 +1885,9 @@
- strcspn(imapd_userid, "@") : 0);
-
- freebuf(&passwdbuf);
-+
-+ autocreate_inbox();
-+
- return;
- }
-
-@@ -1993,6 +2033,8 @@
- config_virtdomains ?
- strcspn(imapd_userid, "@") : 0);
-
-+ autocreate_inbox();
-+
- return;
- }
-
-diff -Naur cyrus-imapd-2.2.12/imap/lmtpd.c cyrus-imapd-2.2.12.autocreate2/imap/lmtpd.c
---- cyrus-imapd-2.2.12/imap/lmtpd.c 2004-12-17 18:32:15.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/lmtpd.c 2005-10-19 14:48:57.971145000 +0300
-@@ -106,6 +106,8 @@
- static FILE *spoolfile(message_data_t *msgdata);
- static void removespool(message_data_t *msgdata);
-
-+static int autocreate_inbox(char *rcpt_userid);
-+
- /* current namespace */
- static struct namespace lmtpd_namespace;
-
-@@ -504,10 +506,55 @@
- exit(code);
- }
-
-+/*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+int autocreate_inbox(char *rcpt_userid)
-+{
-+ struct auth_state *authstate;
-+ char inboxname[MAX_MAILBOX_NAME+1];
-+ int rcptisadmin;
-+ int autocreatequota;
-+ int r;
-+
-+ if(rcpt_userid == NULL)
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Exclude anonymous
-+ */
-+ if (!strcmp(rcpt_userid, "anonymous"))
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Check for autocreatequota and createonpost
-+ */
-+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) ||
-+ !(config_getswitch(IMAPOPT_CREATEONPOST)))
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Exclude admin's accounts
-+ */
-+ authstate = auth_newstate(rcpt_userid);
-+ rcptisadmin = global_authisa(authstate, IMAPOPT_ADMINS);
-+ if (rcptisadmin)
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace,
-+ "INBOX", rcpt_userid, inboxname);
-+ if (!r)
-+ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid,
-+ authstate, inboxname, autocreatequota);
-+ return r;
-+}
-+
-+
- static int verify_user(const char *user, const char *domain, const char *mailbox,
- long quotacheck, struct auth_state *authstate)
- {
- char namebuf[MAX_MAILBOX_NAME+1] = "";
-+ char *userinbox = NULL;
- int r = 0;
-
- if ((!user && !mailbox) ||
-@@ -545,6 +592,28 @@
- */
- r = append_check(namebuf, MAILBOX_FORMAT_NORMAL, authstate,
- !user ? ACL_POST : 0, quotacheck > 0 ? 0 : quotacheck);
-+ if (r == IMAP_MAILBOX_NONEXISTENT && user) {
-+ if(domain) {
-+ int k;
-+ userinbox = (char *)xmalloc((strlen(user)+strlen(domain)+2)*sizeof(char));
-+ k = strlcpy(userinbox, user, strlen(user)+1);
-+ *(userinbox + k) = '@';
-+ strlcpy(userinbox+k+1, domain, strlen(domain)+1);
-+ }
-+ else userinbox = user;
-+ /*
-+ * Try to create automatically the mailbox, if
-+ * autocreate inbox option is enabled.
-+ */
-+ r = autocreate_inbox(userinbox);
-+
-+ if(userinbox != user)
-+ free(userinbox);
-+ if (!r)
-+ r = append_check(namebuf, MAILBOX_FORMAT_NORMAL, authstate,
-+ 0, quotacheck > 0 ? 0 : quotacheck);
-+ }
-+
- }
-
- if (r) syslog(LOG_DEBUG, "verify_user(%s) failed: %s", namebuf,
-diff -Naur cyrus-imapd-2.2.12/imap/mboxlist.c cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.c
---- cyrus-imapd-2.2.12/imap/mboxlist.c 2004-07-26 21:08:03.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.c 2005-10-19 14:49:25.972032000 +0300
-@@ -81,6 +81,12 @@
- #include "mboxlist.h"
- #include "quota.h"
-
-+#ifdef USE_SIEVE
-+extern int autoadd_sieve(char *userid,
-+ const char *source_script);
-+#endif
-+
-+
- #define DB config_mboxlist_db
- #define SUBDB config_subscription_db
-
-@@ -98,11 +104,29 @@
- static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
- void *rock);
-
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+ void *rock);
-+
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+ char *userid, char *auth_userid,
-+ struct auth_state *auth_state);
-+
- struct change_rock {
- struct quota *quota;
- struct txn **tid;
- };
-
-+/*
-+ * Struct needed to be passed as void *rock to
-+ * mboxlist_autochangesub();
-+ */
-+struct changesub_rock_st {
-+ char *userid;
-+ char *auth_userid;
-+ struct auth_state *auth_state;
-+};
-+
-+
- #define FNAME_SUBSSUFFIX ".sub"
-
- /*
-@@ -3124,3 +3148,338 @@
-
- return DB->abort(mbdb, tid);
- }
-+
-+/*
-+ * Automatically subscribe user to *ALL* shared folders,
-+ * one has permissions to be subscribed to.
-+ * INBOX subfolders are excluded.
-+ */
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+ void *rock) {
-+
-+ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
-+ char *userid = changesub_rock->userid;
-+ char *auth_userid = changesub_rock->auth_userid;
-+ struct auth_state *auth_state = changesub_rock->auth_state;
-+ int r;
-+
-+
-+ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
-+ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
-+ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */
-+ return 0;
-+
-+
-+ r = mboxlist_changesub(name, userid, auth_state, 1, 0);
-+
-+ if (r) {
-+ syslog(LOG_WARNING,
-+ "autosubscribe: User %s to folder %s, subscription failed: %s",
-+ auth_userid, name, error_message(r));
-+ } else {
-+ syslog(LOG_NOTICE,
-+ "autosubscribe: User %s to folder %s, subscription succeeded",
-+ auth_userid, name);
-+ }
-+
-+ return 0;
-+}
-+
-+#define SEP '|'
-+
-+/*
-+ * Automatically subscribe user to a shared folder.
-+ * Subscription is done successfully, if the shared
-+ * folder exists and the user has the necessary
-+ * permissions.
-+ */
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+ char *userid, char *auth_userid,
-+ struct auth_state *auth_state) {
-+
-+ const char *sub ;
-+ char *p, *q, *next_sub;
-+ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1];
-+ int len;
-+ int r = 0;
-+ int subscribe_all_sharedfolders = 0;
-+
-+ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS);
-+
-+ /*
-+ * If subscribeallsharedfolders is set to yes in imapd.conf, then
-+ * subscribe user to every shared folder one has the apropriate
-+ * permissions.
-+ */
-+ if(subscribe_all_sharedfolders) {
-+ char pattern[MAX_MAILBOX_PATH+1];
-+ struct changesub_rock_st changesub_rock;
-+
-+ strcpy(pattern, "*");
-+ changesub_rock.userid = userid;
-+ changesub_rock.auth_userid = auth_userid;
-+ changesub_rock.auth_state = auth_state;
-+
-+ r = mboxlist_findall(namespace, pattern, 0, userid,
-+ auth_state, mboxlist_autochangesub, &changesub_rock);
-+
-+ return r;
-+ }
-+
-+ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL)
-+ return r;
-+
-+ next_sub = (char *) sub;
-+ while (*next_sub) {
-+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++);
-+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++);
-+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--);
-+ if (!*p ) continue;
-+
-+ len = q - p + 1;
-+ /* Check for folder length */
-+ if (len > sizeof(folder)-1)
-+ continue;
-+
-+ if (!r) {
-+ strncpy(folder, p, len);
-+ folder[len] = '\0';
-+
-+ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name));
-+ len = strlcat(name, folder, sizeof(name));
-+
-+ r = (namespace->mboxname_tointernal) (namespace, name, userid,
-+ mailboxname);
-+ }
-+
-+ if (!r)
-+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0);
-+
-+ if (!r) {
-+ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded",
-+ userid, folder);
-+ } else {
-+ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s",
-+ userid, folder, error_message(r));
-+ r = 0;
-+ }
-+ }
-+
-+ return r;
-+}
-+
-+
-+
-+int mboxlist_autocreateinbox(struct namespace *namespace,
-+ char *userid,
-+ struct auth_state *auth_state,
-+ char *mailboxname, int autocreatequota) {
-+ char name [MAX_MAILBOX_NAME+1];
-+ char folder [MAX_MAILBOX_NAME+1];
-+ char *auth_userid = NULL;
-+ char *partition = NULL;
-+ const char *crt;
-+ const char *sub;
-+ char *p, *q, *next_crt, *next_sub;
-+ int len;
-+ int r = 0;
-+ int numcrt = 0;
-+ int numsub = 0;
-+#ifdef USE_SIEVE
-+ const char *source_script;
-+#endif
-+
-+ /*
-+ * While this is not needed for admins
-+ * and imap_admins accounts, it would be
-+ * better to separate *all* admins and
-+ * proxyservers from normal accounts
-+ * (accounts that have mailboxes).
-+ * UOA Specific note(1): Even if we do not
-+ * exclude these servers-classes here,
-+ * UOA specific code, will neither return
-+ * role, nor create INBOX, because none of these
-+ * administrative accounts belong to the
-+ * mailRecipient objectclass, or have imapPartition.
-+ * UOA Specific note(2): Another good reason for doing
-+ * this, is to prevent the code, from getting into
-+ * cyrus_ldap.c because of the continues MSA logins to LMTPd.
-+ */
-+
-+ /*
-+ * admins and the coresponding imap
-+ * service, had already been excluded.
-+ */
-+
-+ /*
-+ * Do we really need group membership
-+ * for admins or service_admins?
-+ */
-+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0;
-+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0;
-+
-+ /*
-+ * Do we really need group membership
-+ * for proxyservers?
-+ */
-+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0;
-+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0;
-+
-+ auth_userid = auth_canonuser(auth_state);
-+
-+ if (auth_userid == NULL) {
-+ /*
-+ * Couldn't get cannon userid
-+ */
-+ syslog(LOG_ERR,
-+ "Could not get cannon userid for user %s", userid);
-+ return IMAP_PARTITION_UNKNOWN;
-+ }
-+
-+#if 0
-+ /*
-+ * Get Partition info or return.
-+ * (Here you should propably use
-+ * you own "get_partition(char *userid)"
-+ * function. Otherwise all new INBOXes will be
-+ * created into whatever partition has been declared
-+ * as default in your imapd.conf)
-+ */
-+
-+ partition = get_partition(userid);
-+
-+ if (partition == NULL) {
-+ /*
-+ * Couldn't get partition info
-+ */
-+ syslog(LOG_ERR,
-+ "Could not get imapPartition info for user %s", userid);
-+ return IMAP_PARTITION_UNKNOWN;
-+ }
-+#endif
-+
-+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL,
-+ 1, userid, auth_state, 0, 0, 0);
-+
-+ if (!r && autocreatequota > 0)
-+ r = mboxlist_setquota(mailboxname, autocreatequota, 0);
-+
-+ if (!r)
-+ r = mboxlist_changesub(mailboxname, userid,
-+ auth_state, 1, 1);
-+
-+ if (!r) {
-+ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s",
-+ auth_userid, partition == NULL ? "default" : partition);
-+ } else {
-+ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s",
-+ auth_userid, error_message(r));
-+ }
-+
-+
-+#if 0
-+ /* Allocated from get_partition, and not needed any more */
-+ free_partition(partition);
-+#endif
-+
-+ if (r) return r;
-+
-+
-+ /* INBOX's subfolders */
-+ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS)))
-+ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS);
-+
-+ /* Roll through crt */
-+ next_crt = (char *) crt;
-+ while (next_crt!=NULL && *next_crt) {
-+ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++);
-+ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++);
-+ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--);
-+
-+ if (!*p) continue;
-+
-+ len = q - p + 1;
-+
-+ /* First time we check for length */
-+ if (len > sizeof(folder) - 5)
-+ r = IMAP_MAILBOX_BADNAME;
-+
-+ if (!r) {
-+ strncpy(folder, p, len);
-+ folder[len] = '\0';
-+
-+ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name));
-+ len = strlcat(name, folder, sizeof(name));
-+ }
-+
-+ if (!r)
-+ r = (namespace->mboxname_tointernal) (namespace, name, userid,
-+ mailboxname);
-+ if (!r)
-+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL,
-+ 1, userid, auth_state, 0, 0, 0);
-+
-+ if (!r) {
-+ numcrt++;
-+ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.",
-+ auth_userid, name);
-+ } else {
-+ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s",
-+ auth_userid, name, error_message(r));
-+ r=0;
-+ continue;
-+ }
-+
-+ /* Roll through sub */
-+ next_sub = (char *) sub;
-+ while (next_sub!=NULL && *next_sub) {
-+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++);
-+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++);
-+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--);
-+ if (!*p ) continue;
-+
-+ len = q - p + 1;
-+
-+ if (len != strlen(folder) || strncmp(folder, p, len))
-+ continue;
-+
-+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1);
-+
-+ if (!r) {
-+ numsub++;
-+ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded",
-+ auth_userid, name);
-+ } else
-+ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s",
-+ auth_userid, name, error_message(r));
-+
-+ break;
-+ }
-+ }
-+
-+ if (crt!=NULL && *crt)
-+ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d",
-+ auth_userid, numcrt, numsub);
-+
-+ /*
-+ * Check if shared folders are available for subscription.
-+ */
-+ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state);
-+
-+#ifdef USE_SIEVE
-+ /*
-+ * Here the autocreate sieve script feature is iniated from.
-+ */
-+ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT);
-+
-+ if (source_script) {
-+ if (!autoadd_sieve(userid, source_script))
-+ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid);
-+ else
-+ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid);
-+ }
-+#endif
-+
-+ return r;
-+}
-+
-diff -Naur cyrus-imapd-2.2.12/imap/mboxlist.h cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.h
---- cyrus-imapd-2.2.12/imap/mboxlist.h 2004-03-17 20:07:49.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.h 2005-10-19 14:48:58.027033000 +0300
-@@ -197,4 +197,10 @@
- int mboxlist_commit(struct txn *tid);
- int mboxlist_abort(struct txn *tid);
-
-+int mboxlist_autocreateinbox(struct namespace *namespace,
-+ char *userid,
-+ struct auth_state *auth_state,
-+ char *mailboxname, int autocreatequota);
-+
-+
- #endif
-diff -Naur cyrus-imapd-2.2.12/imap/pop3d.c cyrus-imapd-2.2.12.autocreate2/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c 2005-01-04 17:06:13.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/imap/pop3d.c 2005-10-19 14:48:58.033335000 +0300
-@@ -152,6 +152,8 @@
- static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
- static void cmd_apop(char *response);
-
-+static int autocreate_inbox(char *inboxname, char *userid);
-+
- static void cmd_auth(char *arg);
- static void cmd_capa(void);
- static void cmd_pass(char *pass);
-@@ -1084,6 +1086,7 @@
- popd_userid = xstrdup(p);
- prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
- }
-+
- }
-
- void cmd_pass(char *pass)
-@@ -1328,6 +1331,46 @@
- }
-
- /*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+int autocreate_inbox(char *inboxname, char *auth_userid)
-+{
-+ struct auth_state *authstate;
-+ int userisadmin;
-+ int autocreatequota;
-+ int r;
-+
-+ if(inboxname == NULL || auth_userid == NULL)
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Exclude anonymous
-+ */
-+ if (!strcmp(popd_userid, "anonymous"))
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Check for autocreatequota
-+ */
-+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)))
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ /*
-+ * Exclude admin's accounts
-+ */
-+
-+ authstate = auth_newstate(popd_userid);
-+ userisadmin = global_authisa(authstate, IMAPOPT_ADMINS);
-+ if (userisadmin)
-+ return IMAP_MAILBOX_NONEXISTENT;
-+
-+ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid,
-+ authstate, inboxname, autocreatequota);
-+ return r;
-+}
-+
-+
-+/*
- * Complete the login process by opening and locking the user's inbox
- */
- int openinbox(void)
-@@ -1349,6 +1392,10 @@
- userid, inboxname);
-
- if (!r) r = mboxlist_detail(inboxname, &type, NULL, &server, &acl, NULL);
-+ /* Try once again after autocreate_inbox */
-+ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid)))
-+ r = mboxlist_detail(inboxname, &type, NULL, &server, &acl, NULL);
-+
- if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
- (!acl ||
- !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
-diff -Naur cyrus-imapd-2.2.12/lib/auth.h cyrus-imapd-2.2.12.autocreate2/lib/auth.h
---- cyrus-imapd-2.2.12/lib/auth.h 2003-10-22 21:50:12.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/lib/auth.h 2005-10-19 14:48:58.035324000 +0300
-@@ -60,4 +60,6 @@
- extern struct auth_state *auth_newstate(const char *identifier);
- extern void auth_freestate(struct auth_state *auth_state);
-
-+extern char *auth_canonuser(struct auth_state *auth_state);
-+
- #endif /* INCLUDED_AUTH_H */
-diff -Naur cyrus-imapd-2.2.12/lib/auth_krb.c cyrus-imapd-2.2.12.autocreate2/lib/auth_krb.c
---- cyrus-imapd-2.2.12/lib/auth_krb.c 2003-11-11 05:26:00.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_krb.c 2005-10-19 14:48:58.038180000 +0300
-@@ -338,3 +338,11 @@
- free((char *)auth_state);
- }
-
-+char *
-+auth_canonuser(struct auth_state *auth_state)
-+{
-+ if (auth_state)
-+ return auth_state->userid;
-+ return NULL;
-+}
-+
-diff -Naur cyrus-imapd-2.2.12/lib/auth_krb5.c cyrus-imapd-2.2.12.autocreate2/lib/auth_krb5.c
---- cyrus-imapd-2.2.12/lib/auth_krb5.c 2004-01-16 17:28:58.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_krb5.c 2005-10-19 14:48:58.040108000 +0300
-@@ -193,4 +193,11 @@
- free(auth_state);
- }
-
-+char *
-+auth_canonuser(struct auth_state *auth_state)
-+{
-+ if (auth_state)
-+ return auth_state->userid;
-+ return NULL;
-+}
-
-diff -Naur cyrus-imapd-2.2.12/lib/auth_pts.c cyrus-imapd-2.2.12.autocreate2/lib/auth_pts.c
---- cyrus-imapd-2.2.12/lib/auth_pts.c 2004-02-25 01:11:37.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_pts.c 2005-10-19 14:48:58.042343000 +0300
-@@ -349,3 +349,11 @@
- {
- free(auth_state);
- }
-+
-+char *auth_canonuser(struct auth_state *auth_state)
-+{
-+ if (auth_state)
-+ return auth_state->userid.id;
-+ return NULL;
-+}
-+
-diff -Naur cyrus-imapd-2.2.12/lib/auth_unix.c cyrus-imapd-2.2.12.autocreate2/lib/auth_unix.c
---- cyrus-imapd-2.2.12/lib/auth_unix.c 2004-09-14 01:49:29.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_unix.c 2005-10-19 14:48:58.044431000 +0300
-@@ -267,4 +267,11 @@
- free((char *)auth_state);
- }
-
-+char *auth_canonuser(struct auth_state *auth_state)
-+{
-+ if (auth_state)
-+ return auth_state->userid;
-+
-+ return NULL;
-+}
-
-diff -Naur cyrus-imapd-2.2.12/lib/imapoptions cyrus-imapd-2.2.12.autocreate2/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions 2004-07-21 22:07:45.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/lib/imapoptions 2005-10-19 14:48:58.048748000 +0300
-@@ -169,6 +169,51 @@
- /* Number of seconds to wait before returning a timeout failure when
- performing a client connection (e.g. in a murder enviornment) */
-
-+{ "createonpost", 0, SWITCH }
-+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist,
-+ then the INBOX is automatically created by lmtpd. */
-+
-+{ "autocreateinboxfolders", NULL, STRING }
-+/* If a user does not have an INBOX created then the INBOX as well as some INBOX subfolders are
-+ created under two conditions.
-+ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value)
-+ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must yes)
-+ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that are automatically created by the server
-+ under the previous two situations. */
-+
-+{ "autosubscribeinboxfolders", NULL, STRING }
-+/* A list of folder names, separated by "|" that the users get automatically subscribed to, when their INBOX
-+ is created.
-+ These folder names must have been included in the autocreateinboxfolders option of the imapd.conf. */
-+
-+{ "autosubscribesharedfolders", NULL, STRING }
-+/* A list of shared folders (bulletin boards), separated by "|" that the users get
-+ automatically subscribed to, after their INBOX
-+ is created. The shared folder must have been created and the user must have the
-+ required permissions to get subscribed to the it. Otherwise the subscription fails. */
-+
-+{ "autosubscribe_all_sharedfolders", 0, SWITCH }
-+/* If set to yes then the user is automatically subscribed to all shared folders, one has permission
-+ to subscribe to. */
-+
-+{ "autocreate_sieve_script", NULL, STRING }
-+/* The full path of a file that contains a sieve script. This script automatically becomes a
-+ user's initial default sieve filter script. When this option is not defined, no default
-+ sieve filter is created. The file must be readable by the cyrus daemon. */
-+
-+{ "autocreate_sieve_compiledscript", NULL, STRING }
-+/* The full path of a file that contains a compiled in bytecode sieve script. This script
-+ automatically becomes a user's initial default sieve filter script.
-+ If this option is not specified, or the filename doesn't exist then the script defined
-+ by autocreate_sieve_script is compiled on the fly and installed as the user's default
-+ sieve script */
-+
-+{ "generate_compiled_sieve_script", 0, SWITCH }
-+/* If set to yes and no compiled sieve script file exists then the sieve script that is
-+ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript
-+ option points. In order a compiled script to be generated, autocreate_sieve_script and
-+ autocreate_sieve_compiledscript must have valid values */
-+
- { "configdirectory", NULL, STRING }
- /* The pathname of the IMAP configuration directory. This field is
- required. */
-diff -Naur cyrus-imapd-2.2.12/notifyd/Makefile.in cyrus-imapd-2.2.12.autocreate2/notifyd/Makefile.in
---- cyrus-imapd-2.2.12/notifyd/Makefile.in 2004-05-28 21:03:06.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/notifyd/Makefile.in 2005-10-19 14:48:58.050575000 +0300
-@@ -69,10 +69,11 @@
- SERVICE=../master/service.o
-
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.2.12/notifyd/notifyd.c cyrus-imapd-2.2.12.autocreate2/notifyd/notifyd.c
---- cyrus-imapd-2.2.12/notifyd/notifyd.c 2004-12-17 18:32:25.000000000 +0200
-+++ cyrus-imapd-2.2.12.autocreate2/notifyd/notifyd.c 2005-10-19 14:48:58.052220000 +0300
-@@ -97,7 +97,7 @@
-
- #define NOTIFY_MAXSIZE 8192
-
--int do_notify()
-+static int do_notify()
- {
- struct sockaddr_un sun_data;
- socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.2.12/ptclient/Makefile.in cyrus-imapd-2.2.12.autocreate2/ptclient/Makefile.in
---- cyrus-imapd-2.2.12/ptclient/Makefile.in 2004-05-28 21:03:08.000000000 +0300
-+++ cyrus-imapd-2.2.12.autocreate2/ptclient/Makefile.in 2005-10-19 14:48:58.053762000 +0300
-@@ -57,10 +57,11 @@
- AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
- AFS_LIBS = @AFS_LIBS@
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
- LIB_SASL = @LIB_SASL@
- LIB_WRAP = @LIB_WRAP@
--DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
-
- LDAP_LIBS=@LDAP_LIBS@
diff --git a/src/patches/cyrus-imapd-2.2.12-gcc4.patch b/src/patches/cyrus-imapd-2.2.12-gcc4.patch
deleted file mode 100644
index 3363beaba..000000000
--- a/src/patches/cyrus-imapd-2.2.12-gcc4.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- tools/config2header 2005/04/13 08:56:16 1.1
-+++ tools/config2header 2005/04/13 08:57:48
-@@ -214,7 +214,6 @@
- print HFILE <<EOF
- IMAPOPT_LAST
- };
--extern struct imapopt_s imapopts[];
-
- enum enum_value {
- IMAP_ENUM_ZERO = 0,
-@@ -260,6 +259,9 @@
-
- print HFILE <<EOF
- };
-+
-+extern struct imapopt_s imapopts[];
-+
- #endif /* INCLUDED_IMAPOPTIONS_H */
- EOF
- ;
---- imap/fud.c 2005/04/13 09:19:05 1.1
-+++ imap/fud.c 2005/04/13 09:20:02
-@@ -202,6 +202,7 @@
- r = begin_handling();
-
- shut_down(r);
-+ return 0;
- }
-
- static void cyrus_timeout(int signo __attribute__((unused)))
---- imap/smmapd.c 2005/04/13 09:19:12 1.1
-+++ imap/smmapd.c 2005/04/13 09:19:50
-@@ -199,6 +199,7 @@
- r = begin_handling();
-
- shut_down(r);
-+ return 0;
- }
-
- int verify_user(const char *key, long quotacheck,
---- notifyd/notifyd.c 2005/04/13 09:19:23 1.1
-+++ notifyd/notifyd.c 2005/04/13 09:19:39
-@@ -266,4 +266,5 @@
- r = do_notify();
-
- shut_down(r);
-+ return 0;
- }
diff --git a/src/patches/ddns-012-noip-fix-handle-name.patch b/src/patches/ddns-012-noip-fix-handle-name.patch
deleted file mode 100644
index d1d281c34..000000000
--- a/src/patches/ddns-012-noip-fix-handle-name.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit c0277eeea2b2c1ed8f40f1248b28438e44e51912
-Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
-Date: Tue Nov 12 08:43:31 2019 +0100
-
- NoIP.com: Rename handle back to no-ip.com
-
- The old handle name is required for backward compatiblity.
-
- Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 528684f..61a608a 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -120,7 +120,7 @@
- # password = pass
-
- # [test.noip.org]
--# provider = noip.com
-+# provider = no-ip.com
- # username = user
- # password = pass
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 4789107..661fbcc 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,7 +1344,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
-
-
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
-- handle = "noip.com"
-+ handle = "no-ip.com"
- name = "NoIP"
- website = "http://www.noip.com/"
- protocols = ("ipv4",)
diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch
deleted file mode 100644
index acc5e66a7..000000000
--- a/src/patches/ddns-012-noip-rename-provider.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445
-Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
-Date: Tue Nov 5 19:09:53 2019 +0100
-
- No-IP.com: Rename provider and handle to NoIP.com
-
- Fixes #11561.
-
- Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-
-diff --git a/README b/README
-index 76f63bc..c75c448 100644
---- a/README
-+++ b/README
-@@ -75,7 +75,7 @@ SUPPORTED PROVIDERS:
- loopia.se
- myonlineportal.net
- namecheap.com
-- no-ip.com
-+ noip.com
- now-dns.com
- nsupdate.info
- opendns.com
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 5b3b845..528684f 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -119,8 +119,8 @@
- # provider = namecheap.com
- # password = pass
-
--# [test.no-ip.org]
--# provider = no-ip.com
-+# [test.noip.org]
-+# provider = noip.com
- # username = user
- # password = pass
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index f3c62c1..4789107 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,16 +1344,16 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
-
-
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
-- handle = "no-ip.com"
-- name = "No-IP"
-- website = "http://www.no-ip.com/"
-+ handle = "noip.com"
-+ name = "NoIP"
-+ website = "http://www.noip.com/"
- protocols = ("ipv4",)
-
- # Information about the format of the HTTP request is to be found
-- # here: http://www.no-ip.com/integrate/request and
-- # here: http://www.no-ip.com/integrate/response
-+ # here: http://www.noip.com/integrate/request and
-+ # here: http://www.noip.com/integrate/response
-
-- url = "http://dynupdate.no-ip.com/nic/update"
-+ url = "http://dynupdate.noip.com/nic/update"
-
- def prepare_request_data(self, proto):
- assert proto == "ipv4"
diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch
new file mode 100644
index 000000000..f131c5b24
--- /dev/null
+++ b/src/patches/ddns-013-dyfi-use-https.patch
@@ -0,0 +1,22 @@
+commit ce6e977f0ace7fe468411270ad07f1824a3aeaec
+Author: Mauno Pirnes <mauno.pirnes(a)hotmail.com>
+Date: Fri Feb 7 12:25:00 2020 +0100
+
+ dy.fi: Use HTTPS to perform updates.
+
+ Signed-off-by: Mauno Pirnes <mauno.pirnes(a)hotmail.com>
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/src/ddns/providers.py b/src/ddns/providers.py
+index dcdc5da..f1fed22 100644
+--- a/src/ddns/providers.py
++++ b/src/ddns/providers.py
+@@ -826,7 +826,7 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
+ # https://www.dy.fi/page/clients?lang=en
+ # https://www.dy.fi/page/specification?lang=en
+
+- url = "http://www.dy.fi/nic/update"
++ url = "https://www.dy.fi/nic/update"
+
+ # Please only send automatic updates when your IP address changes,
+ # or once per 5 to 6 days to refresh the address mapping (they will
diff --git a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch b/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch
deleted file mode 100644
index 0fbc07a50..000000000
--- a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ez-ipupdate.c b/ez-ipupdate.c
-index 9aea495..a6d2528 100644
---- a/ez-ipupdate.c
-+++ b/ez-ipupdate.c
-@@ -95,7 +95,7 @@
- #define HN_DEFAULT_PORT "80"
- #define HN_REQUEST "/vanity/update"
-
--#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com"
-+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com"
- #define ZONEEDIT_DEFAULT_PORT "80"
- #define ZONEEDIT_REQUEST "/auth/dynamic.html"
-
diff --git a/src/patches/ez-ipupdate.formstring.patch b/src/patches/ez-ipupdate.formstring.patch
deleted file mode 100644
index 83187d197..000000000
--- a/src/patches/ez-ipupdate.formstring.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ez-ipupdate.c.old 2002-03-12 00:31:47.000000000 +0100
-+++ ez-ipupdate.c 2004-11-10 15:28:23.000000000 +0100
-@@ -798,7 +798,7 @@ void show_message(char *fmt, ...)
- sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt);
- #endif
-
-- syslog(LOG_NOTICE, buf);
-+ syslog(LOG_NOTICE, "%s", buf);
- }
- else
- {
diff --git a/src/patches/guardian-2.0.2-http-parser.patch b/src/patches/guardian-2.0.2-http-parser.patch
new file mode 100644
index 000000000..1ecae658c
--- /dev/null
+++ b/src/patches/guardian-2.0.2-http-parser.patch
@@ -0,0 +1,45 @@
+commit 5028c7fde1fa15e4960f2fec3c025d0338382895
+Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
+Date: Tue Feb 4 07:55:48 2020 +0100
+
+ Parser: Adjust HTTP parser to be compatible with newer log format.
+
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/modules/Parser.pm b/modules/Parser.pm
+index 3880228..bcca88f 100644
+--- a/modules/Parser.pm
++++ b/modules/Parser.pm
+@@ -302,7 +302,7 @@ sub message_parser_httpd (@) {
+ # been passed.
+ foreach my $line (@message) {
+ # This will catch brute-force attacks against htaccess logins (username).
+- if ($line =~ /.*\[error\] \[client (.*)\] user(.*) not found:.*/) {
++ if ($line =~ /.*\[client (.*)\] .* user(.*) not found:.*/) {
+ # Store the grabbed IP-address.
+ $address = $1;
+
+@@ -311,7 +311,7 @@ sub message_parser_httpd (@) {
+ }
+
+ # Detect htaccess password brute-forcing against a username.
+- elsif ($line =~ /.*\[error\] \[client (.*)\] user(.*): authentication failure for.*/) {
++ elsif ($line =~ /.*\[client (.*)\] .* user(.*): authentication failure for.*/) {
+ # Store the extracted IP-address.
+ $address = $1;
+
+@@ -321,6 +321,14 @@ sub message_parser_httpd (@) {
+
+ # Check if at least the IP-address information has been extracted.
+ if (defined ($address)) {
++ # Check if the address also contains a port value.
++ if ($address =~ m/:/) {
++ my ($add_address, $port) = split(/:/, $address);
++
++ # Only process the address.
++ $address = $add_address;
++ }
++
+ # Add the extracted values and event message to the actions array.
+ push(@actions, "count $address $name $message");
+ }
diff --git a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch b/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
deleted file mode 100644
index 97b2cc1f2..000000000
--- a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
+++ /dev/null
@@ -1,1563 +0,0 @@
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 2014-11-05 22:07:58.828714499 +0100
-@@ -0,0 +1,108 @@
-+/*
-+ * arch/arm/mach-kirkwood/db88f6281-bp-setup.c
-+ *
-+ * Marvell DB-88F6281-BP Development Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/sizes.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include <linux/platform_data/mmc-mvsdio.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition db88f6281_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = SZ_4M
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data db88f6281_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(8),
-+};
-+
-+static struct mv_sata_platform_data db88f6281_sata_data = {
-+ .n_ports = 2,
-+};
-+
-+static struct mvsdio_platform_data db88f6281_mvsdio_data = {
-+ .gpio_write_protect = 37,
-+ .gpio_card_detect = 38,
-+};
-+
-+static unsigned int db88f6281_mpp_config[] __initdata = {
-+ MPP0_NF_IO2,
-+ MPP1_NF_IO3,
-+ MPP2_NF_IO4,
-+ MPP3_NF_IO5,
-+ MPP4_NF_IO6,
-+ MPP5_NF_IO7,
-+ MPP18_NF_IO0,
-+ MPP19_NF_IO1,
-+ MPP37_GPIO,
-+ MPP38_GPIO,
-+ 0
-+};
-+
-+static void __init db88f6281_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(db88f6281_mpp_config);
-+
-+ kirkwood_nand_init(ARRAY_AND_SIZE(db88f6281_nand_parts), 25);
-+ kirkwood_ehci_init();
-+ kirkwood_ge00_init(&db88f6281_ge00_data);
-+ kirkwood_sata_init(&db88f6281_sata_data);
-+ kirkwood_uart0_init();
-+ kirkwood_sdio_init(&db88f6281_mvsdio_data);
-+}
-+
-+static int __init db88f6281_pci_init(void)
-+{
-+ if (machine_is_db88f6281_bp()) {
-+ u32 dev, rev;
-+
-+ kirkwood_pcie_id(&dev, &rev);
-+ if (dev == MV88F6282_DEV_ID)
-+ kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);
-+ else
-+ kirkwood_pcie_init(KW_PCIE0);
-+ }
-+ return 0;
-+}
-+subsys_initcall(db88f6281_pci_init);
-+
-+MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board")
-+ /* Maintainer: Saeed Bishara <saeed(a)marvell.com> */
-+ .atag_offset = 0x100,
-+ .init_machine = db88f6281_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c 2014-11-05 22:07:58.828714499 +0100
-@@ -0,0 +1,111 @@
-+/*
-+ * arch/arm/mach-kirkwood/dockstar-setup.c
-+ *
-+ * Seagate FreeAgent DockStar Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition dockstar_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = SZ_4M
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data dockstar_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
-+};
-+
-+static struct gpio_led dockstar_led_pins[] = {
-+ {
-+ .name = "dockstar:green:health",
-+ .default_trigger = "default-on",
-+ .gpio = 46,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "dockstar:orange:misc",
-+ .default_trigger = "none",
-+ .gpio = 47,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_led_platform_data dockstar_led_data = {
-+ .leds = dockstar_led_pins,
-+ .num_leds = ARRAY_SIZE(dockstar_led_pins),
-+};
-+
-+static struct platform_device dockstar_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &dockstar_led_data,
-+ }
-+};
-+
-+static unsigned int dockstar_mpp_config[] __initdata = {
-+ MPP29_GPIO, /* USB Power Enable */
-+ MPP46_GPIO, /* LED green */
-+ MPP47_GPIO, /* LED orange */
-+ 0
-+};
-+
-+static void __init dockstar_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+
-+ /* setup gpio pin select */
-+ kirkwood_mpp_conf(dockstar_mpp_config);
-+
-+ kirkwood_uart0_init();
-+ kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25);
-+
-+ if (gpio_request(29, "USB Power Enable") != 0 ||
-+ gpio_direction_output(29, 1) != 0)
-+ pr_err("can't set up GPIO 29 (USB Power Enable)\n");
-+ kirkwood_ehci_init();
-+
-+ kirkwood_ge00_init(&dockstar_ge00_data);
-+
-+ platform_device_register(&dockstar_leds);
-+}
-+
-+MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")
-+ .atag_offset = 0x100,
-+ .init_machine = dockstar_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c 2014-11-05 22:07:58.833714499 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * arch/arm/mach-kirkwood/dreamplug-setup.c
-+ *
-+ * Marvell DreamPlug Reference Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/leds.h>
-+#include <linux/spi/flash.h>
-+#include <linux/spi/spi.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include <linux/platform_data/mmc-mvsdio.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static const struct flash_platform_data dreamplug_spi_slave_data = {
-+ .type = "mx25l1606e",
-+};
-+
-+static struct spi_board_info __initdata dreamplug_spi_slave_info[] = {
-+ {
-+ .modalias = "m25p80",
-+ .platform_data = &dreamplug_spi_slave_data,
-+ .irq = -1,
-+ .max_speed_hz = 50000000,
-+ .bus_num = 0,
-+ .chip_select = 0,
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data dreamplug_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
-+};
-+
-+static struct mv643xx_eth_platform_data dreamplug_ge01_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(1),
-+};
-+
-+static struct mv_sata_platform_data dreamplug_sata_data = {
-+ .n_ports = 1,
-+};
-+
-+static struct mvsdio_platform_data dreamplug_mvsdio_data = {
-+ /* unfortunately the CD signal has not been connected */
-+};
-+
-+static struct gpio_led dreamplug_led_pins[] = {
-+ {
-+ .name = "dreamplug:blue:bluetooth",
-+ .gpio = 47,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "dreamplug:green:wlan",
-+ .gpio = 48,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "dreamplug:blue:wlanap",
-+ .gpio = 49,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_led_platform_data dreamplug_led_data = {
-+ .leds = dreamplug_led_pins,
-+ .num_leds = ARRAY_SIZE(dreamplug_led_pins),
-+};
-+
-+static struct platform_device dreamplug_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &dreamplug_led_data,
-+ }
-+};
-+
-+static unsigned int dreamplug_mpp_config[] __initdata = {
-+ MPP0_SPI_SCn,
-+ MPP1_SPI_MOSI,
-+ MPP2_SPI_SCK,
-+ MPP3_SPI_MISO,
-+ MPP4_GPIO,
-+ MPP5_GPO,
-+ MPP7_GPO,
-+ MPP18_GPO,
-+ MPP19_GPO,
-+ MPP47_GPIO, /* B_BLED */
-+ MPP48_GPIO, /* W_GLED */
-+ MPP49_GPIO, /* W_BLED */
-+ 0
-+};
-+
-+static void __init dreamplug_legacy_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(dreamplug_mpp_config);
-+
-+ kirkwood_uart0_init();
-+
-+ spi_register_board_info(dreamplug_spi_slave_info,
-+ ARRAY_SIZE(dreamplug_spi_slave_info));
-+
-+ kirkwood_spi_init();
-+ kirkwood_ehci_init();
-+
-+ kirkwood_ge00_init(&dreamplug_ge00_data);
-+ kirkwood_ge01_init(&dreamplug_ge01_data);
-+ kirkwood_sata_init(&dreamplug_sata_data);
-+ kirkwood_sdio_init(&dreamplug_mvsdio_data);
-+
-+ platform_device_register(&dreamplug_leds);
-+}
-+
-+MACHINE_START(DREAMPLUG, "Marvell DreamPlug Reference Board")
-+ /* Maintainer: Siddarth Gore <gores <at> marvell.com> */
-+ .atag_offset = 0x100,
-+ .init_machine = dreamplug_legacy_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+
-+MACHINE_START(DREAMPLUG1, "Marvell DreamPlug Reference Board")
-+ .atag_offset = 0x100,
-+ .init_machine = dreamplug_legacy_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c 2014-11-05 22:07:58.838714499 +0100
-@@ -0,0 +1,135 @@
-+/*
-+ * arch/arm/mach-kirkwood/guruplug-setup.c
-+ *
-+ * Marvell GuruPlug Reference Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include <linux/platform_data/mmc-mvsdio.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition guruplug_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M,
-+ .mask_flags = MTD_WRITEABLE, /* read only */
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = SZ_4M,
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL,
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data guruplug_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
-+};
-+
-+static struct mv643xx_eth_platform_data guruplug_ge01_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(1),
-+};
-+
-+static struct mv_sata_platform_data guruplug_sata_data = {
-+ .n_ports = 1,
-+};
-+
-+static struct mvsdio_platform_data guruplug_mvsdio_data = {
-+ /* unfortunately the CD signal has not been connected */
-+ .gpio_card_detect = -1,
-+ .gpio_write_protect = -1,
-+};
-+
-+static struct gpio_led guruplug_led_pins[] = {
-+ {
-+ .name = "guruplug:red:health",
-+ .gpio = 46,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "guruplug:green:health",
-+ .gpio = 47,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "guruplug:red:wmode",
-+ .gpio = 48,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "guruplug:green:wmode",
-+ .gpio = 49,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_led_platform_data guruplug_led_data = {
-+ .leds = guruplug_led_pins,
-+ .num_leds = ARRAY_SIZE(guruplug_led_pins),
-+};
-+
-+static struct platform_device guruplug_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &guruplug_led_data,
-+ }
-+};
-+
-+static unsigned int guruplug_mpp_config[] __initdata = {
-+ MPP46_GPIO, /* M_RLED */
-+ MPP47_GPIO, /* M_GLED */
-+ MPP48_GPIO, /* B_RLED */
-+ MPP49_GPIO, /* B_GLED */
-+ 0
-+};
-+
-+static void __init guruplug_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(guruplug_mpp_config);
-+
-+ kirkwood_uart0_init();
-+ kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
-+
-+ kirkwood_ehci_init();
-+ kirkwood_ge00_init(&guruplug_ge00_data);
-+ kirkwood_ge01_init(&guruplug_ge01_data);
-+ kirkwood_sata_init(&guruplug_sata_data);
-+ kirkwood_sdio_init(&guruplug_mvsdio_data);
-+
-+ platform_device_register(&guruplug_leds);
-+}
-+
-+MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board")
-+ /* Maintainer: Siddarth Gore <gores(a)marvell.com> */
-+ .atag_offset = 0x100,
-+ .init_machine = guruplug_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c 2014-11-05 22:07:58.843714499 +0100
-@@ -0,0 +1,214 @@
-+/*
-+ * arch/arm/mach-kirkwood/iconnect-setup.c
-+ *
-+ * Iomega iConnect Wireless Data Station Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/i2c.h>
-+#include <linux/input.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition iconnect_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M,
-+ .mask_flags = MTD_WRITEABLE, /* read only */
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = 0x440000,
-+ }, {
-+ .name = "uInit",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = 0x440000,
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL,
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data iconnect_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(0xB),
-+};
-+
-+static struct gpio_led iconnect_led_pins[] = {
-+ {
-+ .name = "iconnect:led_level",
-+ .default_trigger = "default-on",
-+ .gpio = 41,
-+ .active_low = 0,
-+ },
-+
-+ {
-+ .name = "iconnect:blue:power",
-+ .default_trigger = "default-on",
-+ .gpio = 42,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:red:power",
-+ .default_trigger = "none",
-+ .gpio = 43,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:blue:usb_1",
-+ .default_trigger = "none",
-+ .gpio = 44,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:blue:usb_2",
-+ .default_trigger = "none",
-+ .gpio = 45,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:blue:usb_3",
-+ .default_trigger = "none",
-+ .gpio = 46,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:blue:usb_4",
-+ .default_trigger = "none",
-+ .gpio = 47,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "iconnect:blue:otb",
-+ .default_trigger = "none",
-+ .gpio = 48,
-+ .active_low = 0,
-+ },
-+};
-+
-+static struct gpio_led_platform_data iconnect_led_data = {
-+ .leds = iconnect_led_pins,
-+ .num_leds = ARRAY_SIZE(iconnect_led_pins),
-+};
-+
-+static struct platform_device iconnect_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &iconnect_led_data,
-+ }
-+};
-+
-+static struct gpio_keys_button iconnect_buttons[] = {
-+ {
-+ .code = KEY_COPY,
-+ .gpio = 35,
-+ .desc = "OTB Button",
-+ .active_low = 1,
-+ },
-+ {
-+ .code = KEY_RESTART,
-+ .gpio = 12,
-+ .desc = "Reset",
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_keys_platform_data iconnect_button_data = {
-+ .buttons = iconnect_buttons,
-+ .nbuttons = ARRAY_SIZE(iconnect_buttons),
-+};
-+
-+static struct platform_device iconnect_button_device = {
-+ .name = "gpio-keys",
-+ .id = -1,
-+ .num_resources = 0,
-+ .dev = {
-+ .platform_data = &iconnect_button_data,
-+ }
-+};
-+
-+static unsigned int iconnect_mpp_config[] __initdata = {
-+ MPP0_NF_IO2,
-+ MPP1_NF_IO3,
-+ MPP2_NF_IO4,
-+ MPP3_NF_IO5,
-+ MPP4_NF_IO6,
-+ MPP5_NF_IO7,
-+ MPP18_NF_IO0,
-+ MPP19_NF_IO1,
-+ MPP12_GPIO, /* Reset Button */
-+ MPP35_GPIO, /* OTB Button */
-+
-+ MPP41_GPIO, /* LED Level */
-+ MPP42_GPIO, /* Power LED blue */
-+ MPP43_GPIO, /* Power LED red */
-+ MPP44_GPIO, /* USB LED 1 */
-+ MPP45_GPIO, /* USB LED 2 */
-+ MPP46_GPIO, /* USB LED 3 */
-+ MPP47_GPIO, /* USB LED 4 */
-+ MPP48_GPIO, /* OTB LED */
-+ 0
-+};
-+
-+static struct i2c_board_info __initdata iconnect_i2c = {
-+ I2C_BOARD_INFO("lm63", 0x4c),
-+};
-+
-+static void __init iconnect_legacy_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(iconnect_mpp_config);
-+
-+ kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
-+ kirkwood_ehci_init();
-+ kirkwood_ge00_init(&iconnect_ge00_data);
-+
-+ kirkwood_uart0_init();
-+ platform_device_register(&iconnect_leds);
-+ platform_device_register(&iconnect_button_device);
-+
-+ kirkwood_i2c_init();
-+ i2c_register_board_info(0, &iconnect_i2c,1);
-+}
-+
-+static int __init iconnect_pci_init(void)
-+{
-+ if (machine_is_iconnect()) {
-+ kirkwood_pcie_init(KW_PCIE0);
-+ }
-+ return 0;
-+}
-+subsys_initcall(iconnect_pci_init);
-+
-+MACHINE_START(ICONNECT, "Iomega iConnect Wireless Data Station")
-+ /* Maintainer: Arne Fitzenreiter <arne_f(a)ipfire.org> */
-+ .atag_offset = 0x100,
-+ .init_machine = iconnect_legacy_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/arm/mach-kirkwood/Kconfig
---- linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig 2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig 2014-11-05 22:07:58.848714499 +0100
-@@ -1,3 +1,5 @@
-+
-+
- if ARCH_KIRKWOOD
-
- menu "Marvell Kirkwood Implementations"
-@@ -72,6 +74,83 @@
- Say 'Y' here if you want your kernel to support the
- HP t5325 Thin Client.
-
-+config MACH_DB88F6281_BP
-+ bool "Marvell DB-88F6281-BP Development Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Marvell DB-88F6281-BP Development Board.
-+
-+config MACH_DOCKSTAR
-+ bool "Seagate FreeAgent DockStar"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Seagate FreeAgent DockStar.
-+
-+config MACH_SHEEVAPLUG
-+ bool "Marvell SheevaPlug Reference Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Marvell SheevaPlug Reference Board.
-+
-+config MACH_ESATA_SHEEVAPLUG
-+ bool "Marvell eSATA SheevaPlug Reference Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Marvell eSATA SheevaPlug Reference Board.
-+
-+config MACH_GURUPLUG
-+ bool "Marvell GuruPlug Reference Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Marvell GuruPlug Reference Board.
-+
-+config MACH_INETSPACE_V2
-+ bool "LaCie Internet Space v2 NAS Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ LaCie Internet Space v2 NAS.
-+
-+config MACH_NETSPACE_MAX_V2
-+ bool "LaCie Network Space Max v2 NAS Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ LaCie Network Space Max v2 NAS.
-+
-+config MACH_NETSPACE_V2
-+ bool "LaCie Network Space v2 NAS Board"
-+ select KIRKWOOD_LEGACY
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ LaCie Network Space v2 NAS.
-+
-+config MACH_DREAMPLUG
-+ select KIRKWOOD_LEGACY
-+ bool "Marvell DreamPlug Reference Board"
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Marvell DreamPlug Reference Board.
-+
-+config MACH_ICONNECT
-+ select KIRKWOOD_LEGACY
-+ bool "Iomega iConnect Wireless Data Station"
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Iomega iConnect Wireless Data Station.
-+
-+config MACH_NAS6210
-+ select KIRKWOOD_LEGACY
-+ bool "Raidsonic ICY BOX IB-62x0"
-+ help
-+ Say 'Y' here if you want your kernel to support the
-+ Raidsonic ICY BOX IB-62x0.
-+
- config MACH_TS219
- bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
- select KIRKWOOD_LEGACY
-@@ -113,6 +192,7 @@
- Say 'Y' here if you want your kernel to support the
- Marvell 88F6281 GTW GE Board (Flattened Device Tree).
-
-+
- endmenu
-
- endif
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/arm/mach-kirkwood/Makefile
---- linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile 2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile 2014-11-05 22:09:01.758714529 +0100
-@@ -2,6 +2,15 @@
- obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o
- obj-$(CONFIG_PM) += pm.o
-
-+obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o
-+obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
-+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
-+obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
-+obj-$(CONFIG_MACH_DREAMPLUG) += dreamplug-setup.o
-+obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
-+obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o
-+obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
-+obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
- obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
- obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
- obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
-@@ -11,6 +20,8 @@
- obj-$(CONFIG_MACH_T5325) += t5325-setup.o
- obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
- obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
-+obj-$(CONFIG_MACH_ICONNECT) += iconnect-setup.o
-+obj-$(CONFIG_MACH_NAS6210) += nas6210-setup.o
-
- obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o
- obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c 2014-11-05 22:07:58.858714499 +0100
-@@ -0,0 +1,185 @@
-+/*
-+ * arch/arm/mach-kirkwood/nas6210-setup.c
-+ *
-+ * Raidsonic ICYBOX NAS6210 and 6220 Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/i2c.h>
-+#include <linux/input.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+#define NAS6210_GPIO_POWER_OFF 24
-+
-+static struct mtd_partition nas6210_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M,
-+ .mask_flags = MTD_WRITEABLE, /* read only */
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = (SZ_1M*6),
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL,
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data nas6210_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(8),
-+};
-+
-+static struct mv_sata_platform_data nas6210_sata_data = {
-+ .n_ports = 2,
-+};
-+
-+static struct gpio_led nas6210_led_pins[] = {
-+ {
-+ .name = "nas6210:green:power",
-+ .default_trigger = "default-on",
-+ .gpio = 25,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "nas6210:red:power",
-+ .default_trigger = "none",
-+ .gpio = 22,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "nas6210:red:usb_copy",
-+ .default_trigger = "none",
-+ .gpio = 27,
-+ .active_low = 0,
-+ },
-+};
-+
-+static struct gpio_led_platform_data nas6210_led_data = {
-+ .leds = nas6210_led_pins,
-+ .num_leds = ARRAY_SIZE(nas6210_led_pins),
-+};
-+
-+static struct platform_device nas6210_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &nas6210_led_data,
-+ }
-+};
-+
-+static struct gpio_keys_button nas6210_buttons[] = {
-+ {
-+ .code = KEY_COPY,
-+ .gpio = 29,
-+ .desc = "USB Copy",
-+ .active_low = 1,
-+ },
-+ {
-+ .code = KEY_RESTART,
-+ .gpio = 28,
-+ .desc = "Reset",
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_keys_platform_data nas6210_button_data = {
-+ .buttons = nas6210_buttons,
-+ .nbuttons = ARRAY_SIZE(nas6210_buttons),
-+};
-+
-+static struct platform_device nas6210_button_device = {
-+ .name = "gpio-keys",
-+ .id = -1,
-+ .num_resources = 0,
-+ .dev = {
-+ .platform_data = &nas6210_button_data,
-+ }
-+};
-+
-+static unsigned int nas6210_mpp_config[] __initdata = {
-+ MPP0_NF_IO2,
-+ MPP1_NF_IO3,
-+ MPP2_NF_IO4,
-+ MPP3_NF_IO5,
-+ MPP4_NF_IO6,
-+ MPP5_NF_IO7,
-+ MPP18_NF_IO0,
-+ MPP19_NF_IO1,
-+ MPP22_GPIO, /* Power LED red */
-+ MPP24_GPIO, /* Power off */
-+ MPP25_GPIO, /* Power LED green */
-+ MPP27_GPIO, /* USB transfer LED */
-+ MPP28_GPIO, /* Reset button */
-+ MPP29_GPIO, /* USB Copy button */
-+ 0
-+};
-+
-+void nas6210_power_off(void)
-+{
-+ gpio_set_value(NAS6210_GPIO_POWER_OFF, 1);
-+ while(1);
-+}
-+
-+static void __init nas6210_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(nas6210_mpp_config);
-+
-+ kirkwood_nand_init(ARRAY_AND_SIZE(nas6210_nand_parts), 25);
-+ kirkwood_ehci_init();
-+ kirkwood_ge00_init(&nas6210_ge00_data);
-+ kirkwood_sata_init(&nas6210_sata_data);
-+ kirkwood_uart0_init();
-+ platform_device_register(&nas6210_leds);
-+ platform_device_register(&nas6210_button_device);
-+
-+ if (gpio_request(NAS6210_GPIO_POWER_OFF, "power-off") == 0 &&
-+ gpio_direction_output(NAS6210_GPIO_POWER_OFF, 0) == 0)
-+ pm_power_off = nas6210_power_off;
-+
-+ else
-+ pr_err("nas6210: failed to configure power-off gpio pin");
-+}
-+
-+static int __init nas6210_pci_init(void)
-+{
-+ if (machine_is_nas6210()) {
-+ kirkwood_pcie_init(KW_PCIE0);
-+ }
-+ return 0;
-+}
-+subsys_initcall(nas6210_pci_init);
-+
-+MACHINE_START(NAS6210, "RaidSonic ICY BOX IB-NAS62x0")
-+ /* Maintainer: Arne Fitzenreiter <arne_f(a)ipfire.org> */
-+ .atag_offset = 0x00000100,
-+ .init_machine = nas6210_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c 2014-11-05 22:07:58.858714499 +0100
-@@ -0,0 +1,293 @@
-+/*
-+ * arch/arm/mach-kirkwood/netspace_v2-setup.c
-+ *
-+ * LaCie Network Space v2 board setup
-+ *
-+ * Copyright (C) 2009 Simon Guinot <sguinot(a)lacie.com>
-+ * Copyright (C) 2009 Benoît Canet <benoit.canet(a)gmail.com>
-+ *
-+ * 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 2 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/input.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/leds.h>
-+#include <linux/gpio-fan.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include <linux/platform_data/leds-kirkwood-ns2.h>
-+#include "common.h"
-+#include "mpp.h"
-+#include "lacie_v2-common.h"
-+
-+/*****************************************************************************
-+ * Ethernet
-+ ****************************************************************************/
-+
-+static struct mv643xx_eth_platform_data netspace_v2_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(8),
-+};
-+
-+/*****************************************************************************
-+ * SATA
-+ ****************************************************************************/
-+
-+static struct mv_sata_platform_data netspace_v2_sata_data = {
-+ .n_ports = 2,
-+};
-+
-+/*****************************************************************************
-+ * GPIO keys
-+ ****************************************************************************/
-+
-+#define NETSPACE_V2_PUSH_BUTTON 32
-+
-+static struct gpio_keys_button netspace_v2_buttons[] = {
-+ [0] = {
-+ .code = KEY_POWER,
-+ .gpio = NETSPACE_V2_PUSH_BUTTON,
-+ .desc = "Power push button",
-+ .active_low = 0,
-+ },
-+};
-+
-+static struct gpio_keys_platform_data netspace_v2_button_data = {
-+ .buttons = netspace_v2_buttons,
-+ .nbuttons = ARRAY_SIZE(netspace_v2_buttons),
-+};
-+
-+static struct platform_device netspace_v2_gpio_buttons = {
-+ .name = "gpio-keys",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &netspace_v2_button_data,
-+ },
-+};
-+
-+/*****************************************************************************
-+ * GPIO LEDs
-+ ****************************************************************************/
-+
-+#define NETSPACE_V2_GPIO_RED_LED 12
-+
-+static struct gpio_led netspace_v2_gpio_led_pins[] = {
-+ {
-+ .name = "ns_v2:red:fail",
-+ .gpio = NETSPACE_V2_GPIO_RED_LED,
-+ },
-+};
-+
-+static struct gpio_led_platform_data netspace_v2_gpio_leds_data = {
-+ .num_leds = ARRAY_SIZE(netspace_v2_gpio_led_pins),
-+ .leds = netspace_v2_gpio_led_pins,
-+};
-+
-+static struct platform_device netspace_v2_gpio_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &netspace_v2_gpio_leds_data,
-+ },
-+};
-+
-+/*****************************************************************************
-+ * Dual-GPIO CPLD LEDs
-+ ****************************************************************************/
-+
-+#define NETSPACE_V2_GPIO_BLUE_LED_SLOW 29
-+#define NETSPACE_V2_GPIO_BLUE_LED_CMD 30
-+
-+static struct ns2_led netspace_v2_led_pins[] = {
-+ {
-+ .name = "ns_v2:blue:sata",
-+ .cmd = NETSPACE_V2_GPIO_BLUE_LED_CMD,
-+ .slow = NETSPACE_V2_GPIO_BLUE_LED_SLOW,
-+ },
-+};
-+
-+static struct ns2_led_platform_data netspace_v2_leds_data = {
-+ .num_leds = ARRAY_SIZE(netspace_v2_led_pins),
-+ .leds = netspace_v2_led_pins,
-+};
-+
-+static struct platform_device netspace_v2_leds = {
-+ .name = "leds-ns2",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &netspace_v2_leds_data,
-+ },
-+};
-+
-+/*****************************************************************************
-+ * GPIO fan
-+ ****************************************************************************/
-+
-+/* Designed for fan 40x40x16: ADDA AD0412LB-D50 6000rpm@12v */
-+static struct gpio_fan_speed netspace_max_v2_fan_speed[] = {
-+ { 0, 0 },
-+ { 1500, 15 },
-+ { 1700, 14 },
-+ { 1800, 13 },
-+ { 2100, 12 },
-+ { 3100, 11 },
-+ { 3300, 10 },
-+ { 4300, 9 },
-+ { 5500, 8 },
-+};
-+
-+static unsigned netspace_max_v2_fan_ctrl[] = { 22, 7, 33, 23 };
-+
-+static struct gpio_fan_alarm netspace_max_v2_fan_alarm = {
-+ .gpio = 25,
-+ .active_low = 1,
-+};
-+
-+static struct gpio_fan_platform_data netspace_max_v2_fan_data = {
-+ .num_ctrl = ARRAY_SIZE(netspace_max_v2_fan_ctrl),
-+ .ctrl = netspace_max_v2_fan_ctrl,
-+ .alarm = &netspace_max_v2_fan_alarm,
-+ .num_speed = ARRAY_SIZE(netspace_max_v2_fan_speed),
-+ .speed = netspace_max_v2_fan_speed,
-+};
-+
-+static struct platform_device netspace_max_v2_gpio_fan = {
-+ .name = "gpio-fan",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &netspace_max_v2_fan_data,
-+ },
-+};
-+
-+/*****************************************************************************
-+ * General Setup
-+ ****************************************************************************/
-+
-+static unsigned int netspace_v2_mpp_config[] __initdata = {
-+ MPP0_SPI_SCn,
-+ MPP1_SPI_MOSI,
-+ MPP2_SPI_SCK,
-+ MPP3_SPI_MISO,
-+ MPP4_NF_IO6,
-+ MPP5_NF_IO7,
-+ MPP6_SYSRST_OUTn,
-+ MPP7_GPO, /* Fan speed (bit 1) */
-+ MPP8_TW0_SDA,
-+ MPP9_TW0_SCK,
-+ MPP10_UART0_TXD,
-+ MPP11_UART0_RXD,
-+ MPP12_GPO, /* Red led */
-+ MPP14_GPIO, /* USB fuse */
-+ MPP16_GPIO, /* SATA 0 power */
-+ MPP17_GPIO, /* SATA 1 power */
-+ MPP18_NF_IO0,
-+ MPP19_NF_IO1,
-+ MPP20_SATA1_ACTn,
-+ MPP21_SATA0_ACTn,
-+ MPP22_GPIO, /* Fan speed (bit 0) */
-+ MPP23_GPIO, /* Fan power */
-+ MPP24_GPIO, /* USB mode select */
-+ MPP25_GPIO, /* Fan rotation fail */
-+ MPP26_GPIO, /* USB device vbus */
-+ MPP28_GPIO, /* USB enable host vbus */
-+ MPP29_GPIO, /* Blue led (slow register) */
-+ MPP30_GPIO, /* Blue led (command register) */
-+ MPP31_GPIO, /* Board power off */
-+ MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */
-+ MPP33_GPO, /* Fan speed (bit 2) */
-+ 0
-+};
-+
-+#define NETSPACE_V2_GPIO_POWER_OFF 31
-+
-+static void netspace_v2_power_off(void)
-+{
-+ gpio_set_value(NETSPACE_V2_GPIO_POWER_OFF, 1);
-+}
-+
-+static void __init netspace_v2_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+ kirkwood_mpp_conf(netspace_v2_mpp_config);
-+
-+ if (machine_is_netspace_max_v2())
-+ lacie_v2_hdd_power_init(2);
-+ else
-+ lacie_v2_hdd_power_init(1);
-+
-+ kirkwood_ehci_init();
-+ kirkwood_ge00_init(&netspace_v2_ge00_data);
-+ kirkwood_sata_init(&netspace_v2_sata_data);
-+ kirkwood_uart0_init();
-+ lacie_v2_register_flash();
-+ lacie_v2_register_i2c_devices();
-+
-+ platform_device_register(&netspace_v2_leds);
-+ platform_device_register(&netspace_v2_gpio_leds);
-+ platform_device_register(&netspace_v2_gpio_buttons);
-+ if (machine_is_netspace_max_v2())
-+ platform_device_register(&netspace_max_v2_gpio_fan);
-+
-+ if (gpio_request(NETSPACE_V2_GPIO_POWER_OFF, "power-off") == 0 &&
-+ gpio_direction_output(NETSPACE_V2_GPIO_POWER_OFF, 0) == 0)
-+ pm_power_off = netspace_v2_power_off;
-+ else
-+ pr_err("netspace_v2: failed to configure power-off GPIO\n");
-+}
-+
-+#ifdef CONFIG_MACH_NETSPACE_V2
-+MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")
-+ .atag_offset = 0x100,
-+ .init_machine = netspace_v2_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+#endif
-+
-+#ifdef CONFIG_MACH_INETSPACE_V2
-+MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2")
-+ .atag_offset = 0x100,
-+ .init_machine = netspace_v2_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+#endif
-+
-+#ifdef CONFIG_MACH_NETSPACE_MAX_V2
-+MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2")
-+ .atag_offset = 0x100,
-+ .init_machine = netspace_v2_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+#endif
-diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c
---- linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c 2014-11-05 22:07:58.868714499 +0100
-@@ -0,0 +1,161 @@
-+/*
-+ * arch/arm/mach-kirkwood/sheevaplug-setup.c
-+ *
-+ * Marvell SheevaPlug Reference Board Setup
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include <linux/platform_data/mmc-mvsdio.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition sheevaplug_nand_parts[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0,
-+ .size = SZ_1M
-+ }, {
-+ .name = "uImage",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = SZ_4M
-+ }, {
-+ .name = "root",
-+ .offset = MTDPART_OFS_NXTBLK,
-+ .size = MTDPART_SIZ_FULL
-+ },
-+};
-+
-+static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
-+ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
-+};
-+
-+static struct mv_sata_platform_data sheeva_esata_sata_data = {
-+ .n_ports = 2,
-+};
-+
-+static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
-+ /* unfortunately the CD signal has not been connected */
-+};
-+
-+static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
-+ .gpio_write_protect = 44, /* MPP44 used as SD write protect */
-+ .gpio_card_detect = 47, /* MPP47 used as SD card detect */
-+};
-+
-+static struct gpio_led sheevaplug_led_pins[] = {
-+ {
-+ .name = "plug:red:misc",
-+ .default_trigger = "none",
-+ .gpio = 46,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "plug:green:health",
-+ .default_trigger = "default-on",
-+ .gpio = 49,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_led_platform_data sheevaplug_led_data = {
-+ .leds = sheevaplug_led_pins,
-+ .num_leds = ARRAY_SIZE(sheevaplug_led_pins),
-+};
-+
-+static struct platform_device sheevaplug_leds = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &sheevaplug_led_data,
-+ }
-+};
-+
-+static unsigned int sheevaplug_mpp_config[] __initdata = {
-+ MPP29_GPIO, /* USB Power Enable */
-+ MPP46_GPIO, /* LED Red */
-+ MPP49_GPIO, /* LED */
-+ 0
-+};
-+
-+static unsigned int sheeva_esata_mpp_config[] __initdata = {
-+ MPP29_GPIO, /* USB Power Enable */
-+ MPP44_GPIO, /* SD Write Protect */
-+ MPP47_GPIO, /* SD Card Detect */
-+ MPP49_GPIO, /* LED Green */
-+ 0
-+};
-+
-+static void __init sheevaplug_init(void)
-+{
-+ /*
-+ * Basic setup. Needs to be called early.
-+ */
-+ kirkwood_init();
-+
-+ /* setup gpio pin select */
-+ if (machine_is_esata_sheevaplug())
-+ kirkwood_mpp_conf(sheeva_esata_mpp_config);
-+ else
-+ kirkwood_mpp_conf(sheevaplug_mpp_config);
-+
-+ kirkwood_uart0_init();
-+ kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
-+
-+ if (gpio_request(29, "USB Power Enable") != 0 ||
-+ gpio_direction_output(29, 1) != 0)
-+ pr_err("can't set up GPIO 29 (USB Power Enable)\n");
-+ kirkwood_ehci_init();
-+
-+ kirkwood_ge00_init(&sheevaplug_ge00_data);
-+
-+ /* honor lower power consumption for plugs with out eSATA */
-+ if (machine_is_esata_sheevaplug())
-+ kirkwood_sata_init(&sheeva_esata_sata_data);
-+
-+ /* enable sd wp and sd cd on plugs with esata */
-+ if (machine_is_esata_sheevaplug())
-+ kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
-+ else
-+ kirkwood_sdio_init(&sheevaplug_mvsdio_data);
-+
-+ platform_device_register(&sheevaplug_leds);
-+}
-+
-+#ifdef CONFIG_MACH_SHEEVAPLUG
-+MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
-+ /* Maintainer: shadi Ammouri <shadi(a)marvell.com> */
-+ .atag_offset = 0x100,
-+ .init_machine = sheevaplug_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+#endif
-+
-+#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
-+MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
-+ .atag_offset = 0x100,
-+ .init_machine = sheevaplug_init,
-+ .map_io = kirkwood_map_io,
-+ .init_early = kirkwood_init_early,
-+ .init_irq = kirkwood_init_irq,
-+ .init_time = kirkwood_timer_init,
-+ .restart = kirkwood_restart,
-+MACHINE_END
-+#endif
-diff -Naur linux-3.14.22.org/arch/arm/tools/mach-types linux-3.14.22/arch/arm/tools/mach-types
---- linux-3.14.22.org/arch/arm/tools/mach-types 2014-10-15 08:42:04.000000000 +0200
-+++ linux-3.14.22/arch/arm/tools/mach-types 2014-11-05 22:07:58.868714499 +0100
-@@ -447,6 +447,7 @@
- smartq5 MACH_SMARTQ5 SMARTQ5 2534
- davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548
- mxt_td60 MACH_MXT_TD60 MXT_TD60 2550
-+guruplug MACH_GURUPLUG GURUPLUG 2601
- capc7117 MACH_CAPC7117 CAPC7117 2612
- icontrol MACH_ICONTROL ICONTROL 2624
- gplugd MACH_GPLUGD GPLUGD 2625
-@@ -454,7 +455,7 @@
- mx23evk MACH_MX23EVK MX23EVK 2629
- ap4evb MACH_AP4EVB AP4EVB 2630
- mityomapl138 MACH_MITYOMAPL138 MITYOMAPL138 2650
--guruplug MACH_GURUPLUG GURUPLUG 2659
-+dreamplug1 MACH_DREAMPLUG1 DREAMPLUG1 2659
- spear310 MACH_SPEAR310 SPEAR310 2660
- spear320 MACH_SPEAR320 SPEAR320 2661
- aquila MACH_AQUILA AQUILA 2676
-@@ -491,6 +492,7 @@
- t5325 MACH_T5325 T5325 2846
- income MACH_INCOME INCOME 2849
- goni MACH_GONI GONI 2862
-+iconnect MACH_ICONNECT ICONNECT 2870
- bv07 MACH_BV07 BV07 2882
- openrd_ultimate MACH_OPENRD_ULTIMATE OPENRD_ULTIMATE 2884
- devixp MACH_DEVIXP DEVIXP 2885
-@@ -520,6 +522,7 @@
- vpr200 MACH_VPR200 VPR200 3087
- torbreck MACH_TORBRECK TORBRECK 3090
- prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
-+nas6210 MACH_NAS6210 NAS6210 3104
- paz00 MACH_PAZ00 PAZ00 3128
- acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
- ag5evm MACH_AG5EVM AG5EVM 3189
-@@ -544,6 +547,7 @@
- nspire MACH_NSPIRE NSPIRE 3503
- nokia_rm696 MACH_NOKIA_RM696 NOKIA_RM696 3522
- mikrap_x168 MACH_MIKRAP_X168 MIKRAP_X168 3543
-+dreamplug MACH_DREAMPLUG DREAMPLUG 3550
- deto_macarm9 MACH_DETO_MACARM9 DETO_MACARM9 3568
- m28evk MACH_M28EVK M28EVK 3613
- kota2 MACH_KOTA2 KOTA2 3616
diff --git a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
deleted file mode 100644
index f3c88205d..000000000
--- a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
-index 4a512d8..f550bba 100644
---- a/arch/arm/boot/dts/kirkwood-iconnect.dts
-+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
-@@ -5,7 +5,7 @@
- #include "kirkwood-6281.dtsi"
-
- / {
-- model = "Iomega Iconnect";
-+ model = "Iomega iConnect";
- compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-
- memory {
-@@ -85,37 +85,37 @@
- pinctrl-names = "default";
-
- led-level {
-- label = "led_level";
-+ label = "iconnect::led_level";
- gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
- default-state = "on";
- };
- power-blue {
-- label = "power:blue";
-+ label = "iconnect:blue:power";
- gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep";
- };
- power-red {
-- label = "power:red";
-+ label = "iconnect:red:power";
- gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
- };
- usb1 {
-- label = "usb1:blue";
-+ label = "iconnect:blue:usb_1";
- gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
- };
- usb2 {
-- label = "usb2:blue";
-+ label = "iconnect:blue:usb_2";
- gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
- };
- usb3 {
-- label = "usb3:blue";
-+ label = "iconnect:blue:usb_3";
- gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
- };
- usb4 {
-- label = "usb4:blue";
-+ label = "iconnect:blue:usb_4";
- gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
- };
- otb {
-- label = "otb:blue";
-+ label = "iconnect:blue:otb";
- gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
- };
- };
diff --git a/src/patches/multicat-makefile.patch b/src/patches/multicat-makefile.patch
deleted file mode 100644
index 60a987bbe..000000000
--- a/src/patches/multicat-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig 2013-06-14 12:39:11.000000000 +0200
-+++ Makefile 2013-06-14 12:39:20.000000000 +0200
-@@ -13,7 +13,7 @@
- OBJ_LASTS = lasts.o
- OBJ_MULTICAT_VALIDATE = multicat_validate.o util.o
-
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- BIN = $(DESTDIR)/$(PREFIX)/bin
- MAN = $(DESTDIR)/$(PREFIX)/share/man/man1
-
-
diff --git a/src/patches/ppp-2.4.7-openssl.patch b/src/patches/ppp-2.4.7-openssl.patch
deleted file mode 100644
index cbb5857a7..000000000
--- a/src/patches/ppp-2.4.7-openssl.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad(a)redhat.com>
-Date: Fri, 6 Apr 2018 14:27:18 +0200
-Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped
-libcrypt. The libxcrypt standalone package can be used instead, but
-it dropped the old setkey/encrypt API which ppp uses for DES. There
-is support for using openssl in pppcrypt.c, but it contains typos
-preventing it from compiling and seems to be written for an ancient
-openssl version.
-
-This updates the code to use current openssl.
-
-[paulus(a)ozlabs.org - wrote the commit description, fixed comment in
- Makefile.linux.]
-
-Signed-off-by: Jaroslav Škarvada <jskarvad(a)redhat.com>
-Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org>
----
- pppd/Makefile.linux | 7 ++++---
- pppd/pppcrypt.c | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 36d2b036..8d5ce99d 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -35,10 +35,10 @@ endif
- COPTS = -O2 -pipe -Wall -g
- LIBS =
-
--# Uncomment the next 2 lines to include support for Microsoft's
-+# Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
--USE_CRYPT=y
-+#USE_CRYPT=y
- # Don't use MSLANMAN unless you really know what you're doing.
- #MSLANMAN=y
- # Uncomment the next line to include support for MPPE. CHAPMS (above) must
-@@ -137,7 +137,8 @@ endif
-
- ifdef NEEDDES
- ifndef USE_CRYPT
--LIBS += -ldes $(LIBS)
-+CFLAGS += -I/usr/include/openssl
-+LIBS += -lcrypto
- else
- CFLAGS += -DUSE_CRYPT=1
- endif
-diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
-index 8b85b132..6b35375e 100644
---- a/pppd/pppcrypt.c
-+++ b/pppd/pppcrypt.c
-@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */
- des_key[7] = Get7Bits(key, 49);
-
- #ifndef USE_CRYPT
-- des_set_odd_parity((des_cblock *)des_key);
-+ DES_set_odd_parity((DES_cblock *)des_key);
- #endif
- }
-
-@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */
- }
-
- #else /* USE_CRYPT */
--static des_key_schedule key_schedule;
-+static DES_key_schedule key_schedule;
-
- bool
- DesSetkey(key)
- u_char *key;
- {
-- des_cblock des_key;
-+ DES_cblock des_key;
- MakeKey(key, des_key);
-- des_set_key(&des_key, key_schedule);
-+ DES_set_key(&des_key, &key_schedule);
- return (1);
- }
-
- bool
--DesEncrypt(clear, key, cipher)
-+DesEncrypt(clear, cipher)
- u_char *clear; /* IN 8 octets */
- u_char *cipher; /* OUT 8 octets */
- {
-- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
-- key_schedule, 1);
-+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
-+ &key_schedule, 1);
- return (1);
- }
-
-@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
- u_char *cipher; /* IN 8 octets */
- u_char *clear; /* OUT 8 octets */
- {
-- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
-- key_schedule, 0);
-+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
-+ &key_schedule, 0);
- return (1);
- }
-
diff --git a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
index e3608a0d6..2513021b2 100644
--- a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
+++ b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch
@@ -140,16 +140,17 @@ index 8a12fa0..00a2cf5 100644
if (mfd >= 0) {
int ptn;
if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) {
-@@ -2581,7 +2581,7 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
+@@ -2851,7 +2851,8 @@
if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0)
warn("Couldn't unlock pty slave %s: %m", pty_name);
#endif
- if ((sfd = open(pty_name, O_RDWR | O_NOCTTY)) < 0)
-+ if ((sfd = open(pty_name, O_RDWR | O_NOCTTY | O_CLOEXEC)) < 0)
++
++ if ((sfd = open(pty_name, O_RDWR | O_NOCTTY | O_CLOEXEC)) < 0)
+ {
warn("Couldn't open pty slave %s: %m", pty_name);
- }
- }
-@@ -2592,10 +2592,10 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
+ close(mfd);
+@@ -2865,10 +2866,10 @@
for (i = 0; i < 64; ++i) {
slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x",
'p' + i / 16, i % 16);
diff --git a/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch b/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
new file mode 100644
index 000000000..858769f48
--- /dev/null
+++ b/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
@@ -0,0 +1,35 @@
+commit 8d7970b8f3db727fe798b65f3377fe6787575426
+Author: Paul Mackerras <paulus(a)ozlabs.org>
+Date: Mon Feb 3 15:53:28 2020 +1100
+
+ pppd: Fix bounds check in EAP code
+
+ Given that we have just checked vallen < len, it can never be the case
+ that vallen >= len + sizeof(rhostname). This fixes the check so we
+ actually avoid overflowing the rhostname array.
+
+ Reported-by: Ilja Van Sprundel <ivansprundel(a)ioactive.com>
+ Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org>
+
+diff --git a/pppd/eap.c b/pppd/eap.c
+index 94407f5..1b93db0 100644
+--- a/pppd/eap.c
++++ b/pppd/eap.c
+@@ -1420,7 +1420,7 @@ int len;
+ }
+
+ /* Not so likely to happen. */
+- if (vallen >= len + sizeof (rhostname)) {
++ if (len - vallen >= sizeof (rhostname)) {
+ dbglog("EAP: trimming really long peer name down");
+ BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ rhostname[sizeof (rhostname) - 1] = '\0';
+@@ -1846,7 +1846,7 @@ int len;
+ }
+
+ /* Not so likely to happen. */
+- if (vallen >= len + sizeof (rhostname)) {
++ if (len - vallen >= sizeof (rhostname)) {
+ dbglog("EAP: trimming really long peer name down");
+ BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ rhostname[sizeof (rhostname) - 1] = '\0';
diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
deleted file mode 100644
index d8319c0af..000000000
--- a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c
---- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300
-+++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300
-@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void)
- LoadConfD();
- LoadUserVars();
-
-- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
-- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
-- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
-- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
-- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
-- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
-- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
-- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
-- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
-- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
-+ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true);
-+ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf");
-+ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf");
-+ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf");
-+ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data");
-+ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf");
-+ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf");
-+ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf");
-+ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf");
-+ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf");
-
- cSearchTimerThread::Init(this);
- cSwitchTimerThread::Init();
-diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c
---- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300
-+++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300
-@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
- strcpy(MailAuthUser, "");
- strcpy(MailAuthPass, "");
- strcpy(LastMailConflicts, "");
-- mailViaScript = 1;
-+ mailViaScript = 0;
- manualTimerCheckDefault = 0;
- noAnnounceWhileReplay = 0;
- TimerProgRepeat = 0;
-diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh
---- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300
-+++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300
-@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes
- SVDRPSEND=svdrpsend
-
- # Home of EPGsearch
--EPGSEARCH_HOME="/etc/vdr/plugins"
-+EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
-
- # Video root
--VIDEO_ROOT="/video"
-+VIDEO_ROOT="/var/video"
-
- # do not edit below this line
- #------------------------------------------------------------------------------
-diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh
---- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300
-+++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300
-@@ -15,7 +15,7 @@
- # adjust the following lines to your config
-
- # your plugins config dir
--PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
-+PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
- # path to svdrpsend
- SVDRPSEND=svdrpsend
- # the key used to call epgsearch
-diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh
---- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300
-+++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300
-@@ -15,7 +15,7 @@
- #<Configuration>
-
- # Your timers.conf
--TIMERS="/video/timers.conf"
-+TIMERS="/etc/vdr/timers.conf"
-
- #</Configuration>
-
diff --git a/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
new file mode 100644
index 000000000..99b7a8bcf
--- /dev/null
+++ b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
@@ -0,0 +1,82 @@
+diff -Naur vdr-plugin-epgsearch.org/epgsearch.c vdr-plugin-epgsearch/epgsearch.c
+--- vdr-plugin-epgsearch.org/epgsearch.c 2020-02-16 07:56:33.307310006 +0100
++++ vdr-plugin-epgsearch/epgsearch.c 2020-02-16 07:50:53.826938247 +0100
+@@ -465,16 +465,16 @@
+ LoadConfD();
+ LoadUserVars();
+
+- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
+- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
+- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
+- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
+- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
+- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
+- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
+- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
+- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
+- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
++ ChannelGroups.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchchangrps.conf"), true);
++ Blacklists.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchblacklists.conf"));
++ SearchExts.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearch.conf"));
++ SearchTemplates.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchtemplates.conf"));
++ RecsDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchdone.data"));
++ SwitchTimers.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchswitchtimers.conf"));
++ NoAnnounces.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "noannounce.conf"));
++ DefTimerCheckModes.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "deftimerchkmodes.conf"));
++ TimersDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "timersdone.conf"));
++ PendingNotifications.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "pendingnotifications.conf"));
+
+ cSearchTimerThread::Init(this);
+ cSwitchTimerThread::Init();
+diff -Naur vdr-plugin-epgsearch.org/epgsearchcfg.c vdr-plugin-epgsearch/epgsearchcfg.c
+--- vdr-plugin-epgsearch.org/epgsearchcfg.c 2020-02-16 07:56:33.323310490 +0100
++++ vdr-plugin-epgsearch/epgsearchcfg.c 2020-02-16 07:51:58.065261524 +0100
+@@ -76,7 +76,7 @@
+ strcpy(MailAuthUser, "");
+ strcpy(MailAuthPass, "");
+ strcpy(LastMailConflicts, "");
+- mailViaScript = 1;
++ mailViaScript = 0;
+ manualTimerCheckDefault = 0;
+ noAnnounceWhileReplay = 0;
+ TimerProgRepeat = 0;
+diff -Naur vdr-plugin-epgsearch.org/scripts/recordingdone.sh vdr-plugin-epgsearch/scripts/recordingdone.sh
+--- vdr-plugin-epgsearch.org/scripts/recordingdone.sh 2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/recordingdone.sh 2020-02-16 07:53:37.255598512 +0100
+@@ -60,10 +60,10 @@
+ SVDRPSEND=svdrpsend
+
+ # Home of EPGsearch
+-EPGSEARCH_HOME="/etc/vdr/plugins"
++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch"
+
+ # Video root
+-VIDEO_ROOT="/video"
++VIDEO_ROOT="/var/video"
+
+ # do not edit below this line
+ #------------------------------------------------------------------------------
+diff -Naur vdr-plugin-epgsearch.org/scripts/recrep.sh vdr-plugin-epgsearch/scripts/recrep.sh
+--- vdr-plugin-epgsearch.org/scripts/recrep.sh 2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/recrep.sh 2020-02-16 07:54:21.508751492 +0100
+@@ -15,7 +15,7 @@
+ # adjust the following lines to your config
+
+ # your plugins config dir
+-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
+ # path to svdrpsend
+ SVDRPSEND=svdrpsend
+ # the key used to call epgsearch
+diff -Naur vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh
+--- vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh 2020-02-16 07:56:33.319310370 +0100
++++ vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh 2020-02-16 07:54:58.685432309 +0100
+@@ -15,7 +15,7 @@
+ #<Configuration>
+
+ # Your timers.conf
+-TIMERS="/video/timers.conf"
++TIMERS="/etc/vdr/timers.conf"
+
+ #</Configuration>
+
diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch
deleted file mode 100644
index 2dc5250b4..000000000
--- a/src/patches/vdr-streamdev_recordings-64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c
---- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100
-+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200
-@@ -455,11 +455,11 @@
- return NULL;
-
- char *p = NULL;
-- unsigned long l = strtoul(FileBase, &p, 0);
-+ unsigned long long l = strtoull(FileBase, &p, 0);
- if (p != FileBase && l > 0L) {
- if (*p == ':') {
- // get recording by dev:inode
-- unsigned long inode = strtoul(p + 1, &p, 0);
-+ unsigned long long inode = strtoull(p + 1, &p, 0);
- if (*p == 0 && inode > 0) {
- struct stat st;
- cThreadLock RecordingsLock(&Recordings);
-diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c
---- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100
-+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200
-@@ -28,7 +28,7 @@
- {
- struct stat st;
- if (stat(current->FileName(), &st) == 0)
-- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino);
-+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino);
- return "";
- }
-
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5ad31551cd8e22b9dcf19739e4369969514bdca8
by Arne Fitzenreiter 25 Feb '20
by Arne Fitzenreiter 25 Feb '20
25 Feb '20
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, next has been updated
via 5ad31551cd8e22b9dcf19739e4369969514bdca8 (commit)
via f0e61c20b15ff13f90b4f776c9db90a28edd7107 (commit)
from 46ac0498640767683dc8d6dee791e7426f4e6f2b (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 5ad31551cd8e22b9dcf19739e4369969514bdca8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 20:38:19 2020 +0000
dnsdist: a compile thread needs two gigabyte of ram
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f0e61c20b15ff13f90b4f776c9db90a28edd7107
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 20:35:57 2020 +0000
core142: replace "pakfire remove"
i have cut and paste this from older core but its not working
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/142/update.sh | 5 ++++-
lfs/dnsdist | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh
index 9f06f4e95..581e8fd19 100644
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -104,7 +104,10 @@ for package in arm bitstream multicat check_mk_agent directfb \
icecast icegenerator rtpproxy streamripper \
cyrus-imapd; do
if [ -e /opt/pakfire/db/installed/meta-$package ]; then
- pakfire remove -y $package
+ stop_service $package
+ for i in $(cat /opt/pakfire/db/rootfiles/$package); do
+ rm -rfv /${i}
+ done
fi
rm -f /opt/pakfire/db/installed/meta-$package
rm -f /opt/pakfire/db/meta/meta-$package
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 89a14f737..30eba4673 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -37,7 +37,7 @@ PAK_VER = 4
DEPS = ""
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048)))
###############################################################################
# Top-level Rules
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 46ac0498640767683dc8d6dee791e7426f4e6f2b
by Arne Fitzenreiter 25 Feb '20
by Arne Fitzenreiter 25 Feb '20
25 Feb '20
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, next has been updated
via 46ac0498640767683dc8d6dee791e7426f4e6f2b (commit)
from 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65 (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 46ac0498640767683dc8d6dee791e7426f4e6f2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 06:55:30 2020 +0000
core142: remove dropped packages
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/142/update.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
Difference in files:
diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh
index 7f23ff1cc..9f06f4e95 100644
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -99,6 +99,18 @@ mv -f /etc/rc.d/init.d/netowrking/red.up/05-update-dns-forwarders \
# update linker config
ldconfig
+# remove dropped packages
+for package in arm bitstream multicat check_mk_agent directfb \
+ icecast icegenerator rtpproxy streamripper \
+ cyrus-imapd; do
+ if [ -e /opt/pakfire/db/installed/meta-$package ]; then
+ pakfire remove -y $package
+ fi
+ rm -f /opt/pakfire/db/installed/meta-$package
+ rm -f /opt/pakfire/db/meta/meta-$package
+ rm -f /opt/pakfire/db/rootfiles/$package
+done
+
# Update Language cache
/usr/local/bin/update-lang-cache
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65
by Arne Fitzenreiter 25 Feb '20
by Arne Fitzenreiter 25 Feb '20
25 Feb '20
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, next has been updated
via 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65 (commit)
from 712425ff0bbe96700de5a1b865d58730ba9c6b90 (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 1b68fc29b4df4880ca4761cdb036d1b6aac8ab65
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 25 06:41:14 2020 +0000
core142: fix typo
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/142/filelists/files | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 69d6eb7bc..4d6c69adb 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -9,7 +9,7 @@ lib/udev/network-hotplug-bridges
opt/pakfire/etc/pakfire.conf
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/dns.cgi
-srv/web/ipfire/cgi-bin/fireingo.cgi
+srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/suricata/ruleset-sources
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 712425ff0bbe96700de5a1b865d58730ba9c6b90
by Arne Fitzenreiter 24 Feb '20
by Arne Fitzenreiter 24 Feb '20
24 Feb '20
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, next has been updated
via 712425ff0bbe96700de5a1b865d58730ba9c6b90 (commit)
via 6cd35da57ecf795a51d61cd848df77e6dd5fbd97 (commit)
via fd90cadc97559b1d78c202d5560a93a3ecabef5a (commit)
from 5cbcd514def1b63606d2139634a4f7a31af89205 (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 712425ff0bbe96700de5a1b865d58730ba9c6b90
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 24 18:51:24 2020 +0000
pakfire: Re-install previous core update when in testing mode
Fixes: #12302
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Tested-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6cd35da57ecf795a51d61cd848df77e6dd5fbd97
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 24 19:20:12 2020 +0000
core142: ship updated fireinfo.cgi
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fd90cadc97559b1d78c202d5560a93a3ecabef5a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 23 16:13:46 2020 +0100
fireinfo.cgi: Use pakfire lib to gather the pakfire version.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/142/filelists/files | 1 +
html/cgi-bin/fireinfo.cgi | 3 ++-
src/pakfire/lib/functions.pl | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 12df9c26d..69d6eb7bc 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -9,6 +9,7 @@ lib/udev/network-hotplug-bridges
opt/pakfire/etc/pakfire.conf
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/fireingo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/suricata/ruleset-sources
diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 08fee3d8a..967e250c7 100644
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -28,6 +28,7 @@ use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+require '/opt/pakfire/lib/functions.pl';
my $configfile = "/var/ipfire/main/send_profile";
@@ -84,7 +85,7 @@ if ($errormessage) {
}
my $ipfire_version = `cat /etc/system-release`;
-my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+my $pakfire_version = &Pakfire::make_version();
my $kernel_version = `uname -a`;
&Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'});
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index ddb1e9aad..45e3427b1 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -768,6 +768,12 @@ sub upgradecore {
getcoredb("noforce");
eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
if ("$core_release" > "$Conf::core_mine") {
+ # Safety check for lazy testers:
+ # Before we upgrade to the latest release, we re-install the previous release
+ # to make sure that the tester has always been on the latest version.
+ my $tree = &get_tree();
+ $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable");
+
message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release");
my @seq = `seq $Conf::core_mine $core_release`;
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5cbcd514def1b63606d2139634a4f7a31af89205
by Arne Fitzenreiter 22 Feb '20
by Arne Fitzenreiter 22 Feb '20
22 Feb '20
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, next has been updated
via 5cbcd514def1b63606d2139634a4f7a31af89205 (commit)
from 8d43248794b1abadf6e1c519b79a05bd5e64467c (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 5cbcd514def1b63606d2139634a4f7a31af89205
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Feb 22 15:02:24 2020 +0100
ppp: Add upstream patch to fix bounds check in EAP code.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/ppp | 1 +
...p-2.4.8-pppd-fix-bounds-check-in-eap-code.patch | 35 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
Difference in files:
diff --git a/lfs/ppp b/lfs/ppp
index 607765bd0..cbac95067 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)"
diff --git a/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch b/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
new file mode 100644
index 000000000..858769f48
--- /dev/null
+++ b/src/patches/ppp/ppp-2.4.8-pppd-fix-bounds-check-in-eap-code.patch
@@ -0,0 +1,35 @@
+commit 8d7970b8f3db727fe798b65f3377fe6787575426
+Author: Paul Mackerras <paulus(a)ozlabs.org>
+Date: Mon Feb 3 15:53:28 2020 +1100
+
+ pppd: Fix bounds check in EAP code
+
+ Given that we have just checked vallen < len, it can never be the case
+ that vallen >= len + sizeof(rhostname). This fixes the check so we
+ actually avoid overflowing the rhostname array.
+
+ Reported-by: Ilja Van Sprundel <ivansprundel(a)ioactive.com>
+ Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org>
+
+diff --git a/pppd/eap.c b/pppd/eap.c
+index 94407f5..1b93db0 100644
+--- a/pppd/eap.c
++++ b/pppd/eap.c
+@@ -1420,7 +1420,7 @@ int len;
+ }
+
+ /* Not so likely to happen. */
+- if (vallen >= len + sizeof (rhostname)) {
++ if (len - vallen >= sizeof (rhostname)) {
+ dbglog("EAP: trimming really long peer name down");
+ BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ rhostname[sizeof (rhostname) - 1] = '\0';
+@@ -1846,7 +1846,7 @@ int len;
+ }
+
+ /* Not so likely to happen. */
+- if (vallen >= len + sizeof (rhostname)) {
++ if (len - vallen >= sizeof (rhostname)) {
+ dbglog("EAP: trimming really long peer name down");
+ BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ rhostname[sizeof (rhostname) - 1] = '\0';
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8d43248794b1abadf6e1c519b79a05bd5e64467c
by Arne Fitzenreiter 21 Feb '20
by Arne Fitzenreiter 21 Feb '20
21 Feb '20
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, next has been updated
via 8d43248794b1abadf6e1c519b79a05bd5e64467c (commit)
from 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 (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 8d43248794b1abadf6e1c519b79a05bd5e64467c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 21 22:33:23 2020 +0100
w_scan: fix country and satalite selection menu
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/w_scan/w_scan_start | 13 +++++++------
lfs/w_scan | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
Difference in files:
diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
index c424f5f14..26527b41a 100755
--- a/config/w_scan/w_scan_start
+++ b/config/w_scan/w_scan_start
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -19,9 +19,10 @@
# #
###############################################################################
###############################################################################
-# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc #
-# - 2013-04-20 Arne Fitzenreiter - path vdr 2 #
-# - 2012-11-15 Arne Fitzenreiter - inital vers.#
+# w_scan_start - 2020-02-21 Arne Fitzenreiter - update for 2017 wscan version #
+# - 2013-04-30 Arne Fitzenreiter - add atsc #
+# - 2013-04-20 Arne Fitzenreiter - path vdr 2 #
+# - 2012-11-15 Arne Fitzenreiter - inital vers. #
###############################################################################
err_msg ()
@@ -82,7 +83,7 @@ if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_S
# Generate and run separate country menubox and default germany
echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh
echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh
- $WSCAN -c? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh
+ $WSCAN -c? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh
echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh
sh /tmp/w_scan_countryselect.sh
chk_cancel
@@ -95,7 +96,7 @@ if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
# Generate and run separate satelite menubox and default astra
echo '#!/bin/bash' > /tmp/w_scan_satselect.sh
echo 'whiptail --checklist "\nSelect satellites" 19 70 10 \' >> /tmp/w_scan_satselect.sh
- $WSCAN -s? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh
+ $WSCAN -s? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh
echo ' 2>/tmp/w_scan_satellite' >> /tmp/w_scan_satselect.sh
sh /tmp/w_scan_satselect.sh
chk_cancel
diff --git a/lfs/w_scan b/lfs/w_scan
index ecc196845..4b5229c3e 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 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 #
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = w_scan
-PAK_VER = 6
+PAK_VER = 7
DEPS = ""
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9
by Arne Fitzenreiter 21 Feb '20
by Arne Fitzenreiter 21 Feb '20
21 Feb '20
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, next has been updated
via 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 (commit)
from 1eef496d47de2136929254b491f9b60fe6f8d5fc (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 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 21 09:26:36 2020 +0100
u-boot: split rpi aarch64 quirk into parts
on of the changed variables was used before the old quirk.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/u-boot/boot.cmd | 13 ++++++++++---
config/u-boot/boot.scr | Bin 2736 -> 2915 bytes
2 files changed, 10 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index b2fe0684f..3517fe946 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -15,7 +15,7 @@ if test ${cpu} = "armv8"; then
echo ;
else
setenv kernel_type -multi;
- fi;
+fi;
# Import uEnv txt...
if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then
@@ -34,6 +34,14 @@ if test "${board}" = "sunxi"; then
setenv fdtfile ${DTBSUNXI};
fi;
+# Quirk for RPi on aarch64 becuase u-boot cannot use the
+# initrd on aarch64 and without ramdisk no UUID
+if test ${cpu} = "armv8"; then
+ if test ${board} = "rpi"; then
+ setenv root_dev /dev/mmcblk0p3;
+ fi;
+fi;
+
# Check if serial console is enabled
if test "${SERIAL-CONSOLE}" = "ON"; then
if test ${console} = ""; then
@@ -93,8 +101,7 @@ fi;
# initrd on aarch64
if test ${cpu} = "armv8"; then
if test ${board} = "rpi"; then
- setenv ramdisk_addr -;
- setenv root_dev /dev/mmcblk0p3;
+ setenv ramdisk_addr -;
fi;
fi;
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index d7b604849..7fde534e3 100644
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
hooks/post-receive
--
IPFire 2.x development tree
1
0