[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0

16 Dec 2022

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 3.x development tree".
The branch, master has been updated
       via  3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0 (commit)
       via  025fddde11d065d96c1315a2bb6510977a62c93a (commit)
       via  6dce0e4cc7290a963f4e1985e47d32e26505c243 (commit)
       via  4c2ac9b955523416030467f9822268c93f63077c (commit)
       via  4eed0041ab7fcfa5880ab65dab14e689dfa44a45 (commit)
       via  10f472d04f7cfcfa66cdc8673bde52d16c9a9555 (commit)
       via  11604d3a631af647382dd6c95eb7a65f2804e356 (commit)
       via  c948329b14cdd86ba2a0a8e7b398c8ca6266dab3 (commit)
       via  52653ac455b4d249314e90e96a9c3f5d5ca25fcc (commit)
       via  d9b1e5cf5f59d08e611b7a2fb25ee2f66ebc12fa (commit)
       via  688bdeec39d26bac00c5f1328e12e60881038ab6 (commit)
       via  8653ff5748997967f8d2e92a933e003d1ffcabc1 (commit)
       via  e7079cd770bf66783156583854c5f9f7ee1dabfe (commit)
       via  6692d36376332a482402510a2db54dd3bf5b0f21 (commit)
       via  23426a606f8f063ee430927c097ddd98feede6c5 (commit)
       via  6d2de241f19e5028e3fd10c242f6019a471df853 (commit)
       via  5a9cbae16b29ccc77abf13955d91dbbc9306b239 (commit)
       via  69d3ef88fbbfdbf5e577b376defaa6c88e5e2215 (commit)
       via  69344f2bee56d76bfb648e668a9af814d668d292 (commit)
       via  da4ad94809d8e90e72a7f6134f3a196e7dc7a92a (commit)
       via  843c96e324b110e42a6fd65198851e560068f762 (commit)
       via  414fa1419aa82327dbb1dbd99fe9b1ebb9346aaf (commit)
       via  f92aff060c8401429fd6182a18635785ecde7b6a (commit)
       via  0a14926108bde241c52bbbccc685a43a39dad96c (commit)
       via  ac21502fc2e09c8ca9e639258e8b6328f6531c43 (commit)
       via  8055a586b88694dbbc12ddb34477131f9baf4321 (commit)
       via  6fe31a44d07d8705ca7713c449ccbb3dbb9684a0 (commit)
       via  365cb5203aae4c16e381f34da8de9798f341c6f2 (commit)
       via  507ff9c38a8cf0639bfc7f00339f5877074accfa (commit)
       via  01543109ec90c284b20cda0e74c96c4c136e9c05 (commit)
       via  2e239be91e2ecb5c8e723db9b51e53528c62e058 (commit)
       via  344efdbfdc9c6725594970a080d095f3184b51f7 (commit)
       via  c067772a087376ce6a2fc214e06057649af43da0 (commit)
       via  61842ff05003cf1af2075c462dc0c3d9d777ce26 (commit)
       via  5e011eb59eaedc4a703e1f7bf8471c346f26957f (commit)
       via  dcfddfafcd6ae6ae62ed1e8f33c614162e401da2 (commit)
       via  839abee5ac1bc61388cee0b940a11e822cc35b7f (commit)
       via  561285e4cf310a47680d5fec9e22994ff0be872b (commit)
       via  e73f228b5d7445829fea28b23cb44fc01ed0c017 (commit)
       via  575d0a8754a55004d2704388fb4e0661864d07c3 (commit)
       via  6dd0eca70422076194bf10282977af343f13fe19 (commit)
       via  163e20d8cdc7d04fb93a3b7772315192fafa3796 (commit)
       via  49242a5661a550b370fff56f893df0983700ef32 (commit)
       via  88d75a2b81ede9fb24f20beefaae4227f8eb16ab (commit)
       via  2d64b6c3a0bc9d9a6ff1ee19e16e37de08e1c766 (commit)
       via  72a46760aa85ba021f581626c7770738459644b7 (commit)
       via  56edf0870aec70b8d798322c84b2bc153c4fe308 (commit)
       via  e61ec8d3052951da15da5a54c35440b3322091e3 (commit)
       via  c36f92723a727a1f6366b5d27f5cd2eac106a3cc (commit)
       via  8cdd5bc1fa4f38a75a202e92f2fb0d946c84f9cc (commit)
       via  445b5561bcd7ad84f684565e538b09b0b44f5701 (commit)
       via  9c77f06c78524f22f188376a942f0d8b4a7c2c3f (commit)
       via  ae2262bf736b9ea1558a522d4b6bc7f4e583344e (commit)
       via  472fb5fa6b1f77a2166407a8936fda6c8cbdb80b (commit)
       via  79c261934990d0239cf7d51f7980d937bc4ff9f3 (commit)
       via  48931178ff83911c5bbc86194dea694845ae1608 (commit)
       via  f6d485e51a9fba1d787553d6a30d2c2f1a075652 (commit)
       via  7b518e96ab3d49797158b1131750cb4b2a34eed1 (commit)
       via  d86661fd43c20cd917a1e64ca7d89e341c6c6520 (commit)
       via  c5a0ffd85fc40a2b6a73152bf3562ad13ff991cd (commit)
       via  a3371197269ce3df78bd84d0da65afc3c61ed27d (commit)
       via  aea3e8471c0c11d4a5a1164efbe7c7c948667b6e (commit)
       via  efe0eb2ccfb0f887b2b3f27f131e81139fcb98bf (commit)
       via  1688d420e2ec0a0aad17084f6e75c6af8cb8fbde (commit)
       via  536ea2db5b32ab55d827bf1250e90ece49a85766 (commit)
       via  8f9a789a7cc119781367a8f7c5e2db9214aedc3c (commit)
       via  1e08abdd38778e883624a50dae1e6d792ede6c8e (commit)
       via  a63f4bd2ce916cec351c43f7a184f687fd529a72 (commit)
       via  b46f65b88b4625929e5c7e637c8ba66142683d20 (commit)
       via  2487038703ad6509202ffc16804cd17755dd5ad5 (commit)
       via  712cc1ea35872df1e59f01a735c598a3917c6a02 (commit)
       via  86fae9ec23242191fcb160184ad836d7cf0bd09a (commit)
       via  c4d1dcfca1be744f555860c4f17f1cd597f2a701 (commit)
       via  3d9d44ddaec6b32eaa5c0fc6470ec61d23e61f92 (commit)
       via  f51bf39207cf3f9bf5cc52ae30c10e22f487015a (commit)
       via  3159f8b48a68f8c85b455876e705b97b48aae973 (commit)
       via  09f86054d78e905224429348e39565b977bd51f1 (commit)
       via  6aea180b26906f001611dcc0c54f494818069d8c (commit)
       via  a3776d8aee67369dcff8ea091bc8b785dc2d6647 (commit)
       via  04859b28914ee493ff5438696b2ef155ae972e0f (commit)
       via  8bec5c3948cd7b2f69f9df7e057c1f66ec38d23a (commit)
       via  ad220c70636b96be979d79a4e29bd88904d68808 (commit)
       via  f05d9a85959ff9fed5f3d1bbe3bacdff8ca1a145 (commit)
       via  1350134bfa7470bfd83543cfcabf49bf67992ef4 (commit)
       via  831bb8951d0cf310a19a27b958c624207766ed12 (commit)
       via  62947c45b2c24f7bb24c72d78d9100c177078a76 (commit)
       via  5bc5c239c340f56e454ae7b2e2e0033682f118a0 (commit)
      from  ebd7ac70091a2eb74c2672fe635959ce61a4594b (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 3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:57:32 2022 +0000
passwd: Update to 0.80
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 025fddde11d065d96c1315a2bb6510977a62c93a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:55:47 2022 +0000
bzip2: Update to 1.0.8
This patch also splits the library into a separate package.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6dce0e4cc7290a963f4e1985e47d32e26505c243
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:48:22 2022 +0000
kernel: Create a -debuginfo package for the tools
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4c2ac9b955523416030467f9822268c93f63077c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:28:05 2022 +0000
MAKEDEV: Drop package
Nothing has ever used this I think.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4eed0041ab7fcfa5880ab65dab14e689dfa44a45
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:23:38 2022 +0000
asciidoc: Fix build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 10f472d04f7cfcfa66cdc8673bde52d16c9a9555
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:16:29 2022 +0000
ppp: Update to 2.4.9
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 11604d3a631af647382dd6c95eb7a65f2804e356
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:08:31 2022 +0000
wpa_supplicant: Depend on network without epoch
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c948329b14cdd86ba2a0a8e7b398c8ca6266dab3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:02:34 2022 +0000
batctl: Drop package
We currently do not have B.A.T.M.A.N. enabled in our kernel, so this
    tools is not of much use.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 52653ac455b4d249314e90e96a9c3f5d5ca25fcc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 17:01:30 2022 +0000
upower: Drop package
I don't think that we need to worry about battery-powered firewalls
    right now.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d9b1e5cf5f59d08e611b7a2fb25ee2f66ebc12fa
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:58:12 2022 +0000
openldap: Update to 2.6.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 688bdeec39d26bac00c5f1328e12e60881038ab6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:57:29 2022 +0000
cyrus-sasl: Update to 2.1.28
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8653ff5748997967f8d2e92a933e003d1ffcabc1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:56:45 2022 +0000
tftp: Drop package
This is probably not needed right now, and tftp is pretty much out of
    fashion.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e7079cd770bf66783156583854c5f9f7ee1dabfe
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:52:20 2022 +0000
libpwquality: Update to 1.4.5
The project has moved to GitHub.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6692d36376332a482402510a2db54dd3bf5b0f21
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:39:03 2022 +0000
cracklib: Remove Python module
The Python module does not build with Python 3 and we do not need it
    anyways. So this patch disables it.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 23426a606f8f063ee430927c097ddd98feede6c5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:24:25 2022 +0000
audit: Drop package
This package is not very useful as we do not have any sources
    configured, nor do we have the audit subsystem enabled in the kernel.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6d2de241f19e5028e3fd10c242f6019a471df853
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:23:24 2022 +0000
Drop epoch from all files
We are having a fresh start, so let's use it for better version numbers.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5a9cbae16b29ccc77abf13955d91dbbc9306b239
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:20:08 2022 +0000
ipfire-release: Install pakfire by default and try to install vim
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 69d3ef88fbbfdbf5e577b376defaa6c88e5e2215
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:19:10 2022 +0000
ipfire-release: No longer install pakfire-build into the build environment
Pakfire does not need any internal components any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 69344f2bee56d76bfb648e668a9af814d668d292
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:16:49 2022 +0000
newt: Fix build against Python 3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit da4ad94809d8e90e72a7f6134f3a196e7dc7a92a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:08:21 2022 +0000
python3-gobject3: Update to 3.42.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 843c96e324b110e42a6fd65198851e560068f762
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:06:37 2022 +0000
gobject-introspection: Update to 1.74.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 414fa1419aa82327dbb1dbd99fe9b1ebb9346aaf
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:04:57 2022 +0000
python3-cairo: Update to 1.23.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f92aff060c8401429fd6182a18635785ecde7b6a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 16:03:05 2022 +0000
avahi: Update to 0.8
Drop dependency to Python 2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0a14926108bde241c52bbbccc685a43a39dad96c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 15:40:26 2022 +0000
rrdtool: Update to 1.8.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ac21502fc2e09c8ca9e639258e8b6328f6531c43
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 15:27:11 2022 +0000
cairo: Update to 1.16.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8055a586b88694dbbc12ddb34477131f9baf4321
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Dec 16 15:04:40 2022 +0000
python3-dbus: Update to 1.3.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6fe31a44d07d8705ca7713c449ccbb3dbb9684a0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 17:35:29 2022 +0000
kernel: Disable all sorts of useless Device Mapper targets
This patch also compiles all sorts of device mapper stuff as modules.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 365cb5203aae4c16e381f34da8de9798f341c6f2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 17:29:37 2022 +0000
kernel: Disable support for floppy drives and block ramdisks
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 507ff9c38a8cf0639bfc7f00339f5877074accfa
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 17:25:35 2022 +0000
kernel: Enable modern features of the block layer
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 01543109ec90c284b20cda0e74c96c4c136e9c05
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 16:57:38 2022 +0000
kernel: Disable the Distributed Lock Manager
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2e239be91e2ecb5c8e723db9b51e53528c62e058
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 16:53:26 2022 +0000
kernel: Enable support for ExFAT & NTFS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 344efdbfdc9c6725594970a080d095f3184b51f7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 16:48:45 2022 +0000
kernel: Enable support for Hyper-V across the board
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c067772a087376ce6a2fc214e06057649af43da0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 15 15:50:02 2022 +0000
kernel: Disable I3C
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 61842ff05003cf1af2075c462dc0c3d9d777ce26
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 20:02:45 2022 +0000
kernel: Update Ethernet driver configuration
Enable what hasn't been enabled before, and disable PIO mode where
    possible.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5e011eb59eaedc4a703e1f7bf8471c346f26957f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 18:32:33 2022 +0000
kernel: Merge aarch64 & x86_64
This only sync configuration that seems to have been different between
    those two architectures for no reason.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dcfddfafcd6ae6ae62ed1e8f33c614162e401da2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 18:12:08 2022 +0000
kernel: Compile EHCI/OHCI/UHCI support as modules
The USB core will always be compiled into the kernel (because I believe
    that we have virtually no systems which won't have a USB bus).
The others will only be loaded when necessary.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 839abee5ac1bc61388cee0b940a11e822cc35b7f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 18:04:39 2022 +0000
kernel: Compile the entire SCSI subsystem as modules
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 561285e4cf310a47680d5fec9e22994ff0be872b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 17:40:35 2022 +0000
kernel: Compile the ATA subsystem as a module
It probably was a good assumption to compile this in, but since more
    hardware is using NVMe, I think this might not be used on all systems
    any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e73f228b5d7445829fea28b23cb44fc01ed0c017
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 17:39:12 2022 +0000
kernel: Compile the MMC subsystem as a module
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 575d0a8754a55004d2704388fb4e0661864d07c3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 17:37:30 2022 +0000
kernel: Disable the multimedia subsystem
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6dd0eca70422076194bf10282977af343f13fe19
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 17:32:56 2022 +0000
kernel: Enable all supported platforms for ARM
These are the platforms that are currently supported in IPFire 2 and
    their depending drivers.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 163e20d8cdc7d04fb93a3b7772315192fafa3796
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:23:57 2022 +0000
kernel: Disable overloading ACPI methods
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 49242a5661a550b370fff56f893df0983700ef32
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:21:04 2022 +0000
kernel: Wipe all memory when rebooting on EFI
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 88d75a2b81ede9fb24f20beefaae4227f8eb16ab
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:18:39 2022 +0000
kernel: Wipe all caller-used registers on exit from the function
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2d64b6c3a0bc9d9a6ff1ee19e16e37de08e1c766
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:14:18 2022 +0000
kernel: Make the scheduler aware of SMT
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 72a46760aa85ba021f581626c7770738459644b7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:12:13 2022 +0000
kernel: Trust the CPU's RNG
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 56edf0870aec70b8d798322c84b2bc153c4fe308
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:10:21 2022 +0000
kernel: Enable all TPM devices
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e61ec8d3052951da15da5a54c35440b3322091e3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:08:09 2022 +0000
kernel: Enable IOMMU and set it to strict mode
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c36f92723a727a1f6366b5d27f5cd2eac106a3cc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 16:04:03 2022 +0000
kernel: Improve memory hardening with KFENCE
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8cdd5bc1fa4f38a75a202e92f2fb0d946c84f9cc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:53:51 2022 +0000
kernel: Enable Kernel Lockdown in Confidentiality Mode
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 445b5561bcd7ad84f684565e538b09b0b44f5701
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:50:37 2022 +0000
kernel: Set HZ=100
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9c77f06c78524f22f188376a942f0d8b4a7c2c3f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:43:57 2022 +0000
kernel: Enable cpufreq support for AMD processors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ae2262bf736b9ea1558a522d4b6bc7f4e583344e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:40:33 2022 +0000
kernel: Enable support for all sorts of ACPI components
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 472fb5fa6b1f77a2166407a8936fda6c8cbdb80b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:32:32 2022 +0000
kernel: Disable some character devices that do not make sense
Like vibrators.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 79c261934990d0239cf7d51f7980d937bc4ff9f3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:27:22 2022 +0000
kernel: Make graphics configruation sane
This patch disables lots of legacy hardware that should not be found in
    the IPFire context and enables any modern GPUs.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 48931178ff83911c5bbc86194dea694845ae1608
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:19:38 2022 +0000
kernel: Disable syscalls that allows processes to r/w other processes' memory
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f6d485e51a9fba1d787553d6a30d2c2f1a075652
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:14:14 2022 +0000
kernel: Mount devtmpfs with noexec, etc.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7b518e96ab3d49797158b1131750cb4b2a34eed1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 15:11:06 2022 +0000
kernel: Enable/disable (mainly wireless) network hardware
This patch enables modules for various modern WiFi/WWAN devices, and
    disables support for devices that are not supported by us any more (i.e.
    802.11b only cards).
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d86661fd43c20cd917a1e64ca7d89e341c6c6520
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 14:22:52 2022 +0000
kernel: Enable WireGuard
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c5a0ffd85fc40a2b6a73152bf3562ad13ff991cd
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 11:34:55 2022 +0000
kernel: Enable SLS on x86
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a3371197269ce3df78bd84d0da65afc3c61ed27d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 11:29:43 2022 +0000
kernel: Disable option to execute 32 bit binaries
Since we are a 64 bit only distribution, there is no need to compile in
    any support for 32 bit binaries.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit aea3e8471c0c11d4a5a1164efbe7c7c948667b6e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 11:09:11 2022 +0000
kernel: Compile binfmt_misc as a module
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit efe0eb2ccfb0f887b2b3f27f131e81139fcb98bf
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 11:07:04 2022 +0000
kernel: Disable /dev/mem
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1688d420e2ec0a0aad17084f6e75c6af8cb8fbde
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 11:04:36 2022 +0000
kernel: Build all HWRNGs as modules
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 536ea2db5b32ab55d827bf1250e90ece49a85766
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:59:29 2022 +0000
kernel: Do not automatically load TTY line disciplines
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8f9a789a7cc119781367a8f7c5e2db9214aedc3c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:58:04 2022 +0000
kernel: Enable Yama
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1e08abdd38778e883624a50dae1e6d792ede6c8e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:54:15 2022 +0000
kernel: Enable Landlock
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a63f4bd2ce916cec351c43f7a184f687fd529a72
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:34:58 2022 +0000
kernel: Build all library routines as modules and disable self-tests
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b46f65b88b4625929e5c7e637c8ba66142683d20
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:31:14 2022 +0000
kernel: Build BTRFS as a module
I am not sure why I built it into the kernel as it pulls in lots of
    other stuff which will probably make the kernel image really large.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2487038703ad6509202ffc16804cd17755dd5ad5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:27:18 2022 +0000
kernel: Enable various modern ciphers/hashes/etc. and acceleration
Most of them have been added in recent kernel releases, but since we
    have not been running "make oldconfig" for each of them, they have not
    been enabled by default.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 712cc1ea35872df1e59f01a735c598a3917c6a02
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Dec 14 10:20:23 2022 +0000
kernel: Enable parallel crypto by default
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 86fae9ec23242191fcb160184ad836d7cf0bd09a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 18:13:34 2022 +0000
kernel: Disable the entire framebuffer subsystem
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c4d1dcfca1be744f555860c4f17f1cd597f2a701
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 18:05:17 2022 +0000
kernel: Disable bcache
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3d9d44ddaec6b32eaa5c0fc6470ec61d23e61f92
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 18:03:32 2022 +0000
kernel: Disable the entire PCMCIA/CardBus subsystem
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f51bf39207cf3f9bf5cc52ae30c10e22f487015a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:56:40 2022 +0000
kernel: Disable all connection tracking helper modules
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3159f8b48a68f8c85b455876e705b97b48aae973
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:53:47 2022 +0000
kernel: Drop the entire xtables subsystem
This is being replaced by nf_tables.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 09f86054d78e905224429348e39565b977bd51f1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:44:42 2022 +0000
kernel: Enable RANDSTRUCT plugin
This is currently configured to performance mode in order to avoid too
    much performance impact.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6aea180b26906f001611dcc0c54f494818069d8c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:40:28 2022 +0000
kernel: Disable the latent entropy plugin
It does not generate cryptographically secure entropy.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a3776d8aee67369dcff8ea091bc8b785dc2d6647
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:32:37 2022 +0000
kernel: Compress the kernel, modules and firmware using Zstandard
Zstandard is an ideal compression algorithm with great performance for
    this purpose. The kernel is still able to load firmware compressed using
    XZ and ramdisks compressed with various other algorirthms.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 04859b28914ee493ff5438696b2ef155ae972e0f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:27:27 2022 +0000
kernel: Cryptographically sign all kernel modules
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8bec5c3948cd7b2f69f9df7e057c1f66ec38d23a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:21:46 2022 +0000
kernel: Enabel zswap by default using LZ4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ad220c70636b96be979d79a4e29bd88904d68808
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 17:04:32 2022 +0000
kernel: Enable support for SquashFS
We require this for our installer live system.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f05d9a85959ff9fed5f3d1bbe3bacdff8ca1a145
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Dec 13 16:44:12 2022 +0000
kernel: Refactor configure script
This patch removes support for "platforms" and "sub-platforms" which we
    won't need any more.
Instead, configuration files are now called by their architecture name
    and flavour. The "generic" flavour is the default flavour and any other
    flavours for the same architecture will be based on it.
There are no changes to the configuration files in this patch.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1350134bfa7470bfd83543cfcabf49bf67992ef4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Dec 12 17:21:04 2022 +0000
Replace ":=" with "=" as Pakfire doesn't support this any more
Fixes: #13001
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 831bb8951d0cf310a19a27b958c624207766ed12
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Dec 5 20:55:22 2022 +0100
libjpeg: Update to 2.1.4
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 62947c45b2c24f7bb24c72d78d9100c177078a76
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Dec 5 20:24:11 2022 +0100
libtiff: Update to 4.4.0.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5bc5c239c340f56e454ae7b2e2e0033682f118a0
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Dec 5 21:03:39 2022 +0100
shared-mime-info: New package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 MAKEDEV/MAKEDEV.nm                                 |   63 -
 MAKEDEV/makedev.d.5                                |  180 --
 asciidoc/asciidoc.nm                               |   23 +-
 audit/audit.nm                                     |  100 -
 audit/systemd/auditd.service                       |   11 -
 avahi/avahi.nm                                     |   33 +-
 basesystem/basesystem.nm                           |    1 -
 batctl/batctl.nm                                   |   38 -
 bzip2/bzip2.nm                                     |   26 +-
 bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0   |   25 -
 bzip2/patches/bzip2-1.0.6-saneso.patch0            |   13 -
 bzip2/patches/bzip2-saneso.patch                   |   12 +
 cairo/cairo.nm                                     |    8 +-
 compat-db/compat-db.nm                             |    2 +-
 cracklib/cracklib.nm                               |   25 +-
 cyrus-sasl/cyrus-sasl.nm                           |   27 +-
 gobject-introspection/gobject-introspection.nm     |   29 +-
 initscripts/initscripts.nm                         |    1 -
 ipfire-release/ipfire-release.nm                   |   14 +-
 kbd/kbd.nm                                         |    1 -
 ...config-arm64-generic => config-aarch64-generic} |  767 +++--
 kernel/config-generic                              | 2008 ++++---------
 .../{config-x86-generic => config-x86_64-generic}  |  324 +--
 kernel/kernel.nm                                   |   23 +-
 kernel/scripts/configure                           |  460 +--
 libjpeg/libjpeg.nm                                 |   26 +-
 libpwquality/libpwquality.nm                       |    8 +-
 libtiff/libtiff.nm                                 |   14 +-
 mc/mc.nm                                           |    1 -
 network/network.nm                                 |    1 -
 newt/newt.nm                                       |   10 +-
 openldap/openldap.nm                               |    8 +-
 .../patches/openldap-2.4.17-disable_sys_err.patch  |   17 -
 openssh/openssh.nm                                 |    3 +-
 passwd/passwd.nm                                   |   19 +-
 perl-libwww-perl/perl-libwww-perl.nm               |    1 -
 ...ild-sys-use-gcc-as-our-compiler-of-choice.patch |   25 -
 .../0002-build-sys-enable-PAM-support.patch        |   25 -
 ...tilize-compiler-flags-handed-to-us-by-rpm.patch |  121 -
 .../0004-doc-add-configuration-samples.patch       |  341 ---
 ...on-t-hardcode-LIBDIR-but-set-it-according.patch |  120 -
 ...6-scritps-use-change_resolv_conf-function.patch |   85 -
 ...-don-t-strip-binaries-during-installation.patch |  111 -
 ...d-sys-use-prefix-usr-instead-of-usr-local.patch |   89 -
 .../0009-pppd-introduce-ipv6-accept-remote.patch   |   57 -
 ppp/patches/0010-build-sys-enable-CBCP.patch       |   26 -
 ...s-don-t-put-connect-errors-log-to-etc-ppp.patch |   77 -
 ...pd-we-don-t-want-to-accidentally-leak-fds.patch |  143 -
 ppp/patches/0013-everywhere-O_CLOEXEC-harder.patch |  241 --
 ...ere-use-SOCK_CLOEXEC-when-creating-socket.patch |  174 --
 ...15-pppd-move-pppd-database-to-var-run-ppp.patch |   44 -
 ...-rp-pppoe-add-manpage-for-pppoe-discovery.patch |  126 -
 .../0017-pppd-rebase-EAP-TLS-patch-v0.994.patch    | 3045 --------------------
 .../0018-scritps-fix-ip-up.local-sample.patch      |   27 -
 .../0019-sys-linux-rework-get_first_ethernet.patch |  383 ---
 .../0020-pppd-put-lock-files-in-var-lock-ppp.patch |   26 -
 ...ompile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch |   23 -
 ...s-compile-pppol2tp-with-multilink-support.patch |   24 -
 ...nstall-rp-pppoe-plugin-files-with-standar.patch |   32 -
 ...uild-sys-make-pppd-first-and-then-plugins.patch |   26 -
 ...nstall-pppoatm-plugin-files-with-standard.patch |   26 -
 ...tall-pppd-binary-using-standard-perms-755.patch |   29 -
 ppp/patches/ppp-2.4.2-ifname.patch                 |  126 -
 ppp/ppp.nm                                         |   10 +-
 pygobject3/pygobject3.nm                           |  117 -
 python-cairo/python-cairo.nm                       |   47 -
 python-dbus/python-dbus.nm                         |   84 -
 ...ro-waf-use-python-config-as-shell-script.patch0 |   11 -
 .../patches/pycairo-1.10.0-test-python3.patch      |   12 -
 python3-cairo/python3-cairo.nm                     |   45 +-
 eggdbus/eggdbus.nm => python3-dbus/python3-dbus.nm |   23 +-
 python3-gobject3/python3-gobject3.nm               |   67 +
 rp-pppoe/rp-pppoe.nm                               |    2 +-
 rrdtool/patches/rrdtool-1.7.1-compile-fix.patch    |   29 -
 rrdtool/rrdtool.nm                                 |   32 +-
 shared-mime-info/shared-mime-info.nm               |   59 +
 sip/sip.nm                                         |    1 -
 tftp/patches/tftp-0.40-remap.patch                 |   19 -
 tftp/patches/tftp-0.42-tftpboot.patch              |   54 -
 tftp/patches/tftp-0.49-chk_retcodes.patch          |   15 -
 tftp/patches/tftp-0.49-cmd_arg.patch               |  159 -
 tftp/patches/tftp-doc.patch                        |   27 -
 tftp/patches/tftp-hpa-0.39-tzfix.patch             |   18 -
 .../tftp-hpa-0.49-fortify-strcpy-crash.patch       |   26 -
 tftp/patches/tftp-hpa-0.49-stats.patch             |   14 -
 tftp/patches/tftp-hpa-5.2-pktinfo.patch            |   23 -
 tftp/systemd/tftp.service                          |    6 -
 tftp/systemd/tftp.socket                           |    8 -
 tftp/tftp.nm                                       |  125 -
 ulogd2/ulogd2.nm                                   |    2 -
 upower/upower.nm                                   |   60 -
 usbutils/usbutils.nm                               |    1 -
 wpa_supplicant/wpa_supplicant.nm                   |    4 +-
 93 files changed, 1684 insertions(+), 9310 deletions(-)
 delete mode 100644 MAKEDEV/MAKEDEV.nm
 delete mode 100644 MAKEDEV/makedev.d.5
 delete mode 100644 audit/audit.nm
 delete mode 100644 audit/systemd/auditd.service
 delete mode 100644 batctl/batctl.nm
 delete mode 100644 bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0
 delete mode 100644 bzip2/patches/bzip2-1.0.6-saneso.patch0
 create mode 100644 bzip2/patches/bzip2-saneso.patch
 rename kernel/{config-arm64-generic => config-aarch64-generic} (68%)
 rename kernel/{config-x86-generic => config-x86_64-generic} (82%)
 delete mode 100644 openldap/patches/openldap-2.4.17-disable_sys_err.patch
 delete mode 100644 ppp/patches/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
 delete mode 100644 ppp/patches/0002-build-sys-enable-PAM-support.patch
 delete mode 100644 ppp/patches/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
 delete mode 100644 ppp/patches/0004-doc-add-configuration-samples.patch
 delete mode 100644 ppp/patches/0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
 delete mode 100644 ppp/patches/0006-scritps-use-change_resolv_conf-function.patch
 delete mode 100644 ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch
 delete mode 100644 ppp/patches/0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
 delete mode 100644 ppp/patches/0009-pppd-introduce-ipv6-accept-remote.patch
 delete mode 100644 ppp/patches/0010-build-sys-enable-CBCP.patch
 delete mode 100644 ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
 delete mode 100644 ppp/patches/0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
 delete mode 100644 ppp/patches/0013-everywhere-O_CLOEXEC-harder.patch
 delete mode 100644 ppp/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
 delete mode 100644 ppp/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
 delete mode 100644 ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
 delete mode 100644 ppp/patches/0017-pppd-rebase-EAP-TLS-patch-v0.994.patch
 delete mode 100644 ppp/patches/0018-scritps-fix-ip-up.local-sample.patch
 delete mode 100644 ppp/patches/0019-sys-linux-rework-get_first_ethernet.patch
 delete mode 100644 ppp/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
 delete mode 100644 ppp/patches/0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
 delete mode 100644 ppp/patches/0022-build-sys-compile-pppol2tp-with-multilink-support.patch
 delete mode 100644 ppp/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
 delete mode 100644 ppp/patches/0023-build-sys-make-pppd-first-and-then-plugins.patch
 delete mode 100644 ppp/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
 delete mode 100644 ppp/patches/0025-pppd-install-pppd-binary-using-standard-perms-755.patch
 delete mode 100644 ppp/patches/ppp-2.4.2-ifname.patch
 delete mode 100644 pygobject3/pygobject3.nm
 delete mode 100644 python-cairo/python-cairo.nm
 delete mode 100644 python-dbus/python-dbus.nm
 delete mode 100644 python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
 delete mode 100644 python3-cairo/patches/pycairo-1.10.0-test-python3.patch
 copy eggdbus/eggdbus.nm => python3-dbus/python3-dbus.nm (63%)
 create mode 100644 python3-gobject3/python3-gobject3.nm
 delete mode 100644 rrdtool/patches/rrdtool-1.7.1-compile-fix.patch
 create mode 100644 shared-mime-info/shared-mime-info.nm
 delete mode 100644 tftp/patches/tftp-0.40-remap.patch
 delete mode 100644 tftp/patches/tftp-0.42-tftpboot.patch
 delete mode 100644 tftp/patches/tftp-0.49-chk_retcodes.patch
 delete mode 100644 tftp/patches/tftp-0.49-cmd_arg.patch
 delete mode 100644 tftp/patches/tftp-doc.patch
 delete mode 100644 tftp/patches/tftp-hpa-0.39-tzfix.patch
 delete mode 100644 tftp/patches/tftp-hpa-0.49-fortify-strcpy-crash.patch
 delete mode 100644 tftp/patches/tftp-hpa-0.49-stats.patch
 delete mode 100644 tftp/patches/tftp-hpa-5.2-pktinfo.patch
 delete mode 100644 tftp/systemd/tftp.service
 delete mode 100644 tftp/systemd/tftp.socket
 delete mode 100644 tftp/tftp.nm
 delete mode 100644 upower/upower.nm
Difference in files:

diff --git a/MAKEDEV/MAKEDEV.nm b/MAKEDEV/MAKEDEV.nm
deleted file mode 100644
index b59e489d3..000000000
--- a/MAKEDEV/MAKEDEV.nm
+++ /dev/null
@@ -1,63 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = MAKEDEV
-version    = 3.24
-release    = 2
-
-groups     = System/Base
-url        =
-license    = GPLv2
-summary    = A program used for creating device files in /dev.
-
-description
-	This package contains the MAKEDEV program, which makes it easier to create
-	and maintain the files in the /dev directory.  /dev directory files
-	correspond to a particular device supported by Linux (serial or printer
-	ports, scanners, sound cards, tape drives, CD-ROM drives, hard drives,
-	etc.) and interface with the drivers in the kernel.
-
-	You should install the MAKEDEV package because the MAKEDEV utility makes
-	it easy to manage the /dev directory device files.
-end
-
-sources    = %{thisapp}-1.tar.gz
-
-build
-	make_build_targets += OPTFLAGS="%{CFLAGS}"
-	make_install_targets += devdir=/dev makedevdir=/sbin
-
-	install_cmds
-		rm -f %{BUILDROOT}/dev/MAKEDEV
-		mkdir -pv %{BUILDROOT}/usr/share/man/man5
-		install -m 644 -p %{DIR_SOURCE}/makedev.d.5 \
-			%{BUILDROOT}/usr/share/man/man5
-		mkdir -pv %{BUILDROOT}/lib/udev/devices
-		ln -svf ../../../sbin/MAKEDEV \
-			%{BUILDROOT}/lib/udev/devices/MAKEDEV
-	end
-end
-
-packages
-	package %{name}
-		groups += Base
-
-		prerequires = shadow-utils
-		requires += udev
-
-		script prein
-			# Add the floopy group and the vcsa user.
-			getent group floppy >/dev/null || groupadd -g 19 -r -f floppy
-			getent group vcsa >/dev/null || groupadd -g 69 -r -f vcsa
-			getent passwd vcsa >/dev/null || \
-				useradd -r -g vcsa -d /dev -s /sbin/nologin -u 69 \
-				-c "virtual console memory owner" vcsa 2>/dev/null
-		end
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/MAKEDEV/makedev.d.5 b/MAKEDEV/makedev.d.5
deleted file mode 100644
index 290334cba..000000000
--- a/MAKEDEV/makedev.d.5
+++ /dev/null
@@ -1,180 +0,0 @@
-." Copyright (c) 2002 Thierry Vignaud tvignaud@mandrakesoft.com
-." Copyright (c) 2010 Hans de Goede hdegoede@redhat.com
-."
-." This is free documentation; 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.
-."
-." The GNU General Public License's references to "object code"
-." and "executables" are to be interpreted as the output of any
-." document formatting or typesetting system, including
-." intermediate and printed output.
-."
-." This manual 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 manual; if not, write to the Free
-." Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
-." USA.
-."
-."
-.TH makedev.d 5 "1 June 2010" "Red Hat Linux" "Linux System Administrator's Manual"
-.SH NAME
-makedev.d - configuration files for devices creation through MAKEDEV
-.".SH SYNOPSIS
-.SH DESCRIPTION
-The behavior of
-.B MAKEDEV
-is instrumented by the configuration files in
-.I /etc/makedev.d/
-directory. They're read and "executed" by
-.BR MAKEDEV(8)
-on post installation of the MAKEDEV package.
-.PP
-These configuration file consists of a set of lines.
-.PP
-All empty lines, and all text on a line after a '#', will be ignored.
-.PP
-The remaining lines should all conform to one of the following formats:
-.SH SYNTAX
-This is a description of the four basic legal directives.
-.TP
-.B =NAME expanded text
-this define a macro. eg: 
-.I =BURNER   660 root cdwriter
-will make 
-.B MAKEDEV
-expand
-.I $BURNER
-when encountered.
-.TP
-.B b mask owner group   major minor  minor_step dev_number root_name base
-this directive define some
-.I block
-(``b'') device(s) creation.  They will be owned by
-.I owner
-and
-.I group
-and will have the
-.I major
-and
-.I minor
-as major and minor numbers.
-.br
-The
-.I dev_number
-arguments define how many devices will be created. If 
-.I dev_number
-is different from 1, then
-.I dev_number
-devices will be created, their minor number being incremented by
-.I minor_step
-at each step.
-.br
-If only one device is created, it will be named \fIroot_name\fP.  Else,
-the devices will be named with regards to the following rules :
-.RS 7
-.IP (bu
-If 
-.I root_name
-does not contains ``%d'', then ```\fI%d\fP'' is appended to its end.
-.IP (bu
-If 
-.I base
-is not set, it is initialized to zero.
-.IP (bu
-Then, at each step, the name of the device we have to created is obtained
-by incrementing
-.I base
-and replacing ``%d'' by \fI base\fP. This is equivament to these statements :
-.NF
-$base++; $file = sprintf($name, $base);
-.FI
-." If several devices have to be created and if 
-.RE
-.TP
-.B c mask owner group   major minor  minor_step dev_number root_name base
-is quite the same directive as the previous one, exept its purpose is
-.I character
-devices (``c'') creation.
-.TP
-.B l destination source
-will make
-.B makdev
-symlink
-.I source
-on \fIdestination\fP.
-." .TP
-." .B s mask owner group root_name
-." will make
-." .B makdev
-." creating a node like the \fBb\fP and the \fBc\fP directives, but as a regular
-." file with the sticky bit positionned.
-.SH CUSTOMIZATION
-Since there is currently no standardization in what names are used for
-system users and groups, it is possible that you may need to modify
-\fBMAKEDEV\fR's configuration files to reflect your site's settings.
-.SH EXAMPLES
-.RS
-.sp
-.nf
-.ne 7
-# /etc/makedev.d/test sample
-#
-
-# the following line create (```\fBc\fP'') the famous \fI/dev/null\fP entry
-# with 666 mask (file access permissions), with 1 as major and
-# 3 as minor
-c 666 root root         1   3  1  1 null
-
-
-# the following line define the STORAGE macro that specify a 660
-# mask for file permissions, root as owner and disk as group
-=STORAGE  660 root disk
-
-# the following line create 16 \fI/dev/hdaX\fP entries (/dev/hda0 to
-# /dev/hda15) with the permissions and ownership defined above,
-# and with 22 as major
-b $STORAGE             22   0  1 16 hda%d
-
-# this one link /dev/snd on alsa entry in procfs
-# (usually mounted in /proc)
-l snd ../proc/asound/dev
-.fi
-.sp
-.RE
-.PP
-.SH NOTES
-The name of the file may contain some ``\fI/\fP'' characters :
-.B makdev
-will create the necessary directories if the node to create must be
-in a sub directory.
-.br
-Comments must begin on first line character.
-.br
-Files are parsed one by one, after having been sorted by name in alphabetical order.
-.SH FILES
-The
-.IR /etc/makedev.d/*
-files contains instructions that instrument
-.B makdev
-to create the device files in /dev.  Especially,
-.IR /etc/makedev.d/00macros
-define most frequently used macros.
-.SH "SEE ALSO"
-Linux Allocated Devices
-.br
-It can be found in
-.IR /usr/share/doc/kernel-doc-<VERSION>/Documentation/devices.txt
-if the kernel-doc package is installed. <VERSION> is the version number
-of the installed kernel (eg: 2.6.32).
-.PP
-.BR MAKEDEV (8)
-.SH AUTHOR
-.RI "Thierry Vignaud <" tvignaud@mandrakesoft.com ">, 2002"
-.br
-.RI "Hans de Goede <" hdegoede@redhat.com ">, 2010"
diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm
index 35c8fc434..a8220579d 100644
--- a/asciidoc/asciidoc.nm
+++ b/asciidoc/asciidoc.nm
@@ -5,11 +5,12 @@
name       = asciidoc
 version    = 8.6.9
-release    = 1
+release    = 2
+thisapp    = %{name}-py-%{version}
 arch       = noarch
groups     = Application/System
-url        = http://www.methods.co.nz/asciidoc/
+url        = https://asciidoc.org/
 license    = GPL+ and GPLv2+
 summary    = Text based document generation.
@@ -19,19 +20,27 @@ description
    to HTML and DocBook markups using the asciidoc(1) command.
 end
-source_dl  = http://sourceforge.net/projects/asciidoc/files/%%7Bname%7D/%%7Bversion%7D/
+source_dl  = https://github.com/%%7Bname%7D-py/asciidoc-py/archive/%%7Bversion%7D/
build
    requires
-		python
+		autoconf
+		automake
+		docbook-dsssl
+		docbook-xsl
+		libxslt
+		python3-devel
+	end
+
+	prepare_cmds
+		autoreconf -vfi
    end
make_install_targets += docs
install_cmds
-		# Install python API.
-		install -Dpm 644 asciidocapi.py \
-			%{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py
+		# Broken symlink to an example that is not being installed
+		rm -vf %{BUILDROOT}%{datadir}/doc/asciidoc/examples/website/asciidoc-graphviz-sample.txt
    end
 end
diff --git a/audit/audit.nm b/audit/audit.nm
deleted file mode 100644
index 094a51b3a..000000000
--- a/audit/audit.nm
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = audit
-version    = 2.5
-release    = 1
-
-groups     = System/Daemons
-url        = http://people.redhat.com/sgrubb/audit/
-license    = GPLv2+
-summary    = User space tools for 2.6 kernel auditing.
-
-description
-	The audit package contains the user space utilities for
-	storing and searching the audit records generate by
-	the audit subsystem in the Linux 2.6 kernel.
-end
-
-source_dl  = http://people.redhat.com/sgrubb/audit/
-
-build
-	requires
-		autoconf
-		automake
-		libcap-ng-devel
-		libtool
-		openldap-devel
-		python-devel
-		swig
-	end
-
-	configure_options += \
-		--without-prelude \
-		--without-libwrap \
-		--enable-gssapi-krb5=no \
-		--with-libcap-ng=yes
-
-	prepare_cmds
-		autoreconf -fvi
-	end
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}/var/log/audit
-
-		rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig}
-	end
-end
-
-packages
-	package %{name}
-		prerequires += systemd-units
-
-		script postin
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script preun
-			/bin/systemctl --no-reload disable auditd.service >/dev/null 2>&1 || :
-			/bin/systemctl stop auditd.service >/dev/null 2>&1 || :
-		end
-
-		script postun
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script postup
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-			/bin/systemctl try-restart auditd.service >/dev/null 2>&1 || :
-		end
-	end
-
-	package %{name}-libs
-		template LIBS
-	end
-
-	package %{name}-devel
-		template DEVEL
-
-		# Just require the libs to link
-		# against them.
-		requires
-			%{name}-libs = %{thisver}
-		end
-	end
-
-	package python-%{name}
-		summary = Python bindings for libaudit.
-		description = %{summary}
-
-		files
-			%{libdir}/python*/
-		end
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/audit/systemd/auditd.service b/audit/systemd/auditd.service
deleted file mode 100644
index 04b0b3633..000000000
--- a/audit/systemd/auditd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Security Auditing Service
-After=syslog.target
-
-[Service]
-ExecStart=/sbin/auditd -n
-ExecStartPost=/sbin/auditctl -R /etc/audit/audit.rules
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/avahi/avahi.nm b/avahi/avahi.nm
index 4bfa13cac..295cad203 100644
--- a/avahi/avahi.nm
+++ b/avahi/avahi.nm
@@ -4,11 +4,11 @@
 ###############################################################################
name       = avahi
-version    = 0.6.32
+version    = 0.8
 release    = 1
groups     = Networking/Zeroconf
-url        = http://avahi.org/
+url        = https://avahi.org/
 license    = LGPLv2+
 summary    = Local network service discovery
@@ -22,8 +22,7 @@ description
    convenient.
 end
-source_dl  = http://avahi.org/download/ \
-	https://github.com/lathiat/avahi/releases/download/v%%7Bversion%7D/
+source_dl  = https://avahi.org/download/
build
    requires
@@ -33,41 +32,35 @@ build
    	expat-devel
    	gcc-c++
    	gettext
-		libdaemon-devel>=0.14
+		libdaemon-devel >= 0.14
+		libevent-devel >= 2.0.21
    	intltool
    	perl
    	perl-XML-Parser
    	pkg-config
-		python-devel
-		python-dbus
+		python3-devel
+		python3-dbus
+		python3-gobject3-devel
    	systemd-units
-	end
-
-	prepare_cmds
-		# for aarch64
-		for i in $(find . -name config.guess -or -name config.sub); do
-			cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
-		done
+		zlib-devel
    end
configure_options += \
    	--with-distro=none \
    	--with-systemdsystemunitdir=%{unitdir} \
+		--disable-introspection \
    	--disable-gdbm \
    	--disable-qt3 \
    	--disable-qt4 \
+		--disable-qt5 \
    	--disable-gtk \
    	--disable-gtk3 \
-		--disable-pygtk \
-		--disable-mono
+		--disable-mono \
+		PYTHON=%{python3}
 end
packages
    package %{name}
-		requires
-			libdaemon >= 0.14
-		end
-
    	prerequires += shadow-utils
# Create avahi user and group.
diff --git a/basesystem/basesystem.nm b/basesystem/basesystem.nm
index 7b972846b..033a2b3df 100644
--- a/basesystem/basesystem.nm
+++ b/basesystem/basesystem.nm
@@ -6,7 +6,6 @@
 name       = basesystem
 version    = 2.99
 release    = 4
-epoch      = 1
 arch       = noarch
groups     = Base System/Base
diff --git a/batctl/batctl.nm b/batctl/batctl.nm
deleted file mode 100644
index 8095ae5a4..000000000
--- a/batctl/batctl.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = batctl
-version    = 2012.4.0
-release    = 1
-
-groups     = Networking/Tools
-url        = http://www.open-mesh.org/projects/batctl
-license    = GPLv2
-summary    = B.A.T.M.A.N. advanced control and management tool.
-
-
-description
-	B.A.T.M.A.N. advanced operates on layer 2 and thus all
-	hosts participating in the virtual switch are completely
-	transparent for all protocols above layer 2. Therefore the
-	common diagnosis tools do not work as expected.
-	To overcome these problems batctl was created. At the moment batctl
-	contains ping, traceroute, tcpdump and interfaces to the
-	kernel module settings.
-end
-
-source_dl  = http://downloads.open-mesh.org/batman/stable/sources/batctl/
-
-build
-	make_install_targets += PREFIX=%{prefix}
-end
-
-packages
-	package %{name}
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm
index 4660dc7ad..adab75658 100644
--- a/bzip2/bzip2.nm
+++ b/bzip2/bzip2.nm
@@ -4,31 +4,23 @@
 ###############################################################################
name       = bzip2
-version    = 1.0.6
-release    = 7
+version    = 1.0.8
+release    = 1
groups     = Applications/Compression
-url        = http://www.bzip.org/
+url        = https://sourceware.org/bzip2/
 license    = GPLv2+
-summary    = Bzip2 is a data compressor.
+summary    = Bzip2 is a data compressor
description
    bzip2 is a freely available, patent free (see below), high-quality data
    compressor that is an alternative to the GNU zip compressor.
 end
-source_dl  = http://www.bzip.org/%%7Bversion%7D/
-
-CFLAGS    += -fPIC -D_FILE_OFFSET_BITS=64
+source_dl  = https://sourceware.org/pub/bzip2/
build
-	prepare_cmds
-		sed -i 's@(ln -s -f )$(PREFIX)/bin/@\1@' Makefile
-		sed -e "s/$(CC) -shared/& %{CFLAGS}/" -i Makefile-libbz2_so
-	end
-
    build
-		%{DO_FIX_LIBTOOL}
    	make -f Makefile-libbz2_so %{PARALLELISMFLAGS} \
    		CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
@@ -70,13 +62,9 @@ end
packages
    package %{name}
-		groups += Build
-		# Provide older soname to fix problem with
-		# older version of the package.
-		if "%{DISTRO_ARCH}" == "i686"
-			provides += libbz2.so.1.0
-		end
+	package %{name}-libs
+		template LIBS
    end
package %{name}-devel
diff --git a/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 b/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0
deleted file mode 100644
index 5a95ed68b..000000000
--- a/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -18,10 +18,9 @@
- CC=gcc
- AR=ar
- RANLIB=ranlib
--LDFLAGS=
- 
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
---- Makefile-libbz2_so
-+++ Makefile-libbz2_so
-@@ -24,7 +24,7 @@
- SHELL=/bin/sh
- CC=gcc
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
- 
- OBJS= blocksort.o  \
-       huffman.o    \
diff --git a/bzip2/patches/bzip2-1.0.6-saneso.patch0 b/bzip2/patches/bzip2-1.0.6-saneso.patch0
deleted file mode 100644
index 9c4ddf053..000000000
--- a/bzip2/patches/bzip2-1.0.6-saneso.patch0
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile-libbz2_so
-+++ Makefile-libbz2_so
-@@ -35,8 +35,8 @@
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
--	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
- 
diff --git a/bzip2/patches/bzip2-saneso.patch b/bzip2/patches/bzip2-saneso.patch
new file mode 100644
index 000000000..ec76a4c66
--- /dev/null
+++ b/bzip2/patches/bzip2-saneso.patch
@@ -0,0 +1,12 @@
+diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so
+--- bzip2-1.0.6/Makefile-libbz2_so.pom	2010-09-11 01:07:52.000000000 +0200
++++ bzip2-1.0.6/Makefile-libbz2_so	2010-09-22 10:31:46.000000000 +0200
+@@ -35,7 +35,7 @@ OBJS= blocksort.o  \
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.8 libbz2.so.1.0
diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index 4fdd38212..5cdf4c8a3 100644
--- a/cairo/cairo.nm
+++ b/cairo/cairo.nm
@@ -4,11 +4,11 @@
 ###############################################################################
name       = cairo
-version    = 1.14.10
+version    = 1.16.0
 release    = 1
groups     = System/Graphics
-url        = http://cairographics.org
+url        = https://cairographics.org
 license    = LGPLv2 MPLv1.1
 summary    = A 2D graphics library.
@@ -17,12 +17,12 @@ description
    and print output.
 end
-source_dl  = http://cairographics.org/releases/
+source_dl  = https://cairographics.org/releases/
 sources    = %{thisapp}.tar.xz
build
    requires
-		binutils>=2.21.51.0.8-2
+		binutils >= 2.21.51.0.8-2
    	fontconfig-devel >= 2.10
    	freetype-devel
    	glib2-devel >= 2.14
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm
index 0ea88e495..37d319d8e 100644
--- a/compat-db/compat-db.nm
+++ b/compat-db/compat-db.nm
@@ -29,7 +29,7 @@ version_db48 = 4.8.30
 version_db52 = 5.2.36
 version_db53 = 5.3.28
 versions     = %{version_db53} %{version_db52} %{version_db48} %{version_db47} %{version_db46}
-main_version:= %{version_db53}
+main_version = %{version_db53}
source_dl  = http://download.oracle.com/berkeley-db/
 sources    = db-%{version_db53}.tar.gz
diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index dbc643928..5103349cb 100644
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -5,12 +5,12 @@
name       = cracklib
 version    = 2.9.5
-release    = 2
+release    = 3
groups     = Security/Password
-url        = http://sourceforge.net/projects/cracklib/
+url        = https://sourceforge.net/projects/cracklib/
 license    = GPLv2
-summary    = A password-checking library.
+summary    = A password-checking library
description
    CrackLib tests passwords to determine whether they match certain \
@@ -22,12 +22,12 @@ description
    in a dictionary.
 end
-source_dl  = http://prdownloads.sourceforge.net/cracklib/
+source_dl  = https://prdownloads.sourceforge.net/cracklib/
 sources   += cracklib-words-20080507.gz
build
    requires
-		python-devel
+		zlib-devel
    end
dictdir  = %{datadir}/cracklib
@@ -37,7 +37,7 @@ build
configure_options += \
    	--with-default-dict=%{dictpath} \
-		--with-python \
+		--without-python \
    	--disable-static
# Only extract the source tarball.
@@ -98,7 +98,7 @@ packages
    	template DEVEL
    end
-	# We build an extra package with the dictionaries.
+	# We build an extra package with the dictionaries
    package %{name}-dicts
    	summary = Dictionaries for %{thisapp}.
    	description = %{summary}
@@ -109,17 +109,6 @@ packages
    	end
    end
-	# We build an extra python package with the bindings for it.
-	package python-cracklib
-		summary = Python bindings for %{thisapp}.
-		description = %{summary}
-
-		files
-			/usr/lib/python*
-			%{libdir}/python*
-		end
-	end
-
    package %{name}-debuginfo
    	template DEBUGINFO
    end
diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index aa76c831e..b55b3886e 100644
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -4,21 +4,21 @@
 ###############################################################################
name       = cyrus-sasl
-version    = 2.1.26
-release    = 2
+version    = 2.1.28
+release    = 1
groups     = System/Libraries
-url        = http://asg.web.cmu.edu/sasl/sasl-library.html
+url        = https://github.com/cyrusimap/cyrus-sasl
 license    = BSD
-summary    = The Cyrus SASL library.
+summary    = The Cyrus SASL library
description
-	The cyrus-sasl package contains the Cyrus implementation of SASL. \
-	SASL is the Simple Authentication and Security Layer, a method for \
+	The cyrus-sasl package contains the Cyrus implementation of SASL.
+	SASL is the Simple Authentication and Security Layer, a method for
    adding authentication support to connection-based protocols.
 end
-source_dl  = ftp://ftp.cyrusimap.org/cyrus-sasl/
+source_dl  = https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-%%7Bver...
build
    requires
@@ -28,22 +28,11 @@ build
    	pam-devel
    end
-	prepare_cmds
-		# for aarch64
-		for i in $(find . -name config.guess -or -name config.sub); do
-			cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
-		done
-	end
-
    configure_options += \
-		--sysconfdir=/etc \
    	--with-configdir=%{libdir}/sasl2:/etc/sasl2 \
    	--with-plugindir=%{libdir}/sasl2 \
    	--with-dbpath=/var/lib/sasl/sasldb2 \
-		--with-saslauthd=/var/run/saslauthd \
-		--mandir=/usr/share/man
-
-	PARALLELISMFLAGS = # Disabled
+		--with-saslauthd=/var/run/saslauthd
make_install_targets += sasldir=%{libdir}/sasl2
diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm
index a5ff3ec34..3540e6d2e 100644
--- a/gobject-introspection/gobject-introspection.nm
+++ b/gobject-introspection/gobject-introspection.nm
@@ -5,13 +5,12 @@
name       = gobject-introspection
 version    = %{major_ver}.%{minor_ver}
-release    = 3
-
-major_ver  = 1.48
+major_ver  = 1.74
 minor_ver  = 0
+release    = 3
groups     = Development/Libraries
-url        = http://live.gnome.org/GObjectIntrospection
+url        = https://live.gnome.org/GObjectIntrospection
 license    = GPLv2+, LGPLv2+, MIT
 summary    = Introspection system for GObject-based libraries.
@@ -22,7 +21,7 @@ description
    other things.
 end
-source_dl  = http://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bmajor_ver%7D/
+source_dl  = https://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bmajor_ver%7D/
 sources    = %{thisapp}.tar.xz
build
@@ -30,23 +29,27 @@ build
    	automake
    	bison
    	cairo-devel
+		cairo-gobject-devel
    	flex
    	glib2-devel >= 2.48.0
    	libffi-devel
    	libtool
-		python-devel
+		meson
+		ninja
+		python3-devel
    end
export LD_LIBRARY_PATH = %{DIR_APP}/.libs:%{DIR_APP}/tests/offsets/.libs
-	configure_options += \
-		--disable-static
+	build
+		%{meson} \
+			-Ddoctool=disabled
+
+		%{meson_build}
+	end
-	install_cmds
-		# Fix interpreter
-		sed -e "s@^#!.*@#!/usr/bin/python@" \
-			-i %{BUILDROOT}%{bindir}/g-ir-scanner \
-			-i %{BUILDROOT}%{bindir}/g-ir-annotation-tool
+	install
+		%{meson_install}
    end
 end
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index a8ad505dc..7be182479 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -4,7 +4,6 @@
 ###############################################################################
name       = initscripts
-epoch      = 1
 version    = 2.99
 release    = 19
diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
index 42ba081b9..db41d322c 100644
--- a/ipfire-release/ipfire-release.nm
+++ b/ipfire-release/ipfire-release.nm
@@ -14,8 +14,7 @@ DISTRO_COLOR    = 0;31
name       = %{DISTRO_SNAME}-release
 version    = %{DISTRO_VERSION}
-release    = 5
-epoch      = 3
+release    = 7
 arch       = noarch
maintainer = Michael Tremer michael.tremer@ipfire.org
@@ -76,6 +75,14 @@ packages
    		/etc/hostname
    		/etc/pakfire/repos
    	end
+
+		requires
+			pakfire
+		end
+
+		recommends
+			vim
+		end
    end
package %{name}-build
@@ -89,9 +96,6 @@ packages
    	end
requires
-			# Install Pakfire Build components
-			pakfire-build
-
    		# Various default tools
    		bash
    		bzip2
diff --git a/kbd/kbd.nm b/kbd/kbd.nm
index 62186f97c..fbc57c7e6 100644
--- a/kbd/kbd.nm
+++ b/kbd/kbd.nm
@@ -6,7 +6,6 @@
 name       = kbd
 version    = 1.15.3
 release    = 2
-epoch      = 1
groups     = System/Base
 url        = http://ftp.altlinux.org/pub/people/legion/kbd
diff --git a/kernel/config-arm64-generic b/kernel/config-aarch64-generic
similarity index 68%
rename from kernel/config-arm64-generic
rename to kernel/config-aarch64-generic
index 3a7effeeb..185cfebfe 100644
--- a/kernel/config-arm64-generic
+++ b/kernel/config-aarch64-generic
@@ -3,6 +3,7 @@
 # IRQ subsystem
 #
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_IRQ_IPI=y
 # end of IRQ subsystem
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -40,14 +41,14 @@ CONFIG_BROKEN_GAS_INST=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
-# CONFIG_ARCH_BCM2835 is not set
+CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCMBCA is not set
-# CONFIG_ARCH_BERLIN is not set
+CONFIG_ARCH_BERLIN=y
 # CONFIG_ARCH_BITMAIN is not set
 # CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_EXYNOS is not set
@@ -59,15 +60,15 @@ CONFIG_BROKEN_GAS_INST=y
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 CONFIG_ARCH_MESON=y
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXC is not set
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_NPCM is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
+CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S32 is not set
-CONFIG_ARCH_SEATTLE=y
+# CONFIG_ARCH_SEATTLE is not set
 # CONFIG_ARCH_INTEL_SOCFPGA is not set
 # CONFIG_ARCH_SYNQUACER is not set
 # CONFIG_ARCH_TEGRA is not set
@@ -91,11 +92,8 @@ CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_ARM64_ERRATUM_1742098=y
-CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1319367=y
@@ -149,11 +147,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_SW_TTBR0_PAN=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
+# CONFIG_COMPAT is not set
#
 # ARMv8.1 architectural features
@@ -234,21 +228,19 @@ CONFIG_CPU_PM=y
 #
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
+CONFIG_ARM_ARMADA_8K_CPUFREQ=m
 CONFIG_ARM_SCPI_CPUFREQ=m
+CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_SCMI_CPUFREQ=m
 # end of CPU Frequency scaling
 CONFIG_ACPI_GENERIC_GSI=y
 CONFIG_ACPI_CCA_REQUIRED=y
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
-# CONFIG_ACPI_VIDEO is not set
 CONFIG_ACPI_MCFG=y
-CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_ACPI_HED=m
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
-# CONFIG_ACPI_APEI is not set
+CONFIG_ACPI_APEI_SEA=y
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
 CONFIG_ACPI_PPTT=y
@@ -275,7 +267,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
-# CONFIG_CRYPTO_POLY1305_NEON is not set
+CONFIG_CRYPTO_POLY1305_NEON=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
@@ -306,13 +298,6 @@ CONFIG_ARCH_USE_GNU_PROPERTY=y
 #
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-
-#
-# Network testing
-#
-# CONFIG_RFKILL_GPIO is not set
#
 # Device Drivers
@@ -320,37 +305,36 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARM_AMBA=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
+CONFIG_PCI_BRIDGE_EMUL=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=y
#
 # PCI controller drivers
 #
+CONFIG_PCI_AARDVARK=m
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
-# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_ALTERA=m
+CONFIG_PCIE_ALTERA_MSI=m
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_BRCMSTB=m
+# CONFIG_PCIE_HISI_ERR is not set
#
 # DesignWare PCI Core Support
 #
+CONFIG_PCI_IMX6=y
 CONFIG_PCI_HISI=y
-# CONFIG_PCIE_KIRIN is not set
-# CONFIG_PCIE_AL is not set
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_ROCKCHIP_DW_HOST=y
+CONFIG_PCIE_KIRIN=m
+CONFIG_PCIE_AL=y
 # end of DesignWare PCI Core Support
 # end of PCI controller drivers
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCCARD is not set
-
 #
 # Firmware loader
 #
@@ -364,7 +348,11 @@ CONFIG_GENERIC_ARCH_NUMA=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_IMX_WEIM is not set
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
 CONFIG_VEXPRESS_CONFIG=y
+# CONFIG_FSL_MC_BUS is not set
 # end of Bus devices
#
@@ -381,8 +369,10 @@ CONFIG_ARM_SCMI_POWER_DOMAIN=m
 # end of ARM System Control and Management Interface Protocol
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
-# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_ARM_SDE_INTERFACE is not set
 # CONFIG_ISCSI_IBFT is not set
+# CONFIG_RASPBERRYPI_FIRMWARE is not set
+# CONFIG_TURRIS_MOX_RWTM is not set
 # CONFIG_ARM_FFA_TRANSPORT is not set
#
@@ -392,6 +382,9 @@ CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_GENERIC_STUB=y
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # end of EFI (Extensible Firmware Interface) Support
+CONFIG_UEFI_CPER_ARM=y
+# CONFIG_IMX_DSP is not set
+# CONFIG_IMX_SCU is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -407,19 +400,11 @@ CONFIG_OF_NUMA=y
 # Protocols
 #
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_BLK_DEV_RAM_SIZE=4096
#
 # Misc devices
 #
-# CONFIG_HP_ILO is not set
-CONFIG_SRAM=y
 # CONFIG_OPEN_DICE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_VMWARE_VMCI is not set
 # end of Misc devices
#
@@ -439,35 +424,47 @@ CONFIG_SATA_ZPODD=y
 #
 # Controllers with non-SFF native interface
 #
+CONFIG_AHCI_IMX=m
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
 CONFIG_AHCI_XGENE=m
-CONFIG_SATA_AHCI_SEATTLE=m
#
-# PIO-only SFF controllers
+# PATA SFF controllers with BMDMA
 #
-# CONFIG_PATA_OF_PLATFORM is not set
+CONFIG_PATA_IMX=m
#
 # IEEE 1394 (FireWire) support
 #
 CONFIG_MII=y
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_SOLOS is not set
#
 # Distributed Switch Architecture drivers
 #
+CONFIG_NET_DSA_MSCC_FELIX=m
+# end of Distributed Switch Architecture drivers
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
 CONFIG_AMD8111_ETH=y
 CONFIG_NET_XGENE=m
 CONFIG_NET_XGENE_V2=m
-# CONFIG_CHELSIO_T1_1G is not set
+# CONFIG_EMAC_ROCKCHIP is not set
 # CONFIG_DE2104X is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_NAPI is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_FSL_DPAA2_SWITCH=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_VF=m
+CONFIG_FSL_ENETC_IERB=m
+CONFIG_FSL_ENETC_MDIO=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+# CONFIG_FSL_ENETC_QOS is not set
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
 CONFIG_HISI_FEMAC=m
@@ -481,16 +478,25 @@ CONFIG_HNS3=m
 CONFIG_HNS3_HCLGE=m
 CONFIG_HNS3_HCLGEVF=m
 CONFIG_HNS3_ENET=m
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+CONFIG_MVPP2_PTP=y
+CONFIG_PXA168_ETH=m
 # CONFIG_SKGE_GENESIS is not set
 CONFIG_OCTEONTX2_MBOX=m
 CONFIG_OCTEONTX2_AF=m
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
-# CONFIG_OCTEONTX2_PF is not set
-# CONFIG_MLXBF_GIGE is not set
+CONFIG_OCTEONTX2_PF=m
+CONFIG_OCTEONTX2_VF=m
+CONFIG_MLXBF_GIGE=m
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
 CONFIG_SMC91X=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+CONFIG_DWMAC_IMX8=m
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_XILINX_AXI_EMAC is not set
@@ -500,6 +506,7 @@ CONFIG_DWMAC_MESON=m
 # MII PHY device drivers
 #
 CONFIG_MESON_GXL_PHY=m
+CONFIG_MDIO_SUN4I=m
 CONFIG_MDIO_XGENE=m
#
@@ -518,12 +525,13 @@ CONFIG_WIL6210_TRACING=y
 #
 # Input Device Drivers
 #
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
+# CONFIG_KEYBOARD_IMX is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_TWL4030_PWRBUTTON is not set
-# CONFIG_INPUT_TWL4030_VIBRA is not set
-# CONFIG_INPUT_TWL6040_VIBRA is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 # CONFIG_INPUT_PWM_VIBRA is not set
@@ -531,11 +539,13 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 # Hardware I/O ports
 #
 # CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_SUN4I_PS2 is not set
 # end of Hardware I/O ports
#
 # Serial drivers
 #
+# CONFIG_SERIAL_8250_BCM2835AUX is not set
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_OF_PLATFORM=y
@@ -547,21 +557,27 @@ CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
 CONFIG_SERIAL_MESON=m
 # CONFIG_SERIAL_MESON_CONSOLE is not set
+# CONFIG_SERIAL_IMX is not set
+# CONFIG_SERIAL_IMX_EARLYCON is not set
 # CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_QE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
 # end of Serial drivers
 # CONFIG_SYNCLINK_GT is not set
 # CONFIG_NOZOMI is not set
 CONFIG_HVC_DCC=y
 # CONFIG_HVC_DCC_SERIALIZE_SMP is not set
+CONFIG_HW_RANDOM_BCM2835=y
+CONFIG_HW_RANDOM_IPROC_RNG200=y
+CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_MESON=y
-CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
-CONFIG_HW_RANDOM_CN10K=y
-CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+CONFIG_HW_RANDOM_CN10K=m
#
 # Multiplexer I2C Chip support
@@ -581,11 +597,17 @@ CONFIG_I2C_SIS630=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_BCM2835=m
+CONFIG_I2C_BRCMSTB=y
 CONFIG_I2C_CADENCE=m
-# CONFIG_I2C_HISI is not set
-# CONFIG_I2C_MLXBF is not set
+CONFIG_I2C_HISI=m
+CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_MESON=m
+CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_NOMADIK=m
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
 CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_THUNDERX=m
@@ -594,29 +616,86 @@ CONFIG_I2C_THUNDERX=m
 #
 CONFIG_I2C_XGENE_SLIMPRO=m
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=y
-# CONFIG_PINCTRL_AMD is not set
+# end of PTP clock support
 CONFIG_PINCTRL_AS3722=m
 CONFIG_PINCTRL_PALMAS=m
-CONFIG_PINCTRL_MESON=y
-CONFIG_PINCTRL_MESON_GXBB=y
-CONFIG_PINCTRL_MESON_GXL=y
-CONFIG_PINCTRL_MESON8_PMX=y
-CONFIG_PINCTRL_MESON_AXG=y
-CONFIG_PINCTRL_MESON_AXG_PMX=y
-CONFIG_PINCTRL_MESON_G12A=y
-CONFIG_PINCTRL_MESON_A1=y
-CONFIG_PINCTRL_MESON_S4=y
+CONFIG_PINCTRL_ROCKCHIP=m
+CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_BERLIN=y
+CONFIG_PINCTRL_AS370=y
+CONFIG_PINCTRL_BERLIN_BG4CT=y
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX8MM=m
+CONFIG_PINCTRL_IMX8MN=m
+CONFIG_PINCTRL_IMX8MP=m
+CONFIG_PINCTRL_IMX8MQ=m
+CONFIG_PINCTRL_IMX8ULP=m
+CONFIG_PINCTRL_IMXRT1050=y
+CONFIG_PINCTRL_IMX93=m
+CONFIG_PINCTRL_IMXRT1170=y
+CONFIG_PINCTRL_MESON=m
+CONFIG_PINCTRL_MESON_GXBB=m
+CONFIG_PINCTRL_MESON_GXL=m
+CONFIG_PINCTRL_MESON8_PMX=m
+CONFIG_PINCTRL_MESON_AXG=m
+CONFIG_PINCTRL_MESON_AXG_PMX=m
+CONFIG_PINCTRL_MESON_G12A=m
+CONFIG_PINCTRL_MESON_A1=m
+CONFIG_PINCTRL_MESON_S4=m
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
+CONFIG_PINCTRL_AC5=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+
+#
+# Renesas pinctrl drivers
+#
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
+CONFIG_PINCTRL_SUN20I_D1=y
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
+CONFIG_PINCTRL_SUN50I_H616=y
+CONFIG_PINCTRL_SUN50I_H616_R=y
#
 # Memory mapped GPIO drivers
 #
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_HISI is not set
-CONFIG_GPIO_PL061=y
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=m
+CONFIG_GPIO_PL061=m
+CONFIG_GPIO_ROCKCHIP=m
+CONFIG_GPIO_VF610=y
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
 # end of Memory mapped GPIO drivers
@@ -627,17 +706,11 @@ CONFIG_GPIO_XGENE_SB=m
 # CONFIG_GPIO_TC3589X is not set
 # end of MFD GPIO expanders
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_MLXBF=m
-# CONFIG_GPIO_MLXBF2 is not set
-# end of PCI GPIO expanders
-
 #
 # Virtual GPIO drivers
 #
 CONFIG_POWER_RESET_BRCMSTB=y
+# CONFIG_POWER_RESET_LINKSTATION is not set
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 # CONFIG_MAX8925_POWER is not set
@@ -656,7 +729,6 @@ CONFIG_POWER_RESET_XGENE=y
 #
 CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
-CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_OCC_P8_I2C=m
 CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_PWM_FAN=m
@@ -665,33 +737,48 @@ CONFIG_SENSORS_VEXPRESS=m
 #
 # ACPI drivers
 #
-CONFIG_AMLOGIC_THERMAL=y
+CONFIG_IMX_THERMAL=m
+CONFIG_IMX8MM_THERMAL=m
+CONFIG_QORIQ_THERMAL=m
+CONFIG_SUN8I_THERMAL=m
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_AMLOGIC_THERMAL=m
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2711_THERMAL=m
+CONFIG_BCM2835_THERMAL=m
+# end of Broadcom thermal drivers
#
 # Watchdog Device Drivers
 #
-CONFIG_MLX_WDT=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SBSA_WATCHDOG=m
+CONFIG_ARMADA_37XX_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_IMX2_WDT=m
+CONFIG_IMX7ULP_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=m
-# CONFIG_ARM_SMC_WATCHDOG is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
+CONFIG_ARM_SMC_WATCHDOG=m
+CONFIG_BCM2835_WDT=m
#
 # Multifunction device drivers
 #
+# CONFIG_MFD_SUN4I_GPADC is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_AC100 is not set
+# CONFIG_MFD_AXP20X_RSB is not set
 # CONFIG_LPC_ICH is not set
#
 # STMicroelectronics STMPE Interface Drivers
 #
+# CONFIG_MFD_SUN6I_PRCM is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_KHADAS_MCU is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
@@ -700,6 +787,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_88PM8607 is not set
+# CONFIG_REGULATOR_ANATOP is not set
 # CONFIG_REGULATOR_ARM_SCMI is not set
 # CONFIG_REGULATOR_GPIO is not set
 # CONFIG_REGULATOR_LP872X is not set
@@ -713,87 +801,17 @@ CONFIG_REGULATOR_VEXPRESS=m
 # CONFIG_IR_MESON is not set
 # CONFIG_IR_MESON_TX is not set
 # CONFIG_IR_NUVOTON is not set
+# CONFIG_IR_SUNXI is not set
+CONFIG_CEC_PIN=y
#
 # CEC support
 #
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 # CONFIG_CEC_MESON_AO is not set
 # CONFIG_CEC_MESON_G12A_AO is not set
 # end of CEC support
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_TTUSB_BUDGET=y
-CONFIG_DVB_TTUSB_DEC=y
-
-#
-# Media capture/analog/hybrid TV support
-#
-# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_CX23885 is not set
-# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA7164 is not set
-
-#
-# Media digital TV PCI Adapters
-#
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-# CONFIG_DVB_DM1105 is not set
-# CONFIG_MANTIS_CORE is not set
-# CONFIG_DVB_NGENE is not set
-# CONFIG_DVB_PLUTO2 is not set
-# CONFIG_DVB_PT1 is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-
-#
-# Amlogic media platform drivers
-#
-# CONFIG_VIDEO_MESON_GE2D is not set
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TDA1997X=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-# CONFIG_VIDEO_SAA6588 is not set
-# end of RDS decoders
-
-#
-# Audio/Video compression chips
-#
-# CONFIG_VIDEO_SAA6752HS is not set
-# end of Audio/Video compression chips
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_STV0299=y
-CONFIG_DVB_TDA8083=y
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_CX22700=y
-CONFIG_DVB_TDA1004X=y
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_STV0297=y
-CONFIG_DVB_VES1820=y
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=y
-
 #
 # I2C encoder or helper chips
 #
@@ -812,14 +830,33 @@ CONFIG_DRM_MALI_DISPLAY=m
 # Display Engine Configuration
 #
 # CONFIG_HSA_AMD is not set
-# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_ROCKCHIP is not set
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
#
 # Display Interface Bridges
 #
 CONFIG_DRM_DISPLAY_CONNECTOR=m
+# CONFIG_DRM_FSL_LDB is not set
+# CONFIG_DRM_IMX8QM_LDB is not set
+# CONFIG_DRM_IMX8QXP_LDB is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
+CONFIG_DRM_DW_HDMI_CEC=m
 # end of Display Interface Bridges
+CONFIG_DRM_IMX_DCSS=m
+CONFIG_DRM_V3D=m
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_DRM_MESON=m
@@ -829,11 +866,6 @@ CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
 # CONFIG_DRM_TIDSS is not set
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_ARMCLCD is not set
-
 #
 # Backlight & LCD device support
 #
@@ -847,6 +879,8 @@ CONFIG_DRM_PANFROST=m
 #
 # Console display driver support
 #
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=m
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALI5451 is not set
@@ -877,6 +911,7 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_AMD_ACP_CONFIG is not set
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_SOC_MIKROE_PROTO=m
+# CONFIG_SND_BCM2835_SOC_I2S is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_DESIGNWARE_PCM is not set
@@ -894,10 +929,13 @@ CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_FSL_EASRC is not set
 # CONFIG_SND_SOC_FSL_XCVR is not set
+# CONFIG_SND_SOC_FSL_AUD2HTX is not set
 CONFIG_SND_SOC_FSL_UTILS=m
 # CONFIG_SND_SOC_FSL_RPMSG is not set
 CONFIG_SND_SOC_IMX_AUDMUX=m
+# CONFIG_SND_IMX_SOC is not set
 CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MTK_BTCVSD=m
@@ -923,11 +961,19 @@ CONFIG_SND_MESON_G12A_TOACODEC=m
 CONFIG_SND_MESON_G12A_TOHDMITX=m
 CONFIG_SND_SOC_MESON_T9015=m
 # end of ASoC support for Amlogic platforms
+# CONFIG_SND_SOC_ROCKCHIP is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
#
-# STMicroelectronics STM32 SOC audio support
+# Allwinner SoC Audio support
 #
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
+# end of Allwinner SoC Audio support
 # CONFIG_SND_SOC_XILINX_I2S is not set
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -1120,14 +1166,32 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
 # CONFIG_SND_TEST_COMPONENT is not set
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_XHCI_MVEBU is not set
+CONFIG_USB_EHCI_HCD_ORION=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_CDNS3_IMX=m
+
+#
+# Platform Glue Layer
+#
+# CONFIG_USB_MUSB_SUNXI is not set
+
 #
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_MESON_G12A=m
+CONFIG_USB_DWC3_IMX8MP=m
#
 # USB Physical Layer drivers
 #
+# CONFIG_USB_MXS_PHY is not set
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 # end of USB Physical Layer drivers
@@ -1138,8 +1202,13 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_STM32_SDMMC=y
 # CONFIG_MMC_RICOH_MMC is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_ESDHC_IMX is not set
+CONFIG_MMC_SDHCI_PXAV3=m
+# CONFIG_MMC_SDHCI_IPROC is not set
 CONFIG_MMC_MESON_GX=m
 CONFIG_MMC_MESON_MX_SDIO=m
+CONFIG_MMC_MXC=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_BLUEFIELD=m
@@ -1147,6 +1216,9 @@ CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_HI3798CV200=m
 CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
+# CONFIG_MMC_DW_ROCKCHIP is not set
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_BCM2835=m
#
 # LED drivers
@@ -1157,10 +1229,11 @@ CONFIG_LEDS_PWM=m
 # Simple LED drivers
 #
 CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_GHES=y
 CONFIG_EDAC_THUNDERX=m
+CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC_XGENE=m
-# CONFIG_EDAC_BLUEFIELD is not set
-# CONFIG_EDAC_DMC520 is not set
+CONFIG_EDAC_DMC520=m
#
 # Platform RTC drivers
@@ -1170,97 +1243,141 @@ CONFIG_RTC_DRV_EFI=m
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_MESON_VRTC=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
+CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_XGENE=m
#
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-# CONFIG_AMBA_PL08X is not set
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_AMBA_PL08X=y
 CONFIG_BCM_SBA_RAID=m
+CONFIG_DMA_BCM2835=m
+CONFIG_DMA_SUN6I=m
 CONFIG_FSL_QDMA=m
-# CONFIG_HISI_DMA is not set
+CONFIG_HISI_DMA=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
+CONFIG_MV_XOR=y
 CONFIG_MV_XOR_V2=y
-# CONFIG_PL330_DMA is not set
+CONFIG_MXS_DMA=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+CONFIG_PL330_DMA=m
 CONFIG_XGENE_DMA=m
 CONFIG_XILINX_DMA=m
 CONFIG_XILINX_ZYNQMP_DMA=m
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# CONFIG_HYPERV is not set
-# end of Microsoft Hyper-V guest support
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC_PCI=m
#
 # Xen driver support
 #
 CONFIG_XEN_PCIDEV_STUB=m
 # end of Xen driver support
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
-# CONFIG_MLXREG_LC is not set
-CONFIG_MLXBF_TMFIFO=m
-# CONFIG_MLXBF_BOOTCTL is not set
-# CONFIG_MLXBF_PMC is not set
-# CONFIG_NVSW_SN2201 is not set
-CONFIG_COMMON_CLK_WM831X=y
#
 # Clock driver for ARM Reference designs
 #
-# CONFIG_CLK_ICST is not set
+CONFIG_CLK_ICST=y
 CONFIG_CLK_SP810=y
-CONFIG_CLK_VEXPRESS_OSC=y
+CONFIG_CLK_VEXPRESS_OSC=m
 # end of Clock driver for ARM Reference designs
-CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=m
+CONFIG_CLK_BCM2711_DVP=m
+CONFIG_CLK_BCM2835=y
+CONFIG_MXC_CLK=m
+CONFIG_CLK_IMX8MM=m
+CONFIG_CLK_IMX8MN=m
+CONFIG_CLK_IMX8MP=m
+CONFIG_CLK_IMX8MQ=m
+CONFIG_CLK_IMX8ULP=m
+CONFIG_CLK_IMX93=m
#
 # Clock support for Amlogic platforms
 #
-CONFIG_COMMON_CLK_MESON_REGMAP=y
-CONFIG_COMMON_CLK_MESON_DUALDIV=y
-CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_REGMAP=m
+CONFIG_COMMON_CLK_MESON_DUALDIV=m
+CONFIG_COMMON_CLK_MESON_MPLL=m
 CONFIG_COMMON_CLK_MESON_PHASE=m
-CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_PLL=m
 CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
-CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
-CONFIG_COMMON_CLK_MESON_AO_CLKC=y
-CONFIG_COMMON_CLK_MESON_EE_CLKC=y
-CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y
-CONFIG_COMMON_CLK_GXBB=y
-CONFIG_COMMON_CLK_AXG=y
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=m
+CONFIG_COMMON_CLK_MESON_AO_CLKC=m
+CONFIG_COMMON_CLK_MESON_EE_CLKC=m
+CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=m
+CONFIG_COMMON_CLK_GXBB=m
+CONFIG_COMMON_CLK_AXG=m
 CONFIG_COMMON_CLK_AXG_AUDIO=m
-CONFIG_COMMON_CLK_G12A=y
+CONFIG_COMMON_CLK_G12A=m
 # end of Clock support for Amlogic platforms
+CONFIG_ARMADA_AP_CP_HELPER=y
+CONFIG_ARMADA_37XX_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_AP_CPU_CLK=y
+CONFIG_ARMADA_CP110_SYSCON=y
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
+CONFIG_CLK_RK3568=y
+CONFIG_SUNXI_CCU=m
+CONFIG_SUN50I_A64_CCU=m
+CONFIG_SUN50I_A100_CCU=m
+CONFIG_SUN50I_A100_R_CCU=m
+CONFIG_SUN50I_H6_CCU=m
+CONFIG_SUN50I_H616_CCU=m
+CONFIG_SUN50I_H6_R_CCU=m
+CONFIG_SUN6I_RTC_CCU=m
+CONFIG_SUN8I_H3_CCU=m
+CONFIG_SUN8I_DE2_CCU=m
+CONFIG_SUN8I_R_CCU=m
+# CONFIG_HWSPINLOCK_SUN6I is not set
#
 # Clock Source drivers
 #
-CONFIG_TIMER_OF=y
 CONFIG_TIMER_ACPI=y
-CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_SUN4I_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
+CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_TIMER_IMX_SYS_CTR=y
 # end of Clock Source drivers
 CONFIG_ARM_MHU=m
-# CONFIG_ARM_MHU_V2 is not set
-# CONFIG_PL320_MBOX is not set
+CONFIG_ARM_MHU_V2=m
+CONFIG_IMX_MBOX=m
+CONFIG_PL320_MBOX=y
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
+CONFIG_ROCKCHIP_MBOX=y
+CONFIG_BCM2835_MBOX=m
 CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_SUN6I_MSGBOX=m
#
 # Generic IOMMU Pagetable Support
@@ -1270,38 +1387,67 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
 # end of Generic IOMMU Pagetable Support
-# CONFIG_ARM_SMMU is not set
-CONFIG_ARM_SMMU_V3=y
-# CONFIG_ARM_SMMU_V3_SVA is not set
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_SUN50I_IOMMU=y
+CONFIG_ARM_SMMU=m
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+CONFIG_ARM_SMMU_V3=m
+CONFIG_ARM_SMMU_V3_SVA=y
#
 # Amlogic SoC drivers
 #
 CONFIG_MESON_CANVAS=m
-CONFIG_MESON_CLK_MEASURE=y
+CONFIG_MESON_CLK_MEASURE=m
 CONFIG_MESON_GX_SOCINFO=y
-CONFIG_MESON_GX_PM_DOMAINS=y
-CONFIG_MESON_EE_PM_DOMAINS=y
+CONFIG_MESON_GX_PM_DOMAINS=m
+CONFIG_MESON_EE_PM_DOMAINS=m
 # end of Amlogic SoC drivers
#
 # Broadcom SoC drivers
 #
-# CONFIG_SOC_BRCMSTB is not set
+CONFIG_BCM2835_POWER=y
+CONFIG_SOC_BRCMSTB=y
 # end of Broadcom SoC drivers
#
 # NXP/Freescale QorIQ SoC drivers
 #
-# CONFIG_QUICC_ENGINE is not set
+CONFIG_QUICC_ENGINE=y
 # end of NXP/Freescale QorIQ SoC drivers
#
 # fujitsu SoC drivers
 #
-# CONFIG_A64FX_DIAG is not set
+CONFIG_A64FX_DIAG=y
 # end of fujitsu SoC drivers
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+CONFIG_SOC_IMX8M=y
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SUNXI_MBUS=y
+CONFIG_SUNXI_SRAM=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_ARM_IMX_BUS_DEVFREQ=m
+CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+
 #
 # Extcon Device Drivers
 #
@@ -1310,7 +1456,11 @@ CONFIG_ARM_PL172_MPMC=m
 #
 # Analog to digital converters
 #
-CONFIG_MESON_SARADC=m
+# CONFIG_BERLIN2_ADC is not set
+# CONFIG_IMX7D_ADC is not set
+# CONFIG_IMX8QXP_ADC is not set
+# CONFIG_MESON_SARADC is not set
+# CONFIG_ROCKCHIP_SARADC is not set
 # end of Analog to digital converters
#
@@ -1325,17 +1475,24 @@ CONFIG_MESON_SARADC=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
-# CONFIG_PWM_ATMEL_TCB is not set
-# CONFIG_PWM_CLK is not set
-# CONFIG_PWM_DWC is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_LP3943 is not set
+CONFIG_PWM_ATMEL_TCB=m
+CONFIG_PWM_BCM2835=m
+CONFIG_PWM_BERLIN=m
+CONFIG_PWM_CLK=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_IMX1=m
+CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_LP3943=m
 CONFIG_PWM_MESON=m
-# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_STMPE=y
-# CONFIG_PWM_TWL is not set
-# CONFIG_PWM_TWL_LED is not set
-# CONFIG_PWM_XILINX is not set
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+CONFIG_PWM_XILINX=m
#
 # IRQ chip support
@@ -1346,25 +1503,71 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_BRCMSTB_L2_IRQ=y
+CONFIG_DW_APB_ICTL=y
+CONFIG_SUN6I_R_INTC=y
+CONFIG_SUNXI_NMI_INTC=y
+CONFIG_IMX_GPCV2=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MESON_IRQ_GPIO=y
+CONFIG_IMX_IRQSTEER=y
+CONFIG_IMX_INTMUX=y
 # end of IRQ chip support
-CONFIG_RESET_MESON=y
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_BERLIN=m
+CONFIG_RESET_IMX7=m
+CONFIG_RESET_MESON=m
 CONFIG_RESET_MESON_AUDIO_ARB=m
-CONFIG_RESET_SCMI=y
+CONFIG_RESET_SCMI=m
+CONFIG_RESET_SUNXI=y
#
 # PHY Subsystem
 #
 CONFIG_PHY_XGENE=m
-CONFIG_PHY_MESON8B_USB2=y
-CONFIG_PHY_MESON_GXL_USB2=y
-CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG=y
-CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
-CONFIG_PHY_MESON_AXG_PCIE=y
-CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y
-CONFIG_PHY_MESON_AXG_MIPI_DPHY=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_SUN50I_USB3=m
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=m
+CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG=m
+CONFIG_PHY_MESON_G12A_USB2=m
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
+CONFIG_PHY_MESON_AXG_PCIE=m
+CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=m
+CONFIG_PHY_MESON_AXG_MIPI_DPHY=m
+
+#
+# PHY drivers for Broadcom platforms
+#
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+CONFIG_PHY_MIXEL_LVDS_PHY=m
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_FSL_IMX8M_PCIE=m
+CONFIG_PHY_BERLIN_SATA=m
+CONFIG_PHY_BERLIN_USB=m
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_UTMI=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
+CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PHY_ROCKCHIP_USB=m
 # end of PHY Subsystem
#
@@ -1379,6 +1582,7 @@ CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 CONFIG_ARM_SMMU_V3_PMU=m
 # CONFIG_ARM_DSU_PMU is not set
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 CONFIG_XGENE_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_ARM_DMC620_PMU is not set
@@ -1390,7 +1594,13 @@ CONFIG_XGENE_PMU=y
 #
 # Android
 #
+CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_ROCKCHIP_OTP=m
+CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_MESON_MX_EFUSE=m
+CONFIG_NVMEM_SNVS_LPGPR=m
#
 # Multiplexer drivers
@@ -1417,22 +1627,49 @@ CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 #
 # Random Number Generation
 #
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
+CONFIG_CRYPTO_DEV_ALLWINNER=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
+CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE=m
+CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS=m
+CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
+CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_MXS_DCP=m
+CONFIG_CRYPTO_DEV_MARVELL=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_HISI_SEC=m
-# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
-# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
-# CONFIG_CRYPTO_DEV_HISI_TRNG is not set
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
+CONFIG_CRYPTO_DEV_HISI_QM=m
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
+CONFIG_CRYPTO_DEV_HISI_HPRE=m
+CONFIG_CRYPTO_DEV_HISI_TRNG=m
#
 # Library routines
 #
+CONFIG_STMP_DEVICE=y
 # CONFIG_INDIRECT_PIO is not set
 # CONFIG_TRACE_MMIO_ACCESS is not set
@@ -1442,6 +1679,7 @@ CONFIG_CRYPTO_DEV_HISI_SEC=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 # end of Crypto library routines
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
@@ -1468,13 +1706,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # end of Compile-time checks and compiler options
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_WX is not set
-# end of Memory Debugging
-
 #
 # Debug Oops, Lockups and Hangs
 #
diff --git a/kernel/config-generic b/kernel/config-generic
index 131c51f40..b626e9550 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -32,11 +32,10 @@ CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC_COMPAT=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_WATCH_QUEUE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
 # CONFIG_USELIB is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@ -48,6 +47,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
@@ -97,7 +97,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
+CONFIG_BPF_LSM=y
 # end of BPF subsystem
CONFIG_PREEMPT_BUILD=y
@@ -107,7 +107,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
-# CONFIG_SCHED_CORE is not set
+CONFIG_SCHED_CORE=y
#
 # CPU/Task time and stats accounting
@@ -212,10 +212,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_EXPERT=y
-CONFIG_UID16=y
 CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
@@ -298,11 +296,11 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-# CONFIG_HZ_100 is not set
+CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
+CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC_FILE is not set
 CONFIG_RELOCATABLE=y
@@ -329,29 +327,43 @@ CONFIG_ACPI=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
-# CONFIG_ACPI_TINY_POWER_BUTTON is not set
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON_SIGNAL=38
+CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_HMAT is not set
 CONFIG_HAVE_ACPI_APEI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+# CONFIG_ACPI_APEI_EINJ is not set
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_WATCHDOG=y
 # CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_ACPI_PFRUT is not set
 CONFIG_ACPI_PCC=y
 # CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_VIOT=y
 CONFIG_ACPI_PRMT=y
#
@@ -402,7 +414,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # Binary Emulations
 #
-CONFIG_COMPAT=y
 # end of Binary Emulations
CONFIG_HAVE_KVM=y
@@ -458,7 +469,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
@@ -482,11 +492,7 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
@@ -514,11 +520,12 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
+CONFIG_MODULE_SIG_FORMAT=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -527,19 +534,27 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_ASM_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_NONE is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
-# CONFIG_MODULE_DECOMPRESS is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+CONFIG_MODULE_COMPRESS_ZSTD=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_TRIM_UNUSED_KSYMS=y
 CONFIG_UNUSED_KSYMS_WHITELIST=""
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
+CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
@@ -549,14 +564,16 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_WBT is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_FC_APPID is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-# CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_CGROUP_IOPRIO=y
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_SED_OPAL is not set
-# CONFIG_BLK_INLINE_ENCRYPTION is not set
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
#
 # Partition Types
@@ -584,7 +601,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
-CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
@@ -621,19 +637,35 @@ CONFIG_FREEZER=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=y
+CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # end of Executable file formats
#
 # Memory Management options
 #
+CONFIG_ZPOOL=y
 CONFIG_SWAP=y
-# CONFIG_ZSWAP is not set
+CONFIG_ZSWAP=y
+CONFIG_ZSWAP_DEFAULT_ON=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4"
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
+# CONFIG_ZBUD is not set
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
#
 # SLAB allocator options
@@ -665,16 +697,24 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
@@ -691,10 +731,12 @@ CONFIG_ARCH_HAS_ZONE_DMA_SET=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_HMM_MIRROR=y
+CONFIG_VMAP_PFN=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
@@ -706,7 +748,6 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 # end of Memory Management options
CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_REDIRECT=y
@@ -861,30 +902,23 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
@@ -906,7 +940,6 @@ CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
-# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
@@ -923,87 +956,7 @@ CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 # CONFIG_NF_FLOW_TABLE_PROCFS is not set
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_NETFILTER_XTABLES_COMPAT=y
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_NETFILTER_XTABLES is not set
 # end of Core Netfilter Configuration
CONFIG_IP_SET=m
@@ -1070,9 +1023,7 @@ CONFIG_IP_VS_MH_TAB_INDEX=12
 #
 # IPVS application helper
 #
-CONFIG_IP_VS_FTP=m
 CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
#
 # IP: Netfilter Configuration
@@ -1089,13 +1040,8 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
 # CONFIG_IP_NF_IPTABLES is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_NF_ARPTABLES is not set
 # end of IP: Netfilter Configuration
#
@@ -1118,7 +1064,6 @@ CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
-# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BPFILTER=y
 CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
@@ -1146,20 +1091,20 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
 # CONFIG_BRIDGE_CFM is not set
 CONFIG_NET_DSA=y
-# CONFIG_NET_DSA_TAG_AR9331 is not set
+CONFIG_NET_DSA_TAG_AR9331=m
 CONFIG_NET_DSA_TAG_BRCM_COMMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-# CONFIG_NET_DSA_TAG_HELLCREEK is not set
+CONFIG_NET_DSA_TAG_HELLCREEK=m
 CONFIG_NET_DSA_TAG_GSWIP=y
 CONFIG_NET_DSA_TAG_DSA_COMMON=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_KSZ=y
-# CONFIG_NET_DSA_TAG_OCELOT is not set
-# CONFIG_NET_DSA_TAG_OCELOT_8021Q is not set
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
 CONFIG_NET_DSA_TAG_QCA=y
 # CONFIG_NET_DSA_TAG_RTL4_A is not set
 # CONFIG_NET_DSA_TAG_RTL8_4 is not set
@@ -1167,7 +1112,7 @@ CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_SJA1105=y
 CONFIG_NET_DSA_TAG_TRAILER=y
-# CONFIG_NET_DSA_TAG_XRS700X is not set
+CONFIG_NET_DSA_TAG_XRS700X=m
 CONFIG_VLAN_8021Q=y
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
@@ -1245,14 +1190,12 @@ CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
-# CONFIG_NET_ACT_IPT is not set
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
@@ -1280,8 +1223,10 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_VSOCKETS=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
+# CONFIG_HYPERV_VSOCKETS is not set
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1291,7 +1236,10 @@ CONFIG_MPLS_IPTUNNEL=m
 # CONFIG_HSR is not set
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
+CONFIG_QRTR=m
+# CONFIG_QRTR_SMD is not set
+# CONFIG_QRTR_TUN is not set
+CONFIG_QRTR_MHI=m
 # CONFIG_NET_NCSI is not set
 CONFIG_PCPU_DEV_REFCNT=y
 CONFIG_RPS=y
@@ -1360,6 +1308,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
@@ -1375,7 +1324,7 @@ CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
+CONFIG_PAGE_POOL_STATS=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
@@ -1388,6 +1337,8 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+CONFIG_PCIE_ECRC=y
 CONFIG_PCIEASPM=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
@@ -1400,8 +1351,16 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=y
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
 CONFIG_PCI_ECAM=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
 CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCIE_BUS_SAFE is not set
@@ -1421,7 +1380,8 @@ CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_XILINX=y
-# CONFIG_PCIE_MICROCHIP_HOST is not set
+CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCIE_MICROCHIP_HOST=y
#
 # DesignWare PCI Core Support
@@ -1430,7 +1390,7 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCI_MESON=y
+CONFIG_PCI_MESON=m
 # end of DesignWare PCI Core Support
#
@@ -1441,8 +1401,12 @@ CONFIG_PCI_MESON=y
 #
 # Cadence PCIe controllers support
 #
-# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
-# CONFIG_PCI_J721E_HOST is not set
+CONFIG_PCIE_CADENCE=y
+CONFIG_PCIE_CADENCE_HOST=y
+CONFIG_PCIE_CADENCE_PLAT=y
+CONFIG_PCIE_CADENCE_PLAT_HOST=y
+CONFIG_PCI_J721E=y
+CONFIG_PCI_J721E_HOST=y
 # end of Cadence PCIe controllers support
 # end of PCI controller drivers
@@ -1455,14 +1419,11 @@ CONFIG_PCI_MESON=y
 #
 # PCI switch controller drivers
 #
-# CONFIG_PCI_SW_SWITCHTEC is not set
+CONFIG_PCI_SW_SWITCHTEC=m
 # end of PCI switch controller drivers
# CONFIG_CXL_BUS is not set
-
-#
-# PC-card bridges
-#
+# CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
#
@@ -1472,7 +1433,7 @@ CONFIG_AUXILIARY_BUS=y
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_DEVTMPFS_SAFE is not set
+CONFIG_DEVTMPFS_SAFE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -1487,7 +1448,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_COMPRESS_XZ=y
-# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
@@ -1504,7 +1465,6 @@ CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_SCCB=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # end of Generic Driver Options
@@ -1512,7 +1472,9 @@ CONFIG_DMA_SHARED_BUFFER=y
 #
 # Bus devices
 #
-# CONFIG_MHI_BUS is not set
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+# CONFIG_MHI_BUS_PCI_GENERIC is not set
 # CONFIG_MHI_BUS_EP is not set
 # end of Bus devices
@@ -1528,11 +1490,11 @@ CONFIG_PROC_EVENTS=y
 #
 # end of ARM System Control and Management Interface Protocol
+CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
 CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
@@ -1547,7 +1509,7 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
+CONFIG_RESET_ATTACK_MITIGATION=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_EARLYCON=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
@@ -1555,6 +1517,7 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_COCO_SECRET is not set
 # end of EFI (Extensible Firmware Interface) Support
+CONFIG_UEFI_CPER=y
#
 # Tegra firmware driver
@@ -1584,14 +1547,13 @@ CONFIG_PNP=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_CDROM=y
+CONFIG_CDROM=m
 # CONFIG_ZRAM is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
+# CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_XEN_BLKDEV_FRONTEND=m
@@ -1632,6 +1594,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 # CONFIG_HI6421V600_IRQ is not set
+CONFIG_HP_ILO=m
 # CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISL29020 is not set
@@ -1640,6 +1603,7 @@ CONFIG_ENCLOSURE_SERVICES=m
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
+CONFIG_SRAM=y
 # CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
@@ -1671,6 +1635,7 @@ CONFIG_TI_ST=m
# CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_ALTERA_STAPL=m
+CONFIG_VMWARE_VMCI=m
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
 # CONFIG_BCM_VK is not set
@@ -1685,21 +1650,21 @@ CONFIG_MISC_RTSX_USB=m
 #
 # SCSI device support
 #
-CONFIG_SCSI_MOD=y
+CONFIG_SCSI_MOD=m
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_COMMON=y
-CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=m
+CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_PROC_FS is not set
#
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
 CONFIG_BLK_DEV_BSG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -1748,7 +1713,7 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVUMI is not set
+CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_ESAS2R=m
 CONFIG_MEGARAID_LEGACY=m
@@ -1757,16 +1722,18 @@ CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS=m
-# CONFIG_SCSI_MPI3MR is not set
+CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
 CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
-# CONFIG_SCSI_SNIC is not set
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_FDOMAIN=m
 CONFIG_SCSI_FDOMAIN_PCI=m
@@ -1805,7 +1772,7 @@ CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
 # end of SCSI device support
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_SATA_HOST=y
 CONFIG_PATA_TIMINGS=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -1896,6 +1863,7 @@ CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
 CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_RZ1000=m
#
@@ -1912,50 +1880,39 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
+CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_WRITECACHE=m
 # CONFIG_DM_EBS is not set
-CONFIG_DM_ERA=m
+# CONFIG_DM_ERA is not set
 # CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=y
+CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=y
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_MULTIPATH_HST is not set
-# CONFIG_DM_MULTIPATH_IOA is not set
+CONFIG_DM_ZERO=m
+# CONFIG_DM_MULTIPATH is not set
 # CONFIG_DM_DELAY is not set
 # CONFIG_DM_DUST is not set
-# CONFIG_DM_INIT is not set
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -1970,7 +1927,8 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
-# CONFIG_WIREGUARD is not set
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
 CONFIG_IFB=m
@@ -1985,11 +1943,8 @@ CONFIG_VXLAN=m
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
 # CONFIG_AMT is not set
-# CONFIG_MACSEC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_MACSEC=m
+# CONFIG_NETCONSOLE is not set
 CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
@@ -1998,13 +1953,10 @@ CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_NET_VRF=m
 CONFIG_VSOCKMON=m
+# CONFIG_MHI_NET is not set
 CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_DRIVERS is not set
#
 # Distributed Switch Architecture drivers
@@ -2016,21 +1968,24 @@ CONFIG_B53_SRAB_DRIVER=m
 CONFIG_B53_SERDES=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
-# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 CONFIG_NET_DSA_MT7530=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI is not set
-CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
+CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
-# CONFIG_NET_DSA_MSCC_SEVILLE is not set
-# CONFIG_NET_DSA_AR9331 is not set
+CONFIG_NET_DSA_MSCC_SEVILLE=m
+CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_XRS700X_I2C is not set
-# CONFIG_NET_DSA_XRS700X_MDIO is not set
-# CONFIG_NET_DSA_REALTEK is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_REALTEK=m
+# CONFIG_NET_DSA_REALTEK_RTL8365MB is not set
+# CONFIG_NET_DSA_REALTEK_RTL8366RB is not set
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@@ -2079,8 +2034,10 @@ CONFIG_CNIC=m
 CONFIG_TIGON3=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
 CONFIG_SYSTEMPORT=m
 CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_CADENCE=y
@@ -2097,13 +2054,14 @@ CONFIG_LIQUIDIO=m
 CONFIG_LIQUIDIO_VF=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_CHELSIO_LIB=m
 CONFIG_CHELSIO_INLINE_CRYPTO=y
 CONFIG_CHELSIO_IPSEC_INLINE=m
-# CONFIG_CHELSIO_TLS_DEVICE is not set
+CONFIG_CHELSIO_TLS_DEVICE=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
@@ -2113,7 +2071,7 @@ CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
 CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MWI=y
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
@@ -2160,18 +2118,19 @@ CONFIG_ICE_SWITCHDEV=y
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_NET_VENDOR_WANGXUN=y
-# CONFIG_TXGBE is not set
+CONFIG_TXGBE=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
-# CONFIG_LITEX_LITEETH is not set
+CONFIG_LITEX_LITEETH=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
-# CONFIG_OCTEON_EP is not set
-# CONFIG_PRESTERA is not set
+CONFIG_OCTEON_EP=m
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
@@ -2187,12 +2146,12 @@ CONFIG_MLXSW_SPECTRUM=m
 CONFIG_MLXSW_MINIMAL=m
 CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851_MLL is not set
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
 CONFIG_NET_VENDOR_MICROCHIP=y
 CONFIG_LAN743X=m
-# CONFIG_LAN966X_SWITCH is not set
+CONFIG_LAN966X_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
@@ -2209,7 +2168,7 @@ CONFIG_NET_VENDOR_NETERION=y
 CONFIG_S2IO=m
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
@@ -2222,14 +2181,16 @@ CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
+CONFIG_IONIC=m
 CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_HWMON=y
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
 CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
@@ -2261,9 +2222,13 @@ CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
-# CONFIG_SFC_SIENA is not set
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_SRIOV=y
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
@@ -2276,7 +2241,7 @@ CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
-# CONFIG_DWMAC_LOONGSON is not set
+CONFIG_DWMAC_LOONGSON=m
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2301,10 +2266,10 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_EMACLITE is not set
+CONFIG_XILINX_EMACLITE=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
+# CONFIG_NET_SB1000 is not set
 CONFIG_PHYLINK=y
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -2316,14 +2281,14 @@ CONFIG_SFP=m
 # MII PHY device drivers
 #
 CONFIG_AMD_PHY=m
-# CONFIG_ADIN_PHY is not set
-# CONFIG_ADIN1100_PHY is not set
+CONFIG_ADIN_PHY=m
+CONFIG_ADIN1100_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AX88796B_PHY=m
 CONFIG_BROADCOM_PHY=m
-# CONFIG_BCM54140_PHY is not set
+CONFIG_BCM54140_PHY=m
 CONFIG_BCM7XXX_PHY=m
-# CONFIG_BCM84881_PHY is not set
+CONFIG_BCM84881_PHY=m
 CONFIG_BCM87XX_PHY=m
 CONFIG_BCM_NET_PHYLIB=m
 CONFIG_CICADA_PHY=m
@@ -2335,16 +2300,16 @@ CONFIG_INTEL_XWAY_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-# CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MAXLINEAR_GPHY is not set
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
 CONFIG_MEDIATEK_GE_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MOTORCOMM_PHY is not set
+CONFIG_MOTORCOMM_PHY=m
 CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_C45_TJA11XX_PHY is not set
+CONFIG_NXP_C45_TJA11XX_PHY=m
 CONFIG_NXP_TJA11XX_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -2358,8 +2323,8 @@ CONFIG_DP83822_PHY=m
 CONFIG_DP83TC811_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
-# CONFIG_DP83869_PHY is not set
-# CONFIG_DP83TD510_PHY is not set
+CONFIG_DP83869_PHY=m
+CONFIG_DP83TD510_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_XILINX_GMII2RGMII=m
 CONFIG_MDIO_DEVICE=y
@@ -2374,11 +2339,11 @@ CONFIG_MDIO_CAVIUM=m
 # CONFIG_MDIO_GPIO is not set
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
-# CONFIG_MDIO_MVUSB is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
 CONFIG_MDIO_OCTEON=m
-# CONFIG_MDIO_IPQ4019 is not set
-# CONFIG_MDIO_IPQ8064 is not set
+CONFIG_MDIO_IPQ4019=m
+CONFIG_MDIO_IPQ8064=m
 CONFIG_MDIO_THUNDER=m
#
@@ -2393,6 +2358,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # PCS device drivers
 #
 CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
 # end of PCS device drivers
CONFIG_PPP=m
@@ -2487,7 +2453,12 @@ CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_CARL9170_HWRNG=y
-# CONFIG_ATH6KL is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_ATH6KL_REGDOMAIN=y
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
@@ -2504,7 +2475,10 @@ CONFIG_ATH10K_USB=m
 CONFIG_ATH10K_DFS_CERTIFIED=y
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -2528,20 +2502,15 @@ CONFIG_B43_PHY_HT=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
 # CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
+# CONFIG_B43LEGACY is not set
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
@@ -2575,23 +2544,7 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 # end of Debugging Options
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
@@ -2611,6 +2564,7 @@ CONFIG_MT7601U=m
 CONFIG_MT76_CORE=m
 CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76_CONNAC_LIB=m
@@ -2623,16 +2577,18 @@ CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
 CONFIG_MT7615_COMMON=m
 CONFIG_MT7615E=m
-# CONFIG_MT7663U is not set
-# CONFIG_MT7663S is not set
-# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
-# CONFIG_MT7921S is not set
-# CONFIG_MT7921U is not set
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921_COMMON=m
+CONFIG_MT7921E=m
+CONFIG_MT7921S=m
+CONFIG_MT7921U=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 CONFIG_WLAN_VENDOR_PURELIFI=y
-# CONFIG_PLFXLC is not set
+CONFIG_PLFXLC=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2690,20 +2646,30 @@ CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
 CONFIG_RTW88_8822CE=m
-# CONFIG_RTW88_8723DE is not set
-# CONFIG_RTW88_8821CE is not set
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
-# CONFIG_RTW89 is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852CE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
 CONFIG_WLAN_VENDOR_SILABS=y
-# CONFIG_WFX is not set
+CONFIG_WFX=m
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
@@ -2716,27 +2682,33 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_ZD1211RW is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
 CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_VIRT_WIFI=m
 # CONFIG_WAN is not set
#
 # Wireless WAN
 #
-# CONFIG_WWAN is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
+CONFIG_WWAN_HWSIM=m
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+CONFIG_RPMSG_WWAN_CTRL=m
+CONFIG_MTK_T7XX=m
 # end of Wireless WAN
CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -2823,15 +2795,17 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_RETU_PWRBUTTON=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_AXP20X_PEK=m
+# CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_RK805_PWRKEY=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_DA7280_HAPTICS is not set
 # CONFIG_INPUT_DA9052_ONKEY is not set
 # CONFIG_INPUT_DA9055_ONKEY is not set
-CONFIG_INPUT_DA9063_ONKEY=m
+# CONFIG_INPUT_DA9063_ONKEY is not set
 # CONFIG_INPUT_WM831X_ON is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
@@ -2841,13 +2815,13 @@ CONFIG_INPUT_DA9063_ONKEY=m
 # CONFIG_INPUT_CMA3000 is not set
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-CONFIG_INPUT_STPMIC1_ONKEY=m
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_INPUT_STPMIC1_ONKEY is not set
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
-# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_SMB=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
@@ -2856,21 +2830,21 @@ CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 # CONFIG_RMI4_F34 is not set
 # CONFIG_RMI4_F3A is not set
-# CONFIG_RMI4_F54 is not set
 # CONFIG_RMI4_F55 is not set
#
 # Hardware I/O ports
 #
 CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_SERPORT=m
 # CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_HYPERV_KEYBOARD=m
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
@@ -2888,7 +2862,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_LDISC_AUTOLOAD=y
+# CONFIG_LDISC_AUTOLOAD is not set
#
 # Serial drivers
@@ -2931,6 +2905,7 @@ CONFIG_SERIAL_FSL_LPUART=m
 # CONFIG_SERIAL_FSL_LINFLEXUART is not set
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 # CONFIG_SERIAL_SPRD is not set
+# CONFIG_SERIAL_LITEUART is not set
 # end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y
@@ -2961,16 +2936,32 @@ CONFIG_IPMI_POWEROFF=m
 CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-# CONFIG_HW_RANDOM_BA431 is not set
+CONFIG_HW_RANDOM_BA431=m
 CONFIG_HW_RANDOM_VIRTIO=m
-# CONFIG_HW_RANDOM_CCTRNG is not set
-# CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
 # CONFIG_APPLICOM is not set
-CONFIG_DEVMEM=y
+# CONFIG_DEVMEM is not set
 CONFIG_DEVPORT=y
-# CONFIG_TCG_TPM is not set
+CONFIG_TCG_TPM=m
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C=m
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=m
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
+CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
@@ -3035,15 +3026,15 @@ CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EMEV2=m
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_KEMPLD=m
-# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_RK3X=m
 CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_XILINX is not set
+CONFIG_I2C_XILINX=m
#
 # External I2C/SMBus adapter drivers
@@ -3058,7 +3049,7 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_VIRTIO is not set
+CONFIG_I2C_VIRTIO=m
 # end of I2C Hardware Bus support
CONFIG_I2C_STUB=m
@@ -3070,14 +3061,10 @@ CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_DEBUG_BUS is not set
 # end of I2C support
-CONFIG_I3C=m
-CONFIG_CDNS_I3C_MASTER=m
-CONFIG_DW_I3C_MASTER=m
-# CONFIG_SVC_I3C_MASTER is not set
-# CONFIG_MIPI_I3C_HCI is not set
+# CONFIG_I3C is not set
 # CONFIG_SPI is not set
 CONFIG_SPMI=m
-# CONFIG_SPMI_HISI3670 is not set
+CONFIG_SPMI_HISI3670=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -3123,17 +3110,18 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_AXP209=m
-# CONFIG_PINCTRL_DA9062 is not set
+CONFIG_PINCTRL_DA9062=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_MCP23S08_I2C=m
 CONFIG_PINCTRL_MCP23S08=m
-# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
-# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_MICROCHIP_SGPIO=y
+CONFIG_PINCTRL_OCELOT=m
 CONFIG_PINCTRL_RK805=m
 CONFIG_PINCTRL_SINGLE=m
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_STMFX=m
+CONFIG_PINCTRL_SX150X=y
#
 # Intel pinctrl drivers
@@ -3541,7 +3529,7 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
-CONFIG_THERMAL_MMIO=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -3603,6 +3591,8 @@ CONFIG_XEN_WDT=m
 #
 # PCI-based Watchdog Cards
 #
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
#
 # USB-based Watchdog Cards
@@ -3912,820 +3902,18 @@ CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # end of CEC support
-CONFIG_MEDIA_SUPPORT=y
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=y
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_V4L2_ASYNC=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-CONFIG_MEDIA_CONTROLLER_DVB=y
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-# CONFIG_USB_GSPCA_TOPRO is not set
-# CONFIG_USB_GSPCA_TOUPTEK is not set
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_AU0828_RC is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_AS102=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-# CONFIG_DVB_USB_MXL111SF is not set
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_ZD1301=m
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_OPERA1=m
-# CONFIG_DVB_USB_PCTV452E is not set
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_SMS_USB_DRV=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# Software defined radio USB devices
-#
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_HACKRF=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-# CONFIG_VIDEO_SOLO6X10 is not set
-CONFIG_VIDEO_TW5864=m
-# CONFIG_VIDEO_TW68 is not set
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-# CONFIG_VIDEO_DT3155 is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
-
-#
-# Media capture/analog/hybrid TV support
-#
-# CONFIG_VIDEO_BT848 is not set
-
-#
-# Media digital TV PCI Adapters
-#
-# CONFIG_DVB_DDBRIDGE is not set
-CONFIG_DVB_PT3=m
-CONFIG_DVB_SMIPCIE=m
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_SHARK is not set
-# CONFIG_RADIO_SHARK2 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_KEENE is not set
-# CONFIG_USB_MA901 is not set
-# CONFIG_USB_MR800 is not set
-# CONFIG_USB_RAREMONO is not set
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_RADIO_WL128X is not set
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-# CONFIG_VIDEO_MUX is not set
-
-#
-# Allegro DVT media platform drivers
-#
-
-#
-# Amlogic media platform drivers
-#
-
-#
-# Amphion drivers
-#
-
-#
-# Aspeed media platform drivers
-#
-# CONFIG_VIDEO_ASPEED is not set
-
-#
-# Atmel media platform drivers
-#
-
-#
-# Cadence media platform drivers
-#
-# CONFIG_VIDEO_CADENCE_CSI2RX is not set
-# CONFIG_VIDEO_CADENCE_CSI2TX is not set
-
-#
-# Chips&Media media platform drivers
-#
-
-#
-# Intel media platform drivers
-#
-
-#
-# Marvell media platform drivers
-#
-# CONFIG_VIDEO_CAFE_CCIC is not set
-
-#
-# Mediatek media platform drivers
-#
-
-#
-# NVidia media platform drivers
-#
-
-#
-# NXP media platform drivers
-#
-
-#
-# Qualcomm media platform drivers
-#
-
-#
-# Renesas media platform drivers
-#
-
-#
-# Rockchip media platform drivers
-#
-
-#
-# Samsung media platform drivers
-#
-
-#
-# STMicroelectronics media platform drivers
-#
-
-#
-# Sunxi media platform drivers
-#
-
-#
-# Texas Instruments drivers
-#
-
-#
-# VIA media platform drivers
-#
-
-#
-# Xilinx media platform drivers
-#
-# CONFIG_VIDEO_XILINX is not set
-
-#
-# MMC/SDIO DVB adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_TEST_DRIVERS is not set
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
-#
-CONFIG_VIDEO_IR_I2C=y
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-# CONFIG_VIDEO_AR0521 is not set
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_HI847 is not set
-# CONFIG_VIDEO_IMX208 is not set
-CONFIG_VIDEO_IMX214=m
-# CONFIG_VIDEO_IMX219 is not set
-CONFIG_VIDEO_IMX258=m
-CONFIG_VIDEO_IMX274=m
-# CONFIG_VIDEO_IMX290 is not set
-CONFIG_VIDEO_IMX319=m
-# CONFIG_VIDEO_IMX334 is not set
-# CONFIG_VIDEO_IMX335 is not set
-CONFIG_VIDEO_IMX355=m
-# CONFIG_VIDEO_IMX412 is not set
-CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9M111=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9T112=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_MT9V111=m
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_OG01A1B is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV08D10 is not set
-CONFIG_VIDEO_OV13858=m
-# CONFIG_VIDEO_OV13B10 is not set
-CONFIG_VIDEO_OV2640=m
-CONFIG_VIDEO_OV2659=m
-CONFIG_VIDEO_OV2680=m
-CONFIG_VIDEO_OV2685=m
-# CONFIG_VIDEO_OV2740 is not set
-CONFIG_VIDEO_OV5640=m
-CONFIG_VIDEO_OV5645=m
-CONFIG_VIDEO_OV5647=m
-# CONFIG_VIDEO_OV5648 is not set
-CONFIG_VIDEO_OV5670=m
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-CONFIG_VIDEO_OV5695=m
-CONFIG_VIDEO_OV6650=m
-CONFIG_VIDEO_OV7251=m
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_OV772X=m
-CONFIG_VIDEO_OV7740=m
-CONFIG_VIDEO_OV8856=m
-# CONFIG_VIDEO_OV8865 is not set
-# CONFIG_VIDEO_OV9282 is not set
-CONFIG_VIDEO_OV9640=m
-CONFIG_VIDEO_OV9650=m
-# CONFIG_VIDEO_OV9734 is not set
-# CONFIG_VIDEO_RDACM20 is not set
-# CONFIG_VIDEO_RDACM21 is not set
-CONFIG_VIDEO_RJ54N1=m
-CONFIG_VIDEO_S5K4ECGX=m
-CONFIG_VIDEO_S5K5BAF=m
-CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VS6624=m
-# CONFIG_VIDEO_CCS is not set
-CONFIG_VIDEO_ET8EK8=m
-CONFIG_VIDEO_M5MOLS=m
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9768 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_WM8775=m
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-# end of RDS decoders
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_ADV748X=m
-CONFIG_VIDEO_ADV7604=m
-# CONFIG_VIDEO_ADV7604_CEC is not set
-CONFIG_VIDEO_ADV7842=m
-# CONFIG_VIDEO_ADV7842_CEC is not set
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-# CONFIG_VIDEO_ISL7998X is not set
-CONFIG_VIDEO_KS0127=m
-# CONFIG_VIDEO_MAX9286 is not set
-CONFIG_VIDEO_ML86V7667=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TC358743=m
-# CONFIG_VIDEO_TC358743_CEC is not set
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_TW9910=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-# end of Video decoders
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_AD9389B=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_ADV7511=m
-# CONFIG_VIDEO_ADV7511_CEC is not set
-CONFIG_VIDEO_AK881X=m
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_THS8200=m
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-# CONFIG_SDR_MAX2175 is not set
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# end of Miscellaneous helper chips
-
-CONFIG_MEDIA_TUNER=y
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_MC44S803=y
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=y
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC4000=y
-CONFIG_MEDIA_TUNER_XC5000=y
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_GP8PSK_FE=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_ZL10353=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_MXL692=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_S921=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_MN88443X=m
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_HELENE=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_LNBH25=m
-CONFIG_DVB_LNBH29=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_DRX39XYJ=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-# end of Media ancillary drivers
+# CONFIG_MEDIA_SUPPORT is not set
#
 # Graphics support
 #
-CONFIG_APERTURE_HELPERS=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_HELPER=m
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
@@ -4750,11 +3938,11 @@ CONFIG_DRM_I2C_NXP_TDA9950=m
 #
 # ARM devices
 #
-# CONFIG_DRM_KOMEDA is not set
+CONFIG_DRM_KOMEDA=m
 # end of ARM devices
CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
@@ -4794,10 +3982,11 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
-CONFIG_DRM_RCAR_DW_HDMI=m
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_USE_LVDS is not set
 # CONFIG_DRM_RCAR_MIPI_DSI is not set
 CONFIG_DRM_QXL=m
@@ -4807,25 +3996,25 @@ CONFIG_DRM_PANEL=y
 #
 # Display Panels
 #
-CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
-CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_SIMPLE is not set
 # CONFIG_DRM_PANEL_EDP is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
-CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
-CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
-CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
@@ -4833,28 +4022,28 @@ CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
-CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
-CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
-CONFIG_DRM_PANEL_SITRONIX_ST7701=m
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -4869,7 +4058,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 #
 # Display Interface Bridges
 #
-CONFIG_DRM_CDNS_DSI=m
+# CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
@@ -4879,45 +4068,38 @@ CONFIG_DRM_CDNS_DSI=m
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
 # CONFIG_DRM_ITE_IT66121 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW=m
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
 # CONFIG_DRM_PARADE_PS8640 is not set
-CONFIG_DRM_SIL_SII8620=m
-CONFIG_DRM_SII902X=m
-CONFIG_DRM_SII9234=m
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-CONFIG_DRM_THINE_THC63LVD1024=m
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TOSHIBA_TC358762 is not set
-CONFIG_DRM_TOSHIBA_TC358764=m
-CONFIG_DRM_TOSHIBA_TC358767=m
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
-CONFIG_DRM_TI_TFP410=m
+# CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
-CONFIG_DRM_TI_SN65DSI86=m
+# CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_DP=m
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_ANALOGIX_ANX7625 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
-CONFIG_DRM_DW_HDMI_CEC=m
 # end of Display Interface Bridges
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_LOGICVC is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=m
+# CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_IMX_LCDIF is not set
-CONFIG_DRM_ARCPGU=m
+# CONFIG_DRM_ARCPGU is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_GM12U320 is not set
@@ -4926,104 +4108,49 @@ CONFIG_DRM_XEN=y
 CONFIG_DRM_XEN_FRONTEND=m
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
+CONFIG_DRM_HYPERV=m
 CONFIG_DRM_LEGACY=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 CONFIG_DRM_NOMODESET=y
#
 # Frame buffer Devices
 #
 CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MODE_HELPERS is not set
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_EFI=y
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
+# CONFIG_FB is not set
 # end of Frame buffer Devices
#
 # Backlight & LCD device support
 #
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LM3533 is not set
-# CONFIG_BACKLIGHT_DA903X is not set
-# CONFIG_BACKLIGHT_DA9052 is not set
-# CONFIG_BACKLIGHT_MAX8925 is not set
-# CONFIG_BACKLIGHT_QCOM_WLED is not set
-# CONFIG_BACKLIGHT_WM831X is not set
-# CONFIG_BACKLIGHT_ADP5520 is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_88PM860X is not set
-# CONFIG_BACKLIGHT_AAT2870 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_PANDORA is not set
-# CONFIG_BACKLIGHT_SKY81452 is not set
-# CONFIG_BACKLIGHT_AS3711 is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_LED=m
 # end of Backlight & LCD device support
CONFIG_VIDEOMODE_HELPERS=y
@@ -5035,17 +4162,7 @@ CONFIG_HDMI=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 # end of Console display driver support
-
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
 # end of Graphics support
CONFIG_SOUND=m
@@ -5054,8 +4171,6 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
@@ -5135,7 +4250,6 @@ CONFIG_SND_INDIGODJX=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_ICE1724=m
@@ -5193,7 +4307,6 @@ CONFIG_SND_INTEL_DSP_CONFIG=m
 CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -5292,7 +4405,6 @@ CONFIG_HID_ORTEK=m
 CONFIG_HID_PENMOUNT=m
 CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
@@ -5313,6 +4425,7 @@ CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
 # CONFIG_HID_GREENASIA is not set
+CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_SMARTJOYPLUS is not set
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
@@ -5388,33 +4501,33 @@ CONFIG_USB_MON=m
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=y
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PCI=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_UHCI_HCD=y
-# CONFIG_USB_U132_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
-# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 # CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_XEN_HCD is not set
+CONFIG_USB_XEN_HCD=m
#
 # USB Device Class drivers
@@ -5431,7 +4544,7 @@ CONFIG_USB_TMC=m
 #
 # also be needed; see USB_STORAGE Help for more info
 #
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
@@ -5455,7 +4568,13 @@ CONFIG_USB_UAS=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS_SUPPORT is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+CONFIG_USB_CDNSP_HOST=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_HOST=y
@@ -5466,7 +4585,7 @@ CONFIG_USB_MUSB_HOST=y
 #
 # MUSB DMA mode
 #
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_DWC3_HOST=y
@@ -5477,13 +4596,13 @@ CONFIG_USB_DWC3_HOST=y
 CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_DWC3_HAPS=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2=m
 CONFIG_USB_DWC2_HOST=y
#
 # Gadget/Dual-role mode requires USB Gadget support to be enabled
 #
-CONFIG_USB_DWC2_PCI=y
+CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 CONFIG_USB_CHIPIDEA=m
@@ -5567,13 +4686,13 @@ CONFIG_USB_LCD=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_IDMOUSE is not set
-CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
-CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
 # CONFIG_USB_ISIGHTFW is not set
@@ -5584,7 +4703,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_ONBOARD_HUB is not set
+CONFIG_USB_ONBOARD_HUB=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -5607,21 +4726,24 @@ CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_RT1711H=m
-# CONFIG_TYPEC_TCPCI_MAXIM is not set
+CONFIG_TYPEC_TCPCI_MAXIM=m
 CONFIG_TYPEC_FUSB302=m
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_UCSI_STM32G0=m
 CONFIG_TYPEC_TPS6598X=m
-# CONFIG_TYPEC_ANX7411 is not set
-# CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_STUSB160X is not set
-# CONFIG_TYPEC_WUSB3801 is not set
+CONFIG_TYPEC_ANX7411=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_WUSB3801=m
#
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
-# CONFIG_TYPEC_MUX_FSA4480 is not set
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
#
@@ -5631,15 +4753,16 @@ CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # end of USB Type-C Alternate Mode drivers
-CONFIG_USB_ROLE_SWITCH=y
-CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_MMC=m
+CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
-CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
+# CONFIG_MMC_CRYPTO is not set
#
 # MMC/SD/SDIO Host Controller Drivers
@@ -5651,12 +4774,12 @@ CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
+CONFIG_MMC_SDHCI_OF_ASPEED=m
 CONFIG_MMC_SDHCI_OF_AT91=m
 CONFIG_MMC_SDHCI_OF_DWCMSHC=m
 CONFIG_MMC_SDHCI_CADENCE=m
 CONFIG_MMC_SDHCI_F_SDH30=m
-# CONFIG_MMC_SDHCI_MILBEAUT is not set
+CONFIG_MMC_SDHCI_MILBEAUT=m
 CONFIG_MMC_ALCOR=m
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_CB710=m
@@ -5666,15 +4789,17 @@ CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_CQHCI=m
-# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_HSQ=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_AM654=m
 CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
+CONFIG_MMC_LITEX=m
 CONFIG_SCSI_UFSHCD=m
 # CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_UFS_CRYPTO is not set
 # CONFIG_SCSI_UFS_HPB is not set
 # CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_UFSHCD_PCI=m
@@ -5836,7 +4961,7 @@ CONFIG_RTC_DRV_MAX8925=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
-# CONFIG_RTC_DRV_NCT3018Y is not set
+CONFIG_RTC_DRV_NCT3018Y=m
 CONFIG_RTC_DRV_RK808=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5856,7 +4981,7 @@ CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
 CONFIG_RTC_DRV_RC5T583=m
-# CONFIG_RTC_DRV_RC5T619 is not set
+CONFIG_RTC_DRV_RC5T619=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_RX8010=m
@@ -5864,7 +4989,7 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3028=m
-# CONFIG_RTC_DRV_RV3032 is not set
+CONFIG_RTC_DRV_RV3032=m
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_SD3078=m
@@ -5933,20 +5058,20 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
+CONFIG_ALTERA_MSGDMA=m
 CONFIG_DW_AXI_DMAC=m
 CONFIG_FSL_EDMA=m
 CONFIG_INTEL_IDMA64=m
-# CONFIG_PLX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DPDMA is not set
+CONFIG_PLX_DMA=m
+CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-# CONFIG_SF_PDMA is not set
+CONFIG_SF_PDMA=m
#
 # DMA Clients
@@ -5979,10 +5104,11 @@ CONFIG_UIO=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_UIO_HV_GENERIC is not set
 # CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
-# CONFIG_NITRO_ENCLAVES is not set
+CONFIG_NITRO_ENCLAVES=m
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_PCI_LIB=m
@@ -6007,6 +5133,9 @@ CONFIG_VHOST_VSOCK=m
 #
 # Microsoft Hyper-V guest support
 #
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
 # end of Microsoft Hyper-V guest support
#
@@ -6032,18 +5161,18 @@ CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_FRONT_PGDIR_SHBUF=m
-# CONFIG_XEN_VIRTIO is not set
+CONFIG_XEN_GRANT_DMA_IOMMU=y
+CONFIG_XEN_GRANT_DMA_OPS=y
+CONFIG_XEN_VIRTIO=y
+CONFIG_XEN_VIRTIO_FORCE_GRANT=y
 # end of Xen driver support
# CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_STAGING is not set
 # CONFIG_CHROME_PLATFORMS is not set
-CONFIG_SURFACE_PLATFORMS=y
-# CONFIG_SURFACE_3_POWER_OPREGION is not set
-# CONFIG_SURFACE_GPE is not set
-# CONFIG_SURFACE_HOTPLUG is not set
-# CONFIG_SURFACE_PRO3_BUTTON is not set
+# CONFIG_MELLANOX_PLATFORM is not set
+# CONFIG_SURFACE_PLATFORMS is not set
#
 # Intel Speed Select Technology interface support
@@ -6059,6 +5188,8 @@ CONFIG_SURFACE_PLATFORMS=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_MAX9485=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI5341=m
@@ -6071,9 +5202,9 @@ CONFIG_COMMON_CLK_CDCE925=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=m
-# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
+CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_PALMAS=m
-# CONFIG_COMMON_CLK_RS9_PCIE is not set
+CONFIG_COMMON_CLK_RS9_PCIE=m
 CONFIG_COMMON_CLK_VC5=m
 CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
@@ -6083,15 +5214,18 @@ CONFIG_HWSPINLOCK=y
 #
 # Clock Source drivers
 #
-# CONFIG_MICROCHIP_PIT64B is not set
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_MICROCHIP_PIT64B=y
 # end of Clock Source drivers
CONFIG_MAILBOX=y
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
 CONFIG_PCC=y
 CONFIG_ALTERA_MBOX=m
-# CONFIG_MAILBOX_TEST is not set
+CONFIG_MAILBOX_TEST=m
 CONFIG_IOMMU_IOVA=y
+CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
@@ -6102,12 +5236,13 @@ CONFIG_IOMMU_IO_PGTABLE=y
 # end of Generic IOMMU Pagetable Support
# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
-CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_IOMMU_SVA=y
+CONFIG_VIRTIO_IOMMU=m
#
 # Remoteproc drivers
@@ -6160,12 +5295,14 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Enable LiteX SoC Builder specific drivers
 #
-# CONFIG_LITEX_SOC_CONTROLLER is not set
+CONFIG_LITEX=y
+CONFIG_LITEX_SOC_CONTROLLER=m
 # end of Enable LiteX SoC Builder specific drivers
#
 # Qualcomm SoC drivers
 #
+CONFIG_QCOM_QMI_HELPERS=m
 # end of Qualcomm SoC drivers
CONFIG_SOC_TI=y
@@ -6209,7 +5346,7 @@ CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
-# CONFIG_EXTCON_USBC_TUSB320 is not set
+CONFIG_EXTCON_USBC_TUSB320=m
 CONFIG_MEMORY=y
 CONFIG_IIO=m
 # CONFIG_IIO_BUFFER is not set
@@ -6615,21 +5752,21 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 #
 CONFIG_IRQCHIP=y
 CONFIG_AL_FIC=y
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 # end of IRQ chip support
# CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_SIMPLE is not set
+CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_TI_SYSCON=m
-# CONFIG_RESET_TI_TPS380X is not set
+CONFIG_RESET_TI_TPS380X=m
#
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-# CONFIG_PHY_CAN_TRANSCEIVER is not set
+CONFIG_PHY_CAN_TRANSCEIVER=m
#
 # PHY drivers for Broadcom platforms
@@ -6637,17 +5774,17 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_BCM_KONA_USB2_PHY=m
 # end of PHY drivers for Broadcom platforms
-# CONFIG_PHY_CADENCE_TORRENT is not set
+CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY=m
-# CONFIG_PHY_CADENCE_DPHY_RX is not set
+CONFIG_PHY_CADENCE_DPHY_RX=m
 CONFIG_PHY_CADENCE_SIERRA=m
-# CONFIG_PHY_CADENCE_SALVO is not set
+CONFIG_PHY_CADENCE_SALVO=m
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-# CONFIG_PHY_LAN966X_SERDES is not set
+CONFIG_PHY_LAN966X_SERDES=m
 CONFIG_PHY_CPCAP_USB=m
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_MAPPHONE_MDM6600=m
+CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_SAMSUNG_USB2=m
@@ -6678,10 +5815,11 @@ CONFIG_ND_BTT=m
 CONFIG_BTT=y
 # CONFIG_OF_PMEM is not set
 CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_SPMI_SDAM is not set
-# CONFIG_NVMEM_RMEM is not set
+CONFIG_NVMEM_SPMI_SDAM=m
+CONFIG_NVMEM_RMEM=m
#
 # HW tracing support
@@ -6745,8 +5883,8 @@ CONFIG_XFS_ONLINE_REPAIR=y
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-CONFIG_BTRFS_FS=y
-# CONFIG_BTRFS_FS_POSIX_ACL is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -6760,6 +5898,7 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
+# CONFIG_FS_ENCRYPTION_INLINE_CRYPT is not set
 # CONFIG_FS_VERITY is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -6818,9 +5957,13 @@ CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_FAT_DEFAULT_UTF8=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 # CONFIG_NTFS_FS is not set
-# CONFIG_NTFS3_FS is not set
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
 # end of DOS/FAT/EXFAT/NT Filesystems
#
@@ -6855,7 +5998,21 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
@@ -6933,7 +6090,7 @@ CONFIG_CIFS=m
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 # CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_SMB_SERVER is not set
@@ -6991,9 +6148,7 @@ CONFIG_NLS_MAC_INUIT=m
 CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEPRECATED_API is not set
-# CONFIG_DLM_DEBUG is not set
+# CONFIG_DLM is not set
 # CONFIG_UNICODE is not set
 CONFIG_IO_WQ=y
 # end of File systems
@@ -7013,7 +6168,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
@@ -7022,10 +6177,14 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_SECURITY_LANDLOCK is not set
+CONFIG_SECURITY_LOCKDOWN_LSM=y
+CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE is not set
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
+CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY=y
+CONFIG_SECURITY_LANDLOCK=y
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -7034,7 +6193,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama,loadpin,safesetid,integrity"
+CONFIG_LSM="yama,loadpin,safesetid,integrity,landlock"
#
 # Kernel hardening options
@@ -7057,16 +6216,18 @@ CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 CONFIG_INIT_ON_FREE_DEFAULT_ON=y
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-# CONFIG_ZERO_CALL_USED_REGS is not set
+CONFIG_ZERO_CALL_USED_REGS=y
 # end of Memory initialization
-CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_NONE is not set
 # CONFIG_RANDSTRUCT_FULL is not set
-# CONFIG_RANDSTRUCT_PERFORMANCE is not set
+CONFIG_RANDSTRUCT_PERFORMANCE=y
+CONFIG_RANDSTRUCT=y
+CONFIG_GCC_PLUGIN_RANDSTRUCT=y
 # end of Kernel hardening options
 # end of Security options
-CONFIG_XOR_BLOCKS=y
+CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
@@ -7100,10 +6261,10 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_PCRYPT=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
+# CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_ENGINE=m
#
@@ -7111,13 +6272,13 @@ CONFIG_CRYPTO_ENGINE=m
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=m
-# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
-CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
+CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECDSA is not set
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECRDSA=m
 # CONFIG_CRYPTO_SM2 is not set
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
#
 # Authenticated Encryption with Associated Data
@@ -7126,25 +6287,26 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 # CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_ECHAINIV=m
#
 # Block modes
 #
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=y
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_OFB=y
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XCTR=m
+CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_NHPOLY1305=m
 CONFIG_CRYPTO_ADIANTUM=m
-# CONFIG_CRYPTO_HCTR2 is not set
+CONFIG_CRYPTO_HCTR2=m
 CONFIG_CRYPTO_ESSIV=m
#
@@ -7159,12 +6321,13 @@ CONFIG_CRYPTO_VMAC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_XXHASH=y
-CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLYVAL=m
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -7191,7 +6354,7 @@ CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_CHACHA20=m
 # CONFIG_CRYPTO_ARIA is not set
 CONFIG_CRYPTO_SERPENT=m
@@ -7206,7 +6369,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_842=y
-CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
@@ -7234,14 +6397,22 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_NITROX=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_DEV_CCREE=m
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
@@ -7254,6 +6425,9 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
 #
 # Certificates for signature checking
 #
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+# CONFIG_MODULE_SIG_KEY_TYPE_RSA is not set
+CONFIG_MODULE_SIG_KEY_TYPE_ECDSA=y
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
@@ -7266,7 +6440,7 @@ CONFIG_BINARY_PRINTF=y
 #
 # Library routines
 #
-CONFIG_RAID6_PQ=y
+CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_LINEAR_RANGES=y
 CONFIG_PACKING=y
@@ -7290,18 +6464,20 @@ CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-# CONFIG_CRYPTO_LIB_CHACHA is not set
-# CONFIG_CRYPTO_LIB_CURVE25519 is not set
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-# CONFIG_CRYPTO_LIB_POLY1305 is not set
-# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines
CONFIG_LIB_MEMNEQ=y
-CONFIG_CRC_CCITT=y
+CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC64_ROCKSOFT=y
@@ -7318,14 +6494,13 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
 CONFIG_XXHASH=y
-CONFIG_RANDOM32_SELFTEST=y
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_842_COMPRESS=y
 CONFIG_842_DECOMPRESS=y
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
@@ -7337,7 +6512,7 @@ CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
-# CONFIG_XZ_DEC_MICROLZMA is not set
+CONFIG_XZ_DEC_MICROLZMA=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -7349,7 +6524,6 @@ CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_ZSTD=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC16=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
@@ -7401,9 +6575,8 @@ CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+CONFIG_FONT_AUTOSELECT=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_MEMREGION=y
@@ -7415,6 +6588,7 @@ CONFIG_OBJAGG=m
 # end of Library routines
CONFIG_PLDMFW=y
+CONFIG_POLYNOMIAL=m
#
 # Kernel hacking
@@ -7489,15 +6663,18 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 #
 # Memory Debugging
 #
-CONFIG_PAGE_EXTENSION=y
+# CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
-CONFIG_PAGE_POISONING=y
+# CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
+CONFIG_DEBUG_WX=y
 CONFIG_GENERIC_PTDUMP=y
+CONFIG_PTDUMP_CORE=y
 # CONFIG_PTDUMP_DEBUGFS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SHRINKER_DEBUG is not set
@@ -7510,7 +6687,7 @@ CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
@@ -7518,7 +6695,12 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
 CONFIG_HAVE_ARCH_KFENCE=y
-# CONFIG_KFENCE is not set
+CONFIG_KFENCE=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=100
+CONFIG_KFENCE_NUM_OBJECTS=255
+# CONFIG_KFENCE_DEFERRABLE is not set
+# CONFIG_KFENCE_STATIC_KEYS is not set
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 # end of Memory Debugging
CONFIG_DEBUG_SHIRQ=y
@@ -7649,8 +6831,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_RV is not set
 # CONFIG_SAMPLES is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_STRICT_DEVMEM is not set
#
 # x86 Debugging
@@ -7710,5 +6891,6 @@ CONFIG_REED_SOLOMON_TEST=m
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
+# CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/kernel/config-x86-generic b/kernel/config-x86_64-generic
similarity index 82%
rename from kernel/config-x86-generic
rename to kernel/config-x86_64-generic
index a936bd85e..0b2901710 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86_64-generic
@@ -5,16 +5,15 @@
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_ZSTD is not set
+CONFIG_KERNEL_ZSTD=y
#
 # IRQ subsystem
 #
 CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_INJECTION=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 # end of IRQ subsystem
@@ -116,7 +115,6 @@ CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_GART_IOMMU=y
-CONFIG_BOOT_VESA_SUPPORT=y
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
@@ -188,7 +186,6 @@ CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
@@ -204,7 +201,7 @@ CONFIG_RETHUNK=y
 CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPU_IBPB_ENTRY=y
 CONFIG_CPU_IBRS_ENTRY=y
-# CONFIG_SLS is not set
+CONFIG_SLS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -220,30 +217,18 @@ CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_FPDT is not set
+CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_PLATFORM_PROFILE=m
-CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-# CONFIG_ACPI_APEI_EINJ is not set
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_ACPI_DPTF is not set
 CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_ADXL=y
@@ -254,7 +239,7 @@ CONFIG_X86_PM_TIMER=y
 #
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
-# CONFIG_X86_AMD_PSTATE is not set
+CONFIG_X86_AMD_PSTATE=m
 CONFIG_X86_ACPI_CPUFREQ=m
 # CONFIG_X86_ACPI_CPUFREQ_CPB is not set
 CONFIG_X86_POWERNOW_K8=m
@@ -271,7 +256,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 # CPU Idle
 #
 # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-CONFIG_HALTPOLL_CPUIDLE=y
+# CONFIG_HALTPOLL_CPUIDLE is not set
 # end of CPU Idle
 CONFIG_INTEL_IDLE=y
 # end of Power management and ACPI options
@@ -292,13 +277,10 @@ CONFIG_AMD_NB=y
 #
 # Binary Emulations
 #
-CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_EMULATION is not set
 # CONFIG_X86_X32_ABI is not set
-CONFIG_COMPAT_32=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 # end of Binary Emulations
 CONFIG_KVM_ASYNC_PF=y
-CONFIG_KVM_COMPAT=y
 CONFIG_KVM=m
 CONFIG_KVM_WERROR=y
 CONFIG_KVM_INTEL=m
@@ -320,7 +302,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_MMAP_RND_BITS=32
@@ -342,61 +323,24 @@ CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
 #
 CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=y
-CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_THP_SWAP=y
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_VMAP_PFN=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
-CONFIG_MAPPING_DIRTY_HELPERS=y
-
-#
-# Networking options
-#
-# CONFIG_XFRM_USER_COMPAT is not set
-
-#
-# Classification
-#
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_HYPERV_VSOCKETS=m
-# end of Networking options
-
-#
-# Network testing
-#
-CONFIG_RFKILL_GPIO=m
#
 # Device Drivers
 #
 # CONFIG_EISA is not set
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIE_ECRC=y
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=y
-CONFIG_PCI_PF_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_PCI_ATS=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_HYPERV=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
#
 # PCI controller drivers
 #
 CONFIG_VMD=m
-CONFIG_PCI_HYPERV_INTERFACE=m
#
 # DesignWare PCI Core Support
@@ -405,23 +349,6 @@ CONFIG_PCI_HYPERV_INTERFACE=m
 # end of DesignWare PCI Core Support
 # end of PCI controller drivers
-#
-# PCI switch controller drivers
-#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-
 #
 # Firmware loader
 #
@@ -433,7 +360,6 @@ CONFIG_FW_CACHE=y
 #
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
@@ -447,7 +373,6 @@ CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_EFI_RCI2_TABLE is not set
 # end of EFI (Extensible Firmware Interface) Support
-CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
#
@@ -458,19 +383,15 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 #
 # Protocols
 #
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_FD_RAWCMD is not set
+# CONFIG_BLK_DEV_FD is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_RAM_SIZE=16384
#
 # Misc devices
 #
 CONFIG_SENSORS_LIS3LV02D=m
 # CONFIG_IBM_ASM is not set
-CONFIG_HP_ILO=m
 CONFIG_VMWARE_BALLOON=m
-# CONFIG_SRAM is not set
#
 # Texas Instruments shared transport line discipline
@@ -481,7 +402,6 @@ CONFIG_INTEL_MEI_TXE=m
 # CONFIG_INTEL_MEI_GSC is not set
 # CONFIG_INTEL_MEI_HDCP is not set
 # CONFIG_INTEL_MEI_PXP is not set
-CONFIG_VMWARE_VMCI=m
 # end of Misc devices
#
@@ -497,35 +417,15 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_FLASHPOINT=y
 CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
 CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_ISCI=m
 # CONFIG_SATA_ZPODD is not set
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_OF_PLATFORM=m
-
 #
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MII=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
#
 # Distributed Switch Architecture drivers
@@ -533,27 +433,20 @@ CONFIG_ATM_SOLOS=m
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_CX_ECAT=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT_SRIOV=y
-CONFIG_CHELSIO_T1_1G=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
 CONFIG_TULIP_MMIO=y
 CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_PCMCIA_XIRCOM=m
 CONFIG_E1000E_HWTS=y
 CONFIG_IGB_DCA=y
 CONFIG_IXGBE_DCA=y
 CONFIG_ICE_HWTS=y
 CONFIG_SKGE_GENESIS=y
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MYRI10GE_DCA=y
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QED_SRIOV=y
 # CONFIG_8139TOO_PIO is not set
 CONFIG_8139TOO_8129=y
-CONFIG_SFC_SRIOV=y
 CONFIG_DWMAC_INTEL=m
 CONFIG_STMMAC_PCI=m
 CONFIG_VIA_RHINE_MMIO=y
@@ -574,8 +467,9 @@ CONFIG_IPW2200_QOS=y
 #
 # Wireless WAN
 #
+CONFIG_IOSM=m
+# end of Wireless WAN
 CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=m
#
 # Input Device Drivers
@@ -585,9 +479,7 @@ CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_GPIO_BEEPER=m
 # CONFIG_INPUT_ATLAS_BTNS is not set
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
#
 # Hardware I/O ports
@@ -595,7 +487,6 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
 CONFIG_SERIO_I8042=y
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_HYPERV_KEYBOARD=m
 # end of Hardware I/O ports
#
@@ -632,8 +523,8 @@ CONFIG_NVRAM=y
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_NSC=m
 # CONFIG_TELCLOCK is not set
-# CONFIG_RANDOM_TRUST_CPU is not set
 # end of Character devices
#
@@ -671,7 +562,6 @@ CONFIG_I2C_MLXCPLD=m
 #
 CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_VMW is not set
-CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_AS3722 is not set
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_PALMAS=y
@@ -837,12 +727,6 @@ CONFIG_INTEL_MEI_WDT=m
 CONFIG_NI903X_WDT=m
 CONFIG_NIC7018_WDT=m
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
 #
 # Multifunction device drivers
 #
@@ -882,117 +766,17 @@ CONFIG_IR_WINBOND_CIR=m
 # CONFIG_CEC_SECO is not set
 # end of CEC support
-#
-# Video4Linux options
-#
-CONFIG_VIDEOBUF_DMA_SG=m
-# end of Video4Linux options
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_DM1105=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-# CONFIG_VIDEO_IPU3_CIO2 is not set
-
-#
-# common driver options
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEOBUF2_DVB=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-# end of RDS decoders
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-# end of Audio/Video compression chips
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_TDA8083=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_TDA1004X=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_VES1820=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-
 #
 # Graphics support
 #
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_VIA=y
-CONFIG_INTEL_GTT=y
-CONFIG_VGA_SWITCHEROO=y
+CONFIG_APERTURE_HELPERS=y
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_INTEL_GTT=m
+# CONFIG_VGA_SWITCHEROO is not set
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
#
@@ -1041,10 +825,8 @@ CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
 CONFIG_DRM_I915_STOP_TIMEOUT=100
 CONFIG_DRM_I915_TIMESLICE_DURATION=1
 # end of drm/i915 Profile Guided Optimisation
-CONFIG_DRM_VMWGFX=m
-# CONFIG_DRM_VMWGFX_FBCON is not set
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_GMA500 is not set
+CONFIG_DRM_GMA500=m
#
 # Display Interface Bridges
@@ -1052,29 +834,15 @@ CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
 # end of Display Interface Bridges
 CONFIG_DRM_VBOXVIDEO=m
-# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_SIS is not set
 CONFIG_DRM_PRIVACY_SCREEN=y
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_HYPERV is not set
-
 #
 # Backlight & LCD device support
 #
 CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_SAHARA=m
 # end of Backlight & LCD device support
#
@@ -1097,7 +865,6 @@ CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
-# CONFIG_SND_ES1968_RADIO is not set
 CONFIG_SND_ICE1712=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
@@ -1116,12 +883,6 @@ CONFIG_SND_X86=y
 # CONFIG_HDMI_LPE_AUDIO is not set
 CONFIG_SND_SYNTH_EMUX=m
-#
-# Special HID drivers
-#
-# CONFIG_HID_HYPERV_MOUSE is not set
-# end of Special HID drivers
-
 #
 # Intel ISH HID support
 #
@@ -1192,12 +953,12 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # DMA Devices
 #
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_INTEL_IDXD is not set
 # CONFIG_INTEL_IDXD_COMPAT is not set
 CONFIG_INTEL_IOATDMA=m
 # CONFIG_AMD_PTDMA is not set
 CONFIG_DW_DMAC_CORE=y
-CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
 CONFIG_HSU_DMA=m
 # CONFIG_INTEL_LDMA is not set
@@ -1206,7 +967,6 @@ CONFIG_HSU_DMA=m
 # DMABUF options
 #
 CONFIG_DCA=m
-# CONFIG_UIO_HV_GENERIC is not set
 CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_VBOXGUEST=m
 # CONFIG_EFI_SECRET is not set
@@ -1214,10 +974,7 @@ CONFIG_VBOXGUEST=m
 #
 # Microsoft Hyper-V guest support
 #
-CONFIG_HYPERV=m
 CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
 # end of Microsoft Hyper-V guest support
#
@@ -1231,7 +988,6 @@ CONFIG_XEN_ACPI=y
 # CONFIG_XEN_SYMS is not set
 CONFIG_XEN_HAVE_VPMU=y
 # end of Xen driver support
-# CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
@@ -1332,8 +1088,6 @@ CONFIG_INTEL_IPS=m
 # CONFIG_SIEMENS_SIMATIC_IPC is not set
 # CONFIG_WINMATE_FM07_KEYS is not set
 CONFIG_P2SB=y
-CONFIG_COMMON_CLK_WM831X=m
-CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_CLK_LGM_CGU is not set
#
@@ -1343,18 +1097,16 @@ CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
 # end of Clock Source drivers
-CONFIG_IOASID=y
#
 # Generic IOMMU Pagetable Support
 #
-CONFIG_IOMMU_SVA=y
 CONFIG_AMD_IOMMU=y
 CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_SVM=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
 CONFIG_IRQ_REMAP=y
@@ -1394,11 +1146,6 @@ CONFIG_EXTCON_INTEL_CHT_WC=m
 #
 # CONFIG_RAS_CEC is not set
-#
-# Android
-#
-# CONFIG_DEV_DAX is not set
-
 #
 # Multiplexer drivers
 #
@@ -1432,7 +1179,7 @@ CONFIG_CRYPTO_SIMD=m
 #
 # Public-key cryptography
 #
-# CONFIG_CRYPTO_CURVE25519_X86 is not set
+CONFIG_CRYPTO_CURVE25519_X86=m
#
 # Authenticated Encryption with Associated Data
@@ -1450,9 +1197,9 @@ CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 #
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-# CONFIG_CRYPTO_BLAKE2S_X86 is not set
+CONFIG_CRYPTO_BLAKE2S_X86=y
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
+CONFIG_CRYPTO_POLYVAL_CLMUL_NI=m
 CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
@@ -1488,13 +1235,6 @@ CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_SP_PSP=y
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
#
 # Library routines
@@ -1504,9 +1244,11 @@ CONFIG_GENERIC_IOMAP=y
 #
 # Crypto library routines
 #
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 # end of Crypto library routines
+CONFIG_ZLIB_DEFLATE=y
#
 # Default contiguous memory area size:
@@ -1524,9 +1266,6 @@ CONFIG_OBJTOOL=y
 #
 # Memory Debugging
 #
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_WX=y
-CONFIG_PTDUMP_CORE=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
 # CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
 # end of Memory Debugging
@@ -1591,5 +1330,4 @@ CONFIG_UNWINDER_ORC=y
 #
 # CONFIG_TEST_FPU is not set
 # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
-# CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b2e2e26c2..0ce81c298 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name       = kernel
 version    = 6.0.6
-release    = 0.2
+release    = 1
 thisapp    = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org
@@ -29,8 +29,6 @@ source_dl    = https://www.kernel.org/pub/linux/kernel/v6.x/
 sources      = %{thisapp}.tar.xz
build
-	kernel_logo = /usr/share/pixmaps/kernel-logo.ppm
-
    requires
    	asciidoc
    	bc
@@ -47,6 +45,8 @@ build
    	ncurses-devel
    	net-tools
    	newt-devel
+		openssl
+		/usr/bin/openssl
    	pciutils-devel
    	perl
    	python3
@@ -56,9 +56,9 @@ build
    	slang-devel
    	xmlto
    	xz
+		zstd
/sbin/depmod
-		%{kernel_logo}
    end
kernel_arch = %{DISTRO_PLATFORM}
@@ -79,9 +79,6 @@ build
sed -e "s/$(HOST_LFS_CFLAGS)/& -fPIC/g" -i Makefile
-		cp -vf %{kernel_logo} \
-			drivers/video/logo/logo_linux_clut224.ppm
-
    	# Get rid of unwanted files resulting from patch fuzz.
    	find . ( -name "*.orig" -o -name "*~" ) -exec rm -f {} ; >/dev/null
@@ -97,7 +94,7 @@ build
    	configure_kernel() {
    		local flavour=${1}
    		local suffix
-			if [ "${flavour}" != "default" ]; then
+			if [ "${flavour}" != "generic" ]; then
    			suffix="-${flavour}"
    		fi
@@ -107,7 +104,7 @@ build
# Generate configuration files for all kernels we are going to
    	# build.
-		configure_kernel "default"
+		configure_kernel "generic"
    end
build
@@ -116,7 +113,7 @@ build
    		local suffix
    		local localversion="%{localversion}"
    		local fullversion="%{fullver}"
-			if [ "${flavour}" != "default" ]; then
+			if [ "${flavour}" != "generic" ]; then
    			suffix="-${flavour}"
    			localversion="${localversion}.${flavour}"
    			fullversion="${fullversion}.${flavour}"
@@ -220,7 +217,7 @@ build
    	}
# Build the kernel
-		build_kernel "default"
+		build_kernel "generic"
# cpupower
    	chmod +x tools/power/cpupower/utils/version-gen.sh
@@ -275,6 +272,10 @@ packages
    	end
    end
+	package kernel-tools-debuginfo
+		template DEBUGINFO
+	end
+
    package kernel
    	summary = The Linux kernel %{fullver}
diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index d507f24b0..060e0dcbc 100644
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -4,19 +4,15 @@
 # Copyright (C) - IPFire Development Team info@ipfire.org                   #
 ###############################################################################
-BASEDIR=$(dirname ${0})
-SCRIPTS_DIR=${BASEDIR}
+BASEDIR="$(dirname "${0}")"
+SCRIPTS_DIR="${BASEDIR}"
-# x86_64
-CONFIGS="x86_64:default"
+CONFIGS=(
+	# x86_64
+	"x86_64:generic"
-# aarch64
-CONFIGS="${CONFIGS} aarch64:default"
-
-PLATFORMS="x86 arm"
-declare -A SUBPLATFORMS
-SUBPLATFORMS=(
-	[arm]="arm64"
+	# aarch64
+	"aarch64:generic"
 )
search_kernel_dir() {
@@ -29,36 +25,50 @@ search_kernel_dir() {
    done
 }
-function get_platform() {
+arches() {
+	local config
+	for config in ${CONFIGS[@]}; do
+		echo "${config%:*}"
+	done
+}
+
+flavours_for_arch() {
    local arch="${1}"
-	case "${arch}" in
-		aarch64)
-			echo "arm"
-			;;
-		x86_64)
-			echo "x86"
-			;;
-		*)
-			return 1
-			;;
-	esac
+	local config
+	for config in ${CONFIGS[@]}; do
+		if [ "${arch}:" = "${config%:*}:" ]; then
+			echo "${config#*:}"
+		fi
+	done
 }
-function get_subplatform() {
+configs() {
    local arch="${1}"
+	local flavour="${2}"
+	shift 2
-	case "${arch}" in
-		aarch64)
-			echo "arm64"
-			;;
-		*)
-			return 1
-			;;
-	esac
+	# Add any extra files first
+	local configs=( "$@" )
+
+	# Add the generic configuration
+	configs+=( "config-generic" )
+
+	# If flavour is not generic, we add *-generic
+	if [ "${flavour}" != "generic" ]; then
+		configs+=( "config-${arch}-generic" )
+	fi
+
+	# Add the architecture/flavour configuration
+	configs+=( "config-${arch}-${flavour}" )
+
+	# Return the result
+	echo "${configs[@]}"
+
+	return 0
 }
-function get_kernel_arch() {
+get_kernel_arch() {
    local arch="${1}"
case "${arch}" in
@@ -68,89 +78,74 @@ function get_kernel_arch() {
    	x86_64)
    		echo "x86"
    		;;
+		*)
+			echo "${arch}"
+			;;
    esac
 }
-function merge_config() {
-	local arch=${1}
-	local flavour=${2}
-	local output=${3}
+kernel_config() {
+	local arch="${1}"
+	local action="${2}"
+	local config_in="${3}"
+	local config_out="${4}"
+
+	echo "Running 'make ${action}' for ${arch}..."
+
+	local kernel_arch="$(get_kernel_arch "${arch}")"
+
+	pushd "${KERNEL_DIR}" >/dev/null
+
+	cat "${config_in}" > ".config"
+
+	# Run the configuration program
+	make ARCH="${kernel_arch}" "${action}"
+
+	# Write back the configuration file
+	cat ".config" > "${config_out}"
+
+	popd >/dev/null
+}
+
+merge_config() {
+	local arch="${1}"
+	local flavour="${2}"
+	local output="${3}"
    shift 3
local arg
    for arg in arch flavour output; do
    	if [ -z "${!arg}" ]; then
    		echo >&2 "merge usage: <arch> <flavour> <output filename>"
-			exit 2
+			return 2
    	fi
    done
-	local config_mode="olddefconfig"
-	local extra_configs
-	while [ $# -gt 0 ]; do
-		case "${1}" in
-			--mode=*)
-				config_mode=${1#--mode=}
-				shift
-				;;
-			-*)
-				echo >&2 "Unknown option: ${1}"
-				;;
-			*)
-				extra_configs="${extra_configs} ${1}"
-				;;
-		esac
-		shift
-	done
-
-	local configs="${extra_configs} config-generic"
-
-	case "${arch}:${flavour}" in
-		# x86
-		x86_64:default)
-			configs="${configs} config-x86-generic"
-			;;
-
-		# ARM64
-		aarch64:default)
-			configs="${configs} config-arm64-generic"
-			;;
-
-		*)
-			echo >&2 "ERROR: Invalid parameters given: $@"
-			return 1
-			;;
-	esac
+	local configs="$(configs "${arch}" "${flavour}" "$@")"
# Merge the configuration files from its elementary configuration
    # files.
-	local tmp_out=$(mktemp)
-	local tmp_in=$(mktemp)
+	local tmp_out="$(mktemp)"
+	local tmp_in="$(mktemp)"
local config
    for config in ${configs}; do
-		cat ${tmp_out} > ${tmp_in}
-		perl ${SCRIPTS_DIR}/merge.pl \
-			${tmp_in} ${config} > ${tmp_out}
-	done
+		cat "${tmp_out}" > "${tmp_in}"
-	if [ "${config_mode}" != "none" ]; then
-		echo "Running 'make olddefconfig' for ${arch} (${flavour})..."
-		local kernel_arch="$(get_kernel_arch "${arch}")"
-		(
-			cd ${KERNEL_DIR}
-			cat ${tmp_out} > .config
-			make ARCH="${kernel_arch}" ${config_mode}
-			cat .config > ${tmp_out}
-		)
-	fi
+		if ! perl "${SCRIPTS_DIR}/merge.pl" \
+				"${tmp_in}" "${config}" > "${tmp_out}"; then
+			echo >&2 "Could not merge configuration for ${arch} ${flavour}"
+			rm -f "${tmp_in}" "${tmp_out}"
+			return 1
+		fi
+	done
-	cat ${tmp_out} > ${output}
-	rm -f ${tmp_in} ${tmp_out}
+	cat "${tmp_out}" > "${output}"
+	rm -f "${tmp_in}" "${tmp_out}"
 }
-# This function runs an interactive "make oldconfig".
-function make_config() {
+# This function runs an interactive "make oldconfig"
+make_config() {
    local action="${1}"
    local arch="${2}"
@@ -160,174 +155,187 @@ function make_config() {
    fi
# Detect kernel arch
-	local kernel_arch="$(get_kernel_arch "${arch}")"
-	local flavour="default"
+	local flavour="generic"
-	local config_in=$(mktemp)
-	local config_out=$(mktemp)
-	local diff_out=$(mktemp)
+	# Create a temporary directory
+	local tmpdir="$(mktemp -d)"
-	merge_config ${arch} ${flavour} ${config_in} --mode=none
+	# Merge configuration
+	if ! merge_config "${arch}" "${flavour}" "${tmpdir}/.config.old"; then
+		echo "Could not merge configuration for ${arch} (${flavour})" >&2
+		return 1
+	fi
-	(
-		pushd ${KERNEL_DIR}
-		cat ${config_in} > .config
+	# Open the kernel configuration editor (in the given mode)
+	if ! kernel_config "${arch}" "${action}" "${tmpdir}/.config.old" "${tmpdir}/.config"; then
+		echo >&2 "Kernel configuration editing has been unsuccessful"
+		rm -rf "${tmpdir}"
+		return 1
+	fi
-		echo "You may now edit the configuration..."
-		make ARCH=${kernel_arch} "${action}"
+	# Diff the old and changed configuration
+	if ! python3 "${SCRIPTS_DIR}/configdiff.py" \
+			"${tmpdir}/.config.old" "${tmpdir}/.config" > "${tmpdir}/diff"; then
+		rm -rf "${tmpdir}"
+		return 1
+	fi
-		cat .config > ${config_out}
-		popd
-	)
+	# Check if the diff contains any data
+	if [ ! -s "${tmpdir}/diff" ]; then
+		echo "No changes found"
+		return 0
+	fi
-	python3 ${SCRIPTS_DIR}/configdiff.py ${config_in} ${config_out} > ${diff_out}
+	# Apply the diff to all configurations
+	if ! diff_configs "${tmpdir}/diff"; then
+		rm -rf "${tmpdir}"
+		return 1
+	fi
-	# Update the rest of the configurations.
-	diff_configs ${diff_out} --mode=oldconfig
+	# Cleanup
+	rm -rf "${tmpdir}"
-	rm -f ${config_in} ${config_out} ${diff_out}
+	return 0
 }
-# config-generic
-#  Intersection of all files.
-# config-x86-x86_64
-#  Diff against merge of (config-generic and config-x86-generic).
-
-function diff_configs() {
-	local extra_configs="$@"
+diff_configs() {
+	local tmpdir="$(mktemp -d)"
-	local filename
-	local platform
-	local subplatform
+	local configs=()
-	declare -A platform_configs
-	declare -A subplatform_configs
-
-	tmpdir=$(mktemp -d)
-
-	for config in ${CONFIGS}; do
-		arch=${config%:*}
-		flavour=${config#*:}
+	local config
+	for config in ${CONFIGS[@]}; do
+		arch="${config%:*}"
+		flavour="${config#*:}"
-		filename=${tmpdir}/config-${arch}-${flavour}
+		# Generate the filename
+		local filename="${tmpdir}/full-${arch}-${flavour}"
-		merge_config ${arch} ${flavour} ${filename} ${extra_configs}
+		# Merge configuration
+		if ! merge_config "${arch}" "${flavour}" "${filename}" "$@"; then
+			rm -rf "${tmpdir}"
+			return 1
+		fi
-		platform="$(get_platform "${arch}")"
-		subplatform="$(get_subplatform "${arch}")"
+		# Run "oldconfig" to ensure there are no gaps in other architectures
+		kernel_config "${arch}" "oldconfig" "${filename}" "${filename}"
-		if [ -n "${subplatform}" ]; then
-			subplatform_configs[${subplatform}]="${subplatform_configs[${subplatform}]} ${filename}"
-		else
-			platform_configs[${platform}]="${platform_configs[${platform}]} ${filename}"
-		fi
+		# Collect all *-generic configurations
+		case "${flavour}" in
+			generic)
+				configs+=( "${filename}" )
+				;;
+		esac
    done
-	local common_configs
-	for platform in ${PLATFORMS}; do
-		for subplatform in ${SUBPLATFORMS[${platform}]}; do
-			filename="${tmpdir}/config-${subplatform}-common"
-			python3 ${SCRIPTS_DIR}/configcommon.py ${subplatform_configs[${subplatform}]} \
-				> ${filename}
+	# Generate config-generic
+	if ! python3 "${SCRIPTS_DIR}/configcommon.py" "${configs[@]}" \
+			> "${tmpdir}/config-generic"; then
+		echo >&2 "Could not generate config-generic"
+		rm -rf "${tmpdir}"
+		return 1
+	fi
-			platform_configs[${platform}]="${platform_configs[${platform}]} ${filename}"
+	local arch
+	for arch in $(arches); do
+		# Fetch all flavours
+		local flavours="$(flavours_for_arch "${arch}")"
+
+		local flavour
+		for flavour in ${flavours}; do
+			local base_config="${tmpdir}/config-${arch}-generic"
+
+			# config-${arch}-generic is handled in a special way and diffed
+			# directly against config-generic
+			case "${flavour}" in
+				generic)
+					base_config="${tmpdir}/config-generic"
+					;;
+			esac
+
+			# Diff configurations
+			if ! python3 "${SCRIPTS_DIR}/configdiff.py" \
+					"${base_config}" \
+					"${tmpdir}/full-${arch}-${flavour}" \
+					> "${tmpdir}/config-${arch}-${flavour}"; then
+				echo >&2 "Could not generate config-${arch}-${flavour}"
+				rm -rf "${tmpdir}"
+				return 1
+			fi
    	done
+	done
-		filename="${tmpdir}/config-${platform}-common"
-		python3 ${SCRIPTS_DIR}/configcommon.py ${platform_configs[${platform}]} \
-			> ${filename}
+	# List any changes and copy back the result
+	for config in config-*; do
+		if ! cmp "${tmpdir}/${config}" "${config}" &>/dev/null; then
+			echo "${config} has changed"
+		fi
-		common_configs="${common_configs} ${filename}"
+		# Copy back configuration
+		cat "${tmpdir}/${config}" > "${config}"
    done
-	python3 ${SCRIPTS_DIR}/configcommon.py ${common_configs} > ${tmpdir}/config-generic
+	# Cleanup
+	rm -rf "${tmpdir}"
-	for platform in ${PLATFORMS}; do
-		for subplatform in ${SUBPLATFORMS[${platform}]}; do
-			python3 ${SCRIPTS_DIR}/configdiff.py \
-				${tmpdir}/config-${platform}-common \
-				${tmpdir}/config-${subplatform}-common \
-				> ${tmpdir}/config-${subplatform}-generic
-		done
+	return 0
+}
-		python3 ${SCRIPTS_DIR}/configdiff.py \
-			${tmpdir}/config-generic \
-			${tmpdir}/config-${platform}-common \
-			> ${tmpdir}/config-${platform}-generic
-	done
+KERNEL_DIR="$(search_kernel_dir)"
-	for config in ${CONFIGS}; do
-		arch=${config%:*}
-		flavour=${config#*:}
+main() {
+	local action
-		filename=${tmpdir}/config-${arch}-${flavour}
+	# Parse commandline
+	local arg
+	while [ $# -gt 0 ]; do
+		arg="${1}"
+		shift
-		case "${config}" in
-			aarch64:default|x86_64:default)
-				# Virtual configuration
-				rm -f ${filename}
-				continue
+		case "${arg}" in
+			--kernel-dir=*)
+				KERNEL_DIR="${arg#--kernel-dir=}"
    			;;
-			*)
-				platform="$(get_subplatform "${arch}" || get_platform "${arch}")"
-				python3 ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${platform}-common \
-					${filename} > ${filename}.tmp
+
+			listnewconfig|menuconfig|merge|oldconfig|olddefconfig)
+				action="${arg}"
+				break
    			;;
-		esac
-		mv ${filename}{.tmp,}
-	done
-	rm -f ${tmpdir}/config-*-common
-	for config in ${tmpdir}/*; do
-		if ! cmp $(basename ${config}) ${config} &>/dev/null; then
-			echo "$(basename ${config}) has changed."
-		fi
-		cat ${config} > $(basename ${config})
+			help|"")
+				echo "${0} - available commands:"
+				echo "    * merge <arch> <flavour> <output filename>"
+				echo "    * menuconfig"
+				echo "    * oldconfig"
+				echo "    * olddefconfig"
+				return 0
+				;;
+		esac
    done
-	rm -rf ${tmpdir}
-}
+	# Check if KERNEL_DIR has been set and exists
+	if [ -z "${KERNEL_DIR}" -o ! -d "${KERNEL_DIR}" ]; then
+		echo >&2 "KERNEL_DIR was not set or does not exist!"
+		return 2
+	fi
-KERNEL_DIR="$(search_kernel_dir)"
+	case "${action}" in
+		merge)
+			merge_config "$@"
+			return $?
+			;;
-# Parse commandline.
-while [ $# -gt 0 ]; do
-	arg=${1}; shift
-	case "${arg}" in
-		help|"")
-			echo "${0} - available commands:"
-			echo "    * merge <arch> <flavour> <output filename>"
-			echo "    * menuconfig"
-			echo "    * oldconfig"
-			echo "    * olddefconfig"
-			exit 0
+		listnewconfig|menuconfig|oldconfig|olddefconfig)
+			make_config "${action}" "$@"
+			return $?
    		;;
-		listnewconfig|menuconfig|merge|oldconfig|olddefconfig)
-			action=${arg}
-			break
+
+		# Handle no or invalid actions
+		*)
+			echo >&2 "No action given... Try ${0} help."
+			return 2
    		;;
    esac
-done
-
-if [ -z "${KERNEL_DIR}" ]; then
-	echo >&2 "KERNEL_DIR was not set!"
-	exit 2
-fi
-
-if [ -z "${action}" ]; then
-	echo >&2 "No action given... Try ${0} help."
-	exit 2
-fi
-
-case "${action}" in
-	merge)
-		merge_config $@
-		exit $?
-		;;
-	listnewconfig|menuconfig|oldconfig|olddefconfig)
-		make_config "${action}" "$@"
-		exit $?
-		;;
-esac
-
-exit 1
+}
+
+main "$@" || exit $?
diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm
index 1dea7aa92..b4d7b0eb0 100644
--- a/libjpeg/libjpeg.nm
+++ b/libjpeg/libjpeg.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = libjpeg
-version    = 1.4.2
+version    = 2.1.4
 release    = 1
 thisapp    = libjpeg-turbo-%{version}
@@ -27,18 +27,28 @@ source_dl  = http://sourceforge.net/projects/libjpeg-turbo/files/%%7Bversion%7D/
build
    requires
-		autoconf
-		automake
+		cmake
    	gcc-c++
-		libtool
    	nasm
    end
-	configure_options += \
-		--enable-shared
+	# NASM object files are missing GNU Property note for Intel CET,
+	# force it on the resulting library
+	LDFLAGS +="-Wl,-z,ibt -Wl,-z,shstk"
-	prepare_cmds
-		autoreconf -vfi
+	export LD_LIBRARY_PATH = %{DIR_APP}
+
+	build
+		%{cmake} . \
+			-DCMAKE_SKIP_RPATH:BOOL=YES \
+			-DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
+			-DENABLE_STATIC:BOOL=NO
+
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
    end
 end
diff --git a/libpwquality/libpwquality.nm b/libpwquality/libpwquality.nm
index fc13c9fd4..20bfc6232 100644
--- a/libpwquality/libpwquality.nm
+++ b/libpwquality/libpwquality.nm
@@ -4,11 +4,11 @@
 ###############################################################################
name       = libpwquality
-version    = 1.3.0
-release    = 2
+version    = 1.4.5
+release    = 1
groups     = System/Base
-url        = https://fedorahosted.org/libpwquality/
+url        = https://github.com/libpwquality/libpwquality
 license    = BSD or GPL+
 summary    = A library for password generation and password quality checking.
@@ -18,7 +18,7 @@ description
    cracklib dictionaries to perform some of the checks.
 end
-source_dl  = http://fedorahosted.org/releases/l/i/libpwquality/
+source_dl  = https://github.com/libpwquality/libpwquality/releases/download/%%7Bthisapp%7...
 sources    = %{thisapp}.tar.bz2
build
diff --git a/libtiff/libtiff.nm b/libtiff/libtiff.nm
index 7912829cf..15698ea61 100644
--- a/libtiff/libtiff.nm
+++ b/libtiff/libtiff.nm
@@ -4,12 +4,12 @@
 ###############################################################################
name       = libtiff
-version    = 4.0.6
+version    = 4.4.0
 release    = 1
 thisapp    = tiff-%{version}
groups     = System/Libraries
-url        = http://www.remotesensing.org/libtiff/
+url        = http://www.simplesystems.org/libtiff/
 license    = libtiff ( own )
 summary    = Library of functions for manipulating TIFF format image files.
@@ -20,17 +20,25 @@ description
    .tif extension and they are often quite large.
 end
-source_dl  = ftp://ftp.remotesensing.org/pub/libtiff/
+source_dl  = https://download.osgeo.org/libtiff/
build
    requires
    	gcc-c++
    	libjpeg-devel
+		zlib-devel
+		zstd-devel
    end
+	export LD_LIBRARY_PATH = %{DIR_APP}/libtiff/.libs
+
    configure_options += \
    	--enable-defer-strile-load \
    	--enable-chunky-strip-read
+
+	test
+		make check
+	end
 end
packages
diff --git a/mc/mc.nm b/mc/mc.nm
index e9198548e..acf78ac2c 100644
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -6,7 +6,6 @@
 name       = mc
 version    = 4.8.16
 release    = 1
-epoch      = 1
groups     = Applications/System
 url        = http://www.ibiblio.org/mc/
diff --git a/network/network.nm b/network/network.nm
index 1a1c4546e..5403f75b0 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -4,7 +4,6 @@
 ###############################################################################
name       = network
-epoch      = 1
 version    = 010
 release    = 3
diff --git a/newt/newt.nm b/newt/newt.nm
index 2a2154d40..67612cb94 100644
--- a/newt/newt.nm
+++ b/newt/newt.nm
@@ -5,7 +5,7 @@
name       = newt
 version    = 0.52.21
-release    = 1
+release    = 2
groups     = System/Libraries
 url        = https://fedorahosted.org/releases/n/e/newt/
@@ -32,13 +32,9 @@ build
    end
configure_options += \
+		--with-python=python%{python3_version} \
    	--without-gpm-support \
-		--without-tcl \
-
-	prepare_cmds
-		# make install searches for /usr/bin/install
-		sed -e "s/^INSTALL=.*/INSTALL = install -c/" -i po/Makefile
-	end
+		--without-tcl
install
    	make install instroot=%{BUILDROOT}
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index cb6a3a5e6..1faf968c1 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,11 +4,11 @@
 ###############################################################################
name       = openldap
-version    = 2.4.44
+version    = 2.6.3
 release    = 1
groups     = System/Daemons
-url        = http://www.openldap.org/
+url        = https://www.openldap.org/
 license    = OpenLDAP
 summary    = LDAP support libraries.
@@ -21,7 +21,7 @@ description
    documentation for OpenLDAP.
 end
-source_dl  = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+source_dl  = https://mirror.eu.oneandone.net/software/openldap/openldap-release/
 sources    = %{thisapp}.tgz
build
@@ -43,6 +43,7 @@ build
    	--libexecdir=%{libdir} \
    	--with-threads=posix \
    	--disable-perl \
+		--disable-wt \
    	--enable-dynamic \
    	--enable-crypt \
    	--enable-modules \
@@ -70,6 +71,7 @@ build
    	ln -svf	slapd %{BUILDROOT}/usr/sbin/slappasswd
    	ln -svf	slapd %{BUILDROOT}/usr/sbin/slapschema
    	ln -svf	slapd %{BUILDROOT}/usr/sbin/slaptest
+		ln -svf	slapd %{BUILDROOT}/usr/sbin/slapmodify
# Remove unneeded files.
    	rm -rvf %{BUILDROOT}%{sysconfidir}/slapd.{conf,ldif}
diff --git a/openldap/patches/openldap-2.4.17-disable_sys_err.patch b/openldap/patches/openldap-2.4.17-disable_sys_err.patch
deleted file mode 100644
index c1ab72de3..000000000
--- a/openldap/patches/openldap-2.4.17-disable_sys_err.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur openldap-2.4.16.org/include/ac/errno.h openldap-2.4.16/include/ac/errno.h
---- openldap-2.4.16.org/include/ac/errno.h	2009-01-22 01:00:52.000000000 +0100
-+++ openldap-2.4.16/include/ac/errno.h	2009-04-28 13:48:01.000000000 +0200
-@@ -36,12 +36,7 @@
- #undef _AC_ERRNO_UNKNOWN
- #define _AC_ERRNO_UNKNOWN "unknown error"
- 
--#ifdef HAVE_SYS_ERRLIST
--	/* this is thread safe */
--#	define	STRERROR(e) ( (e) > -1 && (e) < sys_nerr \
--			? sys_errlist[(e)] : _AC_ERRNO_UNKNOWN )
--
--#elif defined( HAVE_STRERROR )
-+#if defined( HAVE_STRERROR )
- 	/* this may not be thread safe */
- 	/* and, yes, some implementations of strerror may return NULL */
- #	define	STRERROR(e) ( strerror(e) \
diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index 6df5d41fa..9ae7bf738 100644
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -5,7 +5,7 @@
name       = openssh
 version    = 9.1p1
-release    = 1
+release    = 2
groups     = Application/Internet
 url        = https://www.openssh.com/portable.html
@@ -130,7 +130,6 @@ packages
    	description = %{summary}
requires
-			audit
    		openssh = %{thisver}
    	end
diff --git a/passwd/passwd.nm b/passwd/passwd.nm
index 3380824fa..ba40e3591 100644
--- a/passwd/passwd.nm
+++ b/passwd/passwd.nm
@@ -4,13 +4,13 @@
 ###############################################################################
name       = passwd
-version    = 0.79
-release    = 2
+version    = 0.80
+release    = 1
groups     = System/Base
 url        = https://pagure.io/passwd
 license    = BSD
-summary    = An utility for setting or changing passwords using PAM.
+summary    = An utility for setting or changing passwords using PAM
description
    This package contains a system utility (passwd) which sets
@@ -23,14 +23,23 @@ sources    = %{thisapp}.tar.bz2
build
    requires
+		autoconf
+		automake
+		gettext-devel
    	glib2-devel
+		libtool
    	libuser-devel
    	pam-devel
    	pkg-config
    	popt-devel
    end
-	configure_options +=\
+	prepare_cmds
+		mkdir -pv admin
+		autoreconf -vfi
+	end
+
+	configure_options += \
    	--without-selinux \
    	--without-audit \
    	--disable-static
@@ -41,8 +50,6 @@ end
packages
    package %{name}
-		groups += Base
-	end
package %{name}-debuginfo
    	template DEBUGINFO
diff --git a/perl-libwww-perl/perl-libwww-perl.nm b/perl-libwww-perl/perl-libwww-perl.nm
index 4538da5a9..74fe1fb88 100644
--- a/perl-libwww-perl/perl-libwww-perl.nm
+++ b/perl-libwww-perl/perl-libwww-perl.nm
@@ -6,7 +6,6 @@
 name       = perl-libwww-perl
 version    = 5.837
 release    = 2
-epoch      = 1
 arch       = noarch
 thisapp    = libwww-perl-%{version}
diff --git a/ppp/patches/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch b/ppp/patches/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
deleted file mode 100644
index 75584a095..000000000
--- a/ppp/patches/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 486e36d184cbaee7e34bb582ea6fdf3bfa9ca531 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 11:23:42 +0200
-Subject: [PATCH 01/25] build-sys: use gcc as our compiler of choice
-
----
- pppd/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index a74c914..1d9ea78 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -30,7 +30,7 @@ ifeq (.depend,$(wildcard .depend))
- include .depend
- endif
- 
--# CC = gcc
-+CC = gcc
- #
- COPTS = -O2 -pipe -Wall -g
- LIBS =
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0002-build-sys-enable-PAM-support.patch b/ppp/patches/0002-build-sys-enable-PAM-support.patch
deleted file mode 100644
index 6a354707a..000000000
--- a/ppp/patches/0002-build-sys-enable-PAM-support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0d71a32b73b71c9793d0b304320858062faf00d1 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 11:25:43 +0200
-Subject: [PATCH 02/25] build-sys: enable PAM support
-
----
- pppd/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 1d9ea78..5a44d30 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -61,7 +61,7 @@ HAVE_MULTILINK=y
- USE_TDB=y
- 
- HAS_SHADOW=y
--#USE_PAM=y
-+USE_PAM=y
- HAVE_INET6=y
- 
- # Enable plugins
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch b/ppp/patches/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
deleted file mode 100644
index 4a43d444a..000000000
--- a/ppp/patches/0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From d729b06f0ac7a5ebd3648ef60bef0499b59bf82d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 11:29:39 +0200
-Subject: [PATCH 03/25] build-sys: utilize compiler flags handed to us by
- rpmbuild
-
----
- chat/Makefile.linux                  | 2 +-
- pppd/Makefile.linux                  | 3 +--
- pppd/plugins/Makefile.linux          | 2 +-
- pppd/plugins/pppoatm/Makefile.linux  | 2 +-
- pppd/plugins/radius/Makefile.linux   | 2 +-
- pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
- pppdump/Makefile.linux               | 2 +-
- pppstats/Makefile.linux              | 2 +-
- 8 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/chat/Makefile.linux b/chat/Makefile.linux
-index 1065ac5..848cd8d 100644
---- a/chat/Makefile.linux
-+++ b/chat/Makefile.linux
-@@ -10,7 +10,7 @@ CDEF3=	-UNO_SLEEP			# Use the usleep function
- CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
- CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
- 
--COPTS=	-O2 -g -pipe
-+COPTS=	$(RPM_OPT_FLAGS)
- CFLAGS=	$(COPTS) $(CDEFS)
- 
- INSTALL= install
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 5a44d30..63872eb 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -32,8 +32,7 @@ endif
- 
- CC = gcc
- #
--COPTS = -O2 -pipe -Wall -g
--LIBS =
-+COPTS = -Wall $(RPM_OPT_FLAGS)
- 
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..e09a369 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
-diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 20f62e6..5a81447 100644
---- a/pppd/plugins/pppoatm/Makefile.linux
-+++ b/pppd/plugins/pppoatm/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
-diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 24ed3e5..45b3b8d 100644
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 5d7a271..352991a 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -25,7 +25,7 @@ INSTALL	= install
- # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- RP_VERSION=3.8p
- 
--COPTS=-O2 -g
-+COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
- all: rp-pppoe.so pppoe-discovery
- 
-diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
-index ac028f6..d0a5032 100644
---- a/pppdump/Makefile.linux
-+++ b/pppdump/Makefile.linux
-@@ -2,7 +2,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
- 
--CFLAGS= -O -I../include/net
-+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
- 
- INSTALL= install
-diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
-index cca6f0f..42aba73 100644
---- a/pppstats/Makefile.linux
-+++ b/pppstats/Makefile.linux
-@@ -10,7 +10,7 @@ PPPSTATSRCS = pppstats.c
- PPPSTATOBJS = pppstats.o
- 
- #CC = gcc
--COPTS = -O
-+COPTS = $(RPM_OPT_FLAGS)
- COMPILE_FLAGS = -I../include
- LIBS =
- 
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0004-doc-add-configuration-samples.patch b/ppp/patches/0004-doc-add-configuration-samples.patch
deleted file mode 100644
index b18747add..000000000
--- a/ppp/patches/0004-doc-add-configuration-samples.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-From d7faeb88f684c8b2ae193b2c5b5b358ac757fcfa Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 11:39:09 +0200
-Subject: [PATCH 04/25] doc: add configuration samples
-
----
- sample/auth-down     |  17 ++++++
- sample/auth-up       |  17 ++++++
- sample/ip-down       |  22 ++++++++
- sample/ip-up         |  23 ++++++++
- sample/options       | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++
- sample/options.ttyXX |  14 +++++
- sample/pap-secrets   |  28 ++++++++++
- 7 files changed, 274 insertions(+)
- create mode 100644 sample/auth-down
- create mode 100644 sample/auth-up
- create mode 100644 sample/ip-down
- create mode 100644 sample/ip-up
- create mode 100644 sample/options
- create mode 100644 sample/options.ttyXX
- create mode 100644 sample/pap-secrets
-
-diff --git a/sample/auth-down b/sample/auth-down
-new file mode 100644
-index 0000000..edde65d
---- /dev/null
-+++ b/sample/auth-down
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# A program or script which is executed after the remote system
-+# successfully authenticates itself. It is executed with the parameters
-+# <interface-name> <peer-name> <user-name> <tty-device> <speed>
-+#
-+
-+#
-+# The environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+echo auth-down `date +'%y/%m/%d %T'` $* >> /var/log/pppstats
-+
-+# last line
-diff --git a/sample/auth-up b/sample/auth-up
-new file mode 100644
-index 0000000..54722a3
---- /dev/null
-+++ b/sample/auth-up
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# A program or script which is executed after the remote system
-+# successfully authenticates itself. It is executed with the parameters
-+# <interface-name> <peer-name> <user-name> <tty-device> <speed>
-+#
-+
-+#
-+# The environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+echo auth-up `date +'%y/%m/%d %T'` $* >> /var/log/pppstats
-+
-+# last line
-diff --git a/sample/ip-down b/sample/ip-down
-new file mode 100644
-index 0000000..b771fb6
---- /dev/null
-+++ b/sample/ip-down
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This script is run by the pppd _after_ the link is brought down.
-+# It should be used to delete routes, unset IP addresses etc.
-+#
-+# This script is called with the following arguments:
-+#    Arg  Name               Example
-+#    $1   Interface name     ppp0
-+#    $2   The tty            ttyS1
-+#    $3   The link speed     38400
-+#    $4   Local IP number    12.34.56.78
-+#    $5   Peer  IP number    12.34.56.99
-+#
-+
-+#
-+# The  environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+# last line
-diff --git a/sample/ip-up b/sample/ip-up
-new file mode 100644
-index 0000000..7ce7c8d
---- /dev/null
-+++ b/sample/ip-up
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+#
-+# This script is run by the pppd after the link is established.
-+# It should be used to add routes, set IP address, run the mailq
-+# etc.
-+#
-+# This script is called with the following arguments:
-+#    Arg  Name               Example
-+#    $1   Interface name     ppp0
-+#    $2   The tty            ttyS1
-+#    $3   The link speed     38400
-+#    $4   Local IP number    12.34.56.78
-+#    $5   Peer  IP number    12.34.56.99
-+#
-+
-+#
-+# The  environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+# last line
-diff --git a/sample/options b/sample/options
-new file mode 100644
-index 0000000..8d0a3f9
---- /dev/null
-+++ b/sample/options
-@@ -0,0 +1,153 @@
-+# /etc/ppp/options
-+
-+# The name of this server. Often, the FQDN is used here.
-+#name <host>
-+
-+# Enforce the use of the hostname as the name of the local system for
-+# authentication purposes (overrides the name option).
-+usehostname
-+
-+# If no local IP address is given, pppd will use the first IP address
-+# that belongs to the local hostname. If "noipdefault" is given, this
-+# is disabled and the peer will have to supply an IP address.
-+noipdefault
-+
-+# With this option, pppd will accept the peer's idea of our local IP
-+# address, even if the local IP address was specified in an option.
-+#ipcp-accept-local
-+
-+# With this option, pppd will accept the peer's idea of its (remote) IP
-+# address, even if the remote IP address was specified in an option.
-+#ipcp-accept-remote
-+
-+# Specify which DNS Servers the incoming Win95 or WinNT Connection should use
-+# Two Servers can be remotely configured
-+#ms-dns 192.168.1.1
-+#ms-dns 192.168.1.2
-+
-+# Specify which WINS Servers the incoming connection Win95 or WinNT should use
-+#wins-addr 192.168.1.50
-+#wins-addr 192.168.1.51
-+
-+# enable this on a server that already has a permanent default route
-+#nodefaultroute
-+
-+# Run the executable or shell command specified after pppd has terminated
-+# the link.  This script could, for example, issue commands to the modem
-+# to cause it to hang up if hardware modem control signals were not
-+# available.
-+# If mgetty is running, it will reset the modem anyway. So there is no need
-+# to do it here.
-+#disconnect "chat -- \d+++\d\c OK ath0 OK"
-+
-+# Increase debugging level (same as -d). The debug output is written
-+# to syslog LOG_LOCAL2.
-+debug
-+
-+# Enable debugging code in the kernel-level PPP driver.  The argument n
-+# is a number which is the sum of the following values: 1 to enable
-+# general debug messages, 2 to request that the contents of received
-+# packets be printed, and 4 to request that the contents of transmitted
-+# packets be printed.
-+#kdebug n
-+
-+# Require the peer to authenticate itself before allowing network
-+# packets to be sent or received.
-+# Please do not disable this setting. It is expected to be standard in
-+# future releases of pppd. Use the call option (see manpage) to disable
-+# authentication for specific peers.
-+#auth
-+
-+# authentication can either be pap or chap. As most people only want to
-+# use pap, you can also disable chap:
-+#require-pap
-+#refuse-chap
-+
-+# Use hardware flow control (i.e. RTS/CTS) to control the flow of data
-+# on the serial port.
-+crtscts
-+
-+# Specifies that pppd should use a UUCP-style lock on the serial device
-+# to ensure exclusive access to the device.
-+lock
-+
-+# Use the modem control lines.
-+modem
-+
-+# async character map -- 32-bit hex; each bit is a character
-+# that needs to be escaped for pppd to receive it.  0x00000001
-+# represents '\x01', and 0x80000000 represents '\x1f'.
-+# To allow pppd to work over a rlogin/telnet connection, ou should escape
-+# XON (^Q), XOFF  (^S) and ^]: (The peer should use "escape ff".)
-+#asyncmap  200a0000
-+asyncmap 0
-+
-+# Specifies that certain characters should be escaped on transmission
-+# (regardless of whether the peer requests them to be escaped with its
-+# async control character map).  The characters to be escaped are
-+# specified as a list of hex numbers separated by commas.  Note that
-+# almost any character can be specified for the escape option, unlike
-+# the asyncmap option which only allows control characters to be
-+# specified.  The characters which may not be escaped are those with hex
-+# values 0x20 - 0x3f or 0x5e.
-+#escape 11,13,ff
-+
-+# Set the MRU [Maximum Receive Unit] value to <n> for negotiation.  pppd
-+# will ask the peer to send packets of no more than <n> bytes. The
-+# minimum MRU value is 128.  The default MRU value is 1500.  A value of
-+# 296 is recommended for slow links (40 bytes for TCP/IP header + 256
-+# bytes of data).
-+#mru 542
-+
-+# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer
-+# requests a smaller value via MRU negotiation, pppd will request that
-+# the kernel networking code send data packets of no more than n bytes
-+# through the PPP network interface.
-+#mtu <n>
-+
-+# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot"
-+# notation (e.g. 255.255.255.0).
-+#netmask 255.255.255.0
-+
-+# Don't fork to become a background process (otherwise pppd will do so
-+# if a serial device is specified).
-+nodetach
-+
-+# Set the assumed name of the remote system for authentication purposes
-+# to <n>.
-+#remotename <n>
-+
-+# Add an entry to this system's ARP [Address Resolution Protocol]
-+# table with the IP address of the peer and the Ethernet address of this
-+# system. {proxyarp,noproxyarp}
-+proxyarp
-+
-+# Use the system password database for authenticating the peer using
-+# PAP. Note: mgetty already provides this option. If this is specified
-+# then dialin from users using a script under Linux to fire up ppp wont work.
-+#login
-+
-+# If this option is given, pppd will send an LCP echo-request frame to
-+# the peer every n seconds. Under Linux, the echo-request is sent when
-+# no packets have been received from the peer for n seconds. Normally
-+# the peer should respond to the echo-request by sending an echo-reply.
-+# This option can be used with the lcp-echo-failure option to detect
-+# that the peer is no longer connected.
-+lcp-echo-interval 30
-+
-+# If this option is given, pppd will presume the peer to be dead if n
-+# LCP echo-requests are sent without receiving a valid LCP echo-reply.
-+# If this happens, pppd will terminate the connection.  Use of this
-+# option requires a non-zero value for the lcp-echo-interval parameter.
-+# This option can be used to enable pppd to terminate after the physical
-+# connection has been broken (e.g., the modem has hung up) in
-+# situations where no hardware modem control lines are available.
-+lcp-echo-failure 4
-+
-+# Specifies that pppd should disconnect if the link is idle for n seconds.
-+idle 600
-+
-+# Disable the IPXCP and IPX protocols.
-+noipx
-+
-+# ---<End of File>---
-diff --git a/sample/options.ttyXX b/sample/options.ttyXX
-new file mode 100644
-index 0000000..d4202f5
---- /dev/null
-+++ b/sample/options.ttyXX
-@@ -0,0 +1,14 @@
-+# If you need to set up multiple serial lines then copy this file to
-+# options.<ttyname> for each tty with a modem on it.
-+#
-+# The options.tty file will assign an IP address to each PPP connection
-+# as it comes up. They must all be distinct!
-+#
-+# Example:
-+# options.ttyS1		for com2 under DOS.
-+#
-+# Edit the following line so that the first IP address
-+# mentioned is the ip address of the serial port while the second
-+# is the IP address of your host
-+#
-+hostname-s1:hostname
-diff --git a/sample/pap-secrets b/sample/pap-secrets
-new file mode 100644
-index 0000000..098971b
---- /dev/null
-+++ b/sample/pap-secrets
-@@ -0,0 +1,28 @@
-+# Secrets for authentication using PAP
-+# client	server	secret			IP addresses
-+
-+# OUTBOUND CONNECTIONS
-+# Here you should add your userid password to connect to your providers via
-+# pap. The * means that the password is to be used for ANY host you connect
-+# to. Thus you do not have to worry about the foreign machine name. Just
-+# replace password with your password.
-+# If you have different providers with different passwords then you better
-+# remove the following line.
-+#hostname	*	password
-+
-+# INBOUND CONNECTIONS
-+#client		hostname	<password>	192.168.1.1
-+
-+# If you add "auth login -chap +pap" to /etc/mgetty+sendfax/login.config,
-+# all users in /etc/passwd can use their password for pap-authentication.
-+#
-+# Every regular user can use PPP and has to use passwords from /etc/passwd
-+#*	hostname	""
-+# UserIDs that cannot use PPP at all. Check your /etc/passwd and add any
-+# other accounts that should not be able to use pppd! Replace hostname
-+# with your local hostname.
-+#guest		hostname	"*"	-
-+#master		hostname	"*"	-
-+#root		hostname	"*"	-
-+#support	hostname	"*"	-
-+#stats		hostname	"*"	-
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch b/ppp/patches/0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
deleted file mode 100644
index de1c43988..000000000
--- a/ppp/patches/0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 69711944745af0078da77e108d30f89fd7e06108 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 12:01:33 +0200
-Subject: [PATCH 05/25] build-sys: don't hardcode LIBDIR, but set it according
- to the target platform
-
----
- pppd/Makefile.linux                  | 3 ++-
- pppd/pathnames.h                     | 2 +-
- pppd/plugins/Makefile.linux          | 2 +-
- pppd/plugins/pppoatm/Makefile.linux  | 2 +-
- pppd/plugins/pppol2tp/Makefile.linux | 4 ++--
- pppd/plugins/radius/Makefile.linux   | 2 +-
- pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
- 7 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 63872eb..8ed56c1 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -8,6 +8,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
- INCDIR = $(DESTDIR)/include
-+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
- 
- TARGETS = pppd
- 
-@@ -32,7 +33,7 @@ endif
- 
- CC = gcc
- #
--COPTS = -Wall $(RPM_OPT_FLAGS)
-+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=""$(LIBDIR)""
- 
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index a33f046..a427cb8 100644
---- a/pppd/pathnames.h
-+++ b/pppd/pathnames.h
-@@ -57,7 +57,7 @@
- 
- #ifdef PLUGIN
- #ifdef __STDC__
--#define _PATH_PLUGIN	DESTDIR "/lib/pppd/" VERSION
-+#define _PATH_PLUGIN	LIBDIR "/pppd/" VERSION
- #else /* __STDC__ */
- #define _PATH_PLUGIN	"/usr/lib/pppd"
- #endif /* __STDC__ */
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index e09a369..b474a19 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL	= install
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- SUBDIRS := rp-pppoe pppoatm pppol2tp
- # Uncomment the next line to include the radius authentication plugin
-diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 5a81447..769794b 100644
---- a/pppd/plugins/pppoatm/Makefile.linux
-+++ b/pppd/plugins/pppoatm/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL	= install
- #***********************************************************************
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index ea3538e..4339566 100644
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -6,8 +6,8 @@ INSTALL	= install
- 
- #***********************************************************************
- 
--DESTDIR = @DESTDIR@
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+DESTDIR = $(INSTROOT)@DESTDIR@
-+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
-diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 45b3b8d..179d0b7 100644
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -5,7 +5,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 352991a..1305ed8 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -16,7 +16,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
- 
- PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0006-scritps-use-change_resolv_conf-function.patch b/ppp/patches/0006-scritps-use-change_resolv_conf-function.patch
deleted file mode 100644
index 0e45197fb..000000000
--- a/ppp/patches/0006-scritps-use-change_resolv_conf-function.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 01419dfb684d501b57f1c24dcfdbcf9da93ccca2 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 18:12:47 +0200
-Subject: [PATCH 06/25] scritps: use change_resolv_conf function
-
-Don't handle /etc/resolv.conf manually, but use a helper function from
-initscripts. Also change path where we save DNS servers supplied by peer while
-we are at it.
-
-Resolves: #132482
----
- pppd/pppd.8               |  2 +-
- scripts/ip-down.local.add |  9 +++++----
- scripts/ip-up.local.add   | 17 ++++++++++-------
- 3 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/pppd/pppd.8 b/pppd/pppd.8
-index e2768b1..2dd6e1a 100644
---- a/pppd/pppd.8
-+++ b/pppd/pppd.8
-@@ -1099,7 +1099,7 @@ Ask the peer for up to 2 DNS server addresses.  The addresses supplied
- by the peer (if any) are passed to the /etc/ppp/ip-up script in the
- environment variables DNS1 and DNS2, and the environment variable
- USEPEERDNS will be set to 1.  In addition, pppd will create an
--/etc/ppp/resolv.conf file containing one or two nameserver lines with
-+/var/run/ppp/resolv.conf file containing one or two nameserver lines with
- the address(es) supplied by the peer.
- .TP
- .B user \fIname
-diff --git a/scripts/ip-down.local.add b/scripts/ip-down.local.add
-index b93590e..163f71e 100644
---- a/scripts/ip-down.local.add
-+++ b/scripts/ip-down.local.add
-@@ -9,12 +9,13 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
--if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
--	if [ -f /etc/ppp/resolv.prev ]; then
--		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
-+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
-+	if [ -f /var/run/ppp/resolv.prev ]; then
-+		change_resolv_conf /var/run/ppp/resolv.prev
- 	else
--		rm -f /etc/resolv.conf
-+		change_resolv_conf
- 	fi
- fi
- 
-diff --git a/scripts/ip-up.local.add b/scripts/ip-up.local.add
-index 8017209..26cf5f8 100644
---- a/scripts/ip-up.local.add
-+++ b/scripts/ip-up.local.add
-@@ -9,16 +9,19 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
--if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
--	rm -f /etc/ppp/resolv.prev
-+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
-+	rm -f /var/run/ppp/resolv.prev
- 	if [ -f /etc/resolv.conf ]; then
--		cp /etc/resolv.conf /etc/ppp/resolv.prev
--		grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
--		grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
--		cat /etc/ppp/resolv.conf >> /etc/resolv.conf
-+		cp /etc/resolv.conf /var/run/ppp/resolv.prev
-+		rscf=/var/run/ppp/resolv.new
-+		grep domain /var/run/ppp/resolv.prev > $rscf
-+		grep search /var/run/ppp/resolv.prev >> $rscf
-+		change_resolv_conf $rscf
-+		rm -f $rscf
- 	else
--		cp /etc/ppp/resolv.conf /etc
-+		change_resolv_conf /var/run/ppp/resolv.conf
- 	fi
- fi
- 
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch b/ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch
deleted file mode 100644
index e4881ef03..000000000
--- a/ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From b9fb631a493c5f1b490c8e9645eb6ebab4b25cc8 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 18:37:00 +0200
-Subject: [PATCH 07/25] build-sys: don't strip binaries during installation
-
-We don't want that when building rpms. rpmbuild does final stripping of binaries
-for us and generetes debuginfo rpm.
----
- chat/Makefile.linux                  | 2 +-
- pppd/Makefile.linux                  | 4 ++--
- pppd/plugins/radius/Makefile.linux   | 6 +++---
- pppd/plugins/rp-pppoe/Makefile.linux | 4 ++--
- pppdump/Makefile.linux               | 2 +-
- pppstats/Makefile.linux              | 2 +-
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/chat/Makefile.linux b/chat/Makefile.linux
-index 848cd8d..2445637 100644
---- a/chat/Makefile.linux
-+++ b/chat/Makefile.linux
-@@ -25,7 +25,7 @@ chat.o:	chat.c
- 
- install: chat
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 8ed56c1..4f27100 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -102,7 +102,7 @@ ifdef USE_SRP
- CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
- LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
- TARGETS	+= srp-entry
--EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -208,7 +208,7 @@ all: $(TARGETS)
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
- 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
- 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
- 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 179d0b7..707326b 100644
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -36,9 +36,9 @@ all: $(PLUGIN)
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
- 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
- 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
- 
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 1305ed8..3cd9101 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
--	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so pppoe-discovery
-diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
-index d0a5032..95c6805 100644
---- a/pppdump/Makefile.linux
-+++ b/pppdump/Makefile.linux
-@@ -17,5 +17,5 @@ clean:
- 
- install:
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c pppdump $(BINDIR)
-+	$(INSTALL) -c pppdump $(BINDIR)
- 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
-index 42aba73..c5ba3b1 100644
---- a/pppstats/Makefile.linux
-+++ b/pppstats/Makefile.linux
-@@ -22,7 +22,7 @@ all: pppstats
- 
- install: pppstats
- 	-mkdir -p $(MANDIR)
--	$(INSTALL) -s -c pppstats $(BINDIR)
-+	$(INSTALL) -c pppstats $(BINDIR)
- 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
- 
- pppstats: $(PPPSTATSRCS)
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0008-build-sys-use-prefix-usr-instead-of-usr-local.patch b/ppp/patches/0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
deleted file mode 100644
index 5d08b11b2..000000000
--- a/ppp/patches/0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 343728d5de6e44bd67923503e62eefaad50760a4 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 18:47:01 +0200
-Subject: [PATCH 08/25] build-sys: use prefix /usr instead of /usr/local
-
----
- configure           | 2 +-
- pppd/Makefile.linux | 4 ++--
- scripts/ppp-on-rsh  | 2 +-
- scripts/ppp-on-ssh  | 4 ++--
- scripts/secure-card | 2 +-
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 6a55e0f..db54d77 100755
---- a/configure
-+++ b/configure
-@@ -2,7 +2,7 @@
- # $Id: configure,v 1.38 2008/06/15 07:08:49 paulus Exp $
- 
- # Where to install stuff by default
--DESTDIR=/usr/local
-+DESTDIR=/usr
- SYSCONF=/etc
- 
- #  if [ -d /NextApps ]; then
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 4f27100..95c2598 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -99,8 +99,8 @@ endif
- 
- # EAP SRP-SHA1
- ifdef USE_SRP
--CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
--LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
-+CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/include/openssl
-+LIBS	+= -lsrp -L/usr/lib -lcrypto
- TARGETS	+= srp-entry
- EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
-diff --git a/scripts/ppp-on-rsh b/scripts/ppp-on-rsh
-index 30a50db..a80616a 100755
---- a/scripts/ppp-on-rsh
-+++ b/scripts/ppp-on-rsh
-@@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost
- # For this example, we assume that pppd on both local and remote
- # machines reside in the same place, /usr/local/bin/pppd
- #
--PPPD_LOC=/usr/local/bin/pppd
-+PPPD_LOC=/usr/sbin/pppd
- 
- #
- # The location of local options file (where rsh client is running).
-diff --git a/scripts/ppp-on-ssh b/scripts/ppp-on-ssh
-index 0e41aca..c27e80a 100755
---- a/scripts/ppp-on-ssh
-+++ b/scripts/ppp-on-ssh
-@@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost
- # For this example, we assume that pppd on both local and remote
- # machines reside in the same place, /usr/local/bin/pppd
- #
--PPPD_LOC=/usr/local/bin/pppd
-+PPPD_LOC=/usr/sbin/pppd
- 
- #
- # The location of local options file (where ssh client is running).
-@@ -52,7 +52,7 @@ PPPD_REM_OPT=/etc/ppp/options-ssh-rem
- #
- # The location of ssh client on the local machine
- #
--SSH_LOC=/usr/local/bin/ssh
-+SSH_LOC=/usr/bin/ssh
- 
- export PPPD_LOC PPPD_LOC_OPT PPPD_REM_OPT PPPD_RHOST SSH_LOC
- 
-diff --git a/scripts/secure-card b/scripts/secure-card
-index 0002365..ae3ae50 100755
---- a/scripts/secure-card
-+++ b/scripts/secure-card
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/expect -f
-+#!/usr/bin/expect -f
- #
- # This  script was  written  by  Jim Isaacson  jcisaac@crl.com.  It is
- # designed to work  as a script to use the  SecureCARD(tm) device.  This
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0009-pppd-introduce-ipv6-accept-remote.patch b/ppp/patches/0009-pppd-introduce-ipv6-accept-remote.patch
deleted file mode 100644
index 28a51cfa9..000000000
--- a/ppp/patches/0009-pppd-introduce-ipv6-accept-remote.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From abef895f9d144f05a83045136b77277352dc450f Mon Sep 17 00:00:00 2001
-From: David Woodhouse dwmw2@fedoraproject.org
-Date: Fri, 4 Apr 2014 18:53:33 +0200
-Subject: [PATCH 09/25] pppd: introduce ipv6-accept-remote
-
----
- pppd/ipv6cp.c | 5 ++++-
- pppd/ipv6cp.h | 3 ++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
-index caa2b26..5a56c95 100644
---- a/pppd/ipv6cp.c
-+++ b/pppd/ipv6cp.c
-@@ -245,6 +245,8 @@ static option_t ipv6cp_option_list[] = {
- 
-     { "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local,
-       "Accept peer's interface identifier for us", 1 },
-+    { "ipv6cp-accept-remote", o_bool, &ipv6cp_allowoptions[0].accept_remote,
-+      "Accept peer's interface identifier for itself", 1 },
- 
-     { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip,
-       "Use (default) IPv4 address as interface identifier", 1 },
-@@ -437,6 +439,7 @@ ipv6cp_init(unit)
-     memset(ao, 0, sizeof(*ao));
- 
-     wo->accept_local = 1;
-+    wo->accept_remote = 1;
-     wo->neg_ifaceid = 1;
-     ao->neg_ifaceid = 1;
- 
-@@ -962,7 +965,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disagree)
- 		orc = CONFREJ;		/* Reject CI */
- 		break;
- 	    }
--	    if (!eui64_iszero(wo->hisid) && 
-+	    if (!eui64_iszero(wo->hisid) && !wo->accept_remote &&
- 		!eui64_equals(ifaceid, wo->hisid) && 
- 		eui64_iszero(go->hisid)) {
- 		    
-diff --git a/pppd/ipv6cp.h b/pppd/ipv6cp.h
-index cc4568d..8c7552e 100644
---- a/pppd/ipv6cp.h
-+++ b/pppd/ipv6cp.h
-@@ -150,7 +150,8 @@
- typedef struct ipv6cp_options {
-     int neg_ifaceid;		/* Negotiate interface identifier? */
-     int req_ifaceid;		/* Ask peer to send interface identifier? */
--    int accept_local;		/* accept peer's value for iface id? */
-+    int accept_local;		/* accept peer's value for our iface id? */
-+    int accept_remote;		/* accept peer's value for his iface id? */
-     int opt_local;		/* ourtoken set by option */
-     int opt_remote;		/* histoken set by option */
-     int use_ip;			/* use IP as interface identifier */
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0010-build-sys-enable-CBCP.patch b/ppp/patches/0010-build-sys-enable-CBCP.patch
deleted file mode 100644
index 2de594125..000000000
--- a/ppp/patches/0010-build-sys-enable-CBCP.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8015a0ef23a874f288d5e77ffafe1d7f4281725d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 18:59:24 +0200
-Subject: [PATCH 10/25] build-sys: enable CBCP
-
-Resolves: #199278
----
- pppd/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 95c2598..65700fa 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -68,7 +68,7 @@ HAVE_INET6=y
- PLUGIN=y
- 
- # Enable Microsoft proprietary Callback Control Protocol
--#CBCP=y
-+CBCP=y
- 
- # Enable EAP SRP-SHA1 authentication (requires libsrp)
- #USE_SRP=y
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch b/ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
deleted file mode 100644
index f1a0d5fea..000000000
--- a/ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b4ef433be936c90e356da7a590b032cdee219a3f Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Fri, 4 Apr 2014 19:06:05 +0200
-Subject: [PATCH 11/25] build-sys: don't put connect-errors log to /etc/ppp/
-
-Resolves: #118837
----
- chat/chat.8        | 2 +-
- linux/Makefile.top | 8 +++++++-
- pppd/pathnames.h   | 4 ++--
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/chat/chat.8 b/chat/chat.8
-index 6d10836..78d6939 100644
---- a/chat/chat.8
-+++ b/chat/chat.8
-@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user
- at the terminal via standard error.  If \fBchat\fR is being run by
- pppd, and pppd is running as a daemon (detached from its controlling
- terminal), standard error will normally be redirected to the file
--/etc/ppp/connect-errors.
-+/var/log/ppp/connect-errors.
- .LP
- \fBSAY\fR strings must be enclosed in single or double quotes. If
- carriage return and line feed are needed in the string to be output,
-diff --git a/linux/Makefile.top b/linux/Makefile.top
-index f63d45e..f42efd5 100644
---- a/linux/Makefile.top
-+++ b/linux/Makefile.top
-@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin
- INCDIR = $(DESTDIR)/include
- MANDIR = $(DESTDIR)/share/man
- ETCDIR = $(INSTROOT)@SYSCONF@/ppp
-+RUNDIR = $(DESTDIR)/var/run/ppp
-+LOGDIR = $(DESTDIR)/var/log/ppp
- 
- # uid 0 = root
- INSTALL= install
-@@ -16,7 +18,7 @@ all:
- 	cd pppstats; $(MAKE) $(MFLAGS) all
- 	cd pppdump; $(MAKE) $(MFLAGS) all
- 
--install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
-+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel
- 
- install-progs:
- 	cd chat; $(MAKE) $(MFLAGS) install
-@@ -44,6 +46,10 @@ $(MANDIR)/man8:
- 	$(INSTALL) -d -m 755 $@
- $(ETCDIR):
- 	$(INSTALL) -d -m 755 $@
-+$(RUNDIR):
-+	$(INSTALL) -d -m 755 $@
-+$(LOGDIR):
-+	$(INSTALL) -d -m 755 $@
- 
- clean:
- 	rm -f `find . -name '*.[oas]' -print`
-diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index a427cb8..bef3160 100644
---- a/pppd/pathnames.h
-+++ b/pppd/pathnames.h
-@@ -28,9 +28,9 @@
- #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
- #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
--#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
-+#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp/resolv.conf"
- 
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch b/ppp/patches/0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
deleted file mode 100644
index 90bb2d161..000000000
--- a/ppp/patches/0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 82cd789df0f022eb6f3d28646e7a61d1d0715805 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Mon, 7 Apr 2014 12:23:36 +0200
-Subject: [PATCH 12/25] pppd: we don't want to accidentally leak fds
-
----
- pppd/auth.c      | 20 ++++++++++----------
- pppd/options.c   |  2 +-
- pppd/sys-linux.c |  4 ++--
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/pppd/auth.c b/pppd/auth.c
-index 4271af6..9e957fa 100644
---- a/pppd/auth.c
-+++ b/pppd/auth.c
-@@ -428,7 +428,7 @@ setupapfile(argv)
- 	option_error("unable to reset uid before opening %s: %m", fname);
- 	return 0;
-     }
--    ufile = fopen(fname, "r");
-+    ufile = fopen(fname, "re");
-     if (seteuid(euid) == -1)
- 	fatal("unable to regain privileges: %m");
-     if (ufile == NULL) {
-@@ -1413,7 +1413,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
-     filename = _PATH_UPAPFILE;
-     addrs = opts = NULL;
-     ret = UPAP_AUTHNAK;
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     if (f == NULL) {
- 	error("Can't open PAP password file %s: %m", filename);
- 
-@@ -1512,7 +1512,7 @@ null_login(unit)
-     if (ret <= 0) {
- 	filename = _PATH_UPAPFILE;
- 	addrs = NULL;
--	f = fopen(filename, "r");
-+	f = fopen(filename, "re");
- 	if (f == NULL)
- 	    return 0;
- 	check_access(f, filename);
-@@ -1559,7 +1559,7 @@ get_pap_passwd(passwd)
-     }
- 
-     filename = _PATH_UPAPFILE;
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     if (f == NULL)
- 	return 0;
-     check_access(f, filename);
-@@ -1597,7 +1597,7 @@ have_pap_secret(lacks_ipp)
-     }
- 
-     filename = _PATH_UPAPFILE;
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     if (f == NULL)
- 	return 0;
- 
-@@ -1642,7 +1642,7 @@ have_chap_secret(client, server, need_ip, lacks_ipp)
-     }
- 
-     filename = _PATH_CHAPFILE;
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     if (f == NULL)
- 	return 0;
- 
-@@ -1684,7 +1684,7 @@ have_srp_secret(client, server, need_ip, lacks_ipp)
-     struct wordlist *addrs;
- 
-     filename = _PATH_SRPFILE;
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     if (f == NULL)
- 	return 0;
- 
-@@ -1740,7 +1740,7 @@ get_secret(unit, client, server, secret, secret_len, am_server)
- 	addrs = NULL;
- 	secbuf[0] = 0;
- 
--	f = fopen(filename, "r");
-+	f = fopen(filename, "re");
- 	if (f == NULL) {
- 	    error("Can't open chap secret file %s: %m", filename);
- 	    return 0;
-@@ -1797,7 +1797,7 @@ get_srp_secret(unit, client, server, secret, am_server)
- 	filename = _PATH_SRPFILE;
- 	addrs = NULL;
- 
--	fp = fopen(filename, "r");
-+	fp = fopen(filename, "re");
- 	if (fp == NULL) {
- 	    error("Can't open srp secret file %s: %m", filename);
- 	    return 0;
-@@ -2203,7 +2203,7 @@ scan_authfile(f, client, server, secret, addrs, opts, filename, flags)
- 	     */
- 	    if (word[0] == '@' && word[1] == '/') {
- 		strlcpy(atfile, word+1, sizeof(atfile));
--		if ((sf = fopen(atfile, "r")) == NULL) {
-+		if ((sf = fopen(atfile, "re")) == NULL) {
- 		    warn("can't open indirect secret file %s", atfile);
- 		    continue;
- 		}
-diff --git a/pppd/options.c b/pppd/options.c
-index 45fa742..1d754ae 100644
---- a/pppd/options.c
-+++ b/pppd/options.c
-@@ -427,7 +427,7 @@ options_from_file(filename, must_exist, check_prot, priv)
- 	option_error("unable to drop privileges to open %s: %m", filename);
- 	return 0;
-     }
--    f = fopen(filename, "r");
-+    f = fopen(filename, "re");
-     err = errno;
-     if (check_prot && seteuid(euid) == -1)
- 	fatal("unable to regain privileges");
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 72a7727..8a12fa0 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -1412,7 +1412,7 @@ static char *path_to_procfs(const char *tail)
- 	/* Default the mount location of /proc */
- 	strlcpy (proc_path, "/proc", sizeof(proc_path));
- 	proc_path_len = 5;
--	fp = fopen(MOUNTED, "r");
-+	fp = fopen(MOUNTED, "re");
- 	if (fp != NULL) {
- 	    while ((mntent = getmntent(fp)) != NULL) {
- 		if (strcmp(mntent->mnt_type, MNTTYPE_IGNORE) == 0)
-@@ -1472,7 +1472,7 @@ static int open_route_table (void)
-     close_route_table();
- 
-     path = path_to_procfs("/net/route");
--    route_fd = fopen (path, "r");
-+    route_fd = fopen (path, "re");
-     if (route_fd == NULL) {
- 	error("can't open routing table %s: %m", path);
- 	return 0;
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0013-everywhere-O_CLOEXEC-harder.patch b/ppp/patches/0013-everywhere-O_CLOEXEC-harder.patch
deleted file mode 100644
index e3608a0d6..000000000
--- a/ppp/patches/0013-everywhere-O_CLOEXEC-harder.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 302c1b736cb656c7885a0cba270fd953a672d8a8 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Mon, 7 Apr 2014 13:56:34 +0200
-Subject: [PATCH 13/25] everywhere: O_CLOEXEC harder
-
----
- pppd/eap.c       |  2 +-
- pppd/main.c      |  4 ++--
- pppd/options.c   |  4 ++--
- pppd/sys-linux.c | 22 +++++++++++-----------
- pppd/tdb.c       |  4 ++--
- pppd/tty.c       |  4 ++--
- pppd/utils.c     |  6 +++---
- 7 files changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 6ea6c1f..faced53 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1226,7 +1226,7 @@ mode_t modebits;
- 
- 	if ((path = name_of_pn_file()) == NULL)
- 		return (-1);
--	fd = open(path, modebits, S_IRUSR | S_IWUSR);
-+	fd = open(path, modebits, S_IRUSR | S_IWUSR | O_CLOEXEC);
- 	err = errno;
- 	free(path);
- 	errno = err;
-diff --git a/pppd/main.c b/pppd/main.c
-index 6d50d1b..4880377 100644
---- a/pppd/main.c
-+++ b/pppd/main.c
-@@ -420,7 +420,7 @@ main(argc, argv)
- 	die(0);
- 
-     /* Make sure fds 0, 1, 2 are open to somewhere. */
--    fd_devnull = open(_PATH_DEVNULL, O_RDWR);
-+    fd_devnull = open(_PATH_DEVNULL, O_RDWR | O_CLOEXEC);
-     if (fd_devnull < 0)
- 	fatal("Couldn't open %s: %m", _PATH_DEVNULL);
-     while (fd_devnull <= 2) {
-@@ -1679,7 +1679,7 @@ device_script(program, in, out, dont_wait)
-     if (log_to_fd >= 0)
- 	errfd = log_to_fd;
-     else
--	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
-+	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0600);
- 
-     ++conn_running;
-     pid = safe_fork(in, out, errfd);
-diff --git a/pppd/options.c b/pppd/options.c
-index 1d754ae..8e62635 100644
---- a/pppd/options.c
-+++ b/pppd/options.c
-@@ -1544,9 +1544,9 @@ setlogfile(argv)
- 	option_error("unable to drop permissions to open %s: %m", *argv);
- 	return 0;
-     }
--    fd = open(*argv, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0644);
-+    fd = open(*argv, O_WRONLY | O_APPEND | O_CREAT | O_EXCL | O_CLOEXEC, 0644);
-     if (fd < 0 && errno == EEXIST)
--	fd = open(*argv, O_WRONLY | O_APPEND);
-+	fd = open(*argv, O_WRONLY | O_APPEND | O_CLOEXEC);
-     err = errno;
-     if (!privileged_option && seteuid(euid) == -1)
- 	fatal("unable to regain privileges: %m");
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 8a12fa0..00a2cf5 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -459,7 +459,7 @@ int generic_establish_ppp (int fd)
- 	    goto err;
- 	}
- 	dbglog("using channel %d", chindex);
--	fd = open("/dev/ppp", O_RDWR);
-+	fd = open("/dev/ppp", O_RDWR | O_CLOEXEC);
- 	if (fd < 0) {
- 	    error("Couldn't reopen /dev/ppp: %m");
- 	    goto err;
-@@ -619,7 +619,7 @@ static int make_ppp_unit()
- 		dbglog("in make_ppp_unit, already had /dev/ppp open?");
- 		close(ppp_dev_fd);
- 	}
--	ppp_dev_fd = open("/dev/ppp", O_RDWR);
-+	ppp_dev_fd = open("/dev/ppp", O_RDWR | O_CLOEXEC);
- 	if (ppp_dev_fd < 0)
- 		fatal("Couldn't open /dev/ppp: %m");
- 	flags = fcntl(ppp_dev_fd, F_GETFL);
-@@ -693,7 +693,7 @@ int bundle_attach(int ifnum)
- 	if (!new_style_driver)
- 		return -1;
- 
--	master_fd = open("/dev/ppp", O_RDWR);
-+	master_fd = open("/dev/ppp", O_RDWR | O_CLOEXEC);
- 	if (master_fd < 0)
- 		fatal("Couldn't open /dev/ppp: %m");
- 	if (ioctl(master_fd, PPPIOCATTACH, &ifnum) < 0) {
-@@ -1715,7 +1715,7 @@ int sifproxyarp (int unit, u_int32_t his_adr)
- 	if (tune_kernel) {
- 	    forw_path = path_to_procfs("/sys/net/ipv4/ip_forward");
- 	    if (forw_path != 0) {
--		int fd = open(forw_path, O_WRONLY);
-+		int fd = open(forw_path, O_WRONLY | O_CLOEXEC);
- 		if (fd >= 0) {
- 		    if (write(fd, "1", 1) != 1)
- 			error("Couldn't enable IP forwarding: %m");
-@@ -2030,7 +2030,7 @@ int ppp_available(void)
-     sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
-     kernel_version = KVERSION(osmaj, osmin, ospatch);
- 
--    fd = open("/dev/ppp", O_RDWR);
-+    fd = open("/dev/ppp", O_RDWR | O_CLOEXEC);
-     if (fd >= 0) {
- 	new_style_driver = 1;
- 
-@@ -2208,7 +2208,7 @@ void logwtmp (const char *line, const char *name, const char *host)
- #if __GLIBC__ >= 2
-     updwtmp(_PATH_WTMP, &ut);
- #else
--    wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY);
-+    wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY|O_CLOEXEC);
-     if (wtmp >= 0) {
- 	flock(wtmp, LOCK_EX);
- 
-@@ -2394,7 +2394,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
- 	int fd;
- 
- 	path = path_to_procfs("/sys/net/ipv4/ip_dynaddr");
--	if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) {
-+	if (path != 0 && (fd = open(path, O_WRONLY | O_CLOEXEC)) >= 0) {
- 	    if (write(fd, "1", 1) != 1)
- 		error("Couldn't enable dynamic IP addressing: %m");
- 	    close(fd);
-@@ -2570,7 +2570,7 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
-     /*
-      * Try the unix98 way first.
-      */
--    mfd = open("/dev/ptmx", O_RDWR);
-+    mfd = open("/dev/ptmx", O_RDWR | O_CLOEXEC);
-     if (mfd >= 0) {
- 	int ptn;
- 	if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) {
-@@ -2581,7 +2581,7 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
- 	    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)
- 		warn("Couldn't open pty slave %s: %m", pty_name);
- 	}
-     }
-@@ -2592,10 +2592,10 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
- 	for (i = 0; i < 64; ++i) {
- 	    slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x",
- 		     'p' + i / 16, i % 16);
--	    mfd = open(pty_name, O_RDWR, 0);
-+	    mfd = open(pty_name, O_RDWR | O_CLOEXEC, 0);
- 	    if (mfd >= 0) {
- 		pty_name[5] = 't';
--		sfd = open(pty_name, O_RDWR | O_NOCTTY, 0);
-+		sfd = open(pty_name, O_RDWR | O_NOCTTY | O_CLOEXEC, 0);
- 		if (sfd >= 0) {
- 		    fchown(sfd, uid, -1);
- 		    fchmod(sfd, S_IRUSR | S_IWUSR);
-diff --git a/pppd/tdb.c b/pppd/tdb.c
-index bdc5828..c7ab71c 100644
---- a/pppd/tdb.c
-+++ b/pppd/tdb.c
-@@ -1724,7 +1724,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
- 		goto internal;
- 	}
- 
--	if ((tdb->fd = open(name, open_flags, mode)) == -1) {
-+	if ((tdb->fd = open(name, open_flags | O_CLOEXEC, mode)) == -1) {
- 		TDB_LOG((tdb, 5, "tdb_open_ex: could not open file %s: %s\n",
- 			 name, strerror(errno)));
- 		goto fail;	/* errno set by open(2) */
-@@ -1967,7 +1967,7 @@ int tdb_reopen(TDB_CONTEXT *tdb)
- 	}
- 	if (close(tdb->fd) != 0)
- 		TDB_LOG((tdb, 0, "tdb_reopen: WARNING closing tdb->fd failed!\n"));
--	tdb->fd = open(tdb->name, tdb->open_flags & ~(O_CREAT|O_TRUNC), 0);
-+	tdb->fd = open(tdb->name, (tdb->open_flags & ~(O_CREAT|O_TRUNC)) | O_CLOEXEC, 0);
- 	if (tdb->fd == -1) {
- 		TDB_LOG((tdb, 0, "tdb_reopen: open failed (%s)\n", strerror(errno)));
- 		goto fail;
-diff --git a/pppd/tty.c b/pppd/tty.c
-index d571b11..bc96695 100644
---- a/pppd/tty.c
-+++ b/pppd/tty.c
-@@ -569,7 +569,7 @@ int connect_tty()
- 				status = EXIT_OPEN_FAILED;
- 				goto errret;
- 			}
--			real_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
-+			real_ttyfd = open(devnam, O_NONBLOCK | O_RDWR | O_CLOEXEC, 0);
- 			err = errno;
- 			if (prio < OPRIO_ROOT && seteuid(0) == -1)
- 				fatal("Unable to regain privileges");
-@@ -723,7 +723,7 @@ int connect_tty()
- 	if (connector == NULL && modem && devnam[0] != 0) {
- 		int i;
- 		for (;;) {
--			if ((i = open(devnam, O_RDWR)) >= 0)
-+			if ((i = open(devnam, O_RDWR | O_CLOEXEC)) >= 0)
- 				break;
- 			if (errno != EINTR) {
- 				error("Failed to reopen %s: %m", devnam);
-diff --git a/pppd/utils.c b/pppd/utils.c
-index 29bf970..6051b9a 100644
---- a/pppd/utils.c
-+++ b/pppd/utils.c
-@@ -918,14 +918,14 @@ lock(dev)
-     slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", LOCK_DIR, dev);
- #endif
- 
--    while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) {
-+    while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR | O_CLOEXEC, 0644)) < 0) {
- 	if (errno != EEXIST) {
- 	    error("Can't create lock file %s: %m", lock_file);
- 	    break;
- 	}
- 
- 	/* Read the lock file to find out who has the device locked. */
--	fd = open(lock_file, O_RDONLY, 0);
-+	fd = open(lock_file, O_RDONLY | O_CLOEXEC, 0);
- 	if (fd < 0) {
- 	    if (errno == ENOENT) /* This is just a timing problem. */
- 		continue;
-@@ -1004,7 +1004,7 @@ relock(pid)
- 
-     if (lock_file[0] == 0)
- 	return -1;
--    fd = open(lock_file, O_WRONLY, 0);
-+    fd = open(lock_file, O_WRONLY | O_CLOEXEC, 0);
-     if (fd < 0) {
- 	error("Couldn't reopen lock file %s: %m", lock_file);
- 	lock_file[0] = 0;
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch b/ppp/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
deleted file mode 100644
index 3475f09a8..000000000
--- a/ppp/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 2a97ab28ee00586e5f06b3ef3a0e43ea0c7c6499 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Mon, 7 Apr 2014 14:21:41 +0200
-Subject: [PATCH 14/25] everywhere: use SOCK_CLOEXEC when creating socket
-
----
- pppd/plugins/pppoatm/pppoatm.c          |  2 +-
- pppd/plugins/pppol2tp/openl2tp.c        |  2 +-
- pppd/plugins/pppol2tp/pppol2tp.c        |  2 +-
- pppd/plugins/rp-pppoe/if.c              |  2 +-
- pppd/plugins/rp-pppoe/plugin.c          |  6 +++---
- pppd/plugins/rp-pppoe/pppoe-discovery.c |  2 +-
- pppd/sys-linux.c                        | 10 +++++-----
- pppd/tty.c                              |  2 +-
- 8 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/pppd/plugins/pppoatm/pppoatm.c b/pppd/plugins/pppoatm/pppoatm.c
-index d693350..c31bb34 100644
---- a/pppd/plugins/pppoatm/pppoatm.c
-+++ b/pppd/plugins/pppoatm/pppoatm.c
-@@ -135,7 +135,7 @@ static int connect_pppoatm(void)
- 
- 	if (!device_got_set)
- 		no_device_given_pppoatm();
--	fd = socket(AF_ATMPVC, SOCK_DGRAM, 0);
-+	fd = socket(AF_ATMPVC, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- 	if (fd < 0)
- 		fatal("failed to create socket: %m");
- 	memset(&qos, 0, sizeof qos);
-diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c
-index 9643b96..1099575 100644
---- a/pppd/plugins/pppol2tp/openl2tp.c
-+++ b/pppd/plugins/pppol2tp/openl2tp.c
-@@ -83,7 +83,7 @@ static int openl2tp_client_create(void)
- 	int result;
- 
- 	if (openl2tp_fd < 0) {
--		openl2tp_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
-+		openl2tp_fd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- 		if (openl2tp_fd < 0) {
- 			error("openl2tp connection create: %m");
- 			return -ENOTCONN;
-diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
-index a7e3400..e64a778 100644
---- a/pppd/plugins/pppol2tp/pppol2tp.c
-+++ b/pppd/plugins/pppol2tp/pppol2tp.c
-@@ -208,7 +208,7 @@ static void send_config_pppol2tp(int mtu,
- 		struct ifreq ifr;
- 		int fd;
- 
--		fd = socket(AF_INET, SOCK_DGRAM, 0);
-+		fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- 		if (fd >= 0) {
- 			memset (&ifr, '\0', sizeof (ifr));
- 			strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
-index 91e9a57..72aba41 100644
---- a/pppd/plugins/rp-pppoe/if.c
-+++ b/pppd/plugins/rp-pppoe/if.c
-@@ -116,7 +116,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
-     stype = SOCK_PACKET;
- #endif
- 
--    if ((fd = socket(domain, stype, htons(type))) < 0) {
-+    if ((fd = socket(domain, stype | SOCK_CLOEXEC, htons(type))) < 0) {
- 	/* Give a more helpful message for the common error case */
- 	if (errno == EPERM) {
- 	    fatal("Cannot create raw socket -- pppoe must be run as root.");
-diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
-index a8c2bb4..24bdf8f 100644
---- a/pppd/plugins/rp-pppoe/plugin.c
-+++ b/pppd/plugins/rp-pppoe/plugin.c
-@@ -137,7 +137,7 @@ PPPOEConnectDevice(void)
-     /* server equipment).                                                  */
-     /* Opening this socket just before waitForPADS in the discovery()      */
-     /* function would be more appropriate, but it would mess-up the code   */
--    conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE);
-+    conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM | SOCK_CLOEXEC, PX_PROTO_OE);
-     if (conn->sessionSocket < 0) {
- 	error("Failed to create PPPoE socket: %m");
- 	return -1;
-@@ -148,7 +148,7 @@ PPPOEConnectDevice(void)
-     lcp_wantoptions[0].mru = conn->mru;
- 
-     /* Update maximum MRU */
--    s = socket(AF_INET, SOCK_DGRAM, 0);
-+    s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if (s < 0) {
- 	error("Can't get MTU for %s: %m", conn->ifName);
- 	goto errout;
-@@ -320,7 +320,7 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
-     }
- 
-     /* Open a socket */
--    if ((fd = socket(PF_PACKET, SOCK_RAW, 0)) < 0) {
-+    if ((fd = socket(PF_PACKET, SOCK_RAW | SOCK_CLOEXEC, 0)) < 0) {
- 	r = 0;
-     }
- 
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-index 3d3bf4e..c0d927d 100644
---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -121,7 +121,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
-     stype = SOCK_PACKET;
- #endif
- 
--    if ((fd = socket(domain, stype, htons(type))) < 0) {
-+    if ((fd = socket(domain, stype | SOCK_CLOEXEC, htons(type))) < 0) {
- 	/* Give a more helpful message for the common error case */
- 	if (errno == EPERM) {
- 	    rp_fatal("Cannot create raw socket -- pppoe must be run as root.");
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 00a2cf5..0690019 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -308,12 +308,12 @@ static int modify_flags(int fd, int clear_bits, int set_bits)
- void sys_init(void)
- {
-     /* Get an internet socket for doing socket ioctls. */
--    sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-+    sock_fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if (sock_fd < 0)
- 	fatal("Couldn't create IP socket: %m(%d)", errno);
- 
- #ifdef INET6
--    sock6_fd = socket(AF_INET6, SOCK_DGRAM, 0);
-+    sock6_fd = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if (sock6_fd < 0)
- 	sock6_fd = -errno;	/* save errno for later */
- #endif
-@@ -1857,7 +1857,7 @@ get_if_hwaddr(u_char *addr, char *name)
- 	struct ifreq ifreq;
- 	int ret, sock_fd;
- 
--	sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-+	sock_fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- 	if (sock_fd < 0)
- 		return 0;
- 	memset(&ifreq.ifr_hwaddr, 0, sizeof(struct sockaddr));
-@@ -2067,7 +2067,7 @@ int ppp_available(void)
- /*
-  * Open a socket for doing the ioctl operations.
-  */
--    s = socket(AF_INET, SOCK_DGRAM, 0);
-+    s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if (s < 0)
- 	return 0;
- 
-@@ -2860,7 +2860,7 @@ ether_to_eui64(eui64_t *p_eui64)
-     int skfd;
-     const unsigned char *ptr;
- 
--    skfd = socket(PF_INET6, SOCK_DGRAM, 0);
-+    skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if(skfd == -1)
-     {
-         warn("could not open IPv6 socket");
-diff --git a/pppd/tty.c b/pppd/tty.c
-index bc96695..8e76a5d 100644
---- a/pppd/tty.c
-+++ b/pppd/tty.c
-@@ -896,7 +896,7 @@ open_socket(dest)
-     *sep = ':';
- 
-     /* get a socket and connect it to the other end */
--    sock = socket(PF_INET, SOCK_STREAM, 0);
-+    sock = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-     if (sock < 0) {
- 	error("Can't create socket: %m");
- 	return -1;
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch b/ppp/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
deleted file mode 100644
index f6ae8f7d5..000000000
--- a/ppp/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f2c855462ff56be4121409c7e048cd2503fe0ccf Mon Sep 17 00:00:00 2001
-From: Jiri Skala jskala@fedoraproject.org
-Date: Mon, 7 Apr 2014 14:26:20 +0200
-Subject: [PATCH 15/25] pppd: move pppd database to /var/run/ppp
-
-Resolves: #560014
----
- pppd/pathnames.h | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index bef3160..24e010c 100644
---- a/pppd/pathnames.h
-+++ b/pppd/pathnames.h
-@@ -6,8 +6,9 @@
- 
- #ifdef HAVE_PATHS_H
- #include <paths.h>
--
-+#define _PPP_SUBDIR	"ppp/"
- #else /* HAVE_PATHS_H */
-+#define _PPP_SUBDIR
- #ifndef _PATH_VARRUN
- #define _PATH_VARRUN 	"/etc/ppp/"
- #endif
-@@ -46,13 +47,9 @@
- #endif /* IPX_CHANGE */
- 
- #ifdef __STDC__
--#define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN "pppd2.tdb"
-+#define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
- #else /* __STDC__ */
--#ifdef HAVE_PATHS_H
--#define _PATH_PPPDB	"/var/run/pppd2.tdb"
--#else
--#define _PATH_PPPDB	"/etc/ppp/pppd2.tdb"
--#endif
-+#define _PATH_PPPDB	_PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
- #endif /* __STDC__ */
- 
- #ifdef PLUGIN
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch b/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
deleted file mode 100644
index af89fc81e..000000000
--- a/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From a30efa2cc99a5b6ab220de04cbcc7db38888a17a Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Mon, 7 Apr 2014 14:29:45 +0200
-Subject: [PATCH 16/25] rp-pppoe: add manpage for pppoe-discovery
-
----
- pppd/plugins/rp-pppoe/Makefile.linux    |  2 +
- pppd/plugins/rp-pppoe/pppoe-discovery.8 | 86 +++++++++++++++++++++++++++++++++
- 2 files changed, 88 insertions(+)
- create mode 100644 pppd/plugins/rp-pppoe/pppoe-discovery.8
-
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 3cd9101..9918091 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -16,6 +16,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
-+MANDIR = $(DESTDIR)/share/man/man8
- LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
- 
- PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-@@ -46,6 +47,7 @@ install: all
- 	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
- 	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
- 
- clean:
- 	rm -f *.o *.so pppoe-discovery
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.8 b/pppd/plugins/rp-pppoe/pppoe-discovery.8
-new file mode 100644
-index 0000000..d0a93db
---- /dev/null
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.8
-@@ -0,0 +1,86 @@
-+." pppoe-discovery.8 written by
-+." Ben Hutchings ben@decadentplace.org.uk, based on pppoe.8.
-+." Licenced under the GPL version 2 or later.
-+.TH PPPOE-DISCOVERY 8
-+.SH NAME
-+pppoe-discovery - perform PPPoE discovery
-+.SH SYNOPSIS
-+.B pppoe-discovery
-+[
-+.I options
-+]
-+.br
-+.BR pppoe-discovery " { " -V " | " -h " }"
-+.SH DESCRIPTION
-+.LP
-+\fBpppoe-discovery\fR performs the same discovery process as
-+\fBpppoe\fR, but does not initiate a session.
-+It sends a PADI packet and then prints the names of access
-+concentrators in each PADO packet it receives.
-+.SH OPTIONS
-+.TP
-+.BI -I " interface"
-+.RS
-+The \fB-I\fR option specifies the Ethernet interface to use.
-+Under Linux, it is typically eth0 or eth1.
-+The interface should be (lqup(rq before you start
-+\fBpppoe-discovery\fR, but should \fInot\fR be configured to have an
-+IP address.
-+The default interface is eth0.
-+.RE
-+.TP
-+.BI -D " file_name"
-+.RS
-+The \fB-D\fR option causes every packet to be dumped to the specified
-+\fIfile_name\fR.
-+This is intended for debugging only.
-+.RE
-+.TP
-+.B -U
-+.RS
-+Causes \fBpppoe-discovery\fR to use the Host-Uniq tag in its discovery
-+packets.
-+This lets you run multiple instances of \fBpppoe-discovery\fR and/or
-+\fBpppoe\fR without having their discovery packets interfere with one
-+another.
-+You must supply this option to \fIall\fR instances that you intend to
-+run simultaneously.
-+.RE
-+.TP
-+.BI -S " service_name"
-+.RS
-+Specifies the desired service name.
-+\fBpppoe-discovery\fR will only accept access concentrators which can
-+provide the specified service.
-+In most cases, you should \fInot\fR specify this option.
-+Use it only if you know that there are multiple access concentrators
-+or know that you need a specific service name.
-+.RE
-+.TP
-+.BI -C " ac_name"
-+.RS
-+Specifies the desired access concentrator name.
-+\fBpppoe-discovery\fR will only accept the specified access
-+concentrator.
-+In most cases, you should \fInot\fR specify this option.
-+Use it only if you know that there are multiple access concentrators.
-+If both the \fB-S\fR and \fB-C\fR options are specified, they must
-+\fIboth\fR match.
-+.RE
-+.TP
-+.B -A
-+.RS
-+This option is accepted for compatibility with \fBpppoe\fR, but has no
-+effect.
-+.RE
-+.TP
-+.BR -V " | " -h
-+.RS
-+Either of these options causes \fBpppoe-discovery\fR to print its
-+version number and usage information, then exit.
-+.RE
-+.SH AUTHORS
-+\fBpppoe-discovery\fR was written by Marco d'Itri md@linux.it,
-+based on \fBpppoe\fR by David F. Skoll dfs@roaringpenguin.com.
-+.SH SEE ALSO
-+pppoe(8), pppoe-sniff(8)
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0017-pppd-rebase-EAP-TLS-patch-v0.994.patch b/ppp/patches/0017-pppd-rebase-EAP-TLS-patch-v0.994.patch
deleted file mode 100644
index b9053a6a3..000000000
--- a/ppp/patches/0017-pppd-rebase-EAP-TLS-patch-v0.994.patch
+++ /dev/null
@@ -1,3045 +0,0 @@
-From 044a5b1e5d878c519143b71a44b3d5b0ca91de3b Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Mon, 7 Apr 2014 14:56:56 +0200
-Subject: [PATCH 17/25] pppd: rebase EAP-TLS patch v0.994
-
----
- README.eap-tls              |  169 +++++++
- etc.ppp/eaptls-client       |   10 +
- etc.ppp/eaptls-server       |   11 +
- etc.ppp/openssl.cnf         |   14 +
- linux/Makefile.top          |    6 +-
- pppd/Makefile.linux         |   12 +
- pppd/auth.c                 |  414 ++++++++++++++-
- pppd/ccp.c                  |   20 +-
- pppd/chap-md5.c             |    4 +
- pppd/eap-tls.c              | 1174 +++++++++++++++++++++++++++++++++++++++++++
- pppd/eap-tls.h              |  107 ++++
- pppd/eap.c                  |  462 ++++++++++++++++-
- pppd/eap.h                  |   32 +-
- pppd/md5.c                  |    3 +
- pppd/md5.h                  |    3 +
- pppd/options.c              |   10 +
- pppd/pathnames.h            |    7 +
- pppd/plugins/Makefile.linux |    3 +
- pppd/plugins/passprompt.c   |    3 +
- pppd/plugins/passwordfd.c   |    4 +
- pppd/pppd.h                 |    8 +
- 21 files changed, 2461 insertions(+), 15 deletions(-)
- create mode 100644 README.eap-tls
- create mode 100644 etc.ppp/eaptls-client
- create mode 100644 etc.ppp/eaptls-server
- create mode 100644 etc.ppp/openssl.cnf
- create mode 100644 pppd/eap-tls.c
- create mode 100644 pppd/eap-tls.h
-
-diff --git a/README.eap-tls b/README.eap-tls
-new file mode 100644
-index 0000000..0a4fee9
---- /dev/null
-+++ b/README.eap-tls
-@@ -0,0 +1,169 @@
-+EAP-TLS authentication support for PPP
-+======================================
-+
-+1. Intro
-+
-+    The Extensible Authentication Protocol (EAP; RFC 3748) is a
-+    security protocol that can be used with PPP.  It provides a means
-+    to plug in multiple optional authentication methods.
-+
-+    Transport Level Security (TLS; RFC 2246) provides for mutual 
-+    authentication, integrity-protected ciphersuite negotiation and 
-+    key exchange between two endpoints.  It also provides for optional
-+    MPPE encryption.
-+
-+    EAP-TLS (RFC 2716) incapsulates the TLS messages in EAP packets,
-+    allowing TLS mutual authentication to be used as a generic EAP
-+    mechanism. It also provides optional encryption using the MPPE
-+    protocol.
-+
-+    This patch provide EAP-TLS support to pppd.
-+    This authentication method can be used in both client or server
-+    mode.
-+
-+2. Building
-+
-+    To build pppd with EAP-TLS support, OpenSSL (http://www.openssl.org)
-+    is required. Any version from 0.9.7 should work.
-+    
-+    Configure, compile, and install as usual. 
-+
-+3. Configuration
-+
-+    On the client side there are two ways to configure EAP-TLS:
-+
-+	1. supply the appropriate 'ca', 'cert' and 'key' command-line parameters
-+
-+	2. edit the /etc/ppp/eaptls-client file.
-+    Insert a line for each system with which you use EAP-TLS.
-+    The line is composed of this fields separated by tab:
-+
-+      - Client name 
-+		The name used by the client for authentication, can be *
-+      - Server name
-+		The name of the server, can be *
-+      - Client certificate file 
-+		The file containing the certificate chain for the 
-+		client in PEM format
-+      - Server certificate file
-+		If you want to specify the certificate that the 
-+		server is allowed to use, put the certificate file name.
-+		Else put a dash '-'.
-+      - CA certificate file
-+		The file containing the trusted CA certificates in PEM
-+		format.
-+      - Client private key file
-+		The file containing the client private key in PEM format.
-+
-+
-+    On the server side edit the /etc/ppp/eaptls-server file.
-+    Insert a line for each system with which you use EAP-TLS.
-+    The line is composed of this fields separated by tab:
-+
-+      - Client name
-+                The name used by the client for authentication, can be *
-+      - Server name
-+                The name of the server, can be *
-+      - Client certificate file
-+                If you want to specify the certificate that the
-+                client is allowed to use, put the certificate file name.
-+                Else put a dash '-'.
-+      - Server certificate file
-+		The file containing the certificate chain for the
-+                server in PEM format
-+      - CA certificate file
-+                The file containing the trusted CA certificates in PEM
-+                format.
-+      - Client private key file
-+                The file containing the server private key in PEM format.
-+      - addresses
-+		A list of IP addresses the client is allowed to use.
-+
-+
-+    OpenSSL engine support is included starting with v0.95 of this patch. 
-+    Currently the only engine tested is the 'pkcs11' engine (hardware token
-+    support). To use the 'pksc11' engine:
-+      - Use a special private key fileiname in the /etc/ppp/eaptls-client file:
-+          <engine>:<identifier>
-+        e.g.
-+          pkcs11:123456
-+
-+      - The certificate can also be loaded from the 'pkcs11' engine using
-+        a special client certificate filename in the /etc/ppp/eaptls-client file:
-+          <engine>:<identifier>
-+        e.g.
-+          pkcs11:123456
-+
-+      - Create an /etc/ppp/openssl.cnf file to load the right OpenSSL engine prior
-+        to starting 'pppd'. A sample openssl.cnf file is
-+
-+        openssl_conf = openssl_def
-+
-+        [ openssl_def ]
-+        engines = engine_section
-+
-+        [ engine_section ]
-+        pkcs11 = pkcs11_section
-+
-+        [ pkcs11_section ]
-+        engine_id = pkcs11
-+        dynamic_path = /usr/lib64/openssl/engines/engine_pkcs11.so
-+        MODULE_PATH = /usr/lib64/libeTPkcs11.so
-+        init = 0
-+
-+      - There are two ways to specify a password/PIN for the PKCS11 engine:
-+          - inside the openssl.cnf file using
-+              PIN = your-secret-pin
-+            Note The keyword 'PIN' is case sensitive!
-+          - Using the 'password' in the ppp options file.
-+        From v0.97 of the eap-tls patch the password can also be supplied
-+        using the appropriate 'eaptls_passwd_hook' (see plugins/passprompt.c
-+        for an example).
-+
-+
-+4. Options
-+
-+      These pppd options are available:
-+
-+	  ca <ca-file>
-+			Use the CA public certificate found in <ca-file> in PEM format
-+	  cert <cert-file>
-+			Use the client public certificate found in <cert-file> in PEM format
-+			or in engine:engine_id format
-+	  key <key-file>
-+			Use the client private key found in <key-file> in PEM format
-+			or in engine:engine_id format
-+      crl-dir <dir>
-+        	Use CRL files from dir. It contains CRL files in PEM
-+		format and each file contains a CRL. The files are looked up 
-+		by the issuer name hash value. Use the c_rehash utility 
-+		to create necessary links.
-+      need-peer-eap
-+		If the peer doesn't ask us to authenticate or doesn't use eap
-+		to authenticate us, disconnect.
-+
-+      Note: 
-+        password-encrypted certificates can be used as of v0.94 of this 
-+        patch. The password for the eap-tls.key file is specified using 
-+        the regular
-+          password ....
-+        statement in the ppp options file, or by using the appropriate
-+        plugin which supplies a 'eaptls_passwd_hook' routine.
-+
-+5. Connecting
-+
-+    If you're setting up a pppd server, edit the EAP-TLS configuration file 
-+    as written above and then run pppd with the 'auth' option to authenticate
-+    the client. The EAP-TLS method will be used if the other eap methods can't
-+    be used (no secrets).
-+
-+    If you're setting up a client, edit the configuration file and then run
-+    pppd with 'remotename' option to specify the server name. Add the 
-+    'need-peer-eap' option if you want to be sure the peer ask you to
-+    authenticate (and to use eap) and to disconnect if it doesn't.
-+
-+6. Notes
-+
-+   This is experimental code.
-+   Send suggestions and comments to Jan Just Keijser janjust@nikhef.nl
-+
-diff --git a/etc.ppp/eaptls-client b/etc.ppp/eaptls-client
-new file mode 100644
-index 0000000..7782f0e
---- /dev/null
-+++ b/etc.ppp/eaptls-client
-@@ -0,0 +1,10 @@
-+# Parameters for authentication using EAP-TLS (client)
-+
-+# client name (can be *)
-+# server name (can be *)
-+# client certificate file (required)
-+# server certificate file (optional, if unused put '-')
-+# CA certificate file (required)
-+# client private key file (required)
-+
-+#client	server	/root/cert/client.crt	-	/root/cert/ca.crt	/root/cert/client.key
-diff --git a/etc.ppp/eaptls-server b/etc.ppp/eaptls-server
-new file mode 100644
-index 0000000..fa53cbd
---- /dev/null
-+++ b/etc.ppp/eaptls-server
-@@ -0,0 +1,11 @@
-+# Parameters for authentication using EAP-TLS (server)
-+
-+# client name (can be *)
-+# server name (can be *)
-+# client certificate file (optional, if unused put '-')
-+# server certificate file (required)
-+# CA certificate file (required)
-+# server private key file (required)
-+# allowed addresses (required, can be *)
-+
-+#client	server	-	/root/cert/server.crt	/root/cert/ca.crt	/root/cert/server.key	192.168.1.0/24
-diff --git a/etc.ppp/openssl.cnf b/etc.ppp/openssl.cnf
-new file mode 100644
-index 0000000..dd32f30
---- /dev/null
-+++ b/etc.ppp/openssl.cnf
-@@ -0,0 +1,14 @@
-+openssl_conf = openssl_def
-+
-+[ openssl_def ]
-+engines = engine_section
-+
-+[ engine_section ]
-+pkcs11 = pkcs11_section
-+
-+[ pkcs11_section ]
-+engine_id = pkcs11
-+dynamic_path = /usr/lib64/openssl/engines/engine_pkcs11.so
-+MODULE_PATH = /usr/lib64/libeTPkcs11.so
-+init = 0
-+
-diff --git a/linux/Makefile.top b/linux/Makefile.top
-index f42efd5..9a8945a 100644
---- a/linux/Makefile.top
-+++ b/linux/Makefile.top
-@@ -28,7 +28,7 @@ install-progs:
- 	cd pppdump; $(MAKE) $(MFLAGS) install
- 
- install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
--	$(ETCDIR)/chap-secrets
-+	$(ETCDIR)/chap-secrets $(ETCDIR)/eaptls-server $(ETCDIR)/eaptls-client
- 
- install-devel:
- 	cd pppd; $(MAKE) $(MFLAGS) install-devel
-@@ -39,6 +39,10 @@ $(ETCDIR)/pap-secrets:
- 	$(INSTALL) -c -m 600 etc.ppp/pap-secrets $@
- $(ETCDIR)/chap-secrets:
- 	$(INSTALL) -c -m 600 etc.ppp/chap-secrets $@
-+$(ETCDIR)/eaptls-server:
-+	$(INSTALL) -c -m 600 etc.ppp/eaptls-server $@
-+$(ETCDIR)/eaptls-client:
-+	$(INSTALL) -c -m 600 etc.ppp/eaptls-client $@
- 
- $(BINDIR):
- 	$(INSTALL) -d -m 755 $@
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 65700fa..53df4d2 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -76,6 +76,9 @@ CBCP=y
- # Use libutil
- USE_LIBUTIL=y
- 
-+# Enable EAP-TLS authentication (requires libssl and libcrypto)
-+USE_EAPTLS=y
-+
- MAXOCTETS=y
- 
- INCLUDE_DIRS= -I../include
-@@ -115,6 +118,15 @@ HEADERS += sha1.h
- PPPDOBJS += sha1.o
- endif
- 
-+# EAP-TLS
-+ifdef USE_EAPTLS
-+CFLAGS += -DUSE_EAPTLS=1 -I/usr/kerberos/include
-+LIBS += -lssl -lcrypto
-+PPPDSRC += eap-tls.c
-+HEADERS += eap-tls.h
-+PPPDOBJS += eap-tls.o
-+endif
-+
- ifdef HAS_SHADOW
- CFLAGS   += -DHAS_SHADOW
- #LIBS     += -lshadow $(LIBS)
-diff --git a/pppd/auth.c b/pppd/auth.c
-index 9e957fa..88cbdb6 100644
---- a/pppd/auth.c
-+++ b/pppd/auth.c
-@@ -109,6 +109,9 @@
- #include "upap.h"
- #include "chap-new.h"
- #include "eap.h"
-+#ifdef USE_EAPTLS
-+#include "eap-tls.h"
-+#endif
- #ifdef CBCP_SUPPORT
- #include "cbcp.h"
- #endif
-@@ -183,6 +186,11 @@ int (*chap_check_hook) __P((void)) = NULL;
- /* Hook for a plugin to get the CHAP password for authenticating us */
- int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL;
- 
-+#ifdef USE_EAPTLS
-+/* Hook for a plugin to get the EAP-TLS password for authenticating us */
-+int (*eaptls_passwd_hook) __P((char *user, char *passwd)) = NULL;
-+#endif
-+
- /* Hook for a plugin to say whether it is OK if the peer
-    refuses to authenticate. */
- int (*null_auth_hook) __P((struct wordlist **paddrs,
-@@ -238,6 +246,13 @@ bool explicit_remote = 0;	/* User specified explicit remote name */
- bool explicit_user = 0;		/* Set if "user" option supplied */
- bool explicit_passwd = 0;	/* Set if "password" option supplied */
- char remote_name[MAXNAMELEN];	/* Peer's name for authentication */
-+#ifdef USE_EAPTLS
-+char *cacert_file  = NULL;	/* CA certificate file (pem format) */
-+char *cert_file    = NULL;	/* client certificate file (pem format) */
-+char *privkey_file = NULL;	/* client private key file (pem format) */
-+char *crl_dir      = NULL;	/* directory containing CRL files */
-+bool need_peer_eap = 0;			/* Require peer to authenticate us */
-+#endif
- 
- static char *uafname;		/* name of most recent +ua file */
- 
-@@ -254,6 +269,19 @@ static int  have_pap_secret __P((int *));
- static int  have_chap_secret __P((char *, char *, int, int *));
- static int  have_srp_secret __P((char *client, char *server, int need_ip,
-     int *lacks_ipp));
-+
-+#ifdef USE_EAPTLS
-+static int  have_eaptls_secret_server
-+__P((char *client, char *server, int need_ip, int *lacks_ipp));
-+static int  have_eaptls_secret_client __P((char *client, char *server));
-+static int  scan_authfile_eaptls __P((FILE * f, char *client, char *server,
-+			       char *cli_cert, char *serv_cert,
-+			       char *ca_cert, char *pk,
-+			       struct wordlist ** addrs,
-+			       struct wordlist ** opts,
-+			       char *filename, int flags));
-+#endif
-+
- static int  ip_addr_check __P((u_int32_t, struct permitted_ip *));
- static int  scan_authfile __P((FILE *, char *, char *, char *,
- 			       struct wordlist **, struct wordlist **,
-@@ -401,6 +429,14 @@ option_t auth_options[] = {
-       "Set telephone number(s) which are allowed to connect",
-       OPT_PRIV | OPT_A2LIST },
- 
-+#ifdef USE_EAPTLS
-+    { "ca", o_string, &cacert_file,   "EAP-TLS CA certificate in PEM format" },
-+    { "cert", o_string, &cert_file,   "EAP-TLS client certificate in PEM format" },
-+    { "key", o_string, &privkey_file, "EAP-TLS client private key in PEM format" },
-+    { "crl-dir", o_string, &crl_dir,  "Use CRLs in directory" },
-+    { "need-peer-eap", o_bool, &need_peer_eap,
-+      "Require the peer to authenticate us", 1 },
-+#endif /* USE_EAPTLS */
-     { NULL }
- };
- 
-@@ -730,6 +766,9 @@ link_established(unit)
-     lcp_options *wo = &lcp_wantoptions[unit];
-     lcp_options *go = &lcp_gotoptions[unit];
-     lcp_options *ho = &lcp_hisoptions[unit];
-+#ifdef USE_EAPTLS
-+    lcp_options *ao = &lcp_allowoptions[unit];
-+#endif
-     int i;
-     struct protent *protp;
- 
-@@ -764,6 +803,22 @@ link_established(unit)
- 	}
-     }
- 
-+#ifdef USE_EAPTLS
-+    if (need_peer_eap && !ao->neg_eap) {
-+	warn("eap required to authenticate us but no suitable secrets");
-+	lcp_close(unit, "couldn't negotiate eap");
-+	status = EXIT_AUTH_TOPEER_FAILED;
-+	return;
-+    }
-+
-+    if (need_peer_eap && !ho->neg_eap) {
-+	warn("peer doesn't want to authenticate us with eap");
-+	lcp_close(unit, "couldn't negotiate eap");
-+	status = EXIT_PEER_AUTH_FAILED;
-+	return;
-+    }
-+#endif
-+
-     new_phase(PHASE_AUTHENTICATE);
-     auth = 0;
-     if (go->neg_eap) {
-@@ -1117,7 +1172,7 @@ np_down(unit, proto)
- 	UNTIMEOUT(connect_time_expired, NULL);
- #ifdef MAXOCTETS
- 	UNTIMEOUT(check_maxoctets, NULL);
--#endif	
-+#endif
- 	new_phase(PHASE_NETWORK);
-     }
- }
-@@ -1144,7 +1199,7 @@ check_maxoctets(arg)
- 
-     update_link_stats(ifunit);
-     link_stats_valid=0;
--    
-+
-     switch(maxoctets_dir) {
- 	case PPP_OCTETS_DIRECTION_IN:
- 	    used = link_stats.bytes_in;
-@@ -1277,6 +1332,15 @@ auth_check_options()
- 				    our_name, 1, &lacks_ip);
-     }
- 
-+#ifdef USE_EAPTLS
-+    if (!can_auth && wo->neg_eap) {
-+	can_auth =
-+	    have_eaptls_secret_server((explicit_remote ? remote_name :
-+				       NULL), our_name, 1, &lacks_ip);
-+
-+    }
-+#endif
-+
-     if (auth_required && !can_auth && noauth_addrs == NULL) {
- 	if (default_auth) {
- 	    option_error(
-@@ -1331,7 +1395,11 @@ auth_reset(unit)
- 	passwd[0] != 0 ||
- 	(hadchap == 1 || (hadchap == -1 && have_chap_secret(user,
- 	    (explicit_remote? remote_name: NULL), 0, NULL))) ||
--	have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL));
-+	have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL)
-+#ifdef USE_EAPTLS
-+		|| have_eaptls_secret_client(user, (explicit_remote? remote_name: NULL))
-+#endif
-+	);
- 
-     hadchap = -1;
-     if (go->neg_upap && !uselogin && !have_pap_secret(NULL))
-@@ -1346,8 +1414,14 @@ auth_reset(unit)
- 	    !have_chap_secret((explicit_remote? remote_name: NULL), our_name,
- 		1, NULL))) &&
- 	!have_srp_secret((explicit_remote? remote_name: NULL), our_name, 1,
--	    NULL))
-+	    NULL)
-+#ifdef USE_EAPTLS
-+	 && !have_eaptls_secret_server((explicit_remote? remote_name: NULL),
-+				   our_name, 1, NULL)
-+#endif
-+		)
- 	go->neg_eap = 0;
-+
- }
- 
- 
-@@ -1707,6 +1781,7 @@ have_srp_secret(client, server, need_ip, lacks_ipp)
- }
- 
- 
-+
- /*
-  * get_secret - open the CHAP secret file and return the secret
-  * for authenticating the given client on the given server.
-@@ -2359,3 +2434,334 @@ auth_script(script)
- 
-     auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL, 0);
- }
-+
-+
-+#ifdef USE_EAPTLS
-+static int
-+have_eaptls_secret_server(client, server, need_ip, lacks_ipp)
-+    char *client;
-+    char *server;
-+    int need_ip;
-+    int *lacks_ipp;
-+{
-+    FILE *f;
-+    int ret;
-+    char *filename;
-+    struct wordlist *addrs;
-+    char servcertfile[MAXWORDLEN];
-+    char clicertfile[MAXWORDLEN];
-+    char cacertfile[MAXWORDLEN];
-+    char pkfile[MAXWORDLEN];
-+
-+    filename = _PATH_EAPTLSSERVFILE;
-+    f = fopen(filename, "r");
-+    if (f == NULL)
-+		return 0;
-+
-+    if (client != NULL && client[0] == 0)
-+		client = NULL;
-+    else if (server != NULL && server[0] == 0)
-+		server = NULL;
-+
-+    ret =
-+	scan_authfile_eaptls(f, client, server, clicertfile, servcertfile,
-+			     cacertfile, pkfile, &addrs, NULL, filename,
-+			     0);
-+
-+    fclose(f);
-+
-+/*
-+    if (ret >= 0 && !eaptls_init_ssl(1, cacertfile, servcertfile,
-+				clicertfile, pkfile))
-+		ret = -1;
-+*/
-+
-+	if (ret >= 0 && need_ip && !some_ip_ok(addrs)) {
-+		if (lacks_ipp != 0)
-+			*lacks_ipp = 1;
-+		ret = -1;
-+    }
-+    if (addrs != 0)
-+		free_wordlist(addrs);
-+
-+    return ret >= 0;
-+}
-+
-+
-+static int
-+have_eaptls_secret_client(client, server)
-+    char *client;
-+    char *server;
-+{
-+    FILE *f;
-+    int ret;
-+    char *filename;
-+    struct wordlist *addrs = NULL;
-+    char servcertfile[MAXWORDLEN];
-+    char clicertfile[MAXWORDLEN];
-+    char cacertfile[MAXWORDLEN];
-+    char pkfile[MAXWORDLEN];
-+
-+    if (client != NULL && client[0] == 0)
-+		client = NULL;
-+    else if (server != NULL && server[0] == 0)
-+		server = NULL;
-+
-+	if (cacert_file && cert_file && privkey_file)
-+		return 1;
-+
-+    filename = _PATH_EAPTLSCLIFILE;
-+    f = fopen(filename, "r");
-+    if (f == NULL)
-+		return 0;
-+
-+    ret =
-+	scan_authfile_eaptls(f, client, server, clicertfile, servcertfile,
-+			     cacertfile, pkfile, &addrs, NULL, filename,
-+			     0);
-+    fclose(f);
-+
-+/*
-+    if (ret >= 0 && !eaptls_init_ssl(0, cacertfile, clicertfile,
-+				servcertfile, pkfile))
-+		ret = -1;
-+*/
-+
-+    if (addrs != 0)
-+		free_wordlist(addrs);
-+
-+    return ret >= 0;
-+}
-+
-+
-+static int
-+scan_authfile_eaptls(f, client, server, cli_cert, serv_cert, ca_cert, pk,
-+		     addrs, opts, filename, flags)
-+    FILE *f;
-+    char *client;
-+    char *server;
-+    char *cli_cert;
-+    char *serv_cert;
-+    char *ca_cert;
-+    char *pk;
-+    struct wordlist **addrs;
-+    struct wordlist **opts;
-+    char *filename;
-+    int flags;
-+{
-+    int newline;
-+    int got_flag, best_flag;
-+    struct wordlist *ap, *addr_list, *alist, **app;
-+    char word[MAXWORDLEN];
-+
-+    if (addrs != NULL)
-+	*addrs = NULL;
-+    if (opts != NULL)
-+	*opts = NULL;
-+    addr_list = NULL;
-+    if (!getword(f, word, &newline, filename))
-+	return -1;		/* file is empty??? */
-+    newline = 1;
-+    best_flag = -1;
-+    for (;;) {
-+	/*
-+	 * Skip until we find a word at the start of a line.
-+	 */
-+	while (!newline && getword(f, word, &newline, filename));
-+	if (!newline)
-+	    break;		/* got to end of file */
-+
-+	/*
-+	 * Got a client - check if it's a match or a wildcard.
-+	 */
-+	got_flag = 0;
-+	if (client != NULL && strcmp(word, client) != 0 && !ISWILD(word)) {
-+	    newline = 0;
-+	    continue;
-+	}
-+	if (!ISWILD(word))
-+	    got_flag = NONWILD_CLIENT;
-+
-+	/*
-+	 * Now get a server and check if it matches.
-+	 */
-+	if (!getword(f, word, &newline, filename))
-+	    break;
-+	if (newline)
-+	    continue;
-+	if (!ISWILD(word)) {
-+	    if (server != NULL && strcmp(word, server) != 0)
-+		continue;
-+	    got_flag |= NONWILD_SERVER;
-+	}
-+
-+	/*
-+	 * Got some sort of a match - see if it's better than what
-+	 * we have already.
-+	 */
-+	if (got_flag <= best_flag)
-+	    continue;
-+
-+	/*
-+	 * Get the cli_cert
-+	 */
-+	if (!getword(f, word, &newline, filename))
-+	    break;
-+	if (newline)
-+	    continue;
-+	if (strcmp(word, "-") != 0) {
-+	    strlcpy(cli_cert, word, MAXWORDLEN);
-+	} else
-+	    cli_cert[0] = 0;
-+
-+	/*
-+	 * Get serv_cert
-+	 */
-+	if (!getword(f, word, &newline, filename))
-+	    break;
-+	if (newline)
-+	    continue;
-+	if (strcmp(word, "-") != 0) {
-+	    strlcpy(serv_cert, word, MAXWORDLEN);
-+	} else
-+	    serv_cert[0] = 0;
-+
-+	/*
-+	 * Get ca_cert
-+	 */
-+	if (!getword(f, word, &newline, filename))
-+	    break;
-+	if (newline)
-+	    continue;
-+	strlcpy(ca_cert, word, MAXWORDLEN);
-+
-+	/*
-+	 * Get pk
-+	 */
-+	if (!getword(f, word, &newline, filename))
-+	    break;
-+	if (newline)
-+	    continue;
-+	strlcpy(pk, word, MAXWORDLEN);
-+
-+
-+	/*
-+	 * Now read address authorization info and make a wordlist.
-+	 */
-+	app = &alist;
-+	for (;;) {
-+	    if (!getword(f, word, &newline, filename) || newline)
-+		break;
-+	    ap = (struct wordlist *)
-+		malloc(sizeof(struct wordlist) + strlen(word) + 1);
-+	    if (ap == NULL)
-+		novm("authorized addresses");
-+	    ap->word = (char *) (ap + 1);
-+	    strcpy(ap->word, word);
-+	    *app = ap;
-+	    app = &ap->next;
-+	}
-+	*app = NULL;
-+	/*
-+	 * This is the best so far; remember it.
-+	 */
-+	best_flag = got_flag;
-+	if (addr_list)
-+	    free_wordlist(addr_list);
-+	addr_list = alist;
-+
-+	if (!newline)
-+	    break;
-+    }
-+
-+    /* scan for a -- word indicating the start of options */
-+    for (app = &addr_list; (ap = *app) != NULL; app = &ap->next)
-+	if (strcmp(ap->word, "--") == 0)
-+	    break;
-+    /* ap = start of options */
-+    if (ap != NULL) {
-+	ap = ap->next;		/* first option */
-+	free(*app);		/* free the "--" word */
-+	*app = NULL;		/* terminate addr list */
-+    }
-+    if (opts != NULL)
-+	*opts = ap;
-+    else if (ap != NULL)
-+	free_wordlist(ap);
-+    if (addrs != NULL)
-+	*addrs = addr_list;
-+    else if (addr_list != NULL)
-+	free_wordlist(addr_list);
-+
-+    return best_flag;
-+}
-+
-+
-+int
-+get_eaptls_secret(unit, client, server, clicertfile, servcertfile,
-+		  cacertfile, pkfile, am_server)
-+    int unit;
-+    char *client;
-+    char *server;
-+    char *clicertfile;
-+    char *servcertfile;
-+    char *cacertfile;
-+    char *pkfile;
-+    int am_server;
-+{
-+    FILE *fp;
-+    int ret;
-+    char *filename         = NULL;
-+    struct wordlist *addrs = NULL;
-+    struct wordlist *opts  = NULL;
-+
-+	/* in client mode the ca+cert+privkey can also be specified as options */
-+	if (!am_server && cacert_file && cert_file && privkey_file )
-+	{
-+		strlcpy( clicertfile, cert_file, MAXWORDLEN );
-+		strlcpy( cacertfile, cacert_file, MAXWORDLEN );
-+		strlcpy( pkfile, privkey_file, MAXWORDLEN );
-+		servcertfile[0] = '\0';
-+	}
-+	else
-+	{
-+		filename = (am_server ? _PATH_EAPTLSSERVFILE : _PATH_EAPTLSCLIFILE);
-+		addrs = NULL;
-+
-+		fp = fopen(filename, "r");
-+		if (fp == NULL)
-+		{
-+			error("Can't open eap-tls secret file %s: %m", filename);
-+			return 0;
-+                }
-+
-+		check_access(fp, filename);
-+
-+		ret = scan_authfile_eaptls(fp, client, server, clicertfile, servcertfile,
-+				cacertfile, pkfile, &addrs, &opts, filename, 0);
-+
-+		fclose(fp);
-+
-+		if (ret < 0) return 0;
-+	}
-+
-+    if (eaptls_passwd_hook)
-+    {
-+		dbglog( "Calling eaptls password hook" );
-+		if ( (*eaptls_passwd_hook)(pkfile, passwd) < 0)
-+		{
-+                        error("Unable to obtain EAP-TLS password for %s (%s) from plugin",
-+                              client, pkfile);
-+                        return 0;
-+		}
-+	}
-+    if (am_server)
-+		set_allowed_addrs(unit, addrs, opts);
-+    else if (opts != NULL)
-+		free_wordlist(opts);
-+    if (addrs != NULL)
-+		free_wordlist(addrs);
-+
-+    return 1;
-+}
-+#endif
-diff --git a/pppd/ccp.c b/pppd/ccp.c
-index 5814f35..7dead23 100644
---- a/pppd/ccp.c
-+++ b/pppd/ccp.c
-@@ -540,6 +540,9 @@ ccp_resetci(f)
-     if (go->mppe) {
- 	ccp_options *ao = &ccp_allowoptions[f->unit];
- 	int auth_mschap_bits = auth_done[f->unit];
-+#ifdef USE_EAPTLS
-+	int auth_eap_bits = auth_done[f->unit];
-+#endif
- 	int numbits;
- 
- 	/*
-@@ -567,8 +570,23 @@ ccp_resetci(f)
- 	    lcp_close(f->unit, "MPPE required but not available");
- 	    return;
- 	}
-+
-+#ifdef USE_EAPTLS
-+    /*
-+     * MPPE is also possible in combination with EAP-TLS.
-+     * It is not possible to detect if we're doing EAP or EAP-TLS
-+     * at this stage, hence we accept all forms of EAP. If TLS is
-+     * not used then the MPPE keys will not be derived anyway.
-+     */
-+	/* Leave only the eap auth bits set */
-+	auth_eap_bits &= (EAP_WITHPEER | EAP_PEER );
-+
-+	if ((numbits == 0) && (auth_eap_bits == 0)) {
-+	    error("MPPE required, but MS-CHAP[v2] nor EAP-TLS auth are performed.");
-+#else
- 	if (!numbits) {
--	    error("MPPE required, but MS-CHAP[v2] auth not performed.");
-+		error("MPPE required, but MS-CHAP[v2] auth not performed.");
-+#endif
- 	    lcp_close(f->unit, "MPPE required but not available");
- 	    return;
- 	}
-diff --git a/pppd/chap-md5.c b/pppd/chap-md5.c
-index 77dd4ec..269b52c 100644
---- a/pppd/chap-md5.c
-+++ b/pppd/chap-md5.c
-@@ -36,7 +36,11 @@
- #include "chap-new.h"
- #include "chap-md5.h"
- #include "magic.h"
-+#ifdef USE_EAPTLS
-+#include "eap-tls.h"
-+#else
- #include "md5.h"
-+#endif /* USE_EAPTLS */
- 
- #define MD5_HASH_SIZE		16
- #define MD5_MIN_CHALLENGE	16
-diff --git a/pppd/eap-tls.c b/pppd/eap-tls.c
-new file mode 100644
-index 0000000..a3aea5a
---- /dev/null
-+++ b/pppd/eap-tls.c
-@@ -0,0 +1,1174 @@
-+/*
-+ * eap-tls.c - EAP-TLS implementation for PPP
-+ *
-+ * Copyright (c) Beniamino Galvani 2005 All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name(s) of the authors of this software must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission.
-+ *
-+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ */
-+
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+
-+#include <openssl/conf.h>
-+#include <openssl/engine.h>
-+#include <openssl/hmac.h>
-+#include <openssl/err.h>
-+#include <openssl/x509v3.h>
-+
-+#include "pppd.h"
-+#include "eap.h"
-+#include "eap-tls.h"
-+#include "fsm.h"
-+#include "lcp.h"
-+#include "pathnames.h"
-+
-+/* The openssl configuration file and engines can be loaded only once */
-+static CONF   *ssl_config  = NULL;
-+static ENGINE *cert_engine = NULL;
-+static ENGINE *pkey_engine = NULL;
-+
-+#ifdef MPPE
-+
-+/*
-+ * TLS PRF from RFC 2246
-+ */
-+static void P_hash(const EVP_MD *evp_md,
-+		   const unsigned char *secret, unsigned int secret_len,
-+		   const unsigned char *seed,   unsigned int seed_len,
-+		   unsigned char *out, unsigned int out_len)
-+{
-+	HMAC_CTX ctx_a, ctx_out;
-+	unsigned char a[HMAC_MAX_MD_CBLOCK];
-+	unsigned int size;
-+
-+	HMAC_CTX_init(&ctx_a);
-+	HMAC_CTX_init(&ctx_out);
-+	HMAC_Init_ex(&ctx_a, secret, secret_len, evp_md, NULL);
-+	HMAC_Init_ex(&ctx_out, secret, secret_len, evp_md, NULL);
-+
-+	size = HMAC_size(&ctx_out);
-+
-+	/* Calculate A(1) */
-+	HMAC_Update(&ctx_a, seed, seed_len);
-+	HMAC_Final(&ctx_a, a, NULL);
-+
-+	while (1) {
-+		/* Calculate next part of output */
-+		HMAC_Update(&ctx_out, a, size);
-+		HMAC_Update(&ctx_out, seed, seed_len);
-+
-+		/* Check if last part */
-+		if (out_len < size) {
-+			HMAC_Final(&ctx_out, a, NULL);
-+			memcpy(out, a, out_len);
-+			break;
-+		}
-+
-+		/* Place digest in output buffer */
-+		HMAC_Final(&ctx_out, out, NULL);
-+		HMAC_Init_ex(&ctx_out, NULL, 0, NULL, NULL);
-+		out += size;
-+		out_len -= size;
-+
-+		/* Calculate next A(i) */
-+		HMAC_Init_ex(&ctx_a, NULL, 0, NULL, NULL);
-+		HMAC_Update(&ctx_a, a, size);
-+		HMAC_Final(&ctx_a, a, NULL);
-+	}
-+
-+	HMAC_CTX_cleanup(&ctx_a);
-+	HMAC_CTX_cleanup(&ctx_out);
-+	memset(a, 0, sizeof(a));
-+}
-+
-+static void PRF(const unsigned char *secret, unsigned int secret_len,
-+		const unsigned char *seed,   unsigned int seed_len,
-+		unsigned char *out, unsigned char *buf, unsigned int out_len)
-+{
-+        unsigned int i;
-+        unsigned int len = (secret_len + 1) / 2;
-+	const unsigned char *s1 = secret;
-+	const unsigned char *s2 = secret + (secret_len - len);
-+
-+	P_hash(EVP_md5(),  s1, len, seed, seed_len, out, out_len);
-+	P_hash(EVP_sha1(), s2, len, seed, seed_len, buf, out_len);
-+
-+	for (i=0; i < out_len; i++) {
-+	        out[i] ^= buf[i];
-+	}
-+}
-+
-+#define EAPTLS_MPPE_KEY_LEN     32
-+
-+/*
-+ *  Generate keys according to RFC 2716 and add to reply
-+ */
-+void eaptls_gen_mppe_keys(struct eaptls_session *ets, const char *prf_label,
-+                          int client)
-+{
-+    unsigned char out[4*EAPTLS_MPPE_KEY_LEN], buf[4*EAPTLS_MPPE_KEY_LEN];
-+    unsigned char seed[64 + 2*SSL3_RANDOM_SIZE];
-+    unsigned char *p = seed;
-+	SSL			  *s = ets->ssl;
-+    size_t prf_size;
-+
-+    prf_size = strlen(prf_label);
-+
-+    memcpy(p, prf_label, prf_size);
-+    p += prf_size;
-+
-+    memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
-+    p += SSL3_RANDOM_SIZE;
-+    prf_size += SSL3_RANDOM_SIZE;
-+
-+    memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE);
-+    prf_size += SSL3_RANDOM_SIZE;
-+
-+    PRF(s->session->master_key, s->session->master_key_length,
-+        seed, prf_size, out, buf, sizeof(out));
-+
-+    /* 
-+     * We now have the master send and receive keys.
-+     * From these, generate the session send and receive keys.
-+     * (see RFC3079 / draft-ietf-pppext-mppe-keys-03.txt for details)
-+     */
-+    if (client)
-+    {
-+	    p = out;
-+		BCOPY( p, mppe_send_key, sizeof(mppe_send_key) );
-+		p += EAPTLS_MPPE_KEY_LEN;
-+    	BCOPY( p, mppe_recv_key, sizeof(mppe_recv_key) );
-+    }
-+    else
-+    {
-+	    p = out;
-+    	BCOPY( p, mppe_recv_key, sizeof(mppe_recv_key) );
-+		p += EAPTLS_MPPE_KEY_LEN;
-+		BCOPY( p, mppe_send_key, sizeof(mppe_send_key) );
-+    }
-+
-+    mppe_keys_set = 1;
-+}
-+
-+#endif
-+
-+void log_ssl_errors( void )
-+{
-+	unsigned long ssl_err = ERR_get_error();
-+
-+    if (ssl_err != 0)
-+		dbglog("EAP-TLS SSL error stack:");
-+	while (ssl_err != 0) {
-+		dbglog( ERR_error_string( ssl_err, NULL ) );
-+		ssl_err = ERR_get_error();
-+	}
-+}
-+
-+
-+int password_callback (char *buf, int size, int rwflag, void *u)
-+{
-+	if (buf)
-+	{
-+		strncpy (buf, passwd, size);
-+		return strlen (buf);
-+	}
-+	return 0;
-+}
-+
-+
-+CONF *eaptls_ssl_load_config( void )
-+{
-+    CONF        *config;
-+    int          ret_code;
-+    long         error_line = 33;
-+
-+    config = NCONF_new( NULL );
-+	dbglog( "Loading OpenSSL config file" );
-+    ret_code = NCONF_load( config, _PATH_OPENSSLCONFFILE, &error_line );
-+    if (ret_code == 0)
-+    {
-+        warn( "EAP-TLS: Error in OpenSSL config file %s at line %d", _PATH_OPENSSLCONFFILE, error_line );
-+        NCONF_free( config );
-+        config = NULL;
-+        ERR_clear_error();
-+    }
-+
-+	dbglog( "Loading OpenSSL built-ins" );
-+    ENGINE_load_builtin_engines();
-+    OPENSSL_load_builtin_modules();
-+   
-+	dbglog( "Loading OpenSSL configured modules" );
-+    if (CONF_modules_load( config, NULL, 0 ) <= 0 )
-+    {
-+        warn( "EAP-TLS: Error loading OpenSSL modules" );
-+	    log_ssl_errors();
-+        config = NULL;
-+    }
-+
-+    return config;
-+}
-+
-+ENGINE *eaptls_ssl_load_engine( char *engine_name )
-+{
-+	ENGINE      *e = NULL;
-+
-+	dbglog( "Enabling OpenSSL auto engines" );
-+	ENGINE_register_all_complete();
-+
-+	dbglog( "Loading OpenSSL '%s' engine support", engine_name );
-+	e = ENGINE_by_id( engine_name );
-+    if (!e) 
-+	{
-+		dbglog( "EAP-TLS: Cannot load '%s' engine support, trying 'dynamic'", engine_name );
-+		e = ENGINE_by_id( "dynamic" );
-+		if (e)
-+		{
-+			if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine_name, 0)
-+   	         || !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0))
-+			{
-+				warn( "EAP-TLS: Error loading dynamic engine '%s'", engine_name );
-+		        log_ssl_errors();
-+				ENGINE_free(e);
-+				e = NULL;
-+			}
-+		}
-+		else
-+		{
-+			warn( "EAP-TLS: Cannot load dynamic engine support" );
-+		}
-+	}
-+
-+    if (e)
-+	{
-+		dbglog( "Initialising engine" );
-+		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-+		{
-+			warn( "EAP-TLS: Cannot use that engine" );
-+			log_ssl_errors();
-+			ENGINE_free(e);
-+			e = NULL;
-+		}
-+	}
-+
-+    return e;
-+}
-+
-+/*
-+ * Initialize the SSL stacks and tests if certificates, key and crl
-+ * for client or server use can be loaded.
-+ */
-+SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile,
-+			char *certfile, char *peer_certfile, char *privkeyfile)
-+{
-+	char		*cert_engine_name = NULL;
-+	char		*cert_identifier = NULL;
-+	char		*pkey_engine_name = NULL;
-+	char		*pkey_identifier = NULL;
-+	SSL_CTX		*ctx;
-+	X509_STORE	*certstore;
-+	X509_LOOKUP	*lookup;
-+	X509		*tmp;
-+
-+	/*
-+	 * Without these can't continue 
-+	 */
-+	if (!cacertfile[0])
-+    {
-+		error("EAP-TLS: CA certificate missing");
-+		return NULL;
-+    }
-+
-+	if (!certfile[0])
-+    {
-+		error("EAP-TLS: User certificate missing");
-+		return NULL;
-+    }
-+
-+	if (!privkeyfile[0])
-+    {
-+		error("EAP-TLS: User private key missing");
-+		return NULL;
-+    }
-+
-+	SSL_library_init();
-+	SSL_load_error_strings();
-+
-+	ctx = SSL_CTX_new(TLSv1_method());
-+
-+	if (!ctx) {
-+		error("EAP-TLS: Cannot initialize SSL CTX context");
-+		goto fail;
-+	}
-+
-+	/* if the certificate filename is of the form engine:id. e.g.
-+		pkcs11:12345
-+	   then we try to load and use this engine.
-+	   If the certificate filename starts with a / or . then we
-+	   ALWAYS assume it is a file and not an engine/pkcs11 identifier
-+	 */
-+	if ( index( certfile, '/' ) == NULL && index( certfile, '.') == NULL )
-+	{
-+		cert_identifier = index( certfile, ':' );
-+
-+		if (cert_identifier)
-+		{
-+			cert_engine_name = certfile;
-+			*cert_identifier = '\0';
-+			cert_identifier++;
-+
-+			dbglog( "Found certificate engine '%s'", cert_engine_name );
-+			dbglog( "Found certificate identifier '%s'", cert_identifier );
-+		}
-+	}
-+
-+	/* if the privatekey filename is of the form engine:id. e.g.
-+		pkcs11:12345
-+	   then we try to load and use this engine.
-+	   If the privatekey filename starts with a / or . then we
-+	   ALWAYS assume it is a file and not an engine/pkcs11 identifier
-+	 */
-+	if ( index( privkeyfile, '/' ) == NULL && index( privkeyfile, '.') == NULL )
-+	{
-+		pkey_identifier = index( privkeyfile, ':' );
-+
-+		if (pkey_identifier)
-+		{
-+			pkey_engine_name = privkeyfile;
-+			*pkey_identifier = '\0';
-+			pkey_identifier++;
-+
-+			dbglog( "Found privatekey engine '%s'", pkey_engine_name );
-+			dbglog( "Found privatekey identifier '%s'", pkey_identifier );
-+		}
-+	}
-+
-+	if (cert_identifier && pkey_identifier)
-+	{
-+		if (strlen( cert_identifier ) == 0)
-+		{
-+			if (strlen( pkey_identifier ) == 0)
-+				error( "EAP-TLS: both the certificate and privatekey identifiers are missing!" );
-+			else
-+			{
-+				dbglog( "Substituting privatekey identifier for certificate identifier" );
-+				cert_identifier = pkey_identifier;
-+			}
-+		}
-+		else
-+		{
-+			if (strlen( pkey_identifier ) == 0)
-+			{
-+				dbglog( "Substituting certificate identifier for privatekey identifier" );
-+				pkey_identifier = cert_identifier;
-+			}
-+		}
-+
-+	}
-+
-+	/* load the openssl config file only once */
-+	if (!ssl_config)
-+	{
-+		if (cert_engine_name || pkey_engine_name)
-+			ssl_config = eaptls_ssl_load_config();
-+
-+		if (ssl_config && cert_engine_name)
-+			cert_engine = eaptls_ssl_load_engine( cert_engine_name );
-+
-+		if (ssl_config && pkey_engine_name)
-+		{
-+			/* don't load the same engine twice */
-+			if ( strcmp( cert_engine_name, pkey_engine_name) == 0 )
-+				pkey_engine = cert_engine;
-+			else
-+				pkey_engine = eaptls_ssl_load_engine( pkey_engine_name );
-+		}
-+	}
-+
-+    SSL_CTX_set_default_passwd_cb (ctx, password_callback);
-+
-+	if (!SSL_CTX_load_verify_locations(ctx, cacertfile, NULL))
-+	{
-+		error("EAP-TLS: Cannot load or verify CA file %s", cacertfile);
-+		goto fail;
-+	}
-+
-+    if (init_server)
-+		SSL_CTX_set_client_CA_list(ctx, SSL_load_client_CA_file(cacertfile));
-+
-+	if (cert_engine)
-+	{
-+		struct
-+		{
-+			const char *s_slot_cert_id;
-+			X509 *cert;
-+		} cert_info;
-+
-+		cert_info.s_slot_cert_id = cert_identifier;
-+		cert_info.cert = NULL;
-+		
-+		if (!ENGINE_ctrl_cmd( cert_engine, "LOAD_CERT_CTRL", 0, &cert_info, NULL, 0 ) )
-+		{
-+			error( "EAP-TLS: Error loading certificate with id '%s' from engine", cert_identifier );
-+			goto fail;
-+		}
-+
-+		if (cert_info.cert)
-+		{
-+		    dbglog( "Got the certificate, adding it to SSL context" );
-+			dbglog( "subject = %s", X509_NAME_oneline( X509_get_subject_name( cert_info.cert ), NULL, 0 ) );
-+			if (SSL_CTX_use_certificate(ctx, cert_info.cert) <= 0)
-+			{
-+				error("EAP-TLS: Cannot use PKCS11 certificate %s", cert_identifier);
-+				goto fail;
-+			}
-+		}
-+		else
-+		{
-+			warn("EAP-TLS: Cannot load PKCS11 key %s", cert_identifier);
-+			log_ssl_errors();
-+		}
-+	}
-+	else
-+	{
-+		if (!SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
-+		{
-+			error( "EAP-TLS: Cannot use public certificate %s", certfile );
-+			goto fail;
-+		}
-+	}
-+
-+	if (pkey_engine)
-+	{
-+		EVP_PKEY   *pkey = NULL;
-+		PW_CB_DATA  cb_data;
-+
-+		cb_data.password = passwd;
-+		cb_data.prompt_info = pkey_identifier;
-+
-+		dbglog( "Loading private key '%s' from engine", pkey_identifier );
-+		pkey = ENGINE_load_private_key(pkey_engine, pkey_identifier, NULL, &cb_data);
-+		if (pkey)
-+		{
-+		    dbglog( "Got the private key, adding it to SSL context" );
-+			if (SSL_CTX_use_PrivateKey(ctx, pkey) <= 0)
-+			{
-+				error("EAP-TLS: Cannot use PKCS11 key %s", pkey_identifier);
-+				goto fail;
-+			}
-+		}
-+		else
-+		{
-+			warn("EAP-TLS: Cannot load PKCS11 key %s", pkey_identifier);
-+			log_ssl_errors();
-+		}
-+	}
-+	else
-+	{
-+		if (!SSL_CTX_use_PrivateKey_file(ctx, privkeyfile, SSL_FILETYPE_PEM))
-+		{ 
-+			error("EAP-TLS: Cannot use private key %s", privkeyfile);
-+			goto fail;
-+		}
-+	}
-+
-+	if (SSL_CTX_check_private_key(ctx) != 1) {
-+		error("EAP-TLS: Private key %s fails security check", privkeyfile);
-+		goto fail;
-+	}
-+
-+	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-+	SSL_CTX_set_verify_depth(ctx, 5);
-+	SSL_CTX_set_verify(ctx,
-+			   SSL_VERIFY_PEER |
-+			   SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-+			   &ssl_verify_callback);
-+
-+	if (crl_dir) {
-+		if (!(certstore = SSL_CTX_get_cert_store(ctx))) {
-+			error("EAP-TLS: Failed to get certificate store");
-+			goto fail;
-+		}
-+
-+		if (!(lookup =
-+		     X509_STORE_add_lookup(certstore, X509_LOOKUP_hash_dir()))) {
-+			error("EAP-TLS: Store lookup for CRL failed");
-+
-+			goto fail;
-+		}
-+
-+		X509_LOOKUP_add_dir(lookup, crl_dir, X509_FILETYPE_PEM);
-+		X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK);
-+	}
-+
-+	/*
-+	 * If a peer certificate file was specified, it must be valid, else fail 
-+	 */
-+	if (peer_certfile[0]) {
-+		if (!(tmp = get_X509_from_file(peer_certfile))) {
-+			error("EAP-TLS: Error loading client certificate from file %s",
-+			     peer_certfile);
-+			goto fail;
-+		}
-+		X509_free(tmp);
-+	}
-+
-+	return ctx;
-+
-+fail:
-+	log_ssl_errors();
-+	SSL_CTX_free(ctx);
-+	return NULL;
-+}
-+
-+/*
-+ * Determine the maximum packet size by looking at the LCP handshake
-+ */
-+
-+int eaptls_get_mtu(int unit)
-+{
-+	int mtu, mru;
-+
-+	lcp_options *wo = &lcp_wantoptions[unit];
-+	lcp_options *go = &lcp_gotoptions[unit];
-+	lcp_options *ho = &lcp_hisoptions[unit];
-+	lcp_options *ao = &lcp_allowoptions[unit];
-+
-+	mtu = ho->neg_mru? ho->mru: PPP_MRU;
-+	mru = go->neg_mru? MAX(wo->mru, go->mru): PPP_MRU;
-+    mtu = MIN(MIN(mtu, mru), ao->mru)- PPP_HDRLEN - 10;
-+
-+	dbglog("MTU = %d", mtu);
-+ 	return mtu;
-+}
-+
-+
-+/*
-+ * Init the ssl handshake (server mode)
-+ */
-+int eaptls_init_ssl_server(eap_state * esp)
-+{
-+	struct eaptls_session *ets;
-+	char servcertfile[MAXWORDLEN];
-+	char clicertfile[MAXWORDLEN];
-+	char cacertfile[MAXWORDLEN];
-+	char pkfile[MAXWORDLEN];
-+	/*
-+	 * Allocate new eaptls session 
-+	 */
-+	esp->es_server.ea_session = malloc(sizeof(struct eaptls_session));
-+	if (!esp->es_server.ea_session)
-+		fatal("Allocation error");
-+	ets = esp->es_server.ea_session;
-+
-+	if (!esp->es_server.ea_peer) {
-+		error("EAP-TLS: Error: client name not set (BUG)");
-+		return 0;
-+	}
-+
-+	strncpy(ets->peer, esp->es_server.ea_peer, MAXWORDLEN);
-+
-+	dbglog( "getting eaptls secret" );
-+	if (!get_eaptls_secret(esp->es_unit, esp->es_server.ea_peer,
-+			       esp->es_server.ea_name, clicertfile,
-+			       servcertfile, cacertfile, pkfile, 1)) {
-+		error( "EAP-TLS: Cannot get secret/password for client "%s", server "%s"",
-+				esp->es_server.ea_peer, esp->es_server.ea_name );
-+		return 0;
-+	}
-+
-+	ets->mtu = eaptls_get_mtu(esp->es_unit);
-+
-+	ets->ctx = eaptls_init_ssl(1, cacertfile, servcertfile, clicertfile, pkfile);
-+	if (!ets->ctx)
-+		goto fail;
-+
-+	if (!(ets->ssl = SSL_new(ets->ctx)))
-+		goto fail;
-+
-+	/*
-+	 * Set auto-retry to avoid timeouts on BIO_read
-+	 */
-+	SSL_set_mode(ets->ssl, SSL_MODE_AUTO_RETRY);
-+
-+	/*
-+	 * Initialize the BIOs we use to read/write to ssl engine 
-+	 */
-+	ets->into_ssl = BIO_new(BIO_s_mem());
-+	ets->from_ssl = BIO_new(BIO_s_mem());
-+	SSL_set_bio(ets->ssl, ets->into_ssl, ets->from_ssl);
-+
-+	SSL_set_msg_callback(ets->ssl, ssl_msg_callback);
-+	SSL_set_msg_callback_arg(ets->ssl, ets);
-+
-+	/*
-+	 * Attach the session struct to the connection, so we can later
-+	 * retrieve it when doing certificate verification
-+	 */
-+	SSL_set_ex_data(ets->ssl, 0, ets);
-+
-+	SSL_set_accept_state(ets->ssl);
-+
-+	ets->data = NULL;
-+	ets->datalen = 0;
-+	ets->alert_sent = 0;
-+	ets->alert_recv = 0;
-+
-+	/*
-+	 * If we specified the client certificate file, store it in ets->peercertfile,
-+	 * so we can check it later in ssl_verify_callback()
-+	 */
-+	if (clicertfile[0])
-+		strncpy(&ets->peercertfile[0], clicertfile, MAXWORDLEN);
-+	else
-+		ets->peercertfile[0] = 0;
-+
-+	return 1;
-+
-+fail:
-+	SSL_CTX_free(ets->ctx);
-+	return 0;
-+}
-+
-+/*
-+ * Init the ssl handshake (client mode)
-+ */
-+int eaptls_init_ssl_client(eap_state * esp)
-+{
-+	struct eaptls_session *ets;
-+	char servcertfile[MAXWORDLEN];
-+	char clicertfile[MAXWORDLEN];
-+	char cacertfile[MAXWORDLEN];
-+	char pkfile[MAXWORDLEN];
-+
-+	/*
-+	 * Allocate new eaptls session 
-+	 */
-+	esp->es_client.ea_session = malloc(sizeof(struct eaptls_session));
-+	if (!esp->es_client.ea_session)
-+		fatal("Allocation error");
-+	ets = esp->es_client.ea_session;
-+
-+	/*
-+	 * If available, copy server name in ets; it will be used in cert
-+	 * verify 
-+	 */
-+	if (esp->es_client.ea_peer)
-+		strncpy(ets->peer, esp->es_client.ea_peer, MAXWORDLEN);
-+	else
-+		ets->peer[0] = 0;
-+	
-+	ets->mtu = eaptls_get_mtu(esp->es_unit);
-+
-+	dbglog( "calling get_eaptls_secret" );
-+	if (!get_eaptls_secret(esp->es_unit, esp->es_client.ea_name,
-+			       esp->es_client.ea_peer, clicertfile,
-+			       servcertfile, cacertfile, pkfile, 0)) {
-+		error( "EAP-TLS: Cannot get secret/password for client "%s", server "%s"",
-+				esp->es_client.ea_name, esp->es_client.ea_peer );
-+		return 0;
-+	}
-+
-+	dbglog( "calling eaptls_init_ssl" );
-+	ets->ctx = eaptls_init_ssl(0, cacertfile, clicertfile, servcertfile, pkfile);
-+	if (!ets->ctx)
-+		goto fail;
-+
-+	ets->ssl = SSL_new(ets->ctx);
-+
-+	if (!ets->ssl)
-+		goto fail;
-+
-+	/*
-+	 * Initialize the BIOs we use to read/write to ssl engine 
-+	 */
-+	dbglog( "Initializing SSL BIOs" );
-+	ets->into_ssl = BIO_new(BIO_s_mem());
-+	ets->from_ssl = BIO_new(BIO_s_mem());
-+	SSL_set_bio(ets->ssl, ets->into_ssl, ets->from_ssl);
-+
-+	SSL_set_msg_callback(ets->ssl, ssl_msg_callback);
-+	SSL_set_msg_callback_arg(ets->ssl, ets);
-+
-+	/*
-+	 * Attach the session struct to the connection, so we can later
-+	 * retrieve it when doing certificate verification
-+	 */
-+	SSL_set_ex_data(ets->ssl, 0, ets);
-+
-+	SSL_set_connect_state(ets->ssl);
-+
-+	ets->data = NULL;
-+	ets->datalen = 0;
-+	ets->alert_sent = 0;
-+	ets->alert_recv = 0;
-+
-+	/*
-+	 * If we specified the server certificate file, store it in
-+	 * ets->peercertfile, so we can check it later in
-+	 * ssl_verify_callback() 
-+	 */
-+	if (servcertfile[0])
-+		strncpy(ets->peercertfile, servcertfile, MAXWORDLEN);
-+	else
-+		ets->peercertfile[0] = 0;
-+
-+	return 1;
-+
-+fail:
-+	dbglog( "eaptls_init_ssl_client: fail" );
-+	SSL_CTX_free(ets->ctx);
-+	return 0;
-+
-+}
-+
-+void eaptls_free_session(struct eaptls_session *ets)
-+{
-+	if (ets->ssl)
-+		SSL_free(ets->ssl);
-+
-+	if (ets->ctx)
-+		SSL_CTX_free(ets->ctx);
-+
-+	free(ets);
-+}
-+
-+/*
-+ * Handle a received packet, reassembling fragmented messages and
-+ * passing them to the ssl engine
-+ */
-+int eaptls_receive(struct eaptls_session *ets, u_char * inp, int len)
-+{
-+	u_char flags;
-+	u_int tlslen;
-+	u_char dummy[65536];
-+
-+	GETCHAR(flags, inp);
-+	len--;
-+
-+    if (flags & EAP_TLS_FLAGS_LI && !ets->data) {
-+ 
-+		/*
-+		 * This is the first packet of a message
-+		*/
-+ 
-+		GETLONG(tlslen, inp);
-+		len -= 4;
-+
-+		if (tlslen > EAP_TLS_MAX_LEN) {
-+			error("Error: tls message length > %d, truncated",
-+				EAP_TLS_MAX_LEN);
-+			tlslen = EAP_TLS_MAX_LEN;
-+		}
-+
-+		/*
-+		 * Allocate memory for the whole message
-+		*/
-+		ets->data = malloc(tlslen);
-+		if (!ets->data)
-+			fatal("EAP TLS: allocation error\n");
-+
-+		ets->datalen = 0;
-+		ets->tlslen = tlslen;
-+
-+	}
-+	else if (flags & EAP_TLS_FLAGS_LI && ets->data) {
-+		/*
-+		 * Non first with LI (strange...)
-+		*/
-+ 
-+		GETLONG(tlslen, inp);
-+		len -= 4;
-+ 
-+	}
-+	else if (!ets->data) {
-+		/*
-+		 * A non fragmented message without LI flag
-+		*/
-+ 
-+		ets->data = malloc(len);
-+		if (!ets->data)
-+			fatal("EAP TLS: allocation error\n");
-+ 
-+		ets->datalen = 0;
-+		ets->tlslen = len;
-+	}
-+
-+	if (flags & EAP_TLS_FLAGS_MF)
-+		ets->frag = 1;
-+	else
-+		ets->frag = 0;
-+
-+	if (len + ets->datalen > ets->tlslen) {
-+		warn("EAP TLS: received data > TLS message length");
-+		return 1;
-+	}
-+
-+	BCOPY(inp, ets->data + ets->datalen, len);
-+	ets->datalen += len;
-+
-+	if (!ets->frag) {
-+
-+		/*
-+		 * If we have the whole message, pass it to ssl 
-+		 */
-+
-+		if (ets->datalen != ets->tlslen) {
-+			warn("EAP TLS: received data != TLS message length");
-+			return 1;
-+		}
-+
-+		if (BIO_write(ets->into_ssl, ets->data, ets->datalen) == -1)
-+			log_ssl_errors();
-+
-+		SSL_read(ets->ssl, dummy, 65536);
-+
-+		free(ets->data);
-+		ets->data = NULL;
-+		ets->datalen = 0;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Return an eap-tls packet in outp.
-+ * A TLS message read from the ssl engine is buffered in ets->data.
-+ * At each call we control if there is buffered data and send a 
-+ * packet of mtu bytes.
-+ */
-+int eaptls_send(struct eaptls_session *ets, u_char ** outp)
-+{
-+	bool first = 0;
-+	int size;
-+	u_char fromtls[65536];
-+	int res;
-+	u_char *start;
-+
-+	start = *outp;
-+
-+	if (!ets->data) {
-+
-+		if(!ets->alert_sent)
-+			SSL_read(ets->ssl, fromtls, 65536);
-+
-+		/*
-+		 * Read from ssl 
-+		 */
-+		if ((res = BIO_read(ets->from_ssl, fromtls, 65536)) == -1)
-+			fatal("No data from BIO_read");
-+
-+		ets->datalen = res;
-+
-+		ets->data = malloc(ets->datalen);
-+		BCOPY(fromtls, ets->data, ets->datalen);
-+
-+		ets->offset = 0;
-+		first = 1;
-+
-+	}
-+
-+	size = ets->datalen - ets->offset;
-+    
-+	if (size > ets->mtu) {
-+		size = ets->mtu;
-+		ets->frag = 1;
-+	} else
-+		ets->frag = 0;
-+
-+	PUTCHAR(EAPT_TLS, *outp);
-+
-+	/*
-+	 * Set right flags and length if necessary 
-+	 */
-+	if (ets->frag && first) {
-+		PUTCHAR(EAP_TLS_FLAGS_LI | EAP_TLS_FLAGS_MF, *outp);
-+		PUTLONG(ets->datalen, *outp);
-+	} else if (ets->frag) {
-+		PUTCHAR(EAP_TLS_FLAGS_MF, *outp);
-+	} else
-+		PUTCHAR(0, *outp);
-+
-+	/*
-+	 * Copy the data in outp 
-+	 */
-+	BCOPY(ets->data + ets->offset, *outp, size);
-+	INCPTR(size, *outp);
-+
-+	/*
-+	 * Copy the packet in retransmission buffer 
-+	 */
-+	BCOPY(start, &ets->rtx[0], *outp - start);
-+	ets->rtx_len = *outp - start;
-+
-+	ets->offset += size;
-+
-+	if (ets->offset >= ets->datalen) {
-+
-+		/*
-+		 * The whole message has been sent 
-+		 */
-+
-+		free(ets->data);
-+		ets->data = NULL;
-+		ets->datalen = 0;
-+		ets->offset = 0;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Get the sent packet from the retransmission buffer
-+ */
-+void eaptls_retransmit(struct eaptls_session *ets, u_char ** outp)
-+{
-+	BCOPY(ets->rtx, *outp, ets->rtx_len);
-+	INCPTR(ets->rtx_len, *outp);
-+}
-+
-+/*
-+ * Verify a certificate.
-+ * Most of the work (signatures and issuer attributes checking)
-+ * is done by ssl; we check the CN in the peer certificate 
-+ * against the peer name.
-+ */
-+int ssl_verify_callback(int preverify_ok, X509_STORE_CTX * ctx)
-+{
-+	char subject[256];
-+	char cn_str[256];
-+	X509 *peer_cert;
-+	int err, depth;
-+	int ok = preverify_ok;
-+	SSL *ssl;
-+	struct eaptls_session *ets;
-+
-+	peer_cert = X509_STORE_CTX_get_current_cert(ctx);
-+	err = X509_STORE_CTX_get_error(ctx);
-+	depth = X509_STORE_CTX_get_error_depth(ctx);
-+
-+	dbglog("certificate verify depth: %d", depth);
-+
-+    if (auth_required && !ok) {
-+		X509_NAME_oneline(X509_get_subject_name(peer_cert),
-+				  subject, 256);
-+
-+		X509_NAME_get_text_by_NID(X509_get_subject_name(peer_cert),
-+					  NID_commonName, cn_str, 256);
-+
-+		dbglog("Certificate verification error:\n depth: %d CN: %s"
-+		       "\n err: %d (%s)\n", depth, cn_str, err,
-+		       X509_verify_cert_error_string(err));
-+
-+		return 0;
-+	}
-+
-+	ssl = X509_STORE_CTX_get_ex_data(ctx,
-+				       SSL_get_ex_data_X509_STORE_CTX_idx());
-+
-+	ets = (struct eaptls_session *)SSL_get_ex_data(ssl, 0);
-+
-+	if (ets == NULL) {
-+		error("Error: SSL_get_ex_data returned NULL");
-+		return 0;
-+	}
-+
-+	log_ssl_errors();
-+
-+	if (!depth) {		/* This is the peer certificate */
-+
-+		X509_NAME_oneline(X509_get_subject_name(peer_cert),
-+				  subject, 256);
-+
-+		X509_NAME_get_text_by_NID(X509_get_subject_name(peer_cert),
-+					  NID_commonName, cn_str, 256);
-+
-+		/*
-+		 * If acting as client and the name of the server wasn't specified
-+		 * explicitely, we can't verify the server authenticity 
-+		 */
-+		if (!ets->peer[0]) {
-+			warn("Peer name not specified: no check");
-+			return 1;
-+		}
-+
-+		/*
-+		 * Check the CN 
-+		 */
-+		if (strcmp(cn_str, ets->peer)) {
-+			error
-+			    ("Certificate verification error: CN (%s) != peer_name (%s)",
-+			     cn_str, ets->peer);
-+			return 0;
-+		}
-+
-+		warn("Certificate CN: %s , peer name %s", cn_str, ets->peer);
-+
-+		/*
-+		 * If a peer certificate file was specified, here we check it 
-+		 */
-+		if (ets->peercertfile[0]) {
-+			if (ssl_cmp_certs(&ets->peercertfile[0], peer_cert)
-+			    != 0) {
-+				error
-+				    ("Peer certificate doesn't match stored certificate");
-+				return 0;
-+			}
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+/*
-+ * Compare a certificate with the one stored in a file
-+ */
-+int ssl_cmp_certs(char *filename, X509 * a)
-+{
-+	X509 *b;
-+	int ret;
-+
-+	if (!(b = get_X509_from_file(filename)))
-+		return 1;
-+
-+	ret = X509_cmp(a, b);
-+	X509_free(b);
-+
-+	return ret;
-+
-+}
-+
-+X509 *get_X509_from_file(char *filename)
-+{
-+	FILE *fp;
-+	X509 *ret;
-+
-+	if (!(fp = fopen(filename, "r")))
-+		return NULL;
-+
-+	ret = PEM_read_X509(fp, NULL, NULL, NULL);
-+
-+	fclose(fp);
-+
-+	return ret;
-+}
-+
-+/*
-+ * Every sent & received message this callback function is invoked,
-+ * so we know when alert messages have arrived or are sent and
-+ * we can print debug information about TLS handshake.
-+ */
-+void
-+ssl_msg_callback(int write_p, int version, int content_type,
-+		 const void *buf, size_t len, SSL * ssl, void *arg)
-+{
-+	char string[256];
-+	struct eaptls_session *ets = (struct eaptls_session *)arg;
-+	unsigned char code;
-+
-+	if(write_p)
-+		strcpy(string, " -> ");
-+	else
-+		strcpy(string, " <- ");
-+
-+	
-+	switch(content_type) {
-+
-+	case SSL3_RT_ALERT:	
-+		strcat(string, "Alert: ");	
-+		code = ((const unsigned char *)buf)[1];
-+
-+		if (write_p) {
-+			ets->alert_sent = 1;
-+			ets->alert_sent_desc = code;
-+		} else {
-+			ets->alert_recv = 1;
-+			ets->alert_recv_desc = code;
-+		}
-+
-+		strcat(string, SSL_alert_desc_string_long(code));
-+		break;
-+
-+	case SSL3_RT_CHANGE_CIPHER_SPEC:
-+		strcat(string, "ChangeCipherSpec");
-+		break;
-+
-+	case SSL3_RT_HANDSHAKE:
-+
-+		strcat(string, "Handshake: ");
-+		code = ((const unsigned char *)buf)[0];
-+
-+		switch(code) {
-+			case SSL3_MT_HELLO_REQUEST:
-+				strcat(string,"Hello Request");
-+				break;
-+			case SSL3_MT_CLIENT_HELLO:
-+				strcat(string,"Client Hello");
-+				break;
-+			case SSL3_MT_SERVER_HELLO:
-+				strcat(string,"Server Hello");
-+				break;
-+			case SSL3_MT_CERTIFICATE:
-+				strcat(string,"Certificate");
-+				break;
-+			case SSL3_MT_SERVER_KEY_EXCHANGE:
-+				strcat(string,"Server Key Exchange");
-+				break;
-+			case SSL3_MT_CERTIFICATE_REQUEST:
-+				strcat(string,"Certificate Request");
-+				break;
-+			case SSL3_MT_SERVER_DONE:
-+				strcat(string,"Server Hello Done");
-+								break;
-+			case SSL3_MT_CERTIFICATE_VERIFY:
-+				strcat(string,"Certificate Verify");
-+				break;
-+			case SSL3_MT_CLIENT_KEY_EXCHANGE:
-+				strcat(string,"Client Key Exchange");
-+				break;
-+			case SSL3_MT_FINISHED:
-+				strcat(string,"Finished");
-+				break;
-+
-+			default:
-+				sprintf( string, "Handshake: Unknown SSL3 code received: %d", code );
-+		}
-+		break;
-+
-+	default:
-+		sprintf( string, "SSL message contains unknown content type: %d", content_type );
-+		
-+	}
-+
-+	/* Alert messages must always be displayed */
-+	if(content_type == SSL3_RT_ALERT)
-+		error("%s", string);
-+	else
-+		dbglog("%s", string);
-+}
-+
-diff --git a/pppd/eap-tls.h b/pppd/eap-tls.h
-new file mode 100644
-index 0000000..2d45a0b
---- /dev/null
-+++ b/pppd/eap-tls.h
-@@ -0,0 +1,107 @@
-+/*
-+ * eap-tls.h
-+ *
-+ * Copyright (c) Beniamino Galvani 2005 All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name(s) of the authors of this software must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission.
-+ *
-+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ */
-+
-+#ifndef __EAP_TLS_H__
-+#define __EAP_TLS_H__
-+
-+#include "eap.h"
-+
-+#include <openssl/ssl.h>
-+#include <openssl/bio.h>
-+#include <openssl/md5.h>
-+
-+#define EAP_TLS_FLAGS_LI        128	/* length included flag */
-+#define EAP_TLS_FLAGS_MF        64	/* more fragments flag */
-+#define EAP_TLS_FLAGS_START     32	/* start flag */
-+
-+#define EAP_TLS_MAX_LEN         65536	/* max eap tls packet size */
-+
-+struct eaptls_session
-+{
-+	u_char *data;		/* buffered data */
-+	int datalen;		/* buffered data len */
-+	int offset;		/* from where to send */
-+	int tlslen;		/* total length of tls data */
-+	bool frag;		/* packet is fragmented */
-+	SSL_CTX *ctx;
-+	SSL *ssl;		/* ssl connection */
-+	BIO *from_ssl;
-+	BIO *into_ssl;
-+	char peer[MAXWORDLEN];	/* peer name */
-+	char peercertfile[MAXWORDLEN];
-+	bool alert_sent;
-+	u_char alert_sent_desc;
-+	bool alert_recv;
-+	u_char alert_recv_desc;
-+	char rtx[65536];	/* retransmission buffer */
-+	int rtx_len;
-+	int mtu;		/* unit mtu */
-+};
-+
-+typedef struct pw_cb_data
-+{
-+	const void *password;
-+	const char *prompt_info;
-+} PW_CB_DATA;
-+
-+
-+int ssl_verify_callback(int, X509_STORE_CTX *);
-+void ssl_msg_callback(int write_p, int version, int ct, const void *buf,
-+		      size_t len, SSL * ssl, void *arg);
-+
-+X509 *get_X509_from_file(char *filename);
-+int ssl_cmp_certs(char *filename, X509 * a);
-+
-+SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile,
-+            char *certfile, char *peer_certfile, char *privkeyfile);
-+int eaptls_init_ssl_server(eap_state * esp);
-+int eaptls_init_ssl_client(eap_state * esp);
-+void eaptls_free_session(struct eaptls_session *ets);
-+
-+int eaptls_receive(struct eaptls_session *ets, u_char * inp, int len);
-+int eaptls_send(struct eaptls_session *ets, u_char ** outp);
-+void eaptls_retransmit(struct eaptls_session *ets, u_char ** outp);
-+
-+int get_eaptls_secret(int unit, char *client, char *server,
-+		      char *clicertfile, char *servcertfile, char *cacertfile,
-+		      char *pkfile, int am_server);
-+
-+#ifdef MPPE
-+#include "mppe.h"   /* MPPE_MAX_KEY_LEN */
-+extern u_char mppe_send_key[MPPE_MAX_KEY_LEN];
-+extern u_char mppe_recv_key[MPPE_MAX_KEY_LEN];
-+extern int mppe_keys_set;
-+
-+void eaptls_gen_mppe_keys(struct eaptls_session *ets, const char *prf_label, int client);
-+
-+#endif
-+
-+#endif
-diff --git a/pppd/eap.c b/pppd/eap.c
-index faced53..e2270af 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -43,6 +43,11 @@
-  * Based on draft-ietf-pppext-eap-srp-03.txt.
-  */
- 
-+/*
-+ * Modification by Beniamino Galvani, Mar 2005
-+ * Implemented EAP-TLS authentication
-+ */
-+
- #define RCSID	"$Id: eap.c,v 1.4 2004/11/09 22:39:25 paulus Exp $"
- 
- /*
-@@ -62,8 +67,12 @@
- 
- #include "pppd.h"
- #include "pathnames.h"
--#include "md5.h"
- #include "eap.h"
-+#ifdef USE_EAPTLS
-+#include "eap-tls.h"
-+#else
-+#include "md5.h"
-+#endif /* USE_EAPTLS */
- 
- #ifdef USE_SRP
- #include <t_pwd.h>
-@@ -209,6 +218,9 @@ int unit;
- 	esp->es_server.ea_id = (u_char)(drand48() * 0x100);
- 	esp->es_client.ea_timeout = EAP_DEFREQTIME;
- 	esp->es_client.ea_maxrequests = EAP_DEFALLOWREQ;
-+#ifdef USE_EAPTLS
-+	esp->es_client.ea_using_eaptls = 0;
-+#endif /* USE_EAPTLS */
- }
- 
- /*
-@@ -268,7 +280,7 @@ eap_state *esp;
- 	u_char *outp;
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_FAILURE, outp);
-@@ -293,7 +305,7 @@ eap_state *esp;
- 	u_char *outp;
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_SUCCESS, outp);
-@@ -436,8 +448,16 @@ int status;
- 	u_char vals[2];
- 	struct b64state bs;
- #endif /* USE_SRP */
-+#ifdef USE_EAPTLS
-+	struct eaptls_session *ets;
-+	int secret_len;
-+	char secret[MAXWORDLEN];
-+#endif /* USE_EAPTLS */
- 
- 	esp->es_server.ea_timeout = esp->es_savedtime;
-+#ifdef USE_EAPTLS
-+	esp->es_server.ea_prev_state = esp->es_server.ea_state;
-+#endif /* USE_EAPTLS */
- 	switch (esp->es_server.ea_state) {
- 	case eapBadAuth:
- 		return;
-@@ -562,9 +582,81 @@ int status;
- 			break;
- 		}
- #endif /* USE_SRP */
-+#ifdef USE_EAPTLS
-+                if (!get_secret(esp->es_unit, esp->es_server.ea_peer,
-+                    esp->es_server.ea_name, secret, &secret_len, 1)) {
-+
-+			esp->es_server.ea_state = eapTlsStart;
-+			break;
-+		}
-+#endif /* USE_EAPTLS */
-+
- 		esp->es_server.ea_state = eapMD5Chall;
- 		break;
- 
-+#ifdef USE_EAPTLS
-+	case eapTlsStart:
-+		/* Initialize ssl session */
-+		if(!eaptls_init_ssl_server(esp)) {
-+			esp->es_server.ea_state = eapBadAuth;
-+			break;
-+		}
-+
-+		esp->es_server.ea_state = eapTlsRecv;
-+		break;
-+
-+	case eapTlsRecv:
-+		ets = (struct eaptls_session *) esp->es_server.ea_session;
-+
-+		if(ets->alert_sent) {
-+			esp->es_server.ea_state = eapTlsSendAlert;
-+			break;
-+		}
-+
-+		if (status) {
-+			esp->es_server.ea_state = eapBadAuth;
-+			break;
-+		}
-+		ets = (struct eaptls_session *) esp->es_server.ea_session;
-+
-+		if(ets->frag)
-+			esp->es_server.ea_state = eapTlsSendAck;
-+		else
-+			esp->es_server.ea_state = eapTlsSend;
-+		break;
-+
-+	case eapTlsSend:
-+		ets = (struct eaptls_session *) esp->es_server.ea_session;
-+
-+		if(SSL_is_init_finished(ets->ssl)) {
-+			esp->es_server.ea_state = eapTlsRecvClient;
-+			break;
-+		}
-+
-+		if(ets->frag)
-+			esp->es_server.ea_state = eapTlsRecvAck;
-+		else
-+			esp->es_server.ea_state = eapTlsRecv;
-+		break;
-+
-+	case eapTlsSendAck:
-+			esp->es_server.ea_state = eapTlsRecv;
-+		break;
-+
-+	case eapTlsRecvAck:
-+                if (status) {
-+                        esp->es_server.ea_state = eapBadAuth;
-+                        break;
-+                }
-+
-+		esp->es_server.ea_state = eapTlsSend;
-+		break;
-+
-+	case eapTlsSendAlert:
-+		esp->es_server.ea_state = eapTlsRecvAlertAck;
-+		break;
-+#endif /* USE_EAPTLS */
-+
- 	case eapSRP1:
- #ifdef USE_SRP
- 		ts = (struct t_server *)esp->es_server.ea_session;
-@@ -681,7 +773,7 @@ eap_state *esp;
- 	}
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_REQUEST, outp);
-@@ -718,6 +810,30 @@ eap_state *esp;
- 		INCPTR(esp->es_server.ea_namelen, outp);
- 		break;
- 
-+#ifdef USE_EAPTLS
-+	case eapTlsStart:
-+		PUTCHAR(EAPT_TLS, outp);
-+		PUTCHAR(EAP_TLS_FLAGS_START, outp);
-+		eap_figure_next_state(esp, 0);
-+		break;
-+
-+	case eapTlsSend:
-+		eaptls_send(esp->es_server.ea_session, &outp);
-+		eap_figure_next_state(esp, 0);
-+		break;
-+
-+	case eapTlsSendAck:
-+		PUTCHAR(EAPT_TLS, outp);
-+		PUTCHAR(0, outp);
-+		eap_figure_next_state(esp, 0);
-+		break;
-+
-+	case eapTlsSendAlert:
-+		eaptls_send(esp->es_server.ea_session, &outp);
-+		eap_figure_next_state(esp, 0);
-+		break;
-+#endif /* USE_EAPTLS */
-+
- #ifdef USE_SRP
- 	case eapSRP1:
- 		PUTCHAR(EAPT_SRP, outp);
-@@ -904,11 +1020,57 @@ static void
- eap_server_timeout(arg)
- void *arg;
- {
-+#ifdef USE_EAPTLS
-+	u_char *outp;
-+	u_char *lenloc;
-+	int outlen;
-+#endif /* USE_EAPTLS */
-+
- 	eap_state *esp = (eap_state *) arg;
- 
- 	if (!eap_server_active(esp))
- 		return;
- 
-+#ifdef USE_EAPTLS
-+	switch(esp->es_server.ea_prev_state) {
-+
-+	/*
-+	 *  In eap-tls the state changes after a request, so we return to
-+	 *  previous state ...
-+	 */
-+	case(eapTlsStart):
-+	case(eapTlsSendAck):
-+		esp->es_server.ea_state = esp->es_server.ea_prev_state;
-+		break;
-+
-+	/*
-+	 *  ... or resend the stored data
-+	 */
-+	case(eapTlsSend):
-+	case(eapTlsSendAlert):
-+		outp = outpacket_buf;
-+		MAKEHEADER(outp, PPP_EAP);
-+		PUTCHAR(EAP_REQUEST, outp);
-+		PUTCHAR(esp->es_server.ea_id, outp);
-+		lenloc = outp;
-+		INCPTR(2, outp);
-+
-+		eaptls_retransmit(esp->es_server.ea_session, &outp);
-+
-+		outlen = (outp - outpacket_buf) - PPP_HDRLEN;
-+		PUTSHORT(outlen, lenloc);
-+		output(esp->es_unit, outpacket_buf, outlen + PPP_HDRLEN);
-+		esp->es_server.ea_requests++;
-+
-+		if (esp->es_server.ea_timeout > 0)
-+			TIMEOUT(eap_server_timeout, esp, esp->es_server.ea_timeout);
-+
-+		return;
-+	default:
-+		break;
-+	}
-+#endif /* USE_EAPTLS */
-+
- 	/* EAP ID number must not change on timeout. */
- 	eap_send_request(esp);
- }
-@@ -1081,7 +1243,7 @@ int namelen;
- 	int msglen;
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_RESPONSE, outp);
-@@ -1117,7 +1279,7 @@ int lenstr;
- 	int msglen;
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_RESPONSE, outp);
-@@ -1148,7 +1310,7 @@ u_char *str;
- 	int msglen;
- 
- 	outp = outpacket_buf;
--    
-+
- 	MAKEHEADER(outp, PPP_EAP);
- 
- 	PUTCHAR(EAP_RESPONSE, outp);
-@@ -1166,6 +1328,81 @@ u_char *str;
- }
- #endif /* USE_SRP */
- 
-+#ifdef USE_EAPTLS
-+/*
-+ * Send an EAP-TLS response message with tls data
-+ */
-+static void
-+eap_tls_response(esp, id)
-+eap_state *esp;
-+u_char id;
-+{
-+        u_char *outp;
-+        int outlen;
-+	u_char *lenloc;
-+
-+        outp = outpacket_buf;
-+
-+        MAKEHEADER(outp, PPP_EAP);
-+
-+        PUTCHAR(EAP_RESPONSE, outp);
-+        PUTCHAR(id, outp);
-+
-+	lenloc = outp;
-+	INCPTR(2, outp);
-+
-+	/*
-+	   If the id in the request is unchanged, we must retransmit
-+	   the old data
-+	*/
-+	if(id == esp->es_client.ea_id)
-+		eaptls_retransmit(esp->es_client.ea_session, &outp);
-+	else
-+		eaptls_send(esp->es_client.ea_session, &outp);
-+
-+	outlen = (outp - outpacket_buf) - PPP_HDRLEN;
-+	PUTSHORT(outlen, lenloc);
-+
-+	output(esp->es_unit, outpacket_buf, PPP_HDRLEN + outlen);
-+
-+	esp->es_client.ea_id = id;
-+
-+}
-+
-+/*
-+ * Send an EAP-TLS ack
-+ */
-+static void
-+eap_tls_sendack(esp, id)
-+eap_state *esp;
-+u_char id;
-+{
-+	u_char *outp;
-+	int outlen;
-+	u_char *lenloc;
-+
-+	outp = outpacket_buf;
-+
-+	MAKEHEADER(outp, PPP_EAP);
-+
-+	PUTCHAR(EAP_RESPONSE, outp);
-+	PUTCHAR(id, outp);
-+	esp->es_client.ea_id = id;
-+
-+	lenloc = outp;
-+	INCPTR(2, outp);
-+
-+	PUTCHAR(EAPT_TLS, outp);
-+	PUTCHAR(0, outp);
-+
-+	outlen = (outp - outpacket_buf) - PPP_HDRLEN;
-+	PUTSHORT(outlen, lenloc);
-+
-+	output(esp->es_unit, outpacket_buf, PPP_HDRLEN + outlen);
-+
-+}
-+#endif /* USE_EAPTLS */
-+
- static void
- eap_send_nak(esp, id, type)
- eap_state *esp;
-@@ -1320,6 +1557,11 @@ int len;
- 	char rhostname[256];
- 	MD5_CTX mdContext;
- 	u_char hash[MD5_SIGNATURE_SIZE];
-+#ifdef USE_EAPTLS
-+	u_char flags;
-+	struct eaptls_session *ets = esp->es_client.ea_session;
-+#endif /* USE_EAPTLS */
-+
- #ifdef USE_SRP
- 	struct t_client *tc;
- 	struct t_num sval, gval, Nval, *Ap, Bval;
-@@ -1456,6 +1698,90 @@ int len;
- 		    esp->es_client.ea_namelen);
- 		break;
- 
-+#ifdef USE_EAPTLS
-+	case EAPT_TLS:
-+
-+		switch(esp->es_client.ea_state) {
-+
-+		case eapListen:
-+
-+			GETCHAR(flags, inp);
-+			if(flags & EAP_TLS_FLAGS_START){
-+
-+				esp->es_client.ea_using_eaptls = 1;
-+
-+                                if (explicit_remote){
-+                                        esp->es_client.ea_peer = strdup(remote_name);
-+                                        esp->es_client.ea_peerlen = strlen(remote_name);
-+                                } else
-+                                        esp->es_client.ea_peer = NULL;
-+
-+				/* Init ssl session */
-+				if(!eaptls_init_ssl_client(esp)) {
-+					dbglog("cannot init ssl");
-+					eap_send_nak(esp, id, EAPT_TLS);
-+					esp->es_client.ea_using_eaptls = 0;
-+					break;
-+				}
-+
-+				ets = esp->es_client.ea_session;
-+				eap_tls_response(esp, id);
-+				esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck :
-+								eapTlsRecv);
-+				break;
-+			}
-+
-+			/* The server has sent a bad start packet. */
-+			eap_send_nak(esp, id, EAPT_TLS);
-+			break;
-+
-+		case eapTlsRecvAck:
-+			eap_tls_response(esp, id);
-+			esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck :
-+							eapTlsRecv);
-+			break;
-+
-+		case eapTlsRecv:
-+			eaptls_receive(ets, inp, len);
-+
-+			if(ets->frag) {
-+				eap_tls_sendack(esp, id);
-+				esp->es_client.ea_state = eapTlsRecv;
-+				break;
-+			}
-+
-+			if(ets->alert_recv) {
-+				eap_tls_sendack(esp, id);
-+				esp->es_client.ea_state = eapTlsRecvFailure;
-+				break;
-+			}
-+
-+			/* Check if TLS handshake is finished */
-+			if(SSL_is_init_finished(ets->ssl)){
-+#ifdef MPPE
-+                                eaptls_gen_mppe_keys( ets, "client EAP encryption", 1 );
-+#endif
-+				eaptls_free_session(ets);
-+				eap_tls_sendack(esp, id);
-+				esp->es_client.ea_state = eapTlsRecvSuccess;
-+				break;
-+			}
-+
-+			eap_tls_response(esp,id);
-+                        esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck :
-+                                                        eapTlsRecv);
-+
-+                        break;
-+
-+		default:
-+			eap_send_nak(esp, id, EAPT_TLS);
-+			esp->es_client.ea_using_eaptls = 0;
-+			break;
-+		}
-+
-+		break;
-+#endif /* USE_EAPTLS */
-+
- #ifdef USE_SRP
- 	case EAPT_SRP:
- 		if (len < 1) {
-@@ -1737,6 +2063,11 @@ int len;
- 	u_char dig[SHA_DIGESTSIZE];
- #endif /* USE_SRP */
- 
-+#ifdef USE_EAPTLS
-+	struct eaptls_session *ets;
-+	u_char flags;
-+#endif /* USE_EAPTLS */
-+
- 	if (esp->es_server.ea_id != id) {
- 		dbglog("EAP: discarding Response %d; expected ID %d", id,
- 		    esp->es_server.ea_id);
-@@ -1776,6 +2107,60 @@ int len;
- 		eap_figure_next_state(esp, 0);
- 		break;
- 
-+#ifdef USE_EAPTLS
-+	case EAPT_TLS:
-+		switch(esp->es_server.ea_state) {
-+
-+		case eapTlsRecv:
-+			ets = (struct eaptls_session *) esp->es_server.ea_session;
-+			eap_figure_next_state(esp,
-+				eaptls_receive(esp->es_server.ea_session, inp, len));
-+
-+			if(ets->alert_recv) {
-+				eap_send_failure(esp);
-+				break;
-+			}
-+			break;
-+
-+		case eapTlsRecvAck:
-+			if(len > 1) {
-+				dbglog("EAP-TLS ACK with extra data");
-+			}
-+			eap_figure_next_state(esp, 0);
-+			break;
-+
-+		case eapTlsRecvClient:
-+			/* Receive authentication response from client */
-+
-+			GETCHAR(flags, inp);
-+
-+			if(len == 1 && !flags) {	/* Ack = ok */
-+#ifdef MPPE
-+ 				eaptls_gen_mppe_keys( esp->es_server.ea_session, "client EAP encryption", 0 );
-+#endif
-+				eap_send_success(esp);
-+			}
-+			else {			/* failure */
-+				eaptls_receive(esp->es_server.ea_session, inp, len);
-+				warn("Server authentication failed");
-+				eap_send_failure(esp);
-+			}
-+
-+			eaptls_free_session(esp->es_server.ea_session);
-+
-+			break;
-+
-+		case eapTlsRecvAlertAck:
-+			eap_send_failure(esp);
-+			break;
-+
-+		default:
-+			eap_figure_next_state(esp, 1);
-+			break;
-+		}
-+		break;
-+#endif /* USE_EAPTLS */
-+
- 	case EAPT_NOTIFICATION:
- 		dbglog("EAP unexpected Notification; response discarded");
- 		break;
-@@ -1807,6 +2192,13 @@ int len;
- 			esp->es_server.ea_state = eapMD5Chall;
- 			break;
- 
-+#ifdef USE_EAPTLS
-+			/* Send EAP-TLS start packet */
-+		case EAPT_TLS:
-+			esp->es_server.ea_state = eapTlsStart;
-+			break;
-+#endif /* USE_EAPTLS */
-+
- 		default:
- 			dbglog("EAP: peer requesting unknown Type %d", vallen);
- 			switch (esp->es_server.ea_state) {
-@@ -2018,13 +2410,27 @@ u_char *inp;
- int id;
- int len;
- {
--	if (esp->es_client.ea_state != eapOpen && !eap_client_active(esp)) {
-+	if (esp->es_client.ea_state != eapOpen && !eap_client_active(esp)
-+#ifdef USE_EAPTLS
-+		&& esp->es_client.ea_state != eapTlsRecvSuccess
-+#endif /* USE_EAPTLS */
-+		) {
- 		dbglog("EAP unexpected success message in state %s (%d)",
- 		    eap_state_name(esp->es_client.ea_state),
- 		    esp->es_client.ea_state);
- 		return;
- 	}
- 
-+#ifdef USE_EAPTLS
-+	if(esp->es_client.ea_using_eaptls && esp->es_client.ea_state !=
-+		eapTlsRecvSuccess) {
-+		dbglog("EAP-TLS unexpected success message in state %s (%d)",
-+                    eap_state_name(esp->es_client.ea_state),
-+                    esp->es_client.ea_state);
-+		return;
-+	}
-+#endif /* USE_EAPTLS */
-+
- 	if (esp->es_client.ea_timeout > 0) {
- 		UNTIMEOUT(eap_client_timeout, (void *)esp);
- 	}
-@@ -2150,6 +2556,9 @@ void *arg;
- 	int code, id, len, rtype, vallen;
- 	u_char *pstart;
- 	u_int32_t uval;
-+#ifdef USE_EAPTLS
-+	u_char flags;
-+#endif /* USE_EAPTLS */
- 
- 	if (inlen < EAP_HEADERLEN)
- 		return (0);
-@@ -2214,6 +2623,24 @@ void *arg;
- 			}
- 			break;
- 
-+#ifdef USE_EAPTLS
-+		case EAPT_TLS:
-+			if (len < 1)
-+				break;
-+			GETCHAR(flags, inp);
-+			len--;
-+
-+                        if(flags == 0 && len == 0){
-+                                printer(arg, " Ack");
-+                                break;
-+                        }
-+
-+			printer(arg, flags & EAP_TLS_FLAGS_LI ? " L":" -");
-+			printer(arg, flags & EAP_TLS_FLAGS_MF ? "M":"-");
-+			printer(arg, flags & EAP_TLS_FLAGS_START ? "S":"- ");
-+			break;
-+#endif /* USE_EAPTLS */
-+
- 		case EAPT_SRP:
- 			if (len < 3)
- 				goto truncated;
-@@ -2325,6 +2752,25 @@ void *arg;
- 			}
- 			break;
- 
-+#ifdef USE_EAPTLS
-+		case EAPT_TLS:
-+			if (len < 1)
-+				break;
-+			GETCHAR(flags, inp);
-+			len--;
-+
-+                        if(flags == 0 && len == 0){
-+                                printer(arg, " Ack");
-+                                break;
-+                        }
-+
-+			printer(arg, flags & EAP_TLS_FLAGS_LI ? " L":" -");
-+			printer(arg, flags & EAP_TLS_FLAGS_MF ? "M":"-");
-+			printer(arg, flags & EAP_TLS_FLAGS_START ? "S":"- ");
-+
-+			break;
-+#endif /* USE_EAPTLS */
-+
- 		case EAPT_NAK:
- 			if (len <= 0) {
- 				printer(arg, " <missing hint>");
-diff --git a/pppd/eap.h b/pppd/eap.h
-index 199d184..3fa5391 100644
---- a/pppd/eap.h
-+++ b/pppd/eap.h
-@@ -84,6 +84,16 @@ enum eap_state_code {
- 	eapClosed,	/* Authentication not in use */
- 	eapListen,	/* Client ready (and timer running) */
- 	eapIdentify,	/* EAP Identify sent */
-+	eapTlsStart,	/* Send EAP-TLS start packet */
-+	eapTlsRecv,	/* Receive EAP-TLS tls data */
-+	eapTlsSendAck,	/* Send EAP-TLS ack */
-+	eapTlsSend,	/* Send EAP-TLS tls data */
-+	eapTlsRecvAck,	/* Receive EAP-TLS ack */
-+	eapTlsRecvClient, 	/* Receive EAP-TLS auth response from client*/
-+	eapTlsSendAlert,	/* Send EAP-TLS tls alert (server)*/
-+	eapTlsRecvAlertAck,	/* Receive EAP-TLS ack after sending alert */
-+	eapTlsRecvSuccess,	/* Receive EAP success */
-+	eapTlsRecvFailure,	/* Receive EAP failure */
- 	eapSRP1,	/* Sent EAP SRP-SHA1 Subtype 1 */
- 	eapSRP2,	/* Sent EAP SRP-SHA1 Subtype 2 */
- 	eapSRP3,	/* Sent EAP SRP-SHA1 Subtype 3 */
-@@ -95,9 +105,18 @@ enum eap_state_code {
- 
- #define	EAP_STATES	\
- 	"Initial", "Pending", "Closed", "Listen", "Identify", \
-+	"TlsStart", "TlsRecv", "TlsSendAck", "TlsSend", "TlsRecvAck", "TlsRecvClient",\
-+	"TlsSendAlert", "TlsRecvAlertAck" , "TlsRecvSuccess", "TlsRecvFailure", \
- 	"SRP1", "SRP2", "SRP3", "MD5Chall", "Open", "SRP4", "BadAuth"
- 
--#define	eap_client_active(esp)	((esp)->es_client.ea_state == eapListen)
-+#ifdef USE_EAPTLS
-+#define	eap_client_active(esp)	((esp)->es_client.ea_state != eapInitial ||\
-+				 (esp)->es_client.ea_state != eapPending ||\
-+				 (esp)->es_client.ea_state != eapClosed)
-+#else
-+#define eap_client_active(esp)	((esp)->es_client.ea_state == eapListen)
-+#endif /* USE_EAPTLS */
-+
- #define	eap_server_active(esp)	\
- 	((esp)->es_server.ea_state >= eapIdentify && \
- 	 (esp)->es_server.ea_state <= eapMD5Chall)
-@@ -112,11 +131,17 @@ struct eap_auth {
- 	u_short ea_namelen;	/* Length of our name */
- 	u_short ea_peerlen;	/* Length of peer's name */
- 	enum eap_state_code ea_state;
-+#ifdef USE_EAPTLS
-+	enum eap_state_code ea_prev_state;
-+#endif
- 	u_char ea_id;		/* Current id */
- 	u_char ea_requests;	/* Number of Requests sent/received */
- 	u_char ea_responses;	/* Number of Responses */
- 	u_char ea_type;		/* One of EAPT_* */
- 	u_int32_t ea_keyflags;	/* SRP shared key usage flags */
-+#ifdef USE_EAPTLS
-+	bool ea_using_eaptls;
-+#endif
- };
- 
- /*
-@@ -139,7 +164,12 @@ typedef struct eap_state {
-  * Timeouts.
-  */
- #define	EAP_DEFTIMEOUT		3	/* Timeout (seconds) for rexmit */
-+#ifdef USE_EAPTLS
-+#define	EAP_DEFTRANSMITS	30	/* max # times to transmit */
-+					/* certificates can be long ... */
-+#else
- #define	EAP_DEFTRANSMITS	10	/* max # times to transmit */
-+#endif /* USE_EAPTLS */
- #define	EAP_DEFREQTIME		20	/* Time to wait for peer request */
- #define	EAP_DEFALLOWREQ		20	/* max # times to accept requests */
- 
-diff --git a/pppd/md5.c b/pppd/md5.c
-index f1291ce..2ee0c80 100644
---- a/pppd/md5.c
-+++ b/pppd/md5.c
-@@ -33,6 +33,8 @@
-  ***********************************************************************
-  */
- 
-+#ifndef USE_EAPTLS
-+
- #include <string.h>
- #include "md5.h"
- 
-@@ -305,3 +307,4 @@ UINT4 *in;
-  ** End of md5.c                                                      **
-  ******************************** (cut) ********************************
-  */
-+#endif /* USE_EAPTLS */
-diff --git a/pppd/md5.h b/pppd/md5.h
-index 71e8b00..14d7121 100644
---- a/pppd/md5.h
-+++ b/pppd/md5.h
-@@ -36,6 +36,7 @@
-  ** documentation and/or software.                                    **
-  ***********************************************************************
-  */
-+#ifndef USE_EAPTLS
- 
- #ifndef __MD5_INCLUDE__
- 
-@@ -63,3 +64,5 @@ void MD5_Final (unsigned char hash[], MD5_CTX *mdContext);
- 
- #define __MD5_INCLUDE__
- #endif /* __MD5_INCLUDE__ */
-+
-+#endif /* USE_EAPTLS */
-diff --git a/pppd/options.c b/pppd/options.c
-index 8e62635..6915b2d 100644
---- a/pppd/options.c
-+++ b/pppd/options.c
-@@ -120,6 +120,10 @@ bool	dump_options;		/* print out option values */
- bool	dryrun;			/* print out option values and exit */
- char	*domain;		/* domain name set by domain option */
- int	child_wait = 5;		/* # seconds to wait for children at exit */
-+#ifdef USE_EAPTLS
-+bool	only_update_crl_server = 0;	/* update server crl and exit */
-+bool	only_update_crl_client = 0;	/* update client crl and exit */
-+#endif /* USE_EAPTLS */
- struct userenv *userenv_list;	/* user environment variables */
- 
- #ifdef MAXOCTETS
-@@ -338,6 +342,12 @@ option_t general_options[] = {
-     { "mo-timeout", o_int, &maxoctets_timeout,
-       "Check for traffic limit every N seconds", OPT_PRIO | OPT_LLIMIT | 1 },
- #endif
-+#ifdef USE_EAPTLS
-+    { "only-update-crl-server", o_bool, &only_update_crl_server,
-+      "Update server CA CRLs and exit", 1 },
-+    { "only-update-crl-client", o_bool, &only_update_crl_client,
-+      "Update client CA CRLs and exit", 1 },
-+#endif /* USE_EAPTLS */
- 
-     { NULL }
- };
-diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index 24e010c..6275df6 100644
---- a/pppd/pathnames.h
-+++ b/pppd/pathnames.h
-@@ -22,6 +22,13 @@
- #define _PATH_UPAPFILE 	 _ROOT_PATH "/etc/ppp/pap-secrets"
- #define _PATH_CHAPFILE 	 _ROOT_PATH "/etc/ppp/chap-secrets"
- #define _PATH_SRPFILE 	 _ROOT_PATH "/etc/ppp/srp-secrets"
-+
-+#ifdef USE_EAPTLS
-+#define _PATH_EAPTLSCLIFILE	_ROOT_PATH "/etc/ppp/eaptls-client"
-+#define _PATH_EAPTLSSERVFILE	_ROOT_PATH "/etc/ppp/eaptls-server"
-+#define _PATH_OPENSSLCONFFILE	_ROOT_PATH "/etc/ppp/openssl.cnf"
-+#endif /* USE_EAPTLS */
-+
- #define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
- #define _PATH_IPUP	 _ROOT_PATH "/etc/ppp/ip-up"
- #define _PATH_IPDOWN	 _ROOT_PATH "/etc/ppp/ip-down"
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index b474a19..760cad4 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -4,6 +4,9 @@ CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
- 
-+# EAP-TLS
-+CFLAGS += -DUSE_EAPTLS=1
-+
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
-diff --git a/pppd/plugins/passprompt.c b/pppd/plugins/passprompt.c
-index babb6dc..6ba73ca 100644
---- a/pppd/plugins/passprompt.c
-+++ b/pppd/plugins/passprompt.c
-@@ -107,4 +107,7 @@ void plugin_init(void)
- {
-     add_options(options);
-     pap_passwd_hook = promptpass;
-+#ifdef USE_EAPTLS
-+    eaptls_passwd_hook = promptpass;
-+#endif
- }
-diff --git a/pppd/plugins/passwordfd.c b/pppd/plugins/passwordfd.c
-index d718f3b..c3f9793 100644
---- a/pppd/plugins/passwordfd.c
-+++ b/pppd/plugins/passwordfd.c
-@@ -79,4 +79,8 @@ void plugin_init (void)
- 
-     chap_check_hook = pwfd_check;
-     chap_passwd_hook = pwfd_passwd;
-+
-+#ifdef USE_EAPTLS
-+    eaptls_passwd_hook = pwfd_passwd;
-+#endif
- }
-diff --git a/pppd/pppd.h b/pppd/pppd.h
-index 47e4d9a..de271c1 100644
---- a/pppd/pppd.h
-+++ b/pppd/pppd.h
-@@ -324,6 +324,10 @@ extern bool	dump_options;	/* print out option values */
- extern bool	dryrun;		/* check everything, print options, exit */
- extern int	child_wait;	/* # seconds to wait for children at end */
- 
-+#ifdef USE_EAPTLS
-+extern char	*crl_dir;
-+#endif /* USE_EAPTLS */
-+
- #ifdef MAXOCTETS
- extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
- extern int       maxoctets_dir;      /* Direction :
-@@ -738,6 +742,10 @@ extern int (*chap_check_hook) __P((void));
- extern int (*chap_passwd_hook) __P((char *user, char *passwd));
- extern void (*multilink_join_hook) __P((void));
- 
-+#ifdef USE_EAPTLS
-+extern int (*eaptls_passwd_hook) __P((char *user, char *passwd));
-+#endif
-+
- /* Let a plugin snoop sent and received packets.  Useful for L2TP */
- extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
- extern void (*snoop_send_hook) __P((unsigned char *p, int len));
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0018-scritps-fix-ip-up.local-sample.patch b/ppp/patches/0018-scritps-fix-ip-up.local-sample.patch
deleted file mode 100644
index 225be08a6..000000000
--- a/ppp/patches/0018-scritps-fix-ip-up.local-sample.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 40960f91cdd06da387616ec838ae2599e7f01cee Mon Sep 17 00:00:00 2001
-From: Jiri Skala jskala@fedoraproject.org
-Date: Mon, 7 Apr 2014 15:24:01 +0200
-Subject: [PATCH 18/25] scritps: fix ip-up.local sample
-
-Resolves: #613717
----
- scripts/ip-up.local.add | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/scripts/ip-up.local.add b/scripts/ip-up.local.add
-index 26cf5f8..282337c 100644
---- a/scripts/ip-up.local.add
-+++ b/scripts/ip-up.local.add
-@@ -18,6 +18,9 @@ if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
- 		rscf=/var/run/ppp/resolv.new
- 		grep domain /var/run/ppp/resolv.prev > $rscf
- 		grep search /var/run/ppp/resolv.prev >> $rscf
-+		if [ -f /var/run/ppp/resolv.conf ]; then
-+			cat /var/run/ppp/resolv.conf >> $rscf
-+		fi
- 		change_resolv_conf $rscf
- 		rm -f $rscf
- 	else
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0019-sys-linux-rework-get_first_ethernet.patch b/ppp/patches/0019-sys-linux-rework-get_first_ethernet.patch
deleted file mode 100644
index 28cae8ddd..000000000
--- a/ppp/patches/0019-sys-linux-rework-get_first_ethernet.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-From 6edc865bd02ab591b9121d4a5f6dc3cdbe5af809 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Wed, 9 Apr 2014 09:18:24 +0200
-Subject: [PATCH 19/25] sys-linux: rework get_first_ethernet()
-
-We can't assume that host has ethernet NIC named "eth0". Rather than guessing we
-better ask udev. We iterate over symlinks symlinks in /sys/class/net and
-for each device we determine if it is ethernet device and additionally we query
-udev database for sub-type of the device. If we find PCI or USB device which has
-ethernet datalink type and appropriate sub-type we return its name. If we don't
-succeed in determining more information about device we will return "good
-enough" device which in turn is first device with ethernet datalink type.
-
-Note that we now have two copies of get_first_ethernet() in the source code. This
-is bad and should be fixed in the future.
-
-This commit replaces ppp-2.4.5-eth.patch.
-
-Resolves: #682381
----
- pppd/Makefile.linux                     |   3 +
- pppd/multilink.c                        |   4 +-
- pppd/plugins/rp-pppoe/Makefile.linux    |   4 +-
- pppd/plugins/rp-pppoe/pppoe-discovery.c | 117 +++++++++++++++++++++++++++++++-
- pppd/pppd.h                             |   2 +-
- pppd/sys-linux.c                        | 115 +++++++++++++++++++++++++++++--
- 6 files changed, 232 insertions(+), 13 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 53df4d2..0e8107f 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -32,6 +32,9 @@ include .depend
- endif
- 
- CC = gcc
-+
-+LIBS = -ludev
-+
- #
- COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=""$(LIBDIR)""
- 
-diff --git a/pppd/multilink.c b/pppd/multilink.c
-index 135cab0..2f0ed50 100644
---- a/pppd/multilink.c
-+++ b/pppd/multilink.c
-@@ -436,12 +436,12 @@ static int
- get_default_epdisc(ep)
-      struct epdisc *ep;
- {
--	char *p;
-+	char *p = NULL;
- 	struct hostent *hp;
- 	u_int32_t addr;
- 
- 	/* First try for an ethernet MAC address */
--	p = get_first_ethernet();
-+        get_first_ethernet(&p);
- 	if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) {
- 		ep->class = EPD_MAC;
- 		ep->length = 6;
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 9918091..b949716 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -30,8 +30,8 @@ COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
- all: rp-pppoe.so pppoe-discovery
- 
--pppoe-discovery: pppoe-discovery.o debug.o
--	$(CC) -o pppoe-discovery pppoe-discovery.o debug.o
-+pppoe-discovery: pppoe-discovery.o debug.o common.o
-+	$(CC) -o pppoe-discovery pppoe-discovery.o debug.o -ludev
- 
- pppoe-discovery.o: pppoe-discovery.c
- 	$(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-index c0d927d..2bd910f 100644
---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -47,8 +47,13 @@
- #include <net/if_arp.h>
- #endif
- 
-+#include <dirent.h>
-+#include <sys/types.h>
-+#include <libudev.h>
-+
- char *xstrdup(const char *s);
- void usage(void);
-+int get_first_ethernet(char **_r);
- 
- void die(int status)
- {
-@@ -681,8 +686,15 @@ int main(int argc, char *argv[])
-     }
- 
-     /* default interface name */
--    if (!conn->ifName)
--	conn->ifName = strdup("eth0");
-+    if (!conn->ifName) {
-+            char *eth_dev;
-+            if (get_first_ethernet(&eth_dev) < 0) {
-+                    fprintf(stderr, "No ethernet device on the host.\n");
-+                    exit(1);
-+            }
-+            conn->ifName = eth_dev;
-+    }
-+
- 
-     conn->discoverySocket = -1;
-     conn->sessionSocket = -1;
-@@ -722,3 +734,104 @@ void usage(void)
-     fprintf(stderr, "Usage: pppoe-discovery [options]\n");
-     fprintf(stderr, "\nVersion " RP_VERSION "\n");
- }
-+
-+/*
-+ * get_first_ethernet - return the name of the first ethernet-style
-+ * interface on this system.
-+ */
-+int
-+get_first_ethernet(char **_r)
-+{
-+        int r = 0;
-+        DIR *d = NULL;
-+        struct dirent *entry = NULL;
-+        struct udev *udev = NULL;
-+        struct udev_device *dev = NULL;
-+        char *eth_dev = NULL;
-+
-+        d = opendir("/sys/class/net");
-+        if (!d) {
-+                fprintf(stderr, "Failed to open dir /sys/class/net : %m\n");
-+                r = -errno;
-+                goto fail;
-+        }
-+
-+        udev = udev_new();
-+        if (!udev) {
-+                fprintf(stderr, "Failed to talk to systemd-udevd\n");
-+                r = -EIO;
-+                goto fail;
-+        }
-+
-+        while ((entry = readdir(d)) != NULL) {
-+                char syspath[PATH_MAX] = {};
-+                const char *type = NULL;
-+
-+                if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0))
-+                        continue;
-+
-+                sprintf(syspath, "/sys/class/net/%s", entry->d_name);
-+
-+                dev = udev_device_new_from_syspath(udev, syspath);
-+                if (!dev)
-+                        continue;
-+
-+                type = udev_device_get_sysattr_value(dev, "type");
-+                if (strcmp(type, "1") == 0) {
-+                        const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL;
-+
-+                        pci_dev_subclass = udev_device_get_property_value(dev,
-+                                                                          "ID_PCI_SUBCLASS_FROM_DATABASE");
-+                        usb_dev_subclass = udev_device_get_property_value(dev,
-+                                                                          "ID_USB_SUBCLASS_FROM_DATABASE");
-+
-+                        if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) ||
-+                            (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 ||
-+                                                  strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) {
-+                                char *d = NULL;
-+
-+                                d = strdup(entry->d_name);
-+                                if (!d) {
-+                                        r = -ENOMEM;
-+                                        goto fail;
-+                                }
-+
-+                                free(eth_dev);
-+                                eth_dev = d;
-+                                break;
-+                        } else if (!eth_dev) {
-+                                eth_dev = strdup(entry->d_name);
-+                                if (!eth_dev) {
-+                                        r = -ENOMEM;
-+                                        goto fail;
-+                                }
-+                        }
-+                }
-+
-+                udev_device_unref(dev);
-+                dev = NULL;
-+        }
-+
-+        if (dev)
-+                udev_device_unref(dev);
-+        udev_unref(udev);
-+        closedir(d);
-+
-+        *_r = eth_dev;
-+
-+        return 0;
-+
-+fail:
-+        if (dev)
-+                udev_device_unref(dev);
-+
-+        if (udev)
-+                udev_unref(udev);
-+
-+        if (d)
-+                closedir(d);
-+
-+        free(eth_dev);
-+
-+        return r;
-+}
-diff --git a/pppd/pppd.h b/pppd/pppd.h
-index de271c1..aaddba1 100644
---- a/pppd/pppd.h
-+++ b/pppd/pppd.h
-@@ -691,7 +691,7 @@ int  sipxfaddr __P((int, unsigned long, unsigned char *));
- int  cipxfaddr __P((int));
- #endif
- int  get_if_hwaddr __P((u_char *addr, char *name));
--char *get_first_ethernet __P((void));
-+int get_first_ethernet __P((char **_r));
- 
- /* Procedures exported from options.c */
- int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 0690019..ec09c50 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -92,6 +92,9 @@
- #include <ctype.h>
- #include <termios.h>
- #include <unistd.h>
-+#include <dirent.h>
-+
-+#include <libudev.h>
- 
- /* This is in netdevice.h. However, this compile will fail miserably if
-    you attempt to include netdevice.h because it has so many references
-@@ -1873,10 +1876,101 @@ get_if_hwaddr(u_char *addr, char *name)
-  * get_first_ethernet - return the name of the first ethernet-style
-  * interface on this system.
-  */
--char *
--get_first_ethernet()
--{
--	return "eth0";
-+int
-+get_first_ethernet(char **_r)
-+{
-+        int r = 0;
-+        DIR *d = NULL;
-+        struct dirent *entry = NULL;
-+        struct udev *udev = NULL;
-+        struct udev_device *dev = NULL;
-+        char *eth_dev = NULL;
-+
-+        d = opendir("/sys/class/net");
-+        if (!d) {
-+                fprintf(stderr, "Failed to open dir /sys/class/net : %m\n");
-+                r = -errno;
-+                goto fail;
-+        }
-+
-+        udev = udev_new();
-+        if (!udev) {
-+                fprintf(stderr, "Failed to talk to systemd-udevd\n");
-+                r = -EIO;
-+                goto fail;
-+        }
-+
-+        while ((entry = readdir(d)) != NULL) {
-+                char syspath[PATH_MAX] = {};
-+                const char *type = NULL;
-+
-+                if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0))
-+                        continue;
-+
-+                sprintf(syspath, "/sys/class/net/%s", entry->d_name);
-+
-+                dev = udev_device_new_from_syspath(udev, syspath);
-+                if (!dev)
-+                        continue;
-+
-+                type = udev_device_get_sysattr_value(dev, "type");
-+                if (strcmp(type, "1") == 0) {
-+                        const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL;
-+
-+                        pci_dev_subclass = udev_device_get_property_value(dev,
-+                                                                          "ID_PCI_SUBCLASS_FROM_DATABASE");
-+                        usb_dev_subclass = udev_device_get_property_value(dev,
-+                                                                          "ID_USB_SUBCLASS_FROM_DATABASE");
-+
-+                        if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) ||
-+                            (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 ||
-+                                                  strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) {
-+                                char *d = NULL;
-+
-+                                d = strdup(entry->d_name);
-+                                if (!d) {
-+                                        r = -ENOMEM;
-+                                        goto fail;
-+                                }
-+
-+                                free(eth_dev);
-+                                eth_dev = d;
-+                                break;
-+                        } else if (!eth_dev) {
-+                                eth_dev = strdup(entry->d_name);
-+                                if (!eth_dev) {
-+                                        r = -ENOMEM;
-+                                        goto fail;
-+                                }
-+                        }
-+                }
-+
-+                udev_device_unref(dev);
-+                dev = NULL;
-+        }
-+
-+        if (dev)
-+                udev_device_unref(dev);
-+        udev_unref(udev);
-+        closedir(d);
-+
-+        *_r = eth_dev;
-+
-+        return 0;
-+
-+fail:
-+        if (dev)
-+                udev_device_unref(dev);
-+
-+        if (udev)
-+                udev_unref(udev);
-+
-+        if (d)
-+                closedir(d);
-+
-+        free(eth_dev);
-+
-+        return r;
- }
- 
- /********************************************************************
-@@ -2859,6 +2953,7 @@ ether_to_eui64(eui64_t *p_eui64)
-     struct ifreq ifr;
-     int skfd;
-     const unsigned char *ptr;
-+    char *eth_dev = NULL;
- 
-     skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-     if(skfd == -1)
-@@ -2867,11 +2962,19 @@ ether_to_eui64(eui64_t *p_eui64)
-         return 0;
-     }
- 
--    strcpy(ifr.ifr_name, "eth0");
-+    if (get_first_ethernet(&eth_dev) < 0)
-+    {
-+            warn("no ethernet device present on the host");
-+            return 0;
-+    }
-+
-+    strcpy(ifr.ifr_name, eth_dev);
-+    free(eth_dev);
-+
-     if(ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)
-     {
-         close(skfd);
--        warn("could not obtain hardware address for eth0");
-+        warn("could not obtain hardware address for %s", ifr.ifr_name);
-         return 0;
-     }
-     close(skfd);
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch b/ppp/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
deleted file mode 100644
index af878ce20..000000000
--- a/ppp/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c5a5f795b1defcb6d168e79c4d1fc371dfc556ca Mon Sep 17 00:00:00 2001
-From: Jiri Skala jskala@redhat.com
-Date: Wed, 9 Apr 2014 09:29:50 +0200
-Subject: [PATCH 20/25] pppd: put lock files in /var/lock/ppp
-
-Resolves: #708260
----
- pppd/utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/utils.c b/pppd/utils.c
-index 6051b9a..8407492 100644
---- a/pppd/utils.c
-+++ b/pppd/utils.c
-@@ -846,7 +846,7 @@ complete_read(int fd, void *buf, size_t count)
- /* Procedures for locking the serial device using a lock file. */
- #ifndef LOCK_DIR
- #ifdef __linux__
--#define LOCK_DIR	"/var/lock"
-+#define LOCK_DIR	"/var/lock/ppp"
- #else
- #ifdef SVR4
- #define LOCK_DIR	"/var/spool/locks"
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch b/ppp/patches/0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
deleted file mode 100644
index f19e5536d..000000000
--- a/ppp/patches/0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d69eb9a8aa284014dd7dd282813989eda9d84d74 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Wed, 9 Apr 2014 09:56:09 +0200
-Subject: [PATCH 21/25] build-sys: compile pppol2tp plugin with RPM_OPT_FLAGS
-
----
- pppd/plugins/pppol2tp/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index 4339566..9a635b8 100644
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0022-build-sys-compile-pppol2tp-with-multilink-support.patch b/ppp/patches/0022-build-sys-compile-pppol2tp-with-multilink-support.patch
deleted file mode 100644
index eed9102ca..000000000
--- a/ppp/patches/0022-build-sys-compile-pppol2tp-with-multilink-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a0060c5d48ef742bff4fe9ba9c276a5c21795ce8 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Wed, 9 Apr 2014 09:58:38 +0200
-Subject: [PATCH 22/25] build-sys: compile pppol2tp with multilink support
-
-Resolves: #817013
----
- pppd/plugins/pppol2tp/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index 9a635b8..9cb316d 100644
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -1,5 +1,5 @@
- #CC	= gcc
--COPTS	= $(RPM_OPT_FLAGS)
-+COPTS	= $(RPM_OPT_FLAGS) -DHAVE_MULTILINK
- CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch b/ppp/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
deleted file mode 100644
index af95d4954..000000000
--- a/ppp/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 769521a3798fd554ddc7333cb1255cd1b40790e8 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Thu, 10 Apr 2014 10:00:55 +0200
-Subject: [PATCH 23/25] build-sys: install rp-pppoe plugin files with standard
- perms
-
-This is needed to properly generate debuginfo package.
----
- pppd/plugins/rp-pppoe/Makefile.linux | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index b949716..fa49efb 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -44,10 +44,10 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
--	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
--	$(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
-+	$(INSTALL) -c -m 755 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 644 pppoe-discovery.8 $(MANDIR)
- 
- clean:
- 	rm -f *.o *.so pppoe-discovery
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0023-build-sys-make-pppd-first-and-then-plugins.patch b/ppp/patches/0023-build-sys-make-pppd-first-and-then-plugins.patch
deleted file mode 100644
index 1e9810655..000000000
--- a/ppp/patches/0023-build-sys-make-pppd-first-and-then-plugins.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1dc033327792ef51cb08e224b8d90e7d8571084d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Wed, 9 Apr 2014 15:37:53 +0200
-Subject: [PATCH 23/23] build-sys: make pppd first and then plugins
-
----
- linux/Makefile.top | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/Makefile.top b/linux/Makefile.top
-index 9a8945a..12210f2 100644
---- a/linux/Makefile.top
-+++ b/linux/Makefile.top
-@@ -13,8 +13,8 @@ INSTALL= install
- 
- all:
- 	cd chat; $(MAKE) $(MFLAGS) all
--	cd pppd/plugins; $(MAKE) $(MFLAGS) all
- 	cd pppd; $(MAKE) $(MFLAGS) all
-+	cd pppd/plugins; $(MAKE) $(MFLAGS) all
- 	cd pppstats; $(MAKE) $(MFLAGS) all
- 	cd pppdump; $(MAKE) $(MFLAGS) all
- 
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch b/ppp/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
deleted file mode 100644
index e29231d18..000000000
--- a/ppp/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0fdb22ef3d3cc3b297372451d60bd6c61d047d27 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Thu, 10 Apr 2014 10:08:41 +0200
-Subject: [PATCH 24/25] build-sys: install pppoatm plugin files with standard
- perms
-
----
- pppd/plugins/pppoatm/Makefile.linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 769794b..4c5826f 100644
---- a/pppd/plugins/pppoatm/Makefile.linux
-+++ b/pppd/plugins/pppoatm/Makefile.linux
-@@ -37,7 +37,7 @@ $(PLUGIN): $(PLUGIN_OBJS)
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
-+	$(INSTALL) -c -m 755 $(PLUGIN) $(LIBDIR)
- 
- clean:
- 	rm -f *.o *.so
--- 
-1.8.3.1
-
diff --git a/ppp/patches/0025-pppd-install-pppd-binary-using-standard-perms-755.patch b/ppp/patches/0025-pppd-install-pppd-binary-using-standard-perms-755.patch
deleted file mode 100644
index ed0582446..000000000
--- a/ppp/patches/0025-pppd-install-pppd-binary-using-standard-perms-755.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ab8b06cdc1075abc67f77e7c3bb684e20071d614 Mon Sep 17 00:00:00 2001
-From: Michal Sekletar msekleta@redhat.com
-Date: Thu, 10 Apr 2014 10:09:41 +0200
-Subject: [PATCH 25/25] pppd: install pppd binary using standard perms (755)
-
----
- pppd/Makefile.linux | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 0e8107f..534ccc2 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -223,10 +223,10 @@ all: $(TARGETS)
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 755 pppd $(BINDIR)/pppd
- 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
- 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
--	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-+	$(INSTALL) -c -m 644 pppd.8 $(MANDIR)
- 
- pppd: $(PPPDOBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
--- 
-1.8.3.1
-
diff --git a/ppp/patches/ppp-2.4.2-ifname.patch b/ppp/patches/ppp-2.4.2-ifname.patch
deleted file mode 100644
index 50b96c938..000000000
--- a/ppp/patches/ppp-2.4.2-ifname.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- ./pppd/main.c.orig	2004-07-19 12:35:22.000000000 +0000
-+++ ./pppd/main.c	2004-07-19 14:34:38.542120946 +0000
-@@ -98,7 +98,7 @@
- static const char rcsid[] = RCSID;
- 
- /* interface vars */
--char ifname[32];		/* Interface name */
-+char ifname[MAXIFNAMELEN];	/* Interface name */
- int ifunit;			/* Interface unit number */
- 
- struct channel *the_channel;
-@@ -261,13 +261,6 @@
-     NULL
- };
- 
--/*
-- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-- */
--#if !defined(PPP_DRV_NAME)
--#define PPP_DRV_NAME	"ppp"
--#endif /* !defined(PPP_DRV_NAME) */
--
- int
- main(argc, argv)
-     int argc;
-@@ -777,8 +770,11 @@
- set_ifunit(iskey)
-     int iskey;
- {
--    info("Using interface %s%d", PPP_DRV_NAME, ifunit);
-+    if (req_ifname[0] != '\0')
-+	slprintf(ifname, sizeof(ifname), req_ifname);
-+    else
-     slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
-+    info("Using interface %s", ifname);
-     script_setenv("IFNAME", ifname, iskey);
-     if (iskey) {
- 	create_pidfile(getpid());	/* write pid to file */
---- ./pppd/options.c.orig	2004-07-19 12:59:21.000000000 +0000
-+++ ./pppd/options.c	2004-07-19 14:35:04.253865964 +0000
-@@ -102,6 +102,7 @@
- bool	tune_kernel;		/* may alter kernel settings */
- int	connect_delay = 1000;	/* wait this many ms after connect script */
- int	req_unit = -1;		/* requested interface unit */
-+char	req_ifname[MAXIFNAMELEN];	/* requested interface name */
- bool	multilink = 0;		/* Enable multilink operation */
- char	*bundle_name = NULL;	/* bundle name for multilink */
- bool	dump_options;		/* print out option values */
-@@ -259,6 +260,10 @@
-       "PPP interface unit number to use if possible",
-       OPT_PRIO | OPT_LLIMIT, 0, 0 },
- 
-+    { "ifname", o_string, req_ifname,
-+      "Set PPP interface name",
-+      OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN },
-+
-     { "dump", o_bool, &dump_options,
-       "Print out option values after parsing all options", 1 },
-     { "dryrun", o_bool, &dryrun,
---- ./pppd/pppd.8.orig	2004-07-19 14:39:06.639320497 +0000
-+++ ./pppd/pppd.8	2004-07-19 15:00:37.339448432 +0000
-@@ -1020,7 +1020,12 @@
- .TP
- .B unit \fInum
- Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound
--connections.
-+connections.  If the unit is already in use a dynamically allocated will be
-+used.
-+.TP
-+.B ifname \fIstring
-+Set the ppp interface name for outbound connections.  A failure to set the
-+name will terminate the pppd.
- .TP
- .B updetach
- With this option, pppd will detach from its controlling terminal once
---- ./pppd/pppd.h.orig	2004-07-19 12:59:16.000000000 +0000
-+++ ./pppd/pppd.h	2004-07-19 15:02:08.792752747 +0000
-@@ -80,6 +80,16 @@
- #define MAXARGS		1	/* max # args to a command */
- #define MAXNAMELEN	256	/* max length of hostname or name for auth */
- #define MAXSECRETLEN	256	/* max length of password or secret */
-+#define MAXIFNAMELEN	32	/* max length of interface name; or use IFNAMSIZ, can we
-+				   always include net/if.h? */
-+
-+/*
-+ * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-+ * Where should PPP_DRV_NAME come from? Do we include it here?
-+ */
-+#if !defined(PPP_DRV_NAME)
-+#define PPP_DRV_NAME	"ppp"
-+#endif /* !defined(PPP_DRV_NAME) */
- 
- /*
-  * Option descriptor structure.
-@@ -304,6 +314,7 @@
- extern int	connect_delay;	/* Time to delay after connect script */
- extern int	max_data_rate;	/* max bytes/sec through charshunt */
- extern int	req_unit;	/* interface unit number to use */
-+extern char	req_ifname[MAXIFNAMELEN];	/* interface name to use */
- extern bool	multilink;	/* enable multilink operation */
- extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
- extern char	*bundle_name;	/* bundle name for multilink */
---- ./pppd/sys-linux.c.orig	2004-07-19 12:33:29.000000000 +0000
-+++ ./pppd/sys-linux.c	2004-07-19 14:37:36.463754450 +0000
-@@ -649,6 +649,21 @@
- 	}
- 	if (x < 0)
- 		error("Couldn't create new ppp unit: %m");
-+
-+	if (x == 0 && req_ifname[0] != '\0') {
-+		struct ifreq ifr;
-+		char t[MAXIFNAMELEN];
-+		memset(&ifr, 0, sizeof(struct ifreq));
-+		slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit);
-+		strncpy(ifr.ifr_name, t, IF_NAMESIZE);
-+		strncpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE);
-+		x = ioctl(sock_fd, SIOCSIFNAME, &ifr);
-+		if (x < 0)
-+		    error("Couldn't rename interface %s to %s: %m", t, req_ifname);
-+		else
-+		    info("Renamed interface %s to %s", t, req_ifname);
-+	}
-+
- 	return x;
- }
- 
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 3e6a41f23..6ccfcecc9 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -4,13 +4,13 @@
 ###############################################################################
name       = ppp
-version    = 2.4.6
-release    = 3
+version    = 2.4.9
+release    = 1
groups     = System/Daemons
-url        = http://ppp.samba.org/
+url        = https://ppp.samba.org/
 license    = BSD and LGPLv2+ and GPLv2+ and Public Domain
-summary    = The PPP (Point-to-Point Protocol) daemon.
+summary    = The PPP (Point-to-Point Protocol) daemon
description
    The ppp package contains the PPP (Point-to-Point Protocol) daemon and
@@ -20,7 +20,7 @@ description
    and phone line.
 end
-source_dl  = ftp://ftp.samba.org/pub/ppp/
+source_dl  = https://download.samba.org/pub/ppp/
build
    requires
diff --git a/pygobject3/pygobject3.nm b/pygobject3/pygobject3.nm
deleted file mode 100644
index bc9203582..000000000
--- a/pygobject3/pygobject3.nm
+++ /dev/null
@@ -1,117 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = pygobject3
-version    = %{ver_major}.%{ver_minor}
-ver_major  = 3.18
-ver_minor  = 0
-release    = 1
-
-groups     = Development/Tools
-url        = http://www.pygtk.org/
-license    = LGPLv2+
-summary    = Python 2 bindings for GObject.
-
-description
-	The %{name} package provides a convenient wrapper for the GObject library
-	for use in Python programs.
-end
-
-thisapp = pygobject-%{version}
-
-source_dl  = http://ftp.gnome.org/pub/GNOME/sources/pygobject/%%7Bver_major%7D/
-sources    = %{thisapp}.tar.xz
-
-build
-	requires
-		cairo-gobject-devel >= 1.12.12
-		glib2-devel >= 2.34.2
-		gobject-introspection-devel >= 1.34.2
-		pkg-config
-		python-cairo-devel
-		python3-cairo-devel
-		python-devel
-		python3-devel >= 3.4
-	end
-
-	DIR_APP3 = %{DIR_APP}-python3
-
-	prepare_cmds
-		cp -av %{DIR_APP} %{DIR_APP3}
-
-		pushd %{DIR_APP3}
-		find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python3}|'
-		popd
-
-		find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python}|'
-	end
-
-	build
-		pushd %{DIR_APP3}
-		export PYTHON=%{python3}
-		./configure  %{configure_options}
-		make %{PARALLELISMFLAGS}
-		popd
-
-		export PYTHON=%{python}
-		./configure  %{configure_options}
-		make %{PARALELLISMFLAGS}
-	end
-
-	install
-		pushd %{DIR_APP3}
-		export PYTHON=%{python3}
-		make install DESTDIR=%{BUILDROOT}
-		popd
-
-		export PYTHON=%{python}
-		make install DESTDIR=%{BUILDROOT}
-	end
-end
-
-packages
-	package python-gobject3
-		requires
-			gobject-introspection >= 1.34.2
-			python-cairo
-		end
-
-		files += \
-			{libdir}/*python2*.so.*
-	end
-
-	package python3-gobject3
-		template PYTHON3
-
-		requires
-			gobject-introspection >= 1.34.2
-			python3-cairo
-		end
-
-		files += \
-			%{libdir}/*python3*.so.*
-	end
-
-	package %{name}-devel
-		template DEVEL
-
-		provides
-			python-gobject3-devel
-			python3-gobject3-devel
-		end
-
-		requires
-			glib2-devel
-			gobject-introspection-devel >= 1.34.2
-		end
-
-		files += \
-			%{libdir}/*python3*.so
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm
deleted file mode 100644
index ba5771957..000000000
--- a/python-dbus/python-dbus.nm
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = python-dbus
-version    = 1.1.1
-release    = 2
-
-groups     = System/Libraries
-url        = http://www.freedesktop.org/software/dbus/
-license    = MIT
-summary    = Dbus Python Bindings.
-
-description
-	D-Bus python bindings for use with python programs.
-end
-
-thisapp = dbus-python-%{version}
-
-source_dl  = http://dbus.freedesktop.org/releases/dbus-python/
-
-build
-	requires
-		dbus-devel
-		dbus-glib-devel
-		pkg-config
-		python-devel
-		python3-devel >= 3.4
-	end
-
-	configure_options += \
-		--mandir=/usr/share/man
-
-	DIR_APP3 = %{DIR_APP}-python3
-
-	prepare_cmds
-		cp -av %{DIR_APP} %{DIR_APP3}
-
-		pushd %{DIR_APP3}
-		find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python3}|'
-		popd
-
-		find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python}|'
-	end
-
-	build
-		pushd %{DIR_APP3}
-		export PYTHON=%{python3}
-		./configure  %{configure_options}
-		make %{PARALLELISMFLAGS}
-		popd
-
-		export PYTHON=%{python}
-		./configure  %{configure_options}
-		make %{PARALELLISMFLAGS}
-	end
-
-	install
-		pushd %{DIR_APP3}
-		export PYTHON=%{python3}
-		make install DESTDIR=%{BUILDROOT}
-		popd
-
-		export PYTHON=%{python}
-		make install DESTDIR=%{BUILDROOT}
-	end
-end
-
-packages
-	package %{name}
-
-	package python3-dbus
-		template PYTHON3
-	end
-
-	package %{name}-devel
-		template DEVEL
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
deleted file mode 100644
index b8cd8566f..000000000
--- a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
+++ /dev/null
@@ -1,11 +0,0 @@
---- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig	2014-05-12 12:36:46.776004776 +0200
-+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py	2014-05-12 12:36:53.994995779 +0200
-@@ -169,7 +169,7 @@
- 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
- 	includes=[]
- 	if conf.env.PYTHON_CONFIG:
--		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-+		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
- 			if(incstr.startswith('-I')or incstr.startswith('/I')):
- 				incstr=incstr[2:]
- 			if incstr not in includes:
diff --git a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
deleted file mode 100644
index 32e398f7e..000000000
--- a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py
---- pycairo-1.10.0/test/examples_test.py~	2010-05-29 08:28:35.000000000 +0300
-+++ pycairo-1.10.0/test/examples_test.py	2013-12-20 22:53:07.806217741 +0200
-@@ -14,7 +14,7 @@ def test_snippets():
-   examples/cairo_snippets/snippets/
-   '''
-   def doSnippets(name):
--    retcode = subprocess.call('python %s -s' % name, shell=True)
-+    retcode = subprocess.call('python3 %s -s' % name, shell=True)
-     assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
- 
-   os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm
index a360e7ace..88fa587ea 100644
--- a/python3-cairo/python3-cairo.nm
+++ b/python3-cairo/python3-cairo.nm
@@ -4,62 +4,35 @@
 ###############################################################################
name       = python3-cairo
-version    = 1.10.0
-release    = 2
+version    = 1.23.0
+release    = 1
+thisapp    = pycairo-%{version}
groups     = Development/Tools
-url        = http://cairographics.org/pycairo
+url        = https://cairographics.org/pycairo
 license    = MPLv1.1 or LGPLv2
-summary    = Python3 bindings for the cairo library.
+summary    = Python3 bindings for the cairo library
description
    Python3 bindings for the cairo library.
 end
-thisapp = pycairo-%{version}
-
-source_dl  = http://cairographics.org/releases/
-sources    = %{thisapp}.tar.bz2
+source_dl  = https://github.com/pygobject/pycairo/releases/download/v%%7Bversion%7D/
build
    requires
    	cairo-devel
    	pkg-config
    	python3-devel >= 3.4
-	end
-
-	prepare
-		# Extract source tarball.
-		%{MACRO_EXTRACT_TARBALL}
-
-		# Ensure that ./waf has created the cached unpacked version
-		# of the wafadmin source tree.
-		# This will be created to a subdirectory like
-		#    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-		python3 ./waf --version
-
-		# Apply all patches.
-		%{MACRO_PATCHES}
+		python3-setuptools
    end
build
-		export PYTHON=python3
-		%{python3} ./waf \
-			--prefix=%{prefix} \
-			--libdir=%{libdir} \
-			configure
-
-		%{python3} ./waf build -v
+		%{python3} setup.py build
    end
install
-		# remove executable bits from examples
-		find ./examples/ -type f -print0 | xargs -0 chmod -x
-
-		DESTDIR=%{BUILDROOT} %{python3} ./waf install
-
-		# add executable bit to the .so libraries so we strip the debug info
-		find %{BUILDROOT} -name '*.so' | xargs chmod +x
+		%{python3} setup.py install --skip-build --root="%{BUILDROOT}"
    end
 end
diff --git a/python-cairo/python-cairo.nm b/python3-dbus/python3-dbus.nm
similarity index 50%
rename from python-cairo/python-cairo.nm
rename to python3-dbus/python3-dbus.nm
index b10076e11..5823738ae 100644
--- a/python-cairo/python-cairo.nm
+++ b/python3-dbus/python3-dbus.nm
@@ -3,30 +3,28 @@
 # Copyright (C) - IPFire Development Team info@ipfire.org                   #
 ###############################################################################
-name       = python-cairo
-version    = 1.8.10
-release    = 3
+name       = python3-dbus
+version    = 1.3.2
+release    = 1
+thisapp    = dbus-python-%{version}
-groups     = Development/Tools
-url        = http://cairographics.org/pycairo
-license    = MPLv1.1 or LGPLv2
-summary    = Python bindings for the cairo library.
+groups     = System/Libraries
+url        = https://www.freedesktop.org/software/dbus/
+license    = MIT
+summary    = DBUS Python Bindings
description
-	Python bindings for the cairo library.
+	D-Bus python bindings for use with python programs.
 end
-source_dl  =
-sources    = py2cairo-%{version}.tar.gz
+source_dl  = https://dbus.freedesktop.org/releases/dbus-python/
build
    requires
-		cairo-devel
-		pkg-config
-		python-devel
+		dbus-devel
+		dbus-glib-devel
+		python3-devel >= 3.4
    end
-
-	DIR_APP = %{DIR_SRC}/pycairo-%{version}
 end
packages
@@ -34,11 +32,6 @@ packages
package %{name}-devel
    	template DEVEL
-
-		# The development headers need the cairo headers.
-		requires
-			cairo-devel
-		end
    end
package %{name}-debuginfo
diff --git a/python3-gobject3/python3-gobject3.nm b/python3-gobject3/python3-gobject3.nm
new file mode 100644
index 000000000..f98cd5769
--- /dev/null
+++ b/python3-gobject3/python3-gobject3.nm
@@ -0,0 +1,67 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = python3-gobject3
+version    = %{ver_major}.%{ver_minor}
+ver_major  = 3.42
+ver_minor  = 2
+release    = 1
+thisapp    = pygobject-%{version}
+
+groups     = Development/Tools
+url        = https://www.pygtk.org/
+license    = LGPLv2+
+summary    = Python 2 bindings for GObject.
+
+description
+	The %{name} package provides a convenient wrapper for the GObject library
+	for use in Python programs.
+end
+
+
+source_dl  = https://ftp.gnome.org/pub/GNOME/sources/pygobject/%%7Bver_major%7D/
+sources    = %{thisapp}.tar.xz
+
+build
+	requires
+		cairo-gobject-devel >= 1.12.12
+		glib2-devel >= 2.34.2
+		gobject-introspection-devel >= 1.56
+		pkg-config
+		python3-cairo-devel >= 1.16.0
+		python3-devel >= 3.4
+		python3-setuptools
+	end
+
+	build
+		%{python3} setup.py build
+	end
+
+	install
+		%{python3} setup.py install --skip-build --root=%{BUILDROOT}
+	end	
+end
+
+packages
+	package %{name}
+		requires
+			gobject-introspection >= 1.56
+			python3-cairo
+		end
+	end
+
+	package %{name}-devel
+		template DEVEL
+
+		requires
+			glib2-devel
+			gobject-introspection-devel >= 1.56
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
index 2a0da7f3b..354c9c09a 100644
--- a/rp-pppoe/rp-pppoe.nm
+++ b/rp-pppoe/rp-pppoe.nm
@@ -30,7 +30,7 @@ build
    	systemd-units
    end
-	DIR_APP := %{DIR_APP}/src
+	DIR_APP = %{DIR_APP}/src
    CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing
pppd_version = %(pppd --version 2>&1 | awk '{ print $NF }')
diff --git a/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch b/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch
deleted file mode 100644
index 9d45aa746..000000000
--- a/rrdtool/patches/rrdtool-1.7.1-compile-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index ab763dc..7d18178 100644
---- a/etc/Makefile.am
-+++ b/etc/Makefile.am
-@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
- 
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = \
--	etc/rrdcached.socket \
--	etc/rrdcached.service
-+	rrdcached.socket \
-+	rrdcached.service
- endif
-\ No newline at end of file
-diff --git a/etc/Makefile.in b/etc/Makefile.in
-index 74b914b..d512fd5 100644
---- a/etc/Makefile.in
-+++ b/etc/Makefile.in
-@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
- 	rrdcached.socket.in rrdcached.service.in
- 
- @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
--@HAVE_SYSTEMD_TRUE@	etc/rrdcached.socket \
--@HAVE_SYSTEMD_TRUE@	etc/rrdcached.service
-+@HAVE_SYSTEMD_TRUE@	rrdcached.socket \
-+@HAVE_SYSTEMD_TRUE@	rrdcached.service
- 
- all: all-am
- 
diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm
index b3421c2a4..c9fa29602 100644
--- a/rrdtool/rrdtool.nm
+++ b/rrdtool/rrdtool.nm
@@ -4,23 +4,23 @@
 ###############################################################################
name       = rrdtool
-version    = 1.7.1
+version    = 1.8.0
 release    = 1
groups     = Applications/Databases
 url        = https://oss.oetiker.ch/rrdtool/
 license    = GPLv2+ with exceptions
-summary    = Round Robin Database Tool to store and display time-series data.
+summary    = Round Robin Database Tool to store and display time-series data
description
-	RRD is the Acronym for Round Robin Database. RRD is a system to \
-	store and display time-series data. It stores the data in a \
-	very compact way that will not expand over time, and it presents \
-	useful graphs by processing the data to enforce a certain data \
+	RRD is the Acronym for Round Robin Database. RRD is a system to
+	store and display time-series data. It stores the data in a
+	very compact way that will not expand over time, and it presents
+	useful graphs by processing the data to enforce a certain data
    density.
 end
-source_dl  = https://oss.oetiker.ch/rrdtool/pub/
+source_dl  = https://github.com/oetiker/rrdtool-1.x/releases/download/v%%7Bversion%7D/
build
    requires
@@ -34,8 +34,8 @@ build
    	openssl-devel
    	pango-devel
    	pkg-config
-		python-devel
-		python-setuptools
+		python3-devel
+		python3-setuptools
    	systemd-devel
    	zlib-devel
    end
@@ -48,7 +48,8 @@ build
    	--disable-static \
    	--enable-python \
    	--disable-rrdcached \
-		--with-pic
+		--with-pic \
+		PYTHON=%{python3}
prepare_cmds
    	# Remove rpath
@@ -75,15 +76,8 @@ packages
    	requires += dejavu-fonts-sans-mono-fonts
    end
-	package python-%{name}
-		summary = Python bindings for rrdtool %{thisver}.
-		description = %{summary}
-
-		requires = %{name}-libs = %{thisver}
-
-		files
-			/usr/lib*/python*
-		end
+	package python3-%{name}
+		template PYTHON3
    end
package %{name}-devel
diff --git a/shared-mime-info/shared-mime-info.nm b/shared-mime-info/shared-mime-info.nm
new file mode 100644
index 000000000..580d35a6b
--- /dev/null
+++ b/shared-mime-info/shared-mime-info.nm
@@ -0,0 +1,59 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = shared-mime-info
+version    = 2.2
+release    = 1
+
+url        = http://freedesktop.org/Software/shared-mime-info
+license    = GPLv2+
+summary    = Shared MIME information database
+
+description
+	This is the freedesktop.org shared MIME info database.
+
+	Many programs and desktops use the MIME system to represent the types of
+	files. Frequently, it is necessary to work out the correct MIME type for
+	a file. This is generally done by examining the file's name or contents,
+	and looking up the correct MIME type in a database.
+end
+
+source_dl  = https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%%7Bversion%7D...
+
+build
+	requires
+		glib2-devel
+		libxml2-devel
+		meson >= 0.55.3
+	end
+
+	build
+		%{meson} \
+			-Dupdate-mimedb=true
+
+		%{meson_build}
+
+	end
+
+	install
+		%{meson_install}
+	end
+end
+
+packages
+	package %{name}
+		script postin
+			update-mime-database -n %{datadir}/mime &> /dev/null ||:
+		end
+
+		script postup
+			update-mime-database -n %{datadir}/mime &> /dev/null ||:
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/sip/sip.nm b/sip/sip.nm
index 9533fa5b8..85c4be367 100644
--- a/sip/sip.nm
+++ b/sip/sip.nm
@@ -6,7 +6,6 @@
 name       = sip
 version    = %{major_ver}.%{minor_ver}.%{rev_ver}
 release    = 2
-epoch      = 1
major_ver  = 4
 minor_ver  = 18
diff --git a/tftp/patches/tftp-0.40-remap.patch b/tftp/patches/tftp-0.40-remap.patch
deleted file mode 100644
index 755a30755..000000000
--- a/tftp/patches/tftp-0.40-remap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up tftp-hpa-0.49/tftpd/remap.c.zero tftp-hpa-0.49/tftpd/remap.c
---- tftp-hpa-0.49/tftpd/remap.c.zero	2008-10-20 18:08:31.000000000 -0400
-+++ tftp-hpa-0.49/tftpd/remap.c	2008-11-25 11:41:09.000000000 -0500
-@@ -286,6 +286,7 @@ struct rule *parserulefile(FILE * f)
-     int lineno = 0;
-     int err = 0;
- 
-+    memset(this_rule, '\0', sizeof(struct rule));
-     while (lineno++, fgets(line, MAXLINE, f)) {
-         rv = parseline(line, this_rule, lineno);
-         if (rv < 0)
-@@ -294,6 +295,7 @@ struct rule *parserulefile(FILE * f)
-             *last_rule = this_rule;
-             last_rule = &this_rule->next;
-             this_rule = tfmalloc(sizeof(struct rule));
-+            memset(this_rule, '\0', sizeof(struct rule));
-         }
-     }
- 
diff --git a/tftp/patches/tftp-0.42-tftpboot.patch b/tftp/patches/tftp-0.42-tftpboot.patch
deleted file mode 100644
index a0de58ddf..000000000
--- a/tftp/patches/tftp-0.42-tftpboot.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up tftp-hpa-0.48/tftp-xinetd.tftpboot tftp-hpa-0.48/tftp-xinetd
---- tftp-hpa-0.48/tftp-xinetd.tftpboot	2007-01-31 00:51:05.000000000 +0100
-+++ tftp-hpa-0.48/tftp-xinetd	2008-05-20 12:05:53.000000000 +0200
-@@ -10,7 +10,7 @@ service tftp
- 	wait			= yes
- 	user			= root
- 	server			= /usr/sbin/in.tftpd
--	server_args		= -s /tftpboot
-+	server_args		= -s /var/lib/tftpboot
- 	disable			= yes
- 	per_source		= 11
- 	cps			= 100 2
-diff -up tftp-hpa-0.48/README.security.tftpboot tftp-hpa-0.48/README.security
---- tftp-hpa-0.48/README.security.tftpboot	2008-05-29 17:36:32.000000000 +0200
-+++ tftp-hpa-0.48/README.security	2008-05-29 17:37:21.000000000 +0200
-@@ -17,10 +17,10 @@ probably the following:
- 
- 1. Create a separate "tftpd" user and group only used for tftpd;
- 2. Have all your boot files in a single directory tree (usually called 
--   /tftpboot).
--3. Specify "-p -u tftpd -s /tftpboot" on the tftpd command line; if
-+   /var/lib/tftpboot).
-+3. Specify "-p -u tftpd -s /var/lib/tftpboot" on the tftpd command line; if
-    you want clients to be able to create files use
--   "-p -c -U 002 -u tftpd -s /tftpboot" (replace 002 with whatever
-+   "-p -c -U 002 -u tftpd -s /var/lib/tftpboot" (replace 002 with whatever
-    umask is appropriate for your setup.)
- 
- 	       =======================================
-@@ -40,12 +40,12 @@ directly.  Thus, if your /etc/inetd.conf
- line):
- 
- tftp	dgram	udp	wait	root	/usr/sbin/tcpd
--/usr/sbin/in.tftpd -s /tftpboot -r blksize
-+/usr/sbin/in.tftpd -s /var/lib/tftpboot -r blksize
- 
- ... it's better to change to ...
- 
- tftp	dgram	udp	wait	root	/usr/sbin/in.tftpd
--in.tftpd -s /tftpboot -r blksize
-+in.tftpd -s /var/lib/tftpboot -r blksize
- 
- You should make sure that you are using "wait" option in tftpd; you
- also need to have tftpd spawned as root in order for chroot (-s) to
-diff -up tftp-hpa-0.48/tftpd/sample.rules.tftpboot tftp-hpa-0.48/tftpd/sample.rules
---- tftp-hpa-0.48/tftpd/sample.rules.tftpboot	2008-05-29 17:38:46.000000000 +0200
-+++ tftp-hpa-0.48/tftpd/sample.rules	2008-05-29 17:38:05.000000000 +0200
-@@ -30,5 +30,5 @@ rg	\		/		# Convert backslashes to slash
- rg	#		@		# Convert hash marks to @ signs
- rg	/../		/..no../	# Convert /../ to /..no../
- e	^ok/				# These are always ok
--r	^[^/]		/tftpboot/\0	# Convert non-absolute files
-+r	^[^/]		/var/lib/tftpboot/\0	# Convert non-absolute files
- a	.pvt$				# Reject requests for private files
diff --git a/tftp/patches/tftp-0.49-chk_retcodes.patch b/tftp/patches/tftp-0.49-chk_retcodes.patch
deleted file mode 100644
index 6d63571d9..000000000
--- a/tftp/patches/tftp-0.49-chk_retcodes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tftp-hpa-0.49/tftpd/tftpd.c.chk_retcodes tftp-hpa-0.49/tftpd/tftpd.c
---- tftp-hpa-0.49/tftpd/tftpd.c.chk_retcodes	2009-01-15 15:28:50.000000000 +0100
-+++ tftp-hpa-0.49/tftpd/tftpd.c	2009-01-15 15:31:36.000000000 +0100
-@@ -932,7 +932,10 @@ int main(int argc, char **argv)
-             exit(EX_OSERR);
-         }
- #ifdef __CYGWIN__
--        chdir("/");             /* Cygwin chroot() bug workaround */
-+				if (chdir("/") < 0) {			/* Cygwin chroot() bug workaround */
-+					syslog(LOG_ERR, "chroot: %m");
-+					exit(EX_OSERR);
-+				}
- #endif
-     }
- #ifdef HAVE_SETREGID
diff --git a/tftp/patches/tftp-0.49-cmd_arg.patch b/tftp/patches/tftp-0.49-cmd_arg.patch
deleted file mode 100644
index 2b9023a50..000000000
--- a/tftp/patches/tftp-0.49-cmd_arg.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -up tftp-hpa-0.49/config.h.cmd_arg tftp-hpa-0.49/config.h
---- tftp-hpa-0.49/config.h.cmd_arg	2010-04-19 15:29:10.567331454 +0200
-+++ tftp-hpa-0.49/config.h	2010-04-20 07:33:03.133232772 +0200
-@@ -291,6 +291,7 @@ typedef int socklen_t;
- /* Prototypes for libxtra functions */
- 
- void *xmalloc(size_t);
-+void *xrealloc(void *, size_t);
- char *xstrdup(const char *);
- 
- #ifndef HAVE_BSD_SIGNAL
-diff -up tftp-hpa-0.49/configure.in.cmd_arg tftp-hpa-0.49/configure.in
---- tftp-hpa-0.49/configure.in.cmd_arg	2008-10-21 00:08:31.000000000 +0200
-+++ tftp-hpa-0.49/configure.in	2010-04-19 11:05:12.387340698 +0200
-@@ -152,6 +152,7 @@ OBJROOT=`pwd`
- 
- XTRA=false
- PA_SEARCH_LIBS_AND_ADD(xmalloc, iberty)
-+PA_SEARCH_LIBS_AND_ADD(xrealloc, iberty)
- PA_SEARCH_LIBS_AND_ADD(xstrdup, iberty)
- PA_SEARCH_LIBS_AND_ADD(bsd_signal, bsd, bsdsignal)
- PA_SEARCH_LIBS_AND_ADD(getopt_long, getopt, getopt_long)
-diff -up tftp-hpa-0.49/lib/xrealloc.c.cmd_arg tftp-hpa-0.49/lib/xrealloc.c
---- tftp-hpa-0.49/lib/xrealloc.c.cmd_arg	2010-04-19 11:05:12.387340698 +0200
-+++ tftp-hpa-0.49/lib/xrealloc.c	2010-04-19 11:05:12.387340698 +0200
-@@ -0,0 +1,20 @@
-+/*
-+ * xrealloc.c
-+ *
-+ * Simple error-checking version of realloc()
-+ *
-+ */
-+
-+#include "config.h"
-+
-+void *xrealloc(void *ptr, size_t size)
-+{
-+    void *p = realloc(ptr, size);
-+
-+    if (!p) {
-+        fprintf(stderr, "Out of memory!\n");
-+        exit(128);
-+    }
-+
-+    return p;
-+}
-diff -up tftp-hpa-0.49/tftp/main.c.cmd_arg tftp-hpa-0.49/tftp/main.c
---- tftp-hpa-0.49/tftp/main.c.cmd_arg	2008-10-21 00:08:31.000000000 +0200
-+++ tftp-hpa-0.49/tftp/main.c	2010-04-19 11:05:12.389329337 +0200
-@@ -89,11 +89,14 @@ int connected;
- const struct modes *mode;
- #ifdef WITH_READLINE
- char *line = NULL;
-+char *remote_pth = NULL;
- #else
- char line[LBUFLEN];
-+char remote_pth[LBUFLEN];
- #endif
- int margc;
--char *margv[20];
-+char **margv;
-+int sizeof_margv=0;
- const char *prompt = "tftp> ";
- sigjmp_buf toplevel;
- void intr(int);
-@@ -379,6 +382,10 @@ static void getmoreargs(const char *part
-         free(line);
-         line = NULL;
-     }
-+    if (remote_pth) {
-+        free(remote_pth);
-+        remote_pth = NULL;
-+    }
-     line = xmalloc(len + elen + 1);
-     strcpy(line, partial);
-     strcpy(line + len, eline);
-@@ -535,6 +542,7 @@ void put(int argc, char *argv[])
-     int fd;
-     int n, err;
-     char *cp, *targ;
-+    long dirlen, namelen, lastlen=0;
- 
-     if (argc < 2) {
-         getmoreargs("send ", "(file) ");
-@@ -588,9 +596,22 @@ void put(int argc, char *argv[])
-     }
-     /* this assumes the target is a directory */
-     /* on a remote unix system.  hmmmm.  */
--    cp = strchr(targ, '\0');
--    *cp++ = '/';
-+    dirlen = strlen(targ)+1;
-+#ifdef WITH_READLINE
-+    remote_pth = xmalloc(dirlen+1);
-+#endif
-+    strcpy(remote_pth, targ);
-+    remote_pth[dirlen-1] = '/';
-+    cp = remote_pth + dirlen;
-     for (n = 1; n < argc - 1; n++) {
-+#ifdef WITH_READLINE
-+        namelen = strlen(tail(argv[n])) + 1;
-+        if (namelen > lastlen) {
-+            remote_pth = xrealloc(remote_pth, dirlen + namelen + 1);
-+            cp = remote_pth + dirlen;
-+            lastlen = namelen;
-+        }
-+#endif
-         strcpy(cp, tail(argv[n]));
-         fd = open(argv[n], O_RDONLY | mode->m_openflags);
-         if (fd < 0) {
-@@ -600,9 +621,9 @@ void put(int argc, char *argv[])
-         }
-         if (verbose)
-             printf("putting %s to %s:%s [%s]\n",
--                   argv[n], hostname, targ, mode->m_mode);
-+                   argv[n], hostname, remote_pth, mode->m_mode);
-         sa_set_port(&peeraddr, port);
--        tftp_sendfile(fd, targ, mode->m_mode);
-+        tftp_sendfile(fd, remote_pth, mode->m_mode);
-     }
- }
- 
-@@ -801,6 +822,10 @@ static void command(void)
-             free(line);
-             line = NULL;
-         }
-+        if (remote_pth) {
-+            free(remote_pth);
-+            remote_pth = NULL;
-+        }
-         line = readline(prompt);
-         if (!line)
-             exit(0);            /* EOF */
-@@ -872,7 +897,13 @@ struct cmd *getcmd(char *name)
- static void makeargv(void)
- {
-     char *cp;
--    char **argp = margv;
-+    char **argp;
-+
-+    if (!sizeof_margv) {
-+        sizeof_margv = 20;
-+        margv = xmalloc(sizeof_margv * sizeof(char *));
-+    }
-+    argp = margv;
- 
-     margc = 0;
-     for (cp = line; *cp;) {
-@@ -882,6 +913,11 @@ static void makeargv(void)
-             break;
-         *argp++ = cp;
-         margc += 1;
-+        if (margc == sizeof_margv) {
-+            sizeof_margv += 20;
-+            margv = xrealloc(margv, sizeof_margv * sizeof(char *));
-+            argp = margv + margc;
-+        }
-         while (*cp != '\0' && !isspace(*cp))
-             cp++;
-         if (*cp == '\0')
diff --git a/tftp/patches/tftp-doc.patch b/tftp/patches/tftp-doc.patch
deleted file mode 100644
index 20352c9f6..000000000
--- a/tftp/patches/tftp-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- tftp-hpa-5.2/tftp/main.c	2013-04-19 09:34:09.737410319 +0200
-+++ tftp-hpa-5.2/tftp/main.c	2013-04-19 09:42:53.559946374 +0200
-@@ -195,9 +195,11 @@
- {
-     fprintf(stderr,
- #ifdef HAVE_IPV6
--            "Usage: %s [-4][-6][-v][-l][-m mode] [host [port]] [-c command]\n",
-+            "Usage: %s [-4][-6][-v][-V][-l][-m mode] [-R port:port] "
-+			"[host [port]] [-c command]\n",
- #else
--            "Usage: %s [-v][-l][-m mode] [host [port]] [-c command]\n",
-+            "Usage: %s [-v][-V][-l][-m mode] [-R port:port] "
-+			"[host [port]] [-c command]\n",
- #endif
-             program);
-     exit(errcode);
---- tftp-hpa-5.2/tftpd/tftpd.8.in	2012-11-20 09:43:46.000000000 +0100
-+++ tftp-hpa-5.2/tftpd/tftpd.8.in	2013-04-19 09:44:37.399057279 +0200
-@@ -155,7 +155,7 @@
- .B utimeout
- option is negotiated.  The default is 1000000 (1 second.)
- .TP
--\fB--mapfile\fP \fIremap-file\fP, \fB-m\fP \fIremap-file\fP
-+\fB--map-file\fP \fIremap-file\fP, \fB-m\fP \fIremap-file\fP
- Specify the use of filename remapping.  The
- .I remap-file
- is a file containing the remapping rules.  See the section on filename
diff --git a/tftp/patches/tftp-hpa-0.39-tzfix.patch b/tftp/patches/tftp-hpa-0.39-tzfix.patch
deleted file mode 100644
index ded02efaa..000000000
--- a/tftp/patches/tftp-hpa-0.39-tzfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up tftp-hpa-0.49/tftpd/tftpd.c.tzfix tftp-hpa-0.49/tftpd/tftpd.c
---- tftp-hpa-0.49/tftpd/tftpd.c.tzfix	2008-10-20 18:08:31.000000000 -0400
-+++ tftp-hpa-0.49/tftpd/tftpd.c	2008-11-25 11:45:27.000000000 -0500
-@@ -350,6 +350,14 @@ int main(int argc, char **argv)
-     const char *pidfile = NULL;
-     u_short tp_opcode;
- 
-+    time_t my_time = 0;
-+    struct tm* p_tm;
-+    char envtz[10];
-+    my_time = time(NULL);
-+    p_tm = localtime(&my_time);
-+    snprintf(envtz, sizeof(envtz) - 1, "UTC%+d", (p_tm->tm_gmtoff * -1)/3600);
-+    setenv("TZ", envtz, 0);
-+
-     /* basename() is way too much of a pain from a portability standpoint */
- 
-     p = strrchr(argv[0], '/');
diff --git a/tftp/patches/tftp-hpa-0.49-fortify-strcpy-crash.patch b/tftp/patches/tftp-hpa-0.49-fortify-strcpy-crash.patch
deleted file mode 100644
index e9b70d471..000000000
--- a/tftp/patches/tftp-hpa-0.49-fortify-strcpy-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN tftp-hpa-0.49.orig/tftp/tftp.c tftp-hpa-0.49/tftp/tftp.c
---- tftp-hpa-0.49.orig/tftp/tftp.c	2008-10-20 18:08:31.000000000 -0400
-+++ tftp-hpa-0.49/tftp/tftp.c	2009-08-05 09:47:18.072585848 -0400
-@@ -279,15 +279,16 @@
-             struct tftphdr *tp, const char *mode)
- {
-     char *cp;
-+    size_t len;
- 
-     tp->th_opcode = htons((u_short) request);
-     cp = (char *)&(tp->th_stuff);
--    strcpy(cp, name);
--    cp += strlen(name);
--    *cp++ = '\0';
--    strcpy(cp, mode);
--    cp += strlen(mode);
--    *cp++ = '\0';
-+    len = strlen(name) + 1;
-+    memcpy(cp, name, len);
-+    cp += len;
-+    len = strlen(mode) + 1;
-+    memcpy(cp, mode, len);
-+    cp += len;
-     return (cp - (char *)tp);
- }
- 
diff --git a/tftp/patches/tftp-hpa-0.49-stats.patch b/tftp/patches/tftp-hpa-0.49-stats.patch
deleted file mode 100644
index b6c9d05c9..000000000
--- a/tftp/patches/tftp-hpa-0.49-stats.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up tftp-hpa-0.49/tftp/tftp.c.stats tftp-hpa-0.49/tftp/tftp.c
---- tftp-hpa-0.49/tftp/tftp.c.stats	2011-01-03 15:38:34.217918067 +0100
-+++ tftp-hpa-0.49/tftp/tftp.c	2011-01-03 15:38:37.498917014 +0100
-@@ -400,8 +400,8 @@ static void printstats(const char *direc
- {
-     double delta;
- 
--    delta = (tstop.tv_sec + (tstop.tv_usec / 100000.0)) -
--        (tstart.tv_sec + (tstart.tv_usec / 100000.0));
-+    delta = (tstop.tv_sec + (tstop.tv_usec / 1000000.0)) -
-+        (tstart.tv_sec + (tstart.tv_usec / 1000000.0));
-     if (verbose) {
-         printf("%s %lu bytes in %.1f seconds", direction, amount, delta);
-         printf(" [%.0f bit/s]", (amount * 8.) / delta);
diff --git a/tftp/patches/tftp-hpa-5.2-pktinfo.patch b/tftp/patches/tftp-hpa-5.2-pktinfo.patch
deleted file mode 100644
index d1fa75c3f..000000000
--- a/tftp/patches/tftp-hpa-5.2-pktinfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up tftp-hpa-5.2/tftpd/recvfrom.c.test tftp-hpa-5.2/tftpd/recvfrom.c
---- tftp-hpa-5.2/tftpd/recvfrom.c.test	2011-12-11 23:13:52.000000000 +0100
-+++ tftp-hpa-5.2/tftpd/recvfrom.c	2012-01-04 10:05:17.852042256 +0100
-@@ -149,16 +149,16 @@ myrecvfrom(int s, void *buf, int len, un
- 
-     /* Try to enable getting the return address */
- #ifdef IP_RECVDSTADDR
--    if (from->sa_family == AF_INET)
-+    if (from->sa_family == AF_INET || !from->sa_family)
-         setsockopt(s, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
- #endif
- #ifdef IP_PKTINFO
--    if (from->sa_family == AF_INET)
-+    if (from->sa_family == AF_INET || !from->sa_family)
-         setsockopt(s, IPPROTO_IP, IP_PKTINFO, &on, sizeof(on));
- #endif
- #ifdef HAVE_IPV6
- #ifdef IPV6_RECVPKTINFO
--    if (from->sa_family == AF_INET6)
-+    if (from->sa_family == AF_INET6 || !from->sa_family)
-         setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on));
- #endif
- #endif
diff --git a/tftp/systemd/tftp.service b/tftp/systemd/tftp.service
deleted file mode 100644
index b8484f13f..000000000
--- a/tftp/systemd/tftp.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Tftp Server
-
-[Service]
-ExecStart=/usr/sbin/in.tftpd -u tftp -s /var/lib/tftpboot
-StandardInput=socket
diff --git a/tftp/systemd/tftp.socket b/tftp/systemd/tftp.socket
deleted file mode 100644
index 8764c1de3..000000000
--- a/tftp/systemd/tftp.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Tftp Server Activation Socket
-
-[Socket]
-ListenDatagram=69
-
-[Install]
-WantedBy=sockets.target
diff --git a/tftp/tftp.nm b/tftp/tftp.nm
deleted file mode 100644
index a9e7fea00..000000000
--- a/tftp/tftp.nm
+++ /dev/null
@@ -1,125 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = tftp
-version    = 5.2
-release    = 1
-
-groups     = Applications/Network
-url        = http://www.kernel.org/pub/software/network/tftp/
-license    = BSD
-summary    = Client and server for the Trivial File Transfer Protocol (TFTP).
-
-description
-	The Trivial File Transfer Protocol (TFTP) is normally used only for
-	booting diskless workstations.
-end
-
-thisapp = %{name}-hpa-%{version}
-
-source_dl  = http://www.kernel.org/pub/software/network/tftp/tftp-hpa/
-
-
-build
-	requires
-		autoconf
-		readline-devel
-		shadow-utils
-	end
-
-	prepare_cmds
-		autoreconf -vfi
-		%{create_user}
-	end
-
-	make_install_targets += \
-		INSTALLROOT=%{BUILDROOT}
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}%{sharedstatedir}/tftpboot
-		chown tftp:tftp %{BUILDROOT}%{sharedstatedir}/tftpboot
-	end
-end
-
-create_user
-	getent group tftp >/dev/null || /usr/sbin/groupadd -r tftp
-	getent passwd tftp >/dev/null || /usr/sbin/useradd -r -g tftp \
-		-d %{sharedstatedir}/tftpboot -s /sbin/nologin tftp
-end
-
-packages
-	package %{name}
-		requires
-			%{name}-client = %{thisver}
-			%{name}-server = %{thisver}
-		end
-	end
-
-	package %{name}-client
-		summary = A client programm for the Trivial File Transfer Protocol (TFTP).
-		description
-			The tftp-client package provides the user
-			interface for TFTP, which allows users to transfer files to and from a
-			remote machine.  This program and TFTP provide very little security,
-			and should not be enabled unless it is expressly needed.
-		end
-
-		files
-			%{bindir}/tftp
-			%{mandir}/man1/tftp*
-		end
-	end
-
-	package %{name}-server
-		summary = A Trivial File Transfer Protocol (TFTP) server.
-		description
-			The tftp-server package provides the
-			server for TFTP, which allows users to transfer files to and from a
-			remote machine. TFTP provides very little security, and should not be
-			enabled unless it is expressly needed.
-		end
-
-		prerequires += \
-			shadow-utils
-
-		datafiles
-			%{sharedstatedir}/tftpboot
-		end
-
-		files
-			%{sbindir}/in.tftpd
-			%{mandir}/man8/*
-			%{unitdir}/tftp.*
-			%{sharedstatedir}/tftpboot
-		end
-
-		script prein
-			%{create_user}
-		end
-
-		script postin
-			systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script preun
-			systemctl --no-reload disable tftp.socket >/dev/null 2>&1 || :
-			systemctl stop tftp.socket >/dev/null 2>&1 || :
-			systemctl stop tftp.service >/dev/null 2>&1 || :
-		end
-
-		script postun
-			systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script postup
-			systemctl daemon-reload >/dev/null 2>&1 || :
-			systemctl try-restart tftp.service >/dev/null 2>&1 || :
-		end
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index 401c48885..45c88d457 100644
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -6,8 +6,6 @@
 name       = ulogd2
 version    = 2.0.8
 release    = 1
-epoch      = 1
-
 thisapp    = ulogd-%{version}
groups     = Networking/Statistics
diff --git a/upower/upower.nm b/upower/upower.nm
deleted file mode 100644
index 57e215506..000000000
--- a/upower/upower.nm
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = upower
-version    = 0.9.2
-release    = 2
-
-groups     = System/Libraries
-url        = http://upower.freedesktop.org/
-license    = GPLv2+
-summary    = Power Management Service.
-
-description
-	udisks provides a daemon, D-Bus API and command line tools
-	for managing disks and storage devices.
-end
-
-source_dl  = http://upower.freedesktop.org/releases/
-
-build
-	requires
-		bison
-		dbus-devel
-		dbus-glib-devel
-		glib2-devel
-		gettext
-		intltool
-		perl-XML-Parser
-		pkg-config
-		polkit-devel
-	end
-
-	configure_options += \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var
-end
-
-packages
-	package %{name}
-		requires
-			udev
-			util-linux
-		end
-	end
-
-	package %{name}-libs
-		template LIBS
-	end
-
-	package %{name}-devel
-		template DEVEL
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index a0038fef5..eb6944f88 100644
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -4,7 +4,6 @@
 ###############################################################################
name       = usbutils
-epoch      = 1
 version    = 014
 release    = 4
diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index 0c2ce15c4..101fb5959 100644
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -5,7 +5,7 @@
name       = wpa_supplicant
 version    = 2.9
-release    = 1
+release    = 1.1
groups     = Sytem/Base
 url        = https://w1.fi/wpa_supplicant/
@@ -69,7 +69,7 @@ end
packages
    package %{name}
-		requires += network >= 1:005
+		requires += network >= 005
script postin
    		/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
hooks/post-receive
--
IPFire 3.x development tree

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3658e16a21e92e06f2c51ff8fbfa2248dcfba9f0