[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0e48c84c42407fc326bafba6c6166a38a0c3a3a4 - IPFire-SCM

9 May 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 2.x development tree".
The branch, master has been updated
       via  0e48c84c42407fc326bafba6c6166a38a0c3a3a4 (commit)
       via  3b926424278d9f0d2f89c9684b8d7bbf86de858c (commit)
       via  dc871930f600677514cefca5fb7befa4e809442e (commit)
       via  2b5253bbbb3acb6f276040ffe095f7380ea3991d (commit)
       via  3706e0a5b34f65baa7b6bfaad38ac6bd0496d50c (commit)
       via  85d570843ef7b4b1a428dadf93e5a2a8410348ca (commit)
       via  3cdb83939bc69d7e3d4ca911361d84f54301f4b8 (commit)
       via  4b5d1f3001e5f47399d3c1a6eabcd18c1a318996 (commit)
       via  0f506a130c67a67c833530b2b8ad44f811df5ac6 (commit)
       via  cd521e78b815e84c31683b3cc2ec085f6f97d939 (commit)
       via  c7105c6e66bdc9ed1c42d4248926c0e7b654b414 (commit)
       via  d79814485fba7eb410497ec8e904dc717ef4a065 (commit)
       via  fd1e3e3c7417c14809b1fbbf8f7620c99053009b (commit)
       via  0ab31dfdb1b3fce7aa4f3db0373de8808fa02acb (commit)
       via  3e2e9c159389db191989ad2cb0553d5b9a2bae9f (commit)
       via  822076e0c2109c4a59a93be9c2592f8475726c87 (commit)
       via  40811ff383dc358e77afa9c482199336a4ffdca6 (commit)
       via  99a79bcbd89de07e108b836fe7d19bd26aeb02c3 (commit)
       via  568215c84bb52ad09d7df43492eb61d99e343ac3 (commit)
       via  5ecf056d52b007a413db0477254a3600fef1d81c (commit)
       via  b2f707cb025bccf4417b0848e1140fc610e76fd6 (commit)
       via  b6fe8ee88dafb5ebb02a787b11da602de016969d (commit)
       via  5b1299f71717a59f50ea5b7aa7796dfe27afd080 (commit)
       via  68725035744de0253f19e0b3550799799a44f80d (commit)
       via  4d4f5df0c8b4e212cec1fd1206616308584df18e (commit)
       via  e47f7c8295ef92b6ee40ce88154d4449c4b29f19 (commit)
       via  c78f6e33f8415bdefb5be953032eba111d3585ff (commit)
       via  6f3da00c53ac58dcbb833740b7a6f069166ee98f (commit)
       via  401a2f3db0303e404987d06890296f23966c8ae8 (commit)
       via  c36610e051b931b4ae497b633ca41713e03d53e7 (commit)
       via  3bd471b8203b878e9e270d833d49e08921c584e3 (commit)
       via  05a1fe1362b633b82b696a88801bb29fb1070872 (commit)
       via  ce386d20ab8c5eea847038fb83dc8396bbbe2c04 (commit)
       via  a694737a131fccbc791ab70693a0da8b1c5d550b (commit)
       via  d97295c680de05d7528471077115a46f3a48f600 (commit)
       via  98b761a5576204b9cd0c8a441f2eeb4d530cadd6 (commit)
       via  eac8a6fbb86b8befb00adc318d0675a1c4748ed5 (commit)
       via  66c022d88741a79228575189aadbd106abe668f6 (commit)
       via  944454beecf07808814a3cd9271883e1a4b2e22b (commit)
       via  69a72eb43924e14164d2a5ec142e1f544219198b (commit)
       via  1d683be87622e80b3c672b252c89c9d6c376bed5 (commit)
       via  45bae9ac918b3ff937a8805506f3cf2084ee214b (commit)
       via  e1ea4c0ad2ccda7ecd09c581203f7ebce12f6c5c (commit)
       via  2784c87b0e5978a6c49c814625a7e949298b57bb (commit)
       via  a260900c8d160192adc96234bb8a125f69b28c30 (commit)
       via  64567c94232a7f015b07d5a280f63fd7c6df696d (commit)
       via  52209fedab107907a1a8225b9cdc9edf4c54d251 (commit)
       via  d4afd45e1138adf32ef87c483224f387d6566cfe (commit)
       via  1af975dcebb2892a13775d344109508e46bb0be4 (commit)
       via  01cb6d794baf9f19c47e4037e7e0bf3e7b7710f3 (commit)
       via  2a14689ba86fa0acc222c6bffdb911d674ce34f8 (commit)
       via  01eb9debf3bc28880912b6596ad6cb659b9c3a3b (commit)
       via  e1e94ae75b5cb4835d9a35a7c054db66778a8114 (commit)
       via  53736cfe67a21848b095746b123119c96b2d5dac (commit)
       via  908a25c644c1d1dd87bc0dca8cc2698fb30c87a0 (commit)
       via  f5b9dcd1ccc930255aca4992023097cf1ef496cf (commit)
       via  eecf8445e23a5d9061c18c4bee88090a3a47e0ec (commit)
       via  f4d1ada17054d4d0f08c270ce50dfc90f917307c (commit)
       via  0f907074168a0c7db05b9d25e48999a05a489ac9 (commit)
       via  f61ced49e9b2452bee1448f3a42a050c793194a4 (commit)
       via  56b9ee7e7e63fffba6bbe09c11bd57aa1df88d4b (commit)
       via  b314ad9e78d333109a7e8c43d4461d13ccbaea19 (commit)
       via  efa6f1e2dc1f7d9c93444b70ca1d19cf78d96a11 (commit)
       via  585ab8755129e0cccfb48c2e1fabdaaaf1f39c0f (commit)
       via  d9538fbcc4a5f2547a3cedab9b5d2aad307cd2b3 (commit)
       via  fab835851530b6dafacc16f43c4488ba597376c4 (commit)
       via  535607ac934efbd27cb11c8c201dc528f53bac9e (commit)
       via  3661b4cb467232082bed7ceebe0cff1882c38d5d (commit)
       via  810dbe76aeda67dd339e3150a7dede4af07c1a08 (commit)
       via  85a250d6369357d8405a24dd6ccff22a04c5525d (commit)
       via  a2a05a470649a6ade7d00d82436c2834ababe7ab (commit)
       via  9efdbe103b8d98b80125407443e906373c534269 (commit)
       via  8b97a537f5f9e798a1ab307b2c32bd9a8b0f6913 (commit)
       via  2f908d96489d6de9f1acc783c23f7fbe0057ed1d (commit)
       via  f02dc11a38c1144fcef322cf34fc6417aae4355f (commit)
       via  3421b1abd824d680c68948a83123469737b1bbfa (commit)
       via  7481abecc3ae49406b8312af1dff521755f72428 (commit)
       via  8f855e933d52e7d8eca1cbfe947ab56ee9202232 (commit)
       via  9d5c3d36e08f4b459e17534c40cbbf3dd07d1d57 (commit)
       via  b7d80a2767f42a6bb8df65084f27a34803ee77de (commit)
       via  8de58edc738a0405eda7f691bab1c4fdaf02f83f (commit)
       via  5a48b4a23b66c25c63f1bc503f54c6babac8794a (commit)
       via  7138d1747ced95690e0acd76f7370d34ae3a399b (commit)
       via  ca98d29a86a6eb9734d60eb7fb334395be0a29bd (commit)
       via  0a1d567ce82a6e8f1d103d9481ebf67088b8591c (commit)
       via  c4f3bb4b08f5ee743cf984770d5f205cd75a7ec3 (commit)
       via  174778b20266c2c24f15784e090e7e8d10118642 (commit)
       via  8596273dca625444ef1b28a7a7e61a1354c23c47 (commit)
       via  94e680c36d2f16577e16dc7748721c990efde492 (commit)
       via  ca0458ce1577f5793acaec9e25167b329fec43a3 (commit)
       via  4b113aa68ebc522686c4c70155d6c69507d4d7d1 (commit)
       via  9ee219315c2eb419126afd621e6664c6aefc36cb (commit)
       via  b4294a6a0959127003f4c2cb99887f3e64dc8c09 (commit)
       via  4b502cf0c2d4388d5b29c5656a35e75e34b4fafe (commit)
       via  ff76241b271dc7fdceb7431c95cee299678c90f8 (commit)
       via  843314ba98e0d6b8ab3d1760f49f256ff5cebb61 (commit)
       via  9a39b090cc292ac815c912c198935a20e742959f (commit)
       via  3d767c8aad82ac8a4d8b164569136a138e19d9cf (commit)
       via  1a9e81ce7f999628536c5fa33928f3e79a7d84cc (commit)
       via  504fb53bcc1eb03af782d800b77ee6a1b6e4077b (commit)
       via  91a8664b662ed506a7896b638c6d9d140485a5aa (commit)
       via  b7a2d742b44aaac6b56ad73cbdab860debad345d (commit)
       via  3098182fa7145490c4f1ee00db17f64e04c2299b (commit)
       via  249d796b4b873fde6e4bf270b7028afe8073abc2 (commit)
       via  aa2ab8c40b1cf5dcdcbe3c4ac9d44b8e0997db7d (commit)
       via  2b9af93313e1f6f0a782a94131e87237debc42b7 (commit)
       via  154dfcb7a2ec7ab399f8ca5393987bfa8defefa9 (commit)
       via  52224df18d06515d17b6dd7e1d309364d38b4335 (commit)
       via  f86e23906ee01f5b9c9b4eea84957b78481e0048 (commit)
       via  854241e108ecf798a43fb9b30a53f1119783c149 (commit)
       via  52f8118635b64f1edf5bfdd92d1351f5ec0959af (commit)
       via  d6fc413aea8c863587a4793b320ab2db6c29eb5d (commit)
       via  b8ffb101f86d40c68482c8a305b760a382036d78 (commit)
       via  28fdd8ede6b241144e1aa3a05ac2c5ac82d56ae3 (commit)
       via  0469187ca03c808f23521caf5e4749a41d3a95b2 (commit)
       via  3a5ba6cf97322c9c931b841d72a3642109b2718c (commit)
       via  0487d6a5754fb2121dfcd61ca98d6e3a902cf0a9 (commit)
       via  b26c72d569ebf1ee00f54e4d6363f5cbfd59abf3 (commit)
       via  ab473dd36372980a7603ece7f1c766fd848d74f2 (commit)
       via  cdf0522ec2b944ce0b6aac5d6baa49c96930d660 (commit)
       via  7b5f057a485be990445fe0d5448abdd3946bca84 (commit)
       via  e8e8b6ae29176e605143c8927ba402078cdc4f54 (commit)
       via  8b84073efb4113afe48e6ca12e1c04ed934bd855 (commit)
       via  2e9899036a64e4d1fcccedb1a2eeefca0af7a7e2 (commit)
       via  6dd63f5e7f33d2948132f7412f75cd4473e7b148 (commit)
       via  ac8da780aa611e2b86e49ec02a7d0c4c4b9bfc26 (commit)
       via  2a85fc7a124c918d6b431c04e255e03f364cc84b (commit)
       via  fd4c9f98b8eba436ae16a03b2487ea308aaa94e7 (commit)
       via  1b16f712c6895c462973f4c021be67cd80aabd8f (commit)
       via  22ceda82b63226570ae7a79da99cec84855d8f25 (commit)
       via  f5ebb58ab484b0d966f951e7aaf9dd6eb0611418 (commit)
       via  5d18c0a5704ae55ae1eab6734574b9c8b3678235 (commit)
       via  c35d3ac6a1569c1a3b7aae4981396ed6faed8f9f (commit)
       via  df326d08fe914dcffa5779f59ed34c247a279282 (commit)
       via  a21c2a4cc4cd48f31fb9396065cedb0802994038 (commit)
       via  b0aa87ac73a1d92579b2659020b8b3e8c915226d (commit)
       via  ffe6661c0b892eb9387a8d0d6059f560db919e84 (commit)
       via  87dcb206d025556d9c939fd7f003ad75ff93b61f (commit)
       via  bad8659d80520b2cdbd043efa0b5b15d8580c2c5 (commit)
       via  c04309ef012b19e3bdc98384cad28af407cc62ac (commit)
       via  2420f4775b77f4692cfc1625c2d7318fb5e1876f (commit)
       via  c13060fd4cda278ea79dd8d547291dbbc31840c1 (commit)
       via  a04b39daa75022e5e6e12da32398bee71b73b150 (commit)
       via  28894b78260b8194ff1df4ef0700c5d21031a8d4 (commit)
       via  2f4148ccd3cab052c39a6eb77314bd789f0abd9c (commit)
       via  7a981d94cb2c3e48ecaf07c506c8353a2c839d79 (commit)
       via  018f80c6cd609184b72c08c1967b143a0637cc7f (commit)
       via  7554e857eebdd6593f986b2a0b840e73db65aa19 (commit)
       via  420e8a85d0141198a04af0cb8000739c2bc4a108 (commit)
       via  a808de4c17fea4453817d6dde9de7a0581f3e60d (commit)
       via  ffa5629d06f3ee08ba49ecf6ef6c298cc98d91c4 (commit)
       via  701e63c222f7e09cd27c8198c02ce0279627c7d8 (commit)
       via  30f306a3e28d63d63e126b709d8866cfc9b80803 (commit)
       via  c2ead0c78ddce8e82969ceaab172d3f6bc5e84d4 (commit)
       via  af8c9da4e525c3d0c896398d33e8e891180fc163 (commit)
       via  e56de75e336c84784d46c16f715950b088080adb (commit)
       via  166efe4cb5c5ccd8888ce521857b36b3169b1f5a (commit)
       via  1f326847a36c80b4c65952d06687bf6819a2d6e8 (commit)
       via  adce5b1c8fc21916c77d7e8a40cbed2baac1f2a2 (commit)
       via  615fd78f9294b2843e396f3e70b2181d8491725d (commit)
       via  c8adaee1958ed0c382341e08949d5cb88bd58c7e (commit)
       via  1febad2ad41578d3e77195929076e3cbbc28a89f (commit)
       via  07dc722f611685c6018630f927ad4b65f44988d1 (commit)
       via  e41ee3e0f24cb89b20a758e2281531ed76577ef4 (commit)
       via  c62121c7e4ef9ec5688e16b04ef59e21276e1bd0 (commit)
       via  782418e226434fbd7fbd236699a45bce328dcd6d (commit)
       via  0676b7b777e7d93d80103ca463567b89c8344841 (commit)
       via  9196f2a4483ca9a12485c9d511d9946ccc00a0d7 (commit)
       via  8b27f672f80f2364fd28b13466d3a555b5c076f1 (commit)
       via  0312f9294255755d4a94dcf3fd4b455e25e0324c (commit)
       via  aee369fea30e210bf1088e88116610f8ce970a4b (commit)
       via  12fbbc61e568b208f007df3b02c28b0bb6fe14e7 (commit)
       via  2e68dcd6eb10cccda976d2dfe1f8204cb066eecb (commit)
       via  bdd2566f7bbda478769006871c6f515fc6230940 (commit)
       via  76227aaf7181296f58969a00b91ad2c80d800cfa (commit)
       via  f9563f97c63e0c5c4249cea00ddeb82f5e2450f4 (commit)
       via  75363dc20ffbb2aa17518b757eec2a4e09f9be65 (commit)
       via  7eeeb60373dd381db51505002b3de89d7c33f948 (commit)
       via  a790b010770eb5839055c117f71e44bc9b8d3538 (commit)
       via  dba994e86f185585e656c0fa5dc5c2c5f6b15116 (commit)
       via  98c7df65620a424c1980730bb6118098a685f1ea (commit)
       via  40556f0946c26163d852d973b71f2818ad555198 (commit)
       via  b9758326128d343afe0a80db8aef7b308a9f4ba9 (commit)
       via  e9fecdc0397044c268c8c7ef34bcd924a2daa4a7 (commit)
       via  441e92695515b32beafb009e513b11661eaa210d (commit)
       via  4d2a20f407110fa91b2ceb9f38c6c0bae1add405 (commit)
       via  b3ae0e6695fb3e9dbffa6f15a66c6fdc4a62af23 (commit)
       via  159f9214a6852328f4edb327b33d2268ac4bac3f (commit)
       via  75072c7702208179b392570485d5b301673525a0 (commit)
       via  0f447b470a929bb8f565e4cc5eb2697f074ddd7a (commit)
       via  5e792900bc14070f877e7d2c1e406bebd60fac19 (commit)
       via  f56b5ce8af9a71296bd20c7b47208781b1574caa (commit)
       via  b101f8e842f221113377f69b6a0471ffd24d15e7 (commit)
       via  c516ba3b01b93cd4d549cf92b70f4eb58fd95d20 (commit)
       via  31e85ef336ccfc2abb724d08e497c40c55b52762 (commit)
       via  c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72 (commit)
       via  38cf581405290ac9781793e8785cbdf0e210dced (commit)
       via  eaf5364413ab44dff0640396653fef4e39ace4d7 (commit)
       via  6bef05b9ed1eacb57f66f565def49bbfe6400946 (commit)
       via  7c4b8df7163e60bc05867531e3d2a7001eb2af59 (commit)
       via  da5c7c24f022751ff4d8dfb68c65d0e60801a626 (commit)
       via  b3dbe9ef6462b90198f969dcf42bb17f9c4b427f (commit)
       via  7bc15b982c7ce3bd0b6d3cf752e1e42abba4fe1d (commit)
       via  f7eedacb43e81dd8acd031f1ed7680fd0bf3b2b9 (commit)
       via  5bad33e9a4bae9e15979087df3420c30dd5afd6c (commit)
       via  00271ed769a64e309498c8c5ab2267c0e5982957 (commit)
       via  b645f7fc8675a9caa014b83dff6e7d012a4802c8 (commit)
       via  93af000b8b3f86008040cb5a62405b158c270fe7 (commit)
       via  d2bf4d377f698076e53a56a9784a0b70d8ed3388 (commit)
       via  0d99255c0614d0218912724b97f6cfdb4811a895 (commit)
       via  d44d4ccf34132b77c8cf3d4ace7eab99a4717a53 (commit)
       via  b75baeff28412bec16dd72e4251d24c371c3fd5d (commit)
       via  2e558477da7438d2bd79411279ae1502f044c787 (commit)
       via  a2c56ead7367995ff743cc5c75aec8c4fb195f83 (commit)
       via  a15c9b16b404bc1970fd016104560e8fd24b5edb (commit)
       via  c2eac6fcd4281834409700066b25061d15ca0d6c (commit)
       via  b570d35c0aff4c1d126be539bbb009830a1fbb7f (commit)
       via  4f513522feeb88a447a861d414eead6432ce784f (commit)
       via  c215cfd8873130362b0665696e06a79279f79abd (commit)
       via  70b1672d94f3f6c3cfe82bf65df65125df0b0014 (commit)
       via  9f7702544abc0a906d14ccdcf0e4b03239a8fc33 (commit)
       via  c00609ce56cab337d352e69599144683192dec8f (commit)
       via  2f154264a02a560b0ef4ff6777833330a110f2a4 (commit)
       via  39b5adb9404ae1b986e75437c4203752da8e9167 (commit)
       via  990d111d70b7f5276b5ff3b6729773f1066fcee7 (commit)
       via  149a3291df07c0b1ba0384b83509bb6a62a1eae2 (commit)
       via  a95bb24fe13e4e7837bfbf2e75e255f61985df7d (commit)
       via  6fd8dd43b63d32acd119c06682bb19a2ee10966d (commit)
       via  77be7ab63b0fb4be4eeaa3059d7860ab3a701729 (commit)
       via  54fe871c8305649b00dbd7e67bb68ccfc4c43f7d (commit)
       via  9c4e7e3b4956eb886acaaf039d31b4a26dbece8c (commit)
       via  2a8de00c6fbc7625d385ebd04ad466ee8a024a12 (commit)
       via  bf1defce5579ed2db91d8fae4eb5549bc8471311 (commit)
       via  d6aead033a752d7965a3bed6c98dcf5d289707b2 (commit)
       via  88e01ab8553e9fc7d7d64d2de2b3e7f03c515177 (commit)
       via  00c31b29184dac2f5dadc21f9457b427a6ee3cb6 (commit)
       via  8841ef19685bcb148fdbcdd5c75b8eb96b2bb244 (commit)
       via  411cd0ca9c52b8a57fc288b2e992d13b3ffb1215 (commit)
       via  22ac250b37bbce6f56ea7920e55d5ca9a70f71d3 (commit)
       via  c002bd1f44f4ae0c33691be3896456dc8fbd221f (commit)
       via  6ac573bd8f4a1070e56769e1d74e8268ce8bf19f (commit)
       via  f09b8111142c5d27466d40668d1bd92f60003596 (commit)
       via  da8ca3b1216906d2f009ee6ee09131fa9c7e65de (commit)
       via  5806ff0cc5af4b361b3e32cb9e32d97d1f07d400 (commit)
       via  18ed846002a02d51a9122133dc2314cbb6d5b04e (commit)
       via  b86bd4f90adc4111db864cb8c1365a0d115a6675 (commit)
       via  e2e51070a18073d6087429daa6036f8eb510886e (commit)
       via  943ce57701d39352f51a6b09906cd945a421829c (commit)
       via  5dcca14b51b845a56ea3d99e1772f569a259e949 (commit)
       via  d258332f5bb062394f524dc485153d1841e55436 (commit)
       via  a6d966e1b79de3b052f92569f8f67b2b0753df49 (commit)
       via  9624937d9112b92cd735391bc15b3d7aef5bedd5 (commit)
       via  85967534723f8da3f6077814dc1f04f8ffb87874 (commit)
       via  adee5528664883cf48fd83873c978b51b11a7342 (commit)
       via  03216bd01c57262e1fa753ee4ed86cf050fc2212 (commit)
       via  758162bdc4f5d58cd10afd3f5efbdf7a3034b5b8 (commit)
       via  77c3824f285e7df66ce4a26be11dc336bc17633d (commit)
       via  faa8c62f6377cf6efa2b4edef1bbe77ede248867 (commit)
       via  44d41fd692ea695708c9cd51ecbf1fab2c7a5c28 (commit)
       via  1aaa347774a96e54daf26ff0762e63731e94a629 (commit)
       via  25652a75d485eaf500a60326373f66e56b902c70 (commit)
       via  30c4a9ff35117388ce3061ad44280967e1f4cf86 (commit)
       via  8d6714edc8c957214506bc483bc51edc06c94554 (commit)
       via  fa7663a1b594dcfd4bf542eb34a0869d5280e38f (commit)
       via  81144407528319a53fd0e8ea6852158c56ab7612 (commit)
       via  432b8ed21e0fa9c0ee4cca360dfd881348ba62a0 (commit)
       via  849fc8ea15a861a97f2e4d9c74804115fd15ecf5 (commit)
       via  443ad51d1c33550eafc62320865046510b7be8fc (commit)
       via  4c98be8bd21c95b9bb576e211e633bf507388234 (commit)
       via  9f353f8518b93fb1b4f76663088d36d321e8e3f2 (commit)
       via  2deba6bf4a6b866713ee000a91457802101fa893 (commit)
       via  794469483f26e514e13648a07483d19e2372ecb7 (commit)
       via  5a6c7bbe85a24faddf3c5f495d28a6ae6004514f (commit)
       via  518cbdd38905ed7909f7dfe218957cbc828a004c (commit)
       via  e246285af4c98647217fe96a48d794f959ebf3d8 (commit)
       via  e0eb5bc737fa807a574b4f5bf5c42977d55201fb (commit)
       via  ff780d8b3fa6b91fe9d8560684232381b81b5498 (commit)
       via  74019d3044117bc84646fec22e6a88833a131790 (commit)
       via  9a3f9c2b234457e6cfda54f7ee3746781ba503b5 (commit)
       via  c9c3eadbbffeee8a4f46365e917f619939dee9f1 (commit)
       via  d1f7542659cc7ecaaad551f813b0cb32a4734351 (commit)
       via  65e3aef5835a5e681bdd2af292e4c547c0d196d0 (commit)
       via  52a557a848c3f744278aec91d7e16ff1f5c24833 (commit)
       via  e26edcc1c7cac6235f7d60c527f980895fc3fe5a (commit)
       via  0f2c5211f6d8b183a8496ff208c20ca5ddc0c6c6 (commit)
       via  235e3e92a32a95339c177a94371b22c4bc0877a6 (commit)
       via  061391e77601082727e64e40dfa352f89be18ce1 (commit)
       via  f264adda359ec58846840e60d9743ca522fa4004 (commit)
       via  7d8956083b76babafef3c8e82fb32c4f243424c3 (commit)
       via  304ce130fd1e19de6a4faf9834784e0d821c02c1 (commit)
       via  e71804fb821acf84ef4ad06fcaf80dda6fe8af0c (commit)
       via  de1199e2a32e9f177ea237392b0ae22b5f8a2b87 (commit)
      from  c22d834ca84af6155eab7020c6b031e1e8c7e764 (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 0e48c84c42407fc326bafba6c6166a38a0c3a3a4
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun May 8 15:23:03 2022 +0200
suricata: Perform ruleset update every 12 hours.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3b926424278d9f0d2f89c9684b8d7bbf86de858c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 14:16:10 2022 +0000
Update rootfiles
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit dc871930f600677514cefca5fb7befa4e809442e
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 13:14:16 2022 +0000
Core Update 168: Ship pakfire.cgi
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 2b5253bbbb3acb6f276040ffe095f7380ea3991d
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:52 2022 +0200
pakfire.cgi: Cosmetic fixes
Add formatting to improve readability of dependencies list header.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit 3706e0a5b34f65baa7b6bfaad38ac6bd0496d50c
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:51 2022 +0200
pakfire.cgi: Discard tac stderr output
Prevents meaningless "broken pipe" messages in the httpd error log.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit 85d570843ef7b4b1a428dadf93e5a2a8410348ca
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:50 2022 +0200
pakfire.cgi: Implement Post/Redirect/Get pattern
Refreshing the Pakfire page may cause a command to be
    executed multiple times and induce odd errors.
This patch implements a HTTP 303 redirect after form processing,
    which causes the browser to discard the POST form data.
    Navigating backward or reloading the page now does not trigger
    multiple executions anymore.
Fixes: #12781
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit 3cdb83939bc69d7e3d4ca911361d84f54301f4b8
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:49 2022 +0200
pakfire.cgi: Notify user if Pakfire is already performing a task
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit 4b5d1f3001e5f47399d3c1a6eabcd18c1a318996
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:48 2022 +0200
pakfire.cgi: Show error and log messages earlier
The main page cannot be used while an installation is running.
    Therefore it makes more sense to generate the log output first.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit 0f506a130c67a67c833530b2b8ad44f811df5ac6
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:47 2022 +0200
pakfire.cgi: Fix indentation
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit cd521e78b815e84c31683b3cc2ec085f6f97d939
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun May 8 14:09:46 2022 +0200
pakfire.cgi: Separate command processing and HTML generation
Move most of the command execution away from the HTML output.
    This makes it easier to modify or extend individual commands.
Also load Pakfire settings earlier to ensure that they are
    available during command execution.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Acked-by: Peter Müller peter.muelle@ipfire.org
commit c7105c6e66bdc9ed1c42d4248926c0e7b654b414
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 12:05:53 2022 +0000
spectre-meltdown-checker: Update to 0.45
Please refer to https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.45
    for the release announcements of this version.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d79814485fba7eb410497ec8e904dc717ef4a065
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 12:03:18 2022 +0000
Core Update 168: Delete orphaned symlinks to Suricata ruleset updater
Reported-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit fd1e3e3c7417c14809b1fbbf8f7620c99053009b
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 12:00:10 2022 +0000
Core Update 168: Stop services before extracting files
https://lists.ipfire.org/pipermail/development/2022-May/013398.html
On a general note, we should do so for every Core Update, as it is more
    sane to stop services before deleting or overwriting any files.
Reported-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 0ab31dfdb1b3fce7aa4f3db0373de8808fa02acb
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 11:42:19 2022 +0000
make.sh: Sigh, bump core update version
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 3e2e9c159389db191989ad2cb0553d5b9a2bae9f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 11:41:09 2022 +0000
Core Update 168: Ship intel-microcodes and rebuild initrds
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 822076e0c2109c4a59a93be9c2592f8475726c87
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 11:24:06 2022 +0000
intel-microcode: Update to 20220419
Please refer to https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases...
    for the release announcement.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 40811ff383dc358e77afa9c482199336a4ffdca6
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 8 09:01:24 2022 +0000
Suricata: Install Core Update 167 converter script
My fault, again. :-/
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 99a79bcbd89de07e108b836fe7d19bd26aeb02c3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 21:17:47 2022 +0000
Revert "Core Update 168: Ship boost and delete orphaned libraries"
This reverts commit 3bd471b8203b878e9e270d833d49e08921c584e3.
commit 568215c84bb52ad09d7df43492eb61d99e343ac3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 21:16:45 2022 +0000
Revert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10"
This reverts commit 05a1fe1362b633b82b696a88801bb29fb1070872.
For some reason, the rootfile changes introduced with this patch break
    the build, as they do not seem to be present. Needs further
    investigation.
commit 5ecf056d52b007a413db0477254a3600fef1d81c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 16:47:44 2022 +0000
Drop libusb-compat
This was solely needed for NUT, which has now been updated, and does not
    require an older libusb version to be carried around.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit b2f707cb025bccf4417b0848e1140fc610e76fd6
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu May 5 18:39:53 2022 +0200
nut: Update to version 2.8.0
- Update from version 2.7.4 to 2.8.0
    - 2.7.4 was released in 2016 and since then not a lot of progress was made with it but
       since the start of 2022 new work on nut has ocurred culminating in this release
    - Update of rootfile
    - Ran find-dependencies on the old libraries due to the sobump to confirm that nothing
       else than nut used them, which was the case.
    - Changelog
    	After a long and windy trip since the last official release v2.7.4 half a dozen
             years ago, we the community, contributors and maintainers are proud to announce
             at last the general availability of NUT v2.8.0!
    	As always, the new release includes numerous new drivers, sub-drivers, protocols
             and bug-fixes, with many companies and individuals chipping in with contributions
             of code.Thanks to everyone involved in making this happen, inspiring the changes,
             and providing the open-source friendly infrastructure.
    	This release also culminates a significant effort in improvements of NUT QA and
             CI, and as a result -- in codebase quality and portability across a decade or
             two of recent platforms, third-party tools and other dependencies. As a side
             effect, public API (in headers and libraries) has changed a bit, hence a new
             semantic "minor" number is claimed for this major body of work.
    	During this time, the https://networkupstools.org/ web site has changed to a
             rolling-release model to serve current information to match the evolving
             codebase. There are now special Sub-sites for historic releases to keep
             documentation snapshots relevant for users of packages which are typically based
             on official NUT releases.
    	We recognize that NUT is an important piece of infrastructure which gets built
             into all sorts of devices, projects and operating systems -- some of which the
             team never heard of until they pop up in a question, and others we haven't heard
             of for years -- so we take a seriously omnivorous stance towards covering many
             versions and implementations of compiler suites, C/C++ revisions, make programs,
             shell and other scripted language interpreters, OSes and CPUs, and other similar
             variables tamed with our new NUT CI farm test matrix dynamically driven by
             currently registered build agents and their declared capabilities.
    	Sections in the NEWS and UPGRADING files about changes since last release are
             several pages long, so would not all be repeated here. A few important
             highlights for distribution packagers and custom builders follow, however:
    	    NUT now supports more i2c and modbus devices, as well as libusb-1.0 support
                 as an alternative to earlier libusb-0.1 (so new dependency-based categories
                 of packages for drivers may be due);
    	    NUT Python modules and scripts (e.g. NUT-Monitor variants) should work with
                 python-2.7 and with python-3.x, so covering historic distro releases as
                 well as new ones (and so your distro can deliver one or both, probably in
                 several packages with different dependencies in the latter case);
    	    NUT provides revised reference systemd and SMF service unit definitions,
                 including support of drivers wrapped into individual service instances with
                 varying dependencies based on different media required (networked stack, USB
                 stack, etc.), and many daemons include -F option for running "in foreground"
                 to avoid extra forking after one already done by a service framework - you
                 may want to use those in your packaged deliverables;
    	    NUT newly provides the "nut-driver-enumerator" script and service, which
                 allows it to follow edition of ups.conf and dynamically define+(re)start and
                 stop+undefine service instances for drivers - there are several ways it can
                 be integrated for different use-cases;
    	    There are several new configuration keywords and CLI options - so while new
                 NUT builds should work with old configs and scripts, the opposite is not
                 necessarily true (old binaries may reject configurations taking advantage
                 of new features);
    	    There are several new protocol keywords - but old and new NUT daemons (data
                 server and clients) should be able to communicate both ways;
    	    It is assumed that API/ABI changes may require third-party NUT clients
                 (library consumers of libnutclient, libupsclient, libnutscan... -- their
                 version info was bumped accordingly) to get rebuilt, in order to work with
                 the new NUT release in a stable fashion;
    	    The dummy-ups driver used in automated testing now processes *.dev filename
                 patterns once and does not loop, like it still does for *.seq and other
                 files (by default);
    	    USB code is now more strict about logical minimum/maximum ranges for data
                 reported from devices, and some devices were already found to make mistakes
                 - so there is also a mechanism for turning a blind eye to known issues and
                 fix-up such report descriptors to produce intended sane values;
    	    New documentation page docs/config-prereqs.txt highlights packaged
                 dependencies installable on a large range of platforms to build as much of
                 NUT as possible (incidentally, ones NUT CI farm uses to test every iteration);
    	    Finally, we hope that NUT codebase might be able to cater for everyone "out
                 of the box" (it also simplifies local builds from GitHub sources on any
                 systems, for troubleshooting and checking pre-release enhancements): if you
                 as a packager have to apply patches for your distribution, give it a thought
                 -- whether they address a common issue best solved upstream once and behave
                 similarly for everyone (and conversely, if your platform can do with
                 existing solutions already tracked in the NUT version du-jour). PRs welcome!
                 Or at least Wiki entries to list all the distro efforts for cross-pollination
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b6fe8ee88dafb5ebb02a787b11da602de016969d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 16:24:20 2022 +0000
Run ./make.sh update-contributors
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 5b1299f71717a59f50ea5b7aa7796dfe27afd080
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 16:22:51 2022 +0000
oinkmaster: Delete remnants
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 68725035744de0253f19e0b3550799799a44f80d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 16:21:23 2022 +0000
Core Update 168: Ship and apply IDSv4 changes
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 4d4f5df0c8b4e212cec1fd1206616308584df18e
Merge: e47f7c829 1a9e81ce7
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 16:07:41 2022 +0000
Merge branch 'temp-stevee-idsv4' into next
commit e47f7c8295ef92b6ee40ce88154d4449c4b29f19
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 15:31:16 2022 +0000
Core Update 168: Ship freetype
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c78f6e33f8415bdefb5be953032eba111d3585ff
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 4 21:51:00 2022 +0200
freetype: Update to version 2.12.1
- Update from version 2.11.1 to 2.12.1
    - Update of rootfile
    - Changelog
         CHANGES BETWEEN 2.12.0 and 2.12.1
    	  I. IMPORTANT BUG FIXES
    	  - Loading CFF fonts sometimes made FreeType crash (bug introduced in
    	    version 2.12.0)
    	  - Loading  a fully  hinted  TrueType glyph  a  second time  (without
    	    caching) sometimes yielded different rendering results if TrueType
    	    hinting was active (bug introduced in version 2.12.0).
    	  - The generation of the pkg-config file `freetype2.pc` was broken if
    	    the build was done with cmake (bug introduced in version 2.12.0).
    	  II. MISCELLANEOUS
    	  - New option `--with-librsvg` for  the `configure` script for better
    	    FreeType demo support.
    	  - The  meson  build  no  longer enforces  both  static  and  dynamic
    	    versions of the library by default.
    	  - The internal  zlib library was  updated to version  1.2.12.  Note,
    	    however, that  FreeType is *not* affected  by CVE-2018-25032 since
    	    it only does decompression.
         CHANGES BETWEEN 2.11.1 and 2.12.0
    	  I. IMPORTANT CHANGES
    	  - FreeType  now   handles  OT-SVG  fonts,  to   be  controlled  with
    	    `FT_CONFIG_OPTION_SVG`  configuration macro.   By default,  it can
    	    only load the 'SVG ' table of an OpenType font.  However, by using
    	    the `svg-hooks` property of the new 'ot-svg' module it is possible
    	    to register an  external SVG rendering engine.   The FreeType demo
    	    programs  have been  set  up  to use  'librsvg'  as the  rendering
    	    library.
    	    This work was Moazin Khatti's GSoC 2019 project.
    	  II. MISCELLANEOUS
    	  - The handling of fonts with an 'sbix' table has been improved.
    	    - Corrected bitmap offsets.
    	    - A  new tag  `FT_PARAM_TAG_IGNORE_SBIX` for  `FT_Open_Face` makes
    	      FreeType ignore an 'sbix' table in a font, allowing applications
    	      to access the font's outline glyphs.
    	    - `FT_FACE_FLAG_SBIX`  and   `FT_FACE_FLAG_SBIX_OVERLAY`  together
    	      with their  corresponding preprocessor macros  `FT_HAS_SBIX` and
    	      `FT_HAS_SBIX_OVERLAY` enable applications to treat 'sbix' tables
    	      as described in the OpenType specification.
    	  - The internal 'zlib'  code has been updated to be  in sync with the
    	    current 'zlib' version (1.2.11).
    	  - The  previously internal  load  flag  `FT_LOAD_SBITS_ONLY` is  now
    	    public.
    	  - Some  minor improvements  of the  building systems,  in particular
    	    handling of the 'zlib' library (internal vs. external).
    	  - Support for non-desktop Universal Windows Platform.
    	  - Various other minor bug and documentation fixes.
    	  - The `ftdump` demo  program shows more information  for Type1 fonts
    	    if option `-n` is given.
    	  - `ftgrid` can now display embedded bitmap strikes.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 6f3da00c53ac58dcbb833740b7a6f069166ee98f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 4 21:51:28 2022 +0200
sdl2: Update to version 2.0.22
- Update from version 2.0.20 to 2.0.22
    - Update of rootfile
    - Changelog
       2.0.22:
         General:
    	* Added SDL_RenderGetWindow() to get the window associated with a renderer
    	* Added floating point rectangle functions:
    	    * SDL_PointInFRect()
    	    * SDL_FRectEmpty()
    	    * SDL_FRectEquals()
    	    * SDL_FRectEqualsEpsilon()
    	    * SDL_HasIntersectionF()
    	    * SDL_IntersectFRect()
    	    * SDL_UnionFRect()
    	    * SDL_EncloseFPoints()
    	    * SDL_IntersectFRectAndLine()
    	* Added SDL_IsTextInputShown() which returns whether the IME window is currently
              shown
    	* Added SDL_ClearComposition() to dismiss the composition window without disabling
              IME input
    	* Added SDL_TEXTEDITING_EXT event for handling long composition text, and a hint
              SDL_HINT_IME_SUPPORT_EXTENDED_TEXT to enable it
    	* Added the hint SDL_HINT_MOUSE_RELATIVE_MODE_CENTER to control whether the mouse
              should be constrained to the whole window or the center of the window when
              relative mode is enabled
    	* The mouse is now automatically captured when mouse buttons are pressed, and the
              hint SDL_HINT_MOUSE_AUTO_CAPTURE allows you to control this behavior
    	* Added the hint SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL to let SDL know that a
              foreign window will be used with OpenGL
    	* Added the hint SDL_HINT_VIDEO_FOREIGN_WINDOW_VULKAN to let SDL know that a
              foreign window will be used with Vulkan
    	* Added the hint SDL_HINT_QUIT_ON_LAST_WINDOW_CLOSE to specify whether an
              SDL_QUIT event will be delivered when the last application window is closed
    	* Added the hint SDL_HINT_JOYSTICK_ROG_CHAKRAM to control whether ROG Chakram
              mice show up as joysticks
         Windows:
    	* Added support for SDL_BLENDOPERATION_MINIMUM and SDL_BLENDOPERATION_MAXIMUM to
              the D3D9 renderer
         Linux:
    	* Compiling with Wayland support requires libwayland-client version 1.18.0 or later
    	* Added the hint SDL_HINT_X11_WINDOW_TYPE to specify the _NET_WM_WINDOW_TYPE of
              SDL windows
    	* Added the hint SDL_HINT_VIDEO_WAYLAND_PREFER_LIBDECOR to allow using libdecor
              with compositors that support xdg-decoration
         Android:
    	* Added SDL_AndroidSendMessage() to send a custom command to the SDL java activity
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 401a2f3db0303e404987d06890296f23966c8ae8
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 4 21:51:15 2022 +0200
hplip: Update to version 3.22.4
- Update from version 3.22.2 to 3.22.4
    - Update of rootfile
    - Changelog
       HPLIP 3.22.4 - This release has the following changes:
         Added support for following new Distro's:
    	Manjaro 21.2
         Added support for the following new Printers:
    	HP LaserJet Pro 4001ne
    	HP LaserJet Pro 4001n
    	HP LaserJet Pro 4001dne
    	HP LaserJet Pro 4001dn
    	HP LaserJet Pro 4001dwe
    	HP LaserJet Pro 4001dw
    	HP LaserJet Pro 4001d
    	HP LaserJet Pro 4001de
    	HP LaserJet Pro 4002ne
    	HP LaserJet Pro 4002n
    	HP LaserJet Pro 4002dne
    	HP LaserJet Pro 4002dn
    	HP LaserJet Pro 4002dwe
    	HP LaserJet Pro 4002dw
    	HP LaserJet Pro 4002d
    	HP LaserJet Pro 4002de
    	HP LaserJet Pro 4003dn
    	HP LaserJet Pro 4003dw
    	HP LaserJet Pro 4003n
    	HP LaserJet Pro 4003d
    	HP LaserJet Pro 4004d
    	HP LaserJet Pro 4004dn
    	HP LaserJet Pro 4004dw
    	HP LaserJet Pro MFP 4101dwe
    	HP LaserJet Pro MFP 4101dw
    	HP LaserJet Pro MFP 4101fdn
    	HP LaserJet Pro MFP 4101fdne
    	HP LaserJet Pro MFP 4101fdw
    	HP LaserJet Pro MFP 4101fdwe
    	HP LaserJet Pro MFP 4102dwe
    	HP LaserJet Pro MFP 4102dw
    	HP LaserJet Pro MFP 4102fdn
    	HP LaserJet Pro MFP 4102fdw
    	HP LaserJet Pro MFP 4102fdwe
    	HP LaserJet Pro MFP 4102fdne
    	HP LaserJet Pro MFP 4102fnw
    	HP LaserJet Pro MFP 4102fnwe
    	HP LaserJet Pro MFP 4103dw
    	HP LaserJet Pro MFP 4103dn
    	HP LaserJet Pro MFP 4103fdn
    	HP LaserJet Pro MFP 4103fdw
    	HP LaserJet Pro MFP 4104dw
    	HP LaserJet Pro MFP 4104fdw
    	HP LaserJet Pro MFP 4104fdn
    	HP ScanJet Pro 3600 f1
    	HP ScanJet Pro N4600 fnw1
    	HP ScanJet Pro 2600 f1
    	HP ScanJet Enterprise Flow N6600 fnw1
       HPLIP 3.22.2 - This release has the following changes:
         Added support for following new Distro's:
    	Elementary OS 6.1
    	RHEL 8.5
    	Linux Mint 20.3
         Added support for the following new Printers:
    	HP LaserJet Tank MFP 1602a
    	HP LaserJet Tank MFP 1602w
    	HP LaserJet Tank MFP 1604w
    	HP LaserJet Tank MFP 2602dn
    	HP LaserJet Tank MFP 2602sdn
    	HP LaserJet Tank MFP 2602sdw
    	HP LaserJet Tank MFP 2602dw
    	HP LaserJet Tank MFP 2604dw
    	HP LaserJet Tank MFP 2604sdw
    	HP LaserJet Tank MFP 2603dw
    	HP LaserJet Tank MFP 2603sdw
    	HP LaserJet Tank MFP 2605sdw
    	HP LaserJet Tank MFP 2606dn
    	HP LaserJet Tank MFP 2606sdn
    	HP LaserJet Tank MFP 2606sdw
    	HP LaserJet Tank MFP 2606dw
    	HP LaserJet Tank MFP 2606dc
    	HP LaserJet Tank MFP 1005
    	HP LaserJet Tank MFP 1005w
    	HP LaserJet Tank MFP 1005nw
    	HP LaserJet Tank 1502a
    	HP LaserJet Tank 1502w
    	HP LaserJet Tank 1504w
    	HP LaserJet Tank 2502dw
    	HP LaserJet Tank 2502dn
    	HP LaserJet Tank 2504dw
    	HP LaserJet Tank 2503dw
    	HP LaserJet Tank 2506dw
    	HP LaserJet Tank 2506d
    	HP LaserJet Tank 2506dn
    	HP LaserJet Tank 1020
    	HP LaserJet Tank 1020w
    	HP LaserJet Tank 1020nw
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit c36610e051b931b4ae497b633ca41713e03d53e7
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:33:36 2022 +0200
haproxy: Update to version 2.5.5
- Update from 2.4.15 to 2.5.5
    - Update of rootfile not required
    - Changelog
    	2.5.5
    	    - CI: github actions: add the output of $CC -dM -E-
    	    - CI: github actions: use cache for OpenTracing
    	    - CI: refactor OpenTracing build script
    	    - CI: github actions: use cache for SSL libs
    	    - CI: Consistently use actions/checkout@v2
    	    - BUILD: atomic: make the old HA_ATOMIC_LOAD() support const pointers
    	    - BUILD: tree-wide: mark a few numeric constants as explicitly long long
    	    - BUG/MEDIUM: mux-fcgi: Don't rely on SI src/dst addresses for FCGI health-checks
    	    - BUG/MEDIUM: htx: Fix a possible null derefs in htx_xfer_blks()
    	    - REGTESTS: fix the race conditions in normalize_uri.vtc
    	    - REGTESTS: fix the race conditions in secure_memcmp.vtc
    	    - BUG/MEDIUM: httpclient/lua: infinite appctx loop with POST
    	    - BUG/MINOR: pool: always align pool_heads to 64 bytes
    	    - BUG/MEDIUM: pools: fix ha_free() on area in the process of being freed
    	    - BUILD: fix kFreeBSD build.
    	    - MINOR: pools: add a new global option "no-memory-trimming"
    	    - MINOR: stats: Add dark mode support for socket rows
    	    - BUILD: pools: fix backport of no-memory-trimming on non-linux OS
    	    - BUILD: fix recent build breakage of freebsd caused by kFreeBSD build fix
    	    - BUG/MINOR: add missing modes in proxy_mode_str()
    	    - BUG/MINOR: cli: shows correct mode in "show sess"
    	    - BUG/MINOR: httpclient: Set conn-stream/channel EOI flags at the end of request
    	    - BUG/MINOR: hlua: Set conn-stream/channel EOI flags at the end of request
    	    - BUG/MINOR: stats: Set conn-stream/channel EOI flags at the end of request
    	    - BUG/MINOR: cache: Set conn-stream/channel EOI flags at the end of request
    	    - BUG/MINOR: promex: Set conn-stream/channel EOI flags at the end of request
    	    - BUG/MEDIUM: stream: Use the front analyzers for new listener-less streams
    	    - DEBUG: cache: Update underlying buffer when loading HTX message in cache applet
    	    - BUG/MEDIUM: mcli: Properly handle errors and timeouts during reponse processing
    	    - DEBUG: stream: Add the missing descriptions for stream trace events
    	    - DEBUG: stream: Fix stream trace message to print response buffer state
    	    - BUG/MAJOR: mux-pt: Always destroy the backend connection on detach
    	    - BUG/MINOR: session: fix theoretical risk of memleak in session_accept_fd()
    	    - BUG/MEDIUM: httpclient: don't consume data before it was analyzed
    	    - CLEANUP: htx: remove unused co_htx_remove_blk()
    	    - BUG/MINOR: httpclient: consume partly the blocks when necessary
    	    - BUG/MINOR: httpclient: remove the UNUSED block when parsing headers
    	    - BUG/MEDIUM: httpclient: must manipulate head, not first
    	    - REGTESTS: fix the race conditions in be2hex.vtc
    	2.5.4
    	    - BUG/MEDIUM: htx: Be sure to have a buffer to perform a raw copy of a message
    	    - BUG/MEDIUM: mux-h1: Don't wake h1s if mux is blocked on lack of output buffer
    	    - BUG/MAJOR: mux-h2: Be sure to always report HTX parsing error to the app layer
    	    - DOC: Fix usage/examples of deprecated ACLs
    	    - BUG/MINOR: proxy: preset the error message pointer to NULL in parse_new_proxy()
    	    - REGTESTS: fix the race conditions in 40be_2srv_odd_health_checks
    	    - CI: github: enable pool debugging by default
    	    - BUG/MEDIUM: stream: Abort processing if response buffer allocation fails
    	2.5.3
    	    - MINOR: sock: move the unused socket cleaning code into its own function
    	    - BUG/MEDIUM: mworker: close unused transferred FDs on load failure
    	    - BUG/MINOR: mworker: fix a FD leak of a sockpair upon a failed reload
    	    - BUG/MINOR: sink: Use the right field in appctx context in release callback
    	    - BUG/MEDIUM: resolvers: Really ignore trailing dot in domain names
    	    - BUG/MEDIUM: fd: always align fdtab[] to 64 bytes
    	    - BUG/MAJOR: compiler: relax alignment constraints on certain structures
    	    - MINOR: httpclient: Don't limit data transfer to 1024 bytes
    	    - BUG/MINOR: httpclient: reinit flags in httpclient_start()
    	    - BUG/MINOR: mailers: negotiate SMTP, not ESMTP
    	    - BUG/MINOR: ssl: Add missing return value check in ssl_ocsp_response_print
    	    - BUG/MINOR: ssl: Fix leak in "show ssl ocsp-response" CLI command
    	    - BUG/MINOR: ssl: Missing return value check in ssl_ocsp_response_print
    	    - CLEANUP: httpclient/cli: fix indentation alignment of the help message
    	    - BUG/MINOR: tools: url2sa reads ipv4 too far
    	    - BUG/MEDIUM: httpclient: limit transfers to the maximum available room
    	    - DEBUG: buffer: check in __b_put_blk() whether the buffer room is respected
    	2.5.2
    	    - BUG/MEDIUM: connection: properly leave stopping list on error
    	    - BUG/MEDIUM: htx: Adjust length to add DATA block in an empty HTX buffer
    	    - BUG/MINOR: httpclient: don't send an empty body
    	    - BUG/MINOR: httpclient: set default Accept and User-Agent headers
    	    - BUG/MINOR: httpclient/lua: don't pop the lua stack when getting headers
    	    - BUILD/MINOR: fix solaris build with clang.
    	    - BUG/MEDIUM: server: avoid changing healthcheck ctx with set server ssl
    	    - DOC: management: mark "set server ssl" as deprecated
    	    - MEDIUM: cli: yield between each pipelined command
    	    - MINOR: channel: add new function co_getdelim() to support multiple delimiters
    	    - BUG/MINOR: cli: avoid O(bufsize) parsing cost on pipelined commands
    	    - MEDIUM: h2/hpack: emit a Dynamic Table Size Update after settings change
    	    - BUG/MEDIUM: cli: Never wait for more data on client shutdown
    	    - BUG/MEDIUM: mcli: do not try to parse empty buffers
    	    - BUG/MEDIUM: mcli: always realign wrapping buffers before parsing them
    	    - BUG/MINOR: stream: make the call_rate only count the no-progress calls
    	    - DEBUG: cli: add a new "debug dev fd" expert command
    	    - BUILD: debug/cli: condition test of O_ASYNC to its existence
    	    - DEBUG: pools: add new build option DEBUG_POOL_INTEGRITY
    	    - REGTESTS: ssl: Fix ssl_errors regtest with OpenSSL 1.0.2
    	    - BUG/MEDIUM: mworker: don't lose the stats socket on failed reload
    	    - BUG/MINOR: mworker: does not add the -sf in wait mode
    	    - BUG/MINOR: pools: always flush pools about to be destroyed
    	    - DEBUG: pools: add extra sanity checks when picking objects from a local cache
    	    - DEBUG: pools: let's add reverse mapping from cache heads to thread and pool
    	    - DEBUG: pools: replace the link pointer with the caller's address on pool_free()
    	    - BUG/MAJOR: sched: prevent rare concurrent wakeup of multi-threaded tasks
    	    - BUG/MINOR: mworker: does not erase the pidfile upon reload
    	    - DEBUG: fd: make sure we never try to insert/delete an impossible FD number
    	    - MINOR: listener: replace the listener's spinlock with an rwlock
    	    - BUG/MEDIUM: listener: read-lock the listener during accept()
    	    - BUG/MINOR: httpclient: Revisit HC request and response buffers allocation
    	    - BUG/MEDIUM: httpclient: Xfer the request when the stream is created
    	    - BUG/MINOR: ssl: Remove empty lines from "show ssl ocsp-response <id>" output
    	    - BUG/MINOR: jwt: Double free in deinit function
    	    - BUG/MINOR: jwt: Missing pkey free during cleanup
    	    - BUG/MINOR: jwt: Memory leak if same key is used in multiple jwt_verify calls
    	    - BUG/MINOR: httpclient/cli: display junk characters in vsn
    	    - BUG/MAJOR: http/htx: prevent unbounded loop in http_manage_server_side_cookies
    	    - BUG/MAJOR: spoe: properly detach all agents when releasing the applet
    	    - REGTESTS: server: close an occasional race on dynamic_server_ssl.vtc
    	    - REGTESTS: peers: leave a bit more time to peers to synchronize
    	    - BUG/MEDIUM: h2/hpack: fix emission of HPACK DTSU after settings change
    	    - BUG/MINOR: mux-h2: update the session's idle delay before creating the stream
    	2.5.1
    	    - BUG/MINOR: cache: Fix loop on cache entries in "show cache"
    	    - BUG/MINOR: httpclient: allow to replace the host header
    	    - BUG/MINOR: lua: don't expose internal proxies
    	    - BUG/MINOR: lua: remove loop initial declarations
    	    - BUG/MEDIUM: cli: Properly set stream analyzers to process one command at a time
    	    - BUILD: evports: remove a leftover from the dead_fd cleanup
    	    - BUG/MINOR: vars: Fix the set-var and unset-var converters
    	    - BUG/MINOR: server: Don't rely on last default-server to init server SSL context
    	    - BUG/MEDIUM: resolvers: Detach query item on response error
    	    - BUG/MAJOR: segfault using multiple log forward sections.
    	    - BUG/MEDIUM: h1: Properly reset h1m flags when headers parsing is restarted
    	    - BUG/MEDIUM: mworker: FD leak of the eventpoll in wait mode
    	    - BUG/MINOR: mworker: deinit of thread poller was called when not initialized
    	    - MINOR: mux-h1: Improve H1 traces by adding info about http parsers
    	    - BUILD: bug: Fix error when compiling with -DDEBUG_STRICT_NOCRASH
    	    - BUG/MEDIUM: sample: Fix memory leak in sample_conv_jwt_member_query
    	    - MINOR: cli: "show version" displays the current process version
    	    - BUILD: tree-wide: avoid warnings caused by redundant checks of obj_types
    	    - IMPORT: slz: use the correct CRC32 instruction when running in 32-bit mode
    	    - MINOR: http-rules: Add capture action to http-after-response ruleset
    	    - BUG/MINOR: cli/server: Don't crash when a server is added with a custom id
    	    - DOC: spoe: Clarify use of the event directive in spoe-message section
    	    - DOC: config: Specify %Ta is only available in HTTP mode
    	    - DOC: config: retry-on list is space-delimited
    	    - DOC: config: fix error-log-format example
    	    - BUG/MEDIUM: mworker/cli: crash when trying to access an old PID in prompt mode
    	    - MINOR: ssl: Remove empty lines from "show ssl ocsp-response" output
    	    - MINOR: pools: work around possibly slow malloc_trim() during gc
    	    - BUG/MEDIUM: backend: fix possible sockaddr leak on redispatch
    	    - BUG/MEDIUM: peers: properly skip conn_cur from incoming messages
    	    - BUG/MEDIUM: mux-h1: Fix splicing by properly detecting end of message
    	    - BUG/MINOR: mux-h1: Fix splicing for messages with unknown length
    	    - BUILD: ssl: unbreak the build with newer libressl
    	    - DOC: fix misspelled keyword "resolve_retries" in resolvers
    	    - DEBUG: ssl: make sure we never change a servername on established connections
    	    - BUILD: opentracing: display warning in case of using OT_USE_VARS at compile time
    	    - BUG/MEDIUM: ssl: initialize correctly ssl w/ default-server
    	    - REGTESTS: ssl: fix ssl_default_server.vtc
    	    - MINOR: compat: detect support for dl_iterate_phdr()
    	    - MINOR: debug: add ability to dump loaded shared libraries
    	    - MINOR: debug: add support for -dL to dump library names at boot
    	    - MINOR: proxy: add option idle-close-on-response
    	    - MINOR: cpuset: switch to sched_setaffinity for FreeBSD 14 and above.
    	    - BUILD: makefile: add -Wno-atomic-alignment to work around clang abusive warning
    	    - CI: Github Actions: do not show VTest failures if build failed
    	    - BUG/MINOR: ssl: free the fields in srv->ssl_ctx
    	    - BUG/MEDIUM: ssl: free the ckch instance linked to a server
    	    - REGTESTS: ssl: update of a crt with server deletion
    	    - BUILD/MINOR: cpuset FreeBSD 14 build fix.
    	    - CI: github actions: update OpenSSL to 3.0.1
    	    - BUILD/MINOR: tools: solaris build fix on dladdr.
    	    - BUG/MINOR: cli: fix _getsocks with musl libc
    	    - BUG/MEDIUM: http-ana: Preserve response's FLT_END analyser on L7 retry
    	    - BUG/MEDIUM: mworker: don't use _getsocks in wait mode
    	    - BUG/MINOR: ssl: Store client SNI in SSL context in case of ClientHello error
    	    - BUG/MAJOR: mux-h1: Don't decrement .curr_len for unsent data
    	    - BUILD: cpuset: fix build issue on macos introduced by previous change
    	    - CI: github actions: clean default step conditions
    	2.5.0
    	    - BUILD: SSL: add quictls build to scripts/build-ssl.sh
    	    - BUILD: SSL: add QUICTLS to build matrix
    	    - CLEANUP: sock: Wrap `accept4_broken = 1` into additional parenthesis
    	    - BUILD: cli: clear a maybe-unused  warning on some older compilers
    	    - BUG/MEDIUM: cli: make sure we can report a warning from a bind keyword
    	    - BUG/MINOR: ssl: make SSL counters atomic
    	    - CLEANUP: assorted typo fixes in the code and comments
    	    - BUG/MINOR: ssl: free correctly the sni in the backend SSL cache
    	    - MINOR: version: mention that it's stable now
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 3bd471b8203b878e9e270d833d49e08921c584e3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 14:23:30 2022 +0000
Core Update 168: Ship boost and delete orphaned libraries
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 05a1fe1362b633b82b696a88801bb29fb1070872
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 4 13:14:29 2022 +0200
boost: Fix rootfile entries that referred to python3.8 instead of 3.10
- In Jan 2022 I updated python from 3.8 to 3.10 but I missed that boost had rootfile
       entries with python38 in it.
    - Running a build just now for another package it got flagged up that the rootfile for
       boost had been changed and the logfile now had the entries with python310 instead of
       python38
    - Not clear why it only flagged this up now but this patch is to correct that error
    - Running find-dependencies on both the pyton38 and python310 versions of the libraries
      flagged nothing as being linked to either, so probably lucky with this being missed
      first time around.
    - Boost will need to be shipped with a Core Update
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit ce386d20ab8c5eea847038fb83dc8396bbbe2c04
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 14:18:46 2022 +0000
Core Update 168: Ship OpenSSL
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit a694737a131fccbc791ab70693a0da8b1c5d550b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed May 4 12:59:48 2022 +0200
openssl: Update to version 1.1.1o
- Update from version 1.1.1n to 1.1.1o
    - Update of rootfile not required
    - This patch is to go into CU168 as this update is for fixing a moderate severity CVE
    - Changelog
       1.1.1o [3 May 2022]
    	    (CVE-2022-1292)
    	    Fixed a bug in the c_rehash script which was not properly sanitising shell
    	    metacharacters to prevent command injection.  This script is distributed by
    	    some operating systems in a manner where it is automatically executed.  On
    	    such operating systems, an attacker could execute arbitrary commands with the
    	    privileges of the script.
    	    Use of the c_rehash script is considered obsolete and should be replaced
    	    by the OpenSSL rehash command line tool.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit d97295c680de05d7528471077115a46f3a48f600
Merge: 98b761a55 c22d834ca
Author: Peter Müller peter.mueller@ipfire.org
Date:   Thu May 5 14:18:13 2022 +0000
Merge branch 'master' into next
commit 98b761a5576204b9cd0c8a441f2eeb4d530cadd6
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon May 2 20:26:46 2022 +0000
download-rust-crate: Switch from MD5 to BLAKE2
https://wiki.ipfire.org/devel/telco/2022-05-02
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit eac8a6fbb86b8befb00adc318d0675a1c4748ed5
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 29 14:05:22 2022 +0200
mpc: Update to version 0.34
- Update from version 0.33 to 0.34
    - Combined this patch with update to mpd as mpc depends on mpd
    - Changelog
       0.34 (2021/11/30)
    	* add commands "albumart", "readpicture"
    	* don't print status after error
    	* custom status format
    	* support grouping "list" results
    	* meson: auto-build libmpdclient if not available
    	* require libmpdclient 2.16 or newer
    	* require MPD 0.21 or newer
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 66c022d88741a79228575189aadbd106abe668f6
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 29 14:05:21 2022 +0200
fmt: Addition of new build time dependency for mpd
- lfs and rootfile created
    - Added fmt to make.sh
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 944454beecf07808814a3cd9271883e1a4b2e22b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 29 14:05:20 2022 +0200
mpd: Update to version 0.23.6
- Update from version 0.22.6 to 0.23.6
    - Update of rootfile not required
    - Since version 0.23 there is a new build time dependency for libfmt so a separate
       patch has been created to add fmt to the system but only for build
    - Changelog
       ver 0.23.6 (2022/03/14)
    	* protocol
    	  - support filename "cover.webp" for "albumart" command
    	  - support "readcomments" and "readpicture" on CUE tracks
    	* decoder
    	  - ffmpeg: fix end-of-file check (update stuck at empty files)
    	  - opus: fix "readpicture" on Opus files
    	* output
    	  - pipewire: fix crash bug if setting volume before playback starts
    	  - wasapi: fix resume after pause
       ver 0.23.5 (2021/12/01)
    	* protocol
    	  - support relative offsets for "searchadd"
    	  - fix "searchaddpl" bug (bogus error "Bad position")
    	* database
    	  - upnp: fix crash bug
    	* tags
    	  - fix MixRamp support
    	* migrate to PCRE2
    	* GCC 12 build fixes
       ver 0.23.4 (2021/11/11)
    	* protocol
    	- add optional position parameter to "searchaddpl"
    	* decoder
    	- ffmpeg: support libavcodec 59
    	* output
    	- alsa: add option "thesycon_dsd_workaround" to work around device bug
    	* fix crash on debug builds if startup fails
    	* systemd
    	- remove "RuntimeDirectory" directive because it caused problems
    	- ignore the "pid_file" setting if started as systemd service
    	* Windows
    	- enable the "openmpt" decoder plugin
       ver 0.23.3 (2021/10/31)
    	* protocol
    	  - add optional position parameter to "add" and "playlistadd"
    	  - allow range in "playlistdelete"
    	* database
    	  - fix scanning files with question mark in the name
    	  - inotify: fix use-after-free bug
    	* output
    	  - alsa: add option "stop_dsd_silence" to work around DSD DAC noise
    	* macOS: fix libfmt related build failure
    	* systemd: add "RuntimeDirectory" directive
       ver 0.23.2 (2021/10/22)
    	* protocol
    	  - fix "albumart" timeout bug
    	* input
    	  - nfs: fix playback bug
    	* output
    	  - pipewire: send artist and title to PipeWire
    	  - pipewire: DSD support
    	* neighbor
    	  - mention failed plugin name in error message
    	* player
    	  - fix cross-fade regression
    	* fix crash with libfmt versions older than 7
       ver 0.23.1 (2021/10/19)
    	* protocol
    	  - use decimal notation instead of scientific notation
    	  - "load" supports relative positions
    	* output
    	  - emit "mixer" idle event when replay gain changes volume
    	  - pipewire: emit "mixer" idle events on external volume change
    	  - pipewire: attempt to change the graph sample rate
    	  - snapcast: fix time stamp bug which caused "Failed to get chunk"
    	* fix libfmt linker problems
    	* fix broken password authentication
       ver 0.23 (2021/10/14)
    	* protocol
    	  - new command "getvol"
    	  - show the audio format in "playlistinfo"
    	  - support "listfiles" with arbitrary storage plugins
    	  - support relative positions in "addid"
    	  - fix relative positions in "move" and "moveid"
    	  - add "position" parameter to "findadd" and "searchadd"
    	  - add position parameter to "load"
    	* database
    	  - proxy: require MPD 0.20 or later
    	  - proxy: require libmpdclient 2.11 or later
    	  - proxy: split search into chunks to avoid exceeding the output buffer
    	  - simple: add option to hide CUE target songs
    	  - upnp: support libnpupnp instead of libupnp
    	* archive
    	  - zzip, iso9660: ignore file names which are invalid UTF-8
    	* decoder
    	  - openmpt: new plugin
    	  - wavpack: fix WVC file support
    	* player
    	  - do not cross-fade songs shorter than 20 seconds
    	* output
    	  - oss: support DSD over PCM
    	  - pipewire: new plugin
    	  - snapcast: new plugin
    	* tags
    	  - new tags "ComposerSort", "Ensemble", "Movement", "MovementNumber", and "Location"
    	* split permission "player" from "control"
    	* add option "host_permissions"
    	* new build-time dependency: libfmt
       ver 0.22.11 (2021/08/24)
    	* protocol
    	  - fix "albumart" crash
    	* filter
    	  - ffmpeg: pass "channel_layout" instead of "channels" to buffersrc
    	  - ffmpeg: fix "av_buffersink_get_frame() failed: Resource temporarily unavailable"
    	  - ffmpeg: support double-precision samples (by converting to single precision)
    	* Android
    	  - build with NDK r23
    	  - playlist_directory defaults to "/sdcard/Android/data/org.musicpd/files/playlists"
       ver 0.22.10 (2021/08/06)
    	* protocol
    	  - support "albumart" for virtual tracks in CUE sheets
    	* database
    	  - simple: fix crash bug
    	  - simple: fix absolute paths in CUE "as_directory" entries
    	  - simple: prune CUE entries from database for non-existent songs
    	* input
    	  - curl: fix crash bug after stream with Icy metadata was closed by peer
    	  - tidal: remove defunct unmaintained plugin
    	* tags
    	  - fix crash caused by bug in TagBuilder and a few potential reference leaks
    	* output
    	  - httpd: fix missing tag after seeking into a new song
    	  - oss: fix channel order of multi-channel files
    	* mixer
    	  - alsa: fix yet more rounding errors
       ver 0.22.9 (2021/06/23)
    	* database
    	  - simple: load all .mpdignore files of all parent directories
    	* tags
    	  - fix "readcomments" and "readpicture" on remote files with ID3 tags
    	* decoder
    	  - ffmpeg: support the tags "sort_album", "album-sort", "artist-sort"
    	  - ffmpeg: fix build failure with FFmpeg 3.4
    	* Android
    	  - fix auto-start on boot in Android 8 or later
    	* Windows
    	  - fix build failure with SQLite
       ver 0.22.8 (2021/05/22)
    	* fix crash bug in "albumart" command (0.22.7 regression)
       ver 0.22.7 (2021/05/19)
    	* protocol
    	  - don't use glibc extension to parse time stamps
    	  - optimize the "albumart" command
    	* input
    	  - curl: send user/password in the first request, save one roundtrip
    	* decoder
    	  - ffmpeg: fix build problem with FFmpeg 3.4
    	  - gme: support RSN files
    	* storage
    	  - curl: don't use glibc extension
    	* database
    	  - simple: fix database corruption bug
    	* output
    	  - fix crash when pausing with multiple partitions
    	  - jack: enable on Windows
    	  - httpd: send header "Access-Control-Allow-Origin: *"
    	  - wasapi: add algorithm for finding usable audio format
    	  - wasapi: use default device only if none was configured
    	  - wasapi: add DoP support
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 69a72eb43924e14164d2a5ec142e1f544219198b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun May 1 16:00:00 2022 +0200
apcupsd: Force update to get new libgd library
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 1d683be87622e80b3c672b252c89c9d6c376bed5
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun May 1 15:59:59 2022 +0200
icinga: Force update to get new libgd library
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 45bae9ac918b3ff937a8805506f3cf2084ee214b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun May 1 15:59:58 2022 +0200
sarg: Force update to get new libgd library
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit e1ea4c0ad2ccda7ecd09c581203f7ebce12f6c5c
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun May 1 15:47:13 2022 +0200
gcc: Update mpfr with patches for use in toolchain build
- Added mpfr consolidated patches file to mpfr in gcc. mpfr is built internally for use
       in the toolchain.
    - Confirmed working by running./make toolchain which ran successfully
       confirmed from the _build.toolchain.log file that the patches were successfully
       implemented for gcc pass 1, gcc pass L and gcc pass 2
    - Full toolchain build successfully completed.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 2784c87b0e5978a6c49c814625a7e949298b57bb
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon May 2 05:38:27 2022 +0000
Core Update 168: Fix permissions of /etc/sudoers.d/
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit a260900c8d160192adc96234bb8a125f69b28c30
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 30 10:05:44 2022 +0000
Do not permit world-readability of /etc/sudoers.d/
Lynis (rightly) complains about this directory and its contents being
    world-readable on current IPFire installations. Since there is no
    necessity for this, we might as well chmod them to 750 / 640.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 64567c94232a7f015b07d5a280f63fd7c6df696d
Author: Jon Murphy jon.murphy@ipfire.org
Date:   Sun May 1 18:16:23 2022 -0500
pcengines-apu-firmware: Update to version 4.16.0.3
- Update from 4.15.0.1 to 4.16.0.3
    - Update of rootfile
    - Changelog
       v4.16.0.3 - Release date: 2022-04-21
          Rebased with official coreboot repository commit 2c4b426557
          See: https://github.com/pcengines/coreboot/compare/v4.16.0.2...v4.16.0.3
       v4.16.0.2 - Release date: 2022-03-29
          Rebased with official coreboot repository commit 66f99f7fa7
          See: https://github.com/pcengines/coreboot/compare/v4.16.0.1...v4.16.0.2
       v4.16.0.1 - Release date: 2022-03-08
          Rebased with official coreboot repository commit b4ba289fa5
          Disabled loglevel prefixes introduced in coreboot 4.16
          Disabled ANSI escape sequences introduced in coreboot 4.16
          Fixed AMD PSP CCP as entropy source
       v4.15.0.3 - Release date: 2022-02-16
          Rebased with official coreboot repository commit 36425312ee
          Added checking hardware matrix before regression tests
          Fixed the hard disk not visible in the Seabios Boot Menu
       v4.15.0.2 - Release date: 2022-01-11
          rebased with official coreboot repository commit 3990da0b
          disabled SMM
          enabled parallel AP initialization for apu2-6 for faster boot time
Signed-off-by: Jon Murphy jon.murphy@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 52209fedab107907a1a8225b9cdc9edf4c54d251
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon May 2 05:35:12 2022 +0000
langs: Add missing link
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d4afd45e1138adf32ef87c483224f387d6566cfe
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon May 2 05:30:08 2022 +0000
Core Update 168: Ship and apply sysctl changes
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 1af975dcebb2892a13775d344109508e46bb0be4
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 30 09:45:27 2022 +0000
sysctl: Use strict Reverse Path Filtering
The strict mode, as specified in RFC 3704, section 2.2, causes packets
    to be dropped by the kernel if they arrive with a source IP address that
    is not expected on the interface they arrived in. This prevents internal
    spoofing attacks, and is considered best practice among the industry.
After a discussion with Michael, we reached the conclusion that
    permitting users to configure the operating mode of RPF in IPFire causes
    more harm than good. The scenarios where strict RPF is not usable are
    negligible, and the vast majority of IPFire's userbase won't even
    notice a difference.
This supersedes 495b4ca2-5a4b-2ffa-8306-38f152889582@ipfire.org.
Suggested-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 01cb6d794baf9f19c47e4037e7e0bf3e7b7710f3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon May 2 05:28:32 2022 +0000
cups: Bump package version
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 2a14689ba86fa0acc222c6bffdb911d674ce34f8
Author: Daniel Weismueller daniel.weismueller@ipfire.org
Date:   Thu Apr 28 16:24:16 2022 +0200
cups: for now cups make a backup on uninstall
and a restore on install / update
The include file that was added in a previous commit allowed to manually
    create a backup, but none was created when the addon was installed,
    uninstalled or updated.
Signed-off-by: Daniel Weismueller daniel.weismueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 01eb9debf3bc28880912b6596ad6cb659b9c3a3b
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 15:24:59 2022 +0000
Tor: Update to 0.4.7.7
Please refer to https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.7.7
    for the changelog of this version.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit e1e94ae75b5cb4835d9a35a7c054db66778a8114
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:34:58 2022 +0200
minidlna: Addition of patches to fix CVE-2022-26505
- CVE-2022-26505  A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1
       allows a remote web server to exfiltrate media files. CVE created on 6th March 2022
    - minidlna have created the patches to fix CVE-2022-26505 and have created a git tag for
       version 1.3.1 but have not provided any 1.3.1 source tarballs. A ticket was raised on
       14th March 2022 in the source forge support system asking to "Please publish a tarball
       for 1.3.1" but there was no reply from the developer so far.
    - In the NIST National Vulnerability Database it refers to a fix implemented in 1.3.1 but
       the link to the sourceforge page is only the patches applied for the fix
    - I used those diff descriptions to create a patch to implement on the existing 1.3.0
       version in IPFire and this patch submission applies that fix
    - Incremented the lfs PAK_VER
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 53736cfe67a21848b095746b123119c96b2d5dac
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:34:42 2022 +0200
man-pages: Update to version 5.13
- Update from version 2.34 (2006) to 5.13 (2021)
    - Update of rootfile
    - Changelog is too long to include here (~50000 lines)
       Details for version 5.13 can be found in the file Changes in the source tarball
       Details for version back to 2.34 can be found in  the file Changes.old in the
        source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 908a25c644c1d1dd87bc0dca8cc2698fb30c87a0
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:34:14 2022 +0200
libpipeline: Addition as build dependency for man
- Created lfs and rootfile
    - Added entry into make.sh
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit f5b9dcd1ccc930255aca4992023097cf1ef496cf
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:34:13 2022 +0200
man: Update to version 2.10.2
- Update from version 2.4.3 (2005) to 2.10.2 (2022)
    - Update of rootfile
    - Addition of libpipeline as a build dependency - separate patch for that.
    - Changelog is too long to include here (~14000 lines)
       Details back to 2013 can be found in the file ChangeLog in the source tarball
       Details from 2013 back to version 2.4.3 can be found in the file ChangeLog-2013 in the
        source tarball
       90 bug fixes listed in ChangeLog
       128 bug fixes listed in Changelog-2013 back to the version after 2.4.3
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit eecf8445e23a5d9061c18c4bee88090a3a47e0ec
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 1 08:36:10 2022 +0000
Core Update 168: Ship iana-etc
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f4d1ada17054d4d0f08c270ce50dfc90f917307c
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:33:46 2022 +0200
iana-etc: Update to version 20220414
- Update from version 20220207 to 20220414
    - Update of rootfile not required
    - Changelog
       Add new iana release 20220414
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 0f907074168a0c7db05b9d25e48999a05a489ac9
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun May 1 08:35:18 2022 +0000
Core Update 168: Ship curl
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f61ced49e9b2452bee1448f3a42a050c793194a4
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 30 19:33:31 2022 +0200
curl: Update to version 7.83.0
- Update from 7.82.0 to 7.83.0
    - Update of rootfile
    - Changelog
       7.83.0
         Changes:
    	 o curl: add %header{name} experimental support in -w handling
    	 o curl: add %{header_json} experimental support in -w handling
    	 o curl: add --no-clobber [28]
    	 o curl: add --remove-on-error [11]
    	 o header api: add curl_easy_header and curl_easy_nextheader [56]
    	 o msh3: add support for QUIC and HTTP/3 using msh3 [84]
         Bugfixes:
    	 o appveyor: add Cygwin build [77]
    	 o appveyor: only add MSYS2 to PATH where required [78]
    	 o BearSSL: add CURLOPT_SSL_CIPHER_LIST support [27]
    	 o BearSSL: add CURLOPT_SSL_CTX_FUNCTION support [26]
    	 o BINDINGS.md: add Hollywood binding [34]
    	 o CI: Do not use buildconf. Instead, just use: autoreconf -fi [42]
    	 o CI: install Python package impacket to run SMB test 1451 [5]
    	 o configure.ac: move -pthread CFLAGS setting back where it used to be [14]
    	 o configure: bump the copyright year range int the generated output
    	 o conncache: include the zone id in the "bundle" hashkey [112]
    	 o connecache: remove duplicate connc->closure_handle check [90]
    	 o connect: make Curl_getconnectinfo work with conn cache from share handle [22]
    	 o connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined [6]
    	 o cookie.d: clarify when cookies are sent
    	 o cookies: improve errorhandling for reading cookiefile [123]
    	 o curl/system.h: update ifdef condition for MCST-LCC compiler [4]
    	 o curl: error out if -T and -d are used for the same URL [99]
    	 o curl: error out when options need features not present in libcurl [18]
    	 o curl: escape '?' in generated --libcurl code [117]
    	 o curl: fix segmentation fault for empty output file names. [60]
    	 o curl_easy_header: fix typos in documentation [74]
    	 o CURLINFO_PRIMARY_PORT.3: clarify which port this is [126]
    	 o CURLOPT*TLSAUTH.3: they only work with OpenSSL or GnuTLS [105]
    	 o CURLOPT_DISALLOW_USERNAME_IN_URL.3: use uppercase URL
    	 o CURLOPT_PREQUOTE.3: only works for FTP file transfers, not dirs [79]
    	 o CURLOPT_PROGRESSFUNCTION.3: fix typo in example [63]
    	 o CURLOPT_UNRESTRICTED_AUTH.3: extended explanation [127]
    	 o CURLSHOPT_UNLOCKFUNC.3: fix the callback prototype [9]
    	 o docs/HYPER.md: updated to reflect current hyper build needs
    	 o docs/opts: Mention Schannel client cert type is P12 [50]
    	 o docs: Fix missing semicolon in example code [102]
    	 o docs: lots of minor language polish [51]
    	 o English: use American spelling consistently [95]
    	 o fail.d: tweak the description [101]
    	 o firefox-db2pem.sh: make the shell script safer [47]
    	 o ftp: fix error message for partial file upload [61]
    	 o gen.pl: change wording for mutexed options [98]
    	 o GHA: add openssl3 jobs moved over from zuul [88]
    	 o GHA: build hyper with nightly rustc [7]
    	 o GHA: move bearssl jobs over from zuul [85]
    	 o gha: move the event-based test over from Zuul [59]
    	 o gtls: fix build for disabled TLS-SRP [48]
    	 o http2: handle DONE called for the paused stream [69]
    	 o http2: RST the stream if we stop it on our own will [67]
    	 o http: avoid auth/cookie on redirects same host diff port [110]
    	 o http: close the stream (not connection) on time condition abort [68]
    	 o http: reject header contents with nul bytes [41]
    	 o http: return error on colon-less HTTP headers [31]
    	 o http: streamclose "already downloaded" [57]
    	 o hyper: fix status_line() return code [13]
    	 o hyper: fix tests 580 and 581 for hyper [107]
    	 o hyper: no h2c support [33]
    	 o infof: consistent capitalization of warning messages [103]
    	 o ipv4/6.d: clarify that they are about using IP addresses [3]
    	 o json.d: fix typo (overriden -> overridden) [24]
    	 o keepalive-time.d: It takes many probes to detect brokenness [29]
    	 o lib/warnless.[ch]: only check for WIN32 and ignore _WIN32 [45]
    	 o lib670: avoid double check result [71]
    	 o lib: #ifdef on USE_HTTP2 better [65]
    	 o lib: fix some misuse of curlx_convert_wchar_to_UTF8 [38]
    	 o lib: remove exclamation marks [100]
    	 o libssh2: compare sha256 strings case sensitively [114]
    	 o libssh2: make the md5 comparison fail if wrong length [111]
    	 o libssh: fix build with old libssh versions [12]
    	 o libssh: fix double close [124]
    	 o libssh: Improve fix for missing SSH_S_ stat macros [10]
    	 o libssh: unstick SFTP transfers when done event-based [58]
    	 o macos: set .plist version in autoconf [122]
    	 o mbedtls: remove 'protocols' array from backend when ALPN is not used [66]
    	 o mbedtls: remove server_fd from backend [91]
    	 o mk-ca-bundle.pl: Use stricter logic to process the certificates [39]
    	 o mk-ca-bundle.vbs: delete this script in favor of mk-ca-bundle.pl [8]
    	 o mlc_config.json: add file to ignore known troublesome URLs [35]
    	 o mqtt: better handling of TCP disconnect mid-message [55]
    	 o ngtcp2: add client certificate authentication for OpenSSL [15]
    	 o ngtcp2: avoid busy loop in low CWND situation [119]
    	 o ngtcp2: deal with sub-millisecond timeout [116]
    	 o ngtcp2: disconnect the QUIC connection proper [19]
    	 o ngtcp2: enlarge H3_SEND_SIZE [82]
    	 o ngtcp2: fix HTTP/3 upload stall and avoid busy loop [83]
    	 o ngtcp2: fix memory leak [80]
    	 o ngtcp2: fix QUIC_IDLE_TIMEOUT [94]
    	 o ngtcp2: make curl 1ms faster [93]
    	 o ngtcp2: remove remote_addr which is not used in a meaningful way [81]
    	 o ngtcp2: update to work after recent ngtcp2 updates [62]
    	 o ngtcp2: use token when detecting :status header field [92]
    	 o nonblock: restore setsockopt method to curlx_nonblock [20]
    	 o openssl: check SSL_get_peer_cert_chain return value [1]
    	 o openssl: enable CURLOPT_SSL_EC_CURVES with BoringSSL [23]
    	 o openssl: fix CN check error code [21]
    	 o options: remove mistaken space before paren in prototype
    	 o perl: removed a double semicolon at end of line [64]
    	 o pop3/smtp: return *WEIRD_SERVER_REPLY when not understood [43]
    	 o projects/README: converted to markdown [76]
    	 o projects: Update VC version names for VS2017, VS2022 [52]
    	 o rtsp: don't let CSeq error override earlier errors [37]
    	 o runtests: add 'bearssl' as testable feature [87]
    	 o runtests: make 'oldlibssh' be before 0.9.4 [2]
    	 o schannel: remove dead code that will never run [89]
    	 o scripts/copyright.pl: ignore the new mlc_config.json file
    	 o scripts: move three scripts from lib/ to scripts/ [44]
    	 o test1135: sync with recent API updates [54]
    	 o test1459: disable for oldlibssh [53]
    	 o test375: fix line endings on Windows [40]
    	 o test386: Fix an incorrect test markup tag
    	 o test718: edited slightly to return better HTTP [32]
    	 o tests/server/util.h: align WIN32 condition with util.c [46]
    	 o tests: refactor server/socksd.c to support --unix-socket [96]
    	 o timediff.[ch]: add curlx helper functions for timeval conversions [86]
    	 o tls: make mbedtls and NSS check for h2, not nghttp2 [70]
    	 o tool and tests: force flush of all buffers at end of program [17]
    	 o tool_cb_hdr: Turn the Location: into a terminal hyperlink [30]
    	 o tool_getparam: error out on missing -K file [115]
    	 o tool_listhelp.c: uppercase URL
    	 o tool_operate: fix a scan-build warning [16]
    	 o tool_paramhlp: use feof(3) to identify EOF correctly when using fread(3) [97]
    	 o transfer: redirects to other protocols or ports clear auth [109]
    	 o unit1620: call global_init before calling Curl_open [125]
    	 o url: check sasl additional parameters for connection reuse. [113]
    	 o vtls: provide a unified APLN-disagree string for all backends [75]
    	 o vtls: use a backend standard message for "ALPN: offers %s" [73]
    	 o vtls: use a generic "ALPN, server accepted" message [72]
    	 o winbuild/README.md: fixup dead link [36]
    	 o winbuild: Add a Visual Studio example to the README [49]
    	 o wolfssl: fix compiler error without IPv6 [25]
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 56b9ee7e7e63fffba6bbe09c11bd57aa1df88d4b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 27 19:17:56 2022 +0200
libseccomp: Update to version 2.5.4
- Update from version 2.5.3 to 2.5.4
    - Update of rootfile
    - Changelog
       Version 2.5.4 - April 21, 2022
    	- Update the syscall table for Linux v5.17
    	- Fix minor issues with binary tree testing and with empty binary trees
    	- Minor documentation improvements including retiring the mailing list
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b314ad9e78d333109a7e8c43d4461d13ccbaea19
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 30 08:56:38 2022 +0000
Core Update 168: Ship libaio
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit efa6f1e2dc1f7d9c93444b70ca1d19cf78d96a11
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 22 22:10:12 2022 +0200
libaio: Update to version 0.3.113
- Update from version 0.3.112 to 0.3.113
    - Update of rootfile
    - Changelog
       0.3.113
    	harness: add test for aio poll missed events
    	Verify structure padding is correct at build time
    	Fix struct io_iocb_sockaddr padding for 32bit architectures
    	Fix struct io_iocb_vector padding for 32bit architectures
    	Use generic syscall number schema for loongarch
    	Add endian detection and bit width detection for loongarch
    	Add loongarch to supported architectures in libaio.spec
    	cases/16.t: loongarch only supports eventfd2
    	Fix test issue with gcc-11
    	harness: Skip the test if io_pgetevents() is not implemented
    	harness: Print better error messages on error conditions in 22.t
    	harness: Fix PROT_WRITE mmap check
    	harness: fix read into PROT_WRITE mmap test
    	harness: skip 22.p if async_poll isn't supported
    	harness: Handle -ENOTSUP from io_submit() with RWF_NOWAIT
    	harness: Add fallback code for filesystems not supporting O_DIRECT
    	harness: add support for skipping tests
    	harness: Make the test exit with a code matching the pass/fail state
    	harness: Make RISC-V use SYS_eventfd2 instead of unavailable SYS_eventfd
    	harness: Use run-time _SC_PAGE_SIZE instead of build-time PAGESIZE
    	harness: Use destination strncpy() expression for sizeof() argument
    	Use ctx consistently for io_context_t instead of ctx_id
    	man: Escape verbatim \n in order to make it through roff
    	man: Fold short lines
    	man: Fix markup
    	man: Fix title header
    	man: Fix typos
    	man: Add "None" to empty sections
    	man: Remove spurious text
    	man: Remove spurious spaces
    	man: Fix period formatting
    	man: Fix casing
    	man: End sentences with a period
    	man: Refer to libaio.h instead of libio.h
    	man: Use the correct troff macro for comments
    	man: Add missing space in man page references
    	harness: allow running tests against the installed library
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 585ab8755129e0cccfb48c2e1fabdaaaf1f39c0f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 30 08:56:07 2022 +0000
Core Update 168: Ship libcap
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d9538fbcc4a5f2547a3cedab9b5d2aad307cd2b3
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 22 22:10:30 2022 +0200
libcap: Update to version 2.64
- Update from version 2.63 to 2.64
    - Update of rootfile
    - Change sed line to ensure removal of static libs - environment names for static libraries
       changed.
    - Changelog
       2.64
    	    Fix memory leak in libpsx at program exit. (Bug: 215551 reported by Kalen Hall)
    	    Be more resilient to CGo configuration with Go compiler when building tests.
                 (Bug: 215603)
    	    Fix cap_*prctl() return code/errno handling.  (Bug: 215772 reported by Anderson
                 Toshiyuki Sasaki)
    	    Minor clarification to cap_get_pid() man page concerning pid value within
                 namespaces. (Bug: 215812)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit fab835851530b6dafacc16f43c4488ba597376c4
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 30 08:55:35 2022 +0000
Core Update 168: Ship libcap-ng
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 535607ac934efbd27cb11c8c201dc528f53bac9e
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 22 22:10:47 2022 +0200
libcap-ng: Update to version 0.8.3
- Update from 0.8.2 to 0.8.3
    - Update of rootfile not required
    - Changelog
        0.8.3
    	- Fix parameters to capng_updatev python bindings to be signed
    	- Detect capability options at runtime to make containerization easier (ntkme)
    	- Initialize the library when linked statically
    	- Add gcc function attributes for deallocation
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3661b4cb467232082bed7ceebe0cff1882c38d5d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:40:16 2022 +0200
nginx: Update to version 1.21.6
- Update from version 1.19.2 to 1.21.6
    - Update of rootfile not required
    - Changelog
    	Changes with nginx 1.21.6                                        25 Jan 2022
    	    *) Bugfix: when using EPOLLEXCLUSIVE on Linux client connections were
    	       unevenly distributed among worker processes.
    	    *) Bugfix: nginx returned the "Connection: keep-alive" header line in
    	       responses during graceful shutdown of old worker processes.
    	    *) Bugfix: in the "ssl_session_ticket_key" when using TLSv1.3.
    	Changes with nginx 1.21.5
    	    *) Change: now nginx is built with the PCRE2 library by default.
    	    *) Change: now nginx always uses sendfile(SF_NODISKIO) on FreeBSD.
    	    *) Feature: support for sendfile(SF_NOCACHE) on FreeBSD.
    	    *) Feature: the $ssl_curve variable.
    	    *) Bugfix: connections might hang when using HTTP/2 without SSL with the
    	       "sendfile" and "aio" directives.
    	Changes with nginx 1.21.4
    	    *) Change: support for NPN instead of ALPN to establish HTTP/2
    	       connections has been removed.
    	    *) Change: now nginx rejects SSL connections if ALPN is used by the
    	       client, but no supported protocols can be negotiated.
    	    *) Change: the default value of the "sendfile_max_chunk" directive was
    	       changed to 2 megabytes.
    	    *) Feature: the "proxy_half_close" directive in the stream module.
    	    *) Feature: the "ssl_alpn" directive in the stream module.
    	    *) Feature: the $ssl_alpn_protocol variable.
    	    *) Feature: support for SSL_sendfile() when using OpenSSL 3.0.
    	    *) Feature: the "mp4_start_key_frame" directive in the
    	       ngx_http_mp4_module.
    	       Thanks to Tracey Jaquith.
    	    *) Bugfix: in the $content_length variable when using chunked transfer
    	       encoding.
    	    *) Bugfix: after receiving a response with incorrect length from a
    	       proxied backend nginx might nevertheless cache the connection.
    	       Thanks to Awdhesh Mathpal.
    	    *) Bugfix: invalid headers from backends were logged at the "info" level
    	       instead of "error"; the bug had appeared in 1.21.1.
    	    *) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
    	       directive.
    	Changes with nginx 1.21.3
    	    *) Change: optimization of client request body reading when using
    	       HTTP/2.
    	    *) Bugfix: in request body filters internal API when using HTTP/2 and
    	       buffering of the data being processed.
    	Changes with nginx 1.21.2
    	    *) Change: now nginx rejects HTTP/1.0 requests with the
    	       "Transfer-Encoding" header line.
    	    *) Change: export ciphers are no longer supported.
    	    *) Feature: OpenSSL 3.0 compatibility.
    	    *) Feature: the "Auth-SSL-Protocol" and "Auth-SSL-Cipher" header lines
    	       are now passed to the mail proxy authentication server.
    	       Thanks to Rob Mueller.
    	    *) Feature: request body filters API now permits buffering of the data
    	       being processed.
    	    *) Bugfix: backend SSL connections in the stream module might hang after
    	       an SSL handshake.
    	    *) Bugfix: the security level, which is available in OpenSSL 1.1.0 or
    	       newer, did not affect loading of the server certificates when set
    	       with "@SECLEVEL=N" in the "ssl_ciphers" directive.
    	    *) Bugfix: SSL connections with gRPC backends might hang if select,
    	       poll, or /dev/poll methods were used.
    	    *) Bugfix: when using HTTP/2 client request body was always written to
    	       disk if the "Content-Length" header line was not present in the
    	       request.
    	Changes with nginx 1.21.1
    	    *) Change: now nginx always returns an error for the CONNECT method.
    	    *) Change: now nginx always returns an error if both "Content-Length"
    	       and "Transfer-Encoding" header lines are present in the request.
    	    *) Change: now nginx always returns an error if spaces or control
    	       characters are used in the request line.
    	    *) Change: now nginx always returns an error if spaces or control
    	       characters are used in a header name.
    	    *) Change: now nginx always returns an error if spaces or control
    	       characters are used in the "Host" request header line.
    	    *) Change: optimization of configuration testing when using many
    	       listening sockets.
    	    *) Bugfix: nginx did not escape """, "<", ">", "", "^", "`", "{", "|",
    	       and "}" characters when proxying with changed URI.
    	    *) Bugfix: SSL variables might be empty when used in logs; the bug had
    	       appeared in 1.19.5.
    	    *) Bugfix: keepalive connections with gRPC backends might not be closed
    	       after receiving a GOAWAY frame.
    	    *) Bugfix: reduced memory consumption for long-lived requests when
    	       proxying with more than 64 buffers.
    	Changes with nginx 1.21.0
    	    *) Security: 1-byte memory overwrite might occur during DNS server
    	       response processing if the "resolver" directive was used, allowing an
    	       attacker who is able to forge UDP packets from the DNS server to
    	       cause worker process crash or, potentially, arbitrary code execution
    	       (CVE-2021-23017).
    	    *) Feature: variables support in the "proxy_ssl_certificate",
    	       "proxy_ssl_certificate_key" "grpc_ssl_certificate",
    	       "grpc_ssl_certificate_key", "uwsgi_ssl_certificate", and
    	       "uwsgi_ssl_certificate_key" directives.
    	    *) Feature: the "max_errors" directive in the mail proxy module.
    	    *) Feature: the mail proxy module supports POP3 and IMAP pipelining.
    	    *) Feature: the "fastopen" parameter of the "listen" directive in the
    	       stream module.
    	       Thanks to Anbang Wen.
    	    *) Bugfix: special characters were not escaped during automatic redirect
    	       with appended trailing slash.
    	    *) Bugfix: connections with clients in the mail proxy module might be
    	       closed unexpectedly when using SMTP pipelining.
    	Changes with nginx 1.19.10
    	    *) Change: the default value of the "keepalive_requests" directive was
    	       changed to 1000.
    	    *) Feature: the "keepalive_time" directive.
    	    *) Feature: the $connection_time variable.
    	    *) Workaround: "gzip filter failed to use preallocated memory" alerts
    	       appeared in logs when using zlib-ng.
    	Changes with nginx 1.19.9
    	    *) Bugfix: nginx could not be built with the mail proxy module, but
    	       without the ngx_mail_ssl_module; the bug had appeared in 1.19.8.
    	    *) Bugfix: "upstream sent response body larger than indicated content
    	       length" errors might occur when working with gRPC backends; the bug
    	       had appeared in 1.19.1.
    	    *) Bugfix: nginx might not close a connection till keepalive timeout
    	       expiration if the connection was closed by the client while
    	       discarding the request body.
    	    *) Bugfix: nginx might not detect that a connection was already closed
    	       by the client when waiting for auth_delay or limit_req delay, or when
    	       working with backends.
    	    *) Bugfix: in the eventport method.
    	Changes with nginx 1.19.8
    	    *) Feature: flags in the "proxy_cookie_flags" directive can now contain
    	       variables.
    	    *) Feature: the "proxy_protocol" parameter of the "listen" directive,
    	       the "proxy_protocol" and "set_real_ip_from" directives in mail proxy.
    	    *) Bugfix: HTTP/2 connections were immediately closed when using
    	       "keepalive_timeout 0"; the bug had appeared in 1.19.7.
    	    *) Bugfix: some errors were logged as unknown if nginx was built with
    	       glibc 2.32.
    	    *) Bugfix: in the eventport method.
    	Changes with nginx 1.19.7
    	    *) Change: connections handling in HTTP/2 has been changed to better
    	       match HTTP/1.x; the "http2_recv_timeout", "http2_idle_timeout", and
    	       "http2_max_requests" directives have been removed, the
    	       "keepalive_timeout" and "keepalive_requests" directives should be
    	       used instead.
    	    *) Change: the "http2_max_field_size" and "http2_max_header_size"
    	       directives have been removed, the "large_client_header_buffers"
    	       directive should be used instead.
    	    *) Feature: now, if free worker connections are exhausted, nginx starts
    	       closing not only keepalive connections, but also connections in
    	       lingering close.
    	    *) Bugfix: "zero size buf in output" alerts might appear in logs if an
    	       upstream server returned an incorrect response during unbuffered
    	       proxying; the bug had appeared in 1.19.1.
    	    *) Bugfix: HEAD requests were handled incorrectly if the "return"
    	       directive was used with the "image_filter" or "xslt_stylesheet"
    	       directives.
    	    *) Bugfix: in the "add_trailer" directive.
    	Changes with nginx 1.19.6
    	    *) Bugfix: "no live upstreams" errors if a "server" inside "upstream"
    	       block was marked as "down".
    	    *) Bugfix: a segmentation fault might occur in a worker process if HTTPS
    	       was used; the bug had appeared in 1.19.5.
    	    *) Bugfix: nginx returned the 400 response on requests like
    	       "GET http://example.com?args HTTP/1.0".
    	    *) Bugfix: in the ngx_http_flv_module and ngx_http_mp4_module.
    	       Thanks to Chris Newton.
    	Changes with nginx 1.19.5
    	    *) Feature: the -e switch.
    	    *) Feature: the same source files can now be specified in different
    	       modules while building addon modules.
    	    *) Bugfix: SSL shutdown did not work when lingering close was used.
    	    *) Bugfix: "upstream sent frame for closed stream" errors might occur
    	       when working with gRPC backends.
    	    *) Bugfix: in request body filters internal API.
    	Changes with nginx 1.19.4
    	    *) Feature: the "ssl_conf_command", "proxy_ssl_conf_command",
    	       "grpc_ssl_conf_command", and "uwsgi_ssl_conf_command" directives.
    	    *) Feature: the "ssl_reject_handshake" directive.
    	    *) Feature: the "proxy_smtp_auth" directive in mail proxy.
    	Changes with nginx 1.19.3
    	    *) Feature: the ngx_stream_set_module.
    	    *) Feature: the "proxy_cookie_flags" directive.
    	    *) Feature: the "userid_flags" directive.
    	    *) Bugfix: the "stale-if-error" cache control extension was erroneously
    	       applied if backend returned a response with status code 500, 502,
    	       503, 504, 403, 404, or 429.
    	    *) Bugfix: "[crit] cache file ... has too long header" messages might
    	       appear in logs if caching was used and the backend returned responses
    	       with the "Vary" header line.
    	    *) Workaround: "[crit] SSL_write() failed" messages might appear in logs
    	       when using OpenSSL 1.1.1.
    	    *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages
    	       might appear in logs; the bug had appeared in 1.19.2.
    	    *) Bugfix: a segmentation fault might occur in a worker process when
    	       using HTTP/2 if errors with code 400 were redirected to a proxied
    	       location using the "error_page" directive.
    	    *) Bugfix: socket leak when using HTTP/2 and subrequests in the njs
    	       module.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 810dbe76aeda67dd339e3150a7dede4af07c1a08
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:40:33 2022 +0200
oci-cli: Update to version 3.7.3
- Update from 3.4.2 to 3.7.3
    - Update of rootfile
    - Changelog is too large to include here ~600 lines long
       More details can be found in the CHANGELOG.rst file in the source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Peter Müller peter.mueller@ipfire.org
commit 85a250d6369357d8405a24dd6ccff22a04c5525d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:40:48 2022 +0200
oci-python-sdk: Update to version 2.64.0
- Update from 2.54.0 to 2.64.0
    - Update of rootfile
    - Changelog
    	2.64.0 - 2022-04-19
    	     Added
    		* Support for the Stack Monitoring service
    		* Support for stack monitoring on external databases in the Database service
    		* Support for upgrading VM database systems in place in the Database service
    		* Support for viewing supported VMWare software versions when listing host shapes in the VMWare Solution service
    		* Support for choosing compute shapes when creating SDDCs and ESXi hosts in the VMWare Solution service
    		* Support for work requests on delete operations in the Vulnerability Scanning service
    		* Support for additional scan metadata in reports, including CVE descriptions, in the Vulnerability Scanning service
    		* Support for redemption codes in the Usage service
    	     Breaking
    		* Param `type` in model `DiscoveryDetails` assumes the value of `UNKNOWN_ENUM_VALUE` if it is assigned a value that is not of the allowed_values. It will not raise a `ValueError`.
    	2.63.0 - 2022-04-12
    	     Added
    		* Support for bringing your own IPv6 addresses in the Networking service
    		* Support for specifying database edition and maximum CPU core count when creating or updating an autonomous database in the Database service
    		* Support for enabling and disabling data collection options when creating or updating Exadata Cloud at Customer VM clusters in the Database service
    	      Breaking
    		* Support for retries by default on operations in the Identity service
    		* Support for retries by default on operations in the Operations Insights service
    	2.62.1 - 2022-04-05
    	     Added
    		* Fixed the lifecycle state values for target databases in the Data Safe service
    		* Support for content length and content type response headers when downloading PDFs in the Account Management service
    		* Support for creating Enterprise Manager-based zLinux host targets, creating alarms, and viewing top process analytics in the Operations Insights service
    		* Support for diagnostic reboots on VM instances in the Compute service
    	2.62.0 - 2022-03-29
    	     Added
    		* Support for returning the number of network ports as part of listing shapes in the Compute service
    		* Support for Java runtime removal and custom logs in the Java Management service
    		* Support for new parameters for BGP admin state and enabling/disabling BFD in the Networking service
    		* Support for private OKE clusters and blue-green deployments in the DevOps service
    		* Support for international customers to consume and launch third-party paid listings in the Marketplace service
    		* Support for additional fields on entities, attributes, and folders in the Data Catalog service
    	      Breaking
    		* Support for retries by default on operations in the Marketplace service
    	2.61.0 - 2022-03-22
    	     Added
    		* Support for getting the storage utilization of a deployment on deployment list and get operations in the GoldenGate service
    		* Support for virtual machines, bare metal machines, and Exadata databases with private endpoints in the Operations Insights service
    		* Support for setting deletion policies on database systems in the MySQL Database service
    	      Breaking
    		* Support for retries by default on operations in the Data Labeling service (data plane and control plane)
    	2.60.1 - 2022-03-15
    	     Added
    		* Support for Ubuntu platforms and unlimited installation keys in the Management Agent Cloud service
    		* Support for shielded instances in the VMWare Solution service
    		* Support for application resources in the Data Integration service
    		* Support for multi-AVM on Exadata Cloud at Customer infrastructure in the Database service
    		* Support for heterogeneous (VM and AVM) clusters on Exadata Cloud at Customer infrastructure in the Database service
    		* Support for custom maintenance schedules for AVM clusters on Exadata Cloud at Customer infrastructure in the Database service
    		* Support for listing vulnerabilities, vulnerability-impacted containers, and vulnerability-impacted hosts in the Vulnerability Scanning service
    		* Support for specifying an image count when creating or updating container scan recipes in the Vulnerability Scanning service
    	2.60.0 - 2022-03-08
    	     Added
    		* Support for the Sales Accelerator license option in the Content Management service
    		* Support for VCN hostname cluster endpoints in the Container Engine for Kubernetes service
    		* Support for optionally specifying an admin username and password when creating a database system during a restore operation in the MySQL Database service
    		* Support for automatic tablespace creation on non-autonomous and autonomous database dedicated targets in the Database Migration service
    		* Support for reporting excluded objects based on static exclusion rules and dynamic exclusion settings in the Database Migration service
    		* Support for removing, listing, and adding database objects reported by the Cloud Premigration Advisor Tool (CPAT) in the Database Migration service
    		* Support for migrating Oracle databases from the AWS RDS service to OCI as autonomous databases, using the AWS S3 service and DBLINK for data transfer, in the Database Migration service
    		* Support for querying additional fields of a resource using return clauses in the Search service
    		* Support for clusters and station clusters in the Roving Edge Infrastructure service
    		* Support for creating database systems and database homes using customer-managed keys in the Database service
    	      Breaking
    		* Support for retries enabled by default on operations in the Container Engine for Kubernetes service
    		* Support for retries enabled by default on operations in the Resource Manager service
    		* Support for retries enabled by default on operations in the Search service
    	2.59.0 - 2022-03-01
    	     Added
    		* Support for DRG route distribution statements to be specified with a new match type 'MATCH_ALL' for matching criteria in the Networking service
    		* Support for VCN route types on DRG attachments for deciding whether to import VCN CIDRs or subnet CIDRs into route rules in the Networking service
    		* Support for CPS offline reports in the Database service
    		* Support for infrastructure patching v2 features in the Database service
    		* Support for auto-scaling the storage of an autonomous database, as well as shrinking an autonomous database, in the Database service
    		* Support for managed egress via a default networking option on jobs and notebooks in the Data Science service
    		* Support for more types of saved search enums in the Management Dashboard service
    	     Breaking
    		* Support for retries enabled by default on some operations in the AI Vision service
    	2.58.0 - 2022-02-22
    	     Added
    		* Support for the Data Connectivity Management service
    		* Support for the AI Speech service
    		* Support for disabling crash recovery in the MySQL Database service
    		* Support for detector recipes of type "threat", new detector rule of type "rogue user", and sightings operations in the Cloud Guard service
    		* Support for more VM shape configurations when listing shapes in the Compute service
    		* Support for customer-managed encryption keys in the Analytics Cloud service
    		* Support for FastConnect device information in the Networking service
    	     Breaking
    		* Support for retries enabled by default on all operations in the Application Performance Monitoring control plane service
    	2.57.0 - 2022-02-15
    	     Added
    		* Support for the AI Vision service
    		* Support for the Threat Intelligence service
    		* Support for creation of NoSQL database tables with on-demand throughput capacity in the NoSQL Database Cloud service
    		* Support for tagging features in the Oracle Container Engine for Kubernetes (OKE) service
    		* Support for trace snapshots in the Application Performance Monitoring service
    		* Support for auditing and alerts in the Data Safe service
    		* Support for data discovery and data masking in the Data Safe service
    		* Support for customized subscriptions and delivery of announcements by email and SMS in the Announcements service
    	     Breaking
    		* The API `query_old` was removed from `query_client` in the Application Performance Monitoring service
    	2.56.0 - 2022-02-08
    	     Added
    		* Support for managing tablespaces in the Database Management service
    		* Support for upgrading and managing payment for subscriptions in the Account Management service
    		* Support for listing fast launch job configurations in the Data Science service
    	     Breaking changes
    		* Support for retries enabled by default on all operations in the Application Performance Monitoring service
    		* The type for the `bill_to_address` parameter was changed from `Address` to `BillToAddress` in the invoice model of the Account Management service
    		* `payment_method` was made a required property of the `payment_detail` model of the Account Management service
    	2.55.1 - 2022-02-01
    	     Added
    		* Support for calling Oracle Cloud Infrastructure services in the ap-dcc-canberra-1 region
    		* Support for the Console Dashboard service
    		* Support for capacity reservation in the Container Engine for Kubernetes service
    		* Support for tagging in the Container Engine for Kubernetes service
    		* Support for fetching listings by image OCID in the Marketplace service
    		* Support for underscores and hyphens in project resource names in the DevOps service
    		* Support for cross-region cloning in the Database service
    	2.55.0 - 2022-01-25
    	     Added
    		* Support for OneSubscription services
    		* Support for specifying if a run or application is streaming or batch in the Data Flow service
    		* Support for updating the Instance Configuration of an Instance Pool within a Cluster Network in the Compute Management service
    		* Updated documentation for Cross Region ADG feature for Autonomous Database in the Database service
    	     Breaking
    		* Support for retries enabled by default on all operations in the Object Storage service
    	2.54.1 - 2022-01-18
    	     Added
    		* Support for calling Oracle Cloud Infrastructure services in the me-dcc-muscat-1 region
    		* Support for the Visual Builder service
    		* Support for cross-region replication of volume groups in the Block Storage service
    		* Support for boot volume encryption in the Container Engine for Kubernetes service
    		* Support for adding metadata to records when creating and updating records in the Data Labeling service
    		* Support for global export formats in snapshot datasets in the Data Labeling service
    		* Support for adding labeling instructions to datasets in the Data Labeling service
    		* Support for updating autonomous dataguard associations for autonomous container databases in the Database service
    		* Support for setting up automatic failover when creating autonomous container databases in the Database service
    		* Support for setting the RECO storage size when updating a database system in the Database service
    		* Support for reconnecting refreshable clones to source for autonomous databases on shared infrastructure in the Database service
    		* Support for checking if an autonomous database on shared infrastructure can be reconnected to source, in the Database service
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Peter Müller peter.mueller@ipfire.org
commit a2a05a470649a6ade7d00d82436c2834ababe7ab
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:39:59 2022 +0200
nfs: Update to version 2.6.1
- Update from version 2.5.3 to 2.6.1
    - Update of rootfile not required
    - Changelog is not available in the source tarball or on the website. Follwoing list of
       changes obtained from git shortlog listing
        Release: 2.6.1 nfs-utils-2-6-1
    	mount: removed unused lable
    	tools/rpcgen: fix build on macos arm64 (stat64 issue)
    	mount: Remove NFS v2 support from mount.nfs
    	nfs.man: Remove references to NFS v2 from the man pages
    	nfsd: Remove the ability to enable NFS v2.
    	mount: don't bind a socket needlessly.
    	Add --disable-sbin-override for when /sbin is a symlink
    	mountstats: division by zero error on new mount when...
    	mountd: only do NFSv4 logging on supported kernels.
    	Move version.h into a common include directory
    	install-dep: Use command -v instead of which
    	nfs.man: adding new mount option max_connect
    	cacheio.c:216:21: warning: unused variable 'stb' [...
    	gssd: fix crash in debug message.
    	systemd generators: Install depending on location for...
    	systemd/Makefile: Drop exlicit setting of unit_dir
    	nfs-utils: add install-dep for installing all dependencies
    	nfs-utils: Fix mem leak in mountd
    	nfs-utils: Fix mem leaks in krb5_util
    	nfs-utils: Fix mem leaks in gssd
    	nfs-utils: Fix potential memory leaks in idmap
    	nfsdcltrack: Use uint64_t instead of time_t
    	systemd: Fix non-default statedir paths.
    	nfsdcltrack/nfsdcltrack.c: Fix printf format
    	nfsdcltrack/sqlite: Fix printf format
    	mount.nfs: Fix the sloppy option processing
        Release: 2.5.4
    	gssd: Cleaned up debug messages
    	mount.nfs: insert 'sloppy' at beginning of the options
    	nfs(5): Correct the spelling of "kernel_source"
    	nfs(5): Fix missing mentions of "rdma6" netid
    	gssd: add timeout for upcall threads
    	gssd: deal with failed thread creation
    	configure: check for rpc/rpc.h presence
    	README: update git repository URL
    	Move declaration of etab and rmtab into libraries
    	Remove 'force' arg from cache_flush()
    	Fix NFSv4 export of tmpfs filesystems
    	gssd: use mutex to protect decrement of refcount
    	nfs-utils: Enable the retrieval of raw config settings...
    	nfs-utils: Factor out common structure cleanup calls
    	Replace all /var/run with /run
    	Fix `statx()` emulation breaking exports
    	mountd/exports: Fix typo in the man page
    	NFS server should enable RDMA by default
    	mountd/exportd: only log confirmed clients, and poll...
    	exportfs: fix unexporting of '/'
    	nfsdclnts: Ignore SIGPIPE signal
    	mountd: add logging of NFSv4 clients attaching and...
    	mountd: make default ttl settable by option
    	mountd: add --cache-use-ipaddr option to force use_ipaddr
    	mountd: add logging for authentication results for...
    	mountd/exports: update man page
    	mountd: Don't proactively add export info when fh info...
    	mountd: reject unknown client IP when !use_ipaddr.
    	gssd: Add options to rpc.gssd to allow for the use...
    	exportd: server-side gid management
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 9efdbe103b8d98b80125407443e906373c534269
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 19:48:26 2022 +0000
Core Update 168: Ship changed rules.pl
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8b97a537f5f9e798a1ab307b2c32bd9a8b0f6913
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 25 21:04:53 2022 +0200
rules.pl: Fix automatic ipset sets cleanup.
The array of used/loaded ipsets needs to be reloaded before
    the cleanup can be started to also handle sets which are loaded during
    runtime.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Acked-by: Peter Müller peter.mueller@ipfire.org
commit 2f908d96489d6de9f1acc783c23f7fbe0057ed1d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 19:47:31 2022 +0000
Core Update 168: Ship libinih
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f02dc11a38c1144fcef322cf34fc6417aae4355f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 27 19:17:42 2022 +0200
libinih: Update to version r55
- Update from version r53 to r55
    - Update of rootfile not required
    - Changelog
       inih version 55
         Added "version" to meson.build config: #135 (but bumped up to 55 in a subsequent
          commit, for this release).
       inih version 54
         Mainly #134, adding the visibility symbols to the Meson build config, but also other
          small tweaks to tests and so on.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3421b1abd824d680c68948a83123469737b1bbfa
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 27 19:18:11 2022 +0200
meson: Update to version 0.62.1
- Update from version 0.60.1 to 0.62.1
    - Update of rootfile
    - Changelog is too long to include here. More details can be read at the following link
       https://mesonbuild.com/Release-notes-for-0-62-0.html
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 7481abecc3ae49406b8312af1dff521755f72428
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:59:09 2022 +0000
mcelog: Update to 181
No changelog or release notes are provided. Please refer to
    https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ for the
    source code history since the 175 release of mcelog.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8f855e933d52e7d8eca1cbfe947ab56ee9202232
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:47:00 2022 +0000
Postfix: Update to 3.7.1
Please refer to https://www.postfix.org/announcements/postfix-3.7.1.html
    for this versions' release notes.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 9d5c3d36e08f4b459e17534c40cbbf3dd07d1d57
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:41:54 2022 +0200
openvmtools: Update to version stable-12.0.0
- Update from version stable-11.3.0 to stable-12.0.0
    - Update of rootfile
    - Changelog is a bit too long to include here. More details can be found at
        https://github.com/vmware/open-vm-tools/blob/stable-12.0.0/ReleaseNotes.md
        https://github.com/vmware/open-vm-tools/blob/stable-11.3.5/ReleaseNotes.md
    - In version 11.3.5 mount.vmhgfs was removed from openvmtools
       It has been replaced by hgfs-fuse
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b7d80a2767f42a6bb8df65084f27a34803ee77de
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:25:41 2022 +0200
nasm: Update to version 2.15.05
- Update from version 2.14.02 (Dec 2018) to 2.15.05 (Aug 2020)
    - Most recent commit in git was Dec 2021
    - Update of rootfile not required
    - Changelog in source tarball and in git repository was last updated in 2007.
      Only option to see changes is to review the commits in
      https://github.com/netwide-assembler/nasm/commits/master
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 8de58edc738a0405eda7f691bab1c4fdaf02f83f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 19:32:56 2022 +0000
Core Update 168: Ship relevant linux-firmware changes
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 5a48b4a23b66c25c63f1bc503f54c6babac8794a
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 19:28:30 2022 +0000
linux-firmware: Update to 20220411
See https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/...
    for changes since the last linux-firmware version tag.
Also, please note that this patch does not feature any directives for
    shipping files via a Core Update - these need to be done separately.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 7138d1747ced95690e0acd76f7370d34ae3a399b
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 19:01:46 2022 +0000
Core Update 168: Ship openjpeg
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ca98d29a86a6eb9734d60eb7fb334395be0a29bd
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:41:29 2022 +0200
openjpeg: Update to version 2.4.0
- Update from version 2.3.1 to 2.4.0
    - Update of rootfile
    - Changelog
        2.4.0
    	**Closed issues:**
    		- OPENJPEG_INSTALL_DOC_DIR does not control a destination directory where HTML docs would be installed. [#1309](https://github.com/uclouvain/openjpeg/issues/1309)
    		- Heap-buffer-overflow in lib/openjp2/pi.c:312 [#1302](https://github.com/uclouvain/openjpeg/issues/1302)
    		- Heap-buffer-overflow in lib/openjp2/t2.c:973 [#1299](https://github.com/uclouvain/openjpeg/issues/1299)
    		- Heap-buffer-overflow in lib/openjp2/pi.c:623 [#1293](https://github.com/uclouvain/openjpeg/issues/1293)
    		- Global-buffer-overflow in lib/openjp2/dwt.c:1980 [#1286](https://github.com/uclouvain/openjpeg/issues/1286)
    		- Heap-buffer-overflow in lib/openjp2/tcd.c:2417 [#1284](https://github.com/uclouvain/openjpeg/issues/1284)
    		- Heap-buffer-overflow in lib/openjp2/mqc.c:499 [#1283](https://github.com/uclouvain/openjpeg/issues/1283)
    		- Openjpeg could not encode 32bit RGB float image [#1281](https://github.com/uclouvain/openjpeg/issues/1281)
    		- Openjpeg could not encode 32bit RGB float image [#1280](https://github.com/uclouvain/openjpeg/issues/1280)
    		- ISO/IEC 15444-1:2019 (E) compared with 'cio.h' [#1277](https://github.com/uclouvain/openjpeg/issues/1277)
    		- Test-suite failure due to hash mismatch [#1264](https://github.com/uclouvain/openjpeg/issues/1264)
    		- Heap use-after-free [#1261](https://github.com/uclouvain/openjpeg/issues/1261)
    		- Memory leak when failing to allocate object... [#1259](https://github.com/uclouvain/openjpeg/issues/1259)
    		- Memory leak of Tier 1 handle when OpenJPEG fails to set it as TLS... [#1257](https://github.com/uclouvain/openjpeg/issues/1257)
    		- Any plan to build release for CVE-2020-8112/CVE-2020-6851 [#1247](https://github.com/uclouvain/openjpeg/issues/1247)
    		- failing to convert 16-bit file: opj_t2_encode_packet(): only 5251 bytes remaining in output buffer. 5621 needed. [#1243](https://github.com/uclouvain/openjpeg/issues/1243)
    		- CMake+VS2017 Compile OK, thirdparty Compile OK, but thirdparty not install [#1239](https://github.com/uclouvain/openjpeg/issues/1239)
    		- New release to solve CVE-2019-6988 ? [#1238](https://github.com/uclouvain/openjpeg/issues/1238)
    		- Many tests fail to pass after the update of libtiff to version 4.1.0 [#1233](https://github.com/uclouvain/openjpeg/issues/1233)
    		- Another heap buffer overflow in libopenjp2 [#1231](https://github.com/uclouvain/openjpeg/issues/1231)
    		- Heap buffer overflow in libopenjp2 [#1228](https://github.com/uclouvain/openjpeg/issues/1228)
    		- Endianness of binary volume (JP3D) [#1224](https://github.com/uclouvain/openjpeg/issues/1224)
    		- New release to resolve CVE-2019-12973 [#1222](https://github.com/uclouvain/openjpeg/issues/1222)
    		- how to set the block size,like 128,256 ? [#1216](https://github.com/uclouvain/openjpeg/issues/1216)
    		- compress YUV files to motion jpeg2000 standard [#1213](https://github.com/uclouvain/openjpeg/issues/1213)
    		- Repair/update Java wrapper, and include in release [#1208](https://github.com/uclouvain/openjpeg/issues/1208)
    		- abc [#1206](https://github.com/uclouvain/openjpeg/issues/1206)
    		- Slow decoding [#1202](https://github.com/uclouvain/openjpeg/issues/1202)
    		- Installation question [#1201](https://github.com/uclouvain/openjpeg/issues/1201)
    		- Typo in test_decode_area - *ptilew is assigned instead of *ptileh [#1195](https://github.com/uclouvain/openjpeg/issues/1195)
    		- Creating a J2K file with one POC is broken [#1191](https://github.com/uclouvain/openjpeg/issues/1191)
    		- Make fails on Arch Linux [#1174](https://github.com/uclouvain/openjpeg/issues/1174)
    		- Heap buffer overflow in opj_t1_clbl_decode_processor() triggered with Ghostscript [#1158](https://github.com/uclouvain/openjpeg/issues/1158)
    		- opj_stream_get_number_byte_left: Assertion `p_stream->m_byte_offset >= 0' failed. [#1151](https://github.com/uclouvain/openjpeg/issues/1151)
    		- The fuzzer ignores too many inputs [#1079](https://github.com/uclouvain/openjpeg/issues/1079)
    		- out of bounds read [#1068](https://github.com/uclouvain/openjpeg/issues/1068)
    	**Merged pull requests:**
    		- Change defined WIN32 [#1310](https://github.com/uclouvain/openjpeg/pull/1310) ([Jamaika1](https://github.com/Jamaika1))
    		- docs: fix simple typo, producted -> produced [#1308](https://github.com/uclouvain/openjpeg/pull/1308) ([timgates42](https://github.com/timgates42))
    		- Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs [#1307](https://github.com/uclouvain/openjpeg/pull/1307) ([lemniscati](https://github.com/lemniscati))
    		- Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174) [#1306](https://github.com/uclouvain/openjpeg/pull/1306) ([matthew-sharp](https://github.com/matthew-sharp))
    		- pi.c: avoid out of bounds access with POC (fixes #1302) [#1304](https://github.com/uclouvain/openjpeg/pull/1304) ([rouault](https://github.com/rouault))
    		- Encoder: grow again buffer size [#1303](https://github.com/uclouvain/openjpeg/pull/1303) ([zodf0055980](https://github.com/zodf0055980))
    		- opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299) (probably master only) [#1301](https://github.com/uclouvain/openjpeg/pull/1301) ([rouault](https://github.com/rouault))
    		- pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293%5C#issuecomment-737122836%...) [#1300](https://github.com/uclouvain/openjpeg/pull/1300) ([rouault](https://github.com/rouault))
    		- opj_t2_encode_packet(): avoid out of bound access of #1297, but likely not the proper fix [#1298](https://github.com/uclouvain/openjpeg/pull/1298) ([rouault](https://github.com/rouault))
    		- opj_t2_encode_packet(): avoid out of bound access of #1294, but likely not the proper fix [#1296](https://github.com/uclouvain/openjpeg/pull/1296) ([rouault](https://github.com/rouault))
    		- opj_j2k_setup_encoder(): validate POC compno0 and compno1 (fixes #1293) [#1295](https://github.com/uclouvain/openjpeg/pull/1295) ([rouault](https://github.com/rouault))
    		- Encoder: avoid global buffer overflow on irreversible conversion when… [#1292](https://github.com/uclouvain/openjpeg/pull/1292) ([rouault](https://github.com/rouault))
    		- Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC [#1291](https://github.com/uclouvain/openjpeg/pull/1291) ([rouault](https://github.com/rouault))
    		- Free p_tcd_marker_info to avoid memory leak [#1288](https://github.com/uclouvain/openjpeg/pull/1288) ([zodf0055980](https://github.com/zodf0055980))
    		- Encoder: grow again buffer size [#1287](https://github.com/uclouvain/openjpeg/pull/1287) ([zodf0055980](https://github.com/zodf0055980))
    		- Encoder: avoid uint32 overflow when allocating memory for codestream buffer (fixes #1243) [#1276](https://github.com/uclouvain/openjpeg/pull/1276) ([rouault](https://github.com/rouault))
    		- Java compatibility from 1.5 to 1.6 [#1263](https://github.com/uclouvain/openjpeg/pull/1263) ([jiapei100](https://github.com/jiapei100))
    		- opj_decompress: fix double-free on input directory with mix of valid and invalid images [#1262](https://github.com/uclouvain/openjpeg/pull/1262) ([rouault](https://github.com/rouault))
    		- openjp2: Plug image leak when failing to allocate codestream index. [#1260](https://github.com/uclouvain/openjpeg/pull/1260) ([sebras](https://github.com/sebras))
    		- openjp2: Plug memory leak when setting data as TLS fails. [#1258](https://github.com/uclouvain/openjpeg/pull/1258) ([sebras](https://github.com/sebras))
    		- openjp2: Error out if failing to create Tier 1 handle. [#1256](https://github.com/uclouvain/openjpeg/pull/1256) ([sebras](https://github.com/sebras))
    		- Testing for invalid values of width, height, numcomps [#1254](https://github.com/uclouvain/openjpeg/pull/1254) ([szukw000](https://github.com/szukw000))
    		- Single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements) [#1253](https://github.com/uclouvain/openjpeg/pull/1253) ([rouault](https://github.com/rouault))
    		- Add support for multithreading in encoder [#1248](https://github.com/uclouvain/openjpeg/pull/1248) ([rouault](https://github.com/rouault))
    		- Add support for generation of PLT markers in encoder [#1246](https://github.com/uclouvain/openjpeg/pull/1246) ([rouault](https://github.com/rouault))
    		- Fix warnings about signed/unsigned casts in pi.c [#1244](https://github.com/uclouvain/openjpeg/pull/1244) ([rouault](https://github.com/rouault))
    		- opj_decompress: add sanity checks to avoid segfault in case of decoding error [#1240](https://github.com/uclouvain/openjpeg/pull/1240) ([rouault](https://github.com/rouault))
    		- ignore wrong icc [#1236](https://github.com/uclouvain/openjpeg/pull/1236) ([szukw000](https://github.com/szukw000))
    		- Implement writing of IMF profiles [#1235](https://github.com/uclouvain/openjpeg/pull/1235) ([rouault](https://github.com/rouault))
    		- tests: add alternate checksums for libtiff 4.1 [#1234](https://github.com/uclouvain/openjpeg/pull/1234) ([rouault](https://github.com/rouault))
    		- opj_tcd_init_tile(): avoid integer overflow [#1232](https://github.com/uclouvain/openjpeg/pull/1232) ([rouault](https://github.com/rouault))
    		- tests/fuzzers: link fuzz binaries using $LIB_FUZZING_ENGINE. [#1230](https://github.com/uclouvain/openjpeg/pull/1230) ([Dor1s](https://github.com/Dor1s))
    		- opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228) [#1229](https://github.com/uclouvain/openjpeg/pull/1229) ([rouault](https://github.com/rouault))
    		- Fix resource leaks [#1226](https://github.com/uclouvain/openjpeg/pull/1226) ([dodys](https://github.com/dodys))
    		- abi-check.sh: fix false postive ABI error, and display output error log [#1218](https://github.com/uclouvain/openjpeg/pull/1218) ([rouault](https://github.com/rouault))
    		- pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets() [#1217](https://github.com/uclouvain/openjpeg/pull/1217) ([rouault](https://github.com/rouault))
    		- Add check to validate SGcod/SPcoc/SPcod parameter values. [#1211](https://github.com/uclouvain/openjpeg/pull/1211) ([sebras](https://github.com/sebras))
    		- Fix buffer overflow reading an image file less than four characters [#1196](https://github.com/uclouvain/openjpeg/pull/1196) ([robert-ancell](https://github.com/robert-ancell))
    		- compression: emit POC marker when only one single POC is requested (f… [#1192](https://github.com/uclouvain/openjpeg/pull/1192) ([rouault](https://github.com/rouault))
    		- Fix several potential vulnerabilities  [#1185](https://github.com/uclouvain/openjpeg/pull/1185) ([Young-X](https://github.com/Young-X))
    		- openjp2/j2k: Report error if all wanted components are not decoded. [#1164](https://github.com/uclouvain/openjpeg/pull/1164) ([sebras](https://github.com/sebras))
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 0a1d567ce82a6e8f1d103d9481ebf67088b8591c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 19:01:10 2022 +0000
Core Update 168: Ship openldap
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c4f3bb4b08f5ee743cf984770d5f205cd75a7ec3
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Apr 25 14:41:41 2022 +0200
openldap: Update to version 2.6.1
- Update from version 2.4.49 to 2.6.1
    - Update of rootfile
    - Update of consolidated patch to 2.6.1
    - Removal of old patches
    - Changelog
       OpenLDAP 2.6.1 Release (2022/01/20)
    	Fixed libldap to init client socket port (ITS#9743)
    	Fixed libldap with referrals (ITS#9781)
    	Added slapd config keyword for logfile format (ITS#9745)
    	Fixed slapd to allow objectClass edits with no net change (ITS#9772)
    	Fixed slapd configtable population (ITS#9576)
    	Fixed slapd to only set loglevel in server mode (ITS#9715)
    	Fixed slapd logfile-rotate use of uninitialized variable (ITS#9730)
    	Fixed slapd passwd scheme handling with slapd.conf (ITS#9750)
    	Fixed slapd postread support for modrdn (ITS#7080)
    	Fixed slapd syncrepl recreation of deleted entries (ITS#9282)
    	Fixed slapd syncrepl replication with ODSEE (ITS#9707)
    	Fixed slapd syncrepl to properly replicate glue entries (ITS#9647)
    	Fixed slapd syncrepl to reject REFRESH for precise resync (ITS#9742)
    	Fixed slapd syncrepl to avoid busy loop during refresh (ITS#9584)
    	Fixed slapd syncrepl when X-ORDERED is specified (ITS#9761)
    	Fixed slapd syncrepl to better handle out of order delete ops (ITS#9751)
    	Fixed slapd syncrepl to correctly close connections when config is deleted (ITS#9776)
    	Fixed slapd-mdb to update indices correctly on replace ops (ITS#9753)
    	Fixed slapd-wt to set correct flags (ITS#9760)
    	Fixed slapo-accesslog to fix assertion due to deprecated code (ITS#9738)
    	Fixed slapo-accesslog to fix inconsistently normalized minCSN (ITS#9752)
    	Fixed slapo-accesslog delete handling of multi-valued config attrs (ITS#9493)
    	Fixed slapo-autogroup to maintain values in insertion order (ITS#9766)
    	Fixed slapo-constraint to maintain values in insertion order (ITS#9770)
    	Fixed slapo-dyngroup to maintain values in insertion order (ITS#9762)
    	Fixed slapo-dynlist compare operation for static groups (ITS#9747)
    	Fixed slapo-dynlist static group filter with multiple members (ITS#9779)
    	Fixed slapo-ppolicy when not built modularly (ITS#9733)
    	Fixed slapo-refint to maintain values in insertion order (ITS#9763)
    	Fixed slapo-retcode to honor requested insert position (ITS#9759)
    	Fixed slapo-sock cn=config support (ITS#9758)
    	Fixed slapo-syncprov memory leak (ITS#8039)
    	Fixed slapo-syncprov to generate a more accurate accesslog query (ITS#9756)
    	Fixed slapo-syncprov to allow empty DB to host persistent syncrepl connections (ITS#9691)
    	Fixed slapo-syncprov to consider all deletes for sycnInfo messages (ITS#5972)
    	Fixed slapo-translucent to warn on invalid config (ITS#9768)
    	Fixed slapo-unique to warn on invalid config (ITS#9767)
    	Fixed slapo-valsort to maintain values in insertion order (ITS#9764)
    	Build Environment
    		Fix test022 to preserve DELAY search output (ITS#9718)
    		Fix slapd-watcher to allow startup when servers are down (ITS#9727)
    	Contrib
    		Fixed slapo-lastbind to work with 2.6 lastbind-precision configuration (ITS#9725)
    	Documentation
    		Fixed slapd.conf(5)/slapd-config(5) documentation on lastbind-precision (ITS#9728)
    		Fixed slapo-accesslog(5) to clarify logoldattr usage (ITS#9749)
       OpenLDAP 2.6.0 Release (2021/10/25)
    	Initial release for "general use".
       OpenLDAP 2.5.7 Release (2021/08/18)
    	Fixed lloadd client state tracking (ITS#9624)
    	Fixed slapd bconfig to canonicalize structuralObjectclass (ITS#9611)
    	Fixed slapd-ldif duplicate controls response (ITS#9497)
    	Fixed slapd-mdb multival crash when attribute is missing an equality matchingrule (ITS#9621)
    	Fixed slapd-mdb compatibility with OpenLDAP 2.4 MDB databases (ITS#8958)
    	Fixed slapd-mdb idlexp maximum size handling (ITS#9637)
    	Fixed slapd-monitor number of ops executing with asynchronous backends (ITS#9628)
    	Fixed slapd-sql to add support for ppolicy attributes (ITS#9629)
    	Fixed slapd-sql to close transactions after bind and search (ITS#9630)
    	Fixed slapo-accesslog to make reqMod optional (ITS#9569)
    	Fixed slapo-ppolicy logging when pwdChangedTime attribute is not present (ITS#9625)
    	Documentation
    		slapd-mdb(5) note max idlexp size is 30, not 31 (ITS#9637)
    		slapo-accesslog(5) note that reqMod is optional (ITS#9569)
    		Add ldapvc(1) man page (ITS#9549)
    		Add guide section on load balancer (ITS#9443)
    		Updated guide to document multiprovider as replacement for mirrormode (ITS#9200)
    		Updated guide to clarify slapd-mdb upgrade requirements (ITS#9200)
    		Updated guide to document removal of deprecated options from client tools (ITS#9200)
       OpenLDAP 2.5.6 Release (2021/07/27)
    	Fixed libldap buffer overflow (ITS#9578)
    	Fixed libldap missing mutex unlock on connection alloc failure (ITS#9590)
    	Fixed lloadd cn=config olcBkLloadClientMaxPending setting (ITS#8747)
    	Fixed slapd multiple config defaults (ITS#9363)
    	Fixed slapd ipv6 addresses to work with tcp wrappers (ITS#9603)
    	Fixed slapo-syncprov delete of nonexistent sessionlog (ITS#9608)
    	Build
    		Fixed library symbol versioning on Solaris (ITS#9591)
    		Fixed compile warning in libldap/tpool.c (ITS#9601)
    		Fixed compile warning in libldap/tls_o.c (ITS#9602)
    	Contrib
    		Fixed ppm module for sysconfdir (ITS#7832)
    	Documentation
    		Updated guide to document multival, idlexp, and maxentrysize (ITS#9613, ITS#9614)
       OpenLDAP 2.5.5 Release (2021/06/03)
    	Added libldap LDAP_OPT_TCP_USER_TIMEOUT support (ITS#9502)
    	Added lloadd tcp-user-timeout support (ITS#9502)
    	Added slapd-asyncmeta tcp-user-timeout support (ITS#9502)
    	Added slapd-ldap tcp-user-timeout support (ITS#9502)
    	Added slapd-meta tcp-user-timeout support (ITS#9502)
    	Fixed incorrect control OIDs for AuthZ Identity (ITS#9542)
    	Fixed libldap typo in util-int.c (ITS#9541)
    	Fixed libldap double free of LDAP_OPT_DEFBASE (ITS#9530)
    	Fixed libldap better TLS1.3 cipher suite handling (ITS#9521, ITS#9546)
    	Fixed lloadd multiple issues (ITS#8747)
    	Fixed slapd slap_op_time to avoid duplicates across restarts (ITS#9537)
    	Fixed slapd typo in daemon.c (ITS#9541)
    	Fixed slapd slapi compilation (ITS#9544)
    	Fixed slapd to handle empty DN in extended filters (ITS#9551)
    	Fixed slapd syncrepl searches with empty base (ITS#6467)
    	Fixed slapd syncrepl refresh on startup (ITS#9324, ITS#9534)
    	Fixed slapd abort due to typo (ITS#9561)
    	Fixed slapd-asyncmeta quarantine handling (ITS#8721)
    	Fixed slapd-asyncmeta to have a default operations timeout (ITS#9555)
    	Fixed slapd-ldap quarantine handling (ITS#8721)
    	Fixed slapd-mdb deletion of context entry (ITS#9531)
    	Fixed slapd-mdb off-by-one affecting search scope (ITS#9557)
    	Fixed slapd-meta quarantine handling (ITS#8721)
    	Fixed slapo-accesslog to record reqNewDN for modRDN ops (ITS#9552)
    	Fixed slapo-pcache locking during expiration (ITS#9529)
    	Build
    		Fixed slappw-argon2 module installation (ITS#9548)
    	Contrib
    		Update ldapc++/ldaptcl to use configure.ac (ITS#9554)
    	Documentation
    		ldap_first_attribute(3) - Document ldap_get_attribute_ber (ITS#8820)
            ldap_modify(3) - Delete non-existent mod_next parameter (ITS#9559)
       OpenLDAP 2.5.4 Release (2021/04/29)
    	Initial release for "general use".
       OpenLDAP 2.4.57 Release (2021/01/18)
    	Fixed ldapexop to use correct return code (ITS#9417)
    	Fixed slapd to remove asserts in UUIDNormalize (ITS#9391)
    	Fixed slapd to remove assert in csnValidate (ITS#9410)
    	Fixed slapd validity checks for issuerAndThisUpdateCheck (ITS#9411, ITS#9427)
    	Fixed slapd validity checks for serialNumberAndIssuerCheck (ITS#9404, ITS#9424)
    	Fixed slapd AVA sort with invalid RDN (ITS#9412)
    	Fixed slapd ldap_X509dn2bv to check for invalid BER after RDN count (ITS#9423, ITS#9425)
    	Fixed slapd saslauthz to remove asserts in validation (ITS#9406, ITS#9407)
    	Fixed slapd saslauthz to use slap_sl_free on normalized DN (ITS#9409)
    	Fixed slapd saslauthz SEGV in slap_parse_user (ITS#9413)
    	Fixed slapd modrdn memory leak (ITS#9420)
    	Fixed slapd double-free in vrfilter (ITS#9408)
    	Fixed slapd cancel operation to correctly terminate (ITS#9428)
    	Fixed slapd-ldap fix binds on retry with closed connection (ITS#9400)
    	Fixed slapo-syncprov to ignore duplicate sessionlog entries (ITS#9394)
       OpenLDAP 2.4.56 Release (2020/11/10)
    	Fixed slapd to remove assert in certificateListValidate (ITS#9383)
    	Fixed slapd to remove assert in csnNormalize23 (ITS#9384)
    	Fixed slapd to better parse ldapi listener URIs (ITS#9379)
       OpenLDAP 2.4.55 Release (2020/10/26)
    	Fixed slapd normalization handling with modrdn (ITS#9370)
    	Fixed slapd-meta to check ldap_install_tls return code (ITS#9366)
    	Contrib
    		Fixed nssov misplaced semicolon (ITS#8731, ITS#9368)
       OpenLDAP 2.4.54 Release (2020/10/12)
    	Fixed slapd delta-syncrepl to ignore delete ops on deleted entry (ITS#9342)
    	Fixed slapd delta-syncrepl to be fully serialized (ITS#9330)
    	Fixed slapd delta-syncrepl MOD on zero-length context entry (ITS#9352)
    	Fixed slapd syncrepl to be fully serialized (ITS#8102)
    	Fixed slapd syncrepl to call check_syncprov on fresh consumer (ITS#9345)
    	Fixed slapd syncrepl to propagate errors from overlay_entry_get_ov (ITS#9355)
    	Fixed slapd syncrepl to not create empty ADD ops (ITS#9359)
    	Fixed slapd syncrepl replace usage on single valued attrs (ITS#9295)
    	Fixed slapd-monitor fix monitor_back_register_database for empty suffix DB (ITS#9353)
    	Fixed slapo-accesslog normalizer for reqStart (ITS#9358)
    	Fixed slapo-accesslog to not generate new contextCSN on purge (ITS#9361)
    	Fixed slapo-syncprov contextCSN generation with empty suffix (ITS#9015)
    	Fixed slapo-syncprov sessionlog to use a TAVL tree (ITS#8486)
       OpenLDAP 2.4.53 Release (2020/09/07)
    	Added slapd syncrepl additional SYNC logging (ITS#9043)
    	Fixed slapd syncrepl segfault on NULL cookie on REFRESH (ITS#9282)
    	Fixed slapd syncrepl to use fresh connection on REFRESH fallback (ITS#9338)
    	Fixed slapo-ppolicy race condition for pwdFailureTime (ITS#9302,ITS#9334)
    	Build
    		Require OpenSSL 1.0.2 or later (ITS#9323)
    		Fixed libldap compilation issue with broken C compilers (ITS#9332)
       OpenLDAP 2.4.52 Release (2020/08/28)
    	Added libldap LDAP_OPT_X_TLS_REQUIRE_SAN option (ITS#9318)
    	Added libldap OpenSSL support for multiple EECDH curves (ITS#9054)
    	Added slapd OpenSSL support for multiple EECDH curves (ITS#9054)
    	Fixed librewrite malloc/free corruption (ITS#9249)
    	Fixed libldap hang when using UDP and server down (ITS#9328)
    	Fixed slapd syncrepl rare deadlock due to network issues (ITS#9324)
    	Fixed slapd syncrepl regression that could trigger an assert (ITS#9329)
    	Fixed slapd-mdb index error with collapsed range (ITS#9135)
       OpenLDAP 2.4.51 Release (2020/08/11)
    	Added slapo-ppolicy implement Netscape password policy controls (ITS#9279)
    	Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650)
    	Fixed libldap to use getaddrinfo in ldap_pvt_get_fqdn (ITS#9287)
    	Fixed slapd to enforce singular existence of some overlays (ITS#9309)
    	Fixed slapd syncrepl to not delete non-replicated attrs (ITS#9227)
    	Fixed slapd syncrepl to correctly delete entries on resync (ITS#9282)
    	Fixed slapd syncrepl to use replace on single valued attrs (ITS#9294, ITS#9295)
    	Fixed slapd-perl dynamic config with threaded slapd (ITS#7573)
    	Fixed slapo-ppolicy to expose the ppolicy control (ITS#9285)
    	Fixed slapo-ppolicy race condition for pwdFailureTime (ITS#9302)
    	Fixed slapo-ppolicy so it can only exist once per DB (ITS#9309)
    	Fixed slapo-chain to check referral (ITS#9262)
    	Build Environment
    		Fix test064 so it no longer uses bashisms (ITS#9263)
    	Contrib
    		Fix default prefix value for pw-argon2, pw-pbkdf2 modules (ITS#9248)
    		slapo-allowed - Fix usage of unitialized variable (ITS#9308)
    	Documentation
    		ldap_parse_result(3) - Document ldap_parse_intermediate (ITS#9271)
       OpenLDAP 2.4.50 Release (2020/04/28)
    	Fixed client benign typos (ITS#8890)
    	Fixed libldap type cast (ITS#9175)
    	Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650)
    	Fixed libldap_r race on Windows mutex initialization (ITS#9181)
    	Fixed liblunicode memory leak (ITS#9198)
    	Fixed slapd benign typos (ITS#8890)
    	Fixed slapd to limit depth of nested filters (ITS#9202)
    	Fixed slapd-mdb memory leak in dnSuperiorMatch (ITS#9214)
    	Fixed slapo-pcache database initialization (ITS#9182)
    	Fixed slapo-ppolicy callback (ITS#9171)
    	Build
    		Fix olcDatabaseDummy initialization for windows (ITS#7074)
    		Fix detection for ws2tcpip.h for windows (ITS#8383)
    		Fix back-mdb types for windows (ITS#7878)
    	Contrib
    		Update ldapc++ config.guess and config.sub to support newer architectures (ITS#7855)
    		Added pw-argon2 module (ITS#9233, ITS#8575, ITS#9203, ITS#9206)
    	Documentation
    		slapd-ldap(5) - Clarify idassert-authzfrom behavior (ITS#9003)
    		slapd-meta(5) - Remove client-pr option (ITS#8683)
    		slapindex(8) - Fix truncate option information for back-mdb (ITS#9230)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 174778b20266c2c24f15784e090e7e8d10118642
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 18:59:21 2022 +0000
Core Update 168: Ship sqlite
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8596273dca625444ef1b28a7a7e61a1354c23c47
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 13:14:25 2022 +0200
sqlite: Update to version 3380300
- Update from version 3380000 to 3380300
    - Update of rootfile not required
    - Changelog
    	3.38.3 (2022-04-27):
    	    Fix a case of the query planner be overly aggressive with optimizing
                 automatic-index and Bloom-filter construction, using inappropriate ON clause
                 terms to restrict the size of the automatic-index or Bloom filter, and
                 resulting in missing rows in the output. Forum thread 0d3200f4f3bcd3a3.
    	    Other minor patches. See the timeline for details.
    	3.38.2 (2022-03-26):
    	    Fix a user-discovered problem with the new Bloom filter optimization that
                 might cause an incorrect answer when doing a LEFT JOIN with a WHERE clause
                 constraint that says that one of the columns on the right table of the LEFT
                 JOIN is NULL. See forum thread 031e262a89b6a9d2.
    	    Other minor patches. See the timeline for details.
    	3.38.1 (2022-03-12):
    	    Fix problems with the new Bloom filter optimization that might cause some
                 obscure queries to get an incorrect answer.
    	    Fix the localtime modifier of the date and time functions so that it
                 preserves fractional seconds.
    	    Fix the sqlite_offset SQL function so that it works correctly even in corner
                 cases such as when the argument is a virtual column or the column of a view.
    	    Fix row value IN operator constraints on virtual tables so that they work
                 correctly even if the virtual table implementation relies on bytecode to
                 filter rows that do not satisfy the constraint.
    	    Other minor fixes to assert() statements, test cases, and documentation. See
                 the source code timeline for details.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 94e680c36d2f16577e16dc7748721c990efde492
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 18:58:43 2022 +0000
Core Update 168: Ship mpfr
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ca0458ce1577f5793acaec9e25167b329fec43a3
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:24:34 2022 +0200
mpfr: Update to version 4.1.0 plus patches 1 to 13
- Update from version 4.1.0 to 4.1.0 plus patches 1 to 13
    - Version 4.1.0 was released on 10-07-2020. However patches have been progressively
       issued to fix various bugs that have been identified.
    - Currently 13 patches have been issued and mpfr provide a cumulative patches file to
       use to patch the source file.
    - Update of rootfile
    - Patch changelog
       1 With GCC (the only tested compiler with software _Decimal128), conversions of
         double to _Decimal128 yield an increase of 2 to 3 MB for the generated library
         code when the decimal encoding is BID (designed for software implementations),
         even though the conversions done in MPFR are very simple. Details about this GCC
         issue. The decimal128-conv patch avoids these conversions by directly using
         _Decimal128 constants. Note that fixing the issue entirely would require to get
         rid of all the decimal128 operations; in the mean time, decimal support (i.e.
         mpfr_get_decimal128 and mpfr_set_decimal128 functions) could be disabled at
         configure time.
         Corresponding changeset in the 4.1 branch: 14094.
       2 The random_deviate.c file contains non-portable code. This is fixed by the
         random_deviate patch.
         Corresponding changeset in the 4.1 branch: 14126.
       3 In the mpfr_set_z_2exp function, a huge mpz_t value can yield an integer overflow.
         This is fixed by the set_z_2exp-overflow patch (with testcases). Note that in
         practice, an integer overflow may occur only with a 32-bit ABI. Moreover, with a
         usual compilation, an integer overflow should here not yield any particular issue,
         assuming that the processor does signed addition and multiplication modulo 2^32 (as
         usual). However, UBsan would detect the overflow, and LTO might have unpredictable
         effects.
         Corresponding changesets in the 4.1 branch: 14147, 14151.
       4 Some function prototypes are slightly inconsistent. This is valid C code, but
         these inconsistencies are unintended and possibly confusing, and they trigger
         diagnostics with the -Warray-parameter option of the future GCC 11 (included in
         -Wall). This causes issues when testing MPFR. And since mpfr.h is concerned, this
         might also affect user code. This is fixed by the prototypes patch.
         Corresponding changeset in the 4.1 branch: 14411.
       5 In uncommon cases, the mpfr_digamma function needs to use an intermediate
         precision equal to the exponent of the input value, which may be huge. This is
         inefficient, and the code can request more memory than available, yielding a crash.
         The digamma-hugemem patch improves the implementation by making such a need much
         rarer; it also provides testcases showing a crash on 64-bit machines (at least).
         Corresponding changeset in the 4.1 branch: 14424.
       6 The mpfr_digamma function may have an erratic behavior in some cases (an assertion
         failure in debug mode). This is fixed by the digamma-interm-zero patch (with
         testcase).
         Corresponding changeset in the 4.1 branch: 14425.
       7 The Bessel functions (mpfr_j0, mpfr_j1, mpfr_jn, mpfr_y0, mpfr_y1, mpfr_yn) may
         have an erratic behavior in some cases (an assertion failure in debug mode). This
         is fixed by the jn-interm-zero patch (with testcase).
         Corresponding changeset in the 4.1 branch: 14426.
       8 The mpfr_digamma function may have an erratic behavior in some cases (an assertion
         failure in debug mode) when the reflection formula is used, i.e. when x < 1/2.
         This is fixed by the digamma-interm-zero2 patch (with testcase).
         Corresponding changeset in the 4.1 branch: 14435.
       9 The Bessel functions (mpfr_j0, mpfr_j1, mpfr_jn, mpfr_y0, mpfr_y1, mpfr_yn) may
         have an erratic behavior in some cases (an assertion failure in debug mode) when
         the asymptotic expansion is needed. This is fixed by the jyn_asympt-interm-zero
         patch (with testcase).
         Corresponding changeset in the 4.1 branch: 14436.
      10 Some functions are also implemented as macros, and such a macro should behave
         exactly like the corresponding function (if the code is valid for the function
         call). However, the following macros do not behave as if their argument were
         implicitly converted to the type from the function prototype: mpfr_nan_p,
         mpfr_inf_p, mpfr_zero_p, mpfr_regular_p, mpfr_get_prec, mpfr_get_exp,
         mpfr_copysign (third argument), mpfr_signbit and mpfr_set (second argument). For
         instance, providing an argument of type void * instead of mpfr_ptr or mpfr_srcptr
         will yield a compilation failure. Note that this issue does not exist in C++,
         which does not support such implicit conversions. Moreover, the mpfr_set macro
         evaluates its second argument twice (reported by David McCooey), which is
         incorrect if this evaluation has side effects. This is fixed by the macros patch
         (with testcases). Macros for the custom interface, which are explicitly documented
         as provided, do not follow these rules; the patch clarifies this point in the MPFR
         manual.
         Corresponding changesets in the 4.1 branch: 14468, 14469.
      11 The test programs tset_si and tset_sj fail if MPFR_USE_NO_MACRO is defined (e.g.,
         via -DMPFR_USE_NO_MACRO in CFLAGS). This is fixed by the tset_sij patch.
         Corresponding changeset in the 4.1 branch: 14470.
      12 The mpfr_get_str_ndigits function may raise the inexact flag. In a very reduced
         exponent range (e.g. in which the result would not be representable as a MPFR
         number), it has undefined behavior: it may return an incorrect value, crash, or
         loop, taking more and more memory. This is fixed by the get_str_ndigits patch,
         which also updates the tests to check these issues.
         Corresponding changeset in the 4.1 branch: 14490.
      13 The code for the formatted output functions (mpfr_printf, etc.) contains an
         incorrect assertion, checked only in debug mode, i.e. when MPFR has been
         configured with --enable-assert; this assertion failure occurs when the integer 0
         (of either a native type or mpfr_prec_t with the length specifier P) is output
         with the precision field equal to 0, i.e. when the corresponding string to output
         is empty. Otherwise, there should be no side effects since the code is actually
         valid in this case; but since the code incorrectly instructs the compiler that
         some variable cannot be 0, there might be an issue with some optimizations (very
         unlikely, though). This bug is fixed by the vasprintf-prec-zero patch, which also
         provides testcases.
         Corresponding changesets in the 4.1 branch: 14524, 14525.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 4b113aa68ebc522686c4c70155d6c69507d4d7d1
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:25:00 2022 +0200
mtr: Update to version 0.95
- Update from version 0.94 to 0.95
    - Update of rootfile not required
    - Changelog
    V0.95
       Aaron Lipinski (27):
             move net_send_batch call to its caller
             addr -> hostent for consistency
             re-init source too
             additional call from net_reopen
             refactor - group local, remote inits
             reset ctl address family at net_reopen
             accept only value used in structure
             tell dns process if we want 4 or 6
             resolve ipv6 only if we have ipv6
             remove wrapper only function
             init structures correctly wired up
             prepare host with h_addr_list
             remove temporaries
             extract convert_addrinfo_to_hostent function
             move conversion call to caller
             use addrinfo
             remove conversion function
             switch gui to addrinfo
             export DEFAULT_AF
             reset addr family before searching again
             freeaddrinfo
             export get_hostent_from_name
             make Hostname as const
             rename function
             dont show json option if not available
       Egor Panov (1):
             Updated Readme
       R.E. Wolff (2):
             Slight cleanup, but no fix for code that came up in a bugreport.
             increased max length suggested by YVS2014
       Roger Wolff (12):
       Rogier Wolff (2):
             Code formatting for Zenithal pull
             added clarification to readme suggested by Zenithal
       Sergei Trofimovich (1):
             ui/curses: always use "%s"-style format for printf()-style functions
       Vincent Bernat (3):
             ui: don't cast to void* when calling display_rawhost()
             net: fix MPLS display for curses and report
             report: fix display of MPLS labels when using --report
       Zenithal (1):
             Add display of destination with resolved addr under curses mode
       a1346054 (5):
             fix wrong bash completion flag
             fix shellcheck warnings
             unify codestyle
             fix spelling
             trim trailing whitespace
       gaamox@tutanota.com (1):
             Report secondary servers when CSV + wide report is enabled
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 9ee219315c2eb419126afd621e6664c6aefc36cb
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:25:13 2022 +0200
multipath-tools: Update to version 0.8.9
- Update from commit 386d288, bumped to version 0.7.7 (May 2018) to
       version 0.8.9 (Feb 2022)
    - Update of rootfile
    - Changelog
       No changelog file in the source tarball or on website. Changelog is the commit tree
       see https://github.com/opensvc/multipath-tools/commits/master for more details
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b4294a6a0959127003f4c2cb99887f3e64dc8c09
Author: Peter Müller peter.mueller@ipfire.org
Date:   Fri Apr 29 18:56:38 2022 +0000
Core Update 168: Ship nano
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 4b502cf0c2d4388d5b29c5656a35e75e34b4fafe
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:25:28 2022 +0200
nano: Update to version 6.3
- Update from version 6.2 to 6.3
    - Update of rootfile not required
    - Changelog
       Changes between v6.2 and v6.3:
        Benno Schulenberg (41):
          build: add the --disable-maintainer-mode option to ./configure
          build: fix compilation for --enable-{tiny,nanorc,color}
          build: fix compilation when configured with --disable-color
          build: remove an obsolete check -- the dependent code was deleted
          bump version numbers and add a news item for the 6.3 release
          display: suppress spotlight yellow and error red when NO_COLOR is set
          docs: add an example binding for copying text to the system clipboard
          execute: clear an anchor only when the whole buffer gets filtered
          execute: don't crash when an empty buffer is piped through a command
          execute: stay on the same line number when filtering the whole buffer
          feedback: show extra warning when writing failed due to "No space left"
          files: do not change to a higher directory when the working one is gone
          files: show a warning when the working directory is gone (when used)
          files: when the working directory exists, still check its accessibility
          filtering: close all output descriptors, so that 'xsel' will terminate
          formatting: change cursor position only after saving it in the undo item
          gnulib: pull in the workaround for a build problem on NetBSD
          gnulib: update to its current upstream state
          justify: stay at the same line number when doing a full justification
          painting: colorize text also after an unterminated start match
          painting: look for another start match only after the actual end match
          painting: recalculate the multidata when making large strides or changes
          painting: stop coloring an extremely long line after 2000 bytes
          painting: tighten the check for a lacking end match on a colored line
          syntax: xml: colorize /> properly, and colorize prolog tags differently
          syntax: xml: colorize user-defined entities differently
          tweaks: avoid a function call when two plain assignments will do
          tweaks: change the indentation of a list, to match other indentations
          tweaks: don't leave an orphaned temporary file behind when writing fails
          tweaks: elide an unneeded call of strlen()
          tweaks: exclude the extra truncation warning from the tiny version
          tweaks: make the triggering of the recalculation of multidata less eager
          tweaks: move the saving and restoring of flags to where it is needed
          tweaks: normalize the indentation after the previous change
          tweaks: prevent the adding of an unwanted newline in a different way
          tweaks: remove redundant braces, and add two translator hints
          tweaks: remove some stray spaces before a comma
          tweaks: simplify a bit of code, eliding two labels and three gotos
          tweaks: simplify a fragment of code, and fold two lines together
          tweaks: trim a few comments, rename a function, and reshuffle some code
          verbatim: with --zero, keep cursor in viewport when it was on bottom row
        Mike Frysinger (1):
          general: fix building for Windows
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit ff76241b271dc7fdceb7431c95cee299678c90f8
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 23:25:55 2022 +0200
ncdu: Update to version 1.17
- Update from version 1.16 to 1.17
    - Update of rootfile not required
    - Changelog
    	1.17 - 2022-04-28 - ncdu-1.17.tar.gz
    	    Add ‘dark-bg’ color scheme and use that by default
    	    Use natural sort order when sorting by file name
    	    Improve compatibility with C89 environments
    	    Fix wrong assumption about errno not being set by realloc()
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 843314ba98e0d6b8ab3d1760f49f256ff5cebb61
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 23:25:34 2022 +0200
parted: Update to version 3.5
- Update from 3.4 to 3.5
    - Update of rootfile
    - Changelog
       * Noteworthy changes in release 3.5 (2022-04-18) [stable]
    	** New Features
    	  Update to latest gnulib for 3.5 release
       * Noteworthy changes in release 3.4.64.2 (2022-04-05) [alpha]
    	** Bug Fixes
    	  usage: remove the mention of "a particular partition"
       * Noteworthy changes in release 3.4.64 (2022-03-30) [alpha]
    	** New Features
    	  Add --fix to --script mode to automatically fix problems like the backup
    	  GPT header not being at the end of a disk.
    	  Add use of the swap partition flag to msdos disk labeled disks.
    	  Allow the partition name to be an empty string when set in script mode.
    	  Add --json command line switch to output the details of the disk as JSON.
    	  Add support for the Linux home GUID using the linux-home flag.
    	** Bug Fixes
    	  Decrease disk sizes used in tests to make it easier to run the test suite
    	  on systems with less memory. Largest filesystem is now 267MB (fat32). The
    	  rest are only 10MB.
    	  Add aarch64 and mips64 as valid machines for testing.
    	  Escape colons and backslashes in the machine output. Device path,
    	  model, and partition name could all include these. They are now
    	  escaped with a backslash.
    	  Use libdevmapper's retry remove option when the device is BUSY. This
    	  prevents libdevmapper from printing confusin output when trying to
    	  remove a busy partition.
    	  Keep GUID specific attributes when writing the GPT header. Previously
    	  they were set to 0.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 9a39b090cc292ac815c912c198935a20e742959f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 28 13:52:30 2022 +0200
ncurses-compat: remove orphaned lfs file
- ncurses-compat was removed from make.sh in Core Update 119 together with the rootfile
    --ncurses-compat lfs file was left behind at that time
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3d767c8aad82ac8a4d8b164569136a138e19d9cf
Author: Peter Müller peter.mueller@ipfire.org
Date:   Tue Apr 26 11:25:59 2022 +0000
borgbackup: Fix rootfile on 32-bit ARM
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 1a9e81ce7f999628536c5fa33928f3e79a7d84cc
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Tue Apr 26 05:24:47 2022 +0200
ids.cgi: Remove etag data when deleting a provider.
Otherwise the same provider could not be added again at a later
    time if the stored etag is still valid.
In this case the server will not offer the rules and the provider
    could not be added.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 504fb53bcc1eb03af782d800b77ee6a1b6e4077b
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Tue Apr 26 05:23:44 2022 +0200
ids-functions.pl: Add remove_from_etags() function.
This function is used to drop the stored etags data of a given provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 91a8664b662ed506a7896b638c6d9d140485a5aa
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 25 21:15:23 2022 +0200
Revert "ruleset-sources: Remove support for PT Attack Team Detection rules."
The ruleset provider has recovered his github presence.
This reverts commit c8adaee1958ed0c382341e08949d5cb88bd58c7e.
commit b7a2d742b44aaac6b56ad73cbdab860debad345d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 23:26:41 2022 +0200
powertop: Update to version 2.14
- Update from v2.10 to 2.14
    - added ./autogen.sh to create configure file
    - Update of rootfile
    - Changelog
       No changelog provided anywhere. For details of changes see commits in the github
        repository - https://github.com/fenrus75/powertop/commits/master
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3098182fa7145490c4f1ee00db17f64e04c2299b
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 25 18:40:17 2022 +0000
Samba: Update ARM rootfiles
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 249d796b4b873fde6e4bf270b7028afe8073abc2
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 25 20:12:19 2022 +0200
convert-ids-backend-files: Wait until suricata has stopped sucessfully.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit aa2ab8c40b1cf5dcdcbe3c4ac9d44b8e0997db7d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 19:14:49 2022 +0000
Run ./make.sh update-contributors
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 2b9af93313e1f6f0a782a94131e87237debc42b7
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 19:14:08 2022 +0000
Core Update 168: Ship wakeonlan.cgi
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 154dfcb7a2ec7ab399f8ca5393987bfa8defefa9
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Wed Apr 20 14:13:09 2022 +0200
wakeonlan.cgi: Fix meta refresh tag
This fixes an HTML error that is briefly visible
    on the "magic packet sent" page.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 52224df18d06515d17b6dd7e1d309364d38b4335
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 19:13:37 2022 +0000
Core Update 168: Ship pcre2
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f86e23906ee01f5b9c9b4eea84957b78481e0048
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 23:26:13 2022 +0200
pcre2: Update to version 10.40
- Update from 10.39 to 10.40
    - Update of rootfile
    - Changelog
       Version 10.40 15-April-2022
    	1. Merged patch from @carenas (GitHub #35, 7db87842) to fix pcre2grep incorrect
    	   handling of multiple passes.
    	2. Merged patch from @carenas (GitHub #36, dae47509) to fix portability issue
    	   in pcre2grep with buffered fseek(stdin).
    	3. Merged patch from @carenas (GitHub #37, acc520924) to fix tests when -S is
    	   not supported.
    	4. Revert an unintended change in JIT repeat detection.
    	5. Merged patch from @carenas (GitHub #52, b037bfa1) to fix build on GNU Hurd.
    	6. Merged documentation and comments patches from @carenas (GitHub #47).
    	7. Merged patch from @carenas (GitHub #49) to remove obsolete JFriedl test code
    	   from pcre2grep.
    	8. Merged patch from @carenas (GitHub #48) to fix CMake install issue #46.
    	9. Merged patch from @carenas (GitHub #53) fixing NULL checks in matching and
    	   substituting.
    	10. Add null_subject and null_replacement modifiers to pcre2test.
    	11. Add check for NULL subject to POSIX regexec() function.
    	12. Add check for NULL replacement to pcre2_substitute().
    	13. For the subject arguments of pcre2_match(), pcre2_dfa_match(), and
    	    pcre2_substitute(), and the replacement argument of the latter, if the pointer
    	    is NULL and the length is zero, treat as an empty string. Apparently a number
    	    of applications treat NULL/0 in this way.
    	14. Added support for Bidi_Class and a number of binary Unicode properties,
    	    including Bidi_Control.
    	15. Fix some minor issues raised by clang sanitize.
    	16. Very minor code speed up for maximizing character property matches.
    	17. A number of changes to script matching for \p and \P:
    	    (a) Script extensions for a character are now coded as a bitmap instead of
    	        a list of script numbers, which should be faster and does not need a
    	        loop.
    	    (b) Added the syntax \p{script:xxx} and \p{script_extensions:xxx} (synonyms
    	        sc and scx).
    	    (c) Changed \p{scriptname} from being the same as \p{sc:scriptname} to being
    	        the same as \p{scx:scriptname} because this change happened in Perl at
    	        release 5.26.
    	    (d) The standard Unicode 4-letter abbreviations for script names are now
    	        recognized.
    	    (e) In accordance with Unicode and Perl's "loose matching" rules, spaces,
    	        hyphens, and underscores are ignored in property names, which are then
    	        matched independent of case.
    	18. The Python scripts in the maint directory have been refactored. There are
    	    now three scripts that generate pcre2_ucd.c, pcre2_ucp.h, and pcre2_ucptables.c
    	    (which is #included by pcre2_tables.c). The data lists that used to be
    	    duplicated are now held in a single common Python module.
    	19. On CHERI, and thus Arm's Morello prototype, pointers are represented as
    	    hardware capabilities, which consist of both an integer address and additional
    	    metadata, meaning they are twice the size of the platform's size_t type, i.e.
    	    16 bytes on a 64-bit system. The ovector member of heapframe happens to only be
    	    8 byte aligned, and so computing frame_size ended up with a multiple of 8 but
    	    not 16. Whilst the first frame was always suitably aligned, this then
    	    misaligned the frame that follows, resulting in an alignment fault when storing
    	    a pointer to Fecode at the start of match. Patch to fix this issue by Jessica
    	    Clarke PR#72.
    	20. Added -LP and -LS listing options to pcre2test.
    	21. A user discovered that the library names in CMakeLists.txt for MSVC
    	    debugger (PDB) files were incorrect - perhaps never tried for PCRE2?
    	22. An item such as [Aa] is optimized into a caseless single character match.
    	    When this was quantified (e.g. [Aa]{2}) and was also the last literal item in a
    	    pattern, the optimizing "must be present for a match" character check was not
    	    being flagged as caseless, causing some matches that should have succeeded to
    	    fail.
    	23. Fixed a unicode properrty matching issue in JIT. The character was not
    	    fully read in caseless matching.
    	24. Fixed an issue affecting recursions in JIT caused by duplicated data
    	    transfers.
    	25. Merged patch from @carenas (GitHub #96) which fixes some problems with
    	    pcre2test and readline/readedit:
    	      * Use the right header for libedit in FreeBSD with autoconf
    	      * Really allow libedit with cmake
    	      * Avoid using readline headers with libedit
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 854241e108ecf798a43fb9b30a53f1119783c149
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 19:09:23 2022 +0000
Core Update 168: Ship media.cgi
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 52f8118635b64f1edf5bfdd92d1351f5ec0959af
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Wed May 13 18:40:34 2020 +0200
media.cgi: Added translation for 'inodes'
For details see:
    https://en.wikipedia.org/wiki/Inode
or
http://www.linfo.org/inode.html ;-)
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
commit d6fc413aea8c863587a4793b320ab2db6c29eb5d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:34:11 2022 +0200
ipvsadm: Update to version 1.31
- Update from 1.29 to 1.31
    - Update of rootfile not required
    - Changelog
    	Version 1.31
    		In ipvsadm(8) add using nft or an eBPF program to set a packet mark
    		Add --pe sip option in ipvsadm(8) man page
    		ipvsadm: allow tunneling with gre encapsulation
    		Merge branch 'GUE-encap'
    		ipvsadm: allow tunneling with gue encapsulation
    		ipvsadm: convert options to unsigned long long
    	Version 1.30
    		Merge: ipvsadm: Document/add support for fo/ovf/mh schedulers
    		Add support for mh scheduler
    		Document support of ovf scheduler
    		Document support of fo scheduler
    		libipvs: fix some buffer sizes
    		libipvs: discrepancy with libnl genlmsg_put
    		ipvsadm: catch the original errno from netlink answer
    	Version 1.29
    		ipvsadm: new attributes for sync daemon
    		ipvsadm: support 64-bit stats and rates
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit b8ffb101f86d40c68482c8a305b760a382036d78
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:34:28 2022 +0200
keepalived: Update to version 2.2.7
- Update from 2.2.4 to 2.2.7
    - Update of rootfile
    - Changelog
       Release 2.2.7 brings lots of improvements and fix some minor issues reported. It add
        some new VRRP features as well. Stability has been even more extended.
    	New
    	    ipvs: Add support to twos scheduler.
    	    vrrp: Add vrf option for unicast without specifying an interface.
    	    vrrp: Add option unicast_fault_no_peer. Previously if unicast_src_ip (or any
                      other unicast option) was specified, but no unicast peers were
                      configured, then the VRRP instance would operate in multicast mode. A
                      user has identified that, due to automatic configuration generation,
                      they could have a configuration that should operate in unicast mode,
                      but that no unicast peers were configured. In this case, they did not
                      want the VRRP instance to revert to multicast mode. In order to
                      maintain backward compatibility, keepalived can’t simply change to not
                      allowing no unicast peers. Instead, this commit adds the configuration
                      option “unicast_fault_no_peer”, which if specified causes the VRRP
                      instance to go to fault state if no unicast peers are configured.
    	    vrrp: Allow specification of multicast address to be used.
    	    vrrp: Add vrf option to static and vrrp routes.
    	    vrrp: Add option to resend vrrp states on fifos after reload. Since
                      keepalived restarts FIFOs scripts it is managing when a reload occurs,
                      it can be helpful to send the VRRP instance and group states after a
                      reload. This commit adds option fifo_write_vrrp_states_on_reload to do
                      that, and it means that what is written to the FIFOs with default
                      configuration does not change.
    	    vrrp: Allow duplication of VRIDs on an interface with unicast peers. If two
                      VRRP instances are using unicast peers and there is no overlap of
                      unicast peers between the vrrp instances, then the vrrp instances can
                      use the same VRIDs.
    	    global: Don’t assume running as user root.
    	    systemd: Add keepalived-non-root.service systemd service file.
                         keepalived-non-root.service allows keepalived to be run as a non
                         root user, but with specific added capabilities to allow all the
                         functionality that keepalived needs.
    	Improvements
    	    vrrp: Stop receiving any data on garp and ndisc sockets. This is a send-only
                      channel.
    	    vrrp: Open gratuitous ARP socket as an ARP socket rather than RARP. Now that
                      the receiving of packets on the garp socket has been stopped, we can
                      open the socket with the correct type of binding, and we won’t have a
                      queue of received messages build up.
    	    vrrp: Extend cBPF filtering code to support standard definition.
    	    vrrp: Optimise nftables configuration to limit some rules to macvlans. If we
                      are moving messages that have been generated on a macvlan, we nftables
                      rules can be optimised to restrict them to macvlan interfaces.
    	    vrrp: Drop ICMPV6 Router Solicitation messages from vmac interfaces. When we
                      create a vmac interface, a short time afterwards the kernel sends a
                      router solicition message with the source MAC address of the vmac
                      interface. The problem is that this will upset snooping switches if
                      the VRRP instance is in backup state. Furthermore, we can’t simply
                      move the packet onto the underlying interface since the ICMPV6 payload
                      also contains the MAC address of the vmac interface. We can’t just
                      change the MAC address in the ICMPV6 message, since there is also a
                      checksum which would need to be recalculated. The only solution at the
                      moment is to drop the packet. This shouldn’t be a problem since the
                      underlying interface should have sent a Router solicitation message
                      when it came up.
    	    vrrp: Add option to specify MAC address for VMACs.
    	    vrrp: Don’t lose some configuration faults. The following errors were being
                      detected in vrrp_complete_instance() and the VRRP instance was then
                      supposed to be put into fault state since it couldn’t operate.
                      However, the need to go to fault state was subsequently being lost.
                      The configuration errors that were being lost were: (a) Configuring
                      use of a VMAC on a non Ethernet interface (b) Attempting to use
                      multicast on an interface that doesn’t support it (c) Using an ipvlan
                      without a source IP address (d) ipvlan address family not matching
                      VRRP isntance’s (e) VRID conflicts on an interface which could be
                      deleted an recreated on a different interface (f) An interface
                      specified for a VIP is the same as the VRRP instance’s VMAC or another
                      VRRP instance’s VMAC. This improvement ensures that the VRRP instance
                      will be put into, and remain in, fault state, since it cannot
                      successfully operate. As can be seen from the list of circumstances
                      above, they were very unlikely to occur, but were possible.
    	    vrrp: Bind IPv6 socket to multicast address. Previously IPv6 sockets were
                      being bound to the ::1 address, since trying to bind to the multicast
                      address was failing. The reason for failing has now been discovered to
                      be that the scope_id needed to be set (i.e. the interface index),
                      since the multicast addresses that we use are link-local multicast
                      addresses. This improvement now sets the scope_id, so the socket can
                      successfully be bound to the multicast address.
    	    vrrp: Set IPV6_MULTICAST_ALL on IPv6 sockets if available.
    	    vrrp: Some SNMP extension and improvements: - Correct FastOpenNoCookie and
                      L3Mdev variable types - Don’t write multicast address to SNMP when
                      using unicast. - Don’t write unconfigured LVS sync daemon address to
                      SNMP. - Define and use SNMP_TruthValue. - Define and use
                      SNMP_InetAddressType. - Correct reporting accept mode for VRRPv3 SNMP.
    	    vrrp: Misc DBus improvements (Opening, logging, data_dir, policy, …)
    	    vrrp: Handle VMAC’s interface changing on reload properly.
    	    vrrp: If accept traffic for VIPs changes on reload, update firewall.
    	    vrrp: Stop going to backup if reload IPv6 and change vmac_xmit_base.
    	    vrrp: Add add/prepend/append options to static and virtual routes. The
                      kernel by default prepends routes, whereas the ip (iproute2) utility
                      be default adds routes (adding a route does not allow duplicates
                      whereas appending or prepending does). keepalived previously has not
                      set the flags relating to this, and so has always prepended routes.
                      This means that duplicate routes could be created.
    	    lib: Update Red Black tree code to Linux 5.15-rc4.
    	    script: Extend sample_notify_fifo.sh.
    	    doc: Misc documentation updates.
    	    docker: Upate docker file.
    	    init: Init handling extensions. Make parent process exit with meaningful
                      status on error. Ensure systemd is not notified of successful start if
                      failed. fix building without systemd notify suport.
    	    bfd: handle unexpected closure of pipe to checker and vrrp processes. If the
                     parent process abnormally terminates and then the BFD process
                     terminates due to PDEATHSIG before the vrrp or checker processes
                     terminate, the vrrp and checker processes can get a read error on the
                     pipes used to communicate with the BFD process.
    	    bfd: make BFD work when IPv6 disabled on system.
    	Fixes
    	    lib: Fix calculating CLOCK_REALTIME and CLOCK_MONOTONIC offsets.
    	    lib: scheduler: Handle cancelling timer thread on ready queue. The timer
                     thread on the ready queue, if cancelled, was corrupting the read
                     list_head, since it assumed it was on a red black tree.
    	    snap: Fix building snaps.
    	    ipvs: Fix building with glibc prior to v2.19 (released 2014).
    	    bfd: Handle interface down/address missing when keepalived starts. This
                     resolves a segfault, and also makes bfd retry once per minute to create
                     send socket if it cannot do so due to no address to bind to on an
                     interface.
    	    vrrp: Fix unicast with interface in a VRF domain.
    	    vrrp: Fix moving excess VIPs to eVIPs, by properly handling vip_cnt.
    	    vrrp: Fix configured IPv6 multicast addresses with VMACs. Using different
                      multicast addresses with IPv6 on the same interface without using
                      VMACs is only supported if the kernel supports IPV6_MULTICAST_ALL
                     (from Linux v4.20).
    	    vrrp: Fix checking for unicast with VMAC/ipvlan and no peers.
    	    vrrp: Fix checking if have unicast ppers if unicast_ttl specified.
    	    vrrp: Don’t segfault if duplicate VMAC name, but ignore second name.
    	    vrrp: Don’t delete and recreate VMAC on reload if only VRID has changed.
                      There seems to be an issue deleting and then immediately recreating a
                      VMAC on the same interface. This commit therefore simply changes the
                      MAC address if the only change is the VRID.
    	    vrrp: Fix nftables config if VMAC interface changed on reload.
    	    vrrp: Don’t segfault if don’t have permission for ARP/NDISC socket.
    	    vrrp: Fix IPv6 with vmac_xmit_base.
    	    vrrp: fix disabling vmac-xmit-base with VRRPv3 IPv6 use_vmac.
    	    vrrp: Fix specifying user/group for vrrp_scripts.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 28fdd8ede6b241144e1aa3a05ac2c5ac82d56ae3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 19:01:13 2022 +0000
Core Update 168: Ship procps
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 0469187ca03c808f23521caf5e4749a41d3a95b2
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 23:26:55 2022 +0200
procps: Update to version v4.0.0
- Update from v3.3.16 to v4.0.0
    - added --disable-static to ./configure to remove static libs from rootfile
    - Update of rootfile
    - Changed lib name. Ran ./make.sh find-dependencies. No dependencies on old libraries
    - Changelog
        procps-ng-4.0.0
    	  * Rename pwait to pidwait
    	  * free: Add committed line option                        merge #25
    	  * free: Fix -h --si combined options                     issue #133, #223
    	  * free: Fix first column justification                   issue #229, #204, #206, Debian #1001689
    	  * free: Better spacing for Chinese language              issue #213
    	  * library: renamed to libproc-2 and reset to 0:0:0
    	  * library: add support for accessing smaps_rollup        issue #112, #201
    	  * library: add support for accessing autogroups
    	  * library: add support for LIBPROC_HIDE_KERNEL env var   merge #147
    	  * library: add support for cpu utilization to pids i/f
    	  * pkill: Check for lt- variants of program name          issue #192
    	  * pgrep: Add newline after regex error message           merge #91
    	  * pgrep: Fix selection where uid/gid > 2^31              merge !146
    	  * pgrep: Select on cgroup v2 paths                       issue #168
    	  * ps: Add OOM and OOMADJ fields                          issue #198
    	  * ps: Add IO Accounting fields                           issue #184
    	  * ps: Add PSS and USS fields                             issue #112
    	  * ps: Add two new autogroup fields
    	  * ps: Ignore SIGURG                                      merge !142
    	  * slabtop: Don't combine d and o options                 issue #160
    	  * sysctl: Add support for systemd glob patterns          issue #191
    	  * sysctl: Check resolved path to be under /proc/sys      issue #179
    	  * sysctl: return non-zero if EINVAL return for write     merge #76
    	  * sysctl.conf.5: Note max line length                    issue #77
    	  * top: added LOGID similar to 3.3.13 ps LUID
    	  * top: added EXE identical to 3.3.17 ps EXE
    	  * top: exploit some library smaps_rollup provisions      issue #112
    	  * top: added four new IO accounting fields               issue #184
    	  * top: 'F' key is now a new forest view 'focus' toggle
    	  * top: summary area memory lines can print two abreast
    	  * top: added two new autogroup fields
    	  * top: added long versions of command line options
    	  * top: added cpu utilization & 2 time related fields
    	  * top: the time related fields can now be user scaled
    	  * uptime: print short/pretty format correctly            issue #217
    	  * vmstat: add -y option to remove first line             merge !72
        procps-ng-3.3.17
    	  * library: Incremented to 8:3:0
    	    (no removals or additions, internal changes only)
    	  * all: properly handle utf8 cmdline translations         issue #176
    	  * kill: Pass int to signalled process                    merge #32
    	  * pgrep: Pass int to signalled process                   merge #32
    	  * pgrep: Check sanity of SG_ARG_MAX                      issue #152
    	  * pgrep: Add older than selection                        merge #79
    	  * pidof: Quiet mode                                      merge #83
    	  * pidof: show worker threads                             Redhat #1803640
    	  * ps.1: Mention stime alias                              issue #164
    	  * ps: check also match on truncated 16 char comm names
    	  * ps: Add exe output option                              Redhat #1399206
    	  * pwait: New command waits for a process                 merge #97
    	  * sysctl: Match systemd directory order                  Debian #950788
    	  * sysctl: Document directory order                       Debian #951550
    	  * top: ensure config file backward compatibility         Debian #951335
    	  * top: add command line 'e' for symmetry with 'E'        issue #165
    	  * top: add '4' toggle for two abreast cpu display        issue #172
    	  * top: add '!' toggle for combining multiple cpus
    	  * top: fix potential SEGV involving -p switch            merge #114
    	  * vmstat: Wide mode gives wider proc columns             merge #48
    	  * watch: Add environment variable for interval           merge #62
    	  * watch: Add no linewrap option                          issue #182
    	  * watch: Support more colors                             merge #106,#109
    	  * free,uptime,slabtop: complain about extra ops          issue #181
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 3a5ba6cf97322c9c931b841d72a3642109b2718c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 16:29:49 2022 +0000
Core Update 168: Ship pango
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 0487d6a5754fb2121dfcd61ca98d6e3a902cf0a9
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 5 15:47:47 2022 +0200
pango: Update to version 1.50.6
- Update from 1.50.4 to 1.50.6
    - Update of rootfile
    - Changelog
        Overview of changes in 1.50.6, 19-03-2022
    	- Drop hb-glib dependency
    	- Fix test font configuration
    	- Maintain order in pango_attr_list_change
    	- Fix a use-after-free in pango_attr_list_change
        Overview of changes in 1.50.5, 03-03-2022
    	* Fix compiler warnings
    	* Enable cairo by default
    	* pango-view: Show more baselines
    	* layout: Handle baselines
    	* Windows: build cleanups
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit b26c72d569ebf1ee00f54e4d6363f5cbfd59abf3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 16:08:12 2022 +0000
Core Update 168: Ship logwatch
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ab473dd36372980a7603ece7f1c766fd848d74f2
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Sat Apr 16 13:07:00 2022 +0200
logwatch: Update to 7.6
The developers do not provide a changelog, the only comment I could find was on:
https://packetstormsecurity.com/files/165672/Logwatch-7.6.html
"Changes: Fixed bugs."
Running here on Core 166. No seen problems.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
commit cdf0522ec2b944ce0b6aac5d6baa49c96930d660
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sun Apr 24 12:43:16 2022 +0200
HTML: Add language attribute
This attribute is recommended by W3C, because it is used by
    screen readers to provide the correct pronunciation.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 7b5f057a485be990445fe0d5448abdd3946bca84
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 21 09:51:46 2022 +0200
perl-JSON: Installation of new package required by samba
- Installation of lfs and rootfile for perl-JSON - required by samba-4.16.0
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit e8e8b6ae29176e605143c8927ba402078cdc4f54
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 21 09:51:45 2022 +0200
samba: Update to version 4.16.0
- Update from version 4.15.5 to 4.16.0
    - Update of rootfile
    - perl-JSON now added to samba requirements. Additional patch combined with this on for
       install of perl-JSON
    - Changelog
       Release Notes for Samba 4.16.0
         NEW FEATURES/CHANGES
    	New samba-dcerpcd binary to provide DCERPC in the member server setup
    		In order to make it much easier to break out the DCERPC services
    		from smbd, a new samba-dcerpcd binary has been created.
    		samba-dcerpcd can be used in two ways. In the normal case without
    		startup script modification it is invoked on demand from smbd or
    		winbind --np-helper to serve DCERPC over named pipes. Note that
    		in order to run in this mode the smb.conf [global] section has
    		a new parameter "rpc start on demand helpers = [true|false]".
    		This parameter is set to "true" by default, meaning no changes to
    		smb.conf files are needed to run samba-dcerpcd on demand as a named
    		pipe helper.
    		It can also be used in a standalone mode where it is started
    		separately from smbd or winbind but this requires changes to system
    		startup scripts, and in addition a change to smb.conf, setting the new
    		[global] parameter "rpc start on demand helpers = false". If "rpc
    		start on demand helpers" is not set to false, samba-dcerpcd will
    		refuse to start in standalone mode.
    		Note that when Samba is run in the Active Directory Domain Controller
    		mode the samba binary that provides the AD code will still provide its
    		normal DCERPC services whilst allowing samba-dcerpcd to provide
    		services like SRVSVC in the same way that smbd used to in this
    		configuration.
    		The parameters that allowed some smbd-hosted services to be started
    		externally are now gone (detailed below) as this is now the default
    		setting.
    		samba-dcerpcd can also be useful for use outside of the Samba
    		framework, for example, use with the Linux kernel SMB2 server ksmbd or
    		possibly other SMB2 server implementations.
    	Heimdal-8.0pre used for Samba Internal Kerberos, adds FAST support
    		Samba has since Samba 4.0 included a snapshot of the Heimdal Kerberos
    		implementation.  This snapshot has now been updated and will closely
    		match what will be released as Heimdal 8.0 shortly.
    		This is a major update, previously we used a snapshot of Heimdal from
    		2011, and brings important new Kerberos security features such as
    		Kerberos request armoring, known as FAST.  This tunnels ticket
    		requests and replies that might be encrypted with a weak password
    		inside a wrapper built with a stronger password, say from a machine
    		account.
    		In Heimdal and MIT modes Samba's KDC now supports FAST, for the
    		support of non-Windows clients.
    		Windows clients will not use this feature however, as they do not
    		attempt to do so against a server not advertising domain Functional
    		Level 2012.  Samba users are of course free to modify how Samba
    		advertises itself, but use with Windows clients is not supported "out
    		of the box".
    		Finally, Samba also uses a per-KDC, not per-realm 'cookie' to secure part of
    		the FAST protocol.  A future version will align this more closely with
    		Microsoft AD behaviour.
    		If FAST needs to be disabled on your Samba KDC, set
    		 kdc enable fast = no
    		in the smb.conf.
    	Certificate Auto Enrollment
    		Certificate Auto Enrollment allows devices to enroll for certificates from
    		Active Directory Certificate Services. It is enabled by Group Policy.
    		To enable Certificate Auto Enrollment, Samba's group policy will need to be
    		enabled by setting the smb.conf option `apply group policies` to Yes. Samba
    		Certificate Auto Enrollment depends on certmonger, the cepces certmonger
    		plugin, and sscep. Samba uses sscep to download the CA root chain, then uses
    		certmonger paired with cepces to monitor the host certificate templates.
    		Certificates are installed in /var/lib/samba/certs and private keys are
    		installed in /var/lib/samba/private/certs.
    	Ability to add ports to dns forwarder addresses in internal DNS backend
    		The internal DNS server of Samba forwards queries non-AD zones to one or more
    		configured forwarders. Up until now it has been assumed that these forwarders
    		listen on port 53. Starting with this version it is possible to configure the
    		port using host:port notation. See smb.conf for more details. Existing setups
    		are not affected, as the default port is 53.
    	CTDB changes
    		* The "recovery master" role has been renamed "leader"
    		  Documentation and logs now refer to "leader".
    		  The following ctdb tool command names have changed:
    		    recmaster -> leader
    		    setrecmasterrole -> setleaderrole
    		  Command output has changed for the following commands:
    		    status
    		    getcapabilities
    		  The "[legacy] -> recmaster capability" configuration option has been
    		  renamed and moved to the cluster section, so this is now:
    		    [cluster] -> leader capability
    		* The "recovery lock" has been renamed "cluster lock"
    		  Documentation and logs now refer to "cluster lock".
    		  The "[cluster] -> recovery lock" configuration option has been
    		  deprecated and will be removed in a future version.  Please use
    		  "[cluster] -> cluster lock" instead.
    		  If the cluster lock is enabled then traditional elections are not
    		  done and leader elections use a race for the cluster lock.  This
    		  avoids various conditions where a node is elected leader but can not
    		  take the cluster lock.  Such conditions included:
    		  - At startup, a node elects itself leader of its own cluster before
    		    connecting to other nodes
    		  - Cluster filesystem failover is slow
    		  The abbreviation "reclock" is still used in many places, because a
    		  better abbreviation eludes us (i.e. "clock" is obvious bad) and
    		  changing all instances would require a lot of churn.  If the
    		  abbreviation "reclock" for "cluster lock" is confusing, please
    		  consider mentally prefixing it with "really excellent".
    		* CTDB now uses leader broadcasts and an associated timeout to
    		  determine if an election is required
    		  The leader broadcast timeout can be configured via new configuration
    		  option
    		    [cluster] -> leader timeout
    		  This specifies the number of seconds without leader broadcasts
    		  before a node calls an election.  The default is 5.
         REMOVED FEATURES
    	  Older SMB1 protocol SMBCopy command removed
    		SMB is a nearly 30-year old protocol, and some protocol commands that
    		while supported in all versions, have not seen widespread use.
    		One of those is SMBCopy, a feature for a server-side copy of a file.
    		This feature has been so unmaintained that Samba has no testsuite for
    		it.
    		The SMB1 command SMB_COM_COPY (SMB1 command number 0x29) was
    		introduced in the LAN Manager 1.0 dialect and it was rendered obsolete
    		in the NT LAN Manager dialect.
    		Therefore it has been removed from the Samba smbd server.
    		We do note that a fully supported and tested server-side copy is
    		present in SMB2, and can be accessed with "scopy" subcommand in
    		smbclient)
    	  SMB1 server-side wildcard expansion removed
    		Server-side wildcard expansion is another feature that sounds useful,
    		but is also rarely used and has become problematic - imposing extra
    		work on the server (both in terms of code and CPU time).
    		In actual OS design, wildcard expansion is handled in the local shell,
    		not at the remote server using SMB wildcard syntax (which is not shell
    		syntax).
    		In Samba 4.16 the ability to process file name wildcards in requests
    		using the SMB1 commands SMB_COM_RENAME (SMB1 command number 0x7),
    		SMB_COM_NT_RENAME (SMB1 command number 0xA5) and SMB_COM_DELETE (SMB1
    		command number 0x6) has been removed.
    	  SMB1 protocol has been deprecated, particularly older dialects
    		We take this opportunity to remind that we have deprecated and
    		disabled by default, but not removed, the whole SMB1 protocol since
    		Samba 4.11.  If needed for security purposes or code maintenance we
    		will continue to remove older protocol commands and dialects that are
    		unused or have been replaced in more modern SMB1 versions.
    		We specifically deprecate the older dialects older than "NT LM 0.12"
    		(also known as "NT LANMAN 1.0" and "NT1").
    		Please note that "NT LM 0.12" is the dialect used by software as old
    		as Windows 95, Windows NT and Samba 2.0, so this deprecation applies
    		to DOS and similar era clients.
    		We do reassure that that 'simple' operation of older clients than
    		these (eg DOS) will, while untested, continue for the near future, our
    		purpose is not to cripple use of Samba in unique situations, but to
    		reduce the maintaince burden.
    		Eventually SMB1 as a whole will be removed, but no broader change is
    		announced for 4.16.
    		In the rare case where the above changes cause incompatibilities,
    		users requiring support for these features will need to use older
    		versions of Samba.
    	  No longer using Linux mandatory locks for sharemodes
    		smbd mapped sharemodes to Linux mandatory locks. This code in the Linux kernel
    		was broken for a long time, and is planned to be removed with Linux 5.15. This
    		Samba release removes the usage of mandatory locks for sharemodes and the
    		"kernel share modes" config parameter is changed to default to "no". The Samba
    		VFS interface is kept, so that file-system specific VFS modules can still use
    		private calls for enforcing sharemodes.
    	  smb.conf changes
    		  Parameter Name                          Description     Default
    		  --------------                          -----------     -------
    		  kernel share modes                      New default     No
    		  dns forwarder                           Changed
    		  rpc_daemon                              Removed
    		  rpc_server                              Removed
    		  rpc start on demand helpers             Added           true
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 8b84073efb4113afe48e6ca12e1c04ed934bd855
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 21 21:31:30 2022 +0200
git: Update to version 2.36.0
- Update from 2.35.1 to 2.36.0
    - Update of rootfile
    - Changelog
       2.36 Release Notes
    	These are too long to include here. To see the details go to the following link
            https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.36...
       2.35.3.txt Release Notes
    	This release merges up the fixes that appear in v2.35.3.
       2.35.2 Release Notes
    	This release merges up the fixes that appear in v2.30.3,
    	v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security
    	issue CVE-2022-24765; see the release notes for these versions
    	for details.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 2e9899036a64e4d1fcccedb1a2eeefca0af7a7e2
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:35:26 2022 +0200
stunnel: Update to version 5.63
- Update from version 5.62 to 5.63
    - Update of rootfile not required
    - Changelog
        Version 5.63, 2022.03.15
    	* Security bugfixes
    	  - OpenSSL DLLs updated to version 3.0.2.
    	* New features
    	  - Updated stunnel.spec to support bash completion
    	* Bugfixes
    	  - Fixed possible PRNG initialization crash (thx to Gleydson Soares).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 6dd63f5e7f33d2948132f7412f75cd4473e7b148
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:35:10 2022 +0200
stress: Update to version 1.0.5
- Update from version 1.0.4 to 1.0.5
    - Update of rootfile not required
    - Changelog
        Version 1.0.5
    	  * Added CI test for GitHub.
    	  * Migrated manpage system to txt2man.
    	  * Modernized system install.
    	  * Set right permissions to source code.
    	  * Updated README and added a CONTRIBUTING file.
    	  * Other minor changes and improvements.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit ac8da780aa611e2b86e49ec02a7d0c4c4b9bfc26
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:34:58 2022 +0200
strace: Update to version 5.17
- Update from 5.14 to 5.17
    - Update of rootfile not required
    - Changelog
       Noteworthy changes in release 5.17 (2022-03-26)
    	* Improvements
    	  * Added 64-bit LoongArch architecture support.
    	  * Extended personality designation syntax of syscall specification expressions
    	    to support all@pers and %class@pers.
    	  * Enhanced rejection of invalid syscall numbers in syscall specification
    	    expressions.
    	  * Implemented decoding of set_mempolicy_home_node syscall, introduced
    	    in Linux 5.17.
    	  * Implemented decoding of IFLA_GRO_MAX_SIZE and TCA_ACT_IN_HW_COUNT netlink
    	    attributes.
    	  * Implemented decoding of PR_SET_VMA operation of prctl syscall.
    	  * Implemented decoding of siginfo_t.si_pkey field.
    	  * Implemented decoding of LIRC ioctl commands.
    	  * Updated lists of FAN_*, IORING_*, IOSQE_*, KEY_*, KVM_*, MODULE_INIT_*,
    	    TCA_ACT_*, and *_MAGIC constants.
    	  * Updated lists of ioctl commands from Linux 5.17.
       Noteworthy changes in release 5.16 (2022-01-10)
    	* Improvements
    	  * Implemented --secontext=mismatch option to find mismatches in SELinux
    	    contexts.
    	  * Implemented decoding of futex_waitv syscall introduced in Linux 5.16.
    	  * Implemented decoding of BPF_LINK_GET_NEXT_ID and BPF_LINK_GET_FD_BY_ID bpf
    	    syscall commands.
    	  * Enhanced decoding of BPF_MAP_CREATE, BPF_PROG_TEST_RUN, and BPF_PROG_LOAD
    	    bpf syscall commands.
    	  * Enhanced decoding of BTRFS_IOC_FS_INFO ioctl command.
    	  * Updated lists of AUDIT_*, BPF_*, BTRFS_*, DEVCONF_*, FAN_*, ETH_P_*,
    	    IPV4_DEVCONF_*, KVM_*, NDA_*, SO_*, and V4L2_* constants.
    	  * Updated lists of ioctl commands from Linux 5.16.
    	* Bug fixes
    	  * Fixed build for older Android.
       Noteworthy changes in release 5.15 (2021-12-01)
    	* Improvements
    	  * Implemented --strings-in-hex=non-ascii-chars option for using hexadecimal
    	    numbers instead of octal ones in escape sequences in the output strings.
    	  * Implemented --decode-pids=comm option (and its alias -Y) for printing
    	    command names for PIDs.
    	  * Implemented --decode-pids=pidns as an alias to --pidns-translation option.
    	  * Implemented printing of current working directory when AT_FDCWD constant
    	    is used with --decode-fds=path option enabled.
    	  * Improved printing of syscall names in places where the associated
    	    AUDIT_ARCH_* value is present (ptrace PTRACE_GET_SYSCALL_INFO request,
    	    SIGSYS siginfo_t).
    	  * Implemented decoding of process_mrelease syscall, introduced in Linux 5.15.
    	  * Implemented decoding of SECCOMP_GET_NOTIF_SIZES operation of seccomp
    	    syscall.
    	  * Implemented decoding of HDIO_*, KD*, and SECCOMP_* ioctl commands.
    	  * Implemented decoding of RTM_NEWCACHEREPORT, RTM_{NEW,DEL,GET}NEXTHOP,
    	    and RTM_{NEW,GET}STATS NETLINK_ROUTE netlink messages.
    	  * Implemented decoding of AF_ALG, AF_IEEE802154, AF_MCTP, AF_NFC, AF_QIPCRTR,
    	    AF_RRPC, AF_VSOCK, and AF_XDP socket addresses.
    	  * Implemented decoding of AF_BRIDGE and AF_MCTP protocols for IFLA_AF_SPEC
    	    netlink attribute.
    	  * Implemented decoding of IFLA_BR_MCAST_QUERIER_STATE, IFLA_BR_MULTI_BOOLOPT,
    	    IFLA_INET6_RA_MTU, IFLA_INFO_SLAVE_DATA, and IFLA_VFINFO_LIST netlink
    	    attributes.
    	  * Enhanced decoding of io_uring_register and times syscalls.
    	  * Enhanced IFLA_BR_FORWARD_DELAY, IFLA_BR_MAX_AGE, IFLA_EXT_MASK,
    	    IFLA_PROTINFO, *_INTVL, and *_TIMER netlink attribute decoding.
    	  * Enhanced decoding of AF_IPX and AF_NETLINK socket addresses.
    	  * Updated lists o AF_*, ARPHRD_*, BTRFS_*, DEVCONF_*, DM_*, ETH_P_*,
    	    FAN_REPORT_*, IORING_*, MOVE_MOUNT_*, MPOL_*, PACKET_*, RTM_*, SO_*,
    	    and XFRM_MSG_* constants.
    	  * Updated lists of ioctl commands from Linux 5.15.
    	* Bug fixes
    	  * Fixed printing of struct bpf_prog_info.map_ids array.
    	  * Fixed behaviour of "dev", "pidfd", and "socket" arguments of the --print-fds
    	    option to no longer imply the "path" argument.
    	  * Fixed insufficient buffer size used for network interface name printing,
    	    that previously led to assertions on attempts of printing interface names
    	    that require quoting, for example, names longer than 4 characters in -xx
    	    mode (addresses RHBZ bug #2028146).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 2a85fc7a124c918d6b431c04e255e03f364cc84b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:34:42 2022 +0200
lcdproc: Update to version 0.5.9
- Update from version 0.5.7 (2016) to 0.5.9 (2017)
    - Update of rootfile
    - This patch brings lcdproc up to date with the most recent release.
    - Although there are no new releases there are continuing ongoing commits and issue fixes
       being done in the repository with the last commit being in Dec 2021.
      Not sure why no new releases are being done. It looks like any of the commits that fix
       issuse people have raised have to be patched by the interested people.
    - Changelog
          0.5.9
    	  This is mostly a code cleanup, bugfix and maintainance release.
    		Drivers supporting new hardware or additional functionality
    		    HD44780 connection type "serial" supports Portwell EZIO-100 and EZIO-300
    		    HD44780 connection type "gpio" supports dual controller displays.
    		    This connection type is now a full replacement for the obsolete "rpi"
    		    connection type.
    		Removed configure flags
    		    enable-permissive-menu-goto is replaced by a setting in LCDd.conf
    		    enable-seamless-hbars is now selected by drivers that need it automatically
    		Other important changes
    		    The build system now specifies the language as C99.
    		    API: drivers need to include "shared/report.h" instead of "report.h"
    		    libftdi1 is used if it is available instead of obsolete libftdi
    		    display update interval is selectable from LCDd.conf
         0.5.8
    		New drivers
    		    futaba: for Futaba TOSD-5711BB VFDisplay commonly used on Elonex Artisan,
    		    Fujitsu Scaleo E and FIC Spectra Media Centre PCs
    		    linux_input: supporting event devices from the linux input subsystem
    		    Olimex_MOD_LCD1x9: for Olimex MOD-LCD1x9
    		    yard2LCD: for yard2
    		New connection types for hd44780 driver
    		    lcm162 is a differently wired 8 bit connection type used on Nextgate NSA
    		    network appliances
    		    gpio is using the linux sysfs gpio interface to control a display in
    		    4-bit mode. To build this sub-driver you need
    		    libugpio, which is a new dependency
    		    for lcdproc.
    		Obsolete connection types for hd44780 driver
    		 The following connection types are obsolete and probably won't get bug
    		  and security fixes:
    		    raspberrypi: use the gpio connection type instead
    		    piplate: use the gpio connection type together with the gpio-mcp23s08
    		    kernel module.
    		    pifacecad: use the gpio connection type together with the gpio-mcp23s08
    		    kernel module.
    		    i2c: support for this sub-driver might continue for the users of
    		    non-linux operating systems. On linux systems it is recommended to
    		    use the gpio connection type together with the gpio-pcf857x kernel
    		    module.
    		Drivers supporting new hardware or additional functionality
    		    icp_a106 now also supports A125 displays
    		    NoritakeVFD added some non-essential features
    		Other important changes
    		    Development of lcdproc moved to github.
    		    Some internal data structures have changed. If you have custom LCDd
    		    drivers, you will need to recompile them against the new version. Of
    		    course submitting such drivers in pull requests is appreciated.
    		    For a detailed list of bug fixes, see the ChangeLog.md included in the
    		    distribution archive.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit fd4c9f98b8eba436ae16a03b2487ea308aaa94e7
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 14:17:24 2022 +0000
Core Update 168: Ship ipset
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 1b16f712c6895c462973f4c021be67cd80aabd8f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:33:58 2022 +0200
ipset: Update to version 7.15
- Update from 7.11 to 7.15
    - Update of rootfile
    - Changelog
    	7.15
    	    Kernel part changes
    	        netfilter: ipset: Fix maximal range check in hash_ipportnet4_uadt()
    	7.14
    	    Userspace changes
    	        Add missing function to libipset.map and bump library version
    	    Kernel part changes
    	        64bit division isn't allowed on 32bit, replace it with shift
    	7.13
    	    Userspace changes
    	        When parsing protocols by number, do not check it in /etc/protocols.
    	        Add missing hunk to patch "Allow specifying protocols by number"
    	    Kernel part changes
    	        Limit the maximal range of consecutive elements to add/delete fix
    	7.12
    	    Userspace changes
    	        Allow specifying protocols by number
    	        Fix example in ipset.8 manpage
    	        tests: add tests ipset to nftables
    	        add ipset to nftables translation infrastructur
    	        lib: Detach restore routine from parser
    	        lib: split parser from command execution
    	        Fix patch "Parse port before trying by service name"
    	    Kernel part changes
    	        Limit the maximal range of consecutive elements to add/delete
    	        Backport "netfilter: use nfnetlink_unicast()"
    	        Backport "netfilter: nfnetlink: consolidate callback type"
    	        Backport "netfilter: nfnetlink: add struct nfnl_info and pass it to
                     callbacks"
    	        Backport "netfilter: add helper function to set up the nfnetlink header
                     and use it"
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 22ceda82b63226570ae7a79da99cec84855d8f25
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 14:15:30 2022 +0000
Core Update 168: Ship harfbuzz
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f5ebb58ab484b0d966f951e7aaf9dd6eb0611418
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 5 15:47:30 2022 +0200
harfbuzz: Update to version 4.2.0
- Update from 3.4.0 to 4.2.0
    - Update of rootfile
    - Changelog
       Overview of changes leading to 4.2.0
         Wednesday, March 30, 2022
    	- Source code reorganization, splitting large hb-ot-layout files into smaller,
    	  per-subtable ones under OT/Layout/*. Code for more tables will follow suit in
    	  later releases. (Garret Rieger, Behdad Esfahbod)
    	- Revert Indic shaper change in previous release that broke some fonts and
    	  instead make per-syllable restriction of “GSUB” application limited to
    	  script-specific Indic features, while applying them and discretionary
    	  features in one go. (Behdad Esfahbod)
    	- Fix decoding of private in gvar table. (Behdad Esfahbod)
    	- Fix handling of contextual lookups that delete too many glyphs. (Behdad Esfahbod)
    	- Make “morx” deleted glyphs don’t block “GPOS” application. (Behdad Esfahbod)
    	- Various build fixes. (Chun-wei Fan, Khaled Hosny)
    	- New API
    	   +hb_set_next_many() (Andrew John)
       Overview of changes leading to 4.1.0
         Wednesday, March 23, 2022
    	- Various OSS-Fuzz fixes. (Behdad Esfahbod)
    	- Make fallback vertical-origin match FreeType’s. (Behdad Esfahbod)
    	- Treat visible viramas like dependent vowels in USE shaper. (David Corbett)
    	- Apply presentation forms features and discretionary features in one go in
    	  Indic shaper, which seems to match Uniscribe and CoreText behaviour.
    	  (Behdad Esfahbod, David Corbett)
    	- Various bug fixes.
    	- New API
    	   +hb_set_add_sorted_array() (Andrew John)
       Overview of changes leading to 4.0.1
         Friday, March 11, 2022
    	- Update OpenType to AAT mappings for “hist” and “vrtr” features.
    	  (Florian Pircher)
    	- Update IANA Language Subtag Registry to 2022-03-02. (David Corbett)
    	- Update USE shaper to allow any non-numeric tail in a symbol cluster, and
    	  remove obsolete data overrides. (David Corbett)
    	- Fix handling of baseline variations to return correctly scaled values.
    	  (Matthias Clasen)
    	- A new experimental hb_subset_repack_or_fail() to repack an array of objects,
    	  eliminating offset overflows. The API is not available unless HarfBuzz is
    	  built with experimental APIs enabled. (Qunxin Liu)
    	- New experimental API
    	   +hb_link_t
    	   +hb_object_t
    	   +hb_subset_repack_or_fail()
       Overview of changes leading to 4.0.0
         Tuesday, March 1, 2022
    	- New public API to create subset plan and gather information on things like
    	  glyph mappings in the final subset. The plan can then be passed on to perform
    	  the subsetting operation. (Garret Rieger)
    	- Draw API for extracting glyph shapes have been extended and finalized and is
    	  no longer an experimental API. The draw API supports glyf, CFF and CFF2
    	  glyph outlines tables, and applies variation settings set on the font as well
    	  as synthetic slant. The new public API is not backward compatible with the
    	  previous, non-public, experimental API. (Behdad Esfahbod)
    	- The hb-view tool will use HarfBuzz draw API to render the glyphs instead of
    	  cairo-ft when compiled with Cairo 1.17.5 or newer, setting HB_DRAW
    	  environment variable to 1 or 0 will force using or not use the draw API,
    	  respectively. (Behdad Esfahbod)
    	- The hb-shape and hb-view tools now default to using HarfBuzz’s own font
    	  loading functions (ot) instead of FreeType ones (ft). They also have a new
    	  option, --font-slant, to apply synthetic slant to the font. (Behdad Esfahbod)
    	- HarfBuzz now supports more than 65535 (the OpenType limit) glyph shapes and
    	  metrics. See https://github.com/be-fonts/boring-expansion-spec/issues/6 and
    	  https://github.com/be-fonts/boring-expansion-spec/issues/7 for details.
    	  (Behdad Esfahbod)
    	- New API to get the dominant horizontal baseline tag for a given script.
    	  (Behdad Esfahbod)
    	- New API to get the baseline positions from the font, and synthesize missing
    	  ones. As well as new API to get font metrics and synthesize missing ones.
    	  (Matthias Clasen)
    	- Improvements to finding dependencies on Windows when building with Visual
    	  Studio. (Chun-wei Fan)
    	- New buffer flag, HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT, that must be set
    	  during shaping for HB_GLYPH_FLAG_UNSAFE_TO_CONCAT flag to be reliably
    	  produced. This is to limit the performance hit of producing this flag to when
    	  it is actually needed. (Behdad Esfahbod)
    	- Documentation improvements. (Matthias Clasen)
    	- New API
    	 - General:
    	   +HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT
    	   +hb_var_num_t
    	 - Draw:
    	   +hb_draw_funcs_t
    	   +hb_draw_funcs_create()
    	   +hb_draw_funcs_reference()
    	   +hb_draw_funcs_destroy()
    	   +hb_draw_funcs_is_immutable()
    	   +hb_draw_funcs_make_immutable()
    	   +hb_draw_move_to_func_t
    	   +hb_draw_funcs_set_move_to_func()
    	   +hb_draw_line_to_func_t
    	   +hb_draw_funcs_set_line_to_func()
    	   +hb_draw_quadratic_to_func_t
    	   +hb_draw_funcs_set_quadratic_to_func()
    	   +hb_draw_cubic_to_func_t
    	   +hb_draw_funcs_set_cubic_to_func()
    	   +hb_draw_close_path_func_t
    	   +hb_draw_funcs_set_close_path_func()
    	   +hb_draw_state_t
    	   +HB_DRAW_STATE_DEFAULT
    	   +hb_draw_move_to()
    	   +hb_draw_line_to()
    	   +hb_draw_quadratic_to()
    	   +hb_draw_cubic_to()
    	   +hb_draw_close_path()
    	   +hb_font_get_glyph_shape_func_t
    	   +hb_font_funcs_set_glyph_shape_func()
    	   +hb_font_get_glyph_shape()
    	 - OpenType layout
    	   +HB_OT_LAYOUT_BASELINE_TAG_IDEO_FACE_CENTRAL
    	   +HB_OT_LAYOUT_BASELINE_TAG_IDEO_EMBOX_CENTRAL
    	   +hb_ot_layout_get_horizontal_baseline_tag_for_script()
    	   +hb_ot_layout_get_baseline_with_fallback()
    	 - Metrics:
    	   +hb_ot_metrics_get_position_with_fallback()
    	 - Subset:
    	   +hb_subset_plan_t
    	   +hb_subset_plan_create_or_fail()
    	   +hb_subset_plan_reference()
    	   +hb_subset_plan_destroy()
    	   +hb_subset_plan_set_user_data()
    	   +hb_subset_plan_get_user_data()
    	   +hb_subset_plan_execute_or_fail()
    	   +hb_subset_plan_unicode_to_old_glyph_mapping()
    	   +hb_subset_plan_new_to_old_glyph_mapping()
    	   +hb_subset_plan_old_to_new_glyph_mapping()
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 5d18c0a5704ae55ae1eab6734574b9c8b3678235
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 14:15:04 2022 +0000
Core Update 168: Ship poppler
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c35d3ac6a1569c1a3b7aae4981396ed6faed8f9f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 5 15:48:00 2022 +0200
poppler: Update to version 22.04.0
- Update from 22.02.0 to 22.04.0
    - Update of rootfile
    - Changelog
        Release 22.04.0:
            core:
             * Fix underline sometimes being drawn only partially
             * Fix Adobe Reader not reading some of the contents we write correctly
             * Fix code that workarounds some broken-ish files
             * FoFiTrueType: Parse CFF2 fonts too
             * FoFiTrueType: Support cmap types 2 and 13
             * Fix a few small memory leaks
             * code improvements
            qt:
             * Handle SaveAs named action
             * Annotations: don't change the text color when changing the font
            utils:
             * pdftotext: print creation and modification date when using htmlmeta param
            glib:
             * Fix returning internal data of temporary strings
            cpp:
             * Fix code incompatibility with MSVC
            build system:
             * poppler internal library is no longer forced to static on MSVC
             * Error out if iconv is not available and the cpp frontend is enabled
             * Require FreeType 2.8
        Release 22.03.0:
            core:
             * Signature: Fix finding Signatures that are in Pages not not in the global the Forms object
             * Signature: Improve getting the path to the firefox certificate database
             * Splash: Fix rendering of some joints. Issue #1212
             * Fix get_poppler_localdir for relocatable Windows builds
             * Minor code improvements
            qt:
             * Minor code improvements
            utils:
             * pdfimages: Fix the wrong Stream being passed for drawMaskedImage
            build system:
             * Small code improvements
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit df326d08fe914dcffa5779f59ed34c247a279282
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 14:07:52 2022 +0000
Core Update 168: Ship fribidi
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit a21c2a4cc4cd48f31fb9396065cedb0802994038
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 13:17:16 2022 +0200
fribidi: Update to version 1.0.12
- Update from 1.0.11 to 1.0.12
    - Update of rootfile not required
    - Changelog
       Overview of changes between 1.0.11 and 1.0.12
         * Various fuzzing fixes.
    - Looking at the details in the commits it looks like fribidi's use of the word fuzzing
       fixes basically means bug fixes. Included are fixes for a segmentation violation and a
       stack buffer overflow
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b0aa87ac73a1d92579b2659020b8b3e8c915226d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 14:07:19 2022 +0000
Core Update 168: Ship pciutils
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ffe6661c0b892eb9387a8d0d6059f560db919e84
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sat Apr 23 23:25:58 2022 +0200
pciutils: Update to version 3.8.0
- Update from 3.7.0 to 3.8.0
    - Update of rootfile
    - Changelog
       * Released as 3.8.0.
    	* Filters can now match devices based on partially specified
    	  class code and also on the programming interface.
    	* Reporting of link speeds, power limits, and virtual function tags
    	  has been updated to the current PCIe specification.
    	* We decode the Data Object Exchange capability.
    	* Bus mapping mode works in non-zero domains.
    	* pci_fill_info() can fetch more fields: bridge bases, programming
    	  interface, revision, subsystem vendor and device ID, OS driver,
    	  and also parent bridge. Internally, the implementation was rewritten,
    	  significantly reducing the number of corner cases to be handled.
    	* The Windows port was revived and greatly improved by Pali Rohár.
    	  It requires less magic to compile. More importantly, it runs on both
    	  old and recent Windows systems (see README.Windows for details).
    	* Added a new Windows back-end using the cfgmgr32 interface.
    	  It does not provide direct access to the configuration space,
    	  but basic information about the device is reported via pci_fill_info().
    	  For back-ends of this type, we now provide an emulated read-only
    	  config space.
    	* If the configuration space is not readable for some reason
    	  (e.g., the cfgmgr32 back-end, but also badly implemented sleep mode
    	  of some devices), lspci prints only information provided by the OS.
    	* The Hurd back-end was greatly improved thanks to Joan Lledó.
    	* Various minor bug fixes and improvements.
    	* We officially require a working C99 compiler. Sorry, MSVC.
    	* As usually, updated pci.ids to the current snapshot of the database.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 87dcb206d025556d9c939fd7f003ad75ff93b61f
Merge: a6d1108e7 bad8659d8
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 24 10:27:59 2022 +0000
Merge branch 'temp-c168-development' into next
commit bad8659d80520b2cdbd043efa0b5b15d8580c2c5
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 19:36:57 2022 +0000
Do not mark CGI files as executable, second round
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c04309ef012b19e3bdc98384cad28af407cc62ac
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 19:35:37 2022 +0000
Do not mark CGI files as executable
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 2420f4775b77f4692cfc1625c2d7318fb5e1876f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:35:19 2022 +0000
Core Update 168: Ship WebIF-related changes
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c13060fd4cda278ea79dd8d547291dbbc31840c1
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Wed Apr 20 15:32:34 2022 +0200
menu: Fix warnings, clean code
This patch adds default values and removes a missing translation
    to fix "uninitialized value" and "odd number of elements" warnings.
Removes function calls from functions.pl that have already been
    handled by the header before it is loaded by eval().
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
commit a04b39daa75022e5e6e12da32398bee71b73b150
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:32:00 2022 +0000
Core Update 168: Ship efibootmgr on x86_64 and aarch64
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 28894b78260b8194ff1df4ef0700c5d21031a8d4
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 19:49:32 2022 +0000
efibootmgr: Update to 17
Full changelog as per https://github.com/rhboot/efibootmgr/releases/tag/17:
various CI updates
        Make.defaults: fix pkg-config invocation for LDFLAGS
        make_linux_load_option(): add some more efi_error() calls
        Change the default partition choice.
        Don't set LIBEFIBOOT_REPORT_GPT_ERRORS=1
        Make it easier to build with a devel branch of efivar
        efibootmgr -e: improve parsing for efivar-36 compat
        Fix an invalid free()
        Propogate verbosity to libefivar 36's internal logging facility
        Add a bit more logging
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 2f4148ccd3cab052c39a6eb77314bd789f0abd9c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:29:08 2022 +0000
Core Update 168: Ship and restart OpenSSH
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 7a981d94cb2c3e48ecaf07c506c8353a2c839d79
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 20:40:41 2022 +0000
SSH: do not send spoofable TCP keep alive messages
By default, both SSH server and client rely on TCP-based keep alive
    messages to detect broken sessions, which can be spoofed rather easily
    in order to keep a broken session opened (and vice versa).
Since we rely on SSH-based keep alive messages, which are not vulnerable
    to this kind of tampering, there is no need to double-check connections
    via TCP keep alive as well.
This patch thereof disables using TCP keep alive for both SSH client and
    server scenario. For usability reasons, a timeout of 5 minutes (10
    seconds * 30 keep alive messages = 300 seconds) will be used for both
    client and server configuration, as 60 seconds were found to be too
    short for unstable connectivity scenarios.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 018f80c6cd609184b72c08c1967b143a0637cc7f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 20:40:20 2022 +0000
SSH: Add sntrup761x25519-sha512@openssh.com key exchange to configurations
This algorithm was introduced in OpenSSH 9.0p1; also, align the
    curve25519-sha256* key exchanges to keep things tidy.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 7554e857eebdd6593f986b2a0b840e73db65aa19
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 20:40:00 2022 +0000
OpenSSH: Update to 9.0p1
Relevant changelog part, as retrieved from https://www.openssh.com/txt/release-9.0:
Changes since OpenSSH 8.9
    =========================
This release is focused on bug fixing.
Potentially-incompatible changes
    --------------------------------
This release switches scp(1) from using the legacy scp/rcp protocol
    to using the SFTP protocol by default.
Legacy scp/rcp performs wildcard expansion of remote filenames (e.g.
    "scp host:* .") through the remote shell. This has the side effect of
    requiring double quoting of shell meta-characters in file names
    included on scp(1) command-lines, otherwise they could be interpreted
    as shell commands on the remote side.
This creates one area of potential incompatibility: scp(1) when using
    the SFTP protocol no longer requires this finicky and brittle quoting,
    and attempts to use it may cause transfers to fail. We consider the
    removal of the need for double-quoting shell characters in file names
    to be a benefit and do not intend to introduce bug-compatibility for
    legacy scp/rcp in scp(1) when using the SFTP protocol.
Another area of potential incompatibility relates to the use of remote
    paths relative to other user's home directories, for example -
    "scp host:~user/file /tmp". The SFTP protocol has no native way to
    expand a ~user path. However, sftp-server(8) in OpenSSH 8.7 and later
    support a protocol extension "expand-path@openssh.com" to support
    this.
In case of incompatibility, the scp(1) client may be instructed to use
    the legacy scp/rcp using the -O flag.
New features
    ------------
* ssh(1), sshd(8): use the hybrid Streamlined NTRU Prime + x25519 key
       exchange method by default ("sntrup761x25519-sha512@openssh.com").
       The NTRU algorithm is believed to resist attacks enabled by future
       quantum computers and is paired with the X25519 ECDH key exchange
       (the previous default) as a backstop against any weaknesses in
       NTRU Prime that may be discovered in the future. The combination
       ensures that the hybrid exchange offers at least as good security
       as the status quo.
We are making this change now (i.e. ahead of cryptographically-
       relevant quantum computers) to prevent "capture now, decrypt
       later" attacks where an adversary who can record and store SSH
       session ciphertext would be able to decrypt it once a sufficiently
       advanced quantum computer is available.
* sftp-server(8): support the "copy-data" extension to allow server-
       side copying of files/data, following the design in
       draft-ietf-secsh-filexfer-extensions-00. bz2948
* sftp(1): add a "cp" command to allow the sftp client to perform
       server-side file copies.
Bugfixes
    --------
* ssh(1), sshd(8): upstream: fix poll(2) spin when a channel's output
       fd closes without data in the channel buffer. bz3405 and bz3411
* sshd(8): pack pollfd array in server listen/accept loop. Could
       cause the server to hang/spin when MaxStartups > RLIMIT_NOFILE
* ssh-keygen(1): avoid NULL deref via the find-principals and
       check-novalidate operations. bz3409 and GHPR#307 respectively.
* scp(1): fix a memory leak in argument processing. bz3404
* sshd(8): don't try to resolve ListenAddress directives in the sshd
       re-exec path. They are unused after re-exec and parsing errors
       (possible for example if the host's network configuration changed)
       could prevent connections from being accepted.
* sshd(8): when refusing a public key authentication request from a
       client for using an unapproved or unsupported signature algorithm
       include the algorithm name in the log message to make debugging
       easier.
Portability
    -----------
* sshd(8): refactor platform-specific locked account check, fixing
       an incorrect free() on platforms with both libiaf and shadow
       passwords (probably only Unixware) GHPR#284,
* ssh(1), sshd(8): Fix possible integer underflow in scan_scaled(3)
       parsing of K/M/G/etc quantities. bz#3401.
* sshd(8): provide killpg implementation (mostly for Tandem NonStop)
       GHPR#301.
* Check for missing ftruncate prototype. GHPR#301
* sshd(8): default to not using sandbox when cross compiling. On most
       systems poll(2) does not work when the number of FDs is reduced
       with setrlimit, so assume it doesn't when cross compiling and we
       can't run the test.  bz#3398.
* sshd(8): allow ppoll_time64 in seccomp sandbox. Should fix sandbox
       violations on some (at least i386 and armhf) 32bit Linux platforms.
       bz#3396.
* Improve detection of -fzero-call-used-regs=all support in
       configure script.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 420e8a85d0141198a04af0cb8000739c2bc4a108
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 20:53:35 2022 +0000
lynis: Update to 3.0.7
Full changelog as retrieved from https://cisofy.com/changelog/lynis/#307:
- MALW-3290 - Show status of malware components
    - OS detection for RHEL 6 and Funtoo Linux
    - Added service manager openrc
- DBS-1804 - Added alias for MariaDB
    - FINT-4316 - Support for newer Ubuntu versions
    - MALW-3280 - Added Trend Micro malware agent
    - NETW-3200 - Allow unknown number of spaces in modprobe blacklists
    - PKGS-7320 - Support for Garuda Linux and arch-audit
    - Several improvements for busybox shell
    - Russian translation of Lynis extended
Signed-off-by: Peter Müller peter.mueller@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit a808de4c17fea4453817d6dde9de7a0581f3e60d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:27:01 2022 +0000
Core Update 168: Ship bind
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit ffa5629d06f3ee08ba49ecf6ef6c298cc98d91c4
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 22 09:55:36 2022 +0200
bind: Update to 9.16.28
For details see:
    https://downloads.isc.org/isc/bind9/9.16.28/doc/arm/html/notes.html#notes-fo...
"Notes for BIND 9.16.28
    New Features
Add a new configuration option reuseport to disable load balancing
        on sockets in situations where processing of Response Policy Zones
        (RPZ), Catalog Zones, or large zone transfers can cause service
        disruptions. See the BIND 9 ARM for more detail. [GL #3249]
Bug Fixes
Invalid dnssec-policy definitions, where the defined keys did not
        cover both KSK and ZSK roles for a given algorithm, were being
        accepted. These are now checked, and the dnssec-policy is rejected
        if both roles are not present for all algorithms in use. [GL #3142]
Handling of TCP write timeouts has been improved to track the
        timeout for each TCP write separately, leading to a faster
        connection teardown in case the other party is not reading the data.
        [GL #3200]"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 701e63c222f7e09cd27c8198c02ce0279627c7d8
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:26:05 2022 +0000
Core Update 168: Ship libhtp and Suricata, restart the latter
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 30f306a3e28d63d63e126b709d8866cfc9b80803
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 22 10:21:48 2022 +0200
suricata: Update to 5.0.9
Changelog:
"5.0.9 -- 2022-04-21
Security #4889: ftp: SEGV at flow cleanup due to protocol confusion
    Security #5025: ftp: GetLine function buffers data indefinitely if 0x0a was not found int the frag'd input
    Security #5028: smtp: GetLine function buffers data indefinitely if 0x0a was not found in the frag'd input
    Security #5253: Infinite loop in JsonFTPLogger
    Feature #4644: pthreads: set minimum stack size
    Bug #4466: dataset file not written when run as user
    Bug #4678: Configuration test mode succeeds when reference.config file contains invalid content
    Bug #4745: Absent app-layer protocol is always enabled by default
    Bug #4819: tcp: insert_data_normal_fail can hit without triggering memcap
    Bug #4823: conf: quadratic complexity
    Bug #4825: pppoe decoder fails when protocol identity field is only 1 byte
    Bug #4827: packetpool: packets in pool may have capture method ReleasePacket callbacks set
    Bug #4838: af-packet: cluster_id is not used when trying to set fanout support
    Bug #4878: datasets: memory leak in 5.0.x
    Bug #4887: dnp3: buffer over read in logging base64 empty objects
    Bug #4891: protodetect: SMB vs TLS protocol detection in midstream
    Bug #4893: TFTP: memory leak due to missing detect state
    Bug #4895: Memory leak with signature using file_data and NFS
    Bug #4897: profiling: Invalid performance counter when using sampling
    Bug #4901: eve: memory leak related to dns
    Bug #4932: smtp: smtp transaction not logged if no email is present
    Bug #4955: stream: too aggressive pruning in lossy streams
    Bug #4957: SMTP assertion triggered
    Bug #4959: suricatasc loop if recv returns no data
    Bug #4961: dns: transaction not created when z-bit set
    Bug #4963: Run stream reassembly on both directions upon receiving a FIN packet
    Bug #5058: dns: probing/parser can return error when it should return incomplete
    Bug #5063: Not keyword matches in Kerberos requests
    Bug #5096: output: timestamp missing usecs on Arm 32bit + Musl
    Bug #5099: htp: server personality radix handling issue
    Bug #5101: defrag: policy config can setup radix incorrectly
    Bug #5103: Application log cannot to be re-opened when running as non-root user
    Bug #5105: iprep: cidr support can set up radix incorrectly
    Bug #5107: detect/iponly: rule parsing does not always apply netmask correctly
    Bug #5109: swf: coverity warning
    Bug #5115: detect/ip_proto: inconsistent behavior when specifying protocol by string
    Bug #5117: detect/iponly: mixing netblocks can lead to FN/FP
    Bug #5119: smb: excessive CPU utilization and higher packet processing latency due to excessive calls to Vec::extend_from_slice()
    Bug #5137: smb: excessive memory use during file transfer
    Bug #5150: nfs: Integer underflow in NFS
    Bug #5157: xbits: noalert is allowed in rule language with other commands
    Bug #5164: iprep: use_cnt can get desynchronized (SIGABRT)
    Bug #5171: detect/iponly: non-cidr netmask settings can lead incorrect radix tree
    Bug #5193: SSL : over allocation for certificates
    Bug #5213: content:"22 2 22"; is parsed without error
    Bug #5227: 5.0.x: SMB: Wrong buffer being checked for possible overflow.
    Bug #5251: smb: integer underflows and overflows
    Task #5006: libhtp 0.5.40"
Additionally, I moved the 'suricata' patch files into a separate directory.
    Apart from some line numbers, nothing else was changed.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit c2ead0c78ddce8e82969ceaab172d3f6bc5e84d4
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 22 10:21:47 2022 +0200
libhtp: Update to 0.5.40 - needed for 'suricata'
For details see:
    https://github.com/OISF/libhtp/releases/tag/0.5.40
"uri: optionally allows spaces in uri
        ints: integer handling improvements
        headers: continue on nul byte
        headers: consistent trailing space handling
        list: fix integer overflow
        util: remove unused htp_utf8_decode
        fix 100-continue with CL 0
        lzma: don't do unnecessary realloc"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit af8c9da4e525c3d0c896398d33e8e891180fc163
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:24:25 2022 +0000
Core Update 168: Ship knot
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit e56de75e336c84784d46c16f715950b088080adb
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 22 10:03:54 2022 +0200
knot: Update to 3.1.7
For changes since v3.1.1 see:
    https://gitlab.nic.cz/knot/knot-dns/raw/v3.1.7/NEWS
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 166efe4cb5c5ccd8888ce521857b36b3169b1f5a
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 22 13:32:28 2022 +0200
mc: Update to 4.8.28
For details see:
    http://midnight-commander.org/wiki/NEWS-4.8.28
Summary:
"Major changes since 4.8.27
    Core
    VFS
        Remove SMB support (#1)
Editor
        Add syntax highlighting:
            Ngspice/SPICE (http://ngspice.sourceforge.net/) (#4316, #4319)
            DOT/Graphviz (https://graphviz.org/doc/info/lang.html) (#4322)
Viewer
        Support file/dir macros from mc.ect for standalone viewer (#4150)
Misc
        Minimal version of "check" utility is 0.9.10.
        Code cleanup (#4270, #4330)
        Support Shift+Fn keys for KiTTY (#4325)
        Filehighlight:
            graphical formats: avif, jp2, jxl, heic, heif, psb, psd (#4328)
            Markdown (#4351)
Fixes
        FTBFS with ncurses build with --disable-widec (#4200)
        There is no exit on Ubuntu PPC64 big endian (#3887)
        Segfault on change panel mode (#4323)
        Accelerator conflict in Left/Right? menu (#4284)
        move a lot of files across filesystems is slow (#4287)
        mc.ext: wrong order of rules: general matches are made before more specific ones (#4273)
        mc.ext: compressed man pages are shown unformatted (#4272)
        ext.d/misc.sh: invoking /bin/cat on systems that have no /bin/cat (like NixOS) (#4298)
        mcedit: errors in syntax definitions (#4286)
        VFS: FISH: when uploading a symbolic link, it creates both the link and its target (#4281)
        VFS: SFTP: timestamps are not preserved for uploaded symlink (#4285)
        VFS: EXTFS: incorrect test of isoinfo (#4326)
        Typo in skin files (#3146)"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Adolf Belka adolf.belka@ipfire.org
commit 1f326847a36c80b4c65952d06687bf6819a2d6e8
Merge: 0676b7b77 7e6efc89e
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sat Apr 23 14:23:04 2022 +0000
Merge branch 'next' into temp-c168-development
commit adce5b1c8fc21916c77d7e8a40cbed2baac1f2a2
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 13:31:51 2022 +0200
convert-ids-backend-files: Stop and start suricata during runtime.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 615fd78f9294b2843e396f3e70b2181d8491725d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 09:13:41 2022 +0200
convert-ids-backend-files: Set correct ownership for suricata used
    rulefiles file.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c8adaee1958ed0c382341e08949d5cb88bd58c7e
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 05:47:21 2022 +0200
ruleset-sources: Remove support for PT Attack Team Detection rules.
All of a sudden this ruleset provider has dissapeared from Github.
I was not able to find any further details or web page or the ruleset
    anymore.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 1febad2ad41578d3e77195929076e3cbbc28a89f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 05:45:56 2022 +0200
ids.cgi: Avoid doubble locking the page when forcing a ruleset update.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 07dc722f611685c6018630f927ad4b65f44988d1
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 05:44:23 2022 +0200
ids.cgi: Make the page lock in oinkmaster_web() function optional.
This allows to call and release the page lock manually.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e41ee3e0f24cb89b20a758e2281531ed76577ef4
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 22 05:31:28 2022 +0200
ids-functions.pl: Avoid suricata from loading rulesfiles of an
    unsupported provider.
Modify the write_used_rulefiles_file() function to skip the rulesfiles
    of unsupported providers.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c62121c7e4ef9ec5688e16b04ef59e21276e1bd0
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Wed Apr 20 20:58:04 2022 +0200
ids-functions.pl: Try to enumerate the dl_rulesfile if a provider is not
    supported anymore.
In this case the details about the file suffix is not available in the
    ruleset-sources file anymore. In this case now the function tries to
    enumerate the correct filename.
This allows to display the correct stats in the WUI and to extract and
    use the downloaded ruleset of the provider until it got deleted by the
    user.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 782418e226434fbd7fbd236699a45bce328dcd6d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Tue Apr 19 15:10:31 2022 +0200
Add missing german translation strings.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0676b7b777e7d93d80103ca463567b89c8344841
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 21:16:03 2022 +0000
borgbackup: Add missing 'python3-pkgconfig' dependency
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 9196f2a4483ca9a12485c9d511d9946ccc00a0d7
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 13 19:07:57 2022 +0200
python3-pkgconfig: Install this new python module for borgbackup
- Instal the python pkgconfig module - required for borgbackup
    - Install of rootfile
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 8b27f672f80f2364fd28b13466d3a555b5c076f1
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 13 19:07:56 2022 +0200
borgbackup: Update to version 1.2.0
- Update from 1.1.17 to 1.2.0
    - Update of rootfile
    - v2 version has x86_64 replaced by xxxMACHINExxx in the rootfile
    - borgbackup now requires the python module pkgconfig, installed as a set with this patch
    - Changelog
    	Compatibility notes:
    	    dropped support / testing for older Pythons, minimum requirement is 3.8. In
                 case your OS does not provide Python >= 3.8, consider using our binary,
                 which does not need an external Python interpreter. Or continue using
                 borg 1.1.x, which is still supported.
    	    freeing repository space only happens when “borg compact” is invoked.
    	    mount: the default for --numeric-ids is False now (same as borg extract)
    	    borg create --noatime is deprecated. Not storing atime is the default
                 behaviour now (use --atime if you want to store the atime).
    	    list: corrected mix-up of “isomtime” and “mtime” formats. Previously,
                 “isomtime” was the default but produced a verbose human format, while
                 “mtime” produced a ISO-8601-like format. The behaviours have been swapped
                 (so “mtime” is human, “isomtime” is ISO-like), and the default is now
                 “mtime”. “isomtime” is now a real ISO-8601 format (“T” between date and
                 time, not a space).
    	    create/recreate --list: file status for all files used to get announced
                 AFTER the file (with borg < 1.2). Now, file status is announced BEFORE the
                 file contents are processed. If the file status changes later (e.g. due to
                 an error or a content change), the updated/final file status will be
                 printed again.
    	    removed deprecated-since-long stuff (deprecated since):
    	        command “borg change-passphrase” (2017-02), use “borg key …”
    	        option “--keep-tag-files” (2017-01), use “--keep-exclude-tags”
    	        option “--list-format” (2017-10), use “--format”
    	        option “--ignore-inode” (2017-09), use “--files-cache” w/o “inode”
    	        option “--no-files-cache” (2017-09), use “--files-cache=disabled”
    	    removed BORG_HOSTNAME_IS_UNIQUE env var. to use borg you must implement one
                 of these 2 scenarios:
    	            the combination of FQDN and result of uuid.getnode() must be unique
                         and stable (this should be the case for almost everybody, except
                         when having duplicate FQDN and MAC address or all-zero MAC address)
    	            if you are aware that 1) is not the case for you, you must set
                         BORG_HOST_ID env var to something unique.
    	    exit with 128 + signal number, #5161. if you have scripts expecting rc == 2
                 for a signal exit, you need to update them to check for >= 128.
    	Fixes:
    	    diff: reduce memory consumption, fix is_hardlink_master, #6295
    	    compact: fix / improve freeable / freed space log output
    	        derive really freed space from quota use before/after, #5679
    	        do not say “freeable”, but “maybe freeable” (based on hint, unsure)
    	    fix race conditions in internal SaveFile function, #6306 #6028
    	    implement internal safe_unlink (was: truncate_and_unlink) function more
                 safely: usually it does not truncate any more, only under “disk full”
                 circumstances and only if there is only one hardlink. see:
                 https://github.com/borgbackup/borg/discussions/6286
    	Other changes:
    	    info: use a pre12-meta cache to accelerate stats for borg < 1.2 archives.
                 the first time borg info is invoked on a borg 1.1 repo, it can take a
                 rather long time computing and caching some stats values for 1.1 archives,
                 which borg 1.2 archives have in their archive metadata structure. be
                 patient, esp. if you have lots of old archives. following invocations are
                 much faster due to the cache. related change: add archive name to
                 calc_stats progress display.
    	    docs:
    	        add borg 1.2 upgrade notes, #6217
    	        link to borg placeholders and borg patterns help
    	        init: explain the encryption modes better
    	        clarify usage of patternfile roots
    	        put import-tar docs into same file as export-tar docs
    	        explain the difference between a path that ends with or without a slash,
                     #6297
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 0312f9294255755d4a94dcf3fd4b455e25e0324c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 21:13:09 2022 +0000
wio: Bump package version
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit aee369fea30e210bf1088e88116610f8ce970a4b
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 13 10:00:20 2022 +0200
wio.cgi: Remove code lines that are commented out
- These lines were introduced with another patch related to removing IPFire start/stop
       capability from wio
    - The lines were introduced in commented out form and so are doing nothing.
    - It looks like they were added as part of a debugging or investigation work on wio
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
commit 12fbbc61e568b208f007df3b02c28b0bb6fe14e7
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 13 10:00:19 2022 +0200
wio.pl: Fix bug 12799 - Remove code scanning for all potential IP's on RED interface
- The lines to scan the red interface were introduced at the time of a patch to remove
       the IPFire start/stop function from wio. These lines are not related to that change
       but were included in the patch with no commit message. The same lines were also added
       into wio.cgi in the same patch set but in that case the lines were all commented out.
    - These lines look like they were most likely added to the code for investigation or
       debugging purposes. Looking at the lines in wio.pl the results obtained are not
       used elsewhere in wio for obtaining info on the status of the red interface. Deleting
       the lines did not affect anything related to the scanning, setup or monitoring of
       systems by wio.
    - The lines were wasting space but generally not creating a huge impact on pertformance.
       On my production system it scans my red and comes up with a list of 1022 IP's because
       of the subnet my ISP uses - xxx.yy.216.0/20
    - Scanning those 1022 IP's and sorting them takes my system about 3 seconds. Without
       sorting it is around the same level.
    - In Bug#12799 the originator has an ISP that is using a private network that has a
       defined subnet of 10.0.0.0/8 This is 16,777,214 IP's to be scanned. Even without sorting
       my system would end up taking around 13 hours to do that. The bug originator found that
       on certain machines that he had IPFire on wio just never stopped scanning.
    - As these lines just seem to collect a large amount of IP's on red that are not related
       to the actual running red IP, as there was no commit message related to their
       introduction and as removing the lines on vm's running dhcp and static red interfaces
       and also on my running production system for 4 weeks has shown no impact on the
       monitoring capability this patch is being submitted to remove these lines from wio
Fixes: Bug#12799
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
commit 2e68dcd6eb10cccda976d2dfe1f8204cb066eecb
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 12 12:35:40 2022 +0200
tshark: Update to version 3.6.3
- Update from 3.4.7 to 3.6.3
    - Update of rootfile
    - find-dependencies run due to sobump - nothing reported
    - Changelog - a range of changes including many bug fixes and several vulnerabilities
    	Wireshark 3.6.3 Release Notes
    	  Bug Fixes
    	     • Fuzz job crash output: fuzz-2022-01-19-7399.pcap Issue 17894[1].
    	     • TLS dissector incorrectly reports JA3 values Issue 17942[2].
    	     • "Wiki Protocol page" in packet details menu is broken - wiki
    	       pages not migrated to GitLab? Issue 17944[3].
    	     • Dissector bug, protocol PFCP display Flow Description IE value
    	       error in Additional Flow Description of PFD Management Request
    	       Message Issue 17951[4].
    	     • Bluetooth: Fails to open Log file for SCO connection Issue
    	       17964[5].
    	     • Fuzz job crash output: fuzz-2022-03-07-10896.pcap Issue 17984[6].
    	     • libwiretap: Save as ERF causes segmentation fault Issue 17989[7].
    	     • HTTP server returning multiple early hints shows too many
    	       responses in "Follow HTTP Stream" Issue 18006[8].
    	  New and Updated Features
    	     Updated Protocol Support
    	      CSN.1, HTTP, IEEE 802.11, NTLM SSP, PFCP, PKTLOG, SSDP, TLS, and USB
    	      HID
    	     New and Updated Capture File Support
    	      pcap and pcapng
    	Wireshark 3.6.2 Release Notes
    	  Bug Fixes
    	   The following vulnerabilities have been fixed:
    	     • wnpa-sec-2022-01[1] RTMPT dissector infinite loop. Issue
    	       17813[2].
    	     • wnpa-sec-2022-02[3] Large loops in multiple dissectors. Issue
    	       17829[4], Issue 17842[5], Issue 17847[6], Issue 17855[7], Issue
    	       17891[8], Issue 17925[9], Issue 17926[10], Issue 17931[11], Issue
    	       17932[12], Issue 17933[13].
    	     • wnpa-sec-2022-03[14] PVFS dissector crash. Issue 17840[15].
    	     • wnpa-sec-2022-04[16] CSN.1 dissector crash. Issue 17882[17].
    	     • wnpa-sec-2022-05[18] CMS dissector crash. Issue 17935[19].
    	   The following bugs have been fixed:
    	     • Support for GSM SMS TPDU in HTTP2 body Issue 17784[20].
    	     • Wireshark 3.6.1 broke the ABI by removing ws_log_default_writer
    	       from libwsutil Issue 17822[21].
    	     • Fedora RPM package build failing with RPATH of /usr/local/lib64
    	       Issue 17830[22].
    	     • macos-setup.sh: ftp.pcre.org no longer exists Issue 17834[23].
    	     • nmap.org/npcap → npcap.com: domain/URL change Issue 17838[24].
    	     • MPLS ECHO FEC stack change TLV not dissected correctly Issue
    	       17868[25].
    	     • Attempting to open a systemd journal export file segfaults Issue
    	       17875[26].
    	     • Dissector bug on 802.11ac packets Issue 17878[27].
    	     • The Info column shows only one NGAP/S1AP packet of several
    	       packets inside an SCTP packet Issue 17886[28].
    	     • Uninstalling Wireshark 3.6.1 on Windows 10 fails to remove the
    	       installation directory because it doesn’t remove the User’s Guide
    	       subdirectory and all its contents. Issue 17898[29].
    	     • 3.6 doesn’t build without zlib Issue 17899[30].
    	     • SIP Statistics no longer properly reporting method type
    	       accounting Issue 17904[31].
    	     • Fuzz job crash output: fuzz-2022-01-26-6940.pcap Issue 17909[32].
    	     • SCTP retransmission detection broken for the first data chunk of
    	       each association with relative TSN Issue 17917[33].
    	     • “Show In Folder” doesn’t work correctly for filenames with spaces
    	       Issue 17927[34].
    	  New and Updated Features
    	     Updated Protocol Support
    	      AMP, ASN.1 PER, ATN-ULCS, BGP, BP, CFLOW, CMS, CSN.1, GDSDB, GSM RP,
    	      GTP, HTTP3, IEEE 802.11 Radiotap, IPDC, ISAKMP, Kafka, MP2T, MPEG
    	      PES, MPEG SECT, MPLS ECHO, NGAP, NTLMSSP, OpenFlow 1.4, OpenFlow 1.5,
    	      P_MUL, PN-RT, PROXY, PTP, PVFS, RSL, RTMPT, rtnetlink, S1AP, SCTP,
    	      Signal PDU, SIP, TDS, USB, WAP, and ZigBee ZCL
    	  New and Updated Capture File Support
    	      BLF and libpcap
    	Wireshark 3.6.1 Release Notes
    	  Bug Fixes
    	   The following vulnerabilities have been fixed:
    	     • wnpa-sec-2021-17[1] RTMPT dissector infinite loop. Issue
    	       17745[2]. CVE-2021-4185[3].
    	     • wnpa-sec-2021-18[4] BitTorrent DHT dissector infinite loop. Issue
    	       17754[5]. CVE-2021-4184[6].
    	     • wnpa-sec-2021-19[7] pcapng file parser crash. Issue 17755[8].
    	       CVE-2021-4183[9].
    	     • wnpa-sec-2021-20[10] RFC 7468 file parser infinite loop. Issue
    	       17801[11]. CVE-2021-4182[12].
    	     • wnpa-sec-2021-21[13] Sysdig Event dissector crash.
    	       CVE-2021-4181[14].
    	     • wnpa-sec-2021-22[15] Kafka dissector infinite loop. Issue
    	       17811[16].
    	   The following bugs have been fixed:
    	     • Allow sub-second timestamps in hexdumps Issue 15562[17].
    	     • GRPC: An unnecessary empty Protobuf tree item is displayed if the
    	       GRPC message body length is 0 Issue 17675[18].
    	     • Can’t install "ChmodBPF.pkg" or "Add Wireshark to the system
    	       path.pkg" on M1 MacBook Air Monterey without Rosetta 2 Issue
    	       17757[19].
    	     • TECMP: LIN Payload is cut off by 1 byte Issue 17760[20].
    	     • Wireshark crashes if a 64 bit field of type BASE_CUSTOM is
    	       applied as a column Issue 17762[21].
    	     • Command line option "-o console.log.level" causes wireshark and
    	       tshark to exit on start Issue 17763[22].
    	     • Setting WIRESHARK_LOG_LEVEL=debug breaks interface capture Issue
    	       17764[23].
    	     • Unable to build without tshark Issue 17766[24].
    	     • IEEE 802.11 action frames are not getting parsed and always seen
    	       as malformed Issue 17767[25].
    	     • IEC 60870-5-101 link address field is 1 byte, but should have
    	       configurable length of 0,1 or 2 bytes Issue 17775[26].
    	     • dfilter: 'tcp.port not in {1}' crashes Wireshark Issue 17785[27].
    	  New and Updated Features
    	     • The 'console.log.level' preference was removed in Wireshark
    	       3.6.0. This release adds an '-o console.log.level:'
    	       backward-compatibilty option on the CLI that maps to the new
    	       logging sub-system. Note that this does not have bitmask
    	       semantics and does not correspond to any actual preference. It is
    	       just a transition mechanism for users that were relying on this
    	       CLI option and will be removed in the future. To see the new
    	       diagnostic output options consult the manpages or the output of
    	       '--help'.
    	  Updated Protocol Support
    	      ANSI A I/F, AT, BitTorrent DHT, FF, GRPC, IEC 101/104, IEEE 802.11,
    	      IEEE 802.11 Radiotap, IPsec, Kafka, QUIC, RTMPT, RTSP, SRVLOC, Sysdig
    	      Event, and TECMP
    	  New and Updated Capture File Support
    	      BLF and RFC 7468
    	Wireshark 3.6.0 Release Notes
    	  Many improvements have been made. See the “New and Updated Features”
    	  section below for more details. You might want to pay particular
    	  attention to the display filter syntax updates.
    	  New and Updated Features
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc3:
    	     • The macOS Intel packages now ship with Qt 5.15.3 and require
    	       macOS 10.13 or later.
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc2:
    	     • Display filter set elements must now be comma-separated. See
    	       below for more details.
    	   The following features are new (or have been significantly updated)
    	   since version 3.6.0rc1:
    	     • The display filter expression “a != b” now has the same meaning
    	       as “!(a == b)”.
    	   The following features are new (or have been significantly updated)
    	   since version 3.5.0:
    	     • Nothing of note.
    	   The following features are new (or have been significantly updated)
    	   since version 3.4.0:
    	     • Several changes have been made to the display filter syntax:
    	        • The expression “a != b” now always has the same meaning as
    	       “!(a == b)”. In particular this means filter expressions with
    	       multi-value fields like “ip.addr != 1.1.1.1” will work as
    	       expected (the result is the same as typing “ip.src != 1.1.1.1 and
    	       ip.dst != 1.1.1.1”). This avoids the contradiction (a == b and a
    	       != b) being true.
    	        • It is possible to use the syntax “a ~= b” or “a any_ne b” to
    	       recover the previous (inconsistent with "==") logic for not
    	       equal.
    	        • Literal strings can now be specified using raw string syntax,
    	       identical to raw strings in the Python programming language. This
    	       can be used to avoid the complexity of using two levels of
    	       character escapes with regular expressions.
    	        • Set elements must now be separated using a comma. A filter
    	       such as http.request.method in {"GET" "HEAD"} must be written as
    	       … in {"GET", "HEAD"}. Whitespace is not significant. The
    	       previous use of whitespace as separator is deprecated and will be
    	       removed in a future version.
    	        • Support for the syntax "a not in b" with the same meaning as
    	       "not a in b" has been added.
    	     • Packaging updates:
    	        • A macOS Arm 64 (Apple Silicon) package is now available.
    	        • The macOS Intel packages now ship with Qt 5.15.3 and require
    	       macOS 10.13 or later.
    	        • The Windows installers now ship with Npcap 1.55.
    	        • A 64-bit Windows PortableApps package is now available.
    	     • TCP conversations now support a completeness criteria, which
    	       facilitates the identification of TCP streams having any of
    	       opening or closing handshakes, a payload, in any combination. It
    	       can be accessed with the new tcp.completeness filter.
    	     • Protobuf fields that are not serialized on the wire or otherwise
    	       missing in capture files can now be displayed with default values
    	       by setting the new “add_default_value” preference. The default
    	       values might be explicitly declared in “proto2” files, or false
    	       for bools, first value for enums, zero for numeric types.
    	     • Wireshark now supports reading Event Tracing for Windows (ETW). A
    	       new extcap named ETW reader is created that now can open an etl
    	       file, convert all events in the file to DLT_ETW packets and write
    	       to a specified FIFO destination. Also, a new packet_etw dissector
    	       is created to dissect DLT_ETW packets so Wireshark can display
    	       the DLT_ETW packet header, its message and packet_etw dissector
    	       calls packet_mbim sub_dissector if its provider matches the MBIM
    	       provider GUID.
    	     • “Follow DCCP stream” feature to filter for and extract the
    	       contents of DCCP streams.
    	     • Wireshark now supports dissecting RTP packets with OPUS payloads.
    	     • Importing captures from text files based on regular expressions
    	       is now possible. By specifying a regex capturing a single packet
    	       including capturing groups for relevant fields a textfile can be
    	       converted to a libpcap capture file. Supported data encodings are
    	       plain-hexadecimal, -octal, -binary and base64. Also the timestamp
    	       format now allows the second-fractions to be placed anywhere in
    	       the timestamp and it will be stored with nanosecond instead of
    	       microsecond precision.
    	     • The RTP Player has been significatnly redesigned and improved.
    	       See Playing VoIP Calls[1] and RTP Player Window[2] in the User’s
    	       Guide for more details.
    	        • The RTP Player can play many streams in row.
    	        • The UI is more responsive.
    	        • The RTP Player maintains playlist and other tools can add and
    	       remove streams to and from it.
    	        • Every stream can be muted or routed to the left or right
    	       channel for replay.
    	        • The option to save audio has been moved from the RTP Analysis
    	       dialog to the RTP Player. The RTP Player also saves what was
    	       played, and it can save in multichannel .au or .wav.
    	        • The RTP Player is now accessible from the Telephony › RTP ›
    	       RTP Player menu.
    	     • The VoIP dialogs (VoIP Calls, RTP Streams, RTP Analysis, RTP
    	       Player, SIP Flows) are non-modal and can stay opened on
    	       background.
    	        • The same tools are provided across all dialogs (Prepare
    	       Filter, Analyse, RTP Player …)
    	     • The “Follow Stream” dialog is now able to follow SIP calls based
    	       on their Call-ID value.
    	     • The “Follow Stream” dialog’s YAML output format has been updated
    	       to add timestamps and peers information For more details see
    	       Following Protocol Streams[3] in the User’s Guide.
    	     • IP fragments between public IPv4 addresses are now reassembled
    	       even if they have different VLAN IDs. Reassembly of IP fragments
    	       where one endpoint is a private (RFC 1918 section 3) or
    	       link-local (RFC 3927) IPv4 address continues to take the VLAN ID
    	       into account, as those addresses can be reused. To revert to the
    	       previous behavior and not reassemble fragments with different
    	       VLAN IDs, turn on the “Enable stricter conversation tracking
    	       heuristics” top level protocol preference.
    	     • USB Link Layer reassembly has been added, which allows hardware
    	       captures to be analyzed at the same level as software captures.
    	     • TShark can now export TLS session keys with the
    	       --export-tls-session-keys option.
    	     • Wireshark participated in the Google Season of Docs 2020 and the
    	       User’s Guide has been extensively updated.
    	     • The “RTP Stream Analysis” dialog CSV export format was slightly
    	       changed. The first line of the export contains column titles as
    	       in other CSV exports.
    	     • Wireshark now supports the Turkish language.
    	     • The settings in the “Import from Hex Dump” dialog is now stored
    	       in a profile import_hexdump.json file.
    	     • Analyze › Reload Lua Plugins has been improved to properly
    	       support FileHandler.
    	     • The “RTP Stream Analysis” and “IAX2 Stream Analysis” dialogs now
    	       show correct calculation mean jitter calculations.
    	     • RTP streams are now created based on Skinny protocol messages in
    	       addition to other types of messages.
    	     • The “VoIP Calls Flow Sequence” window shows more information
    	       about various Skinny messages.
    	     • Initial support for building Wireshark on Windows using GCC and
    	       MinGW-w64 has been added. See README.msys2 in the sources for
    	       more information.
    	  New File Format Decoding Support
    	      Vector Informatik Binary Log File (BLF)
    	  New Protocol Support
    	      5G Lawful Interception (5GLI), Bluetooth Link Manager Protocol (BT
    	      LMP), Bundle Protocol version 7 (BPv7), Bundle Protocol version 7
    	      Security (BPSec), CBOR Object Signing and Encryption (COSE), E2
    	      Application Protocol (E2AP), Event Tracing for Windows (ETW), EXtreme
    	      extra Eth Header (EXEH), High-Performance Connectivity Tracer
    	      (HiPerConTracer), ISO 10681, Kerberos SPAKE, Linux psample protocol,
    	      Local Interconnect Network (LIN), Microsoft Task Scheduler Service,
    	      O-RAN E2AP, O-RAN fronthaul UC-plane (O-RAN), Opus Interactive Audio
    	      Codec (OPUS), PDU Transport Protocol, R09.x (R09), RDP Dynamic
    	      Channel Protocol (DRDYNVC), RDP Graphic pipeline channel Protocol
    	      (EGFX), RDP Multi-transport (RDPMT), Real-Time Publish-Subscribe
    	      Virtual Transport (RTPS-VT), Real-Time Publish-Subscribe Wire
    	      Protocol (processed) (RTPS-PROC), Shared Memory Communications (SMC),
    	      Signal PDU, SparkplugB, State Synchronization Protocol (SSyncP),
    	      Tagged Image File Format (TIFF), TP-Link Smart Home Protocol, UAVCAN
    	      DSDL, UAVCAN/CAN, UDP Remote Desktop Protocol (RDPUDP), Van Jacobson
    	      PPP compression (VJC), World of Warcraft World (WOWW), and X2 xIRI
    	      payload (xIRI)
    	  Updated Protocol Support
    	      Too many protocols have been updated to list here.
    	  New and Updated Capture File Support
    	      Vector Informatik Binary Log File (BLF)
    	Wireshark 3.4.9 Release Notes
    	  Bug Fixes
    	     • TShark PDML output embeds "proto" elements within other "proto"
    	       elements Issue 10588[1].
    	     • Filter expressions comparing against single-octet hex strings
    	       where the hex digit string equals a protocol name don’t work
    	       Issue 12810[2].
    	     • AMQP 0.9: dissector fails to handle Content-Body frame split
    	       across TCP packets Issue 14217[3].
    	     • IEEE 802.15.4: Missing check on "PAN ID Present" bit of the
    	       Multipurpose Frame Control field Issue 17496[4].
    	     • Wireshark ignored some character in filename when exporting SMB
    	       objects. Issue 17530[5].
    	     • tshark -z credentials: assertion failed: (allocator→in_scope)
    	       Issue 17576[6].
    	     • IS-IS Extended IP Reachability Prefix-SID not decoded properly
    	       Issue 17610[7].
    	     • Error when reloading lua plugins with a capture file loaded via a
    	       custom lua file handler Issue 17615[8].
    	     • Absolute time UTC field filters are constructed incorrectly,
    	       don’t match the packet Issue 17617[9].
    	     • GUI freezes when clicking on large (non-capture) file in File
    	       chooser Issue 17620[10].
    	     • Crash after selecting a different profile while capturing Issue
    	       17622[11].
    	     • BT-DHT reports malformed packets that are actually uTP on same
    	       connection Issue 17626[12].
    	  Updated Protocol Support
    	      AMQP, Aruba IAP, BGP, BT-DHT, CoAP, DCERPC SPOOLSS, Diameter, EPL,
    	      GSM A-bis OML, GSM A-I/F COMMON, GSM SIM, IEEE 1905.1a, IEEE
    	      802.15.4, IMAP, InfiniBand, ISIS LSP, ISObus VT, JPEG, MP2T,
    	      NORDIC_BLE, QUIC, RTCP, SDP, SMB, TWAMP-Control, USB HID, and VSS
    	      Monitoring
    	  New and Updated Capture File Support
    	      CAM Inspector, Ixia IxVeriWave, pcapng, and USBDump
    	Wireshark 3.4.8 Release Notes
    	  Bug Fixes
    	     • Dissector bug reported for Bluetooth Cycling Power Measurement
    	       characteristic for extreme angles value Issue 17505[1].
    	     • vcruntime140_1.dll deleted on Wireshark update/install Issue
    	       17506[2].
    	     • Raknet Addresses are incorrectly identified. Issue 17509[3].
    	     • Editcap saving files as ethernet when specifying '-T
    	       ieee-802-11-*' Issue 17520[4].
    	     • CoAP dissector confuses Content-Format with Accept Issue
    	       17536[5].
    	  Updated Protocol Support
    	      BT ATT, BT LE LL, CoAP, DLM3, GSM SIM, iLBC, and RakNet
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit bdd2566f7bbda478769006871c6f515fc6230940
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:20 2022 +0200
python3-urllib3: Update to version 1.26.9
- Update from 1.26.7 to 1.26.9
    - Update of rootfile
    - Changelog
        1.26.9 (2022-03-16)
    	* Changed ``urllib3[brotli]`` extra to favor installing Brotli libraries that are still
    	  receiving updates like ``brotli`` and ``brotlicffi`` instead of ``brotlipy``.
    	  This change does not impact behavior of urllib3, only which dependencies are installed.
    	* Fixed a socket leaking when ``HTTPSConnection.connect()`` raises an exception.
    	* Fixed ``server_hostname`` being forwarded from ``PoolManager`` to ``HTTPConnectionPool``
    	  when requesting an HTTP URL. Should only be forwarded when requesting an HTTPS URL.
        1.26.8 (2022-01-07)
    	* Added extra message to ``urllib3.exceptions.ProxyError`` when urllib3 detects that
    	  a proxy is configured to use HTTPS but the proxy itself appears to only use HTTP.
    	* Added a mention of the size of the connection pool when discarding a connection due to the pool being full.
    	* Added explicit support for Python 3.11.
    	* Deprecated the ``Retry.MAX_BACKOFF`` class property in favor of ``Retry.DEFAULT_MAX_BACKOFF``
    	  to better match the rest of the default parameter names. ``Retry.MAX_BACKOFF`` is removed in v2.0.
    	* Changed location of the vendored ``ssl.match_hostname`` function from ``urllib3.packages.ssl_match_hostname``
    	  to ``urllib3.util.ssl_match_hostname`` to ensure Python 3.10+ compatibility after being repackaged
    	  by downstream distributors.
    	* Fixed absolute imports, all imports are now relative.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 76227aaf7181296f58969a00b91ad2c80d800cfa
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:19 2022 +0200
python3-typing-extensions: Update to version 4.1.1
- Update from 4.0.1 to 4.1.1
    - Update of rootfile
    - Changelog
       # Release 4.1.1 (February 13, 2022)
    	- Fix importing `typing_extensions` on Python 3.7.0 and 3.7.1. Original
    	  patch by Nikita Sobolev (@sobolevn).
       # Release 4.1.0 (February 12, 2022)
    	- Runtime support for PEP 646, adding `typing_extensions.TypeVarTuple`
    	  and `typing_extensions.Unpack`.
    	- Add interaction of `Required` and `NotRequired` with `__required_keys__`,
    	  `__optional_keys__` and `get_type_hints()`. Patch by David Cabot (@d-k-bo).
    	- Runtime support for PEP 675 and `typing_extensions.LiteralString`.
    	- Add `Never` and `assert_never`. Backport from bpo-46475.
    	- `ParamSpec` args and kwargs are now equal to themselves. Backport from
    	  bpo-46676. Patch by Gregory Beauregard (@GBeauregard).
    	- Add `reveal_type`. Backport from bpo-46414.
    	- Runtime support for PEP 681 and `typing_extensions.dataclass_transform`.
    	- `Annotated` can now wrap `ClassVar` and `Final`. Backport from
    	  bpo-46491. Patch by Gregory Beauregard (@GBeauregard).
    	- Add missed `Required` and `NotRequired` to `__all__`. Patch by
    	  Yuri Karabas (@uriyyo).
    	- The `@final` decorator now sets the `__final__` attribute on the
    	  decorated object to allow runtime introspection. Backport from
    	  bpo-46342.
    	- Add `is_typeddict`. Patch by Chris Moradi (@chrismoradi) and James
    	  Hilton-Balfe (@Gobot1234).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit f9563f97c63e0c5c4249cea00ddeb82f5e2450f4
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:18 2022 +0200
python3-tomli: Update to version 2.0.1
- Update from 2.0.0 to 2.0.1
    - Update of rootfile
    - Changelog
         2.0.1
    	    Improve
    	        Make bundling easier by using relative imports internally and adding
                     license and copyright notice to source files.
    	        Make error messages more uniform
    	        Raise a friendly TypeError for wrong file mode
    	        Allow parse_float to return objects having the append attr
    	        Eagerly raise an error if parse_float returns an illegal type
    	    Packaging
    	        Move from pytest testing framework to unittest and remove python-dateutil
                     test dependency. Tests now only require Python interpreter.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 75363dc20ffbb2aa17518b757eec2a4e09f9be65
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:17 2022 +0200
python3-setuptools: Update to version 62.0.0
- Update from 59.5.0 to 62.0.0
    - Update of rootfile
    - Changelog
    	v62.0.0
    	Breaking Changes
    	* #3151: Made ``setup.py develop --user`` install to the user site packages directory even if it is disabled in the current interpreter.
    	Changes
    	* #3153: When resolving requirements use both canonical and normalized names -- by :user:`ldaniluk`
    	* #3167: Honor unix file mode in ZipFile when installing wheel via ``install_as_egg`` -- by :user:`delijati`
    	Misc
    	* #3088: Fixed duplicated tag with the ``dist-info`` command.
    	* #3247: Fixed problem preventing ``readme`` specified as dynamic in ``pyproject.toml``
    	  from being dynamically specified in ``setup.py``.
    	v61.3.1
    	Misc
    	* #3233: Included missing test file ``setupcfg_examples.txt`` in ``sdist``.
    	* #3233: Added script that allows developers to download ``setupcfg_examples.txt`` prior to
    	  running tests. By caching these files it should be possible to run the test suite
    	  offline.
    	v61.3.0
    	Changes
    	* #3229: Disabled automatic download of ``trove-classifiers`` to facilitate reproducibility.
    	Misc
    	* #3229: Updated ``pyproject.toml`` validation via ``validate-pyproject`` v0.7.1.
    	* #3229: New internal tool made available for updating the code responsible for
    	  the validation of ``pyproject.toml``.
    	  This tool can be executed via ``tox -e generate-validation-code``.
    	v61.2.0
    	Changes
    	* #3215: Ignored a subgroup of invalid ``pyproject.toml`` files that use the ``[project]``
    	  table to specify only ``requires-python`` (**transitional**).
    	  .. warning::
    	     Please note that future releases of setuptools will halt the build process
    	     if a ``pyproject.toml`` file that does not match doc:`the PyPA Specification
    	     PyPUG:specifications/declaring-project-metadata` is given.
    	* #3215: Updated ``pyproject.toml`` validation, as generated by ``validate-pyproject==0.6.1``.
    	* #3218: Prevented builds from erroring if the project specifies metadata via
    	  ``pyproject.toml``, but uses other files (e.g. ``setup.py``) to complement it,
    	  without setting ``dynamic`` properly.
    	  .. important::
    	     This is a **transitional** behaviour.
    	     Future releases of ``setuptools`` may simply ignore externally set metadata
    	     not backed by ``dynamic`` or even halt the build with an error.
    	* #3224: Merge changes from pypa/distutils@e1d5c9b1f6
    	Documentation changes
    	* #3217: Fixed typo in ``pyproject.toml`` example in Quickstart -- by :user:`pablo-cardenas`.
    	Misc
    	* #3223: Fixed missing requirements with environment markers when
    	  ``optional-dependencies`` is set in ``pyproject.toml``.
    	v61.1.1
    	Misc
    	* #3212: Fixed missing dependencies when running ``setup.py install``.
    	  Note that calling ``setup.py install`` directly is still deprecated and
    	  will be removed in future versions of ``setuptools``.
    	  Please check the release notes for :ref:`setup_install_deprecation_note`.
    	v61.1.0
    	Deprecations
    	* #3206: Changed ``setuptools.convert_path`` to an internal function that is not exposed
    	  as part of setuptools API.
    	  Future releases of ``setuptools`` are likely to remove this function.
    	Changes
    	* #3202: Changed behaviour of auto-discovery to not explicitly expand ``package_dir``
    	  for flat-layouts and to not use relative paths starting with ``./``.
    	* #3203: Prevented ``pyproject.toml`` parsing from overwriting
    	  ``dist.include_package_data`` explicitly set in ``setup.py`` with default
    	  value.
    	* #3208: Added a warning for non existing files listed with the ``file`` directive in
    	  ``setup.cfg`` and ``pyproject.toml``.
    	* #3208: Added a default value for dynamic ``classifiers`` in ``pyproject.toml`` when
    	  files are missing and errors being ignored.
    	* #3211: Disabled auto-discovery when distribution class has a ``configuration``
    	  attribute (e.g. when the ``setup.py`` script contains ``setup(...,
    	  configuration=...)``).  This is done to ensure extension-only packages created
    	  with ``numpy.distutils.misc_util.Configuration`` are not broken by the safe
    	  guard
    	  behaviour to avoid accidental multiple top-level packages in a flat-layout.
    	  .. note::
    	     Users that don't set ``packages``, ``py_modules``, or ``configuration`` are
    	     still likely to observe the auto-discovery behavior, which may halt the
    	     build if the project contains multiple directories and/or multiple Python
    	     files directly under the project root.
    	     To disable auto-discovery please explicitly set either ``packages`` or
    	     ``py_modules``. Alternatively you can also configure :ref:`custom-discovery`.
    	v61.0.0
    	Deprecations
    	* #3068: Deprecated ``setuptools.config.read_configuration``,
    	  ``setuptools.config.parse_configuration`` and other functions or classes
    	  from ``setuptools.config``.
    	  Users that still need to parse and process configuration from ``setup.cfg`` can
    	  import a direct replacement from ``setuptools.config.setupcfg``, however this
    	  module is transitional and might be removed in the future
    	  (the ``setup.cfg`` configuration format itself is likely to be deprecated in the future).
    	Breaking Changes
    	* #2894: If you purposefully want to create an *"empty distribution"*, please be aware
    	  that some Python files (or general folders) might be automatically detected and
    	  included.
    	  Projects that currently don't specify both ``packages`` and ``py_modules`` in their
    	  configuration and contain extra folders or Python files (not meant for distribution),
    	  might see these files being included in the wheel archive or even experience
    	  the build to fail.
    	  You can check details about the automatic discovery (and how to configure a
    	  different behaviour) in :doc:`/userguide/package_discovery`.
    	* #3067: If the file ``pyproject.toml`` exists and it includes project
    	  metadata/config (via ``[project]`` table or ``[tool.setuptools]``),
    	  a series of new behaviors that are not backward compatible may take place:
    	  - The default value of ``include_package_data`` will be considered to be ``True``.
    	  - Setuptools will attempt to validate the ``pyproject.toml`` file according
    	    to PEP 621 specification.
    	  - The values specified in ``pyproject.toml`` will take precedence over those
    	    specified in ``setup.cfg`` or ``setup.py``.
    	Changes
    	* #2887: **[EXPERIMENTAL]** Added automatic discovery for ``py_modules`` and ``packages``
    	  -- by :user:`abravalheri`.
    	  Setuptools will try to find these values assuming that the package uses either
    	  the *src-layout* (a ``src`` directory containing all the packages or modules),
    	  the *flat-layout* (package directories directly under the project root),
    	  or the *single-module* approach (an isolated Python file, directly under
    	  the project root).
    	  The automatic discovery will also respect layouts that are explicitly
    	  configured using the ``package_dir`` option.
    	  For backward-compatibility, this behavior will be observed **only if both**
    	  ``py_modules`` **and** ``packages`` **are not set**.
    	  (**Note**: specifying ``ext_modules`` might also prevent auto-discover from
    	  taking place)
    	  If setuptools detects modules or packages that are not supposed to be in the
    	  distribution, please manually set ``py_modules`` and ``packages`` in your
    	  ``setup.cfg`` or ``setup.py`` file.
    	  If you are using a *flat-layout*, you can also consider switching to
    	  *src-layout*.
    	* #2887: **[EXPERIMENTAL]** Added automatic configuration for the ``name`` metadata
    	  -- by :user:`abravalheri`.
    	  Setuptools will adopt the name of the top-level package (or module in the case
    	  of single-module distributions), **only when** ``name`` **is not explicitly
    	  provided**.
    	  Please note that it is not possible to automatically derive a single name when
    	  the distribution consists of multiple top-level packages or modules.
    	* #3066: Added vendored dependencies for :pypi:`tomli`, :pypi:`validate-pyproject`.
    	  These dependencies are used to read ``pyproject.toml`` files and validate them.
    	* #3067: **[EXPERIMENTAL]** When using ``pyproject.toml`` metadata,
    	  the default value of ``include_package_data`` is changed to ``True``.
    	* #3068: **[EXPERIMENTAL]** Add support for ``pyproject.toml`` configuration
    	  (as introduced by :pep:`621`). Configuration parameters not covered by
    	  standards are handled in the ``[tool.setuptools]`` sub-table.
    	  In the future, existing ``setup.cfg`` configuration
    	  may be automatically converted into the ``pyproject.toml`` equivalent before taking effect
    	  (as proposed in #1688). Meanwhile users can use automated tools like
    	  :pypi:`ini2toml` to help in the transition.
    	  Please note that the legacy backend is not guaranteed to work with
    	  ``pyproject.toml`` configuration.
    	  -- by :user:`abravalheri`
    	* #3125: Implicit namespaces (as introduced in :pep:`420`) are now considered by default
    	  during :doc:`package discovery </userguide/package_discovery>`, when
    	  ``setuptools`` configuration and project metadata are added to the
    	  ``pyproject.toml`` file.
    	  To disable this behaviour, use ``namespaces = False`` when explicitly setting
    	  the ``[tool.setuptools.packages.find]`` section in ``pyproject.toml``.
    	  This change is backwards compatible and does not affect the behaviour of
    	  configuration done in ``setup.cfg`` or ``setup.py``.
    	* #3152: **[EXPERIMENTAL]** Added support for ``attr:`` and ``cmdclass`` configurations
    	  in ``setup.cfg`` and ``pyproject.toml`` when ``package_dir`` is implicitly
    	  found via auto-discovery.
    	* #3178: Postponed importing ``ctypes`` when hiding files on Windows.
    	  This helps to prevent errors in systems that might not have ``libffi`` installed.
    	* #3179: Merge with pypa/distutils@267dbd25ac
    	Documentation changes
    	* #3172: Added initial documentation about configuring ``setuptools`` via ``pyproject.toml``
    	  (using standard project metadata).
    	Misc
    	* #3065: Refactored ``setuptools.config`` by separating configuration parsing (specific
    	  to the configuration file format, e.g. ``setup.cfg``) and post-processing
    	  (which includes directives such as ``file:`` that can be used across different
    	  configuration formats).
    	v60.10.0
    	Changes
    	* #2971: Deprecated upload_docs command, to be removed in the future.
    	* #3137: Use samefile from stdlib, supported on Windows since Python 3.2.
    	* #3170: Adopt nspektr (vendored) to implement Distribution._install_dependencies.
    	Documentation changes
    	* #3144: Added documentation on using console_scripts from setup.py, which was previously only shown in setup.cfg  -- by :user:`xhlulu`
    	* #3148: Added clarifications about ``MANIFEST.in``, that include links to PyPUG docs
    	  and more prominent mentions to using a revision control system plugin as an
    	  alternative.
    	* #3148: Removed mention to ``pkg_resources`` as the recommended way of accessing data
    	  files, in favour of importlib.resources.
    	  Additionally more emphasis was put on the fact that *package data files* reside
    	  **inside** the *package directory* (and therefore should be *read-only*).
    	Misc
    	* #3120: Added workaround for intermittent failures of backend tests on PyPy.
    	  These tests now are marked with `XFAIL
    	  https://docs.pytest.org/en/stable/how-to/skipping.html`_, instead of erroring
    	  out directly.
    	* #3124: Improved configuration for :pypi:`rst-linker` (extension used to build the
    	  changelog).
    	* #3133: Enhanced isolation of tests using virtual environments - PYTHONPATH is not leaking to spawned subprocesses  -- by :user:`befeleme`
    	* #3147: Added options to provide a pre-built ``setuptools`` wheel or sdist for being
    	  used during tests with virtual environments.
    	  Paths for these pre-built distribution files can now be set via the environment
    	  variables: ``PRE_BUILT_SETUPTOOLS_SDIST`` and ``PRE_BUILT_SETUPTOOLS_WHEEL``.
    	v60.9.3
    	Misc
    	* #3093: Repaired automated release process.
    	v60.9.2
    	Misc
    	* #3035: When loading distutils from the vendored copy, rewrite ``__name__`` to ensure consistent importing from inside and out.
    	v60.9.1
    	Misc
    	* #3102: Prevent vendored importlib_metadata from loading distributions from older importlib_metadata.
    	* #3103: Fixed issue where string-based entry points would be omitted.
    	* #3107: Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy.
    	v60.9.0
    	Changes
    	* #2876: In the build backend, allow single config settings to be supplied.
    	* #2993: Removed workaround in distutils hack for get-pip now that pypa/get-pip#137 is closed.
    	* #3085: Setuptools no longer relies on ``pkg_resources`` for entry point handling.
    	* #3098: Bump vendored packaging to 21.3.
    	* Removed bootstrap script.
    	v60.8.2
    	Misc
    	* #3091: Make ``concurrent.futures`` import lazy in vendored ``more_itertools``
    	  package to a  avoid importing threading as a side effect (which caused
    	  `gevent/gevent#1865 https://github.com/gevent/gevent/issues/1865`__).
    	  -- by :user:`maciejp-ro`
    	v60.8.1
    	Misc
    	* #3084: When vendoring jaraco packages, ensure the namespace package is converted to a simple package to support zip importer.
    	v60.8.0
    	Changes
    	* #3085: Setuptools now vendors importlib_resources and importlib_metadata and jaraco.text. Setuptools no longer relies on pkg_resources for ensure_directory nor parse_requirements.
    	v60.7.1
    	Misc
    	* #3072: Remove lorem_ipsum from jaraco.text when vendored.
    	v60.7.0
    	Changes
    	* #3061: Vendored jaraco.text and use line processing from that library in pkg_resources.
    	Misc
    	* #3070: Avoid AttributeError in easy_install.create_home_path when sysconfig.get_config_vars values are not strings.
    	v60.6.0
    	Changes
    	* #3043: Merge with pypa/distutils@bb018f1ac3 including consolidated behavior in sysconfig.get_platform (pypa/distutils#104).
    	* #3057: Don't include optional ``Home-page`` in metadata if no ``url`` is specified. -- by :user:`cdce8p`
    	* #3062: Merge with pypa/distutils@b53a824ec3 including improved support for lib directories on non-x64 Windows builds.
    	Documentation changes
    	* #2897: Added documentation about wrapping ``setuptools.build_meta`` in a in-tree
    	  custom backend. This is a :pep:`517`-compliant way of dynamically specifying
    	  build dependencies (e.g. when platform, OS and other markers are not enough).
    	  -- by :user:`abravalheri`
    	* #3034: Replaced occurrences of the defunct distutils-sig mailing list with pointers
    	  to GitHub Discussions.
    	  -- by :user:`ashemedai`
    	* #3056: The documentation has stopped suggesting to add ``wheel`` to
    	  :pep:`517` requirements -- by :user:`webknjaz`
    	Misc
    	* #3054: Used Py3 syntax ``super().__init__()`` -- by :user:`imba-tjd`
    	v60.5.4
    	Misc
    	* #3009: Remove filtering of distutils warnings.
    	* #3031: Suppress distutils replacement when building or testing CPython.
    	v60.5.3
    	Misc
    	* #3026: Honor sysconfig variables in easy_install.
    	v60.5.2
    	Misc
    	* #2993: In _distutils_hack, for get-pip, simulate existence of setuptools.
    	v60.5.1
    	Misc
    	* #2918: Correct support for Python 3 native loaders.
    	v60.5.0
    	Changes
    	* #2990: Set the ``.origin`` attribute of the ``distutils`` module to the module's ``__file__``.
    	v60.4.0
    	Changes
    	* #2839: Removed ``requires`` sorting when installing wheels as an egg dir.
    	* #2953: Fixed a bug that easy install incorrectly parsed Python 3.10 version string.
    	* #3006: Fixed startup performance issue of Python interpreter due to imports of
    	  costly modules in ``_distutils_hack`` -- by :user:`tiran`
    	Documentation changes
    	* #2674: Added link to additional resources on packaging in Quickstart guide
    	* #3008: "In-tree" Sphinx extension for "favicons" replaced with ``sphinx-favicon``.
    	* #3008: SVG images (logo, banners, ...) optimised with the help of the ``scour``
    	  package.
    	Misc
    	* #2862: Added integration tests that focus on building and installing some packages in
    	  the Python ecosystem via ``pip`` -- by :user:`abravalheri`
    	* #2952: Modified "vendoring" logic to keep license files.
    	* #2968: Improved isolation for some tests that where inadvertently using the project
    	  root for builds, and therefore creating directories (e.g. ``build``, ``dist``,
    	  ``*.egg-info``) that could interfere with the outcome of other tests
    	  -- by :user:`abravalheri`.
    	* #2968: Introduced new test fixtures ``venv``, ``venv_without_setuptools``,
    	  ``bare_venv`` that rely on the ``jaraco.envs`` package.
    	  These new test fixtures were also used to remove the (currently problematic)
    	  dependency on the ``pytest_virtualenv`` plugin.
    	* #2968: Removed ``tmp_src`` test fixture. Previously this fixture was copying all the
    	  files and folders under the project root, including the ``.git`` directory,
    	  which is error prone and increases testing time.
    	  Since ``tmp_src`` was used to populate virtual environments (installing the
    	  version of ``setuptools`` under test via the source tree), it was replaced by
    	  the new ``setuptools_sdist`` and ``setuptools_wheel`` fixtures (that are build
    	  only once per session testing and can be shared between all the workers for
    	  read-only usage).
    	v60.3.1
    	Misc
    	* #3002: Suppress AttributeError when detecting get-pip.
    	v60.3.0
    	Changes
    	* #2993: In _distutils_hack, bypass the distutils exception for pip when get-pip is being invoked, because it imports setuptools.
    	Misc
    	* #2989: Merge with pypa/distutils@788cc159. Includes fix for config vars missing from sysconfig.
    	v60.2.0
    	Changes
    	* #2974: Setuptools now relies on the Python logging infrastructure to log messages. Instead of using ``distutils.log.*``, use ``logging.getLogger(name).*``.
    	* #2987: Sync with pypa/distutils@2def21c5d74fdd2fe7996ee4030ac145a9d751bd, including fix for missing get_versions attribute (#2969), more reliance on sysconfig from stdlib.
    	Misc
    	* #2962: Avoid attempting to use local distutils when the presiding version of Setuptools on the path doesn't have one.
    	* #2983: Restore 'add_shim' as the way to invoke the hook. Avoids compatibility issues between different versions of Setuptools with the distutils local implementation.
    	v60.1.1
    	Misc
    	* #2980: Bypass distutils loader when setuptools module is no longer available on sys.path.
    	v60.1.0
    	Changes
    	* #2958: In distutils_hack, only add the metadata finder once. In ensure_local_distutils, rely on a context manager for reliable manipulation.
    	* #2963: Merge with pypa/distutils@a5af364910. Includes revisited fix for pypa/distutils#15 and improved MinGW/Cygwin support from pypa/distutils#77.
    	v60.0.5
    	Misc
    	* #2960: Install schemes fall back to default scheme for headers.
    	v60.0.4
    	Misc
    	* #2954: Merge with pypa/distutils@eba2bcd310. Adds platsubdir to config vars available for substitution.
    	v60.0.3
    	Misc
    	* #2940: Avoid KeyError in distutils hack when pip is imported during ensurepip.
    	v60.0.2
    	Misc
    	* #2938: Select 'posix_user' for the scheme unless falling back to stdlib, then use 'unix_user'.
    	v60.0.1
    	Misc
    	* #2944: Add support for extended install schemes in easy_install.
    	v60.0.0
    	Breaking Changes
    	* #2896: Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib.
    	v59.8.0
    	Changes
    	* #2935: Merge pypa/distutils@460b59f0e68dba17e2465e8dd421bbc14b994d1f.
    	v59.7.0
    	Changes
    	* #2930: Require Python 3.7
    	v59.6.0
    	Changes
    	* #2925: Merge with pypa/distutils@92082ee42c including introduction of deprecation warning on Version classes.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 7eeeb60373dd381db51505002b3de89d7c33f948
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:16 2022 +0200
python3-setuptools-scm: Update to version 6.4.2
- Update from version 6.3.2 to 6.4.2
    - Update rootfile
    - Changelog
    	v6.4.2
    	   * fix #671 : NoReturn is not avaliable in painfully dead python 3.6
    	v6.4.1
    	   * fix regression #669: restore get_version signature
    	   * fix #668: harden the selftest for distribution extras
    	v6.4.0
    	   * compatibility adjustments for setuptools >58
    	   * only put minimal setuptools version into toml extra to warn people with old
                 strict pins
    	   * coorectly handle hg-git self-use
    	   * better mercurial detection
    	   * modernize packaging setup
    	   * python 3.10 support
    	   * better handling of setuptools install command deprecation
    	   * consider ``pyproject.tomls`` when running as command
    	   * use list in git describe command to avoid shell expansions while supporting
                 both windows and posix
    	   * add ``--strip-dev`` flag to ``python -m setuptools_scm`` to print the next
                 guessed version cleanly
    	   * ensure no-guess-dev will fail on bad tags instead of generating invalid
                 versions
    	   * ensure we use utc everywhere to avoid confusion
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit a790b010770eb5839055c117f71e44bc9b8d3538
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:15 2022 +0200
python3-setuptools-rust: Update to version 1.2.0
- Update from 1.1.2 to 1.2.0
    - Update of rootfile
    - Changelog
       ## 1.2.0 (2022-03-22)
    	### Packaging
    	   - Drop support for Python 3.6. [#209]
    	### Added
    	   - Add support for `kebab-case` executable names. [#205]
    	   - Add support for custom cargo profiles. [#216]
    	### Fixed
    	   - Fix building macOS arm64 wheel with cibuildwheel. [#217]
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit dba994e86f185585e656c0fa5dc5c2c5f6b15116
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:14 2022 +0200
python3-semantic-version: Update to version 2.9.0
- Update from 2.8.5 to 2.9.0
    - Update of rootfile
    - Changelog
        2.9.0 (2022-02-06)
    	*New:*
    	    * Add support for Django 3.1, 3.2, 4.0
    	    * Add support for Python 3.7 / 3.8 / 3.9 / 3.10
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 98c7df65620a424c1980730bb6118098a685f1ea
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:13 2022 +0200
python3-s3transfer: Update to version 0.5.2
- Update from 0.5.0 to 0.5.2
    - Update of rootfile
    - Changelog
       There is no changelog in the source tarball or in PyPi or in the github repository.
        To see the changes you have to read through the individual commits in the github
        repository.
       https://github.com/boto/s3transfer/commits/develop
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 40556f0946c26163d852d973b71f2818ad555198
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:12 2022 +0200
python3-pytz: Update to version 2022.1
- Update from 2021.3 to 2022.1
    - Update of rootfile
    - Changelog
       pytz 2022.1 with the 2022a timezone database has been released. There are no code
        changes.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit b9758326128d343afe0a80db8aef7b308a9f4ba9
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:11 2022 +0200
python3-jmespath: Update to version 1.0.0
- Update from 0.10.0 to 1.0.0
    - Update of rootfile
    - Changelog
       This python module does not have a changelog in its source file or on its PyPi page
        or on its github page.
       To see what changes have occurred you have to look at the individual commits in github
        https://github.com/jmespath/jmespath.py/commits/develop
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit e9fecdc0397044c268c8c7ef34bcd924a2daa4a7
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:10 2022 +0200
python3-flit: Update to version 3.7.1
- Update from 3.6.0 to 3.7.1
    - Update of rootfile
    - Changelog
    	Version 3.7.1
    	    Fix building packages which need execution to get the version number, and
                 have a relative import in __init__.py (PR #531).
    	Version 3.7
    	    Support for external data files such as man pages or Jupyter extension
                 support files (PR #510).
    	    Project names are now lowercase in wheel filenames and .dist-info folder
                 names, in line with the specifications (PR #498).
    	    Improved support for bootstrapping a Python environment, e.g. for downstream
                 packagers (PR #511). flit_core.wheel is usable with python -m to create
                 wheels before the build tool is available, and flit_core sdists also
                 include a script to install itself from a wheel before installer is available.
    	    Use newer importlib APIs, fixing some deprecation warnings (PR #499).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 441e92695515b32beafb009e513b11661eaa210d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:09 2022 +0200
python3-click: Update to version 8.1.2
- Update from 8.0.3 to 8.1.2
    - Update of rootfile
    - Changelog
       Version 8.1.2
    	-   Fix error message for readable path check that was mixed up with the
    	    executable check. :pr:`2236`
    	-   Restore parameter order for ``Path``, placing the ``executable``
    	    parameter at the end. It is recommended to use keyword arguments
    	    instead of positional arguments. :issue:`2235`
       Version 8.1.1
    	-   Fix an issue with decorator typing that caused type checking to
    	    report that a command was not callable. :issue:`2227`
       Version 8.1.0
    	-   Drop support for Python 3.6. :pr:`2129`
    	-   Remove previously deprecated code. :pr:`2130`
-   ``Group.resultcallback`` is renamed to ``result_callback``.
    	    -   ``autocompletion`` parameter to ``Command`` is renamed to
    	        ``shell_complete``.
    	    -   ``get_terminal_size`` is removed, use
    	        ``shutil.get_terminal_size`` instead.
    	    -   ``get_os_args`` is removed, use ``sys.argv[1:]`` instead.
-   Rely on :pep:`538` and :pep:`540` to handle selecting UTF-8 encoding
    	    instead of ASCII. Click's locale encoding detection is removed.
    	    :issue:`2198`
    	-   Single options boolean flags with ``show_default=True`` only show
    	    the default if it is ``True``. :issue:`1971`
    	-   The ``command`` and ``group`` decorators can be applied with or
    	    without parentheses. :issue:`1359`
    	-   The ``Path`` type can check whether the target is executable.
    	    :issue:`1961`
    	-   ``Command.show_default`` overrides ``Context.show_default``, instead
    	    of the other way around. :issue:`1963`
    	-   Parameter decorators and ``@group`` handles ``cls=None`` the same as
    	    not passing ``cls``. ``@option`` handles ``help=None`` the same as
    	    not passing ``help``. :issue:`#1959`
    	-   A flag option with ``required=True`` requires that the flag is
    	    passed instead of choosing the implicit default value. :issue:`1978`
    	-   Indentation in help text passed to ``Option`` and ``Command`` is
    	    cleaned the same as using the ``@option`` and ``@command``
    	    decorators does. A command's ``epilog`` and ``short_help`` are also
    	    processed. :issue:`1985`
    	-   Store unprocessed ``Command.help``, ``epilog`` and ``short_help``
    	    strings. Processing is only done when formatting help text for
    	    output. :issue:`2149`
    	-   Allow empty str input for ``prompt()`` when
    	    ``confirmation_prompt=True`` and ``default=""``. :issue:`2157`
    	-   Windows glob pattern expansion doesn't fail if a value is an invalid
    	    pattern. :issue:`2195`
    	-   It's possible to pass a list of ``params`` to ``@command``. Any
    	    params defined with decorators are appended to the passed params.
    	    :issue:`2131`.
    	-   ``@command`` decorator is annotated as returning the correct type if
    	    a ``cls`` argument is used. :issue:`2211`
    	-   A ``Group`` with ``invoke_without_command=True`` and ``chain=False``
    	    will invoke its result callback with the group function's return
    	    value. :issue:`2124`
    	-   ``to_info_dict`` will not fail if a ``ParamType`` doesn't define a
    	    ``name``. :issue:`2168`
    	-   Shell completion prioritizes option values with option prefixes over
    	    new options. :issue:`2040`
    	-   Options that get an environment variable value using
    	    ``autoenvvar_prefix`` treat an empty value as ``None``, consistent
    	    with a direct ``envvar``. :issue:`2146`
       Version 8.0.4
    	-   ``open_file`` recognizes ``Path("-")`` as a standard stream, the
    	    same as the string ``"-"``. :issue:`2106`
    	-   The ``option`` and ``argument`` decorators preserve the type
    	    annotation of the decorated function. :pr:`2155`
    	-   A callable default value can customize its help text by overriding
    	    ``__str__`` instead of always showing ``(dynamic)``. :issue:`2099`
    	-   Fix a typo in the Bash completion script that affected file and
    	    directory completion. If this script was generated by a previous
    	    version, it should be regenerated. :issue:`2163`
    	-   Fix typing for ``echo`` and ``secho`` file argument.
    	    :issue:`2174, 2185`
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 4d2a20f407110fa91b2ceb9f38c6c0bae1add405
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:08 2022 +0200
python3-charset-vomalizer: Update to version 2.0.12
- Update from 2.0.10 to 2.0.12
    - Update of rootfile
    - Changelog
       ## [2.0.12]
    	### Fixed
    	- ASCII miss-detection on rare cases (PR #170)
       ## [2.0.11]
    	### Added
    	- Explicit support for Python 3.11 (PR #164)
    	### Changed
    	- The logging behavior have been completely reviewed, now using only TRACE and
              DEBUG levels (PR #163 #165)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit b3ae0e6695fb3e9dbffa6f15a66c6fdc4a62af23
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Apr 10 13:18:07 2022 +0200
python3-botocore: Update to version 1.24.37
- Update from 1.23.21 to 1.24.37
    - Update of rootfile
    - Changelog
    	1.24.37
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for the pass-through of WebVTT styling to WebVTT outputs, pass-through of KLV metadata to supported formats, and improved filter support for processing 444/RGB content.
    	    api-change:wafv2: Add a new CurrentDefaultVersion field to ListAvailableManagedRuleGroupVersions API response; add a new VersioningSupported boolean to each ManagedRuleGroup returned from ListAvailableManagedRuleGroups API response.
    	    api-change:mediapackage-vod: This release adds ScteMarkersSource as an available field for Dash Packaging Configurations. When set to MANIFEST, MediaPackage will source the SCTE-35 markers from the manifest. When set to SEGMENTS, MediaPackage will source the SCTE-35 markers from the segments.
    	1.24.36
    	    api-change:apigateway: ApiGateway CLI command get-usage now includes usagePlanId, startDate, and endDate fields in the output to match documentation.
    	    api-change:personalize: This release provides tagging support in AWS Personalize.
    	    api-change:pi: Adds support for DocumentDB to the Performance Insights API.
    	    api-change:events: Update events client to latest version
    	    api-change:docdb: Added support to enable/disable performance insights when creating or modifying db instances
    	    api-change:sagemaker: Amazon Sagemaker Notebook Instances now supports G5 instance types
    	1.24.35
    	    bugfix:Proxy: Fix failure case for IP proxy addresses using TLS-in-TLS. boto/botocore#2652
    	    api-change:config: Add resourceType enums for AWS::EMR::SecurityConfiguration and AWS::SageMaker::CodeRepository
    	    api-change:panorama: Added Brand field to device listings.
    	    api-change:lambda: This release adds new APIs for creating and managing Lambda Function URLs and adds a new FunctionUrlAuthType parameter to the AddPermission API. Customers can use Function URLs to create built-in HTTPS endpoints on their functions.
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Box. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-box.html
    	1.24.34
    	    api-change:securityhub: Added additional ASFF details for RdsSecurityGroup AutoScalingGroup, ElbLoadBalancer, CodeBuildProject and RedshiftCluster.
    	    api-change:fsx: Provide customers more visibility into file system status by adding new "Misconfigured Unavailable" status for Amazon FSx for Windows File Server.
    	    api-change:s3control: Documentation-only update for doc bug fixes for the S3 Control API docs.
    	    api-change:datasync: AWS DataSync now supports Amazon FSx for OpenZFS locations.
    	1.24.33
    	    api-change:iot: AWS IoT - AWS IoT Device Defender adds support to list metric datapoints collected for IoT devices through the ListMetricValues API
    	    api-change:servicecatalog: This release adds ProvisioningArtifictOutputKeys to DescribeProvisioningParameters to reference the outputs of a Provisioned Product and deprecates ProvisioningArtifactOutputs.
    	    api-change:sms: Revised product update notice for SMS console deprecation.
    	    api-change:proton: SDK release to support tagging for AWS Proton Repository resource
    	    enhancement:AWSCRT: Upgrade awscrt version to 0.13.8
    	1.24.32
    	    api-change:connect: This release updates these APIs: UpdateInstanceAttribute, DescribeInstanceAttribute and ListInstanceAttributes. You can use it to programmatically enable/disable multi-party conferencing using attribute type MULTI_PARTY_CONFERENCING on the specified Amazon Connect instance.
    	1.24.31
    	    api-change:cloudcontrol: SDK release for Cloud Control API in Amazon Web Services China (Beijing) Region, operated by Sinnet, and Amazon Web Services China (Ningxia) Region, operated by NWCD
    	    api-change:pinpoint-sms-voice-v2: Amazon Pinpoint now offers a version 2.0 suite of SMS and voice APIs, providing increased control over sending and configuration. This release is a new SDK for sending SMS and voice messages called PinpointSMSVoiceV2.
    	    api-change:workspaces: Added APIs that allow you to customize the logo, login message, and help links in the WorkSpaces client login page. To learn more, visit https://docs.aws.amazon.com/workspaces/latest/adminguide/customize-branding....
    	    api-change:route53-recovery-cluster: This release adds a new API "ListRoutingControls" to list routing control states using the highly reliable Route 53 ARC data plane endpoints.
    	    api-change:databrew: This AWS Glue Databrew release adds feature to support ORC as an input format.
    	    api-change:auditmanager: This release adds documentation updates for Audit Manager. The updates provide data deletion guidance when a customer deregisters Audit Manager or deregisters a delegated administrator.
    	    api-change:grafana: This release adds tagging support to the Managed Grafana service. New APIs: TagResource, UntagResource and ListTagsForResource. Updates: add optional field tags to support tagging while calling CreateWorkspace.
    	1.24.30
    	    api-change:iot-data: Update the default AWS IoT Core Data Plane endpoint from VeriSign signed to ATS signed. If you have firewalls with strict egress rules, configure the rules to grant you access to data-ats.iot.[region].amazonaws.com or data-ats.iot.[region].amazonaws.com.cn.
    	    api-change:ec2: This release simplifies the auto-recovery configuration process enabling customers to set the recovery behavior to disabled or default
    	    api-change:fms: AWS Firewall Manager now supports the configuration of third-party policies that can use either the centralized or distributed deployment models.
    	    api-change:fsx: This release adds support for modifying throughput capacity for FSx for ONTAP file systems.
    	    api-change:iot: Doc only update for IoT that fixes customer-reported issues.
    	1.24.29
    	    api-change:organizations: This release provides the new CloseAccount API that enables principals in the management account to close any member account within an organization.
    	1.24.28
    	    api-change:medialive: This release adds support for selecting a maintenance window.
    	    api-change:acm-pca: Updating service name entities
    	1.24.27
    	    api-change:ec2: This is release adds support for Amazon VPC Reachability Analyzer to analyze path through a Transit Gateway.
    	    api-change:ssm: This Patch Manager release supports creating, updating, and deleting Patch Baselines for Rocky Linux OS.
    	    api-change:batch: Bug Fix: Fixed a bug where shapes were marked as unboxed and were not serialized and sent over the wire, causing an API error from the service.
    	1.24.26
    	    api-change:lambda: Adds support for increased ephemeral storage (/tmp) up to 10GB for Lambda functions. Customers can now provision up to 10 GB of ephemeral storage per function instance, a 20x increase over the previous limit of 512 MB.
    	    api-change:config: Added new APIs GetCustomRulePolicy and GetOrganizationCustomRulePolicy, and updated existing APIs PutConfigRule, DescribeConfigRule, DescribeConfigRuleEvaluationStatus, PutOrganizationConfigRule, DescribeConfigRule to support a new feature for building AWS Config rules with AWS CloudFormation Guard
    	    api-change:transcribe: This release adds an additional parameter for subtitling with Amazon Transcribe batch jobs: outputStartIndex.
    	1.24.25
    	    api-change:redshift: This release adds a new [--encrypted | --no-encrypted] field in restore-from-cluster-snapshot API. Customers can now restore an unencrypted snapshot to a cluster encrypted with AWS Managed Key or their own KMS key.
    	    api-change:ebs: Increased the maximum supported value for the Timeout parameter of the StartSnapshot API from 60 minutes to 4320 minutes. Changed the HTTP error code for ConflictException from 503 to 409.
    	    api-change:gamesparks: Released the preview of Amazon GameSparks, a fully managed AWS service that provides a multi-service backend for game developers.
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:transfer: Documentation updates for AWS Transfer Family to describe how to remove an associated workflow from a server.
    	    api-change:auditmanager: This release updates 1 API parameter, the SnsArn attribute. The character length and regex pattern for the SnsArn attribute have been updated, which enables you to deselect an SNS topic when using the UpdateSettings operation.
    	    api-change:ssm: Update AddTagsToResource, ListTagsForResource, and RemoveTagsFromResource APIs to reflect the support for tagging Automation resources. Includes other minor documentation updates.
    	1.24.24
    	    api-change:location: Amazon Location Service now includes a MaxResults parameter for GetDevicePositionHistory requests.
    	    api-change:polly: Amazon Polly adds new Catalan voice - Arlet. Arlet is available as Neural voice only.
    	    api-change:lakeformation: The release fixes the incorrect permissions called out in the documentation - DESCRIBE_TAG, ASSOCIATE_TAG, DELETE_TAG, ALTER_TAG. This trebuchet release fixes the corresponding SDK and documentation.
    	    api-change:ecs: Documentation only update to address tickets
    	    api-change:ce: Added three new APIs to support tagging and resource-level authorization on Cost Explorer resources: TagResource, UntagResource, ListTagsForResource. Added optional parameters to CreateCostCategoryDefinition, CreateAnomalySubscription and CreateAnomalyMonitor APIs to support Tag On Create.
    	1.24.23
    	    api-change:ram: Document improvements to the RAM API operations and parameter descriptions.
    	    api-change:ecr: This release includes a fix in the DescribeImageScanFindings paginated output.
    	    api-change:quicksight: AWS QuickSight Service Features - Expand public API support for group management.
    	    api-change:chime-sdk-meetings: Add support for media replication to link multiple WebRTC media sessions together to reach larger and global audiences. Participants connected to a replica session can be granted access to join the primary session and can switch sessions with their existing WebRTC connection
    	    api-change:mediaconnect: This release adds support for selecting a maintenance window.
    	1.24.22
    	    enhancement:jmespath: Add env markers to get working version of jmespath for python 3.6
    	    api-change:glue: Added 9 new APIs for AWS Glue Interactive Sessions: ListSessions, StopSession, CreateSession, GetSession, DeleteSession, RunStatement, GetStatement, ListStatements, CancelStatement
    	1.24.21
    	    enhancement:Dependency: Added support for jmespath 1.0
    	    api-change:amplifybackend: Adding the ability to customize Cognito verification messages for email and SMS in CreateBackendAuth and UpdateBackendAuth. Adding deprecation documentation for ForgotPassword in CreateBackendAuth and UpdateBackendAuth
    	    api-change:acm-pca: AWS Certificate Manager (ACM) Private Certificate Authority (CA) now supports customizable certificate subject names and extensions.
    	    api-change:ssm-incidents: Removed incorrect validation pattern for IncidentRecordSource.invokedBy
    	    api-change:billingconductor: This is the initial SDK release for AWS Billing Conductor. The AWS Billing Conductor is a customizable billing service, allowing you to customize your billing data to match your desired business structure.
    	    api-change:s3outposts: S3 on Outposts is releasing a new API, ListSharedEndpoints, that lists all endpoints associated with S3 on Outpost, that has been shared by Resource Access Manager (RAM).
    	1.24.20
    	    api-change:robomaker: This release deprecates ROS, Ubuntu and Gazbeo from RoboMaker Simulation Service Software Suites in favor of user-supplied containers and Relaxed Software Suites.
    	    api-change:dataexchange: This feature enables data providers to use the RevokeRevision operation to revoke subscriber access to a given revision. Subscribers are unable to interact with assets within a revoked revision.
    	    api-change:ec2: Adds the Cascade parameter to the DeleteIpam API. Customers can use this parameter to automatically delete their IPAM, including non-default scopes, pools, cidrs, and allocations. There mustn't be any pools provisioned in the default public scope to use this parameter.
    	    api-change:cognito-idp: Updated EmailConfigurationType and SmsConfigurationType to reflect that you can now choose Amazon SES and Amazon SNS resources in the same Region.
    	    enhancement:AWSCRT: Upgrade awscrt extra to 0.13.5
    	    api-change:location: New HERE style "VectorHereExplore" and "VectorHereExploreTruck".
    	    api-change:ecs: Documentation only update to address tickets
    	    api-change:keyspaces: Fixing formatting issues in CLI and SDK documentation
    	    api-change:rds: Various documentation improvements
    	1.24.19
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Slack. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-slack.html
    	    api-change:timestream-query: Amazon Timestream Scheduled Queries now support Timestamp datatype in a multi-measure record.
    	    enhancement:Stubber: Added support for modeled exception fields when adding errors to a client stub. Implements boto/boto3`#3178 https://github.com/boto/botocore/issues/3178`__.
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:config: Add resourceType enums for AWS::ECR::PublicRepository and AWS::EC2::LaunchTemplate
    	1.24.18
    	    api-change:outposts: This release adds address filters for listSites
    	    api-change:lambda: Adds PrincipalOrgID support to AddPermission API. Customers can use it to manage permissions to lambda functions at AWS Organizations level.
    	    api-change:secretsmanager: Documentation updates for Secrets Manager.
    	    api-change:connect: This release adds support for enabling Rich Messaging when starting a new chat session via the StartChatContact API. Rich Messaging enables the following formatting options: bold, italics, hyperlinks, bulleted lists, and numbered lists.
    	    api-change:chime: Chime VoiceConnector Logging APIs will now support MediaMetricLogs. Also CreateMeetingDialOut now returns AccessDeniedException.
    	1.24.17
    	    api-change:transcribe: Documentation fix for API StartMedicalTranscriptionJobRequest, now showing min sample rate as 16khz
    	    api-change:transfer: Adding more descriptive error types for managed workflows
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	1.24.16
    	    api-change:comprehend: Amazon Comprehend now supports extracting the sentiment associated with entities such as brands, products and services from text documents.
    	1.24.15
    	    api-change:eks: Introducing a new enum for NodeGroup error code: Ec2SubnetMissingIpv6Assignment
    	    api-change:keyspaces: Adding link to CloudTrail section in Amazon Keyspaces Developer Guide
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for reading timecode from AVCHD sources and now provides the ability to segment WebVTT at the same interval as the video and audio in HLS packages.
    	1.24.14
    	    api-change:chime-sdk-meetings: Adds support for Transcribe language identification feature to the StartMeetingTranscription API.
    	    api-change:ecs: Amazon ECS UpdateService API now supports additional parameters: loadBalancers, propagateTags, enableECSManagedTags, and serviceRegistries
    	    api-change:migration-hub-refactor-spaces: AWS Migration Hub Refactor Spaces documentation update.
    	1.24.13
    	    api-change:synthetics: Allow custom handler function.
    	    api-change:transfer: Add waiters for server online and offline.
    	    api-change:devops-guru: Amazon DevOps Guru now integrates with Amazon CodeGuru Profiler. You can view CodeGuru Profiler recommendations for your AWS Lambda function in DevOps Guru. This feature is enabled by default for new customers as of 3/4/2022. Existing customers can enable this feature with UpdateEventSourcesConfig.
    	    api-change:macie: Amazon Macie Classic (macie) has been discontinued and is no longer available. A new Amazon Macie (macie2) is now available with significant design improvements and additional features.
    	    api-change:ec2: Documentation updates for Amazon EC2.
    	    api-change:sts: Documentation updates for AWS Security Token Service.
    	    api-change:connect: This release updates the *InstanceStorageConfig APIs so they support a new ResourceType: REAL_TIME_CONTACT_ANALYSIS_SEGMENTS. Use this resource type to enable streaming for real-time contact analysis and to associate the Kinesis stream where real-time contact analysis segments will be published.
    	1.24.12
    	    api-change:greengrassv2: Doc only update that clarifies Create Deployment section.
    	    api-change:fsx: This release adds support for data repository associations to use root ("/") as the file system path
    	    api-change:kendra: Amazon Kendra now suggests spell corrections for a query. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/query-spell-check.html
    	    api-change:appflow: Launching Amazon AppFlow Marketo as a destination connector SDK.
    	    api-change:timestream-query: Documentation only update for SDK and CLI
    	1.24.11
    	    api-change:gamelift: Minor updates to address errors.
    	    api-change:cloudtrail: Add bytesScanned field into responses of DescribeQuery and GetQueryResults.
    	    api-change:athena: This release adds support for S3 Object Ownership by allowing the S3 bucket owner full control canned ACL to be set when Athena writes query results to S3 buckets.
    	    api-change:keyspaces: This release adds support for data definition language (DDL) operations
    	    api-change:ecr: This release adds support for tracking images lastRecordedPullTime.
    	1.24.10
    	    api-change:mediapackage: This release adds Hybridcast as an available profile option for Dash Origin Endpoints.
    	    api-change:rds: Documentation updates for Multi-AZ DB clusters.
    	    api-change:mgn: Add support for GP3 and IO2 volume types. Add bootMode to LaunchConfiguration object (and as a parameter to UpdateLaunchConfigurationRequest).
    	    api-change:kafkaconnect: Adds operation for custom plugin deletion (DeleteCustomPlugin) and adds new StateDescription field to DescribeCustomPlugin and DescribeConnector responses to return errors from asynchronous resource creation.
    	1.24.9
    	    api-change:finspace-data: Add new APIs for managing Users and Permission Groups.
    	    api-change:amplify: Add repositoryCloneMethod field for hosting an Amplify app. This field shows what authorization method is used to clone the repo: SSH, TOKEN, or SIGV4.
    	    api-change:fsx: This release adds support for the following FSx for OpenZFS features: snapshot lifecycle transition messages, force flag for deleting file systems with child resources, LZ4 data compression, custom record sizes, and unsetting volume quotas and reservations.
    	    api-change:fis: This release adds logging support for AWS Fault Injection Simulator experiments. Experiment templates can now be configured to send experiment activity logs to Amazon CloudWatch Logs or to an S3 bucket.
    	    api-change:route53-recovery-cluster: This release adds a new API option to enable overriding safety rules to allow routing control state updates.
    	    api-change:amplifyuibuilder: We are adding the ability to configure workflows and actions for components.
    	    api-change:athena: This release adds support for updating an existing named query.
    	    api-change:ec2: This release adds support for new AMI property 'lastLaunchedTime'
    	    api-change:servicecatalog-appregistry: AppRegistry is deprecating Application and Attribute-Group Name update feature. In this release, we are marking the name attributes for Update APIs as deprecated to give a heads up to our customers.
    	1.24.8
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:panorama: Added NTP server configuration parameter to ProvisionDevice operation. Added alternate software fields to DescribeDevice response
    	1.24.7
    	    api-change:route53: SDK doc update for Route 53 to update some parameters with new information.
    	    api-change:databrew: This AWS Glue Databrew release adds feature to merge job outputs into a max number of files for S3 File output type.
    	    api-change:transfer: Support automatic pagination when listing AWS Transfer Family resources.
    	    api-change:s3control: Amazon S3 Batch Operations adds support for new integrity checking capabilities in Amazon S3.
    	    api-change:s3: This release adds support for new integrity checking capabilities in Amazon S3. You can choose from four supported checksum algorithms for data integrity checking on your upload and download requests. In addition, AWS SDK can automatically calculate a checksum as it streams data into S3
    	    api-change:fms: AWS Firewall Manager now supports the configuration of AWS Network Firewall policies with either centralized or distributed deployment models. This release also adds support for custom endpoint configuration, where you can choose which Availability Zones to create firewall endpoints in.
    	    api-change:lightsail: This release adds support to delete and create Lightsail default key pairs that you can use with Lightsail instances.
    	    api-change:autoscaling: You can now hibernate instances in a warm pool to stop instances without deleting their RAM contents. You can now also return instances to the warm pool on scale in, instead of always terminating capacity that you will need later.
    	1.24.6
    	    api-change:transfer: The file input selection feature provides the ability to use either the originally uploaded file or the output file from the previous workflow step, enabling customers to make multiple copies of the original file while keeping the source file intact for file archival.
    	    api-change:lambda: Lambda releases .NET 6 managed runtime to be available in all commercial regions.
    	    api-change:textract: Added support for merged cells and column header for table response.
    	1.24.5
    	    api-change:translate: This release enables customers to use translation settings for formality customization in their synchronous translation output.
    	    api-change:wafv2: Updated descriptions for logging configuration.
    	    api-change:apprunner: AWS App Runner adds a Java platform (Corretto 8, Corretto 11 runtimes) and a Node.js 14 runtime.
    	1.24.4
    	    api-change:imagebuilder: This release adds support to enable faster launching for Windows AMIs created by EC2 Image Builder.
    	    api-change:customer-profiles: This release introduces apis CreateIntegrationWorkflow, DeleteWorkflow, ListWorkflows, GetWorkflow and GetWorkflowSteps. These apis are used to manage and view integration workflows.
    	    api-change:dynamodb: DynamoDB ExecuteStatement API now supports Limit as a request parameter to specify the maximum number of items to evaluate. If specified, the service will process up to the Limit and the results will include a LastEvaluatedKey value to continue the read in a subsequent operation.
    	1.24.3
    	    api-change:transfer: Properties for Transfer Family used with SFTP, FTP, and FTPS protocols. Display Banners are bodies of text that can be displayed before and/or after a user authenticates onto a server using one of the previously mentioned protocols.
    	    api-change:gamelift: Increase string list limit from 10 to 100.
    	    api-change:budgets: This change introduces DescribeBudgetNotificationsForAccount API which returns budget notifications for the specified account
    	1.24.2
    	    api-change:iam: Documentation updates for AWS Identity and Access Management (IAM).
    	    api-change:redshift: SDK release for Cross region datasharing and cost-control for cross region datasharing
    	    api-change:evidently: Add support for filtering list of experiments and launches by status
    	    api-change:backup: AWS Backup add new S3_BACKUP_OBJECT_FAILED and S3_RESTORE_OBJECT_FAILED event types in BackupVaultNotifications events list.
    	1.24.1
    	    api-change:ec2: Documentation updates for EC2.
    	    api-change:budgets: Adds support for auto-adjusting budgets, a new budget method alongside fixed and planned. Auto-adjusting budgets introduces new metadata to configure a budget limit baseline using a historical lookback average or current period forecast.
    	    api-change:ce: AWS Cost Anomaly Detection now supports SNS FIFO topic subscribers.
    	    api-change:glue: Support for optimistic locking in UpdateTable
    	    api-change:ssm: Assorted ticket fixes and updates for AWS Systems Manager.
    	1.24.0
    	    api-change:appflow: Launching Amazon AppFlow SAP as a destination connector SDK.
    	    feature:Parser: Adding support for parsing int/long types in rest-json response headers.
    	    api-change:rds: Adds support for determining which Aurora PostgreSQL versions support Babelfish.
    	    api-change:athena: This release adds a subfield, ErrorType, to the AthenaError response object in the GetQueryExecution API when a query fails.
    	1.23.54
    	    api-change:ssm: Documentation updates for AWS Systems Manager.
    	1.23.53
    	    api-change:cloudformation: This SDK release adds AWS CloudFormation Hooks HandlerErrorCodes
    	    api-change:lookoutvision: This release makes CompilerOptions in Lookout for Vision's StartModelPackagingJob's Configuration object optional.
    	    api-change:pinpoint: This SDK release adds a new paramater creation date for GetApp and GetApps Api call
    	    api-change:sns: Customer requested typo fix in API documentation.
    	    api-change:wafv2: Adds support for AWS WAF Fraud Control account takeover prevention (ATP), with configuration options for the new managed rule group AWSManagedRulesATPRuleSet and support for application integration SDKs for Android and iOS mobile apps.
    	1.23.52
    	    api-change:cloudformation: This SDK release is for the feature launch of AWS CloudFormation Hooks.
    	1.23.51
    	    api-change:kendra: Amazon Kendra now provides a data source connector for Amazon FSx. For more information, see https://docs.aws.amazon.com/kendra/latest/dg/data-source-fsx.html
    	    api-change:apprunner: This release adds support for App Runner to route outbound network traffic of a service through an Amazon VPC. New API: CreateVpcConnector, DescribeVpcConnector, ListVpcConnectors, and DeleteVpcConnector. Updated API: CreateService, DescribeService, and UpdateService.
    	    api-change:s3control: This release adds support for S3 Batch Replication. Batch Replication lets you replicate existing objects, already replicated objects to new destinations, and objects that previously failed to replicate. Customers will receive object-level visibility of progress and a detailed completion report.
    	    api-change:sagemaker: Autopilot now generates an additional report with information on the performance of the best model, such as a Confusion matrix and Area under the receiver operating characteristic (AUC-ROC). The path to the report can be found in CandidateArtifactLocations.
    	1.23.50
    	    api-change:auditmanager: This release updates 3 API parameters. UpdateAssessmentFrameworkControlSet now requires the controls attribute, and CreateAssessmentFrameworkControl requires the id attribute. Additionally, UpdateAssessmentFramework now has a minimum length constraint for the controlSets attribute.
    	    api-change:synthetics: Adding names parameters to the Describe APIs.
    	    api-change:ssm-incidents: Update RelatedItem enum to support SSM Automation
    	    api-change:events: Update events client to latest version
    	    enhancement:Lambda Request Header: Adding request header for Lambda recursion detection.
    	1.23.49
    	    api-change:athena: You can now optionally specify the account ID that you expect to be the owner of your query results output location bucket in Athena. If the account ID of the query results bucket owner does not match the specified account ID, attempts to output to the bucket will fail with an S3 permissions error.
    	    api-change:rds: updates for RDS Custom for Oracle 12.1 support
    	    api-change:lakeformation: Add support for calling Update Table Objects without a TransactionId.
    	1.23.48
    	    api-change:ec2: adds support for AMIs in Recycle Bin
    	    api-change:robomaker: The release deprecates the use various APIs of RoboMaker Deployment Service in favor of AWS IoT GreenGrass v2.0.
    	    api-change:meteringmarketplace: Add CustomerAWSAccountId to ResolveCustomer API response and increase UsageAllocation limit to 2500.
    	    api-change:rbin: Add EC2 Image recycle bin support.
    	1.23.47
    	    api-change:emr: Update emr client to latest version
    	    api-change:personalize: Adding minRecommendationRequestsPerSecond attribute to recommender APIs.
    	    enhancement:Request headers: Adding request headers with retry information.
    	    api-change:appflow: Launching Amazon AppFlow Custom Connector SDK.
    	    api-change:dynamodb: Documentation update for DynamoDB Java SDK.
    	    api-change:iot: This release adds support for configuring AWS IoT logging level per client ID, source IP, or principal ID.
    	    api-change:comprehend: Amazon Comprehend now supports sharing and importing custom trained models from one AWS account to another within the same region.
    	    api-change:ce: Doc-only update for Cost Explorer API that adds INVOICING_ENTITY dimensions
    	    api-change:fis: Added GetTargetResourceType and ListTargetResourceTypesAPI actions. These actions return additional details about resource types and parameters that can be targeted by FIS actions. Added a parameters field for the targets that can be specified in experiment templates.
    	    api-change:es: Allows customers to get progress updates for blue/green deployments
    	    api-change:glue: Launch Protobuf support for AWS Glue Schema Registry
    	    api-change:elasticache: Documentation update for AWS ElastiCache
    	1.23.46
    	    api-change:appconfigdata: Documentation updates for AWS AppConfig Data.
    	    api-change:athena: This release adds a field, AthenaError, to the GetQueryExecution response object when a query fails.
    	    api-change:appconfig: Documentation updates for AWS AppConfig
    	    api-change:cognito-idp: Doc updates for Cognito user pools API Reference.
    	    api-change:secretsmanager: Feature are ready to release on Jan 28th
    	    api-change:sagemaker: This release added a new NNA accelerator compilation support for Sagemaker Neo.
    	1.23.45
    	    api-change:ec2: X2ezn instances are powered by Intel Cascade Lake CPUs that deliver turbo all core frequency of up to 4.5 GHz and up to 100 Gbps of networking bandwidth
    	    api-change:kafka: Amazon MSK has updated the CreateCluster and UpdateBrokerStorage API that allows you to specify volume throughput during cluster creation and broker volume updates.
    	    api-change:connect: This release adds support for configuring a custom chat duration when starting a new chat session via the StartChatContact API. The default value for chat duration is 25 hours, minimum configurable value is 1 hour (60 minutes) and maximum configurable value is 7 days (10,080 minutes).
    	    api-change:amplify: Doc only update to the description of basicauthcredentials to describe the required encoding and format.
    	    api-change:opensearch: Allows customers to get progress updates for blue/green deployments
    	1.23.44
    	    api-change:frauddetector: Added new APIs for viewing past predictions and obtaining prediction metadata including prediction explanations: ListEventPredictions and GetEventPredictionMetadata
    	    api-change:ebs: Documentation updates for Amazon EBS Direct APIs.
    	    api-change:codeguru-reviewer: Added failure state and adjusted timeout in waiter
    	    api-change:securityhub: Adding top level Sample boolean field
    	    api-change:sagemaker: API changes relating to Fail steps in model building pipeline and add PipelineExecutionFailureReason in PipelineExecutionSummary.
    	1.23.43
    	    api-change:fsx: This release adds support for growing SSD storage capacity and growing/shrinking SSD IOPS for FSx for ONTAP file systems.
    	    api-change:efs: Update efs client to latest version
    	    api-change:connect: This release adds support for custom vocabularies to be used with Contact Lens. Custom vocabularies improve transcription accuracy for one or more specific words.
    	    api-change:guardduty: Amazon GuardDuty expands threat detection coverage to protect Amazon Elastic Kubernetes Service (EKS) workloads.
    	1.23.42
    	    api-change:route53-recovery-readiness: Updated documentation for Route53 Recovery Readiness APIs.
    	1.23.41
    	    enhancement:Exceptions: ProxyConnectionError previously provided the full proxy URL. User info will now be appropriately masked if needed.
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added support for 4K AV1 output resolutions & 10-bit AV1 color, the ability to ingest sidecar Dolby Vision XML metadata files, and the ability to flag WebVTT and IMSC tracks for accessibility in HLS.
    	    api-change:transcribe: Add support for granular PIIEntityTypes when using Batch ContentRedaction.
    	1.23.40
    	    api-change:guardduty: Amazon GuardDuty findings now include remoteAccountDetails under AwsApiCallAction section if instance credential is exfiltrated.
    	    api-change:connect: This release adds tagging support for UserHierarchyGroups resource.
    	    api-change:mediatailor: This release adds support for multiple Segment Delivery Configurations. Users can provide a list of names and URLs when creating or editing a source location. When retrieving content, users can send a header to choose which URL should be used to serve content.
    	    api-change:fis: Added action startTime and action endTime timestamp fields to the ExperimentAction object
    	    api-change:ec2: C6i, M6i and R6i instances are powered by a third-generation Intel Xeon Scalable processor (Ice Lake) delivering all-core turbo frequency of 3.5 GHz
    	1.23.39
    	    api-change:macie2: This release of the Amazon Macie API introduces stricter validation of requests to create custom data identifiers.
    	    api-change:ec2-instance-connect: Adds support for ED25519 keys. PushSSHPublicKey Availability Zone parameter is now optional. Adds EC2InstanceStateInvalidException for instances that are not running. This was previously a service exception, so this may require updating your code to handle this new exception.
    	1.23.38
    	    api-change:ivs: This release adds support for the new Thumbnail Configuration property for Recording Configurations. For more information see https://docs.aws.amazon.com/ivs/latest/userguide/record-to-s3.html
    	    api-change:storagegateway: Documentation update for adding bandwidth throttling support for S3 File Gateways.
    	    api-change:location: This release adds the CalculateRouteMatrix API which calculates routes for the provided departure and destination positions. The release also deprecates the use of pricing plan across all verticals.
    	    api-change:cloudtrail: This release fixes a documentation bug in the description for the readOnly field selector in advanced event selectors. The description now clarifies that users omit the readOnly field selector to select both Read and Write management events.
    	    api-change:ec2: Add support for AWS Client VPN client login banner and session timeout.
    	1.23.37
    	    enhancement:Configuration: Adding support for defaults_mode configuration. The defaults_mode will be used to determine how certain default configuration options are resolved in the SDK.
    	1.23.36
    	    api-change:config: Update ResourceType enum with values for CodeDeploy, EC2 and Kinesis resources
    	    api-change:application-insights: Application Insights support for Active Directory and SharePoint
    	    api-change:honeycode: Added read and write api support for multi-select picklist. And added errorcode field to DescribeTableDataImportJob API output, when import job fails.
    	    api-change:ram: This release adds the ListPermissionVersions API which lists the versions for a given permission.
    	    api-change:lookoutmetrics: This release adds a new DeactivateAnomalyDetector API operation.
    	1.23.35
    	    api-change:pinpoint: Adds JourneyChannelSettings to WriteJourneyRequest
    	    api-change:lexv2-runtime: Update lexv2-runtime client to latest version
    	    api-change:nimble: Amazon Nimble Studio now supports validation for Launch Profiles. Launch Profiles now report static validation results after create/update to detect errors in network or active directory configuration.
    	    api-change:glue: This SDK release adds support to pass run properties when starting a workflow run
    	    api-change:ssm: AWS Systems Manager adds category support for DescribeDocument API
    	    api-change:elasticache: AWS ElastiCache for Redis has added a new Engine Log LogType in LogDelivery feature. You can now publish the Engine Log from your Amazon ElastiCache for Redis clusters to Amazon CloudWatch Logs and Amazon Kinesis Data Firehose.
    	1.23.34
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	    api-change:elasticache: Doc only update for ElastiCache
    	    api-change:honeycode: Honeycode is releasing new APIs to allow user to create, delete and list tags on resources.
    	    api-change:ec2: Hpc6a instances are powered by a third-generation AMD EPYC processors (Milan) delivering all-core turbo frequency of 3.4 GHz
    	    api-change:fms: Shield Advanced policies for Amazon CloudFront resources now support automatic application layer DDoS mitigation. The max length for SecurityServicePolicyData ManagedServiceData is now 8192 characters, instead of 4096.
    	    api-change:pi: This release adds three Performance Insights APIs. Use ListAvailableResourceMetrics to get available metrics, GetResourceMetadata to get feature metadata, and ListAvailableResourceDimensions to list available dimensions. The AdditionalMetrics field in DescribeDimensionKeys retrieves per-SQL metrics.
    	1.23.33
    	    api-change:finspace-data: Documentation updates for FinSpace.
    	    api-change:rds: This release adds the db-proxy event type to support subscribing to RDS Proxy events.
    	    api-change:ce: Doc only update for Cost Explorer API that fixes missing clarifications for MatchOptions definitions
    	    api-change:kendra: Amazon Kendra now supports advanced query language and query-less search.
    	    api-change:workspaces: Introducing new APIs for Workspaces audio optimization with Amazon Connect: CreateConnectClientAddIn, DescribeConnectClientAddIns, UpdateConnectClientAddIn and DeleteConnectClientAddIn.
    	    api-change:iotevents-data: This release provides documentation updates for Timer.timestamp in the IoT Events API Reference Guide.
    	    api-change:ec2: EC2 Capacity Reservations now supports RHEL instance platforms (RHEL with SQL Server Standard, RHEL with SQL Server Enterprise, RHEL with SQL Server Web, RHEL with HA, RHEL with HA and SQL Server Standard, RHEL with HA and SQL Server Enterprise)
    	1.23.32
    	    api-change:ec2: New feature: Updated EC2 API to support faster launching for Windows images. Optimized images are pre-provisioned, using snapshots to launch instances up to 65% faster.
    	    api-change:compute-optimizer: Adds support for new Compute Optimizer capability that makes it easier for customers to optimize their EC2 instances by leveraging multiple CPU architectures.
    	    api-change:lookoutmetrics: This release adds FailureType in the response of DescribeAnomalyDetector.
    	    api-change:databrew: This SDK release adds support for specifying a Bucket Owner for an S3 location.
    	    api-change:transcribe: Documentation updates for Amazon Transcribe.
    	1.23.31
    	    api-change:medialive: This release adds support for selecting the Program Date Time (PDT) Clock source algorithm for HLS outputs.
    	1.23.30
    	    api-change:ec2: This release introduces On-Demand Capacity Reservation support for Cluster Placement Groups, adds Tags on instance Metadata, and includes documentation updates for Amazon EC2.
    	    api-change:mediatailor: This release adds support for filler slate when updating MediaTailor channels that use the linear playback mode.
    	    api-change:opensearch: Amazon OpenSearch Service adds support for Fine Grained Access Control for existing domains running Elasticsearch version 6.7 and above
    	    api-change:iotwireless: Downlink Queue Management feature provides APIs for customers to manage the queued messages destined to device inside AWS IoT Core for LoRaWAN. Customer can view, delete or purge the queued message(s). It allows customer to preempt the queued messages and let more urgent messages go through.
    	    api-change:es: Amazon OpenSearch Service adds support for Fine Grained Access Control for existing domains running Elasticsearch version 6.7 and above
    	    api-change:mwaa: This release adds a "Source" field that provides the initiator of an update, such as due to an automated patch from AWS or due to modification via Console or API.
    	    api-change:appsync: AppSync: AWS AppSync now supports configurable batching sizes for AWS Lambda resolvers, Direct AWS Lambda resolvers and pipeline functions
    	1.23.29
    	    api-change:cloudtrail: This release adds support for CloudTrail Lake, a new feature that lets you run SQL-based queries on events that you have aggregated into event data stores. New APIs have been added for creating and managing event data stores, and creating, running, and managing queries in CloudTrail Lake.
    	    api-change:iot: This release adds an automatic retry mechanism for AWS IoT Jobs. You can now define a maximum number of retries for each Job rollout, along with the criteria to trigger the retry for FAILED/TIMED_OUT/ALL(both FAILED an TIMED_OUT) job.
    	    api-change:ec2: This release adds a new API called ModifyVpcEndpointServicePayerResponsibility which allows VPC endpoint service owners to take payer responsibility of their VPC Endpoint connections.
    	    api-change:snowball: Updating validation rules for interfaces used in the Snowball API to tighten security of service.
    	    api-change:lakeformation: Add new APIs for 3rd Party Support for Lake Formation
    	    api-change:appstream: Includes APIs for App Entitlement management regarding entitlement and entitled application association.
    	    api-change:eks: Amazon EKS now supports running applications using IPv6 address space
    	    api-change:quicksight: Multiple Doc-only updates for Amazon QuickSight.
    	    api-change:ecs: Documentation update for ticket fixes.
    	    api-change:sagemaker: Amazon SageMaker now supports running training jobs on ml.g5 instance types.
    	    api-change:glue: Add Delta Lake target support for Glue Crawler and 3rd Party Support for Lake Formation
    	1.23.28
    	    api-change:rekognition: This release introduces a new field IndexFacesModelVersion, which is the version of the face detect and storage model that was used when indexing the face vector.
    	    api-change:s3: Minor doc-based updates based on feedback bugs received.
    	    enhancement:JSONFileCache: Add support for __delitem__ in JSONFileCache
    	    api-change:s3control: Documentation updates for the renaming of Glacier to Glacier Flexible Retrieval.
    	1.23.27
    	    api-change:sagemaker: The release allows users to pass pipeline definitions as Amazon S3 locations and control the pipeline execution concurrency using ParallelismConfiguration. It also adds support of EMR jobs as pipeline steps.
    	    api-change:rds: Multiple doc-only updates for Relational Database Service (RDS)
    	    api-change:mediaconvert: AWS Elemental MediaConvert SDK has added strength levels to the Sharpness Filter and now permits OGG files to be specified as sidecar audio inputs.
    	    api-change:greengrassv2: This release adds the API operations to manage the Greengrass role associated with your account and to manage the core device connectivity information. Greengrass V2 customers can now depend solely on Greengrass V2 SDK for all the API operations needed to manage their fleets.
    	    api-change:detective: Added and updated API operations to support the Detective integration with AWS Organizations. New actions are used to manage the delegated administrator account and the integration configuration.
    	1.23.26
    	    api-change:nimble: Amazon Nimble Studio adds support for users to upload files during a streaming session using NICE DCV native client or browser.
    	    api-change:chime-sdk-messaging: The Amazon Chime SDK now supports updating message attributes via channel flows
    	    api-change:imagebuilder: Added a note to infrastructure configuration actions and data types concerning delivery of Image Builder event messages to encrypted SNS topics. The key that's used to encrypt the SNS topic must reside in the account that Image Builder runs under.
    	    api-change:workmail: This release allows customers to change their email monitoring configuration in Amazon WorkMail.
    	    api-change:transfer: Property for Transfer Family used with the FTPS protocol. TLS Session Resumption provides a mechanism to resume or share a negotiated secret key between the control and data connection for an FTPS session.
    	    api-change:lookoutmetrics: This release adds support for Causal Relationships. Added new ListAnomalyGroupRelatedMetrics API operation and InterMetricImpactDetails API data type
    	    api-change:mediaconnect: You can now use the Fujitsu-QoS protocol for your MediaConnect sources and outputs to transport content to and from Fujitsu devices.
    	    api-change:qldb: Amazon QLDB now supports journal exports in JSON and Ion Binary formats. This release adds an optional OutputFormat parameter to the ExportJournalToS3 API.
    	1.23.25
    	    api-change:customer-profiles: This release adds an optional parameter, ObjectTypeNames to the PutIntegration API to support multiple object types per integration option. Besides, this release introduces Standard Order Objects which contain data from third party systems and each order object belongs to a specific profile.
    	    api-change:sagemaker: This release adds a new ContentType field in AutoMLChannel for SageMaker CreateAutoMLJob InputDataConfig.
    	    api-change:forecast: Adds ForecastDimensions field to the DescribeAutoPredictorResponse
    	    api-change:securityhub: Added new resource details objects to ASFF, including resources for Firewall, and RuleGroup, FirewallPolicy Added additional details for AutoScalingGroup, LaunchConfiguration, and S3 buckets.
    	    api-change:location: Making PricingPlan optional as part of create resource API.
    	    api-change:redshift: This release adds API support for managed Redshift datashares. Customers can now interact with a Redshift datashare that is managed by a different service, such as AWS Data Exchange.
    	    api-change:apigateway: Documentation updates for Amazon API Gateway
    	    api-change:devops-guru: Adds Tags support to DescribeOrganizationResourceCollectionHealth
    	    api-change:imagebuilder: This release adds support for importing and exporting VM Images as part of the Image Creation workflow via EC2 VM Import/Export.
    	    api-change:datasync: AWS DataSync now supports FSx Lustre Locations.
    	    api-change:finspace-data: Make dataset description optional and allow s3 export for dataviews
    	1.23.24
    	    api-change:secretsmanager: Documentation updates for Secrets Manager
    	1.23.23
    	    api-change:lexv2-models: Update lexv2-models client to latest version
    	    api-change:network-firewall: This release adds support for managed rule groups.
    	    api-change:route53-recovery-control-config: This release adds tagging supports to Route53 Recovery Control Configuration. New APIs: TagResource, UntagResource and ListTagsForResource. Updates: add optional field tags to support tagging while calling CreateCluster, CreateControlPanel and CreateSafetyRule.
    	    api-change:ec2: Adds waiters support for internet gateways.
    	    api-change:sms: This release adds SMS discontinuation information to the API and CLI references.
    	    api-change:route53domains: Amazon Route 53 domain registration APIs now support filtering and sorting in the ListDomains API, deleting a domain by using the DeleteDomain API and getting domain pricing information by using the ListPrices API.
    	    api-change:savingsplans: Adds the ability to specify Savings Plans hourly commitments using five digits after the decimal point.
    	1.23.22
    	    api-change:lookoutvision: This release adds new APIs for packaging an Amazon Lookout for Vision model as an AWS IoT Greengrass component.
    	    api-change:sagemaker: This release added a new Ambarella device(amba_cv2) compilation support for Sagemaker Neo.
    	    api-change:comprehendmedical: This release adds a new set of APIs (synchronous and batch) to support the SNOMED-CT ontology.
    	    api-change:health: Documentation updates for AWS Health
    	    api-change:logs: This release adds AWS Organizations support as condition key in destination policy for cross account Subscriptions in CloudWatch Logs.
    	    api-change:outposts: This release adds the UpdateOutpost API.
    	    api-change:support: Documentation updates for AWS Support.
    	    api-change:iot: This release allows customer to enable caching of custom authorizer on HTTP protocol for clients that use persistent or Keep-Alive connection in order to reduce the number of Lambda invocations.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 159f9214a6852328f4edb327b33d2268ac4bac3f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 21:08:28 2022 +0000
Core Update 168: Ship and restart OpenVPN
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 75072c7702208179b392570485d5b301673525a0
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 14 10:21:12 2022 +0200
openvpn: Update to version 2.5.6
- Update from version 2.5.4 to 2.5.6
    - Update of rootfile not required
    - No changes related to ciphers or options
    - Source tarball changed from .xz to .gz as for version 2.5.6 the xz options was not
       available. Raised on Openvpn forum but response was that they also didn't know why xz
       option was not available but they thought it was not a big deal as the gz version is
       only slightly larger.
    - Changelog
       Overview of changes in 2.5.6
    	User-visible Changes
    	    update copyright year to 2022
    	New features
    	    new plugin (sample-plugin/defer/multi-auth.c) to help testing with multiple
                 parallel plugins that succeed/fail in direct/deferred mode
    	    various build improvements (github actions etc)
    	    upgrade pkcs11-helper to release 1.28.4
    	Bugfixes
    	    CVE-2022-0547 see
                 https://community.openvpn.net/openvpn/wiki/SecurityAnnouncements
    	      If openvpn is configured with multiple authentication plugins and more than
                   one plugin tries to do deferred authentication, the result is not
                   well-defined - creating a possible authentication bypass.
    	      In this situation the server process will now abort itself with a clear log
                   message. Only one plugin is allowed to do deferred authentication.
    	    Fix "--mtu-disc maybe|yes" on Linux
    	    Due to configure/syshead.h/#ifdef confusion, the code in question was not
                 compiled-in since a long time. Fixed. Trac: #1452
    	    Fix $common_name variable passed to scripts when username-as-common-name is
                 in effect.
    	      This was not consistently set - sometimes, OpenVPN exported the username,
                   sometimes the common name from the client cert. Fixed. Trac: #1434
    	    Fix potential memory leaks in add_route() and add_route_ipv6().
    	    Apply connect-retry backoff only to one side of the connection in p2p mode.
                 Without that fix/enhancement, two sides could end up only sending packets
                  when the other end is not ready. Trac: #1010, #1384
    	    remove unused sitnl.h file
    	    clean up msvc build files, remove unused MSVC build .bat files
    	    repair "--inactive" handling with a 'bytes' parameter larger than 2 Gbytes
    	     due to integer overflow, this ended up being "0" on Linux, but on Windows
                  with MSVC it ends up being "always 2 Gbyte", both not doing what is
                  requested. Trac: #1448
    	    repair handling of EC certificates on Windows with pkcs11-helper
    	    (wrong compile-time defines for OpenSSL 1.1.1)
    	Documentation
    	    documentation improvements related to DynDNS. Trac: #1417
    	    clean up documentation for --proto and related options
    	    rebuild rst docs if input files change (proper dependency handling)
       Overview of changes in 2.5.5
    	User-visible Changes
    	    SWEET32/64bit cipher deprecation change was postponed to 2.7
    	    Windows: use network address for emulated DHCP server as default this
                 enables use of a /30 subnet, which is needed when connecting to OpenVPN Cloud.
    	    require EC support in windows builds (this means it's no longer possible to
                 build a Windows OpenVPN binary with an OpenSSL lib without EC support)
    	New features
    	    Windows build: use CFG and Spectre mitigations on MSVC builds
    	    bring back OpenSSL config loading to Windows builds. OpenSSL config is
                 loaded from %installdir%\ssl\openssl.cnf (typically:
                 c:\program files\openvpn\ssl\openssl.cnf) if it exists.
    	      This is important for some hardware tokens which need special OpenSSL
                   config for correct operation. Trac #1296
    	Bugfixes
    	    Windows build: enable EKM
    	    Windows build: improve various vcpkg related build issues
    	    Windows build: fix regression related to non-writeable status files
                 (Trac #1430)
    	    Windows build: fix regression that broke OpenSSL EC support
    	    Windows build: fix "product version" display (2.5..4 -> 2.5.4)
    	    Windows build: fix regression preventing use of PKCS12 files
    	    improve "make check" to notice if "openvpn --show-cipher" crashes
    	    improve argv unit tests
    	    ensure unit tests work with mbedTLS builds without BF-CBC ciphers
    	    include "--push-remove" in the output of "openvpn --help"
    	    fix error in iptables syntax in example firewall.sh script
    	    fix "resolvconf -p" invocation in example "up" script
    	    fix "common_name" environment for script calls when
                 "--username-as-common-name" is in effect (Trac #1434)
    	Documentation
    	    move "push-peer-info" documentation from "server options" to "client"
                 (where it belongs)
    	    correct "foreign_option_{n}" typo in manpage
    	    update IRC information in CONTRIBUTING.rst (libera.chat)
    	    README.down-root: fix plugin module name
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 0f447b470a929bb8f565e4cc5eb2697f074ddd7a
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 14 10:20:57 2022 +0200
bird: Update to version 2.0.9
- Update from version 2.0.8 to 2.0.9
    - Update of rootfile not required
    - Changelog
    	Version 2.0.9 (2022-02-09)
    	  o BGP: Flowspec validation procedure
    	  o Babel: MAC authentication support
    	  o Routing table configuration blocks
    	  o Optional prefix trie in routing table for faster LPM/interval queries
    	  o CLI: New 'show route in <prefix>' command
    	  o Filter: Faster (16-way) prefix sets
    	  o Filter: MPLS label route attribute
    	  o Filter: Operators to pick community components
    	  o Filter: Operators to find minimum and maximum element of lists
    	  o BGP: New 'free bind' option
    	  o BGP: Log route updates that were changed to withdraws
    	  o BGP: Improved 'invalid next hop' error reporting
    	  o OSPF: Allow ifaces with host address as unnumbered PtP or PtMP ifaces
    	  o OSPF: All packets on PtP networks should be sent to AllSPFRouters address
    	  o Scripts for apkg-powered upstream packaging for deb and rpm
    	  o Support for Blake2s and Blake2b hash functions
    	  o Security keys / passwords can be entered in hexadecimal digits
    	  o Memory statistics split into Effective and Overhead
    	  o Linux: New option 'netlink rx buffer' to specify netlink socket buffer size
    	  o BSD: Assume onlink flag on ifaces with only host addresses
    	  o Many bugfixes
    	  Notes:
    	  - For OSPF on PtP network, BIRD now sends all packets to multicast AllSPFRouters
    	    address (as required in RFC 2328 8.1). This likely breaks setups with multiple
    	    neighbors on a network configured as PtP, which worked in previous versions.
    	    Such links should be configured as PtMP.
    	  - Since Linux 5.3, netlink socket can be flooded by route cache entries during
    	    route table scan. This version mitigates that issue by using strict netlink
    	    filtering.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 5e792900bc14070f877e7d2c1e406bebd60fac19
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 21:05:49 2022 +0000
Core Update 168: Ship and restart Squid
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f56b5ce8af9a71296bd20c7b47208781b1574caa
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Apr 15 13:07:14 2022 +0200
squid: Update to 5.5
For details see:
    http://lists.squid-cache.org/pipermail/squid-users/2022-April/024725.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b101f8e842f221113377f69b6a0471ffd24d15e7
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 21:04:38 2022 +0000
Core Update 168: Ship and restart vnstat
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c516ba3b01b93cd4d549cf92b70f4eb58fd95d20
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Sat Apr 16 16:53:47 2022 +0200
vnstat: Update to 2.9
Triggered by Bug #12846 - in this context I noticed that vnstat had been updated to version 2.9.
For details see:
    https://humdi.net/vnstat/CHANGES
"2.9 / 23-Jan-2022
- Fixed
       - RescanDatabaseOnSave configuration option wasn't being read from the
         configuration file resulting in the feature always being enabled
       - Hourly graph image output using large fonts didn't correctly fade out
         the x-axis line for hours not having data available
     - New
       - Add --alert for producing output and/or specific exit status when
         configured condition and transfer limit is exceeded, can also be used
         for "quota remaining" type of queries depending on used parameters
       - Add configuration option InterfaceMatchMethod which allows configuring
         the possibility of specifying an interface for database queries by using
         its alias instead of system provided interface name, enabled by default
         to support case insensitive matching of the beginning of interface
         aliases (vnstat and vnstati)
       - Image output file extension allows selecting the used image file format
         as long as the used LibGD supports it, PNG is no longer the only option
       - Add configuration option HourlyGraphMode for changing the output mode
         of the graph, 0 = 24 hour sliding window (default, as in previous
         releases), 1 = graph begins from midnight
       - Add mode parameter for -hg / --hoursgraph options for overriding the
         HourlyGraphMode configuration option setting from the command line
       - Add vertical line to image output hourly graph to visualize midnight
       - Add -t / --timestamp options to daemon for enabling timestamps to prints
         when the daemon is running in the foreground attached to a terminal
       - Accept ; as comment character in configuration file in addition to #
       - Comment out keywords which are using default values with ; character in
         provided configuration file and --showconfig output
2.8 / 4-Sep-2021
- Fixed
       - Using a combination of --live and --json wasn't flushing stdout after
         each line resulting in buffered output if the output was being piped
       - Image output would fail to show the last line bar graph in list outputs
         if EstimateStyle was 0, BarColumnShowsRate was 1 and the last line had a
         higher traffic rate than other lines
       - Image output didn't correctly horizontally align the "no data available"
         message in 5 minute graph depending on the width of the image
       - Image output related configuration warnings could get shown when image
         output wasn't being used
       - Warnings of mismatches between image output and data retention
         configuration didn't provide relevant details for solving the issues
       - BandwidthDetection was being used for tun interfaces even when the
         Linux kernel had the information hardcoded to 10 Mbit regardless of the
         used real interface, interface specific MaxBW will now be used instead
         or MaxBandwidth as fallback
       - Configured interface specific MaxBW values were getting overridden by
         BandwidthDetection when something could be detected
       - Image output horizontal rx/tx bars often had one pixel too much width in
         the tx section resulting in slightly wrong ratio getting shown
       - Top days list wasn't always sorting entries with exactly the same traffic
         sum using ascending date
       - 64bitInterfaceCounters with value -2 always assumed 32-bit on Linux
         systems until a 64-bit value was seen if kernel headers weren't available
         when binaries were built
     - New
       - Add the possibility of specifying an interface without using the
         -i / --iface options (vnstat and vnstati)
       - The daemon can discover added interfaces from the database without
         requiring a restart, configurable with option RescanDatabaseOnSave
       - Add configuration option UseUTC for using UTC as timezone for database
         entries instead of following the system timezone configuration
       - --iflist uses user configured interface specific MaxBW values in the
         output when available instead of showing only the kernel provided
         information when detected
       - Add configuration option AlwaysAddNewInterfaces to expose the daemon
         --alwaysadd command line option which gains an optional mode parameter
       - Image output uses LibGD filled arc bug workaround only for LibGD
         versions that are known to be broken
       - Image output example cgi (examples/vnstat.cgi) improvements
         - Automatically lists all monitored interfaces instead of requiring the
           list to be filled manually, server name in page title comes from
           hostname command by default
         - Provides links for most available images to more detailed or longer
           versions of each image
         - Allows direct interface specific page access with /interfacename suffix
           for the cgi if the used httpd supports PATH_INFO
         - Page auto refresh can be enabled with configurable interval"
Please note:
    As mentioned above, the default values in 2.9 are commented out. I have reversed this
    by adding a simple 'sed' command to the lfs file.
Another possibility would have been to extend the existing sed commands. If this
    is desired differently, please report.
As - nearly - always: running here with no seen problems...
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 31e85ef336ccfc2abb724d08e497c40c55b52762
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Mon Apr 18 11:12:43 2022 +0200
rsync: Update to 3.2.4
For details see:
    https://download.samba.org/pub/rsync/NEWS#3.2.4
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72
Merge: a95bb24fe 31592610c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Mon Apr 18 16:38:47 2022 +0000
Merge branch 'next' into temp-c168-development
commit 38cf581405290ac9781793e8785cbdf0e210dced
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 17 16:38:21 2022 +0200
ids-functions.pl: Remove temporary files if the downloader aborts.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit eaf5364413ab44dff0640396653fef4e39ace4d7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 17 15:21:20 2022 +0200
ids.cgi: Disable manual update button if a provider is not longer
    supported.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 6bef05b9ed1eacb57f66f565def49bbfe6400946
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 17 15:03:56 2022 +0200
ids.cgi: Proper handle providers which are not longer supported.
They will be shown with a different background colour to get the users
    attention.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 7c4b8df7163e60bc05867531e3d2a7001eb2af59
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 17 15:02:41 2022 +0200
update-ids-ruleset: Skip unsupported providers.
In case a configured provider is not longer supported, simply skip it
    and do not try to perform an update.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit da5c7c24f022751ff4d8dfb68c65d0e60801a626
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 16:02:28 2022 +0200
ids.cgi: Remove orphaned headline.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit b3dbe9ef6462b90198f969dcf42bb17f9c4b427f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:57:34 2022 +0200
backup.pl: Run convert-ids-backend-files converter.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 7bc15b982c7ce3bd0b6d3cf752e1e42abba4fe1d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:54:44 2022 +0200
backup: Add files for new IDS backend.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit f7eedacb43e81dd8acd031f1ed7680fd0bf3b2b9
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:51:06 2022 +0200
convert-ids-backend-files: Restart suricata if the IDS is running.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 5bad33e9a4bae9e15979087df3420c30dd5afd6c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:32:27 2022 +0200
ids.cgi: Display return code on download error, when adding a new
    provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 00271ed769a64e309498c8c5ab2267c0e5982957
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:30:03 2022 +0200
ids.cgi: Handle "Not modified" when forcing an ruleset update.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit b645f7fc8675a9caa014b83dff6e7d012a4802c8
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 15:12:58 2022 +0200
ids.cgi: Do not longer use hard-coded status messages in
    oinkmaster_web() function.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 93af000b8b3f86008040cb5a62405b158c270fe7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:54:11 2022 +0200
oinkmaster: Drop package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit d2bf4d377f698076e53a56a9784a0b70d8ed3388
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:51:48 2022 +0200
suricata: Rootfile update.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0d99255c0614d0218912724b97f6cfdb4811a895
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:49:52 2022 +0200
suricata: Create empty threshold.config file.
The file is referenced in the suricata config file and if not
    present some ugly warnings will be displayed/logged during startup.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit d44d4ccf34132b77c8cf3d4ace7eab99a4717a53
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:48:35 2022 +0200
suricata: Create directory to store the downloaded ruleset files.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit b75baeff28412bec16dd72e4251d24c371c3fd5d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:42:22 2022 +0200
suricata: Do not longer install YAML file for default rules.
This file got obsolete, because it's content will be generated
    dynamically by the backend code.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 2e558477da7438d2bd79411279ae1502f044c787
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 16 14:39:09 2022 +0200
convert-ids-backend-files: Convert MONITOR_TRAFFIC_ONLY settings.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit a2c56ead7367995ff743cc5c75aec8c4fb195f83
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 06:02:49 2022 +0200
ids-functions.pl: Remove read_enabled_disabled_sids_file() function.
Not longer needed and therefore dead code.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit a15c9b16b404bc1970fd016104560e8fd24b5edb
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:59:33 2022 +0200
IDS: Move autoupdate logic to cron.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c2eac6fcd4281834409700066b25061d15ca0d6c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:52:01 2022 +0200
convert-ids-backend-files: Move already downloaded files to new
    location.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit b570d35c0aff4c1d126be539bbb009830a1fbb7f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:19:20 2022 +0200
ids-functions.pl: Change location for downloaded rulesfiles to
    "/var/cache/suricata/".
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 4f513522feeb88a447a861d414eead6432ce784f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:18:37 2022 +0200
ids-functions.pl: Do not use a hard-code temporary download location.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c215cfd8873130362b0665696e06a79279f79abd
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:13:23 2022 +0200
convert-ids-backend-files: Remove old backend related files.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 70b1672d94f3f6c3cfe82bf65df65125df0b0014
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:12:56 2022 +0200
convert-ids-backend-files: Remove converted files.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 9f7702544abc0a906d14ccdcf0e4b03239a8fc33
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Apr 15 05:10:45 2022 +0200
convert-ids-backend-files: Regenerate ruleset and used rulesets file.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c00609ce56cab337d352e69599144683192dec8f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Apr 14 05:47:55 2022 +0200
convert-ids-backend-files: Successor of the
    convert-ids-modifications-files converter.
This converter also will convert the used rulesfiles file for the
    providers.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 2f154264a02a560b0ef4ff6777833330a110f2a4
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Apr 14 05:16:25 2022 +0200
ids.cg: Regeneate ruleset if the ruleset action (mode) of a provider
    get changed.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 39b5adb9404ae1b986e75437c4203752da8e9167
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 11 05:57:05 2022 +0200
update-ids-ruleset: Only regenerate and reload ruleset on at least one
    successfull update.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 990d111d70b7f5276b5ff3b6729773f1066fcee7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 11 05:48:17 2022 +0200
ids-functions.pl: Add support for Etags.
Etags are used to itentify if an ressource has been changed
    by sending a special request and an Etag value to the server.
If the ressource has changed the server will serve the new content
    otherwise it will return the 304 (Not-Modified) code.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 149a3291df07c0b1ba0384b83509bb6a62a1eae2
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Apr 11 05:47:15 2022 +0200
ids.cgi: Do not double display a working notice when removing a ruleset
    provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit a95bb24fe13e4e7837bfbf2e75e255f61985df7d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Tue Apr 5 09:02:40 2022 +0000
nginx: Update to 1.20.2
The 1.20.x series is the current stable one, please refer to
    https://nginx.org/en/CHANGES-1.20 for its changelog.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 6fd8dd43b63d32acd119c06682bb19a2ee10966d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 5 15:47:01 2022 +0200
dbus: Update to version 1.14.0
- Update from 1.12.20 to 1.14.0
    - Update of rootfile
    - Changelog
       1.14.x is a new stable branch, superseding 1.12.x.
       Summary of major changes between 1.12.x and 1.14.0
         Dependencies:
    	• dbus now requires at least a basic level of support for C99 variadic
    	  macros, as implemented in gcc >= 3, all versions of Clang, and
    	  MSVC >= 2005. In practice this requirement has existed since version
    	  1.9.2, but it is now official.
    	• dbus now requires a C99-compatible va_copy() macro (or a __va_copy()
    	  macro with the same behaviour), except when building for Windows using
    	  MSVC and CMake.
    	• On Unix platforms, if getpwnam_r() and getgrnam_r() are implemented,
    	  they must be POSIX-conformant. The non-POSIX signature seen in ancient
    	  Solaris versions will no longer work.
    	• All Windows builds now require Windows Vista or later.
    	  (Note that we do not recommend or support use of dbus on operating
    	  systems outside their vendor's security support lifetime, such as Vista.)
    	• GLib >= 2.38 is required if full test coverage is enabled
    	  (reduced from 2.40 in dbus 1.12.x.)
    	• Building using CMake now requires CMake 3.4.
    	• Building documentation using CMake now requires xsltproc, Docbook DTDs
    	  (for example docbook-xml on Debian derivatives), and Docbook XSLT
    	  stylesheets (for example docbook-xsl on Debian derivatives). Using
    	  KDE's meinproc4 documentation processor is no longer supported.
         Build-time configuration changes:
    	• Move CMake build system to top level, matching normal practice for
    	  CMake projects
         Deprecations:
            **Looking through these I don't believe they will cause a problem as they are
              deprecations and not yet removed.In the future if needed we might need to set
              datadir to /etc to keep the location the same as with syscondir. This won't be
              needed if we don't use the system.d directory for dbus policies.
    	• Third-party software should install default dbus policies for the system
    	  bus into ${datadir}/dbus-1/system.d (this has been supported since dbus
    	  1.10, released in August 2015). Installing default dbus policies in
    	  ${sysconfdir}/dbus-1/system.d is now considered to be deprecated. Policy
    	  files in ${sysconfdir}/dbus-1/system.d continue to be read, but this
    	  directory should only be used by system administrators wishing to
    	  override the default policies.
    	  The ${datadir} applicable to dbus is usually /usr/share and the
    	  ${sysconfdir} is usually /etc.
    	• A similar pattern applies to the session bus policies in session.d.
    	• The dbus-send(1) man page now documents --bus and --peer instead of
    	  the old --address synonym for --peer, which has been deprecated since
    	  the introduction of --bus and --peer in 1.7.6
    	• The dbus-daemon man page now has scarier warnings about
    	  <allow_anonymous/> and non-local TCP, which are insecure and should
    	  not be used, particularly for the standard system and session buses
    	• DBusServer (and hence the dbus-daemon) no longer accepts usernames
    	  (login names) for the recommended EXTERNAL authentication mechanism,
    	  only numeric user IDs or the empty string. See 1.13.0 release notes
    	  for full details.
         New features:
    	• On Linux 4.13 or later when built against a suitable glibc version,
    	  GetConnectionCredentials() now includes UnixGroupIDs, the effective
    	  group IDs of the initiator of the connection, taken from
    	  SO_PEERGROUPS.
    	• On Linux 4.13 or later, <policy group="…"> now uses the SO_PEERGROUPS
    	  credentials-passing socket option to get the effective group IDs
    	  of the initiator of the connection. See 1.13.4 release notes for details.
    	• Add a --sender option to dbus-send, which requests a name and holds it
    	  until the signal has been sent
    	• dbus-daemon <allow> and <deny> rules can now specify a
    	  send_destination_prefix attribute, which is like a combination of
    	  send_destination and the arg0namespace keyword in match rules.
    	  See 1.13.12 release notes for more details
    	• The dbus-daemon now filters the messages that it relays, removing
    	  header fields that it does not understand. Clients must not rely on
    	  this behaviour unless they have confirmed that they are connected to
    	  a suitable message bus implementation, for example by querying its
    	  Features property.
    	• The dbus-daemon now emits a signal, ActivatableServicesChanged, when
    	  the list of activatable services may have changed. Support for this
    	  signal can be discovered by querying the Features property.
    	• It is now possible to disable traditional (non-systemd) service
    	  activation at build-time (Autotools: --disable-traditional-activation,
    	  CMake: -DENABLE_TRADITIONAL_ACTIVATION=OFF). See 1.13.10 release notes
    	  for details.
    	• The API reference manual can be built as a Qt compiled help file if
    	  qhelpgenerator(-qt5) is available. See 1.13.16 release notes for details.
         Miscellaneous behaviour changes:
    	• When using the "user bus" (--enable-user-session), put the dbus-daemon
    	  in the session slice
    	• Several environment variables set by systemd are no longer passed
    	  on to activated services
    	• If the dbus-daemon is compiled for Linux with systemd support, it
    	  now informs systemd that it is ready for use via the sd_notify()
    	  mechanism
    	• Tarball releases no longer contain pre-2007 changelogs and are now
    	  compressed with xz, making them around 35% smaller.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
commit 77be7ab63b0fb4be4eeaa3059d7860ab3a701729
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:20:31 2022 +0000
Core Update 168: Ship expat
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 54fe871c8305649b00dbd7e67bb68ccfc4c43f7d
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Tue Apr 5 15:47:15 2022 +0200
expat: Update to version 2.4.8
- Update from 2.4.6 to 2.4.8
    - Update of rootfile
    - Changelog
       Release 2.4.8 Mon March 28 2022
            Other changes:
                #587  pkg-config: Move "-lm" to section "Libs.private"
                #587  CMake|MSVC: Fix pkg-config section "Libs"
                #55 #582  CMake|macOS: Start using linker arguments
                            "-compatibility_version <version>" and
                            "-current_version <version>" in a way compatible with
                            GNU Libtool
                #590 #591  Version info bumped from 9:7:8 to 9:8:8;
                             see https://verbump.de/ for what these numbers do
            Infrastructure:
                #589  CI: Upgrade Clang from 13 to 14
    Release 2.4.7 Fri March 4 2022
            Bug fixes:
                #572 #577  Relax fix to CVE-2022-25236 (introduced with release 2.4.5)
                             with regard to all valid URI characters (RFC 3986),
                             i.e. the following set (excluding whitespace):
                             ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
                             0123456789 % -._~ :/?#[]@ !$&'()*+,;=
            Other changes:
                #555 #570 #581  CMake|Windows: Store Expat version in the DLL
                #577  Document consequences of namespace separator choices not just
                        in doc/reference.html but also in header <expat.h>
                #577  Document Expat's lack of validation of namespace URIs against
                        RFC 3986, and that the XML 1.0r4 specification doesn't
                        require Expat to validate namespace URIs, and that Expat
                        may do more in that regard in future releases.
                        If you find need for strict RFC 3986 URI validation on
                        application level today, https://uriparser.github.io/ may
                        be of interest.
                #579  Fix documentation of XML_EndDoctypeDeclHandler in <expat.h>
                #575  Document that a call to XML_FreeContentModel can be done at
                        a later time from outside the element declaration handler
                #574  Make hardcoded namespace URIs easier to find in code
                #573  Update documentation on use of XML_POOR_ENTOPY on Solaris
                #569 #571  tests: Resolve use of macros NAN and INFINITY for GNU G++
                             4.8.2 on Solaris.
                #578 #580  Version info bumped from 9:6:8 to 9:7:8;
                             see https://verbump.de/ for what these numbers do
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 9c4e7e3b4956eb886acaaf039d31b4a26dbece8c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:20:11 2022 +0000
Core Update 168: Ship libgcrypt
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 2a8de00c6fbc7625d385ebd04ad466ee8a024a12
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 6 15:06:12 2022 +0200
libgcrypt: Update to version 1.10.1
- Update from 1.9.4 to 1.10.1
    - Update of rootfile
    - Changelog
       Noteworthy changes in version 1.10.1 (2022-03-28)  [C24/A4/R1]
           * Bug fixes:
    	   - Fix minor memory leaks in FIPS mode.
    	   - Build fixes for MUSL libc.  [rCffaef0be61]
           * Other:
    	   - More portable integrity check in FIPS mode.  [rC9fa4c8946a,T5835]
    	   - Add X9.62 OIDs to sha256 and sha512 modules.  [rC52fd2305ba]
       Noteworthy changes in version 1.10.0 (2022-02-01)  [C24/A4/R0]
           * New and extended interfaces:
    	   - New control codes to check for FIPS 140-3 approved algorithms.
    	   - New control code to switch into non-FIPS mode.
    	   - New cipher modes SIV and GCM-SIV as specified by RFC-5297.
    	   - Extended cipher mode AESWRAP with padding as specified by
    	     RFC-5649.  [T5752]
    	   - New set of KDF functions.
    	   - New KDF modes Argon2 and Balloon.
    	   - New functions for combining hashing and signing/verification.  [T4894]
           * Performance:
    	   - Improved support for PowerPC architectures.
    	   - Improved ECC performance on zSeries/s390x by using accelerated
    	     scalar multiplication.
    	   - Many more assembler performance improvements for several
    	     architectures.
           * Bug fixes:
    	   - Fix Elgamal encryption for other implementations.
    	     [R5328,CVE-2021-40528]
    	   - Fix alignment problem on macOS.  [T5440]
    	   - Check the input length of the point in ECDH.  [T5423]
    	   - Fix an abort in gcry_pk_get_param for "Curve25519".  [T5490]
           * Other features:
    	   - The control code GCRYCTL_SET_ENFORCED_FIPS_FLAG is ignored
    	     because it is useless with the FIPS 140-3 related changes.
    	   - Update of the jitter entropy RNG code.  [T5523]
    	   - Simplification of the entropy gatherer when using the getentropy
    	     system call.
           * Interface changes relative to the 1.10.0 release:
    	   GCRYCTL_SET_DECRYPTION_TAG            NEW control code.
    	   GCRYCTL_FIPS_SERVICE_INDICATOR_CIPHER NEW control code.
    	   GCRYCTL_FIPS_SERVICE_INDICATOR_KDF    NEW control code.
    	   GCRYCTL_NO_FIPS_MODE = 83             NEW control code.
    	   GCRY_CIPHER_MODE_SIV                  NEW mode.
    	   GCRY_CIPHER_MODE_GCM_SIV              NEW mode.
    	   GCRY_CIPHER_EXTENDED                  NEW flag.
    	   GCRY_SIV_BLOCK_LEN                    NEW macro.
    	   gcry_cipher_set_decryption_tag        NEW macro.
    	   GCRY_KDF_ARGON2                       NEW constant.
    	   GCRY_KDF_BALLOON                      NEW constant.
    	   GCRY_KDF_ARGON2D                      NEW constant.
    	   GCRY_KDF_ARGON2I                      NEW constant.
    	   GCRY_KDF_ARGON2ID                     NEW constant.
    	   gcry_kdf_hd_t                         NEW type.
    	   gcry_kdf_job_fn_t                     NEW type.
    	   gcry_kdf_dispatch_job_fn_t            NEW type.
    	   gcry_kdf_wait_all_jobs_fn_t           NEW type.
    	   struct gcry_kdf_thread_ops            NEW struct.
    	   gcry_kdf_open                         NEW function.
    	   gcry_kdf_compute                      NEW function.
    	   gcry_kdf_final                        NEW function.
    	   gcry_kdf_close                        NEW function.
    	   gcry_pk_hash_sign                     NEW function.
    	   gcry_pk_hash_verify                   NEW function.
    	   gcry_pk_random_override_new           NEW function.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit bf1defce5579ed2db91d8fae4eb5549bc8471311
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:18:50 2022 +0000
Core Update 168: Ship libnml
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit d6aead033a752d7965a3bed6c98dcf5d289707b2
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Wed Apr 6 15:06:28 2022 +0200
libmnl: Update to version 1.0.5
- Update from 1.0.4 to 1.0.5
    - Update of rootfile not required
    - Changelog
       Version 1.0.5 changes from git commits
    	src: doc: Fix messed-up Netlink message batch diagram
    	build: If doxygen is not available, be sure to report "doxygen: no" to ./conf...
    	build: doc: get rid of the need for manual updating of Makefile
    	build: doc: "make" builds & installs a full set of man pages
    	doxygen: Fixed link to the git source tree on the website.
    	include: add MNL_SOCKET_DUMP_SIZE definition
    	doxygen: remove EXPORT_SYMBOL from the output
    	nlmsg: Fix a missing doxygen section trailer
    	src: fix doxygen function documentation
    	examples: Add rtnl-addr-add.c
    	examples: reduce LOCs during neigh attributes validation
    	examples: fix print line format
    	examples: fix neigh max attributes
    	examples: add arp cache dump example
    	libmnl: zero attribute padding
    	examples: rtnl-addr-dump: fix typo
    	callback: mark cb_ctl_array 'const' in mnl_cb_run2()
    	examples: nfct-daemon: Fix test building on musl libc
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 88e01ab8553e9fc7d7d64d2de2b3e7f03c515177
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:18:01 2022 +0000
Core Update 168: Remove netbpm add-on, if installed
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 00c31b29184dac2f5dadc21f9457b427a6ee3cb6
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:13:32 2022 +0000
Core Update 168: Remove libnl files
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8841ef19685bcb148fdbcdd5c75b8eb96b2bb244
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 18:35:04 2022 +0200
netpbm: Removal from IPFire
- This is an addon whose purpose is defined as :-
       Netpbm is a toolkit for manipulation of graphic images, including conversion of images
       between a variety of different formats. There are over 300 separate tools in the
       package including converters for about 100 graphics formats. Examples of the sort of
       image manipulation we're talking about are: Shrinking an image by 10%; Cutting the top
       half off of an image; Making a mirror image; Creating a sequence of images that fade
       from one image to another.
    - None of the above seems to be a purpose related to a Firewall. Additionally it is
       available in a huge number of distributions, including Linux, BSD,Windows,
       MacOS X/Darwin, Solaris, AIX etc
    - This package seems to be better used on a system in the lan protected by IPFire than
       used on IPFire itself
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 411cd0ca9c52b8a57fc288b2e992d13b3ffb1215
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 18:35:03 2022 +0200
libnl: Removal from IPFire
- This is the legacy version of libnl - 1.1.4 and was released in 2013
    - libnl-3 is the running stable version - 3.5.0
    - Nothing in IPFire has libnl as a dependency. Large number of programs have libnl-3 as
       a dependency
    - libnl developer indicates that libnl-3 should be used if in any way possible and that
       the legacy version is for situations that fail to work with libnl-3
    - As everything in IPFire looks to already be using libnl-3 this patch is to remove the
       legacy version
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 22ac250b37bbce6f56ea7920e55d5ca9a70f71d3
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:05:38 2022 +0000
Core Update 168: Ship perl-libwww
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit c002bd1f44f4ae0c33691be3896456dc8fbd221f
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 8 20:49:41 2022 +0200
perl-libwww: Update to 6.62
- Update from 6.61 to 6.62
    - Update of rootfile not required
    - Changelog
    	6.62      2022-04-05 01:04:17Z
    	    - Allow downloading to a filehandle (GH#400) (Andrew Fresh)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit 6ac573bd8f4a1070e56769e1d74e8268ce8bf19f
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 10:04:42 2022 +0000
Core Update 168: Ship whois
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f09b8111142c5d27466d40668d1bd92f60003596
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Sat Apr 9 11:00:16 2022 +0200
whois: Update to 5.5.13
For details see:
    https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog
whois (5.5.13) unstable; urgency=medium
* Added the .sd TLD server.
      * Updated the list of new gTLDs.
      * Added the Turkish translation, contributed by Oguz Ersen.
-- Marco d'Itri md@linux.it  Fri, 08 Apr 2022 01:08:55 +0200
whois (5.5.12) unstable; urgency=medium
* Updated the .pro TLD server, which was totally broken.
      * Fixed the detection of Japanese locales using $LC_MESSAGES.
      * Implemented providing partial salt strings to mkpasswd.
      * Removed 2 new gTLDs which are no longer active.
      * Updated one or more translations. (Closes: #1003597)
      * Enabled full hardening in debian/rules.
-- Marco d'Itri md@linux.it  Wed, 23 Feb 2022 01:03:11 +0100
whois (5.5.11) unstable; urgency=medium
* Implemented a --no-recursion command line option to disable recursion
        from registrar to registry servers.
      * Updated the .pro, .vu and .xxx TLD servers.
      * Updated the list of new gTLDs.
      * Removed 7 new gTLDs which are no longer active.
      * Updated make_version_h.pl to support Ubuntu no-change uploads,
        contributed by Matthias Klose. (Closes: #995873)
-- Marco d'Itri md@linux.it  Mon, 03 Jan 2022 18:18:36 +0100
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit da8ca3b1216906d2f009ee6ee09131fa9c7e65de
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 09:56:44 2022 +0000
Core Update 168: Ship changed networking initscripts
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 5806ff0cc5af4b361b3e32cb9e32d97d1f07d400
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Thu Apr 7 18:46:54 2022 +0200
Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
Fixes: 12831
Jonatan Schlag reported that the command line options of 'vnstat' had changed
    "...and seemed to be broken a long time".
    => https://bugzilla.ipfire.org/show_bug.cgi?id=12831#c0
Several command line switches used in networking initscripts were obviously removed.
Affected commands in '.../networking/any' and '.../networking/red'):
...
    /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
    ...
    /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
    ...
and
    ...
    /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
    ...
Adolf Belka tested this, "looked through the changelogs" and found - besides that
    the switch '--enable' had been removed "in version 2.0 in 2018" - that '--enable', '--update'
    and '--reset' switches are either not needed or not supported anymore.
    "The old man page indicates that none of those options are used when the vnstat daemon
    is running."
Since we only start and run 'vnstatd' in IPFire it was decided to remove these commands.
Reported-by: jonatan.schlag jonatan.schlag@ipfire.org
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
commit 18ed846002a02d51a9122133dc2314cbb6d5b04e
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 8 20:49:56 2022 +0200
python3-pyparsing: Update to version 3.0.7
- Update from 3.0.6 to 3.0.7
    - Update of rootfile
    - Changelog
    	Version 3.0.7 -
    	- Fixed bug #345, in which delimitedList changed expressions in place
    	  using expr.streamline(). Reported by Kim Gräsman, thanks!
    	- Fixed bug #346, when a string of word characters was passed to WordStart
    	  or WordEnd instead of just taking the default value. Originally posted
    	  as a question by Parag on StackOverflow, good catch!
    	- Fixed bug #350, in which White expressions could fail to match due to
    	  unintended whitespace-skipping. Reported by Fu Hanxi, thank you!
    	- Fixed bug #355, when a QuotedString is defined with characters in its
    	  quoteChar string containing regex-significant characters such as ., *,
    	  ?, [, ], etc.
    	- Fixed bug in ParserElement.run_tests where comments would be displayed
    	  using with_line_numbers.
    	- Added optional "min" and "max" arguments to `delimited_list`. PR
    	  submitted by Marius, thanks!
    	- Added new API change note in `whats_new_in_pyparsing_3_0_0`, regarding
    	  a bug fix in the `bool()` behavior of `ParseResults`.
    	  Prior to pyparsing 3.0.x, the `ParseResults` class implementation of
    	  `__bool__` would return `False` if the `ParseResults` item list was empty,
    	  even if it contained named results. In 3.0.0 and later, `ParseResults` will
    	  return `True` if either the item list is not empty *or* if the named
    	  results dict is not empty.
    	    # generate an empty ParseResults by parsing a blank string with
    	    # a ZeroOrMore
    	      result = Word(alphas)[...].parse_string("")
    	      print(result.as_list())
    	      print(result.as_dict())
    	      print(bool(result))
    	  Prints:
    	      []
    	      {}
    	      False
    	    # add a results name to the result
    	      result["name"] = "empty result"
    	      print(result.as_list())
    	      print(result.as_dict())
    	      print(bool(result))
    	  Prints:
    	      []
    	      {'name': 'empty result'}
    	      True
    	  In previous versions, the second call to `bool()` would return `False`.
    	- Minor enhancement to Word generation of internal regular expression, to
    	  emit consecutive characters in range, such as "ab", as "ab", not "a-b".
    	- Fixed character ranges for search terms using non-Western characters
    	  in booleansearchparser, PR submitted by tc-yu, nice work!
    	- Additional type annotations on public methods.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit b86bd4f90adc4111db864cb8c1365a0d115a6675
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 09:51:22 2022 +0000
Core Update 168: Remove libevent files
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit e2e51070a18073d6087429daa6036f8eb510886e
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 8 23:55:24 2022 +0200
libevent: Remove from IPFire
- Build worked without libevent without problems
    - Nothing shows up as dependent on the libevent (legacy) libraries
    - Lots of dependencies on the the libevent2 libraries
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Peter Müller peter.mueller@ipfire.org
commit 943ce57701d39352f51a6b09906cd945a421829c
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 09:49:55 2022 +0000
Core Update 168: Ship libnfnetlink
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 5dcca14b51b845a56ea3d99e1772f569a259e949
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Apr 8 20:49:03 2022 +0200
libnfnetlink: Update to version 1.0.2
- Update from 1.0.1 to 1.0.2
    - Update of rootfile not required
    - Changelog
       Version 1.0.2
    	* Warnings with automake-1.12
    	* Update header comments to reflect GPLv2+ license
    	* Allow building on uclinux
    	* Valgrind warnings due to uninitialized padding in netlink messages
    	* Hide private library symbols
    	* Support builds with newer doxygen versions
    	* Failing calls to getsockname() were left unnoticed
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Peter Müller peter.mueller@ipfire.org
commit d258332f5bb062394f524dc485153d1841e55436
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 09:49:02 2022 +0000
Core Update 168: Remove orphaned files
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit a6d966e1b79de3b052f92569f8f67b2b0753df49
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:49 2022 +0200
sdparm: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit 9624937d9112b92cd735391bc15b3d7aef5bedd5
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:48 2022 +0200
pigz: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit 85967534723f8da3f6077814dc1f04f8ffb87874
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:47 2022 +0200
libsolv: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit adee5528664883cf48fd83873c978b51b11a7342
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:46 2022 +0200
libpri: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit 03216bd01c57262e1fa753ee4ed86cf050fc2212
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:45 2022 +0200
libdnet: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit 758162bdc4f5d58cd10afd3f5efbdf7a3034b5b8
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Thu Apr 7 13:04:44 2022 +0200
libart: Removal from IPFire
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Acked-by: Michael Tremer michael.tremer@ipfire.org
commit 77c3824f285e7df66ce4a26be11dc336bc17633d
Author: Peter Müller peter.mueller@ipfire.org
Date:   Sun Apr 10 09:42:56 2022 +0000
Start Core Update 168
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit faa8c62f6377cf6efa2b4edef1bbe77ede248867
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 10 11:25:36 2022 +0200
ids.cgi: Use new oinkmaster_web function instead the silent one from
    ids-functions.
This will print some nice status messages while the page is locked and
    the IDS rules get regenerated/altered.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 44d41fd692ea695708c9cd51ecbf1fab2c7a5c28
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 10 11:23:49 2022 +0200
ids.cgi: Add oinkmaster_web () function.
This function is used to regenerate the entire ruleset similar to the
    one from ids-functions, but is enhanced to print additional status
    messages.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 1aaa347774a96e54daf26ff0762e63731e94a629
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 10 11:19:41 2022 +0200
ids.cgi: Allow to split working_notice function into two parts.
This allows to open the notice and close it at a later time.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 25652a75d485eaf500a60326373f66e56b902c70
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 10 11:17:05 2022 +0200
ids.cgi: Keep IDS/IPS mode settings when enabling/disabling a provider
    or autoupdate for it.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 30c4a9ff35117388ce3061ad44280967e1f4cf86
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 9 14:46:39 2022 +0200
ids.cgi: Adjust code to use new used-rulesfiles backend.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 8d6714edc8c957214506bc483bc51edc06c94554
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Apr 9 13:11:18 2022 +0200
ids-functions.pl: Change backend to use one file to load the used
    rulefiles.
Suricata seems to struggle when using multiple and/or nested includes in
    the same config section. This results in a only partially loaded
    confguration where not all rulefiles are loaded and used.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit fa7663a1b594dcfd4bf542eb34a0869d5280e38f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 12:26:35 2022 +0100
ids.cgi: Remove newly added provider if the rules could not be
    downloaded.
When adding a new provider and in case the rules file or tarball can not
    be downloaded, the provider remains as configured.
To avoid that, the provider needs to be removed again.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 81144407528319a53fd0e8ea6852158c56ab7612
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 18:59:42 2022 +0100
convert-ids-modification-files: New converter.
This converter is responsible to convert the old oinkmaster modification
    files into the new files and format.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 432b8ed21e0fa9c0ee4cca360dfd881348ba62a0
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:54:19 2022 +0100
ids.cgi: Drop last fragments from old modify sids backend.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 849fc8ea15a861a97f2e4d9c74804115fd15ecf5
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 18:08:49 2022 +0100
ids-functions.pl: Drop oinkmaster related functions and declarations.
They are not longer needed and safely can be dropped.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 443ad51d1c33550eafc62320865046510b7be8fc
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 16:52:19 2022 +0100
ids.cgi: Allow to configure IDS/IPS mode individually for each provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 4c98be8bd21c95b9bb576e211e633bf507388234
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 16:33:20 2022 +0100
ids.cgi: Use new provider modifications backend.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 9f353f8518b93fb1b4f76663088d36d321e8e3f2
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 16:11:12 2022 +0100
ids.cgi: Use new backend to store the ruleset modifications of a
    provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 2deba6bf4a6b866713ee000a91457802101fa893
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 16:10:01 2022 +0100
ids-functions.pl: Use "enabled/disabled" to mark if a rule should be
    altered.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 794469483f26e514e13648a07483d19e2372ecb7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 15:47:52 2022 +0100
ids-functions.pl: Replace call of external oinkmaster.pl to newly
    introduced process_ruleset function.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 5a6c7bbe85a24faddf3c5f495d28a6ae6004514f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 15:44:37 2022 +0100
ids-functions.pl: Add process_ruleset() function.
This function is going to replace the part which currently the
    oinkmaster.pl script does.
It will read in the extracted ruleset, remove duplicates and alter the
    rules to alert or drop in case they match. Also rules will be enabled or
    disabled if the used requested this.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 518cbdd38905ed7909f7dfe218957cbc828a004c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 15:34:57 2022 +0100
ids-functions.pl: Add get_provider_ruleset_modifications_file().
This function will obosolete the old oinkmaster modifications files.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e246285af4c98647217fe96a48d794f959ebf3d8
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 15:34:10 2022 +0100
ids-functions.pl: Add private function to obtain the sid and rev of a
    rule.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e0eb5bc737fa807a574b4f5bf5c42977d55201fb
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 20 15:33:09 2022 +0100
ids-functions.pl: Add get_providers_mode() function.
This function is used to gather the modes of the configured providers
    and return them as hash.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit ff780d8b3fa6b91fe9d8560684232381b81b5498
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:27:01 2022 +0100
update-ids-ruleset: Fix typo in return code.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 74019d3044117bc84646fec22e6a88833a131790
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:23:44 2022 +0100
update-ids-ruleset: Skip providers which are not enabled.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 9a3f9c2b234457e6cfda54f7ee3746781ba503b5
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:22:50 2022 +0100
update-ids-ruleset: Log and abort if to less free disk space is
    available.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit c9c3eadbbffeee8a4f46365e917f619939dee9f1
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:22:08 2022 +0100
update-ids-ruleset: Add logging for various events.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit d1f7542659cc7ecaaad551f813b0cb32a4734351
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:18:38 2022 +0100
update-ids-ruleset: Add function to iherit with the syslog daemon.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 65e3aef5835a5e681bdd2af292e4c547c0d196d0
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:17:06 2022 +0100
ids-functionsn.pl: Remove logging calls when checking free diskspace.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 52a557a848c3f744278aec91d7e16ff1f5c24833
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Mar 26 11:14:40 2022 +0100
ids-functions.pl: Remove logging calls from downloader.
The download script should not directly do the logging stuff.
It simply should download the files for the requested provider and
    return an error code on fail.
The logging should be done at another place.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e26edcc1c7cac6235f7d60c527f980895fc3fe5a
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Mar 25 06:03:40 2022 +0100
ids-functions.pl: Provide better return codes, if the downloader fails.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0f2c5211f6d8b183a8496ff208c20ca5ddc0c6c6
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Mar 24 21:17:59 2022 +0100
ids-functions.pl: Limit downloader to only one provider.
Remove the option and required code to download the rulesets
    for all configured and enabled providers by just calling the downloader
    function.
This cause a lot of troubles and if required, directly should be handled
    by the processing script.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 235e3e92a32a95339c177a94371b22c4bc0877a6
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Mar 24 21:17:08 2022 +0100
ids-functions.pl: Add get_subscription_code() function.
This function can be used to obtain the subscription code of a given
    configured provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 061391e77601082727e64e40dfa352f89be18ce1
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Mar 24 20:51:56 2022 +0100
ids-functions.pl: Use If-Modified-Since header to reduce file downloads.
When using the "If-Modified-Since" header, the server can be requested
    if a modified version of the file can be served.
In case that is true, the file will be sent and stored by the downloader
    function. If the file has not been touched since the last time, the
    server will respond with the code "304" (Not modified).
This tells us, that the current stored file is the latest one (still up-to-date)
    and we safely can skip the download attempt for this provider.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit f264adda359ec58846840e60d9743ca522fa4004
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Mar 24 20:29:21 2022 +0100
ids-functions.pl: Re-order download request handler creation.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 7d8956083b76babafef3c8e82fb32c4f243424c3
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Mar 24 20:18:58 2022 +0100
ids-functions.pl: Early load required perl modules.
This will help us to determine if all required perl modules and their
    dependencies are avail and load-able.
It also prevents us from doubble loading modules and makes development
    and maintainance more easy.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 304ce130fd1e19de6a4faf9834784e0d821c02c1
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Mar 21 20:21:21 2022 +0100
ids-functions.pl: Remove temporary file, if the download failed.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit e71804fb821acf84ef4ad06fcaf80dda6fe8af0c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Mar 21 20:19:25 2022 +0100
ids-functions.pl: Allow "3" download attempts for each provider before fail.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit de1199e2a32e9f177ea237392b0ae22b5f8a2b87
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Mon Mar 21 19:52:04 2022 +0100
ids-functions.pl: Drop downloader code for sourcefire based ruleset.
Even if the servers do not support HEAD requests, the remote filesize
    (content_length) can be obtained from the connection headers.
This generic method works for all servers and therefore we do not need
    the code for handle sourcefire servers in a different way anymore.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/backup/backup.pl                            |    6 +
 config/backup/include                              |    7 +-
 config/cfgroot/header.pl                           |    4 +-
 config/cfgroot/ids-functions.pl                    |  992 ++--
 config/cfgroot/oinkmaster.conf                     |  292 -
 config/cron/crontab                                |    3 +
 config/etc/sysctl.conf                             |    4 +-
 config/firewall/rules.pl                           |   14 +-
 config/menu/20-status.menu                         |    4 +-
 config/menu/30-network.menu                        |    2 +-
 config/oinkmaster/oinkmaster.conf                  |  429 --
 config/rootfiles/common/bind                       |   14 +-
 config/rootfiles/common/curl                       |    5 +-
 config/rootfiles/common/expat                      |   20 +-
 config/rootfiles/common/fmt                        |   23 +
 config/rootfiles/common/freetype                   |    3 +-
 config/rootfiles/common/harfbuzz                   |   10 +-
 config/rootfiles/common/ipset                      |    5 +-
 config/rootfiles/common/libaio                     |    2 +-
 config/rootfiles/common/libart                     |   53 -
 config/rootfiles/common/libcap                     |    6 +-
 config/rootfiles/common/libdnet                    |   26 -
 config/rootfiles/common/libevent                   |   24 -
 config/rootfiles/common/libgcrypt                  |    2 +-
 config/rootfiles/common/libnl                      |   60 -
 config/rootfiles/common/libpipeline                |   74 +
 config/rootfiles/common/libusb-compat              |    7 -
 config/rootfiles/common/linux-firmware             |  249 +-
 config/rootfiles/common/logwatch                   |    3 +
 config/rootfiles/common/man                        |  108 +-
 config/rootfiles/common/man-pages                  | 5663 +++++++++-----------
 config/rootfiles/common/meson                      |   35 +-
 config/rootfiles/common/multipath-tools            |    6 +-
 config/rootfiles/common/oinkmaster                 |    2 -
 config/rootfiles/common/openjpeg                   |   18 +-
 config/rootfiles/common/openldap                   |   33 +-
 config/rootfiles/common/pango                      |    6 +-
 config/rootfiles/common/parted                     |    4 +-
 config/rootfiles/common/pciutils                   |    2 +-
 config/rootfiles/common/pcre2                      |  226 +-
 config/rootfiles/common/pigz                       |    2 -
 config/rootfiles/common/poppler                    |    4 +-
 config/rootfiles/common/procps                     |   44 +-
 config/rootfiles/common/python3-setuptools-rust    |   16 +-
 config/rootfiles/common/python3-setuptools-scm     |   19 +-
 config/rootfiles/common/python3-tomli              |   10 +-
 config/rootfiles/common/sdparm                     |    6 -
 config/rootfiles/common/suricata                   |    4 +-
 .../core/{167/filelists => 168}/core-files         |    0
 config/rootfiles/core/{167 => 168}/exclude         |    0
 .../124 => core/168}/filelists/aarch64/efibootmgr  |    0
 .../{oldcore/158 => core/168}/filelists/backup     |    0
 config/rootfiles/core/{167 => 168}/filelists/bind  |    0
 config/rootfiles/core/{167 => 168}/filelists/curl  |    0
 .../{oldcore/106 => core/168}/filelists/expat      |    0
 config/rootfiles/core/168/filelists/files          |  406 ++
 .../{oldcore/110 => core/168}/filelists/freetype   |    0
 .../{oldcore/163 => core/168}/filelists/fribidi    |    0
 .../rootfiles/core/{167 => 168}/filelists/harfbuzz |    0
 .../{oldcore/123 => core/168}/filelists/iana-etc   |    0
 .../{oldcore/106 => core/168}/filelists/ipset      |    0
 .../{oldcore/128 => core/168}/filelists/knot       |    0
 .../{oldcore/125 => core/168}/filelists/libaio     |    0
 .../{oldcore/104 => core/168}/filelists/libcap     |    0
 .../{oldcore/131 => core/168}/filelists/libcap-ng  |    0
 .../{oldcore/105 => core/168}/filelists/libgcrypt  |    0
 .../{oldcore/131 => core/168}/filelists/libhtp     |    0
 config/rootfiles/core/168/filelists/libinih        |    1 +
 .../{oldcore/106 => core/168}/filelists/libmnl     |    0
 .../92 => core/168}/filelists/libnfnetlink         |    0
 .../{oldcore/111 => core/168}/filelists/logwatch   |    0
 .../{oldcore/101 => core/168}/filelists/mpfr       |    0
 config/rootfiles/core/{167 => 168}/filelists/nano  |    0
 .../{oldcore/151 => core/168}/filelists/openjpeg   |    0
 .../{oldcore/128 => core/168}/filelists/openldap   |    0
 .../rootfiles/core/{167 => 168}/filelists/openssh  |    0
 .../rootfiles/core/{167 => 168}/filelists/openssl  |    0
 .../{oldcore/100 => core/168}/filelists/openvpn    |    0
 config/rootfiles/core/{167 => 168}/filelists/pango |    0
 .../{oldcore/101 => core/168}/filelists/pciutils   |    0
 .../{oldcore/155 => core/168}/filelists/pcre2      |    0
 .../165 => core/168}/filelists/perl-libwww         |    0
 .../{oldcore/110 => core/168}/filelists/poppler    |    0
 .../{oldcore/103 => core/168}/filelists/procps     |    0
 .../rootfiles/core/{167 => 168}/filelists/sqlite   |    0
 .../{oldcore/100 => core/168}/filelists/squid      |    0
 .../{oldcore/131 => core/168}/filelists/suricata   |    0
 .../rootfiles/core/{167 => 168}/filelists/vnstat   |    0
 .../{oldcore/162 => core/168}/filelists/whois      |    0
 .../124 => core/168}/filelists/x86_64/efibootmgr   |    0
 .../168}/filelists/x86_64/intel-microcode          |    0
 .../rootfiles/{oldcore/162 => core/168}/update.sh  |  167 +-
 config/rootfiles/{core => oldcore}/167/exclude     |    0
 .../{core => oldcore}/167/filelists/aarch64/linux  |    0
 .../{core => oldcore}/167/filelists/aarch64/u-boot |    0
 .../167/filelists/aarch64/util-linux               |    0
 .../{core => oldcore}/167/filelists/apache2        |    0
 .../{core => oldcore}/167/filelists/armv6l/linux   |    0
 .../167/filelists/armv6l/util-linux                |    0
 .../rootfiles/{core => oldcore}/167/filelists/bind |    0
 .../167/filelists/ca-certificates                  |    0
 .../{core => oldcore}/167/filelists/core-files     |    0
 .../{core => oldcore}/167/filelists/coreutils      |    0
 .../rootfiles/{core => oldcore}/167/filelists/curl |    0
 .../rootfiles/{core => oldcore}/167/filelists/ddns |    0
 .../{core => oldcore}/167/filelists/dracut         |    0
 .../{core => oldcore}/167/filelists/elinks         |    0
 .../{core => oldcore}/167/filelists/files          |    0
 .../rootfiles/{core => oldcore}/167/filelists/gzip |    0
 .../{core => oldcore}/167/filelists/harfbuzz       |    0
 .../{core => oldcore}/167/filelists/hwdata         |    0
 .../{core => oldcore}/167/filelists/iproute2       |    0
 .../{core => oldcore}/167/filelists/libdnet        |    0
 .../{core => oldcore}/167/filelists/libloc         |    0
 .../oldcore/{106 => 167}/filelists/misc-progs      |    0
 .../rootfiles/{core => oldcore}/167/filelists/nano |    0
 .../{core => oldcore}/167/filelists/ntfs-3g        |    0
 .../{core => oldcore}/167/filelists/openssh        |    0
 .../{core => oldcore}/167/filelists/openssl        |    0
 .../{core => oldcore}/167/filelists/pakfire        |    0
 .../{core => oldcore}/167/filelists/pango          |    0
 .../{core => oldcore}/167/filelists/pcmciautils    |    0
 .../{core => oldcore}/167/filelists/perl-CGI       |    0
 .../{core => oldcore}/167/filelists/psmisc         |    0
 .../{core => oldcore}/167/filelists/rrdtool        |    0
 .../{core => oldcore}/167/filelists/smartmontools  |    0
 .../{core => oldcore}/167/filelists/sqlite         |    0
 .../{core => oldcore}/167/filelists/strongswan     |    0
 .../rootfiles/{core => oldcore}/167/filelists/sudo |    0
 .../{core => oldcore}/167/filelists/vnstat         |    0
 .../rootfiles/{core => oldcore}/167/filelists/wget |    0
 .../{core => oldcore}/167/filelists/wireless-regdb |    0
 .../{core => oldcore}/167/filelists/x86_64/linux   |    0
 .../167/filelists/x86_64/util-linux                |    0
 .../{core => oldcore}/167/filelists/xfsprogs       |    0
 .../rootfiles/{core => oldcore}/167/filelists/xz   |    0
 .../rootfiles/{core => oldcore}/167/filelists/zlib |    0
 config/rootfiles/{core => oldcore}/167/update.sh   |    0
 config/rootfiles/packages/aarch64/samba            |   77 +-
 config/rootfiles/packages/armv6l/borgbackup        |   46 +-
 config/rootfiles/packages/armv6l/samba             |   77 +-
 config/rootfiles/packages/borgbackup               |   46 +-
 config/rootfiles/packages/dbus                     |    7 +-
 config/rootfiles/packages/git                      |    2 +
 config/rootfiles/packages/hplip                    |   82 +-
 config/rootfiles/packages/keepalived               |    5 +-
 config/rootfiles/packages/lcdproc                  |   12 +-
 config/rootfiles/packages/libpri                   |    4 -
 config/rootfiles/packages/libseccomp               |    2 +-
 config/rootfiles/packages/libsolv                  |   52 -
 config/rootfiles/packages/mc                       |    4 +-
 config/rootfiles/packages/netpbm                   |  397 --
 config/rootfiles/packages/nmap                     |    4 +
 config/rootfiles/packages/nut                      |   36 +-
 config/rootfiles/packages/oci-cli                  | 1047 ++--
 config/rootfiles/packages/oci-python-sdk           |  976 +++-
 config/rootfiles/packages/openvmtools              |    5 +-
 config/rootfiles/packages/pcengines-apu-firmware   |   12 +-
 config/rootfiles/packages/perl-JSON                |   14 +
 config/rootfiles/packages/powertop                 |    1 +
 config/rootfiles/packages/python3-botocore         |   35 +-
 .../rootfiles/packages/python3-charset-normalizer  |   14 +-
 config/rootfiles/packages/python3-click            |   13 +-
 config/rootfiles/packages/python3-flit             |   29 +-
 config/rootfiles/packages/python3-jmespath         |   10 +-
 config/rootfiles/packages/python3-pkgconfig        |    8 +
 config/rootfiles/packages/python3-pyparsing        |   44 +-
 config/rootfiles/packages/python3-pytz             |   12 +-
 config/rootfiles/packages/python3-s3transfer       |   12 +-
 config/rootfiles/packages/python3-semantic-version |   13 +-
 config/rootfiles/packages/python3-setuptools       |  423 +-
 .../rootfiles/packages/python3-typing-extensions   |   10 +-
 config/rootfiles/packages/python3-urllib3          |   16 +-
 config/rootfiles/packages/sdl2                     |    2 +-
 config/rootfiles/packages/tshark                   |  185 +-
 config/rootfiles/packages/x86_64/samba             |   77 +-
 config/ssh/ssh_config                              |   14 +-
 config/ssh/sshd_config                             |   13 +-
 config/suricata/convert-ids-backend-files          |  276 +
 config/suricata/suricata-default-rules.yaml        |   18 -
 config/suricata/suricata.yaml                      |    5 +-
 html/cgi-bin/captive.cgi                           |    0
 html/cgi-bin/captive/index.cgi                     |    0
 html/cgi-bin/captive/redirect.cgi                  |    0
 html/cgi-bin/credits.cgi                           |   10 +-
 html/cgi-bin/dns.cgi                               |    0
 html/cgi-bin/ids.cgi                               |  459 +-
 html/cgi-bin/logs.cgi/ovpnclients.dat              |    0
 html/cgi-bin/mail.cgi                              |    0
 html/cgi-bin/media.cgi                             |    4 +-
 html/cgi-bin/netother.cgi                          |    0
 html/cgi-bin/netovpnrw.cgi                         |    0
 html/cgi-bin/netovpnsrv.cgi                        |    0
 html/cgi-bin/pakfire.cgi                           |  291 +-
 html/cgi-bin/wakeonlan.cgi                         |    4 +-
 html/html/clwarn.cgi                               |    0
 html/html/themes/ipfire/include/functions.pl       |   18 +-
 langs/de/cgi-bin/de.pl                             |   13 +-
 langs/en/cgi-bin/en.pl                             |   12 +-
 langs/fr/cgi-bin/fr.pl                             |    5 +-
 lfs/apcupsd                                        |    2 +-
 lfs/bind                                           |    4 +-
 lfs/bird                                           |    6 +-
 lfs/borgbackup                                     |    8 +-
 lfs/cups                                           |    4 +-
 lfs/curl                                           |    4 +-
 lfs/dbus                                           |   17 +-
 lfs/efibootmgr                                     |   11 +-
 lfs/expat                                          |    4 +-
 lfs/{libssh => fmt}                                |   18 +-
 lfs/freetype                                       |    4 +-
 lfs/fribidi                                        |    4 +-
 lfs/gcc                                            |    1 +
 lfs/git                                            |    6 +-
 lfs/haproxy                                        |    6 +-
 lfs/harfbuzz                                       |    4 +-
 lfs/hplip                                          |    6 +-
 lfs/iana-etc                                       |    4 +-
 lfs/icinga                                         |    2 +-
 lfs/intel-microcode                                |    6 +-
 lfs/ipset                                          |    4 +-
 lfs/ipvsadm                                        |    6 +-
 lfs/keepalived                                     |    6 +-
 lfs/knot                                           |    6 +-
 lfs/lcdproc                                        |    6 +-
 lfs/libaio                                         |    4 +-
 lfs/libart                                         |   78 -
 lfs/libcap                                         |    8 +-
 lfs/libcap-ng                                      |    4 +-
 lfs/libevent                                       |   78 -
 lfs/libgcrypt                                      |    4 +-
 lfs/libhtp                                         |    6 +-
 lfs/libinih                                        |    4 +-
 lfs/libmnl                                         |    4 +-
 lfs/libnfnetlink                                   |    4 +-
 lfs/libnl                                          |   80 -
 lfs/{libdnet => libpipeline}                       |   12 +-
 lfs/libpri                                         |   88 -
 lfs/libseccomp                                     |    6 +-
 lfs/libsolv                                        |  104 -
 lfs/libusb-compat                                  |   78 -
 lfs/linux-firmware                                 |    4 +-
 lfs/logwatch                                       |   14 +-
 lfs/lynis                                          |    8 +-
 lfs/man                                            |   30 +-
 lfs/man-pages                                      |    8 +-
 lfs/mc                                             |    8 +-
 lfs/mcelog                                         |   11 +-
 lfs/meson                                          |    4 +-
 lfs/minidlna                                       |    3 +-
 lfs/mpc                                            |    6 +-
 lfs/mpd                                            |    6 +-
 lfs/mpfr                                           |    1 +
 lfs/mtr                                            |    7 +-
 lfs/multipath-tools                                |    4 +-
 lfs/nano                                           |    4 +-
 lfs/nasm                                           |    4 +-
 lfs/ncdu                                           |    6 +-
 lfs/ncurses-compat                                 |  130 -
 lfs/netpbm                                         |   99 -
 lfs/nfs                                            |    8 +-
 lfs/nginx                                          |    6 +-
 lfs/nut                                            |   18 +-
 lfs/oci-cli                                        |    6 +-
 lfs/oci-python-sdk                                 |    6 +-
 lfs/oinkmaster                                     |   79 -
 lfs/openjpeg                                       |    4 +-
 lfs/openldap                                       |    6 +-
 lfs/openssh                                        |    6 +-
 lfs/openssl                                        |    4 +-
 lfs/openvmtools                                    |    6 +-
 lfs/openvpn                                        |    8 +-
 lfs/pango                                          |    4 +-
 lfs/parted                                         |    6 +-
 lfs/pcengines-apu-firmware                         |   18 +-
 lfs/pciutils                                       |    4 +-
 lfs/pcre2                                          |    6 +-
 lfs/{perl-TimeDate => perl-JSON}                   |   13 +-
 lfs/perl-libwww                                    |    4 +-
 lfs/pigz                                           |   80 -
 lfs/poppler                                        |    4 +-
 lfs/postfix                                        |    6 +-
 lfs/powertop                                       |    7 +-
 lfs/procps                                         |    7 +-
 lfs/python3-botocore                               |    6 +-
 lfs/python3-charset-normalizer                     |    8 +-
 lfs/python3-click                                  |    6 +-
 lfs/python3-flit                                   |    6 +-
 lfs/python3-jmespath                               |    6 +-
 lfs/{python3-colorama => python3-pkgconfig}        |   12 +-
 lfs/python3-pyparsing                              |    6 +-
 lfs/python3-pytz                                   |    6 +-
 lfs/python3-s3transfer                             |    6 +-
 lfs/python3-semantic-version                       |    6 +-
 lfs/python3-setuptools                             |    6 +-
 lfs/python3-setuptools-rust                        |    4 +-
 lfs/python3-setuptools-scm                         |    6 +-
 lfs/python3-tomli                                  |    6 +-
 lfs/python3-typing-extensions                      |    6 +-
 lfs/python3-urllib3                                |    6 +-
 lfs/rsync                                          |    8 +-
 lfs/samba                                          |    8 +-
 lfs/sarg                                           |    2 +-
 lfs/sdl2                                           |    6 +-
 lfs/sdparm                                         |   81 -
 lfs/setup                                          |    4 +
 lfs/spectre-meltdown-checker                       |    8 +-
 lfs/sqlite                                         |    4 +-
 lfs/squid                                          |    4 +-
 lfs/strace                                         |    6 +-
 lfs/stress                                         |    7 +-
 lfs/stunnel                                        |    6 +-
 lfs/suricata                                       |   33 +-
 lfs/tor                                            |    6 +-
 lfs/tshark                                         |    6 +-
 lfs/vnstat                                         |    7 +-
 lfs/whois                                          |    6 +-
 lfs/wio                                            |   21 +-
 lfs/zabbix_agentd                                  |    2 +-
 make.sh                                            |   17 +-
 src/initscripts/networking/any                     |    5 -
 src/initscripts/networking/red                     |   14 +-
 src/paks/cups/install.sh                           |    1 +
 src/paks/cups/uninstall.sh                         |    1 +
 ...s.patch => logwatch-7.6-disable_iptables.patch} |    6 +-
 ....patch => logwatch-7.6-enable-mdadm-sudo.patch} |   34 +-
 src/patches/mcelog-181-fix-Python-call.patch       |    8 +
 ....0-fix-DNS-rebinding-issue-CVE-2022-26505.patch |   44 +
 .../mpfr-4.1.0-cumulative-patches-1-to-13.patch    | 2976 ++++++++++
 .../oinkmaster-2.0-add_community_rules.patch       |   14 -
 src/patches/oinkmaster-tmp.patch                   |   12 -
 src/patches/openldap-2.4.49-consolidated-1.patch   |  371 --
 src/patches/openldap-2.6.1-consolidated-2.patch    | 4689 ++++++++++++++++
 src/patches/openldap-gcc44-fixes.patch             |   31 -
 ...m-tcp-Handle-retransmitted-SYN-with-TSval.patch |    2 +-
 ....0.8-fix-level1-cache-line-size-detection.patch |    2 +-
 .../suricata-disable-sid-2210059.patch             |    0
 src/scripts/update-ids-ruleset                     |  116 +-
 src/wio/main/wio.pl                                |    3 -
 src/wio/wio.cgi                                    |    3 -
 tools/download-rust-crate                          |    6 +-
 341 files changed, 15459 insertions(+), 8685 deletions(-)
 delete mode 100644 config/cfgroot/oinkmaster.conf
 delete mode 100644 config/oinkmaster/oinkmaster.conf
 create mode 100644 config/rootfiles/common/fmt
 delete mode 100644 config/rootfiles/common/libart
 delete mode 100644 config/rootfiles/common/libdnet
 delete mode 100644 config/rootfiles/common/libevent
 delete mode 100644 config/rootfiles/common/libnl
 create mode 100644 config/rootfiles/common/libpipeline
 delete mode 100644 config/rootfiles/common/libusb-compat
 delete mode 100644 config/rootfiles/common/oinkmaster
 delete mode 100644 config/rootfiles/common/pigz
 delete mode 100644 config/rootfiles/common/sdparm
 copy config/rootfiles/core/{167/filelists => 168}/core-files (100%)
 copy config/rootfiles/core/{167 => 168}/exclude (100%)
 copy config/rootfiles/{oldcore/124 => core/168}/filelists/aarch64/efibootmgr (100%)
 copy config/rootfiles/{oldcore/158 => core/168}/filelists/backup (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/bind (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/curl (100%)
 copy config/rootfiles/{oldcore/106 => core/168}/filelists/expat (100%)
 create mode 100644 config/rootfiles/core/168/filelists/files
 copy config/rootfiles/{oldcore/110 => core/168}/filelists/freetype (100%)
 copy config/rootfiles/{oldcore/163 => core/168}/filelists/fribidi (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/harfbuzz (100%)
 copy config/rootfiles/{oldcore/123 => core/168}/filelists/iana-etc (100%)
 copy config/rootfiles/{oldcore/106 => core/168}/filelists/ipset (100%)
 copy config/rootfiles/{oldcore/128 => core/168}/filelists/knot (100%)
 copy config/rootfiles/{oldcore/125 => core/168}/filelists/libaio (100%)
 copy config/rootfiles/{oldcore/104 => core/168}/filelists/libcap (100%)
 copy config/rootfiles/{oldcore/131 => core/168}/filelists/libcap-ng (100%)
 copy config/rootfiles/{oldcore/105 => core/168}/filelists/libgcrypt (100%)
 copy config/rootfiles/{oldcore/131 => core/168}/filelists/libhtp (100%)
 create mode 120000 config/rootfiles/core/168/filelists/libinih
 copy config/rootfiles/{oldcore/106 => core/168}/filelists/libmnl (100%)
 copy config/rootfiles/{oldcore/92 => core/168}/filelists/libnfnetlink (100%)
 copy config/rootfiles/{oldcore/111 => core/168}/filelists/logwatch (100%)
 copy config/rootfiles/{oldcore/101 => core/168}/filelists/mpfr (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/nano (100%)
 copy config/rootfiles/{oldcore/151 => core/168}/filelists/openjpeg (100%)
 copy config/rootfiles/{oldcore/128 => core/168}/filelists/openldap (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/openssh (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/openssl (100%)
 copy config/rootfiles/{oldcore/100 => core/168}/filelists/openvpn (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/pango (100%)
 copy config/rootfiles/{oldcore/101 => core/168}/filelists/pciutils (100%)
 copy config/rootfiles/{oldcore/155 => core/168}/filelists/pcre2 (100%)
 copy config/rootfiles/{oldcore/165 => core/168}/filelists/perl-libwww (100%)
 copy config/rootfiles/{oldcore/110 => core/168}/filelists/poppler (100%)
 copy config/rootfiles/{oldcore/103 => core/168}/filelists/procps (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/sqlite (100%)
 copy config/rootfiles/{oldcore/100 => core/168}/filelists/squid (100%)
 copy config/rootfiles/{oldcore/131 => core/168}/filelists/suricata (100%)
 copy config/rootfiles/core/{167 => 168}/filelists/vnstat (100%)
 copy config/rootfiles/{oldcore/162 => core/168}/filelists/whois (100%)
 copy config/rootfiles/{oldcore/124 => core/168}/filelists/x86_64/efibootmgr (100%)
 copy config/rootfiles/{oldcore/121 => core/168}/filelists/x86_64/intel-microcode (100%)
 copy config/rootfiles/{oldcore/162 => core/168}/update.sh (54%)
 rename config/rootfiles/{core => oldcore}/167/exclude (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/u-boot (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/aarch64/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/apache2 (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/armv6l/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/armv6l/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/bind (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ca-certificates (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/core-files (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/coreutils (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/curl (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ddns (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/dracut (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/elinks (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/gzip (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/harfbuzz (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/hwdata (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/iproute2 (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/libdnet (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/libloc (100%)
 copy config/rootfiles/oldcore/{106 => 167}/filelists/misc-progs (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/nano (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/ntfs-3g (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/openssh (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/openssl (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pakfire (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pango (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/pcmciautils (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/perl-CGI (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/psmisc (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/rrdtool (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/smartmontools (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/sqlite (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/strongswan (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/sudo (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/vnstat (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/wget (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/wireless-regdb (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/x86_64/linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/x86_64/util-linux (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/xfsprogs (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/xz (100%)
 rename config/rootfiles/{core => oldcore}/167/filelists/zlib (100%)
 rename config/rootfiles/{core => oldcore}/167/update.sh (100%)
 delete mode 100644 config/rootfiles/packages/libpri
 delete mode 100644 config/rootfiles/packages/libsolv
 delete mode 100644 config/rootfiles/packages/netpbm
 create mode 100644 config/rootfiles/packages/perl-JSON
 create mode 100644 config/rootfiles/packages/python3-pkgconfig
 create mode 100644 config/suricata/convert-ids-backend-files
 delete mode 100644 config/suricata/suricata-default-rules.yaml
 mode change 100755 => 100644 html/cgi-bin/captive.cgi
 mode change 100755 => 100644 html/cgi-bin/captive/index.cgi
 mode change 100755 => 100644 html/cgi-bin/captive/redirect.cgi
 mode change 100755 => 100644 html/cgi-bin/dns.cgi
 mode change 100755 => 100644 html/cgi-bin/logs.cgi/ovpnclients.dat
 mode change 100755 => 100644 html/cgi-bin/mail.cgi
 mode change 100755 => 100644 html/cgi-bin/netother.cgi
 mode change 100755 => 100644 html/cgi-bin/netovpnrw.cgi
 mode change 100755 => 100644 html/cgi-bin/netovpnsrv.cgi
 mode change 100755 => 100644 html/html/clwarn.cgi
 copy lfs/{libssh => fmt} (87%)
 delete mode 100644 lfs/libart
 delete mode 100644 lfs/libevent
 delete mode 100644 lfs/libnl
 rename lfs/{libdnet => libpipeline} (90%)
 delete mode 100644 lfs/libpri
 delete mode 100644 lfs/libsolv
 delete mode 100644 lfs/libusb-compat
 delete mode 100644 lfs/ncurses-compat
 delete mode 100644 lfs/netpbm
 delete mode 100644 lfs/oinkmaster
 copy lfs/{perl-TimeDate => perl-JSON} (91%)
 delete mode 100644 lfs/pigz
 copy lfs/{python3-colorama => python3-pkgconfig} (90%)
 delete mode 100644 lfs/sdparm
 rename src/patches/logwatch/{logwatch-7.5.4-disable_iptables.patch => logwatch-7.6-disable_iptables.patch} (80%)
 rename src/patches/logwatch/{logwatch-7.5.5-enable-mdadm-sudo.patch => logwatch-7.6-enable-mdadm-sudo.patch} (56%)
 create mode 100644 src/patches/mcelog-181-fix-Python-call.patch
 create mode 100644 src/patches/minidlna-1.3.0-fix-DNS-rebinding-issue-CVE-2022-26505.patch
 create mode 100644 src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
 delete mode 100644 src/patches/oinkmaster-2.0-add_community_rules.patch
 delete mode 100644 src/patches/oinkmaster-tmp.patch
 delete mode 100644 src/patches/openldap-2.4.49-consolidated-1.patch
 create mode 100644 src/patches/openldap-2.6.1-consolidated-2.patch
 delete mode 100644 src/patches/openldap-gcc44-fixes.patch
 rename src/patches/{ => suricata}/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch (97%)
 rename src/patches/{ => suricata}/suricata-5.0.8-fix-level1-cache-line-size-detection.patch (95%)
 rename src/patches/{ => suricata}/suricata-disable-sid-2210059.patch (100%)
Difference in files:

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 8ea399bb9..7094ed610 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -175,6 +175,12 @@ restore_backup() {
    	convert-ids-multiple-providers
    fi
+	# IDS backend converter.
+	if [ -e "/var/ipfire/suricata/oinkmaster.conf" ]; then
+		# Run the converter
+		convert-ids-backend-files
+	fi
+
    # Convert DNS settings
    convert-dns-settings
diff --git a/config/backup/include b/config/backup/include
index cc4dc27dd..d310b8487 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -24,6 +24,7 @@ root/.bash_history
 root/.gitconfig
 root/.ssh
 srv/web/ipfire/html/proxy.pac
+var/cache/suricata
 var/ipfire/auth/users
 var/ipfire/backup/addons/backup
 var/ipfire/backup/exclude.user
@@ -48,9 +49,7 @@ var/ipfire/ppp
 var/ipfire/proxy
 var/ipfire/qos/*
 var/ipfire/qos/bin/qos.sh
-var/ipfire/suricata/*.conf
-var/ipfire/suricata/*.yaml
-var/ipfire/suricata/providers-settings
+var/ipfire/suricata
 var/ipfire/*/settings
 var/ipfire/time/
 var/ipfire/urlfilter
@@ -60,5 +59,3 @@ var/log/ip-acct/*
 var/log/rrd/*
 var/log/rrd/collectd
 var/log/vnstat
-var/tmp/idsrules-*.tar.gz
-var/tmp/idsrules-*.rules
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 5ddea348e..65459cc92 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -46,7 +46,7 @@ my $menu = %menuhash;
 %settings = ();
 %ethsettings = ();
 %pppsettings = ();
-@URI = ();
+my @URI = split('?', $ENV{'REQUEST_URI'});
### Make sure this is an SSL request
 if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
@@ -573,3 +573,5 @@ sub get_manualpage_url() {
    # No manual page configured, return nothing
    return;
 }
+
+1; # End of package "Header"
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 94dccc8ae..ec4fdacc5 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -29,14 +29,41 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/network-functions.pl";
 require "${General::swroot}/suricata/ruleset-sources";
+# Load perl module to deal with Archives.
+use Archive::Tar;
+
+# Load perl module to deal with files and path.
+use File::Basename;
+
+# Load module to move files.
+use File::Copy;
+
+# Load module to recursely remove files and a folder.
+use File::Path qw(rmtree);
+
+# Load module to get file stats.
+use File::stat;
+
+# Load module to deal with temporary files.
+use File::Temp;
+
+# Load module to deal with the date formats used by the HTTP protocol.
+use HTTP::Date;
+
+# Load the libwwwperl User Agent module.
+use LWP::UserAgent;
+
+# Load function from posix module to format time strings.
+use POSIX qw (strftime);
+
+# Load module to talk to the kernel log daemon.
+use Sys::Syslog qw(:DEFAULT setlogsock);
+
 # Location where all config and settings files are stored.
 our $settingsdir = "${General::swroot}/suricata";
# File where the main file for providers ruleset inclusion exists.
-our $suricata_used_providers_file = "$settingsdir/suricata-used-providers.yaml";
-
-# File for static ruleset inclusions.
-our $suricata_default_rulefiles_file = "$settingsdir/suricata-default-rules.yaml";
+our $suricata_used_rulesfiles_file = "$settingsdir/suricata-used-rulesfiles.yaml";
# File where the addresses of the homenet are stored.
 our $homenet_file = "$settingsdir/suricata-homenet.yaml";
@@ -47,12 +74,6 @@ our $dns_servers_file = "$settingsdir/suricata-dns-servers.yaml";
 # File where the HTTP ports definition is stored.
 our $http_ports_file = "$settingsdir/suricata-http-ports.yaml";
-# File which contains includes for provider specific rule modifications.
-our $oinkmaster_provider_includes_file = "$settingsdir/oinkmaster-provider-includes.conf";
-
-# File which contains wheater the rules should be changed.
-our $modify_sids_file = "$settingsdir/oinkmaster-modify-sids.conf";
-
 # File which stores the configured IPS settings.
 our $ids_settings_file = "$settingsdir/settings";
@@ -62,8 +83,12 @@ our $providers_settings_file = "$settingsdir/providers-settings";
 # File which stores the configured settings for whitelisted addresses.
 our $ignored_file = "$settingsdir/ignored";
+# File which stores HTTP Etags for providers which supports them
+# for cache management.
+our $etags_file = "$settingsdir/etags";
+
 # Location where the downloaded rulesets are stored.
-our $dl_rules_path = "/var/tmp";
+our $dl_rules_path = "/var/cache/suricata";
# File to store any errors, which also will be read and displayed by the wui.
 our $storederrorfile = "/tmp/ids_storederror";
@@ -105,6 +130,9 @@ my $suricatactrl = "/usr/local/bin/suricatactrl";
 # Prefix for each downloaded ruleset.
 my $dl_rulesfile_prefix = "idsrules";
+# Temporary directory to download the rules files.
+my $tmp_dl_directory = "/var/tmp";
+
 # Temporary directory where the rulesets will be extracted.
 my $tmp_directory = "/tmp/ids_tmp";
@@ -115,10 +143,7 @@ my $tmp_rules_directory = "$tmp_directory/rules";
 my $tmp_conf_directory = "$tmp_directory/conf";
# Array with allowed commands of suricatactrl.
-my @suricatactrl_cmds = ( 'start', 'stop', 'restart', 'reload', 'fix-rules-dir', 'cron' );
-
-# Array with supported cron intervals.
-my @cron_intervals = ('off', 'daily', 'weekly' );
+my @suricatactrl_cmds = ( 'start', 'stop', 'restart', 'reload', 'fix-rules-dir' );
# Array which contains the HTTP ports, which statically will be declared as HTTP_PORTS in the
 # http_ports_file.
@@ -147,10 +172,7 @@ my %tr_app_layer_proto = (
 #
 sub check_and_create_filelayout() {
    # Check if the files exist and if not, create them.
-	unless (-f "$oinkmaster_provider_includes_file") { &create_empty_file($oinkmaster_provider_includes_file); }
-	unless (-f "$modify_sids_file") { &create_empty_file($modify_sids_file); }
-	unless (-f "$suricata_used_providers_file") { &create_empty_file($suricata_used_providers_file); }
-	unless (-f "$suricata_default_rulefiles_file") { &create_empty_file($suricata_default_rulefiles_file); }
+	unless (-f "$suricata_used_rulesfiles_file") { &create_empty_file($suricata_used_rulesfiles_file); }
    unless (-f "$ids_settings_file") { &create_empty_file($ids_settings_file); }
    unless (-f "$providers_settings_file") { &create_empty_file($providers_settings_file); }
    unless (-f "$whitelist_file" ) { &create_empty_file($whitelist_file); }
@@ -204,6 +226,42 @@ sub get_enabled_providers () {
    return @enabled_providers;
 }
+#
+## Function to get a hash of provider handles and their configured modes (IDS/IPS).
+#
+sub get_providers_mode () {
+	my %used_providers = ();
+
+	# Hash to store the providers and their configured modes.
+	my %providers_mode = ();
+
+	# Read-in the providers config file.
+	&General::readhasharray("$providers_settings_file", %used_providers);
+
+	# Loop through the hash of used_providers.
+	foreach my $id (keys %used_providers) {
+		# Skip disabled providers.
+		next unless ($used_providers{$id}[3] eq "enabled");
+
+		# Grab the provider handle.
+		my $provider = "$used_providers{$id}[0]";
+
+		# Grab the provider mode.
+		my $mode = "$used_providers{$id}[4]";
+
+		# Fall back to IDS if no mode could be obtained.
+		unless($mode) {
+			$mode = "IDS";
+		}
+
+		# Add details to provider_modes hash.
+		$providers_mode{$provider} = $mode;
+	}
+
+	# Return the hash.
+	return %providers_mode;
+}
+
 #
 ## Function for checking if at least 300MB of free disk space are available
 ## on the "/var" partition.
@@ -225,11 +283,8 @@ sub checkdiskspace () {
# Check if the available disk space is more than 300MB.
    		if ($available < 300) {
-				# Log error to syslog.
-				&_log_to_syslog("Not enough free disk space on /var. Only $available MB from 300 MB available.");
-
-				# Exit function and return "1" - False.
-				return 1;
+				# Exit function and return the available disk space.
+				return $available;
    		}
    	}
    }
@@ -239,46 +294,32 @@ sub checkdiskspace () {
 }
#
-## This function is responsible for downloading the configured IDS rulesets or if no one is specified
-## all configured rulesets will be downloaded.
+## This function is responsible for downloading the ruleset for a given provider.
 ##
-## * At first it gathers all configured ruleset providers, initialize the downloader and sets an
-##   upstream proxy if configured.
-## * After that, the given ruleset or in case all rulesets should be downloaded, it will determine wether it
-##   is enabled or not.
+## * At first it initialize the downloader and sets an upstream proxy if configured.
 ## * The next step will be to generate the final download url, by obtaining the URL for the desired
-##   ruleset, add the settings for the upstream proxy.
-## * Finally the function will grab all the rules files or tarballs from the servers.
+##   ruleset and add the settings for the upstream proxy.
+## * Finally the function will grab the rule file or tarball from the server.
+##   It tries to reduce the amount of download by using the "If-Modified-Since" HTTP header.
+#
+## Return codes:
+##
+## * "no url" - If no download URL could be gathered for the provider.
+## * "not modified" - In case the already stored rules file is up to date.
+## * "incomplete download" - When the remote file size differs from the downloaded file size.
+## * "$error" - The error message generated from the LWP::User Agent module.
 #
 sub downloadruleset ($) {
    my ($provider) = @_;
-	# If no provider is given default to "all".
-	$provider //= 'all';
-
-	# Hash to store the providers and access id's, for which rules should be downloaded.
-	my %sheduled_providers = ();
-
-	# Get used provider settings.
-	my %used_providers = ();
-	&General::readhasharray("$providers_settings_file", %used_providers);
-
-	# Check if a ruleset has been configured.
-	unless(%used_providers) {
-		# Log that no ruleset has been configured and abort.
-		&_log_to_syslog("No ruleset provider has been configured.");
-
-		# Return "1".
-		return 1;
-	}
+	# The amount of download attempts before giving up and
+	# logging an error.
+	my $max_dl_attempts = 3;
# Read proxysettings.
    my %proxysettings=();
    &General::readhash("${General::swroot}/proxy/settings", %proxysettings);
-	# Load required perl module to handle the download.
-	use LWP::UserAgent;
-
    # Init the download module.
    #
    # Request SSL hostname verification and specify path
@@ -311,161 +352,156 @@ sub downloadruleset ($) {
    	$downloader->proxy(['http', 'https'], $proxy_url);
    }
-	# Loop through the hash of configured providers.
-	foreach my $id ( keys %used_providers ) {
-		# Skip providers which are not enabled.
-		next if ($used_providers{$id}[3] ne "enabled");
-
-		# Obtain the provider handle.
-		my $provider_handle = $used_providers{$id}[0];
-
-		# Handle update off all providers.
-		if (($provider eq "all") || ($provider_handle eq "$provider")) {
-			# Add provider handle and it's id to the hash of sheduled providers.
-			$sheduled_providers{$provider_handle} = $id;
-		}
-	}
+	# Grab the download url for the provider.
+	my $url = $IDS::Ruleset::Providers{$provider}{'dl_url'};
-	# Loop through the hash of sheduled providers.
-	foreach my $provider ( keys %sheduled_providers) {
-		# Log download/update of the ruleset.
-		&_log_to_syslog("Downloading ruleset for provider: $provider.");
+	# Check if the provider requires a subscription.
+	if ($IDS::Ruleset::Providers{$provider}{'requires_subscription'} eq "True") {
+		# Grab the subscription code.
+		my $subscription_code = &get_subscription_code($provider);
-		# Grab the download url for the provider.
-		my $url = $IDS::Ruleset::Providers{$provider}{'dl_url'};
+		# Add the subscription code to the download url.
+		$url =~ s/<subscription_code>/$subscription_code/g;
-		# Check if the provider requires a subscription.
-		if ($IDS::Ruleset::Providers{$provider}{'requires_subscription'} eq "True") {
-			# Grab the previously stored access id for the provider from hash.
-			my $id = $sheduled_providers{$provider};
+	}
-			# Grab the subscription code.
-			my $subscription_code = $used_providers{$id}[1];
+	# Abort and return "no url", if no url could be determined for the provider.
+	return "no url" unless ($url);
-			# Add the subscription code to the download url.
-			$url =~ s/<subscription_code>/$subscription_code/g;
+	# Pass the requested URL to the downloader.
+	my $request = HTTP::Request->new(GET => $url);
-		}
+	# Generate temporary file name, located in the tempoary download directory and with a suffix of ".tmp".
+	# The downloaded file will be stored there until some sanity checks are performed.
+	my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_dl_directory/", UNLINK => 0 );
+	my $tmpfile = $tmp->filename();
-		# Abort if no url could be determined for the provider.
-		unless ($url) {
-			# Log error and abort.
-			&_log_to_syslog("Unable to gather a download URL for the selected ruleset provider.");
-			return 1;
-		}
+	# Call function to get the final path and filename for the downloaded file.
+	my $dl_rulesfile = &_get_dl_rulesfile($provider);
-		# Variable to store the filesize of the remote object.
-		my $remote_filesize;
-
-		# The sourcfire (snort rules) does not allow to send "HEAD" requests, so skip this check
-		# for this webserver.
-		#
-		# Check if the ruleset source contains "snort.org".
-		unless ($url =~ /.snort.org/) {
-			# Pass the requrested url to the downloader.
-			my $request = HTTP::Request->new(HEAD => $url);
+	# Check if the rulesfile already exits, because it has been downloaded in the past.
+	#
+	# In this case we are requesting the server if the remote file has been changed or not.
+	# This will be done by sending the modification time in a special HTTP header.
+	if (-f $dl_rulesfile) {
+		# Call stat on the file.
+		my $stat = stat($dl_rulesfile);
-			# Accept the html header.
-			$request->header('Accept' => 'text/html');
+		# Omit the mtime of the existing file.
+		my $mtime = $stat->mtime;
-			# Perform the request and fetch the html header.
-			my $response = $downloader->request($request);
+		# Convert the timestamp into right format.
+		my $http_date = time2str($mtime);
-			# Check if there was any error.
-			unless ($response->is_success) {
-				# Obtain error.
-				my $error = $response->status_line();
+		# Add the If-Modified-Since header to the request to ask the server if the
+		# file has been modified.
+		$request->header( 'If-Modified-Since' => "$http_date" );
+	}
-				# Log error message.
-				&_log_to_syslog("Unable to download the ruleset. ($error)");
+	# Read-in Etags file for known Etags if the file is present.
+	my %etags = ();
+	&General::readhash("$etags_file", %etags) if (-f $etags_file);
-				# Return "1" - false.
-				return 1;
-			}
+	# Check if an Etag for the current provider is stored.
+	if ($etags{$provider}) {
+		# Grab the stored tag.
+		my $etag = $etags{$provider};
-			# Assign the fetched header object.
-			my $header = $response->headers();
+		# Add an "If-None-Match header to the request to ask the server if the
+		# file has been modified.
+		$request->header( 'If-None-Match' => $etag );
+	}
-			# Grab the remote file size from the object and store it in the
-			# variable.
-			$remote_filesize = $header->content_length;
-		}
+	my $dl_attempt = 1;
+	my $response;
-		# Load perl module to deal with temporary files.
-		use File::Temp;
+	# Download and retry on failure.
+	while ($dl_attempt <= $max_dl_attempts) {
+		# Perform the request and save the output into the tmpfile.
+		$response = $downloader->request($request, $tmpfile);
-		# Generate temporary file name, located in "/var/tmp" and with a suffix of ".tmp".
-		my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "/var/tmp/", UNLINK => 0 );
-		my $tmpfile = $tmp->filename();
+		# Check if the download was successfull.
+		if($response->is_success) {
+			# Break loop.
+			last;
-		# Pass the requested url to the downloader.
-		my $request = HTTP::Request->new(GET => $url);
+		# Check if the server responds with 304 (Not Modified).
+		} elsif ($response->code == 304) {
+			# Remove temporary file, if one exists.
+			unlink("$tmpfile") if (-e "$tmpfile");
-		# Perform the request and save the output into the tmpfile.
-		my $response = $downloader->request($request, $tmpfile);
+			# Return "not modified".
+			return "not modified";
-		# Check if there was any error.
-		unless ($response->is_success) {
+		# Check if we ran out of download re-tries.
+		} elsif ($dl_attempt eq $max_dl_attempts) {
    		# Obtain error.
    		my $error = $response->content;
-			# Log error message.
-			&_log_to_syslog("Unable to download the ruleset. ($error)");
+			# Remove temporary file, if one exists.
+			unlink("$tmpfile") if (-e "$tmpfile");
-			# Return "1" - false.
-			return 1;
+			# Return the error message from response..
+			return "$error";
    	}
-		# Load perl stat module.
-		use File::stat;
-
-		# Perform stat on the tmpfile.
-		my $stat = stat($tmpfile);
-
-		# Grab the local filesize of the downloaded tarball.
-		my $local_filesize = $stat->size;
+		# Remove temporary file, if one exists.
+		unlink("$tmpfile") if (-e "$tmpfile");
-		# Check if both file sizes match.
-		if (($remote_filesize) && ($remote_filesize ne $local_filesize)) {
-			# Log error message.
-			&_log_to_syslog("Unable to completely download the ruleset. ");
-			&_log_to_syslog("Only got $local_filesize Bytes instead of $remote_filesize Bytes. ");
-
-			# Delete temporary file.
-			unlink("$tmpfile");
+		# Increase download attempt counter.
+		$dl_attempt++;
+	}
-			# Return "1" - false.
-			return 1;
-		}
+	# Obtain the connection headers.
+	my $headers = $response->headers;
-		# Genarate and assign file name and path to store the downloaded rules file.
-		my $dl_rulesfile = &_get_dl_rulesfile($provider);
+	# Get the timestamp from header, when the file has been modified the
+	# last time.
+	my $last_modified = $headers->last_modified;
-		# Check if a file name could be obtained.
-		unless ($dl_rulesfile) {
-			# Log error message.
-			&_log_to_syslog("Unable to store the downloaded rules file. ");
+	# Get the remote size of the downloaded file.
+	my $remote_filesize = $headers->content_length;
-			# Delete downloaded temporary file.
-			unlink("$tmpfile");
+	# Grab the Etag from response it the server provides one.
+	if ($response->header('Etag')) {
+		# Add the Etag to the etags hash.
+		$etags{$provider} = $response->header('Etag');
-			# Return "1" - false.
-			return 1;
-		}
+		# Write the etags file.
+		&General::writehash($etags_file, %etags);
+	}
-		# Load file copy module, which contains the move() function.
-		use File::Copy;
+	# Perform stat on the tmpfile.
+	my $stat = stat($tmpfile);
-		# Overwrite the may existing rulefile or tarball with the downloaded one.
-		move("$tmpfile", "$dl_rulesfile");
+	# Grab the local filesize of the downloaded tarball.
+	my $local_filesize = $stat->size;
+	# Check if both file sizes match.
+	if (($remote_filesize) && ($remote_filesize ne $local_filesize)) {
    	# Delete temporary file.
    	unlink("$tmpfile");
-		# Set correct ownership for the tarball.
-		set_ownership("$dl_rulesfile");
+		# Return "1" - false.
+		return "incomplete download";
    }
+	# Overwrite the may existing rulefile or tarball with the downloaded one.
+	move("$tmpfile", "$dl_rulesfile");
+
+	# Check if we got a last-modified value from the server.
+	if ($last_modified) {
+		# Assign the last-modified timestamp as mtime to the
+		# rules file.
+		utime(time(), "$last_modified", "$dl_rulesfile");
+	}
+
+	# Delete temporary file.
+	unlink("$tmpfile");
+
+	# Set correct ownership for the tarball.
+	set_ownership("$dl_rulesfile");
+
    # If we got here, everything worked fine. Return nothing.
    return;
 }
@@ -479,18 +515,9 @@ sub downloadruleset ($) {
 sub extractruleset ($) {
    my ($provider) = @_;
-	# Load perl module to deal with archives.
-	use Archive::Tar;
-
    # Disable chown functionality when uncompressing files.
    $Archive::Tar::CHOWN = "0";
-	# Load perl module to deal with files and path.
-	use File::Basename;
-
-	# Load perl module for file copying.
-	use File::Copy;
-
    # Get full path and downloaded rulesfile for the given provider.
    my $tarball = &_get_dl_rulesfile($provider);
@@ -596,9 +623,6 @@ sub extractruleset ($) {
    			# Extract the file to the temporary directory.
    			$tar->extract_file("$packed_file", "$destination");
    		} else {
-				# Load perl module to deal with temporary files.
-				use File::Temp;
-
    			# Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp".
    			my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 );
    			my $tmpfile = $tmp->filename();
@@ -647,39 +671,135 @@ sub oinkmaster () {
    	&extractruleset($provider);
    }
-	# Load perl module to talk to the kernel syslog.
-	use Sys::Syslog qw(:DEFAULT setlogsock);
+	# Call function to process the ruleset and do all modifications.
+	&process_ruleset(@enabled_providers);
-	# Establish the connection to the syslog service.
-	openlog('oinkmaster', 'cons,pid', 'user');
+	# Call function to merge the classification files.
+	&merge_classifications(@enabled_providers);
-	# Call oinkmaster to generate ruleset.
-	open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -s -u dir://$tmp_rules_directory -C $settingsdir/oinkmaster.conf -o $rulespath 2>&1 |") or die "Could not execute oinkmaster $!\n";
+	# Call function to merge the sid to message mapping files.
+	&merge_sid_msg(@enabled_providers);
-	# Log output of oinkmaster to syslog.
-	while(<OINKMASTER>) {
-		# The syslog function works best with an array based input,
-		# so generate one before passing the message details to syslog.
-		my @syslog = ("INFO", "$_");
+	# Cleanup temporary directory.
+	&cleanup_tmp_directory();
+}
-		# Send the log message.
-		syslog(@syslog);
+#
+## Function to alter the ruleset.
+#
+sub process_ruleset(@) {
+	my (@providers) = @_;
+
+	# Hash to store the configured provider modes.
+	my %providers_mode = &get_providers_mode();
+
+	# Array to store the extracted rulefile from the temporary rules directory.
+	my @extracted_rulefiles;
+
+	# Get names of the extracted raw rulefiles.
+	opendir(DIR, $tmp_rules_directory) or die "Could not read from $tmp_rules_directory. $!\n";
+	while (my $file = readdir(DIR)) {
+		# Ignore single and double dotted files.
+		next if $file =~ /^..?$/;
+
+		# Add file to the array of extracted files.
+		push(@extracted_rulefiles, $file);
    }
-	# Close the pipe to oinkmaster process.
-	close(OINKMASTER);
+	# Close directory handle.
+	closedir(DIR);
-	# Close the log handle.
-	closelog();
+	# Loop through the array of providers.
+	foreach my $provider (@providers) {
+		# Hash to store the obtained SIDs and REV of each provider.
+		my %rules = ();
-	# Call function to merge the classification files.
-	&merge_classifications(@enabled_providers);
+		# Hash which holds modifications to apply to the rules.
+		my %modifications = ();
-	# Call function to merge the sid to message mapping files.
-	&merge_sid_msg(@enabled_providers);
+		# Loop through the array of extraced rulefiles.
+		foreach my $file (@extracted_rulefiles) {
+			# Skip file if it does not belong to the current processed provider.
+			next unless ($file =~ m/^$provider/);
-	# Cleanup temporary directory.
-	&cleanup_tmp_directory();
+			# Open the rulefile.
+			open(FILE, "$tmp_rules_directory/$file") or die "Could not read $tmp_rules_directory/$file. $!\n";
+
+			# Loop through the file content.
+			while (my $line = <FILE>) {
+				# Skip blank  lines.
+				next if ($line =~ /^\s*$/);
+
+				# Call function to get the sid and rev of the rule.
+				my ($sid, $rev) = &_get_sid_and_rev($line);
+
+				# Skip rule if a sid with a higher rev already has added to the rules hash.
+				next if ($rev le $rules{$sid});
+
+				# Add the new or rule with higher rev to the hash of rules.
+				$rules{$sid} = $rev;
+			}
+
+			# Close file handle.
+			close(FILE);
+		}
+
+		# Get filename which contains the ruleset modifications for this provider.
+		my $modification_file = &get_provider_ruleset_modifications_file($provider);
+
+		# Read file which holds the modifications of the ruleset for the current provider.
+		&General::readhash($modification_file, %modifications) if (-f $modification_file);
+
+		# Loop again through the array of extracted rulesfiles.
+		foreach my $file (@extracted_rulefiles) {
+			# Skip the file if it does not belong to the current provider.
+			next unless ($file =~ m/^$provider/);
+
+			# Open the rulefile for writing.
+			open(RULEFILE, ">", "$rulespath/$file") or die "Could not write to file $rulespath/$file. $!\n";
+
+			# Open the rulefile for reading.
+			open(TMP_RULEFILE, "$tmp_rules_directory/$file") or die "Could not read $tmp_rules_directory/$file. $!\n";
+
+			# Loop through the raw temporary rulefile.
+			while (my $line = <TMP_RULEFILE>) {
+				# Get the sid and rev of the rule.
+				my ($sid, $rev) = &_get_sid_and_rev($line);
+
+				# Check if the current rule is obsoleted by a newer one.
+				#
+				# In this case the rev number in the rules hash is higher than the current one.
+				next if ($rev lt $rules{$sid});
+
+				# Check if the rule should be enabled or disabled.
+				if ($modifications{$sid} eq "enabled") {
+					# Drop the # at the start of the line.
+					$line =~ s/^#//;
+				} elsif ($modifications{$sid} eq "disabled") {
+					# Add a # at the start of the line to disable the rule.
+					$line = "#$line" unless ($line =~ /^#/);
+				}
+
+				# Check if the Provider is set so IPS mode.
+				if ($providers_mode{$provider} eq "IPS") {
+					# Replacements for sourcefire rules.
+					$line =~ s/^#\s*(?:alert|drop)(.+policy balanced-ips alert)/alert${1}/;
+					$line =~ s/^#\s*(?:alert|drop)(.+policy balanced-ips drop)/drop${1}/;
+
+					# Replacements for generic rules.
+					$line =~ s/^(#?)\s*(?:alert|drop)/${1}drop/;
+					$line =~ s/^(#?)\s*drop(.+flowbits:noalert;)/${1}alert${2}/;
+				}
+
+				# Write line / rule to the target rule file.
+				print RULEFILE "$line";
+			}
+
+			# Close filehandles.
+			close(RULEFILE);
+			close(TMP_RULEFILE);
+		}
+	}
 }
#
@@ -821,9 +941,6 @@ sub merge_sid_msg (@) {
 ## the rules directory.
 #
 sub move_tmp_ruleset() {
-	# Load perl module.
-	use File::Copy;
-
    # Do a directory listing of the temporary directory.
    opendir  DH, $tmp_rules_directory;
@@ -841,8 +958,6 @@ sub move_tmp_ruleset() {
 ## Function to cleanup the temporary IDS directroy.
 #
 sub cleanup_tmp_directory () {
-	# Load rmtree() function from file path perl module.
-	use File::Path 'rmtree';
# Delete temporary directory and all containing files.
    rmtree([ "$tmp_directory" ]);
@@ -870,9 +985,6 @@ sub log_error ($) {
 sub _log_to_syslog ($) {
    my ($message) = @_;
-	# Load perl module to talk to the kernel syslog.
-	use Sys::Syslog qw(:DEFAULT setlogsock);
-
    # The syslog function works best with an array based input,
    # so generate one before passing the message details to syslog.
    my @syslog = ("ERR", "<ERROR> $message");
@@ -915,149 +1027,84 @@ sub _store_error_message ($) {
 sub _get_dl_rulesfile($) {
    my ($provider) = @_;
-	# Gather the download type for the given provider.
-	my $dl_type = $IDS::Ruleset::Providers{$provider}{'dl_type'};
-
-	# Obtain the file suffix for the download file type.
-	my $suffix = $dl_type_to_suffix{$dl_type};
-
-	# Check if a suffix has been found.
-	unless ($suffix) {
-		# Abort return - nothing.
-		return;
-	}
+	# Check if the requested provider is known.
+	if ($IDS::Ruleset::Providers{$provider}) {
+		# Gather the download type for the given provider.
+		my $dl_type = $IDS::Ruleset::Providers{$provider}{'dl_type'};
-	# Generate the full filename and path for the stored rules file.
-	my $rulesfile = "$dl_rules_path/$dl_rulesfile_prefix-$provider$suffix";
+		# Obtain the file suffix for the download file type.
+		my $suffix = $dl_type_to_suffix{$dl_type};
-	# Return the generated filename.
-	return $rulesfile;
-}
+		# Check if a suffix has been found.
+		unless ($suffix) {
+			# Abort return - nothing.
+			return;
+		}
-#
-## Tiny function to delete the stored ruleset file or tarball for a given provider.
-#
-sub drop_dl_rulesfile ($) {
-	my ($provider) = @_;
+		# Generate the full filename and path for the stored rules file.
+		my $rulesfile = "$dl_rules_path/$dl_rulesfile_prefix-$provider$suffix";
-	# Gather the full path and name of the stored rulesfile.
-	my $rulesfile = &_get_dl_rulesfile($provider);
+		# Return the generated filename.
+		return $rulesfile;
-	# Check if the given rulesfile exists.
-	if (-f $rulesfile) {
-		# Delete the stored rulesfile.
-		unlink($rulesfile) or die "Could not delete $rulesfile. $!\n";
+	} else {
+		# A downloaded ruleset for a provider which is not supported anymore is requested.
+		#
+		# Try to enumerate the downloaded ruleset file.
+		foreach my $dl_type (keys %dl_type_to_suffix) {
+			# Get the file suffix for the supported type.
+			my $suffix = $dl_type_to_suffix{$dl_type};
+
+			# Generate possible ruleset file name.
+			my $rulesfile = "$dl_rules_path/$dl_rulesfile_prefix-$provider$suffix";
+
+			# Check if such a file exists.
+			if (-f $rulesfile) {
+				# Downloaded rulesfile found - Return the filename.
+				return $rulesfile;
+			}
+		}
    }
-}
-#
-## Tiny function to get/generate the full path and filename for the providers oinkmaster
-## modified sids file.
-#
-sub get_oinkmaster_provider_modified_sids_file ($) {
-	my ($provider) = @_;
-
-	# Generate the filename.
-	my $filename = "$settingsdir/oinkmaster-$provider-modified-sids.conf";
-
-	# Return the filename.
-	return $filename;
+	# If we got here, no rulesfile could be determined - return nothing.
+	return;
 }
#
-## Function to directly altering the oinkmaster provider includes file.
-##
-## Requires tha acition "remove" or "add" and a provider handle.
+## Private function to obtain the sid and rev of a rule.
 #
-sub alter_oinkmaster_provider_includes_file ($$) {
-	my ($action, $provider) = @_;
-
-	# Call function to get the path and name for the given providers
-	# oinkmaster modified sids file.
-	my $provider_modified_sids_file = &get_oinkmaster_provider_modified_sids_file($provider);
-
-	# Open the file for reading..
-	open (FILE, $oinkmaster_provider_includes_file) or die "Could not read $oinkmaster_provider_includes_file. $!\n";
-
-	# Read-in file content.
-	my @lines = <FILE>;
-
-	# Close file after reading.
-	close(FILE);
-
-	# Re-open the file for writing.
-	open(FILE, ">", $oinkmaster_provider_includes_file) or die "Could not write to $oinkmaster_provider_includes_file. $!\n";
-
-	# Loop through the file content.
-	foreach my $line (@lines) {
-		# Remove newlines.
-		chomp($line);
+## Returns an array with the sid as first and the rev as second value.
+#
+sub _get_sid_and_rev ($) {
+	my ($line) = @_;
-		# Skip line if we found our given provider and the action should be remove.
-		next if (($line =~ /$provider/) && ($action eq "remove"));
+	my @ret;
-		# Write the read-in line back to the file.
-		print FILE "$line\n";
+	# Use regex to obtain the sid and rev.
+	if ($line =~ m/.*sid:\s*(.*?);.*rev:\s*(.*?);/) {
+		# Add the sid and rev to the array.
+		push(@ret, $1);
+		push(@ret, $2);
    }
-	# Check if the file exists and add the provider if requested.
-	if ((-f $provider_modified_sids_file) && ($action eq "add")) {
-		print FILE "include $provider_modified_sids_file\n";
-	}
-
-	# Close file handle.
-	close(FILE);
+	# Return the array.
+	return @ret;
 }
#
-## Function to read-in the given enabled or disables sids file.
+## Tiny function to delete the stored ruleset file or tarball for a given provider.
 #
-sub read_enabled_disabled_sids_file($) {
-	my ($file) = @_;
-
-	# Temporary hash to store the sids and their state. It will be
-	# returned at the end of this function.
-	my %temphash;
-
-	# Open the given filename.
-	open(FILE, "$file") or die "Could not open $file. $!\n";
-
-	# Loop through the file.
-	while(<FILE>) {
-		# Remove newlines.
-		chomp $_;
-
-		# Skip blank lines.
-		next if ($_ =~ /^\s*$/);
-
-		# Skip coments.
-		next if ($_ =~ /^#/);
-
-		# Splitt line into sid and state part.
-		my ($state, $sid) = split(" ", $_);
+sub drop_dl_rulesfile ($) {
+	my ($provider) = @_;
-		# Skip line if the sid is not numeric.
-		next unless ($sid =~ /\d+/ );
+	# Gather the full path and name of the stored rulesfile.
+	my $rulesfile = &_get_dl_rulesfile($provider);
-		# Check if the sid was enabled.
-		if ($state eq "enablesid") {
-			# Add the sid and its state as enabled to the temporary hash.
-			$temphash{$sid} = "enabled";
-		# Check if the sid was disabled.
-		} elsif ($state eq "disablesid") {
-			# Add the sid and its state as disabled to the temporary hash.
-			$temphash{$sid} = "disabled";
-		# Invalid state - skip the current sid and state.
-		} else {
-			next;
-		}
+	# Check if the given rulesfile exists.
+	if (-f $rulesfile) {
+		# Delete the stored rulesfile.
+		unlink($rulesfile) or die "Could not delete $rulesfile. $!\n";
    }
-
-	# Close filehandle.
-	close(FILE);
-
-	# Return the hash.
-	return %temphash;
 }
#
@@ -1101,34 +1148,12 @@ sub call_suricatactrl ($) {
    	# Skip current command unless the given one has been found.
    	next unless($cmd eq $option);
-		# Check if the given command is "cron".
-		if ($option eq "cron") {
-			# Check if an interval has been given.
-			if ($interval) {
-				# Check if the given interval is valid.
-				foreach my $element (@cron_intervals) {
-					# Skip current element until the given one has been found.
-					next unless($element eq $interval);
-
-					# Call the suricatactrl binary and pass the "cron" command
-					# with the requrested interval.
-					&General::system("$suricatactrl", "$option", "$interval");
-
-					# Return "1" - True.
-					return 1;
-				}
-			}
-
-			# If we got here, the given interval is not supported or none has been given. - Return nothing.
-			return;
-		} else {
-			# Call the suricatactrl binary and pass the requrested
-			# option to it.
-			&General::system("$suricatactrl", "$option");
+		# Call the suricatactrl binary and pass the requrested
+		# option to it.
+		&General::system("$suricatactrl", "$option");
-			# Return "1" - True.
-			return 1;
-		}
+		# Return "1" - True.
+		return 1;
    }
# Command not found - return nothing.
@@ -1401,83 +1426,19 @@ sub generate_http_ports_file() {
 }
#
-## Function to generate and write the file for used rulefiles file for a given provider.
+## Function to write the file that contains the rulefiles which are loaded by suricaa.
 ##
-## The function requires as first argument a provider handle, and as second an array with files.
+## This function requires an array of used provider handles.
 #
-sub write_used_provider_rulefiles_file($@) {
-	my ($provider, @files) = @_;
-
-	# Get the path and file for the provider specific used rulefiles file.
-	my $used_provider_rulesfile_file = &get_used_provider_rulesfile_file($provider);
-
-	# Open file for used rulefiles.
-	open (FILE, ">", "$used_provider_rulesfile_file") or die "Could not write to $used_provider_rulesfile_file. $!\n";
-
-	# Write yaml header to the file.
-	print FILE "%YAML 1.1\n";
-	print FILE "---\n\n";
-
-	# Write header to file.
-	print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
-	# Loop through the array of given files.
-	foreach my $file (@files) {
-		# Check if the given filename exists and write it to the file of used rulefiles.
-		if(-f "$rulespath/$file") {
-			print FILE " - $file\n";
-		}
-	}
-
-	# Close file after writing.
-	close(FILE);
-}
-
-#
-## Function to write the main file for provider rulesfiles inclusions.
-##
-## This function requires an array of provider handles.
-#
-sub write_main_used_rulefiles_file (@) {
+sub write_used_rulefiles_file (@) {
    my (@providers) = @_;
-	# Call function to write the static rulefiles file.
-	&_write_default_rulefiles_file();
-
-	# Open file for used rulefils inclusion.
-	open (FILE, ">", "$suricata_used_providers_file") or die "Could not write to $suricata_used_providers_file. $!\n";
-
-	# Write yaml header to the file.
-	print FILE "%YAML 1.1\n";
-	print FILE "---\n\n";
-
-	# Write header to file.
-	print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
-	# Loop through the list of given providers.
-	foreach my $provider (@providers) {
-		# Call function to get the providers used rulefiles file.
-		my $filename = &get_used_provider_rulesfile_file($provider);
-
-		# Check if the file exists and write it into the used rulefiles file.
-		if (-f $filename) {
-			# Print the provider to the file.
-			print FILE "include: $filename\n";
-		}
-	}
-
-	# Close the filehandle after writing.
-	close(FILE);
-}
-
-sub _write_default_rulefiles_file () {
-	# Get enabled application layer protocols.
+	# Get the enabled application layer protocols.
    my @enabled_app_layer_protos = &get_suricata_enabled_app_layer_protos();
-	# Open file.
-	open (FILE, ">", $suricata_default_rulefiles_file) or die "Could not write to $suricata_default_rulefiles_file. $!\n";
+	# Open the file.
+	open (FILE, ">", $suricata_used_rulesfiles_file) or die "Could not write to $suricata_used_rulesfiles_file. $!\n";
-	# Write yaml header to the file.
    print FILE "%YAML 1.1\n";
    print FILE "---\n\n";
@@ -1521,66 +1482,84 @@ sub _write_default_rulefiles_file () {
    	}
    }
+	# Loop through the array of enabled providers.
+	foreach my $provider (@providers) {
+		# Skip unsupported providers.
+		next unless ($IDS::Ruleset::Providers{$provider});
+
+		# Get the used rulefile for this provider.
+		my @used_rulesfiles = &get_provider_used_rulesfiles($provider);
+
+		# Check if there are
+		if(@used_rulesfiles) {
+			# Add notice to the file.
+			print FILE "\n#Used Rulesfiles for provider $provider.\n";
+
+			# Loop through the array of used rulefiles.
+			foreach my $enabled_rulesfile (@used_rulesfiles) {
+				# Generate name and full path to the rulesfile.
+				my $rulesfile = "$rulespath/$enabled_rulesfile";
+
+				# Write the ruelsfile name to the file.
+				print FILE " - $rulesfile\n";
+			}
+		}
+	}
+
    # Close the file handle
    close(FILE);
 }
#
-## Tiny function to generate the full path and name for the used_provider_rulesfile file of a given provider.
+## Tiny function to generate the full path and name for the file which stores the used rulefiles of a given provider.
 #
-sub get_used_provider_rulesfile_file ($) {
+sub get_provider_used_rulesfiles_file ($) {
    my ($provider) = @_;
-	my $filename = "$settingsdir/suricata-$provider-used-rulefiles.yaml";
+	my $filename = "$settingsdir/$provider-used-rulesfiles";
# Return the gernerated file.
    return $filename;
 }
#
-## Function to generate and write the file for modify the ruleset.
+## Tiny function to generate the full path and name for the file which stores the modifications of a ruleset.
+#
+sub get_provider_ruleset_modifications_file($) {
+	my ($provider) = @_;
+
+	my $filename = "$settingsdir/$provider-modifications";
+
+	# Return the filename.
+	return $filename;
+}
+
+#
+## Function to get the subscription code of a configured provider.
 #
-sub write_modify_sids_file() {
-	# Get configured settings.
-	my %idssettings=();
-	&General::readhash("$ids_settings_file", %idssettings);
+sub get_subscription_code($) {
+	my ($provider) = @_;
-	# Open modify sid's file for writing.
-	open(FILE, ">$modify_sids_file") or die "Could not write to $modify_sids_file. $!\n";
+	my %configured_providers = ();
-	# Write file header.
-	print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
+	# Read-in providers settings file.
+	&General::readhasharray($providers_settings_file, %configured_providers);
-	# Check if the traffic only should be monitored.
-	unless($idssettings{'MONITOR_TRAFFIC_ONLY'} eq 'on') {
-		# Suricata is in IPS mode, which means that the rule actions have to be changed
-		# from 'alert' to 'drop', however not all rules should be changed.  Some rules
-		# exist purely to set a flowbit which is used to convey other information, such
-		# as a specific type of file being downloaded, to other rulewhich then check for
-		# malware in that file.  Rules which fall into the first category should stay as
-		# alert since not all flows of that type contain malware.
-
-		# These types of rulesfiles contain meta-data which gives the action that should
-		# be used when in IPS mode.  Do the following:
-		#
-		# 1. Disable all rules and set the action to 'drop'
-		# 2. Set the action back to 'alert' if the rule contains 'flowbits:noalert;'
-		#    This should give rules not in the policy a reasonable default if the user
-		#    manually enables them.
-		# 3. Enable rules and set actions according to the meta-data strings.
-
-		my $policy = 'balanced';  # Placeholder to allow policy to be changed.
-
-			print FILE <<END;
-modifysid * "^#(?:alert|drop)(.+policy $policy-ips alert)" | "alert${1}"
-modifysid * "^#(?:alert|drop)(.+policy $policy-ips drop)" | "drop${1}"
-modifysid * "^(#?)(?:alert|drop)" | "${1}drop"
-modifysid * "^(#?)drop(.+flowbits:noalert;)" | "${1}alert${2}"
-END
+	# Loop through the hash of configured providers.
+	foreach my $id (keys %configured_providers) {
+		# Assign nice human-readable values to the data fields.
+		my $provider_handle = $configured_providers{$id}[0];
+		my $subscription_code = $configured_providers{$id}[1];
+
+		# Check if the current processed provider is the requested one.
+		if ($provider_handle eq $provider) {
+			# Return the obtained subscription code.
+			return $subscription_code;
    	}
+	}
-	# Close file handle.
-	close(FILE);
+	# No subscription code found - return nothing.
+	return;
 }
#
@@ -1594,10 +1573,6 @@ sub get_ruleset_date($) {
    my $date;
    my $mtime;
-	# Load neccessary perl modules for file stat and to format the timestamp.
-	use File::stat;
-	use POSIX qw( strftime );
-
    # Get the stored rulesfile for this provider.
    my $stored_rulesfile = &_get_dl_rulesfile($provider);
@@ -1874,48 +1849,63 @@ sub get_red_address() {
 #
 ## Function to get the used rules files of a given provider.
 #
-sub read_used_provider_rulesfiles($) {
+sub get_provider_used_rulesfiles($) {
    my ($provider) = @_;
+	# Hash to store the used rulefiles of the provider.
+	my %provider_rulefiles = ();
+
    # Array to store the used rulefiles.
    my @used_rulesfiles = ();
-	# Get the used rulesefile file for the provider.
-	my $rulesfile_file = &get_used_provider_rulesfile_file($provider);
+	# Get the filename which contains the used rulefiles for this provider.
+	my $used_rulesfiles_file = &get_provider_used_rulesfiles_file($provider);
-	# Check if the a used rulesfile exists for this provider.
-	if (-f $rulesfile_file) {
-		# Open the file or used rulefiles and read-in content.
-		open(FILE, $rulesfile_file) or die "Could not open $rulesfile_file. $!\n";
+	# Read-in file, if it exists.
+	&General::readhash("$used_rulesfiles_file", %provider_rulefiles) if (-f $used_rulesfiles_file);
-		while (<FILE>) {
-			# Assign the current line to a nice variable.
-			my $line = $_;
+	# Loop through the hash of rulefiles which does the provider offer.
+	foreach my $rulefile (keys %provider_rulefiles) {
+		# Skip disabled rulefiles.
+		next unless($provider_rulefiles{$rulefile} eq "enabled");
-			# Remove newlines.
-			chomp($line);
+		# The General::readhash function does not allow dots as
+		# key value and limits the key "string" to the part before
+		# the dot, in case it contains one.
+		#
+		# So add the file extension for the rules file manually again.
+		$rulefile = "$rulefile.rules";
-			# Skip comments.
-			next if ($line =~ /#/);
+		# Add the enabled rulefile to the array of enabled rulefiles.
+		push(@used_rulesfiles, $rulefile);
+	}
-			# Skip blank  lines.
-			next if ($line =~ /^\s*$/);
+	# Return the array of used rulesfiles.
+	return @used_rulesfiles;
+}
-			# Gather the rulefile.
-			if ($line =~ /.*- (.*)/) {
-				my $rulefile = $1;
+#
+## Function to delete the stored etag data of a given provider.
+#
+sub remove_from_etags ($) {
+	my ($provider) = @_;
-				# Add the rulefile to the array of used rulesfiles.
-				push(@used_rulesfiles, $rulefile);
-			}
-		}
+	my %etags;
-		# Close the file.
-		close(FILE);
-	}
+	# Early exit function if the etags file does not exist.
+	return unless (-f $etags_file);
-	# Return the array of used rulesfiles.
-	return @used_rulesfiles;
+	# Read-in etag file.
+	&General::readhash("$etags_file", %etags);
+
+	# Check if the hash contains an entry for the given provider.
+	if ($etags{$provider}) {
+		# Drop the entry.
+		delete($etags{$provider});
+
+		# Write back the etags file.
+		&General::writehash("$etags_file", %etags);
+	}
 }
#
diff --git a/config/cfgroot/oinkmaster.conf b/config/cfgroot/oinkmaster.conf
deleted file mode 100644
index e52d89dc9..000000000
--- a/config/cfgroot/oinkmaster.conf
+++ /dev/null
@@ -1,292 +0,0 @@
-# $Id: oinkmaster.conf,v 1.1.2.2 2005/05/02 17:11:58 franck78 Exp $ #
-
-# Oinkmaster is a tool to update snort rules, which allow to conserve
-# a particular setting even after a rules update.
-# This file is a customised version for IPCop.
-# Disabling/enabling a particular rule should be made in this file.
-# In case you want to use some of the rules files commented out in 
-# standard ipcop /etc/snort/snort.conf :
-# -comment out the corresponding skipfile in this oinkmaster.conf
-# -uncomment the corresponding include in /etc/snort.conf
-# -save snort settings to restart snort
-
-
-################################################
-#    General options you may want to change    #
-################################################
-
-
-
-# The PATH to use during execution. If you prefer to use external 
-# binaries (i.e. use_external_bins=1, see below), tar and gzip must be 
-# found, and also wget if downloading via ftp, http or https. All with 
-# optional .exe suffix. If you're on Cygwin, make sure that the path 
-# contains the Cygwin binaries and not the native Win32 binaries or 
-# you will get problems.
-# Assume UNIX style by default:
-#path = /bin:/usr/bin:/usr/local/bin
-path = /bin
-
-# Files in the archive(s) matching this regular expression will be 
-# checked for changes, and then updated or added if needed.
-# All other files will be ignored. You can then choose to skip
-# individual files by specifying the "skipfile" keyword below.
-# Normally you shouldn't need to change this one.
-update_files = .rules$|.config$|.conf$|.txt$|.map$
-
-
-# Regexp of keywords that starts a snort rule.
-# May be useful if you create your own ruletypes and want those
-# lines to be regarded as rules as well.
-# rule_actions = alert|drop|log|pass|reject|sdrop|activate|dynamic
-
-
-#######################################################################
-# Files to totally skip (i.e. never update or check for changes)      #
-#                                                                     #
-# Syntax: skipfile filename                                           #
-# or:     skipfile filename1, filename2, filename3, ...               #
-#######################################################################
-
-# Ignore local.rules from the rules archive by default since we might 
-# have put some local rules in our own local.rules and we don't want it 
-# to get overwritten by the empty one from the archive after each 
-# update.
-skipfile local.rules
-
-# The file deleted.rules contains rules that have been deleted from 
-# other files, so there is usually no point in updating it.
-skipfile deleted.rules
-
-# Also skip snort.conf by default since we don't want to overwrite our 
-# own snort.conf if we have it in the same directory as the rules. If 
-# you have your own production copy of snort.conf in another directory, 
-# it may be really nice to check for changes in this file though, 
-# especially since variables are sometimes added or modified and 
-# new/old files are included/excluded.
-skipfile snort.conf
-
-# You may want to consider ignoring threshold.conf for the same reasons 
-# as for snort.conf, i.e. if you customize it locally and don't want it 
-# to become overwritten by the default one. It may be better to put 
-# local thresholding/suppressing in some local file and still update 
-# and use the official one though, in case important stuff is added to 
-# it some day. We do update it by default, but it's your call.
-# skipfile threshold.conf
-
-# If you update from multiple URLs at the same time you must ignore
-# the sid-msg.map (and generate it yourself if you need one) as it's
-# usually included in each rules tarball. See the FAQ for more info.
-# skipfile sid-msg.map
-skipfile web-attacks.rules
-skipfile backdoor.rules
-skipfile shellcode.rules
-skipfile policy.rules
-skipfile porn.rules
-skipfile info.rules
-skipfile icmp-info.rules
-skipfile virus.rules
-skipfile chat.rules
-skipfile multimedia.rules
-skipfile p2p.rules
-skipfile experimental.rules
-
-
-##########################################################################
-# SIDs to modify after each update (only for the skilled/stupid/brave).  #
-# Don't use it unless you have to. There is nothing that stops you from  #
-# modifying rules in such ways that they become invalid or generally     #
-# break things. You have been warned.                                    #
-# If you just want to disable SIDs, please skip this section and have a  #
-# look at the "disablesid" keyword below.                                #
-#                                                                        #
-# You may specify multiple modifysid directives for the same SID (they   #
-# will be processed in order of appearance), and you may also specify a  #
-# list of SIDs on which the substitution should be applied.              #
-# If the argument is in the form something.something it is regarded      #
-# as a filename and the substitution will apply on all rules in that     #
-# file. The wildcard ("*") can be used to apply the substitution on all  #
-# rules regardless of the SID or file. Please avoid using #comments      #
-# at the end of modifysid lines, they may confuse the parser in some     #
-# situations.                                                            #
-#                                                                        #
-# Syntax:                                                                #
-#   modifysid SID "replacethis" | "withthis"                             #    
-# or:                                                                    #
-#   modifysid SID1, SID2, SID3, ... "replacethis" | "withthis"           #
-# or:                                                                    #
-#   modifysid file "replacethis" | "withthis"                            #    
-# or:                                                                    #
-#   modifysid * "replacethis" | "withthis"                               #
-#                                                                        #
-# The strings within the quotes will simply be passed to a               #
-# s/replacethis/withthis/ statement in Perl, so they must be valid       #
-# regular expressions. The strings are case-sensitive and only the first #
-# occurrence will be replaced. If there are multiple occurrences you     #
-# want to replace, simply repeat the same modifysid line.                #
-#                                                                        #
-# If you specify a modifysid statement for a multi-line rule, Oinkmaster #
-# will first translate the rule into a single-line version and then      #
-# perform the substitution, so you don't have to care about the trailing #
-# backslashes and newlines.                                              #
-#                                                                        #
-# If you use variables in the substitution expression, it is strongly    #
-# recommended to always specify them like ${varname} instead of          #
-# $varname (like ${1} instead of $1 for example) to avoid parsing        #
-# confusion in some situations. Note that modifysid statements           #
-# will process both active and inactive (disabled) rules.                #
-#                                                                        #
-# You may want to check out README.templates and template-examples.conf  #
-# to find how you can simplify the modifysid usage by using templates.   #
-##########################################################################
-
-# Example to enable a rule (in this case SID 1325) that is disabled by
-# default, by simply replacing leading "#alert" with "alert".
-# (You should really use 'enablesid' for this though.)
-# Oinkmaster removes whitespaces next to the leading "#" so you don't
-# have to worry about that, but be careful about possible whitespace in
-# other places when writing the regexps.
-# modifysid 1325 "^#alert" | "alert"
-
-# You could also do this to enable it no matter what type of rule it is 
-# (alert, log, pass, etc).
-# modifysid 1325 "^#" | ""
-
-# Example to add "tag" stuff to SID 1325.
-# modifysid 1325 "sid:1325;" | "sid:1325; tag: host, src, 300, seconds;"
-
-# Example to make SID 1378 a 'drop' rule (valid if you're running 
-# Snort_inline).
-# modifysid 1378 "^alert" | "drop"
-
-# Example to replace first occurrence of $EXTERNAL_NET with $HOME_NET 
-# in SID 302. Remember that the strings are regular expressions, so you 
-# must escape special characters like $.
-# modifysid 302 "$EXTERNAL_NET" | "$HOME_NET"
-
-# You can also specify that a substitution should apply on multiple SIDs.
-# modifysid 302,429,1821 "$EXTERNAL_NET" | "$HOME_NET"
-
-# You can take advantage of the fact that it's regular expressions and
-# do more complex stuff. This example (for Snort_inline) adds a 'replace'
-# statement to SID 1324 that replaces "/bin/sh" with "/foo/sh".
-# modifysid 1324 "(content\s*:\s*"/bin/sh"\s*;)" | \
-#                "${1} replace:"/foo/sh";"
-
-# If you for some reason would like to add a comment inside the actual 
-# rules file, like the reason why you disabled this rule, you can do 
-# like this (you would normally add such comments in oinkmaster.conf 
-# though).
-# modifysid 1324 "(.+)" | "# 20020101: disabled this rule just for fun:\n#${1}"
-
-# Here is an example that is actually useful. Let's say you don't care 
-# about incoming welchia pings (detected by SID 483 at the time of 
-# writing) but you want to know when infected hosts on your network 
-# scans hosts on the outside. (Remember that watching for outgoing 
-# malicious packets is often just as important as watching for incoming 
-# ones, especially in this case.) The rule currently looks like
-# "alert icmp $EXTERNAL_NET any -> $HOME_NET any ..."
-# but we want to switch that so it becomes
-# "alert icmp $HOME_NET any -> $EXTERNAL_NET any ...".
-# Here is how it could be done.
-# modifysid 483 \
-# "(.+) $EXTERNAL_NET (.+) $HOME_NET (.+)" | \
-# "${1} $HOME_NET ${2} $EXTERNAL_NET ${3}"
-
-# The wildcard (modifysid * ...) can be used to do all kinds of 
-# interesting things. The substitution expression will be applied on all 
-# matching rules. First, a silly example to replace "foo" with "bar" in 
-# all rules (that have the string "foo" in them, that is.) 
-# modifysid * "foo" | "bar"
-
-# If you for some reason don't want to use the stream preprocessor to 
-# match established streams, you may want to replace the 'flow' 
-# statement with 'flags:A+;' in all those rules.
-# modifysid * "flow:[a-z,_ ]+;" | "flags:A+;"
-
-# Example to convert all rules of classtype attempted-admin to 'drop' 
-# rules (for Snort_inline only, obviously).
-# modifysid * "^alert (.*classtype\s*:\s*attempted-admin)" | "drop ${1}"
-
-# This one will append some text to the 'msg' string for all rules that 
-# have the 'tag' keyword in them.
-# modifysid * "(.*msg:\s*".+?)"(\s*;.+;\s*tag:.*)" | \
-#             "${1}, going to tag this baby"${2}"
-
-# There may be times when you want to replace multiple occurrences of a 
-# certain keyword/string in a rule and not just the first one. To 
-# replace the first two occurrences of "foo" with "bar" in SID 100, 
-# simply repeat the modifysid statement:
-# modifysid 100 "foo" | "bar"
-# modifysid 100 "foo" | "bar"
- 
-# Or you can even specify a SID list but repeat the same SID as many 
-# times as required, like:
-# modifysid 100,100,100 "foo" | "bar"
-
-# Enable all rules in the file exploit.rules.
-# modifysid exploit.rules "^#" | ""
-
-# Enable all rules in exploit.rules, icmp-info.rules and also SID 1171.
-# modifysid exploit.rules, snmp.rules, 1171 "^#" | ""
-
-
-
-########################################################################
-# SIDs that we don't want to update.                                   #
-# If you for some reason don't want a specific rule to be updated      #
-# (e.g. you made local modifications to it and you never want to       #
-# update it and don't care about changes in the official version), you #
-# can specify a "localsid" statement for it. This means that the old   #
-# version of the rule (i.e. the one in the rules file on your          #
-# harddrive) is always kept, regardless if the official version has    #
-# been updated. Please do not use this feature unless in special       #
-# cases as it's easy to end up with many signatures that aren't        #
-# maintained anymore. See the FAQ for details about this and hints     #
-# about better solutions regarding customization of rules.             #
-#                                                                      #
-# Syntax:  localsid SID                                                #
-# or:      localsid SID1, SID2, SID3, ...                              #
-########################################################################
-
-# Example to never update SID 1325.
-# localsid 1325
-
-
-
-########################################################################
-# SIDs to enable after each update.                                    #
-# Will simply remove all the leading '#' for a specified SID (if it's  #
-# a multi-line rule, the leading '#' for all lines are removed.)       #
-# These will be processed after all the modifysid and disablesid       #
-# statements. Using 'enablesid' on a rule that is not disabled is a    #
-# NOOP.                                                                #
-#                                                                      #
-# Syntax:  enablesid SID                                               #
-# or:      enablesid SID1, SID2, SID3, ...                             #
-########################################################################
-
-# Example to enable SID 1325.
-# enablesid 1325
-
-
-
-########################################################################
-# SIDs to comment out, i.e. disable, after each update by placing a    #
-# '#' in front of the rule (if it's a multi-line rule, it will be put  #
-# in front of all lines).                                              #
-#                                                                      #
-# Syntax:  disablesid SID                                              #
-# or:      disablesid SID1, SID2, SID3, ...                            #
-########################################################################
-
-# You can specify one SID per line.
-# disablesid 1
-# disablesid 2
-# disablesid 3
-
-# And also as comma-separated lists.
-# disablesid 4,5,6
-
-# It's a good idea to also add comment about why you disable the sid:
-# disablesid 1324    # 20020101: disabled this SID just because I can
diff --git a/config/cron/crontab b/config/cron/crontab
index d94dd65c2..c42104626 100644
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -62,6 +62,9 @@ HOME=/
 # Update location database
 %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
+# Perform a surciata rules update every 12 hours.
+@ 12h [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1
+
 # Retry sending spooled mails regularly
 %hourly * /usr/sbin/dma -q
diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index 5fc3e3d89..7fe397bb7 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -12,13 +12,13 @@ net.ipv4.tcp_syn_retries = 3
 net.ipv4.tcp_synack_retries = 3
net.ipv4.conf.default.arp_filter = 1
-net.ipv4.conf.default.rp_filter = 2
+net.ipv4.conf.default.rp_filter = 1
 net.ipv4.conf.default.accept_redirects = 0
 net.ipv4.conf.default.accept_source_route = 0
 net.ipv4.conf.default.log_martians = 1
net.ipv4.conf.all.arp_filter = 1
-net.ipv4.conf.all.rp_filter = 2
+net.ipv4.conf.all.rp_filter = 1
 net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.all.log_martians = 1
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 19dc7a6d1..432619184 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -122,7 +122,7 @@ undef (@dummy);
sub main {
    # Get currently used ipset sets.
-	&ipset_get_sets();
+	@ipset_used_sets = &ipset_get_sets();
# Flush all chains.
    &flush();
@@ -922,6 +922,8 @@ sub firewall_is_in_subnet {
 }
sub ipset_get_sets () {
+	my @sets;
+
    # Get all currently used ipset lists and store them in an array.
    my @output = `$IPSET -n list`;
@@ -931,14 +933,17 @@ sub ipset_get_sets () {
    	chomp($set);
# Add the set the array of used sets.
-		push(@ipset_used_sets, $set);
+		push(@sets, $set);
    }
# Display used sets in debug mode.
    if($DEBUG) {
    	print "Used ipset sets:\n";
-		print "@ipset_used_sets\n\n";
+		print "@sets\n\n";
    }
+
+	# Return the array of sets.
+	return @sets;
 }
sub ipset_restore ($) {
@@ -998,6 +1003,9 @@ sub ipset_call_restore ($) {
 }
sub ipset_cleanup () {
+	# Reload the array of used sets.
+	@ipset_used_sets = &ipset_get_sets();
+
    # Loop through the array of used sets.
    foreach my $set (@ipset_used_sets) {
    	# Check if this set is still in use.
diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 2bcf0d5e8..f969a3b0b 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -49,7 +49,7 @@
    $substatus->{'54.networkovpnsrv'} = {
    			'caption' => "$Lang::tr{'vpn statistic n2n'}",
    			'uri' => '/cgi-bin/netovpnsrv.cgi',
-				'title' => "$Lang::tr{'vpn statistics n2n'}",
+				'title' => "$Lang::tr{'vpn statistic n2n'}",
    			'enabled' => 1,
    		  };
     $substatus->{'60.hardwaregraphs'} = {
@@ -90,7 +90,7 @@
     $substatus->{'75.atm-status'} = {'caption' => 'Atm-status',
    			  'uri' => '/cgi-bin/atm-status.cgi',
    			  'title' => 'Atm-status',
-				  'enabled' => `find /sys/class/atm/*/device 2>/dev/null`,
+				  'enabled' => (`find /sys/class/atm/*/device 2>/dev/null` ? 1 : 0),
    			  };
     $substatus->{'76.mdstat'} = {'caption' => 'Mdstat',
    			  'uri' => '/cgi-bin/mdstat.cgi',
diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 19571a870..4ef537ed4 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -67,7 +67,7 @@
    			  'caption' => $Lang::tr{'aliases'},
    			  'uri' => '/cgi-bin/aliases.cgi',
    			  'title' => "$Lang::tr{'aliases'}",
-				  'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`,
+				  'enabled' => (`grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` ? 1 : 0),
    			  };
     $subnetwork->{'80.macadressmenu'} = {
    			  'caption' => $Lang::tr{'mac address menu'},
diff --git a/config/oinkmaster/oinkmaster.conf b/config/oinkmaster/oinkmaster.conf
deleted file mode 100644
index 4d4ee40ef..000000000
--- a/config/oinkmaster/oinkmaster.conf
+++ /dev/null
@@ -1,429 +0,0 @@
-# $Id: oinkmaster.conf,v 1.132 2006/02/02 12:05:08 andreas_o Exp $ #
-
-# This file is pretty big by default, but don't worry. 
-# The only things required are "path" and "update_files". You must also 
-# set "url" to point to the correct rules archive for your version of 
-# Snort, unless you prefer to specify this on the command line.
-# The rest in here is just a few recommended defaults, and examples
-# how to use all the other optional features and give some ideas how they 
-# could be used.
-
-# Remember not to let untrusted users edit Oinkmaster configuration
-# files, as things like the PATH to use during execution is defined
-# in here.
-
-
-# Use "url = <url>" to specify the location of the rules archive to 
-# download. The url must begin with http://, https://, ftp://, file:// 
-# or scp:// and end with .tar.gz or .tgz, and the file must be a 
-# gzipped tarball what contains a directory named "rules".
-# You can also point to a local directory with dir://<directory>.
-# Multiple "url = <url>" lines can be specified to grab multiple rules
-# archives from different locations.
-#
-# Note: if URL is specified on the command line, it overrides all 
-#       possible URLs specified in the configuration file(s).
-#
-# The location of the official Snort rules you should use depends
-# on which Snort version you run. Basically, you should go to
-# http://www.snort.org/rules/ and follow the instructions
-# there to pick the right URL for your version of Snort
-# (and remember to update the URL when upgrading Snort in the
-# future). You can of course also specify locations to third party 
-# rules.
-#
-# As of March 2005, you must register on the Snort site to get access 
-# to the official Snort rules. This will get you an "oinkcode".
-# You then specify the URL as
-# http://www.snort.org/pub-bin/oinkmaster.cgi/<oinkcode>/<filename>
-# For example, if your code is 5a081649c06a277e1022e1284b and
-# you use Snort 2.4, the url to use would be (without the wrap):
-# http://www.snort.org/pub-bin/oinkmaster.cgi/
-# 5a081649c06a277e1022e1284bdc8fabda70e2a4/snortrules-snapshot-2.4.tar.gz
-# See the Oinkmaster FAQ Q1 and http://www.snort.org/rules/ for
-# more information.
-
-
-# URL examples follows. Replace <oinkcode> with the code you get on the 
-# Snort site in your registered user profile.
-
-# Example for Snort 2.4
-# url = http://www.snort.org/pub-bin/oinkmaster.cgi/<oinkcode>/snortrules-snapshot-2.4.tar.gz
-# url = http://www.snort.org/pub-bin/oinkmaster.cgi/<oinkcode>/snortrules-snapshot-2.4.tar.gz
-
-# Example for Snort-current ("current" means cvs snapshots).
-#url = http://www.snort.org/pub-bin/oinkmaster.cgi/<oinkcode>/snortrules-snapshot-CURRENT.tar.gz
-
-# Example for Community rules
-# url = http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rul...
-
-# Example for rules from the Bleeding Snort project
-# url = http://www.bleedingsnort.com/bleeding.rules.tar.gz
-
-# If you prefer to download the rules archive from outside Oinkmaster,
-# you can then point to the file on your local filesystem by using
-# file://<filename>, for example:
-# url = file:///tmp/snortrules.tar.gz
-
-# In rare cases you may want to grab the rules directly from a
-# local directory (don't confuse this with the output directory).
-# url = dir:///etc/snort/src/rules
-
-# Example to use scp to copy the rules archive from another host.
-# Only OpenSSH is tested. See the FAQ for more information.
-# url = scp://user@somehost.example.com:/somedir/snortrules.tar.gz
-
-# If you use -u scp://... and need to specify a private ssh key (passed 
-# as -i <key> to the scp command) you can specify it here or add an 
-# entry in ~/.ssh/config for the Oinkmaster user as described in the 
-# OpenSSH manual. 
-# scp_key = /home/oinkmaster/oinkmaster_privkey
-
-
-# The PATH to use during execution. If you prefer to use external 
-# binaries (i.e. use_external_bins=1, see below), tar and gzip must be 
-# found, and also wget if downloading via ftp, http or https. All with 
-# optional .exe suffix. If you're on Cygwin, make sure that the path 
-# contains the Cygwin binaries and not the native Win32 binaries or 
-# you will get problems.
-# Assume UNIX style by default:
-path = /bin:/usr/bin:/usr/local/bin
-
-# Example if running native Win32 or standalone Cygwin:
-# path = c:\oinkmaster;c:\oinkmaster\bin
-
-# Example if running standalone Cygwin and you prefer Cygwin style path:
-# path = /cygdrive/c/oinkmaster:/cygdrive/c/oinkmaster/bin
-
-
-# We normally use external binaries (wget, tar and gzip) since they're 
-# already available on most systems and do a good job. If you have the 
-# Perl modules Archive::Tar, IO::Zlib and LWP::UserAgent, you can use
-# those instead if you like. You can set use_external_bins below to 
-# choose which method you prefer. It's set to 0 by default on Win32 
-# (i.e. use Perl modules), and 1 on other systems (i.e. use external 
-# binaries). The reason for that is that the required Perl modules
-# are included on Windows/ActivePerl 5.8.1+, so it's easier to use 
-# those than to install the ported Unix tools. (Note that if you're 
-# using scp to download the archive, external scp  binary is still 
-# used.) 
-# use_external_bins = 0
-
-
-# Temporary directory to use. This directory must exist when starting and
-# Oinkmaster will then create a temporary sub directory in here.
-# Keep it as a #comment if you want to use the default.
-# The default will be checked for in the environment variables TMP,
-# TMPDIR or TEMPDIR, or otherwise use "/tmp" if none of them was set.
-
-# Example for UNIX.
-# tmpdir = /home/oinkmaster/tmp/
-
-# Example if running native Win32 or Cygwin.
-# tmpdir = c:\tmp
-
-# Example if running Cygwin and you prefer Cygwin style path.
-# tmpdir = /cygdrive/c/tmp
-
-
-# The umask to use during execution if you want it to be something
-# else than the current value when starting Oinkmaster.
-# This will affect the mode bits when writing new files.
-# Keep it commented out to keep your system's current umask.
-# umask = 0027
-
-
-# Files in the archive(s) matching this regular expression will be 
-# checked for changes, and then updated or added if needed.
-# All other files will be ignored. You can then choose to skip
-# individual files by specifying the "skipfile" keyword below.
-# Normally you shouldn't need to change this one.
-update_files = .rules$|.config$|.conf$|.txt$|.map$
-
-
-# Regexp of keywords that starts a Snort rule.
-# May be useful if you create your own ruletypes and want those
-# lines to be regarded as rules as well.
-# rule_actions = alert|drop|log|pass|reject|sdrop|activate|dynamic
-
-
-# If the number of rules files in the downloaded archive matching the
-# 'update_files' regexp is below min_files, or if the number
-# of rules is below min_rules, the rules are regarded as broken
-# and the update is aborted with an error message.
-# Both are set to 1 by default (i.e. the archive is only regarded as
-# broken if it's totally empty).
-# If you download from multiple URLs, the count is the total number
-# of files/rules across all archives.
-# min_files = 1
-# min_rules = 1
-
-
-# By default, a basic sanity check is performed on most paths/filenames 
-# to see if they contain illegal characters that may screw things up. 
-# If this check is too strict for your system (e.g. you get bogus 
-# "illegal characters in filename" errors because of your local language 
-# etc) and you're sure you want to disable the checks completely,
-# set use_path_checks to 0.
-# use_path_checks = 1
-
-
-# If you want Oinkmaster to send a User-Agent HTTP header string
-# other than the default one for wget/LWP, set this variable.
-# user_agent = Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)
-
-
-# You can include other files anywhere in here by using
-# "include <file>". <file> will be parsed just like a regular 
-# oinkmaster.conf as soon as the include statement is seen, and then 
-# return and continue parsing the rest of the original file. If an 
-# option is redefined, it will override the previous value. You can use 
-# as many "include" statements as you wish, and also include even more 
-# files from included files. Example to load stuff from "/etc/foo.conf".
-# include /etc/foo.conf
-
-# Include file for provider specific includes.
-include /var/ipfire/suricata/oinkmaster-provider-includes.conf
-
-# Include file which defines the runmode of suricata.
-include /var/ipfire/suricata/oinkmaster-modify-sids.conf
-
-#######################################################################
-# Files to totally skip (i.e. never update or check for changes)      #
-#                                                                     #
-# Syntax: skipfile filename                                           #
-# or:     skipfile filename1, filename2, filename3, ...               #
-#######################################################################
-
-# Ignore local.rules from the rules archive by default since we might 
-# have put some local rules in our own local.rules and we don't want it 
-# to get overwritten by the empty one from the archive after each 
-# update.
-skipfile local.rules
-
-# The file deleted.rules contains rules that have been deleted from 
-# other files, so there is usually no point in updating it.
-skipfile deleted.rules
-
-# Also skip snort.conf by default since we don't want to overwrite our 
-# own snort.conf if we have it in the same directory as the rules. If 
-# you have your own production copy of snort.conf in another directory, 
-# it may be really nice to check for changes in this file though, 
-# especially since variables are sometimes added or modified and 
-# new/old files are included/excluded.
-#skipfile snort.conf
-
-# You may want to consider ignoring threshold.conf for the same reasons 
-# as for snort.conf, i.e. if you customize it locally and don't want it 
-# to become overwritten by the default one. It may be better to put 
-# local thresholding/suppressing in some local file and still update 
-# and use the official one though, in case important stuff is added to 
-# it some day. We do update it by default, but it's your call.
-skipfile threshold.conf
-
-# If you update from multiple URLs at the same time you may need to 
-# ignore the sid-msg.map (and generate it yourself if you need one) as 
-# it's usually included in each rules tarball. See the FAQ for more info.
-# skipfile sid-msg.map
-
-
-
-##########################################################################
-# SIDs to modify after each update (only for the skilled/stupid/brave).  #
-# Don't use it unless you have to. There is nothing that stops you from  #
-# modifying rules in such ways that they become invalid or generally     #
-# break things. You have been warned.                                    #
-# If you just want to disable SIDs, please skip this section and have a  #
-# look at the "disablesid" keyword below.                                #
-#                                                                        #
-# You may specify multiple modifysid directives for the same SID (they   #
-# will be processed in order of appearance), and you may also specify a  #
-# list of SIDs on which the substitution should be applied.              #
-# If the argument is in the form something.something it's regarded       #
-# as a filename and the substitution will apply on all rules in that     #
-# file. The wildcard ("*") can be used to apply the substitution on all  #
-# rules regardless of the SID or file. Please avoid using #comments      #
-# at the end of modifysid lines, they may confuse the parser in some     #
-# situations.                                                            #
-#                                                                        #
-# Syntax:                                                                #
-#   modifysid SID "replacethis" | "withthis"                             #    
-# or:                                                                    #
-#   modifysid SID1, SID2, SID3, ... "replacethis" | "withthis"           #
-# or:                                                                    #
-#   modifysid file "replacethis" | "withthis"                            #    
-# or:                                                                    #
-#   modifysid * "replacethis" | "withthis"                               #
-#                                                                        #
-# The strings within the quotes will basically be passed to a            #
-# s/replacethis/withthis/ statement in Perl, so they must be valid       #
-# regular expressions. The strings are case-insensitive and only the     #
-# first occurrence will be replaced. If there are multiple occurrences   #
-# you want to replace, simply repeat the same modifysid line.            #
-# As the strings are regular expressions, you MUST escape special        #
-# characters like $ \ / ( ) | by prepending a "" to them.               #
-#                                                                        #
-# If you specify a modifysid statement for a multi-line rule, Oinkmaster #
-# will first translate the rule into a single-line version and then      #
-# perform the substitution, so you don't have to care about the trailing #
-# backslashes and newlines.                                              #
-#                                                                        #
-# If you use backreference variables in the substitution expression,     #
-# it's strongly recommended to specify them as ${1} instead of $1 and so #
-# on, to avoid parsing confusion with unexpected results in some         #
-# situations. Note that modifysid statements will process both active    #
-# and inactive (disabled) rules.                                         #
-#                                                                        #
-# You may want to check out README.templates and template-examples.conf  #
-# to find how you can simplify the modifysid usage by using templates.   #
-##########################################################################
-
-# Example to enable a rule (in this case SID 1325) that is disabled by
-# default, by simply replacing leading "#alert" with "alert".
-# (You should really use 'enablesid' for this though.)
-# Oinkmaster removes whitespaces next to the leading "#" so you don't
-# have to worry about that, but be careful about possible whitespace in
-# other places when writing the regexps.
-# modifysid 1325 "^#alert" | "alert"
-
-# You could also do this to enable it no matter what type of rule it is
-# (alert, log, pass, etc).
-# modifysid 1325 "^#" | ""
-
-# Example to add "tag" stuff to SID 1325.
-# modifysid 1325 "sid:1325;" | "sid:1325; tag: host, src, 300, seconds;"
-
-# Example to make SID 1378 a 'drop' rule (valid if you're running 
-# Snort_inline).
-# modifysid 1378 "^alert" | "drop"
-
-# Example to replace first occurrence of $EXTERNAL_NET with $HOME_NET 
-# in SID 302.
-# modifysid 302 "$EXTERNAL_NET" | "$HOME_NET"
-
-# You can also specify that a substitution should apply on multiple SIDs.
-# modifysid 302,429,1821 "$EXTERNAL_NET" | "$HOME_NET"
-
-# You can take advantage of the fact that it's regular expressions and
-# do more complex stuff. This example (for Snort_inline) adds a 'replace'
-# statement to SID 1324 that replaces "/bin/sh" with "/foo/sh".
-# modifysid 1324 "(content\s*:\s*"/bin/sh"\s*;)" | \
-#                "${1} replace:"/foo/sh";"
-
-# If you for some reason would like to add a comment inside the actual 
-# rules file, like the reason why you disabled this rule, you can do 
-# like this (you would normally add such comments in oinkmaster.conf 
-# though).
-# modifysid 1324 "(.+)" | "# 20020101: disabled this rule just for fun:\n#${1}"
-
-# Here is an example that is actually useful. Let's say you don't care 
-# about incoming welchia pings (detected by SID 483 at the time of 
-# writing) but you want to know when infected hosts on your network 
-# scans hosts on the outside. (Remember that watching for outgoing 
-# malicious packets is often just as important as watching for incoming 
-# ones, especially in this case.) The rule currently looks like
-# "alert icmp $EXTERNAL_NET any -> $HOME_NET any ..."
-# but we want to switch that so it becomes
-# "alert icmp $HOME_NET any -> $EXTERNAL_NET any ...".
-# Here is how it could be done.
-# modifysid 483 \
-# "(.+) $EXTERNAL_NET (.+) $HOME_NET (.+)" | \
-# "${1} $HOME_NET ${2} $EXTERNAL_NET ${3}"
-
-# The wildcard (modifysid * ...) can be used to do all kinds of 
-# interesting things. The substitution expression will be applied on all 
-# matching rules. First, a silly example to replace "foo" with "bar" in 
-# all rules (that have the string "foo" in them, that is.) 
-# modifysid * "foo" | "bar"
-
-# If you for some reason don't want to use the stream preprocessor to 
-# match established streams, you may want to replace the 'flow' 
-# statement with 'flags:A+;' in all those rules.
-# modifysid * "flow:[a-z,_ ]+;" | "flags:A+;"
-
-# Example to convert all rules of classtype attempted-admin to 'drop' 
-# rules (for Snort_inline only, obviously).
-# modifysid * "^alert (.*classtype\s*:\s*attempted-admin)" | "drop ${1}"
-
-# This one will append some text to the 'msg' string for all rules that 
-# have the 'tag' keyword in them.
-# modifysid * "(.*msg:\s*".+?)"(\s*;.+;\s*tag:.*)" | \
-#             "${1}, going to tag this baby"${2}"
-
-# There may be times when you want to replace multiple occurrences of a 
-# certain keyword/string in a rule and not just the first one. To 
-# replace the first two occurrences of "foo" with "bar" in SID 100, 
-# simply repeat the modifysid statement:
-# modifysid 100 "foo" | "bar"
-# modifysid 100 "foo" | "bar"
- 
-# Or you can even specify a SID list but repeat the same SID as many 
-# times as required, like:
-# modifysid 100,100,100 "foo" | "bar"
-
-# Enable all rules in the file exploit.rules.
-# modifysid exploit.rules "^#" | ""
-
-# Enable all rules in exploit.rules, icmp-info.rules and also SID 1171.
-# modifysid exploit.rules, snmp.rules, 1171 "^#" | ""
-
-
-
-########################################################################
-# SIDs that we don't want to update.                                   #
-# If you for some reason don't want a specific rule to be updated      #
-# (e.g. you made local modifications to it and you never want to       #
-# update it and don't care about changes in the official version), you #
-# can specify a "localsid" statement for it. This means that the old   #
-# version of the rule (i.e. the one in the rules file on your          #
-# harddrive) is always kept, regardless if the official version has    #
-# been updated. Please do not use this feature unless in special       #
-# cases as it's easy to end up with many signatures that aren't        #
-# maintained anymore. See the FAQ for details about this and hints     #
-# about better solutions regarding customization of rules.             #
-#                                                                      #
-# Syntax:  localsid SID                                                #
-# or:      localsid SID1, SID2, SID3, ...                              #
-########################################################################
-
-# Example to never update SID 1325.
-# localsid 1325
-
-
-
-########################################################################
-# SIDs to enable after each update.                                    #
-# Will simply remove all the leading '#' for a specified SID (if it's  #
-# a multi-line rule, the leading '#' for all lines are removed.)       #
-# These will be processed after all the modifysid and disablesid       #
-# statements. Using 'enablesid' on a rule that is not disabled is a    #
-# NOOP.                                                                #
-#                                                                      #
-# Syntax:  enablesid SID                                               #
-# or:      enablesid SID1, SID2, SID3, ...                             #
-########################################################################
-
-# Example to enable SID 1325.
-# enablesid 1325
-
-
-
-########################################################################
-# SIDs to comment out, i.e. disable, after each update by placing a    #
-# '#' in front of the rule (if it's a multi-line rule, it will be put  #
-# in front of all lines).                                              #
-#                                                                      #
-# Syntax:  disablesid SID                                              #
-# or:      disablesid SID1, SID2, SID3, ...                            #
-########################################################################
-
-# You can specify one SID per line.
-# disablesid 1
-# disablesid 2
-# disablesid 3
-
-# And also as comma-separated lists.
-# disablesid 4,5,6
-
-# It's a good idea to also add comment about why you disable the sid:
-# disablesid 1324    # 20020101: disabled this SID just because I can
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index df3df4f47..0d41c90e5 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -274,24 +274,24 @@ usr/bin/nsupdate
 #usr/include/pk11/site.h
 #usr/include/pkcs11
 #usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.27.so
+usr/lib/libbind9-9.16.28.so
 #usr/lib/libbind9.la
 #usr/lib/libbind9.so
-usr/lib/libdns-9.16.27.so
+usr/lib/libdns-9.16.28.so
 #usr/lib/libdns.la
 #usr/lib/libdns.so
-usr/lib/libirs-9.16.27.so
+usr/lib/libirs-9.16.28.so
 #usr/lib/libirs.la
 #usr/lib/libirs.so
-usr/lib/libisc-9.16.27.so
+usr/lib/libisc-9.16.28.so
 #usr/lib/libisc.la
 #usr/lib/libisc.so
-usr/lib/libisccc-9.16.27.so
+usr/lib/libisccc-9.16.28.so
 #usr/lib/libisccc.la
 #usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.27.so
+usr/lib/libisccfg-9.16.28.so
 #usr/lib/libisccfg.la
 #usr/lib/libisccfg.so
-usr/lib/libns-9.16.27.so
+usr/lib/libns-9.16.28.so
 #usr/lib/libns.la
 #usr/lib/libns.so
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index da18e3f29..044713ec6 100644
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -4,6 +4,7 @@ usr/bin/curl
 #usr/include/curl/curl.h
 #usr/include/curl/curlver.h
 #usr/include/curl/easy.h
+#usr/include/curl/header.h
 #usr/include/curl/mprintf.h
 #usr/include/curl/multi.h
 #usr/include/curl/options.h
@@ -14,7 +15,7 @@ usr/bin/curl
 #usr/lib/libcurl.la
 #usr/lib/libcurl.so
 usr/lib/libcurl.so.4
-usr/lib/libcurl.so.4.7.0
+usr/lib/libcurl.so.4.8.0
 #usr/lib/pkgconfig/libcurl.pc
 #usr/share/aclocal/libcurl.m4
 #usr/share/man/man1/curl-config.1
@@ -407,7 +408,9 @@ usr/lib/libcurl.so.4.7.0
 #usr/share/man/man3/curl_easy_duphandle.3
 #usr/share/man/man3/curl_easy_escape.3
 #usr/share/man/man3/curl_easy_getinfo.3
+#usr/share/man/man3/curl_easy_header.3
 #usr/share/man/man3/curl_easy_init.3
+#usr/share/man/man3/curl_easy_nextheader.3
 #usr/share/man/man3/curl_easy_option_by_id.3
 #usr/share/man/man3/curl_easy_option_by_name.3
 #usr/share/man/man3/curl_easy_option_next.3
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index 9901085f2..3911aa90b 100644
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -2,20 +2,20 @@
 #usr/include/expat.h
 #usr/include/expat_config.h
 #usr/include/expat_external.h
-#usr/lib/cmake/expat-2.4.6
-#usr/lib/cmake/expat-2.4.6/expat-config-version.cmake
-#usr/lib/cmake/expat-2.4.6/expat-config.cmake
-#usr/lib/cmake/expat-2.4.6/expat-noconfig.cmake
-#usr/lib/cmake/expat-2.4.6/expat.cmake
+#usr/lib/cmake/expat-2.4.8
+#usr/lib/cmake/expat-2.4.8/expat-config-version.cmake
+#usr/lib/cmake/expat-2.4.8/expat-config.cmake
+#usr/lib/cmake/expat-2.4.8/expat-noconfig.cmake
+#usr/lib/cmake/expat-2.4.8/expat.cmake
 #usr/lib/libexpat.la
 #usr/lib/libexpat.so
 usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.8.6
+#usr/lib/libexpat.so.1.8.8
 #usr/lib/pkgconfig/expat.pc
 #usr/share/doc/expat
-#usr/share/doc/expat-2.4.6
-#usr/share/doc/expat-2.4.6/ok.min.css
-#usr/share/doc/expat-2.4.6/reference.html
-#usr/share/doc/expat-2.4.6/style.css
+#usr/share/doc/expat-2.4.8
+#usr/share/doc/expat-2.4.8/ok.min.css
+#usr/share/doc/expat-2.4.8/reference.html
+#usr/share/doc/expat-2.4.8/style.css
 #usr/share/doc/expat/AUTHORS
 #usr/share/doc/expat/changelog
diff --git a/config/rootfiles/common/fmt b/config/rootfiles/common/fmt
new file mode 100644
index 000000000..d9067f14a
--- /dev/null
+++ b/config/rootfiles/common/fmt
@@ -0,0 +1,23 @@
+#usr/include/fmt
+#usr/include/fmt/args.h
+#usr/include/fmt/chrono.h
+#usr/include/fmt/color.h
+#usr/include/fmt/compile.h
+#usr/include/fmt/core.h
+#usr/include/fmt/format-inl.h
+#usr/include/fmt/format.h
+#usr/include/fmt/locale.h
+#usr/include/fmt/os.h
+#usr/include/fmt/ostream.h
+#usr/include/fmt/printf.h
+#usr/include/fmt/ranges.h
+#usr/include/fmt/xchar.h
+#usr/lib/cmake/fmt
+#usr/lib/cmake/fmt/fmt-config-version.cmake
+#usr/lib/cmake/fmt/fmt-config.cmake
+#usr/lib/cmake/fmt/fmt-targets-release.cmake
+#usr/lib/cmake/fmt/fmt-targets.cmake
+#usr/lib/libfmt.so
+#usr/lib/libfmt.so.8
+#usr/lib/libfmt.so.8.1.1
+#usr/lib/pkgconfig/fmt.pc
diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype
index ceb06b4d6..e7d8e9ff9 100644
--- a/config/rootfiles/common/freetype
+++ b/config/rootfiles/common/freetype
@@ -51,6 +51,7 @@
 #usr/include/freetype2/freetype/fttrigon.h
 #usr/include/freetype2/freetype/fttypes.h
 #usr/include/freetype2/freetype/ftwinfnt.h
+#usr/include/freetype2/freetype/otsvg.h
 #usr/include/freetype2/freetype/t1tables.h
 #usr/include/freetype2/freetype/ttnameid.h
 #usr/include/freetype2/freetype/tttables.h
@@ -59,7 +60,7 @@
 #usr/lib/libfreetype.la
 #usr/lib/libfreetype.so
 usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.18.1
+usr/lib/libfreetype.so.6.18.3
 #usr/lib/pkgconfig/freetype2.pc
 #usr/share/aclocal/freetype2.m4
 #usr/share/man/man1/freetype-config.1
diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz
index 0bf04184c..68269bae0 100644
--- a/config/rootfiles/common/harfbuzz
+++ b/config/rootfiles/common/harfbuzz
@@ -30,6 +30,7 @@
 #usr/include/harfbuzz/hb-shape-plan.h
 #usr/include/harfbuzz/hb-shape.h
 #usr/include/harfbuzz/hb-style.h
+#usr/include/harfbuzz/hb-subset-repacker.h
 #usr/include/harfbuzz/hb-subset.h
 #usr/include/harfbuzz/hb-unicode.h
 #usr/include/harfbuzz/hb-version.h
@@ -39,11 +40,11 @@
 #usr/lib/libharfbuzz-subset.la
 #usr/lib/libharfbuzz-subset.so
 usr/lib/libharfbuzz-subset.so.0
-usr/lib/libharfbuzz-subset.so.0.30400.0
+usr/lib/libharfbuzz-subset.so.0.40200.0
 #usr/lib/libharfbuzz.la
 #usr/lib/libharfbuzz.so
 usr/lib/libharfbuzz.so.0
-usr/lib/libharfbuzz.so.0.30400.0
+usr/lib/libharfbuzz.so.0.40200.0
 #usr/lib/pkgconfig/harfbuzz-subset.pc
 #usr/lib/pkgconfig/harfbuzz.pc
 #usr/share/gtk-doc/html/harfbuzz
@@ -84,7 +85,6 @@ usr/lib/libharfbuzz.so.0.30400.0
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-5-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-6-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-7-2.html
-#usr/share/gtk-doc/html/harfbuzz/api-index-1-7-5.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-7-7.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-8-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-1-8-1.html
@@ -109,6 +109,9 @@ usr/lib/libharfbuzz.so.0.30400.0
 #usr/share/gtk-doc/html/harfbuzz/api-index-3-1-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-3-3-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-3-4-0.html
+#usr/share/gtk-doc/html/harfbuzz/api-index-4-0-0.html
+#usr/share/gtk-doc/html/harfbuzz/api-index-4-1-0.html
+#usr/share/gtk-doc/html/harfbuzz/api-index-4-2-0.html
 #usr/share/gtk-doc/html/harfbuzz/api-index-full.html
 #usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html
 #usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
@@ -131,6 +134,7 @@ usr/lib/libharfbuzz.so.0.30400.0
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-directwrite.html
+#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-draw.html
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html
 #usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html
diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
index 84703391f..5cea7ad22 100644
--- a/config/rootfiles/common/ipset
+++ b/config/rootfiles/common/ipset
@@ -18,11 +18,14 @@ etc/ipset
 #usr/include/libipset/transport.h
 #usr/include/libipset/types.h
 #usr/include/libipset/utils.h
+#usr/include/libipset/xlate.h
 #usr/lib/libipset.la
 #usr/lib/libipset.so
 usr/lib/libipset.so.13
-usr/lib/libipset.so.13.2.0
+usr/lib/libipset.so.13.3.0
 #usr/lib/pkgconfig/libipset.pc
 usr/sbin/ipset
+#usr/sbin/ipset-translate
 #usr/share/man/man3/libipset.3
+#usr/share/man/man8/ipset-translate.8
 #usr/share/man/man8/ipset.8
diff --git a/config/rootfiles/common/libaio b/config/rootfiles/common/libaio
index bc4ddf0de..336409932 100644
--- a/config/rootfiles/common/libaio
+++ b/config/rootfiles/common/libaio
@@ -2,4 +2,4 @@
 #usr/lib/libaio.a
 #usr/lib/libaio.so
 usr/lib/libaio.so.1
-usr/lib/libaio.so.1.0.1
+usr/lib/libaio.so.1.0.2
diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart
deleted file mode 100644
index 7e98a600d..000000000
--- a/config/rootfiles/common/libart
+++ /dev/null
@@ -1,53 +0,0 @@
-#usr/bin/libart2-config
-#usr/include/libart-2.0
-#usr/include/libart-2.0/libart_lgpl
-#usr/include/libart-2.0/libart_lgpl/art_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h
-#usr/include/libart-2.0/libart_lgpl/art_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_config.h
-#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h
-#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_misc.h
-#usr/include/libart-2.0/libart_lgpl/art_pathcode.h
-#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h
-#usr/include/libart-2.0/libart_lgpl/art_point.h
-#usr/include/libart-2.0/libart_lgpl/art_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_render.h
-#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h
-#usr/include/libart-2.0/libart_lgpl/art_render_mask.h
-#usr/include/libart-2.0/libart_lgpl/art_render_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgba.h
-#usr/include/libart-2.0/libart_lgpl/art_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_point.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h
-#usr/include/libart-2.0/libart_lgpl/art_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h
-#usr/include/libart-2.0/libart_lgpl/libart-features.h
-#usr/include/libart-2.0/libart_lgpl/libart.h
-#usr/lib/libart_lgpl_2.a
-#usr/lib/libart_lgpl_2.la
-usr/lib/libart_lgpl_2.so
-usr/lib/libart_lgpl_2.so.2
-usr/lib/libart_lgpl_2.so.2.3.21
-#usr/lib/pkgconfig/libart-2.0.pc
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 0c57c9120..1e104acf6 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,10 +1,8 @@
-#lib/libcap.a
 lib/libcap.so.2
-lib/libcap.so.2.63
-#lib/libpsx.a
+lib/libcap.so.2.64
 #lib/libpsx.so
 #lib/libpsx.so.2
-#lib/libpsx.so.2.63
+lib/libpsx.so.2.64
 #lib/pkgconfig/libcap.pc
 #lib/pkgconfig/libpsx.pc
 lib/security/pam_cap.so
diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet
deleted file mode 100644
index 26288de23..000000000
--- a/config/rootfiles/common/libdnet
+++ /dev/null
@@ -1,26 +0,0 @@
-usr/bin/dnet-config
-#usr/include/dnet
-#usr/include/dnet.h
-#usr/include/dnet/addr.h
-#usr/include/dnet/arp.h
-#usr/include/dnet/blob.h
-#usr/include/dnet/eth.h
-#usr/include/dnet/fw.h
-#usr/include/dnet/icmp.h
-#usr/include/dnet/intf.h
-#usr/include/dnet/ip.h
-#usr/include/dnet/ip6.h
-#usr/include/dnet/os.h
-#usr/include/dnet/rand.h
-#usr/include/dnet/route.h
-#usr/include/dnet/sctp.h
-#usr/include/dnet/tcp.h
-#usr/include/dnet/tun.h
-#usr/include/dnet/udp.h
-usr/lib/libdnet.la
-#usr/lib/libdnet.so
-usr/lib/libdnet.so.1
-usr/lib/libdnet.so.1.0.1
-#usr/man/man3/dnet.3
-#usr/man/man8/dnet.8
-usr/sbin/dnet
diff --git a/config/rootfiles/common/libevent b/config/rootfiles/common/libevent
deleted file mode 100644
index 77bbade2e..000000000
--- a/config/rootfiles/common/libevent
+++ /dev/null
@@ -1,24 +0,0 @@
-#usr/bin/event_rpcgen.py
-#usr/include/evdns.h
-#usr/include/event-config.h
-#usr/include/event.h
-#usr/include/evhttp.h
-#usr/include/evrpc.h
-#usr/include/evutil.h
-usr/lib/libevent-1.4.so.2
-usr/lib/libevent-1.4.so.2.2.0
-#usr/lib/libevent.a
-#usr/lib/libevent.la
-#usr/lib/libevent.so
-usr/lib/libevent_core-1.4.so.2
-usr/lib/libevent_core-1.4.so.2.2.0
-#usr/lib/libevent_core.a
-#usr/lib/libevent_core.la
-#usr/lib/libevent_core.so
-usr/lib/libevent_extra-1.4.so.2
-usr/lib/libevent_extra-1.4.so.2.2.0
-#usr/lib/libevent_extra.a
-#usr/lib/libevent_extra.la
-#usr/lib/libevent_extra.so
-#usr/share/man/man3/evdns.3
-#usr/share/man/man3/event.3
diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt
index 8ca5cb325..8e7f74392 100644
--- a/config/rootfiles/common/libgcrypt
+++ b/config/rootfiles/common/libgcrypt
@@ -6,7 +6,7 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.3.4
+usr/lib/libgcrypt.so.20.4.1
 #usr/lib/pkgconfig/libgcrypt.pc
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
diff --git a/config/rootfiles/common/libnl b/config/rootfiles/common/libnl
deleted file mode 100644
index 960e1c827..000000000
--- a/config/rootfiles/common/libnl
+++ /dev/null
@@ -1,60 +0,0 @@
-#usr/include/netlink
-#usr/include/netlink/addr.h
-#usr/include/netlink/attr.h
-#usr/include/netlink/cache-api.h
-#usr/include/netlink/cache.h
-#usr/include/netlink/data.h
-#usr/include/netlink/fib_lookup
-#usr/include/netlink/fib_lookup/lookup.h
-#usr/include/netlink/fib_lookup/request.h
-#usr/include/netlink/genl
-#usr/include/netlink/genl/ctrl.h
-#usr/include/netlink/genl/family.h
-#usr/include/netlink/genl/genl.h
-#usr/include/netlink/genl/mngt.h
-#usr/include/netlink/handlers.h
-#usr/include/netlink/list.h
-#usr/include/netlink/msg.h
-#usr/include/netlink/netlink-compat.h
-#usr/include/netlink/netlink-kernel.h
-#usr/include/netlink/netlink.h
-#usr/include/netlink/object-api.h
-#usr/include/netlink/object.h
-#usr/include/netlink/route
-#usr/include/netlink/route/addr.h
-#usr/include/netlink/route/class-modules.h
-#usr/include/netlink/route/class.h
-#usr/include/netlink/route/classifier-modules.h
-#usr/include/netlink/route/classifier.h
-#usr/include/netlink/route/cls
-#usr/include/netlink/route/cls/fw.h
-#usr/include/netlink/route/cls/police.h
-#usr/include/netlink/route/cls/u32.h
-#usr/include/netlink/route/link.h
-#usr/include/netlink/route/neighbour.h
-#usr/include/netlink/route/neightbl.h
-#usr/include/netlink/route/nexthop.h
-#usr/include/netlink/route/qdisc-modules.h
-#usr/include/netlink/route/qdisc.h
-#usr/include/netlink/route/route.h
-#usr/include/netlink/route/rtnl.h
-#usr/include/netlink/route/rule.h
-#usr/include/netlink/route/sch
-#usr/include/netlink/route/sch/cbq.h
-#usr/include/netlink/route/sch/dsmark.h
-#usr/include/netlink/route/sch/fifo.h
-#usr/include/netlink/route/sch/htb.h
-#usr/include/netlink/route/sch/netem.h
-#usr/include/netlink/route/sch/prio.h
-#usr/include/netlink/route/sch/red.h
-#usr/include/netlink/route/sch/sfq.h
-#usr/include/netlink/route/sch/tbf.h
-#usr/include/netlink/route/tc.h
-#usr/include/netlink/socket.h
-#usr/include/netlink/types.h
-#usr/include/netlink/utils.h
-#usr/lib/libnl.a
-usr/lib/libnl.so
-usr/lib/libnl.so.1
-usr/lib/libnl.so.1.1.4
-#usr/lib/pkgconfig/libnl-1.pc
diff --git a/config/rootfiles/common/libpipeline b/config/rootfiles/common/libpipeline
new file mode 100644
index 000000000..703d33e65
--- /dev/null
+++ b/config/rootfiles/common/libpipeline
@@ -0,0 +1,74 @@
+#usr/include/pipeline.h
+#usr/lib/libpipeline.la
+#usr/lib/libpipeline.so
+#usr/lib/libpipeline.so.1
+#usr/lib/libpipeline.so.1.5.6
+#usr/lib/pkgconfig/libpipeline.pc
+#usr/share/man/man3/libpipeline.3
+#usr/share/man/man3/pipecmd_arg.3
+#usr/share/man/man3/pipecmd_argf.3
+#usr/share/man/man3/pipecmd_args.3
+#usr/share/man/man3/pipecmd_argstr.3
+#usr/share/man/man3/pipecmd_argv.3
+#usr/share/man/man3/pipecmd_chdir.3
+#usr/share/man/man3/pipecmd_clearenv.3
+#usr/share/man/man3/pipecmd_discard_err.3
+#usr/share/man/man3/pipecmd_dump.3
+#usr/share/man/man3/pipecmd_dup.3
+#usr/share/man/man3/pipecmd_exec.3
+#usr/share/man/man3/pipecmd_fchdir.3
+#usr/share/man/man3/pipecmd_free.3
+#usr/share/man/man3/pipecmd_get_nargs.3
+#usr/share/man/man3/pipecmd_new.3
+#usr/share/man/man3/pipecmd_new_args.3
+#usr/share/man/man3/pipecmd_new_argstr.3
+#usr/share/man/man3/pipecmd_new_argv.3
+#usr/share/man/man3/pipecmd_new_function.3
+#usr/share/man/man3/pipecmd_new_passthrough.3
+#usr/share/man/man3/pipecmd_new_sequence.3
+#usr/share/man/man3/pipecmd_new_sequencev.3
+#usr/share/man/man3/pipecmd_nice.3
+#usr/share/man/man3/pipecmd_pre_exec.3
+#usr/share/man/man3/pipecmd_sequence_command.3
+#usr/share/man/man3/pipecmd_setenv.3
+#usr/share/man/man3/pipecmd_tostring.3
+#usr/share/man/man3/pipecmd_unsetenv.3
+#usr/share/man/man3/pipeline_command.3
+#usr/share/man/man3/pipeline_command_args.3
+#usr/share/man/man3/pipeline_command_argstr.3
+#usr/share/man/man3/pipeline_command_argv.3
+#usr/share/man/man3/pipeline_commands.3
+#usr/share/man/man3/pipeline_commandv.3
+#usr/share/man/man3/pipeline_connect.3
+#usr/share/man/man3/pipeline_dump.3
+#usr/share/man/man3/pipeline_free.3
+#usr/share/man/man3/pipeline_get_command.3
+#usr/share/man/man3/pipeline_get_infile.3
+#usr/share/man/man3/pipeline_get_ncommands.3
+#usr/share/man/man3/pipeline_get_outfile.3
+#usr/share/man/man3/pipeline_get_pid.3
+#usr/share/man/man3/pipeline_ignore_signals.3
+#usr/share/man/man3/pipeline_install_post_fork.3
+#usr/share/man/man3/pipeline_join.3
+#usr/share/man/man3/pipeline_new.3
+#usr/share/man/man3/pipeline_new_command_args.3
+#usr/share/man/man3/pipeline_new_command_argv.3
+#usr/share/man/man3/pipeline_new_commands.3
+#usr/share/man/man3/pipeline_new_commandv.3
+#usr/share/man/man3/pipeline_peek.3
+#usr/share/man/man3/pipeline_peek_size.3
+#usr/share/man/man3/pipeline_peek_skip.3
+#usr/share/man/man3/pipeline_peekline.3
+#usr/share/man/man3/pipeline_pump.3
+#usr/share/man/man3/pipeline_read.3
+#usr/share/man/man3/pipeline_readline.3
+#usr/share/man/man3/pipeline_run.3
+#usr/share/man/man3/pipeline_set_command.3
+#usr/share/man/man3/pipeline_start.3
+#usr/share/man/man3/pipeline_tostring.3
+#usr/share/man/man3/pipeline_wait.3
+#usr/share/man/man3/pipeline_wait_all.3
+#usr/share/man/man3/pipeline_want_in.3
+#usr/share/man/man3/pipeline_want_infile.3
+#usr/share/man/man3/pipeline_want_out.3
+#usr/share/man/man3/pipeline_want_outfile.3
diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat
deleted file mode 100644
index ca3007e9b..000000000
--- a/config/rootfiles/common/libusb-compat
+++ /dev/null
@@ -1,7 +0,0 @@
-#usr/bin/libusb-config
-#usr/include/usb.h
-usr/lib/libusb-0.1.so.4
-usr/lib/libusb-0.1.so.4.4.4
-#usr/lib/libusb.la
-usr/lib/libusb.so
-#usr/lib/pkgconfig/libusb.pc
diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index 4713fb971..8d18c5258 100644
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -33,6 +33,14 @@ lib/firmware/amd/amd_sev_fam17h_model0xh.sbin
 lib/firmware/amd/amd_sev_fam17h_model3xh.sbin
 lib/firmware/amd/amd_sev_fam19h_model0xh.sbin
 #lib/firmware/amdgpu
+lib/firmware/amdgpu/aldebaran_mec.bin
+lib/firmware/amdgpu/aldebaran_mec2.bin
+lib/firmware/amdgpu/aldebaran_rlc.bin
+lib/firmware/amdgpu/aldebaran_sdma.bin
+lib/firmware/amdgpu/aldebaran_smc.bin
+lib/firmware/amdgpu/aldebaran_sos.bin
+lib/firmware/amdgpu/aldebaran_ta.bin
+lib/firmware/amdgpu/aldebaran_vcn.bin
 lib/firmware/amdgpu/arcturus_asd.bin
 lib/firmware/amdgpu/arcturus_gpu_info.bin
 lib/firmware/amdgpu/arcturus_mec.bin
@@ -86,6 +94,7 @@ lib/firmware/amdgpu/cyan_skillfish2_pfp.bin
 lib/firmware/amdgpu/cyan_skillfish2_rlc.bin
 lib/firmware/amdgpu/cyan_skillfish2_sdma.bin
 lib/firmware/amdgpu/cyan_skillfish2_sdma1.bin
+lib/firmware/amdgpu/dcn_3_1_6_dmcub.bin
 lib/firmware/amdgpu/dimgrey_cavefish_ce.bin
 lib/firmware/amdgpu/dimgrey_cavefish_dmcub.bin
 lib/firmware/amdgpu/dimgrey_cavefish_me.bin
@@ -110,6 +119,12 @@ lib/firmware/amdgpu/fiji_sdma1.bin
 lib/firmware/amdgpu/fiji_smc.bin
 lib/firmware/amdgpu/fiji_uvd.bin
 lib/firmware/amdgpu/fiji_vce.bin
+lib/firmware/amdgpu/gc_10_3_7_ce.bin
+lib/firmware/amdgpu/gc_10_3_7_me.bin
+lib/firmware/amdgpu/gc_10_3_7_mec.bin
+lib/firmware/amdgpu/gc_10_3_7_mec2.bin
+lib/firmware/amdgpu/gc_10_3_7_pfp.bin
+lib/firmware/amdgpu/gc_10_3_7_rlc.bin
 lib/firmware/amdgpu/green_sardine_asd.bin
 lib/firmware/amdgpu/green_sardine_ce.bin
 lib/firmware/amdgpu/green_sardine_dmcub.bin
@@ -318,6 +333,9 @@ lib/firmware/amdgpu/polaris12_sdma1.bin
 lib/firmware/amdgpu/polaris12_smc.bin
 lib/firmware/amdgpu/polaris12_uvd.bin
 lib/firmware/amdgpu/polaris12_vce.bin
+lib/firmware/amdgpu/psp_13_0_8_asd.bin
+lib/firmware/amdgpu/psp_13_0_8_ta.bin
+lib/firmware/amdgpu/psp_13_0_8_toc.bin
 lib/firmware/amdgpu/raven2_asd.bin
 lib/firmware/amdgpu/raven2_ce.bin
 lib/firmware/amdgpu/raven2_gpu_info.bin
@@ -354,6 +372,7 @@ lib/firmware/amdgpu/renoir_rlc.bin
 lib/firmware/amdgpu/renoir_sdma.bin
 lib/firmware/amdgpu/renoir_ta.bin
 lib/firmware/amdgpu/renoir_vcn.bin
+lib/firmware/amdgpu/sdma_5_2_7.bin
 lib/firmware/amdgpu/si58_mc.bin
 lib/firmware/amdgpu/sienna_cichlid_ce.bin
 lib/firmware/amdgpu/sienna_cichlid_dmcub.bin
@@ -492,6 +511,10 @@ lib/firmware/amdgpu/yellow_carp_sdma.bin
 lib/firmware/amdgpu/yellow_carp_ta.bin
 lib/firmware/amdgpu/yellow_carp_toc.bin
 lib/firmware/amdgpu/yellow_carp_vcn.bin
+#lib/firmware/amphion
+#lib/firmware/amphion/vpu
+lib/firmware/amphion/vpu/vpu_fw_imx8_dec.bin
+lib/firmware/amphion/vpu/vpu_fw_imx8_enc.bin
 #lib/firmware/ar3k
 #lib/firmware/ar3k/1020200
 lib/firmware/ar3k/1020200/PS_ASIC.pst
@@ -547,17 +570,22 @@ lib/firmware/as102_data2_st.hex
 #lib/firmware/ath10k/QCA4019/hw1.0
 lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
 lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin
+#lib/firmware/ath10k/QCA4019/hw1.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA6174
 #lib/firmware/ath10k/QCA6174/hw2.1
 lib/firmware/ath10k/QCA6174/hw2.1/board-2.bin
 lib/firmware/ath10k/QCA6174/hw2.1/board.bin
 lib/firmware/ath10k/QCA6174/hw2.1/firmware-5.bin
+#lib/firmware/ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA6174/hw3.0
 lib/firmware/ath10k/QCA6174/hw3.0/board-2.bin
 lib/firmware/ath10k/QCA6174/hw3.0/board.bin
 lib/firmware/ath10k/QCA6174/hw3.0/firmware-4.bin
 lib/firmware/ath10k/QCA6174/hw3.0/firmware-6.bin
 lib/firmware/ath10k/QCA6174/hw3.0/firmware-sdio-6.bin
+#lib/firmware/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
+#lib/firmware/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
+#lib/firmware/ath10k/QCA6174/hw3.0/notice_ath10k_firmware-sdio-6.txt
 #lib/firmware/ath10k/QCA9377
 #lib/firmware/ath10k/QCA9377/hw1.0
 lib/firmware/ath10k/QCA9377/hw1.0/board-2.bin
@@ -565,34 +593,45 @@ lib/firmware/ath10k/QCA9377/hw1.0/board.bin
 lib/firmware/ath10k/QCA9377/hw1.0/firmware-5.bin
 lib/firmware/ath10k/QCA9377/hw1.0/firmware-6.bin
 lib/firmware/ath10k/QCA9377/hw1.0/firmware-sdio-5.bin
+#lib/firmware/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
+#lib/firmware/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-6.txt
+#lib/firmware/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-sdio-5.txt
 #lib/firmware/ath10k/QCA9887
 #lib/firmware/ath10k/QCA9887/hw1.0
 lib/firmware/ath10k/QCA9887/hw1.0/board.bin
 lib/firmware/ath10k/QCA9887/hw1.0/firmware-5.bin
+#lib/firmware/ath10k/QCA9887/hw1.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA9888
 #lib/firmware/ath10k/QCA9888/hw2.0
 lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
 lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
+#lib/firmware/ath10k/QCA9888/hw2.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA988X
 #lib/firmware/ath10k/QCA988X/hw2.0
 lib/firmware/ath10k/QCA988X/hw2.0/board.bin
 lib/firmware/ath10k/QCA988X/hw2.0/firmware-4.bin
 lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
+#lib/firmware/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-4.txt
+#lib/firmware/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA9984
 #lib/firmware/ath10k/QCA9984/hw1.0
 lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
+#lib/firmware/ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/QCA99X0
 #lib/firmware/ath10k/QCA99X0/hw2.0
 lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
 lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
+#lib/firmware/ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt
 #lib/firmware/ath10k/WCN3990
 lib/firmware/ath10k/WCN3990/hw1.0
 lib/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
+#lib/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
 lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
 lib/firmware/ath11k
 lib/firmware/ath11k/IPQ6018
 lib/firmware/ath11k/IPQ6018/hw1.0
+#lib/firmware/ath11k/IPQ6018/hw1.0/Notice.txt
 lib/firmware/ath11k/IPQ6018/hw1.0/board-2.bin
 lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.b00
 lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.b01
@@ -611,6 +650,7 @@ lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.flist
 lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.mdt
 lib/firmware/ath11k/IPQ8074
 lib/firmware/ath11k/IPQ8074/hw2.0
+#lib/firmware/ath11k/IPQ8074/hw2.0/Notice.txt
 lib/firmware/ath11k/IPQ8074/hw2.0/board-2.bin
 lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.b00
 lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.b01
@@ -629,9 +669,22 @@ lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.flist
 lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.mdt
 lib/firmware/ath11k/QCA6390
 lib/firmware/ath11k/QCA6390/hw2.0
+#lib/firmware/ath11k/QCA6390/hw2.0/Notice.txt
 lib/firmware/ath11k/QCA6390/hw2.0/amss.bin
 lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin
 lib/firmware/ath11k/QCA6390/hw2.0/m3.bin
+#lib/firmware/ath11k/WCN6855
+#lib/firmware/ath11k/WCN6855/hw2.0
+#lib/firmware/ath11k/WCN6855/hw2.0/Notice.txt
+lib/firmware/ath11k/WCN6855/hw2.0/amss.bin
+lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin
+lib/firmware/ath11k/WCN6855/hw2.0/m3.bin
+lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
+#lib/firmware/ath11k/WCN6855/hw2.1
+lib/firmware/ath11k/WCN6855/hw2.1/amss.bin
+lib/firmware/ath11k/WCN6855/hw2.1/board-2.bin
+lib/firmware/ath11k/WCN6855/hw2.1/m3.bin
+lib/firmware/ath11k/WCN6855/hw2.1/regdb.bin
 lib/firmware/ath3k-1.fw
 #lib/firmware/ath6k
 #lib/firmware/ath6k/AR6002
@@ -811,6 +864,7 @@ lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
 lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
 lib/firmware/brcm/brcmfmac43430-sdio.bin
 lib/firmware/brcm/brcmfmac43430-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt
 lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
 lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
 lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
@@ -837,8 +891,10 @@ lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
 lib/firmware/brcm/brcmfmac4356-pcie.bin
 lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
 lib/firmware/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+lib/firmware/brcm/brcmfmac4356-sdio.AP6356S.txt
 lib/firmware/brcm/brcmfmac4356-sdio.bin
 lib/firmware/brcm/brcmfmac4356-sdio.clm_blob
+lib/firmware/brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt
 lib/firmware/brcm/brcmfmac4356-sdio.khadas,vim2.txt
 lib/firmware/brcm/brcmfmac4356-sdio.vamrs,rock960.txt
 lib/firmware/brcm/brcmfmac43569.bin
@@ -883,6 +939,8 @@ lib/firmware/cis/SW_8xx_SER.cis
 lib/firmware/cis/tamarack.cis
 lib/firmware/cmmb_vega_12mhz.inp
 lib/firmware/cmmb_venice_12mhz.inp
+#lib/firmware/cnm
+lib/firmware/cnm/wave521c_j721s2_codec_fw.bin
 #lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
 lib/firmware/ct2fw-3.2.1.1.bin
@@ -916,15 +974,15 @@ lib/firmware/cxgb4/configs/t6-config-hashfilter.txt
 lib/firmware/cxgb4/t4-config.txt
 lib/firmware/cxgb4/t4fw-1.14.4.0.bin
 lib/firmware/cxgb4/t4fw-1.15.37.0.bin
-lib/firmware/cxgb4/t4fw-1.26.4.0.bin
+lib/firmware/cxgb4/t4fw-1.26.6.0.bin
 lib/firmware/cxgb4/t4fw.bin
 lib/firmware/cxgb4/t5-config.txt
 lib/firmware/cxgb4/t5fw-1.14.4.0.bin
 lib/firmware/cxgb4/t5fw-1.15.37.0.bin
-lib/firmware/cxgb4/t5fw-1.26.4.0.bin
+lib/firmware/cxgb4/t5fw-1.26.6.0.bin
 lib/firmware/cxgb4/t5fw.bin
 lib/firmware/cxgb4/t6-config.txt
-lib/firmware/cxgb4/t6fw-1.26.4.0.bin
+lib/firmware/cxgb4/t6fw-1.26.6.0.bin
 lib/firmware/cxgb4/t6fw.bin
 lib/firmware/cypress
 lib/firmware/cypress/cyfmac43012-sdio.bin
@@ -1032,7 +1090,9 @@ lib/firmware/i915/adlp_dmc_ver2_09.bin
 lib/firmware/i915/adlp_dmc_ver2_10.bin
 lib/firmware/i915/adlp_dmc_ver2_12.bin
 lib/firmware/i915/adlp_dmc_ver2_14.bin
+lib/firmware/i915/adlp_dmc_ver2_16.bin
 lib/firmware/i915/adlp_guc_62.0.3.bin
+lib/firmware/i915/adlp_guc_69.0.3.bin
 lib/firmware/i915/adls_dmc_ver2_01.bin
 lib/firmware/i915/bxt_dmc_ver1.bin
 lib/firmware/i915/bxt_dmc_ver1_07.bin
@@ -1040,6 +1100,7 @@ lib/firmware/i915/bxt_guc_32.0.3.bin
 lib/firmware/i915/bxt_guc_33.0.0.bin
 lib/firmware/i915/bxt_guc_49.0.1.bin
 lib/firmware/i915/bxt_guc_62.0.0.bin
+lib/firmware/i915/bxt_guc_69.0.3.bin
 lib/firmware/i915/bxt_guc_ver8_7.bin
 lib/firmware/i915/bxt_guc_ver9_29.bin
 lib/firmware/i915/bxt_huc_2.0.0.bin
@@ -1048,23 +1109,27 @@ lib/firmware/i915/bxt_huc_ver01_8_2893.bin
 lib/firmware/i915/cml_guc_33.0.0.bin
 lib/firmware/i915/cml_guc_49.0.1.bin
 lib/firmware/i915/cml_guc_62.0.0.bin
+lib/firmware/i915/cml_guc_69.0.3.bin
 lib/firmware/i915/cml_huc_4.0.0.bin
 lib/firmware/i915/cnl_dmc_ver1_06.bin
 lib/firmware/i915/cnl_dmc_ver1_07.bin
 lib/firmware/i915/dg1_dmc_ver2_02.bin
 lib/firmware/i915/dg1_guc_49.0.1.bin
 lib/firmware/i915/dg1_guc_62.0.0.bin
+lib/firmware/i915/dg1_guc_69.0.3.bin
 lib/firmware/i915/dg1_huc_7.7.1.bin
 lib/firmware/i915/dg1_huc_7.9.3.bin
 lib/firmware/i915/ehl_guc_33.0.4.bin
 lib/firmware/i915/ehl_guc_49.0.1.bin
 lib/firmware/i915/ehl_guc_62.0.0.bin
+lib/firmware/i915/ehl_guc_69.0.3.bin
 lib/firmware/i915/ehl_huc_9.0.0.bin
 lib/firmware/i915/glk_dmc_ver1_04.bin
 lib/firmware/i915/glk_guc_32.0.3.bin
 lib/firmware/i915/glk_guc_33.0.0.bin
 lib/firmware/i915/glk_guc_49.0.1.bin
 lib/firmware/i915/glk_guc_62.0.0.bin
+lib/firmware/i915/glk_guc_69.0.3.bin
 lib/firmware/i915/glk_huc_4.0.0.bin
 lib/firmware/i915/glk_huc_ver03_01_2893.bin
 lib/firmware/i915/icl_dmc_ver1_07.bin
@@ -1073,6 +1138,7 @@ lib/firmware/i915/icl_guc_32.0.3.bin
 lib/firmware/i915/icl_guc_33.0.0.bin
 lib/firmware/i915/icl_guc_49.0.1.bin
 lib/firmware/i915/icl_guc_62.0.0.bin
+lib/firmware/i915/icl_guc_69.0.3.bin
 lib/firmware/i915/icl_huc_9.0.0.bin
 lib/firmware/i915/icl_huc_ver8_4_3238.bin
 lib/firmware/i915/kbl_dmc_ver1.bin
@@ -1082,6 +1148,7 @@ lib/firmware/i915/kbl_guc_32.0.3.bin
 lib/firmware/i915/kbl_guc_33.0.0.bin
 lib/firmware/i915/kbl_guc_49.0.1.bin
 lib/firmware/i915/kbl_guc_62.0.0.bin
+lib/firmware/i915/kbl_guc_69.0.3.bin
 lib/firmware/i915/kbl_guc_ver9_14.bin
 lib/firmware/i915/kbl_guc_ver9_39.bin
 lib/firmware/i915/kbl_huc_4.0.0.bin
@@ -1096,6 +1163,7 @@ lib/firmware/i915/skl_guc_32.0.3.bin
 lib/firmware/i915/skl_guc_33.0.0.bin
 lib/firmware/i915/skl_guc_49.0.1.bin
 lib/firmware/i915/skl_guc_62.0.0.bin
+lib/firmware/i915/skl_guc_69.0.3.bin
 lib/firmware/i915/skl_guc_ver1.bin
 lib/firmware/i915/skl_guc_ver4.bin
 lib/firmware/i915/skl_guc_ver6.bin
@@ -1110,6 +1178,7 @@ lib/firmware/i915/tgl_dmc_ver2_12.bin
 lib/firmware/i915/tgl_guc_35.2.0.bin
 lib/firmware/i915/tgl_guc_49.0.1.bin
 lib/firmware/i915/tgl_guc_62.0.0.bin
+lib/firmware/i915/tgl_guc_69.0.3.bin
 lib/firmware/i915/tgl_huc_7.0.12.bin
 lib/firmware/i915/tgl_huc_7.0.3.bin
 lib/firmware/i915/tgl_huc_7.5.0.bin
@@ -1224,7 +1293,9 @@ lib/firmware/intel/ibt-hw-37.8.bseq
 #lib/firmware/intel/ice
 #lib/firmware/intel/ice/ddp
 lib/firmware/intel/ice/ddp-comms
-lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.20.0.pkg
+lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.31.0.pkg
+lib/firmware/intel/ice/ddp-wireless_edge
+lib/firmware/intel/ice/ddp-wireless_edge/ice_wireless_edge-1.3.7.0.pkg
 lib/firmware/intel/ice/ddp/ice-1.3.26.0.pkg
 lib/firmware/intel/ice/ddp/ice.pkg
 lib/firmware/intel/ipu3-fw.bin
@@ -1324,6 +1395,9 @@ lib/firmware/iwlwifi-Qu-b0-hr-b0-55.ucode
 lib/firmware/iwlwifi-Qu-b0-hr-b0-59.ucode
 lib/firmware/iwlwifi-Qu-b0-hr-b0-62.ucode
 lib/firmware/iwlwifi-Qu-b0-hr-b0-63.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-66.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-68.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-71.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-48.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-50.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-53.ucode
@@ -1331,6 +1405,9 @@ lib/firmware/iwlwifi-Qu-b0-jf-b0-55.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-59.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-62.ucode
 lib/firmware/iwlwifi-Qu-b0-jf-b0-63.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-66.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-68.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-71.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-48.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-50.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-53.ucode
@@ -1338,6 +1415,9 @@ lib/firmware/iwlwifi-Qu-c0-hr-b0-55.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-59.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-62.ucode
 lib/firmware/iwlwifi-Qu-c0-hr-b0-63.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-66.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-68.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-71.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-48.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-50.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-53.ucode
@@ -1345,6 +1425,9 @@ lib/firmware/iwlwifi-Qu-c0-jf-b0-55.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-59.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-62.ucode
 lib/firmware/iwlwifi-Qu-c0-jf-b0-63.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-66.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-68.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-71.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-48.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-50.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-53.ucode
@@ -1352,7 +1435,10 @@ lib/firmware/iwlwifi-QuZ-a0-hr-b0-55.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-59.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-62.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-63.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-66.ucode
 lib/firmware/iwlwifi-QuZ-a0-hr-b0-67.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-68.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-71.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-48.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-50.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-53.ucode
@@ -1360,6 +1446,9 @@ lib/firmware/iwlwifi-QuZ-a0-jf-b0-55.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-59.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-62.ucode
 lib/firmware/iwlwifi-QuZ-a0-jf-b0-63.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-66.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-68.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-71.ucode
 lib/firmware/iwlwifi-cc-a0-46.ucode
 lib/firmware/iwlwifi-cc-a0-48.ucode
 lib/firmware/iwlwifi-cc-a0-50.ucode
@@ -1368,19 +1457,32 @@ lib/firmware/iwlwifi-cc-a0-55.ucode
 lib/firmware/iwlwifi-cc-a0-59.ucode
 lib/firmware/iwlwifi-cc-a0-62.ucode
 lib/firmware/iwlwifi-cc-a0-63.ucode
+lib/firmware/iwlwifi-cc-a0-66.ucode
 lib/firmware/iwlwifi-cc-a0-67.ucode
+lib/firmware/iwlwifi-cc-a0-68.ucode
+lib/firmware/iwlwifi-cc-a0-71.ucode
 lib/firmware/iwlwifi-so-a0-gf-a0-64.ucode
 lib/firmware/iwlwifi-so-a0-gf-a0-67.ucode
+lib/firmware/iwlwifi-so-a0-gf-a0-68.ucode
+lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode
 lib/firmware/iwlwifi-so-a0-gf-a0.pnvm
 lib/firmware/iwlwifi-so-a0-gf4-a0-67.ucode
+lib/firmware/iwlwifi-so-a0-gf4-a0-68.ucode
+lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode
 lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm
 lib/firmware/iwlwifi-so-a0-hr-b0-64.ucode
+lib/firmware/iwlwifi-so-a0-hr-b0-68.ucode
+lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode
 lib/firmware/iwlwifi-so-a0-jf-b0-64.ucode
+lib/firmware/iwlwifi-so-a0-jf-b0-68.ucode
+lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0-59.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0-62.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0-63.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0-67.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0-68.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode
 lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm
 #lib/firmware/kaweth
 lib/firmware/kaweth/new_code.bin
@@ -1466,9 +1568,24 @@ lib/firmware/mediatek/mt7663_n9_v3.bin
 lib/firmware/mediatek/mt7663pr2h.bin
 lib/firmware/mediatek/mt7663pr2h_rebb.bin
 lib/firmware/mediatek/mt7668pr2h.bin
+lib/firmware/mediatek/mt7915_eeprom.bin
+lib/firmware/mediatek/mt7915_eeprom_dbdc.bin
 lib/firmware/mediatek/mt7915_rom_patch.bin
 lib/firmware/mediatek/mt7915_wa.bin
 lib/firmware/mediatek/mt7915_wm.bin
+lib/firmware/mediatek/mt7916_eeprom.bin
+lib/firmware/mediatek/mt7916_rom_patch.bin
+lib/firmware/mediatek/mt7916_wa.bin
+lib/firmware/mediatek/mt7916_wm.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976_dbdc.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976_dual.bin
+lib/firmware/mediatek/mt7986_rom_patch.bin
+lib/firmware/mediatek/mt7986_rom_patch_mt7975.bin
+lib/firmware/mediatek/mt7986_wa.bin
+lib/firmware/mediatek/mt7986_wm.bin
+lib/firmware/mediatek/mt7986_wm_mt7975.bin
 #lib/firmware/mediatek/mt8173
 lib/firmware/mediatek/mt8173/vpu_d.bin
 lib/firmware/mediatek/mt8173/vpu_p.bin
@@ -1496,6 +1613,8 @@ lib/firmware/mediatek/mt8183/scp.img
 #lib/firmware/mellanox/mlxsw_spectrum-13.2008.2946.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum-13.2008.3326.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum-13.2010.1006.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum-13.2010.1232.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum-13.2010.1406.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2308.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2714.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2007.1168.mfa2
@@ -1509,6 +1628,8 @@ lib/firmware/mediatek/mt8183/scp.img
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2008.2946.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2008.3326.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1006.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1232.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum2-29.2010.1406.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2007.1168.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.1036.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.1310.mfa2
@@ -1520,6 +1641,8 @@ lib/firmware/mediatek/mt8183/scp.img
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.2946.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2008.3326.mfa2
 #lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1006.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1232.mfa2
+#lib/firmware/mellanox/mlxsw_spectrum3-30.2010.1406.mfa2
 #lib/firmware/meson
 #lib/firmware/meson/vdec
 lib/firmware/meson/vdec/g12a_h264.bin
@@ -1556,6 +1679,22 @@ lib/firmware/moxa/moxa-1618.fw
 lib/firmware/moxa/moxa-1653.fw
 lib/firmware/moxa/moxa-1658.fw
 #lib/firmware/mrvl
+#lib/firmware/mrvl/cpt01
+lib/firmware/mrvl/cpt01/ae.out
+lib/firmware/mrvl/cpt01/ie.out
+lib/firmware/mrvl/cpt01/se.out
+#lib/firmware/mrvl/cpt02
+lib/firmware/mrvl/cpt02/ae.out
+lib/firmware/mrvl/cpt02/ie.out
+lib/firmware/mrvl/cpt02/se.out
+#lib/firmware/mrvl/cpt03
+lib/firmware/mrvl/cpt03/ae.out
+lib/firmware/mrvl/cpt03/ie.out
+lib/firmware/mrvl/cpt03/se.out
+#lib/firmware/mrvl/cpt04
+lib/firmware/mrvl/cpt04/ae.out
+lib/firmware/mrvl/cpt04/ie.out
+lib/firmware/mrvl/cpt04/se.out
 lib/firmware/mrvl/pcie8897_uapsta.bin
 lib/firmware/mrvl/pcie8997_wlan_v4.bin
 lib/firmware/mrvl/pcieuart8997_combo_v4.bin
@@ -1693,6 +1832,96 @@ lib/firmware/netronome/nic_AMDA0099-0001_1x10_1x25.nffw
 lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw
 lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw
 #lib/firmware/nvidia
+#lib/firmware/nvidia/ga102
+#lib/firmware/nvidia/ga102/acr
+lib/firmware/nvidia/ga102/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga102/acr/ucode_asb.bin
+lib/firmware/nvidia/ga102/acr/ucode_unload.bin
+#lib/firmware/nvidia/ga102/gr
+lib/firmware/nvidia/ga102/gr/NET_img.bin
+lib/firmware/nvidia/ga102/gr/fecs_bl.bin
+lib/firmware/nvidia/ga102/gr/fecs_sig.bin
+lib/firmware/nvidia/ga102/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga102/gr/gpccs_sig.bin
+#lib/firmware/nvidia/ga102/nvdec
+lib/firmware/nvidia/ga102/nvdec/scrubber.bin
+#lib/firmware/nvidia/ga102/sec2
+lib/firmware/nvidia/ga102/sec2/desc.bin
+lib/firmware/nvidia/ga102/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga102/sec2/image.bin
+lib/firmware/nvidia/ga102/sec2/sig.bin
+#lib/firmware/nvidia/ga103
+#lib/firmware/nvidia/ga103/acr
+lib/firmware/nvidia/ga103/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga103/acr/ucode_asb.bin
+lib/firmware/nvidia/ga103/acr/ucode_unload.bin
+#lib/firmware/nvidia/ga103/gr
+lib/firmware/nvidia/ga103/gr/NET_img.bin
+lib/firmware/nvidia/ga103/gr/fecs_bl.bin
+lib/firmware/nvidia/ga103/gr/fecs_sig.bin
+lib/firmware/nvidia/ga103/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga103/gr/gpccs_sig.bin
+#lib/firmware/nvidia/ga103/nvdec
+lib/firmware/nvidia/ga103/nvdec/scrubber.bin
+#lib/firmware/nvidia/ga103/sec2
+lib/firmware/nvidia/ga103/sec2/desc.bin
+lib/firmware/nvidia/ga103/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga103/sec2/image.bin
+lib/firmware/nvidia/ga103/sec2/sig.bin
+#lib/firmware/nvidia/ga104
+#lib/firmware/nvidia/ga104/acr
+lib/firmware/nvidia/ga104/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga104/acr/ucode_asb.bin
+lib/firmware/nvidia/ga104/acr/ucode_unload.bin
+#lib/firmware/nvidia/ga104/gr
+lib/firmware/nvidia/ga104/gr/NET_img.bin
+lib/firmware/nvidia/ga104/gr/fecs_bl.bin
+lib/firmware/nvidia/ga104/gr/fecs_sig.bin
+lib/firmware/nvidia/ga104/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga104/gr/gpccs_sig.bin
+#lib/firmware/nvidia/ga104/nvdec
+lib/firmware/nvidia/ga104/nvdec/scrubber.bin
+#lib/firmware/nvidia/ga104/sec2
+lib/firmware/nvidia/ga104/sec2/desc.bin
+lib/firmware/nvidia/ga104/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga104/sec2/image.bin
+lib/firmware/nvidia/ga104/sec2/sig.bin
+#lib/firmware/nvidia/ga106
+#lib/firmware/nvidia/ga106/acr
+lib/firmware/nvidia/ga106/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga106/acr/ucode_asb.bin
+lib/firmware/nvidia/ga106/acr/ucode_unload.bin
+#lib/firmware/nvidia/ga106/gr
+lib/firmware/nvidia/ga106/gr/NET_img.bin
+lib/firmware/nvidia/ga106/gr/fecs_bl.bin
+lib/firmware/nvidia/ga106/gr/fecs_sig.bin
+lib/firmware/nvidia/ga106/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga106/gr/gpccs_sig.bin
+#lib/firmware/nvidia/ga106/nvdec
+lib/firmware/nvidia/ga106/nvdec/scrubber.bin
+#lib/firmware/nvidia/ga106/sec2
+lib/firmware/nvidia/ga106/sec2/desc.bin
+lib/firmware/nvidia/ga106/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga106/sec2/image.bin
+lib/firmware/nvidia/ga106/sec2/sig.bin
+#lib/firmware/nvidia/ga107
+#lib/firmware/nvidia/ga107/acr
+lib/firmware/nvidia/ga107/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga107/acr/ucode_asb.bin
+lib/firmware/nvidia/ga107/acr/ucode_unload.bin
+#lib/firmware/nvidia/ga107/gr
+lib/firmware/nvidia/ga107/gr/NET_img.bin
+lib/firmware/nvidia/ga107/gr/fecs_bl.bin
+lib/firmware/nvidia/ga107/gr/fecs_sig.bin
+lib/firmware/nvidia/ga107/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga107/gr/gpccs_sig.bin
+#lib/firmware/nvidia/ga107/nvdec
+lib/firmware/nvidia/ga107/nvdec/scrubber.bin
+#lib/firmware/nvidia/ga107/sec2
+lib/firmware/nvidia/ga107/sec2/desc.bin
+lib/firmware/nvidia/ga107/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga107/sec2/image.bin
+lib/firmware/nvidia/ga107/sec2/sig.bin
 #lib/firmware/nvidia/gk20a
 lib/firmware/nvidia/gk20a/fecs_data.bin
 lib/firmware/nvidia/gk20a/fecs_inst.bin
@@ -2172,6 +2401,12 @@ lib/firmware/qca/nvm_usb_00130200_0109.bin
 lib/firmware/qca/nvm_usb_00130200_0110.bin
 lib/firmware/qca/nvm_usb_00130201.bin
 lib/firmware/qca/nvm_usb_00130201_010a.bin
+lib/firmware/qca/nvm_usb_00130201_010b.bin
+lib/firmware/qca/nvm_usb_00130201_0303.bin
+lib/firmware/qca/nvm_usb_00130201_gf.bin
+lib/firmware/qca/nvm_usb_00130201_gf_010a.bin
+lib/firmware/qca/nvm_usb_00130201_gf_010b.bin
+lib/firmware/qca/nvm_usb_00130201_gf_0303.bin
 lib/firmware/qca/rampatch_00130300.bin
 lib/firmware/qca/rampatch_00130302.bin
 lib/firmware/qca/rampatch_00230302.bin
@@ -2610,6 +2845,8 @@ lib/firmware/rtl_bt/rtl8822cu_config.bin
 lib/firmware/rtl_bt/rtl8822cu_fw.bin
 lib/firmware/rtl_bt/rtl8852au_config.bin
 lib/firmware/rtl_bt/rtl8852au_fw.bin
+lib/firmware/rtl_bt/rtl8852bu_config.bin
+lib/firmware/rtl_bt/rtl8852bu_fw.bin
 #lib/firmware/rtl_nic
 lib/firmware/rtl_nic/rtl8105e-1.fw
 lib/firmware/rtl_nic/rtl8106e-1.fw
@@ -2703,8 +2940,6 @@ lib/firmware/sb16/ima_adpcm_init.csp
 lib/firmware/sb16/ima_adpcm_playback.csp
 lib/firmware/sb16/mulaw_main.csp
 lib/firmware/sdd_sagrad_1091_1098.bin
-lib/firmware/silabs
-lib/firmware/silabs/wfm_wf200_C0.sec
 #lib/firmware/slicoss
 lib/firmware/slicoss/gbdownload.sys
 lib/firmware/slicoss/gbrcvucode.sys
@@ -2816,6 +3051,8 @@ lib/firmware/vpu_p.bin
 #lib/firmware/vxge
 lib/firmware/vxge/X3fw-pxe.ncf
 lib/firmware/vxge/X3fw.ncf
+lib/firmware/wfx
+lib/firmware/wfx/wfm_wf200_C0.sec
 lib/firmware/whiteheat.fw
 lib/firmware/whiteheat_loader.fw
 lib/firmware/wil6210.brd
diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch
index 1e4a0a81b..40d90cd96 100644
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -128,6 +128,7 @@ usr/share/logwatch/default.conf/services/modprobe.conf
 #usr/share/logwatch/default.conf/services/named.conf
 #usr/share/logwatch/default.conf/services/netopia.conf
 #usr/share/logwatch/default.conf/services/netscreen.conf
+usr/share/logwatch/default.conf/services/nut.conf
 #usr/share/logwatch/default.conf/services/oidentd.conf
 #usr/share/logwatch/default.conf/services/omsa.conf
 usr/share/logwatch/default.conf/services/openvpn.conf
@@ -242,6 +243,7 @@ usr/share/logwatch/scripts/services/dialup
 #usr/share/logwatch/scripts/services/dpkg
 #usr/share/logwatch/scripts/services/emerge
 #usr/share/logwatch/scripts/services/evtapplication
+#usr/share/logwatch/scripts/services/evtmswindows
 #usr/share/logwatch/scripts/services/evtsecurity
 #usr/share/logwatch/scripts/services/evtsystem
 #usr/share/logwatch/scripts/services/exim
@@ -273,6 +275,7 @@ usr/share/logwatch/scripts/services/modprobe
 #usr/share/logwatch/scripts/services/named
 #usr/share/logwatch/scripts/services/netopia
 #usr/share/logwatch/scripts/services/netscreen
+usr/share/logwatch/scripts/services/nut
 #usr/share/logwatch/scripts/services/oidentd
 #usr/share/logwatch/scripts/services/omsa
 usr/share/logwatch/scripts/services/openvpn
diff --git a/config/rootfiles/common/man b/config/rootfiles/common/man
index 39358d110..21d8115f1 100644
--- a/config/rootfiles/common/man
+++ b/config/rootfiles/common/man
@@ -3,56 +3,87 @@
 #usr/bin/catman
 #usr/bin/lexgrog
 #usr/bin/man
+#usr/bin/man-recode
 #usr/bin/mandb
 #usr/bin/manpath
 #usr/bin/whatis
-#usr/bin/zsoelim
 #usr/lib/man-db
+#usr/lib/man-db/libman-2.10.2.so
+#usr/lib/man-db/libman.la
+#usr/lib/man-db/libman.so
+#usr/lib/man-db/libmandb-2.10.2.so
+#usr/lib/man-db/libmandb.la
+#usr/lib/man-db/libmandb.so
+#usr/libexec/man-db
+#usr/libexec/man-db/globbing
+#usr/libexec/man-db/manconv
+#usr/libexec/man-db/zsoelim
 #usr/sbin/accessdb
+#usr/share/doc/man-db
+#usr/share/doc/man-db/man-db-manual.ps
+#usr/share/doc/man-db/man-db-manual.txt
+#usr/share/locale/af/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ast/LC_MESSAGES/man-db.mo
+#usr/share/locale/be/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/bg/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ca/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ca/LC_MESSAGES/man-db.mo
+#usr/share/locale/cs/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/cs/LC_MESSAGES/man-db.mo
+#usr/share/locale/da/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/da/LC_MESSAGES/man-db.mo
+#usr/share/locale/de/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/de/LC_MESSAGES/man-db.mo
+#usr/share/locale/el/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eo/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eo/LC_MESSAGES/man-db.mo
+#usr/share/locale/es/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/es/LC_MESSAGES/man-db.mo
+#usr/share/locale/et/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eu/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/fi/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/fi/LC_MESSAGES/man-db.mo
+#usr/share/locale/fr/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/fr/LC_MESSAGES/man-db.mo
+#usr/share/locale/ga/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/gl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/hu/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/id/LC_MESSAGES/man-db.mo
+#usr/share/locale/it/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/it/LC_MESSAGES/man-db.mo
+#usr/share/locale/ja/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ja/LC_MESSAGES/man-db.mo
+#usr/share/locale/ko/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ms/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nb/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nl/LC_MESSAGES/man-db.mo
+#usr/share/locale/pl/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/pl/LC_MESSAGES/man-db.mo
+#usr/share/locale/pt/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/pt/LC_MESSAGES/man-db.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/man-db.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ro/LC_MESSAGES/man-db.mo
-#usr/share/locale/ru
-#usr/share/locale/ru/LC_MESSAGES
+#usr/share/locale/ru/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ru/LC_MESSAGES/man-db.mo
+#usr/share/locale/rw/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sk/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sr/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sr/LC_MESSAGES/man-db.mo
+#usr/share/locale/sv/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/sv/LC_MESSAGES/man-db.mo
-#usr/share/man/de
-#usr/share/man/de/man1
-#usr/share/man/de/man1/apropos.1
-#usr/share/man/de/man1/man.1
-#usr/share/man/de/man1/manpath.1
-#usr/share/man/de/man1/whatis.1
-#usr/share/man/de/man1/zsoelim.1
-#usr/share/man/de/man5
-#usr/share/man/de/man5/manpath.5
-#usr/share/man/de/man8
-#usr/share/man/de/man8/accessdb.8
-#usr/share/man/de/man8/catman.8
-#usr/share/man/de/man8/mandb.8
-#usr/share/man/es
-#usr/share/man/es/man1
-#usr/share/man/es/man1/apropos.1
-#usr/share/man/es/man1/man.1
-#usr/share/man/es/man1/manpath.1
-#usr/share/man/es/man1/whatis.1
-#usr/share/man/es/man1/zsoelim.1
-#usr/share/man/es/man5
-#usr/share/man/es/man5/manpath.5
-#usr/share/man/es/man8
-#usr/share/man/es/man8/accessdb.8
-#usr/share/man/es/man8/catman.8
-#usr/share/man/es/man8/mandb.8
+#usr/share/locale/tr/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/tr/LC_MESSAGES/man-db.mo
+#usr/share/locale/uk/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/vi/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/vi/LC_MESSAGES/man-db.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/man-db.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/man-db.mo
 #usr/share/man/it
 #usr/share/man/it/man1
 #usr/share/man/it/man1/apropos.1
@@ -66,22 +97,11 @@
 #usr/share/man/it/man8/accessdb.8
 #usr/share/man/it/man8/catman.8
 #usr/share/man/it/man8/mandb.8
-#usr/share/man/ja
-#usr/share/man/ja/man1
-#usr/share/man/ja/man1/apropos.1
-#usr/share/man/ja/man1/man.1
-#usr/share/man/ja/man1/manpath.1
-#usr/share/man/ja/man1/whatis.1
-#usr/share/man/ja/man1/zsoelim.1
-#usr/share/man/ja/man5
-#usr/share/man/ja/man5/manpath.5
-#usr/share/man/ja/man8
-#usr/share/man/ja/man8/accessdb.8
-#usr/share/man/ja/man8/catman.8
-#usr/share/man/ja/man8/mandb.8
 #usr/share/man/man1/apropos.1
 #usr/share/man/man1/lexgrog.1
+#usr/share/man/man1/man-recode.1
 #usr/share/man/man1/man.1
+#usr/share/man/man1/manconv.1
 #usr/share/man/man1/manpath.1
 #usr/share/man/man1/whatis.1
 #usr/share/man/man1/zsoelim.1
diff --git a/config/rootfiles/common/man-pages b/config/rootfiles/common/man-pages
index 7b75d14a3..d177a2278 100644
--- a/config/rootfiles/common/man-pages
+++ b/config/rootfiles/common/man-pages
@@ -1,3177 +1,2486 @@
-#usr/share/man/man0p
-#usr/share/man/man0p/aio.h.0p
-#usr/share/man/man0p/assert.h.0p
-#usr/share/man/man0p/complex.h.0p
-#usr/share/man/man0p/cpio.h.0p
-#usr/share/man/man0p/ctype.h.0p
-#usr/share/man/man0p/dirent.h.0p
-#usr/share/man/man0p/dlfcn.h.0p
-#usr/share/man/man0p/errno.h.0p
-#usr/share/man/man0p/fcntl.h.0p
-#usr/share/man/man0p/fenv.h.0p
-#usr/share/man/man0p/float.h.0p
-#usr/share/man/man0p/fmtmsg.h.0p
-#usr/share/man/man0p/fnmatch.h.0p
-#usr/share/man/man0p/ftw.h.0p
-#usr/share/man/man0p/glob.h.0p
-#usr/share/man/man0p/grp.h.0p
-#usr/share/man/man0p/iconv.h.0p
-#usr/share/man/man0p/if.h.0p
-#usr/share/man/man0p/in.h.0p
-#usr/share/man/man0p/inet.h.0p
-#usr/share/man/man0p/inttypes.h.0p
-#usr/share/man/man0p/ipc.h.0p
-#usr/share/man/man0p/iso646.h.0p
-#usr/share/man/man0p/langinfo.h.0p
-#usr/share/man/man0p/libgen.h.0p
-#usr/share/man/man0p/limits.h.0p
-#usr/share/man/man0p/locale.h.0p
-#usr/share/man/man0p/math.h.0p
-#usr/share/man/man0p/mman.h.0p
-#usr/share/man/man0p/monetary.h.0p
-#usr/share/man/man0p/mqueue.h.0p
-#usr/share/man/man0p/msg.h.0p
-#usr/share/man/man0p/ndbm.h.0p
-#usr/share/man/man0p/netdb.h.0p
-#usr/share/man/man0p/nl_types.h.0p
-#usr/share/man/man0p/poll.h.0p
-#usr/share/man/man0p/pthread.h.0p
-#usr/share/man/man0p/pwd.h.0p
-#usr/share/man/man0p/regex.h.0p
-#usr/share/man/man0p/resource.h.0p
-#usr/share/man/man0p/sched.h.0p
-#usr/share/man/man0p/search.h.0p
-#usr/share/man/man0p/select.h.0p
-#usr/share/man/man0p/sem.h.0p
-#usr/share/man/man0p/semaphore.h.0p
-#usr/share/man/man0p/setjmp.h.0p
-#usr/share/man/man0p/shm.h.0p
-#usr/share/man/man0p/signal.h.0p
-#usr/share/man/man0p/socket.h.0p
-#usr/share/man/man0p/spawn.h.0p
-#usr/share/man/man0p/stat.h.0p
-#usr/share/man/man0p/statvfs.h.0p
-#usr/share/man/man0p/stdarg.h.0p
-#usr/share/man/man0p/stdbool.h.0p
-#usr/share/man/man0p/stddef.h.0p
-#usr/share/man/man0p/stdint.h.0p
-#usr/share/man/man0p/stdio.h.0p
-#usr/share/man/man0p/stdlib.h.0p
-#usr/share/man/man0p/string.h.0p
-#usr/share/man/man0p/strings.h.0p
-#usr/share/man/man0p/stropts.h.0p
-#usr/share/man/man0p/sys_ipc.h.0p
-#usr/share/man/man0p/sys_mman.h.0p
-#usr/share/man/man0p/sys_msg.h.0p
-#usr/share/man/man0p/sys_resource.h.0p
-#usr/share/man/man0p/sys_select.h.0p
-#usr/share/man/man0p/sys_sem.h.0p
-#usr/share/man/man0p/sys_shm.h.0p
-#usr/share/man/man0p/sys_socket.h.0p
-#usr/share/man/man0p/sys_stat.h.0p
-#usr/share/man/man0p/sys_statvfs.h.0p
-#usr/share/man/man0p/sys_time.h.0p
-#usr/share/man/man0p/sys_timeb.h.0p
-#usr/share/man/man0p/sys_times.h.0p
-#usr/share/man/man0p/sys_types.h.0p
-#usr/share/man/man0p/sys_uio.h.0p
-#usr/share/man/man0p/sys_un.h.0p
-#usr/share/man/man0p/sys_utsname.h.0p
-#usr/share/man/man0p/sys_wait.h.0p
-#usr/share/man/man0p/syslog.h.0p
-#usr/share/man/man0p/tar.h.0p
-#usr/share/man/man0p/tcp.h.0p
-#usr/share/man/man0p/termios.h.0p
-#usr/share/man/man0p/tgmath.h.0p
-#usr/share/man/man0p/time.h.0p
-#usr/share/man/man0p/timeb.h.0p
-#usr/share/man/man0p/times.h.0p
-#usr/share/man/man0p/trace.h.0p
-#usr/share/man/man0p/types.h.0p
-#usr/share/man/man0p/ucontext.h.0p
-#usr/share/man/man0p/uio.h.0p
-#usr/share/man/man0p/ulimit.h.0p
-#usr/share/man/man0p/un.h.0p
-#usr/share/man/man0p/unistd.h.0p
-#usr/share/man/man0p/utime.h.0p
-#usr/share/man/man0p/utmpx.h.0p
-#usr/share/man/man0p/utsname.h.0p
-#usr/share/man/man0p/wait.h.0p
-#usr/share/man/man0p/wchar.h.0p
-#usr/share/man/man0p/wctype.h.0p
-#usr/share/man/man0p/wordexp.h.0p
-#usr/share/man/man1/chgrp.1
-#usr/share/man/man1/chmod.1
-#usr/share/man/man1/chown.1
-#usr/share/man/man1/cp.1
-#usr/share/man/man1/dd.1
-#usr/share/man/man1/df.1
-#usr/share/man/man1/diff.1
-#usr/share/man/man1/dir.1
-#usr/share/man/man1/dircolors.1
-#usr/share/man/man1/du.1
-#usr/share/man/man1/install.1
-#usr/share/man/man1/intro.1
-#usr/share/man/man1/ldd.1
-#usr/share/man/man1/ln.1
-#usr/share/man/man1/ls.1
-#usr/share/man/man1/mkdir.1
-#usr/share/man/man1/mkfifo.1
-#usr/share/man/man1/mknod.1
-#usr/share/man/man1/mv.1
-#usr/share/man/man1/rm.1
-#usr/share/man/man1/rmdir.1
-#usr/share/man/man1/time.1
-#usr/share/man/man1/touch.1
-#usr/share/man/man1/vdir.1
-#usr/share/man/man1p
-#usr/share/man/man1p/admin.1p
-#usr/share/man/man1p/alias.1p
-#usr/share/man/man1p/ar.1p
-#usr/share/man/man1p/asa.1p
-#usr/share/man/man1p/at.1p
-#usr/share/man/man1p/awk.1p
-#usr/share/man/man1p/basename.1p
-#usr/share/man/man1p/batch.1p
-#usr/share/man/man1p/bc.1p
-#usr/share/man/man1p/bg.1p
-#usr/share/man/man1p/break.1p
-#usr/share/man/man1p/c99.1p
-#usr/share/man/man1p/cal.1p
-#usr/share/man/man1p/cat.1p
-#usr/share/man/man1p/cd.1p
-#usr/share/man/man1p/cflow.1p
-#usr/share/man/man1p/chgrp.1p
-#usr/share/man/man1p/chmod.1p
-#usr/share/man/man1p/chown.1p
-#usr/share/man/man1p/cksum.1p
-#usr/share/man/man1p/cmp.1p
-#usr/share/man/man1p/colon.1p
-#usr/share/man/man1p/comm.1p
-#usr/share/man/man1p/command.1p
-#usr/share/man/man1p/compress.1p
-#usr/share/man/man1p/continue.1p
-#usr/share/man/man1p/cp.1p
-#usr/share/man/man1p/crontab.1p
-#usr/share/man/man1p/csplit.1p
-#usr/share/man/man1p/ctags.1p
-#usr/share/man/man1p/cut.1p
-#usr/share/man/man1p/cxref.1p
-#usr/share/man/man1p/date.1p
-#usr/share/man/man1p/dd.1p
-#usr/share/man/man1p/delta.1p
-#usr/share/man/man1p/df.1p
-#usr/share/man/man1p/diff.1p
-#usr/share/man/man1p/dirname.1p
-#usr/share/man/man1p/dot.1p
-#usr/share/man/man1p/du.1p
-#usr/share/man/man1p/echo.1p
-#usr/share/man/man1p/ed.1p
-#usr/share/man/man1p/env.1p
-#usr/share/man/man1p/eval.1p
-#usr/share/man/man1p/ex.1p
-#usr/share/man/man1p/exec.1p
-#usr/share/man/man1p/exit.1p
-#usr/share/man/man1p/expand.1p
-#usr/share/man/man1p/export.1p
-#usr/share/man/man1p/expr.1p
-#usr/share/man/man1p/false.1p
-#usr/share/man/man1p/fc.1p
-#usr/share/man/man1p/fg.1p
-#usr/share/man/man1p/file.1p
-#usr/share/man/man1p/find.1p
-#usr/share/man/man1p/fold.1p
-#usr/share/man/man1p/fort77.1p
-#usr/share/man/man1p/fuser.1p
-#usr/share/man/man1p/gencat.1p
-#usr/share/man/man1p/get.1p
-#usr/share/man/man1p/getconf.1p
-#usr/share/man/man1p/getopts.1p
-#usr/share/man/man1p/grep.1p
-#usr/share/man/man1p/hash.1p
-#usr/share/man/man1p/head.1p
-#usr/share/man/man1p/iconv.1p
-#usr/share/man/man1p/id.1p
-#usr/share/man/man1p/ipcrm.1p
-#usr/share/man/man1p/ipcs.1p
-#usr/share/man/man1p/jobs.1p
-#usr/share/man/man1p/join.1p
-#usr/share/man/man1p/kill.1p
-#usr/share/man/man1p/lex.1p
-#usr/share/man/man1p/link.1p
-#usr/share/man/man1p/ln.1p
-#usr/share/man/man1p/locale.1p
-#usr/share/man/man1p/localedef.1p
-#usr/share/man/man1p/logger.1p
-#usr/share/man/man1p/logname.1p
-#usr/share/man/man1p/lp.1p
-#usr/share/man/man1p/ls.1p
-#usr/share/man/man1p/m4.1p
-#usr/share/man/man1p/mailx.1p
-#usr/share/man/man1p/make.1p
-#usr/share/man/man1p/man.1p
-#usr/share/man/man1p/mesg.1p
-#usr/share/man/man1p/mkdir.1p
-#usr/share/man/man1p/mkfifo.1p
-#usr/share/man/man1p/more.1p
-#usr/share/man/man1p/mv.1p
-#usr/share/man/man1p/newgrp.1p
-#usr/share/man/man1p/nice.1p
-#usr/share/man/man1p/nl.1p
-#usr/share/man/man1p/nm.1p
-#usr/share/man/man1p/nohup.1p
-#usr/share/man/man1p/od.1p
-#usr/share/man/man1p/paste.1p
-#usr/share/man/man1p/patch.1p
-#usr/share/man/man1p/pathchk.1p
-#usr/share/man/man1p/pax.1p
-#usr/share/man/man1p/pr.1p
-#usr/share/man/man1p/printf.1p
-#usr/share/man/man1p/prs.1p
-#usr/share/man/man1p/ps.1p
-#usr/share/man/man1p/pwd.1p
-#usr/share/man/man1p/qalter.1p
-#usr/share/man/man1p/qdel.1p
-#usr/share/man/man1p/qhold.1p
-#usr/share/man/man1p/qmove.1p
-#usr/share/man/man1p/qmsg.1p
-#usr/share/man/man1p/qrerun.1p
-#usr/share/man/man1p/qrls.1p
-#usr/share/man/man1p/qselect.1p
-#usr/share/man/man1p/qsig.1p
-#usr/share/man/man1p/qstat.1p
-#usr/share/man/man1p/qsub.1p
-#usr/share/man/man1p/read.1p
-#usr/share/man/man1p/readonly.1p
-#usr/share/man/man1p/renice.1p
-#usr/share/man/man1p/return.1p
-#usr/share/man/man1p/rm.1p
-#usr/share/man/man1p/rmdel.1p
-#usr/share/man/man1p/rmdir.1p
-#usr/share/man/man1p/sact.1p
-#usr/share/man/man1p/sccs.1p
-#usr/share/man/man1p/sed.1p
-#usr/share/man/man1p/set.1p
-#usr/share/man/man1p/sh.1p
-#usr/share/man/man1p/shift.1p
-#usr/share/man/man1p/sleep.1p
-#usr/share/man/man1p/sort.1p
-#usr/share/man/man1p/split.1p
-#usr/share/man/man1p/strings.1p
-#usr/share/man/man1p/strip.1p
-#usr/share/man/man1p/stty.1p
-#usr/share/man/man1p/tabs.1p
-#usr/share/man/man1p/tail.1p
-#usr/share/man/man1p/talk.1p
-#usr/share/man/man1p/tee.1p
-#usr/share/man/man1p/test.1p
-#usr/share/man/man1p/time.1p
-#usr/share/man/man1p/times.1p
-#usr/share/man/man1p/touch.1p
-#usr/share/man/man1p/tput.1p
-#usr/share/man/man1p/tr.1p
-#usr/share/man/man1p/trap.1p
-#usr/share/man/man1p/true.1p
-#usr/share/man/man1p/tsort.1p
-#usr/share/man/man1p/tty.1p
-#usr/share/man/man1p/type.1p
-#usr/share/man/man1p/ulimit.1p
-#usr/share/man/man1p/umask.1p
-#usr/share/man/man1p/unalias.1p
-#usr/share/man/man1p/uname.1p
-#usr/share/man/man1p/uncompress.1p
-#usr/share/man/man1p/unexpand.1p
-#usr/share/man/man1p/unget.1p
-#usr/share/man/man1p/uniq.1p
-#usr/share/man/man1p/unlink.1p
-#usr/share/man/man1p/unset.1p
-#usr/share/man/man1p/uucp.1p
-#usr/share/man/man1p/uudecode.1p
-#usr/share/man/man1p/uuencode.1p
-#usr/share/man/man1p/uustat.1p
-#usr/share/man/man1p/uux.1p
-#usr/share/man/man1p/val.1p
-#usr/share/man/man1p/vi.1p
-#usr/share/man/man1p/wait.1p
-#usr/share/man/man1p/wc.1p
-#usr/share/man/man1p/what.1p
-#usr/share/man/man1p/who.1p
-#usr/share/man/man1p/write.1p
-#usr/share/man/man1p/xargs.1p
-#usr/share/man/man1p/yacc.1p
-#usr/share/man/man1p/zcat.1p
-#usr/share/man/man2/_Exit.2
-#usr/share/man/man2/_exit.2
-#usr/share/man/man2/_llseek.2
-#usr/share/man/man2/_newselect.2
-#usr/share/man/man2/_sysctl.2
-#usr/share/man/man2/accept.2
-#usr/share/man/man2/access.2
-#usr/share/man/man2/acct.2
-#usr/share/man/man2/adjtimex.2
-#usr/share/man/man2/afs_syscall.2
-#usr/share/man/man2/alarm.2
-#usr/share/man/man2/alloc_hugepages.2
-#usr/share/man/man2/arch_prctl.2
-#usr/share/man/man2/bdflush.2
-#usr/share/man/man2/bind.2
-#usr/share/man/man2/break.2
-#usr/share/man/man2/brk.2
-#usr/share/man/man2/cacheflush.2
-#usr/share/man/man2/capget.2
-#usr/share/man/man2/capset.2
-#usr/share/man/man2/chdir.2
-#usr/share/man/man2/chmod.2
-#usr/share/man/man2/chown.2
-#usr/share/man/man2/chroot.2
-#usr/share/man/man2/clone.2
-#usr/share/man/man2/close.2
-#usr/share/man/man2/connect.2
-#usr/share/man/man2/creat.2
-#usr/share/man/man2/create_module.2
-#usr/share/man/man2/delete_module.2
-#usr/share/man/man2/dup.2
-#usr/share/man/man2/dup2.2
-#usr/share/man/man2/epoll_create.2
-#usr/share/man/man2/epoll_ctl.2
-#usr/share/man/man2/epoll_wait.2
-#usr/share/man/man2/execve.2
-#usr/share/man/man2/exit.2
-#usr/share/man/man2/exit_group.2
-#usr/share/man/man2/faccessat.2
-#usr/share/man/man2/fchdir.2
-#usr/share/man/man2/fchmod.2
-#usr/share/man/man2/fchmodat.2
-#usr/share/man/man2/fchown.2
-#usr/share/man/man2/fchownat.2
-#usr/share/man/man2/fcntl.2
-#usr/share/man/man2/fdatasync.2
-#usr/share/man/man2/fgetxattr.2
-#usr/share/man/man2/flistxattr.2
-#usr/share/man/man2/flock.2
-#usr/share/man/man2/fork.2
-#usr/share/man/man2/free_hugepages.2
-#usr/share/man/man2/fremovexattr.2
-#usr/share/man/man2/fsetxattr.2
-#usr/share/man/man2/fstat.2
-#usr/share/man/man2/fstatat.2
-#usr/share/man/man2/fstatfs.2
-#usr/share/man/man2/fstatvfs.2
-#usr/share/man/man2/fsync.2
-#usr/share/man/man2/ftruncate.2
-#usr/share/man/man2/futex.2
-#usr/share/man/man2/futimesat.2
-#usr/share/man/man2/get_kernel_syms.2
-#usr/share/man/man2/get_mempolicy.2
-#usr/share/man/man2/get_thread_area.2
-#usr/share/man/man2/getcontext.2
-#usr/share/man/man2/getdents.2
-#usr/share/man/man2/getdomainname.2
-#usr/share/man/man2/getdtablesize.2
-#usr/share/man/man2/getegid.2
-#usr/share/man/man2/geteuid.2
-#usr/share/man/man2/getgid.2
-#usr/share/man/man2/getgroups.2
-#usr/share/man/man2/gethostid.2
-#usr/share/man/man2/gethostname.2
-#usr/share/man/man2/getitimer.2
-#usr/share/man/man2/getpagesize.2
-#usr/share/man/man2/getpeername.2
-#usr/share/man/man2/getpgid.2
-#usr/share/man/man2/getpgrp.2
-#usr/share/man/man2/getpid.2
-#usr/share/man/man2/getpmsg.2
-#usr/share/man/man2/getppid.2
-#usr/share/man/man2/getpriority.2
-#usr/share/man/man2/getresgid.2
-#usr/share/man/man2/getresuid.2
-#usr/share/man/man2/getrlimit.2
-#usr/share/man/man2/getrusage.2
-#usr/share/man/man2/getsid.2
-#usr/share/man/man2/getsockname.2
-#usr/share/man/man2/getsockopt.2
-#usr/share/man/man2/gettid.2
-#usr/share/man/man2/gettimeofday.2
-#usr/share/man/man2/getuid.2
-#usr/share/man/man2/getxattr.2
-#usr/share/man/man2/gtty.2
-#usr/share/man/man2/idle.2
-#usr/share/man/man2/inb.2
-#usr/share/man/man2/inb_p.2
-#usr/share/man/man2/init_module.2
-#usr/share/man/man2/inl.2
-#usr/share/man/man2/inl_p.2
-#usr/share/man/man2/inotify_add_watch.2
-#usr/share/man/man2/inotify_init.2
-#usr/share/man/man2/inotify_rm_watch.2
-#usr/share/man/man2/insb.2
-#usr/share/man/man2/insl.2
-#usr/share/man/man2/insw.2
-#usr/share/man/man2/intro.2
-#usr/share/man/man2/inw.2
-#usr/share/man/man2/inw_p.2
-#usr/share/man/man2/io_cancel.2
-#usr/share/man/man2/io_destroy.2
-#usr/share/man/man2/io_getevents.2
-#usr/share/man/man2/io_setup.2
-#usr/share/man/man2/io_submit.2
-#usr/share/man/man2/ioctl.2
-#usr/share/man/man2/ioctl_list.2
-#usr/share/man/man2/ioperm.2
-#usr/share/man/man2/iopl.2
-#usr/share/man/man2/ioprio_get.2
-#usr/share/man/man2/ioprio_set.2
-#usr/share/man/man2/ipc.2
-#usr/share/man/man2/kill.2
-#usr/share/man/man2/killpg.2
-#usr/share/man/man2/lchown.2
-#usr/share/man/man2/lgetxattr.2
-#usr/share/man/man2/link.2
-#usr/share/man/man2/linkat.2
-#usr/share/man/man2/listen.2
-#usr/share/man/man2/listxattr.2
-#usr/share/man/man2/llistxattr.2
-#usr/share/man/man2/llseek.2
-#usr/share/man/man2/lock.2
-#usr/share/man/man2/lookup_dcookie.2
-#usr/share/man/man2/lremovexattr.2
-#usr/share/man/man2/lseek.2
-#usr/share/man/man2/lsetxattr.2
-#usr/share/man/man2/lstat.2
-#usr/share/man/man2/madvise.2
-#usr/share/man/man2/mbind.2
-#usr/share/man/man2/mincore.2
-#usr/share/man/man2/mkdir.2
-#usr/share/man/man2/mkdirat.2
-#usr/share/man/man2/mknod.2
-#usr/share/man/man2/mknodat.2
-#usr/share/man/man2/mlock.2
-#usr/share/man/man2/mlockall.2
-#usr/share/man/man2/mmap.2
-#usr/share/man/man2/mmap2.2
-#usr/share/man/man2/modify_ldt.2
-#usr/share/man/man2/mount.2
-#usr/share/man/man2/mprotect.2
-#usr/share/man/man2/mpx.2
-#usr/share/man/man2/mq_getsetattr.2
-#usr/share/man/man2/mremap.2
-#usr/share/man/man2/msgctl.2
-#usr/share/man/man2/msgget.2
-#usr/share/man/man2/msgop.2
-#usr/share/man/man2/msgrcv.2
-#usr/share/man/man2/msgsnd.2
-#usr/share/man/man2/msync.2
-#usr/share/man/man2/munlock.2
-#usr/share/man/man2/munlockall.2
-#usr/share/man/man2/munmap.2
-#usr/share/man/man2/nanosleep.2
-#usr/share/man/man2/nfsservctl.2
-#usr/share/man/man2/nice.2
-#usr/share/man/man2/obsolete.2
-#usr/share/man/man2/oldfstat.2
-#usr/share/man/man2/oldlstat.2
-#usr/share/man/man2/oldolduname.2
-#usr/share/man/man2/oldstat.2
-#usr/share/man/man2/olduname.2
-#usr/share/man/man2/open.2
-#usr/share/man/man2/openat.2
-#usr/share/man/man2/outb.2
-#usr/share/man/man2/outb_p.2
-#usr/share/man/man2/outl.2
-#usr/share/man/man2/outl_p.2
-#usr/share/man/man2/outsb.2
-#usr/share/man/man2/outsl.2
-#usr/share/man/man2/outsw.2
-#usr/share/man/man2/outw.2
-#usr/share/man/man2/outw_p.2
-#usr/share/man/man2/path_resolution.2
-#usr/share/man/man2/pause.2
-#usr/share/man/man2/pciconfig_iobase.2
-#usr/share/man/man2/pciconfig_read.2
-#usr/share/man/man2/pciconfig_write.2
-#usr/share/man/man2/personality.2
-#usr/share/man/man2/pipe.2
-#usr/share/man/man2/pivot_root.2
-#usr/share/man/man2/poll.2
-#usr/share/man/man2/posix_fadvise.2
-#usr/share/man/man2/ppoll.2
-#usr/share/man/man2/prctl.2
-#usr/share/man/man2/pread.2
-#usr/share/man/man2/prof.2
-#usr/share/man/man2/pselect.2
-#usr/share/man/man2/ptrace.2
-#usr/share/man/man2/putpmsg.2
-#usr/share/man/man2/pwrite.2
-#usr/share/man/man2/query_module.2
-#usr/share/man/man2/quotactl.2
-#usr/share/man/man2/read.2
-#usr/share/man/man2/readahead.2
-#usr/share/man/man2/readdir.2
-#usr/share/man/man2/readlink.2
-#usr/share/man/man2/readv.2
-#usr/share/man/man2/reboot.2
-#usr/share/man/man2/recv.2
-#usr/share/man/man2/recvfrom.2
-#usr/share/man/man2/recvmsg.2
-#usr/share/man/man2/remap_file_pages.2
-#usr/share/man/man2/removexattr.2
-#usr/share/man/man2/rename.2
-#usr/share/man/man2/renameat.2
-#usr/share/man/man2/rmdir.2
-#usr/share/man/man2/rt_sigreturn.2
-#usr/share/man/man2/rt_sigsuspend.2
-#usr/share/man/man2/sbrk.2
-#usr/share/man/man2/sched_get_priority_max.2
-#usr/share/man/man2/sched_get_priority_min.2
-#usr/share/man/man2/sched_getaffinity.2
-#usr/share/man/man2/sched_getparam.2
-#usr/share/man/man2/sched_getscheduler.2
-#usr/share/man/man2/sched_rr_get_interval.2
-#usr/share/man/man2/sched_setaffinity.2
-#usr/share/man/man2/sched_setparam.2
-#usr/share/man/man2/sched_setscheduler.2
-#usr/share/man/man2/sched_yield.2
-#usr/share/man/man2/security.2
-#usr/share/man/man2/select.2
-#usr/share/man/man2/select_tut.2
-#usr/share/man/man2/semctl.2
-#usr/share/man/man2/semget.2
-#usr/share/man/man2/semop.2
-#usr/share/man/man2/semtimedop.2
-#usr/share/man/man2/send.2
-#usr/share/man/man2/sendfile.2
-#usr/share/man/man2/sendmsg.2
-#usr/share/man/man2/sendto.2
-#usr/share/man/man2/set_mempolicy.2
-#usr/share/man/man2/set_thread_area.2
-#usr/share/man/man2/set_tid_address.2
-#usr/share/man/man2/setcontext.2
-#usr/share/man/man2/setdomainname.2
-#usr/share/man/man2/setegid.2
-#usr/share/man/man2/seteuid.2
-#usr/share/man/man2/setfsgid.2
-#usr/share/man/man2/setfsuid.2
-#usr/share/man/man2/setgid.2
-#usr/share/man/man2/setgroups.2
-#usr/share/man/man2/sethostid.2
-#usr/share/man/man2/sethostname.2
-#usr/share/man/man2/setitimer.2
-#usr/share/man/man2/setpgid.2
-#usr/share/man/man2/setpgrp.2
-#usr/share/man/man2/setpriority.2
-#usr/share/man/man2/setregid.2
-#usr/share/man/man2/setresgid.2
-#usr/share/man/man2/setresuid.2
-#usr/share/man/man2/setreuid.2
-#usr/share/man/man2/setrlimit.2
-#usr/share/man/man2/setsid.2
-#usr/share/man/man2/setsockopt.2
-#usr/share/man/man2/settimeofday.2
-#usr/share/man/man2/setuid.2
-#usr/share/man/man2/setup.2
-#usr/share/man/man2/setxattr.2
-#usr/share/man/man2/sgetmask.2
-#usr/share/man/man2/shmat.2
-#usr/share/man/man2/shmctl.2
-#usr/share/man/man2/shmdt.2
-#usr/share/man/man2/shmget.2
-#usr/share/man/man2/shmop.2
-#usr/share/man/man2/shutdown.2
-#usr/share/man/man2/sigaction.2
-#usr/share/man/man2/sigaltstack.2
-#usr/share/man/man2/signal.2
-#usr/share/man/man2/sigpending.2
-#usr/share/man/man2/sigprocmask.2
-#usr/share/man/man2/sigqueue.2
-#usr/share/man/man2/sigreturn.2
-#usr/share/man/man2/sigsuspend.2
-#usr/share/man/man2/sigtimedwait.2
-#usr/share/man/man2/sigwaitinfo.2
-#usr/share/man/man2/socket.2
-#usr/share/man/man2/socketcall.2
-#usr/share/man/man2/socketpair.2
-#usr/share/man/man2/ssetmask.2
-#usr/share/man/man2/stat.2
-#usr/share/man/man2/statfs.2
-#usr/share/man/man2/statvfs.2
-#usr/share/man/man2/stime.2
-#usr/share/man/man2/stty.2
-#usr/share/man/man2/swapoff.2
-#usr/share/man/man2/swapon.2
-#usr/share/man/man2/symlink.2
-#usr/share/man/man2/symlinkat.2
-#usr/share/man/man2/sync.2
-#usr/share/man/man2/syscall.2
-#usr/share/man/man2/syscalls.2
-#usr/share/man/man2/sysctl.2
-#usr/share/man/man2/sysfs.2
-#usr/share/man/man2/sysinfo.2
-#usr/share/man/man2/syslog.2
-#usr/share/man/man2/tgkill.2
-#usr/share/man/man2/time.2
-#usr/share/man/man2/times.2
-#usr/share/man/man2/tkill.2
-#usr/share/man/man2/truncate.2
-#usr/share/man/man2/umask.2
-#usr/share/man/man2/umount.2
-#usr/share/man/man2/umount2.2
-#usr/share/man/man2/uname.2
-#usr/share/man/man2/undocumented.2
-#usr/share/man/man2/unimplemented.2
-#usr/share/man/man2/unlink.2
-#usr/share/man/man2/unlinkat.2
-#usr/share/man/man2/unshare.2
-#usr/share/man/man2/uselib.2
-#usr/share/man/man2/ustat.2
-#usr/share/man/man2/utime.2
-#usr/share/man/man2/utimes.2
-#usr/share/man/man2/vfork.2
-#usr/share/man/man2/vhangup.2
-#usr/share/man/man2/vm86.2
-#usr/share/man/man2/vm86old.2
-#usr/share/man/man2/wait.2
-#usr/share/man/man2/wait3.2
-#usr/share/man/man2/wait4.2
-#usr/share/man/man2/waitid.2
-#usr/share/man/man2/waitpid.2
-#usr/share/man/man2/write.2
-#usr/share/man/man2/writev.2
-#usr/share/man/man3/CMSG_ALIGN.3
-#usr/share/man/man3/CMSG_FIRSTHDR.3
-#usr/share/man/man3/CMSG_NXTHDR.3
-#usr/share/man/man3/CMSG_SPACE.3
-#usr/share/man/man3/CPU_CLR.3
-#usr/share/man/man3/CPU_ISSET.3
-#usr/share/man/man3/CPU_SET.3
-#usr/share/man/man3/CPU_ZERO.3
-#usr/share/man/man3/FD_CLR.3
-#usr/share/man/man3/FD_ISSET.3
-#usr/share/man/man3/FD_SET.3
-#usr/share/man/man3/FD_ZERO.3
-#usr/share/man/man3/HUGE_VAL.3
-#usr/share/man/man3/HUGE_VALF.3
-#usr/share/man/man3/HUGE_VALL.3
-#usr/share/man/man3/INFINITY.3
-#usr/share/man/man3/MB_CUR_MAX.3
-#usr/share/man/man3/MB_LEN_MAX.3
-#usr/share/man/man3/NAN.3
-#usr/share/man/man3/__fbufsize.3
-#usr/share/man/man3/__flbf.3
-#usr/share/man/man3/__fpending.3
-#usr/share/man/man3/__fpurge.3
-#usr/share/man/man3/__freadable.3
-#usr/share/man/man3/__freading.3
-#usr/share/man/man3/__fsetlocking.3
-#usr/share/man/man3/__fwritable.3
-#usr/share/man/man3/__fwriting.3
-#usr/share/man/man3/__malloc_hook.3
-#usr/share/man/man3/__setfpucw.3
-#usr/share/man/man3/_flushlbf.3
-#usr/share/man/man3/a64l.3
-#usr/share/man/man3/abort.3
-#usr/share/man/man3/abs.3
-#usr/share/man/man3/acos.3
-#usr/share/man/man3/acosf.3
-#usr/share/man/man3/acosh.3
-#usr/share/man/man3/acoshf.3
-#usr/share/man/man3/acoshl.3
-#usr/share/man/man3/acosl.3
-#usr/share/man/man3/addmntent.3
-#usr/share/man/man3/addseverity.3
-#usr/share/man/man3/adjtime.3
-#usr/share/man/man3/aio_cancel.3
-#usr/share/man/man3/aio_error.3
-#usr/share/man/man3/aio_fsync.3
-#usr/share/man/man3/aio_read.3
-#usr/share/man/man3/aio_return.3
-#usr/share/man/man3/aio_suspend.3
-#usr/share/man/man3/aio_write.3
-#usr/share/man/man3/alloca.3
-#usr/share/man/man3/alphasort.3
-#usr/share/man/man3/argz_add.3
-#usr/share/man/man3/argz_add_sep.3
-#usr/share/man/man3/argz_append.3
-#usr/share/man/man3/argz_count.3
-#usr/share/man/man3/argz_create.3
-#usr/share/man/man3/argz_create_sep.3
-#usr/share/man/man3/argz_delete.3
-#usr/share/man/man3/argz_extract.3
-#usr/share/man/man3/argz_insert.3
-#usr/share/man/man3/argz_next.3
-#usr/share/man/man3/argz_replace.3
-#usr/share/man/man3/argz_stringify.3
-#usr/share/man/man3/asctime.3
-#usr/share/man/man3/asctime_r.3
-#usr/share/man/man3/asin.3
-#usr/share/man/man3/asinf.3
-#usr/share/man/man3/asinh.3
-#usr/share/man/man3/asinhf.3
-#usr/share/man/man3/asinhl.3
-#usr/share/man/man3/asinl.3
-#usr/share/man/man3/asprintf.3
-#usr/share/man/man3/assert.3
-#usr/share/man/man3/assert_perror.3
-#usr/share/man/man3/atan.3
-#usr/share/man/man3/atan2.3
-#usr/share/man/man3/atan2f.3
-#usr/share/man/man3/atan2l.3
-#usr/share/man/man3/atanf.3
-#usr/share/man/man3/atanh.3
-#usr/share/man/man3/atanhf.3
-#usr/share/man/man3/atanhl.3
-#usr/share/man/man3/atanl.3
-#usr/share/man/man3/atexit.3
-#usr/share/man/man3/atof.3
-#usr/share/man/man3/atoi.3
-#usr/share/man/man3/atol.3
-#usr/share/man/man3/atoll.3
-#usr/share/man/man3/atoq.3
-#usr/share/man/man3/auth_destroy.3
-#usr/share/man/man3/authnone_create.3
-#usr/share/man/man3/authunix_create.3
-#usr/share/man/man3/authunix_create_default.3
-#usr/share/man/man3/basename.3
-#usr/share/man/man3/bcmp.3
-#usr/share/man/man3/bcopy.3
-#usr/share/man/man3/bindresvport.3
-#usr/share/man/man3/bsearch.3
-#usr/share/man/man3/bstring.3
-#usr/share/man/man3/btowc.3
-#usr/share/man/man3/btree.3
-#usr/share/man/man3/byteorder.3
-#usr/share/man/man3/bzero.3
-#usr/share/man/man3/cabs.3
-#usr/share/man/man3/cabsf.3
-#usr/share/man/man3/cabsl.3
-#usr/share/man/man3/cacos.3
-#usr/share/man/man3/cacosf.3
-#usr/share/man/man3/cacosh.3
-#usr/share/man/man3/cacoshf.3
-#usr/share/man/man3/cacoshl.3
-#usr/share/man/man3/cacosl.3
-#usr/share/man/man3/calloc.3
-#usr/share/man/man3/callrpc.3
-#usr/share/man/man3/canonicalize_file_name.3
-#usr/share/man/man3/carg.3
-#usr/share/man/man3/cargf.3
-#usr/share/man/man3/cargl.3
-#usr/share/man/man3/casin.3
-#usr/share/man/man3/casinf.3
-#usr/share/man/man3/casinh.3
-#usr/share/man/man3/casinhf.3
-#usr/share/man/man3/casinhl.3
-#usr/share/man/man3/casinl.3
-#usr/share/man/man3/catan.3
-#usr/share/man/man3/catanf.3
-#usr/share/man/man3/catanh.3
-#usr/share/man/man3/catanhf.3
-#usr/share/man/man3/catanhl.3
-#usr/share/man/man3/catanl.3
-#usr/share/man/man3/catclose.3
-#usr/share/man/man3/catgets.3
-#usr/share/man/man3/catopen.3
-#usr/share/man/man3/cbc_crypt.3
-#usr/share/man/man3/cbrt.3
-#usr/share/man/man3/cbrtf.3
-#usr/share/man/man3/cbrtl.3
-#usr/share/man/man3/ccos.3
-#usr/share/man/man3/ccosf.3
-#usr/share/man/man3/ccosh.3
-#usr/share/man/man3/ccoshf.3
-#usr/share/man/man3/ccoshl.3
-#usr/share/man/man3/ccosl.3
-#usr/share/man/man3/ceil.3
-#usr/share/man/man3/ceilf.3
-#usr/share/man/man3/ceill.3
-#usr/share/man/man3/cerf.3
-#usr/share/man/man3/cerfc.3
-#usr/share/man/man3/cerfcf.3
-#usr/share/man/man3/cerfcl.3
-#usr/share/man/man3/cerff.3
-#usr/share/man/man3/cerfl.3
-#usr/share/man/man3/cexp.3
-#usr/share/man/man3/cexp2.3
-#usr/share/man/man3/cexp2f.3
-#usr/share/man/man3/cexp2l.3
-#usr/share/man/man3/cexpf.3
-#usr/share/man/man3/cexpl.3
-#usr/share/man/man3/cfgetispeed.3
-#usr/share/man/man3/cfgetospeed.3
-#usr/share/man/man3/cfmakeraw.3
-#usr/share/man/man3/cfree.3
-#usr/share/man/man3/cfsetispeed.3
-#usr/share/man/man3/cfsetospeed.3
-#usr/share/man/man3/cimag.3
-#usr/share/man/man3/cimagf.3
-#usr/share/man/man3/cimagl.3
-#usr/share/man/man3/clearenv.3
-#usr/share/man/man3/clearerr.3
-#usr/share/man/man3/clearerr_unlocked.3
-#usr/share/man/man3/clnt_broadcast.3
-#usr/share/man/man3/clnt_call.3
-#usr/share/man/man3/clnt_control.3
-#usr/share/man/man3/clnt_create.3
-#usr/share/man/man3/clnt_destroy.3
-#usr/share/man/man3/clnt_freeres.3
-#usr/share/man/man3/clnt_geterr.3
-#usr/share/man/man3/clnt_pcreateerror.3
-#usr/share/man/man3/clnt_perrno.3
-#usr/share/man/man3/clnt_perror.3
-#usr/share/man/man3/clnt_spcreateerror.3
-#usr/share/man/man3/clnt_sperrno.3
-#usr/share/man/man3/clnt_sperror.3
-#usr/share/man/man3/clntraw_create.3
-#usr/share/man/man3/clnttcp_create.3
-#usr/share/man/man3/clntudp_bufcreate.3
-#usr/share/man/man3/clntudp_create.3
-#usr/share/man/man3/clock.3
-#usr/share/man/man3/clock_getres.3
-#usr/share/man/man3/clock_gettime.3
-#usr/share/man/man3/clock_settime.3
-#usr/share/man/man3/clog.3
-#usr/share/man/man3/clog10.3
-#usr/share/man/man3/clog10f.3
-#usr/share/man/man3/clog10l.3
-#usr/share/man/man3/clog2.3
-#usr/share/man/man3/clog2f.3
-#usr/share/man/man3/clog2l.3
-#usr/share/man/man3/clogf.3
-#usr/share/man/man3/clogl.3
-#usr/share/man/man3/closedir.3
-#usr/share/man/man3/closelog.3
-#usr/share/man/man3/cmsg.3
-#usr/share/man/man3/confstr.3
-#usr/share/man/man3/conj.3
-#usr/share/man/man3/conjf.3
-#usr/share/man/man3/conjl.3
-#usr/share/man/man3/copysign.3
-#usr/share/man/man3/copysignf.3
-#usr/share/man/man3/copysignl.3
-#usr/share/man/man3/cos.3
-#usr/share/man/man3/cosf.3
-#usr/share/man/man3/cosh.3
-#usr/share/man/man3/coshf.3
-#usr/share/man/man3/coshl.3
-#usr/share/man/man3/cosl.3
-#usr/share/man/man3/cpow.3
-#usr/share/man/man3/cpowf.3
-#usr/share/man/man3/cpowl.3
-#usr/share/man/man3/cproj.3
-#usr/share/man/man3/cprojf.3
-#usr/share/man/man3/cprojl.3
-#usr/share/man/man3/creal.3
-#usr/share/man/man3/crealf.3
-#usr/share/man/man3/creall.3
-#usr/share/man/man3/crypt.3
-#usr/share/man/man3/csin.3
-#usr/share/man/man3/csinf.3
-#usr/share/man/man3/csinh.3
-#usr/share/man/man3/csinhf.3
-#usr/share/man/man3/csinhl.3
-#usr/share/man/man3/csinl.3
-#usr/share/man/man3/csqrt.3
-#usr/share/man/man3/csqrtf.3
-#usr/share/man/man3/csqrtl.3
-#usr/share/man/man3/ctan.3
-#usr/share/man/man3/ctanf.3
-#usr/share/man/man3/ctanh.3
-#usr/share/man/man3/ctanhf.3
-#usr/share/man/man3/ctanhl.3
-#usr/share/man/man3/ctanl.3
-#usr/share/man/man3/ctermid.3
-#usr/share/man/man3/ctime.3
-#usr/share/man/man3/ctime_r.3
-#usr/share/man/man3/cuserid.3
-#usr/share/man/man3/daemon.3
-#usr/share/man/man3/db.3
-#usr/share/man/man3/dbopen.3
-#usr/share/man/man3/des_crypt.3
-#usr/share/man/man3/des_setparity.3
-#usr/share/man/man3/difftime.3
-#usr/share/man/man3/dirfd.3
-#usr/share/man/man3/dirname.3
-#usr/share/man/man3/div.3
-#usr/share/man/man3/dl_iterate_phdr.3
-#usr/share/man/man3/dladdr.3
-#usr/share/man/man3/dlclose.3
-#usr/share/man/man3/dlerror.3
-#usr/share/man/man3/dlopen.3
-#usr/share/man/man3/dlsym.3
-#usr/share/man/man3/dlvsym.3
-#usr/share/man/man3/dn_comp.3
-#usr/share/man/man3/dn_expand.3
-#usr/share/man/man3/dprintf.3
-#usr/share/man/man3/drand48.3
-#usr/share/man/man3/drand48_r.3
-#usr/share/man/man3/drem.3
-#usr/share/man/man3/dremf.3
-#usr/share/man/man3/dreml.3
-#usr/share/man/man3/dysize.3
-#usr/share/man/man3/ecb_crypt.3
-#usr/share/man/man3/ecvt.3
-#usr/share/man/man3/ecvt_r.3
-#usr/share/man/man3/encrypt.3
-#usr/share/man/man3/endaliasent.3
-#usr/share/man/man3/endfsent.3
-#usr/share/man/man3/endgrent.3
-#usr/share/man/man3/endhostent.3
-#usr/share/man/man3/endmntent.3
-#usr/share/man/man3/endnetent.3
-#usr/share/man/man3/endnetgrent.3
-#usr/share/man/man3/endprotoent.3
-#usr/share/man/man3/endpwent.3
-#usr/share/man/man3/endrpcent.3
-#usr/share/man/man3/endservent.3
-#usr/share/man/man3/endspent.3
-#usr/share/man/man3/endttyent.3
-#usr/share/man/man3/endusershell.3
-#usr/share/man/man3/endutent.3
-#usr/share/man/man3/endutxent.3
-#usr/share/man/man3/envz_add.3
-#usr/share/man/man3/envz_entry.3
-#usr/share/man/man3/envz_get.3
-#usr/share/man/man3/envz_merge.3
-#usr/share/man/man3/envz_remove.3
-#usr/share/man/man3/envz_strip.3
-#usr/share/man/man3/erand48.3
-#usr/share/man/man3/erand48_r.3
-#usr/share/man/man3/erf.3
-#usr/share/man/man3/erfc.3
-#usr/share/man/man3/erfcf.3
-#usr/share/man/man3/erfcl.3
-#usr/share/man/man3/erff.3
-#usr/share/man/man3/erfl.3
-#usr/share/man/man3/err.3
-#usr/share/man/man3/errno.3
-#usr/share/man/man3/error.3
-#usr/share/man/man3/error_at_line.3
-#usr/share/man/man3/error_message_count.3
-#usr/share/man/man3/error_on_per_line.3
-#usr/share/man/man3/error_print_progname.3
-#usr/share/man/man3/errx.3
-#usr/share/man/man3/ether_aton.3
-#usr/share/man/man3/ether_aton_r.3
-#usr/share/man/man3/ether_hostton.3
-#usr/share/man/man3/ether_line.3
-#usr/share/man/man3/ether_ntoa.3
-#usr/share/man/man3/ether_ntoa_r.3
-#usr/share/man/man3/ether_ntohost.3
-#usr/share/man/man3/exec.3
-#usr/share/man/man3/execl.3
-#usr/share/man/man3/execle.3
-#usr/share/man/man3/execlp.3
-#usr/share/man/man3/execv.3
-#usr/share/man/man3/execvp.3
-#usr/share/man/man3/exit.3
-#usr/share/man/man3/exp.3
-#usr/share/man/man3/exp10.3
-#usr/share/man/man3/exp10f.3
-#usr/share/man/man3/exp10l.3
-#usr/share/man/man3/exp2.3
-#usr/share/man/man3/exp2f.3
-#usr/share/man/man3/exp2l.3
-#usr/share/man/man3/expf.3
-#usr/share/man/man3/expl.3
-#usr/share/man/man3/expm1.3
-#usr/share/man/man3/expm1f.3
-#usr/share/man/man3/expm1l.3
-#usr/share/man/man3/fabs.3
-#usr/share/man/man3/fabsf.3
-#usr/share/man/man3/fabsl.3
-#usr/share/man/man3/fclose.3
-#usr/share/man/man3/fcloseall.3
-#usr/share/man/man3/fcvt.3
-#usr/share/man/man3/fcvt_r.3
-#usr/share/man/man3/fdim.3
-#usr/share/man/man3/fdimf.3
-#usr/share/man/man3/fdiml.3
-#usr/share/man/man3/fdopen.3
-#usr/share/man/man3/feclearexcept.3
-#usr/share/man/man3/fedisableexcept.3
-#usr/share/man/man3/feenableexcept.3
-#usr/share/man/man3/fegetenv.3
-#usr/share/man/man3/fegetexcept.3
-#usr/share/man/man3/fegetexceptflag.3
-#usr/share/man/man3/fegetround.3
-#usr/share/man/man3/feholdexcept.3
-#usr/share/man/man3/fenv.3
-#usr/share/man/man3/feof.3
-#usr/share/man/man3/feof_unlocked.3
-#usr/share/man/man3/feraiseexcept.3
-#usr/share/man/man3/ferror.3
-#usr/share/man/man3/ferror_unlocked.3
-#usr/share/man/man3/fesetenv.3
-#usr/share/man/man3/fesetexceptflag.3
-#usr/share/man/man3/fesetround.3
-#usr/share/man/man3/fetestexcept.3
-#usr/share/man/man3/feupdateenv.3
-#usr/share/man/man3/fexecve.3
-#usr/share/man/man3/fflush.3
-#usr/share/man/man3/fflush_unlocked.3
-#usr/share/man/man3/ffs.3
-#usr/share/man/man3/ffsl.3
-#usr/share/man/man3/ffsll.3
-#usr/share/man/man3/fgetc.3
-#usr/share/man/man3/fgetc_unlocked.3
-#usr/share/man/man3/fgetgrent.3
-#usr/share/man/man3/fgetgrent_r.3
-#usr/share/man/man3/fgetpos.3
-#usr/share/man/man3/fgetpwent.3
-#usr/share/man/man3/fgetpwent_r.3
-#usr/share/man/man3/fgets.3
-#usr/share/man/man3/fgets_unlocked.3
-#usr/share/man/man3/fgetspent.3
-#usr/share/man/man3/fgetspent_r.3
-#usr/share/man/man3/fgetwc.3
-#usr/share/man/man3/fgetwc_unlocked.3
-#usr/share/man/man3/fgetws.3
-#usr/share/man/man3/fgetws_unlocked.3
-#usr/share/man/man3/fileno.3
-#usr/share/man/man3/fileno_unlocked.3
-#usr/share/man/man3/finite.3
-#usr/share/man/man3/finitef.3
-#usr/share/man/man3/finitel.3
-#usr/share/man/man3/flockfile.3
-#usr/share/man/man3/floor.3
-#usr/share/man/man3/floorf.3
-#usr/share/man/man3/floorl.3
-#usr/share/man/man3/fma.3
-#usr/share/man/man3/fmaf.3
-#usr/share/man/man3/fmal.3
-#usr/share/man/man3/fmax.3
-#usr/share/man/man3/fmaxf.3
-#usr/share/man/man3/fmaxl.3
-#usr/share/man/man3/fmemopen.3
-#usr/share/man/man3/fmin.3
-#usr/share/man/man3/fminf.3
-#usr/share/man/man3/fminl.3
-#usr/share/man/man3/fmod.3
-#usr/share/man/man3/fmodf.3
-#usr/share/man/man3/fmodl.3
-#usr/share/man/man3/fmtmsg.3
-#usr/share/man/man3/fnmatch.3
-#usr/share/man/man3/fopen.3
-#usr/share/man/man3/forkpty.3
-#usr/share/man/man3/fpathconf.3
-#usr/share/man/man3/fpclassify.3
-#usr/share/man/man3/fprintf.3
-#usr/share/man/man3/fpurge.3
-#usr/share/man/man3/fputc.3
-#usr/share/man/man3/fputc_unlocked.3
-#usr/share/man/man3/fputs.3
-#usr/share/man/man3/fputs_unlocked.3
-#usr/share/man/man3/fputwc.3
-#usr/share/man/man3/fputwc_unlocked.3
-#usr/share/man/man3/fputws.3
-#usr/share/man/man3/fputws_unlocked.3
-#usr/share/man/man3/fread.3
-#usr/share/man/man3/fread_unlocked.3
-#usr/share/man/man3/free.3
-#usr/share/man/man3/freeaddrinfo.3
-#usr/share/man/man3/freehostent.3
-#usr/share/man/man3/freopen.3
-#usr/share/man/man3/frexp.3
-#usr/share/man/man3/frexpf.3
-#usr/share/man/man3/frexpl.3
-#usr/share/man/man3/fscanf.3
-#usr/share/man/man3/fseek.3
-#usr/share/man/man3/fseeko.3
-#usr/share/man/man3/fsetpos.3
-#usr/share/man/man3/ftell.3
-#usr/share/man/man3/ftello.3
-#usr/share/man/man3/ftime.3
-#usr/share/man/man3/ftok.3
-#usr/share/man/man3/ftrylockfile.3
-#usr/share/man/man3/fts.3
-#usr/share/man/man3/fts_children.3
-#usr/share/man/man3/fts_close.3
-#usr/share/man/man3/fts_open.3
-#usr/share/man/man3/fts_read.3
-#usr/share/man/man3/fts_set.3
-#usr/share/man/man3/ftw.3
-#usr/share/man/man3/funlockfile.3
-#usr/share/man/man3/futimes.3
-#usr/share/man/man3/fwide.3
-#usr/share/man/man3/fwprintf.3
-#usr/share/man/man3/fwrite.3
-#usr/share/man/man3/fwrite_unlocked.3
-#usr/share/man/man3/gai_strerror.3
-#usr/share/man/man3/gamma.3
-#usr/share/man/man3/gammaf.3
-#usr/share/man/man3/gammal.3
-#usr/share/man/man3/gcvt.3
-#usr/share/man/man3/get_current_dir_name.3
-#usr/share/man/man3/get_myaddress.3
-#usr/share/man/man3/getaddrinfo.3
-#usr/share/man/man3/getaliasbyname.3
-#usr/share/man/man3/getaliasbyname_r.3
-#usr/share/man/man3/getaliasent.3
-#usr/share/man/man3/getaliasent_r.3
-#usr/share/man/man3/getc.3
-#usr/share/man/man3/getc_unlocked.3
-#usr/share/man/man3/getchar.3
-#usr/share/man/man3/getchar_unlocked.3
-#usr/share/man/man3/getcwd.3
-#usr/share/man/man3/getdate.3
-#usr/share/man/man3/getdate_r.3
-#usr/share/man/man3/getdelim.3
-#usr/share/man/man3/getdirentries.3
-#usr/share/man/man3/getenv.3
-#usr/share/man/man3/getfsent.3
-#usr/share/man/man3/getfsfile.3
-#usr/share/man/man3/getfsspec.3
-#usr/share/man/man3/getgrent.3
-#usr/share/man/man3/getgrent_r.3
-#usr/share/man/man3/getgrgid.3
-#usr/share/man/man3/getgrgid_r.3
-#usr/share/man/man3/getgrnam.3
-#usr/share/man/man3/getgrnam_r.3
-#usr/share/man/man3/getgrouplist.3
-#usr/share/man/man3/gethostbyaddr.3
-#usr/share/man/man3/gethostbyname.3
-#usr/share/man/man3/gethostbyname2.3
-#usr/share/man/man3/gethostbyname2_r.3
-#usr/share/man/man3/gethostbyname_r.3
-#usr/share/man/man3/gethostent.3
-#usr/share/man/man3/gethostent_r.3
-#usr/share/man/man3/getipnodebyaddr.3
-#usr/share/man/man3/getipnodebyname.3
-#usr/share/man/man3/getline.3
-#usr/share/man/man3/getloadavg.3
-#usr/share/man/man3/getlogin.3
-#usr/share/man/man3/getlogin_r.3
-#usr/share/man/man3/getmntent.3
-#usr/share/man/man3/getmntent_r.3
-#usr/share/man/man3/getnameinfo.3
-#usr/share/man/man3/getnetbyaddr.3
-#usr/share/man/man3/getnetbyname.3
-#usr/share/man/man3/getnetent.3
-#usr/share/man/man3/getnetgrent.3
-#usr/share/man/man3/getnetgrent_r.3
-#usr/share/man/man3/getopt.3
-#usr/share/man/man3/getopt_long.3
-#usr/share/man/man3/getopt_long_only.3
-#usr/share/man/man3/getpass.3
-#usr/share/man/man3/getprotobyname.3
-#usr/share/man/man3/getprotobynumber.3
-#usr/share/man/man3/getprotoent.3
-#usr/share/man/man3/getpt.3
-#usr/share/man/man3/getpw.3
-#usr/share/man/man3/getpwent.3
-#usr/share/man/man3/getpwent_r.3
-#usr/share/man/man3/getpwnam.3
-#usr/share/man/man3/getpwnam_r.3
-#usr/share/man/man3/getpwuid.3
-#usr/share/man/man3/getpwuid_r.3
-#usr/share/man/man3/getrpcbyname.3
-#usr/share/man/man3/getrpcbynumber.3
-#usr/share/man/man3/getrpcent.3
-#usr/share/man/man3/getrpcport.3
-#usr/share/man/man3/gets.3
-#usr/share/man/man3/getservbyname.3
-#usr/share/man/man3/getservbyport.3
-#usr/share/man/man3/getservent.3
-#usr/share/man/man3/getspent.3
-#usr/share/man/man3/getspent_r.3
-#usr/share/man/man3/getspnam.3
-#usr/share/man/man3/getspnam_r.3
-#usr/share/man/man3/getttyent.3
-#usr/share/man/man3/getttynam.3
-#usr/share/man/man3/getumask.3
-#usr/share/man/man3/getusershell.3
-#usr/share/man/man3/getutent.3
-#usr/share/man/man3/getutent_r.3
-#usr/share/man/man3/getutid.3
-#usr/share/man/man3/getutid_r.3
-#usr/share/man/man3/getutline.3
-#usr/share/man/man3/getutline_r.3
-#usr/share/man/man3/getutxent.3
-#usr/share/man/man3/getutxid.3
-#usr/share/man/man3/getutxline.3
-#usr/share/man/man3/getw.3
-#usr/share/man/man3/getwc.3
-#usr/share/man/man3/getwc_unlocked.3
-#usr/share/man/man3/getwchar.3
-#usr/share/man/man3/getwchar_unlocked.3
-#usr/share/man/man3/getwd.3
-#usr/share/man/man3/glob.3
-#usr/share/man/man3/globfree.3
-#usr/share/man/man3/gmtime.3
-#usr/share/man/man3/gmtime_r.3
-#usr/share/man/man3/grantpt.3
-#usr/share/man/man3/gsignal.3
-#usr/share/man/man3/hash.3
-#usr/share/man/man3/hasmntopt.3
-#usr/share/man/man3/hcreate.3
-#usr/share/man/man3/hcreate_r.3
-#usr/share/man/man3/hdestroy.3
-#usr/share/man/man3/hdestroy_r.3
-#usr/share/man/man3/herror.3
-#usr/share/man/man3/hsearch.3
-#usr/share/man/man3/hsearch_r.3
-#usr/share/man/man3/hstrerror.3
-#usr/share/man/man3/htonl.3
-#usr/share/man/man3/htons.3
-#usr/share/man/man3/hypot.3
-#usr/share/man/man3/hypotf.3
-#usr/share/man/man3/hypotl.3
-#usr/share/man/man3/iconv.3
-#usr/share/man/man3/iconv_close.3
-#usr/share/man/man3/iconv_open.3
-#usr/share/man/man3/ilogb.3
-#usr/share/man/man3/ilogbf.3
-#usr/share/man/man3/ilogbl.3
-#usr/share/man/man3/imaxabs.3
-#usr/share/man/man3/imaxdiv.3
-#usr/share/man/man3/index.3
-#usr/share/man/man3/inet.3
-#usr/share/man/man3/inet_addr.3
-#usr/share/man/man3/inet_aton.3
-#usr/share/man/man3/inet_lnaof.3
-#usr/share/man/man3/inet_makeaddr.3
-#usr/share/man/man3/inet_netof.3
-#usr/share/man/man3/inet_network.3
-#usr/share/man/man3/inet_ntoa.3
-#usr/share/man/man3/inet_ntop.3
-#usr/share/man/man3/inet_pton.3
-#usr/share/man/man3/infnan.3
-#usr/share/man/man3/initgroups.3
-#usr/share/man/man3/initstate.3
-#usr/share/man/man3/innetgr.3
-#usr/share/man/man3/insque.3
-#usr/share/man/man3/intro.3
-#usr/share/man/man3/iruserok.3
-#usr/share/man/man3/isalnum.3
-#usr/share/man/man3/isalpha.3
-#usr/share/man/man3/isascii.3
-#usr/share/man/man3/isatty.3
-#usr/share/man/man3/isblank.3
-#usr/share/man/man3/iscntrl.3
-#usr/share/man/man3/isdigit.3
-#usr/share/man/man3/isfinite.3
-#usr/share/man/man3/isgraph.3
-#usr/share/man/man3/isgreater.3
-#usr/share/man/man3/isgreaterequal.3
-#usr/share/man/man3/isinf.3
-#usr/share/man/man3/isinff.3
-#usr/share/man/man3/isinfl.3
-#usr/share/man/man3/isless.3
-#usr/share/man/man3/islessequal.3
-#usr/share/man/man3/islessgreater.3
-#usr/share/man/man3/islower.3
-#usr/share/man/man3/isnan.3
-#usr/share/man/man3/isnormal.3
-#usr/share/man/man3/isprint.3
-#usr/share/man/man3/ispunct.3
-#usr/share/man/man3/isspace.3
-#usr/share/man/man3/isunordered.3
-#usr/share/man/man3/isupper.3
-#usr/share/man/man3/iswalnum.3
-#usr/share/man/man3/iswalpha.3
-#usr/share/man/man3/iswblank.3
-#usr/share/man/man3/iswcntrl.3
-#usr/share/man/man3/iswctype.3
-#usr/share/man/man3/iswdigit.3
-#usr/share/man/man3/iswgraph.3
-#usr/share/man/man3/iswlower.3
-#usr/share/man/man3/iswprint.3
-#usr/share/man/man3/iswpunct.3
-#usr/share/man/man3/iswspace.3
-#usr/share/man/man3/iswupper.3
-#usr/share/man/man3/iswxdigit.3
-#usr/share/man/man3/isxdigit.3
-#usr/share/man/man3/j0.3
-#usr/share/man/man3/j0f.3
-#usr/share/man/man3/j0l.3
-#usr/share/man/man3/j1.3
-#usr/share/man/man3/j1f.3
-#usr/share/man/man3/j1l.3
-#usr/share/man/man3/jn.3
-#usr/share/man/man3/jnf.3
-#usr/share/man/man3/jnl.3
-#usr/share/man/man3/jrand48.3
-#usr/share/man/man3/jrand48_r.3
-#usr/share/man/man3/key_decryptsession.3
-#usr/share/man/man3/key_encryptsession.3
-#usr/share/man/man3/key_gendes.3
-#usr/share/man/man3/key_secretkey_is_set.3
-#usr/share/man/man3/key_setsecret.3
-#usr/share/man/man3/killpg.3
-#usr/share/man/man3/klogctl.3
-#usr/share/man/man3/l64a.3
-#usr/share/man/man3/labs.3
-#usr/share/man/man3/lckpwdf.3
-#usr/share/man/man3/lcong48.3
-#usr/share/man/man3/lcong48_r.3
-#usr/share/man/man3/ldexp.3
-#usr/share/man/man3/ldexpf.3
-#usr/share/man/man3/ldexpl.3
-#usr/share/man/man3/ldiv.3
-#usr/share/man/man3/lfind.3
-#usr/share/man/man3/lgamma.3
-#usr/share/man/man3/lgamma_r.3
-#usr/share/man/man3/lgammaf.3
-#usr/share/man/man3/lgammaf_r.3
-#usr/share/man/man3/lgammal.3
-#usr/share/man/man3/lgammal_r.3
-#usr/share/man/man3/llabs.3
-#usr/share/man/man3/lldiv.3
-#usr/share/man/man3/llrint.3
-#usr/share/man/man3/llrintf.3
-#usr/share/man/man3/llrintl.3
-#usr/share/man/man3/llround.3
-#usr/share/man/man3/llroundf.3
-#usr/share/man/man3/llroundl.3
-#usr/share/man/man3/localeconv.3
-#usr/share/man/man3/localtime.3
-#usr/share/man/man3/localtime_r.3
-#usr/share/man/man3/lockf.3
-#usr/share/man/man3/log.3
-#usr/share/man/man3/log10.3
-#usr/share/man/man3/log10f.3
-#usr/share/man/man3/log10l.3
-#usr/share/man/man3/log1p.3
-#usr/share/man/man3/log1pf.3
-#usr/share/man/man3/log1pl.3
-#usr/share/man/man3/log2.3
-#usr/share/man/man3/log2f.3
-#usr/share/man/man3/log2l.3
-#usr/share/man/man3/logb.3
-#usr/share/man/man3/logbf.3
-#usr/share/man/man3/logbl.3
-#usr/share/man/man3/logf.3
-#usr/share/man/man3/login.3
-#usr/share/man/man3/login_tty.3
-#usr/share/man/man3/logl.3
-#usr/share/man/man3/logout.3
-#usr/share/man/man3/logwtmp.3
-#usr/share/man/man3/longjmp.3
-#usr/share/man/man3/lrand48.3
-#usr/share/man/man3/lrand48_r.3
-#usr/share/man/man3/lrint.3
-#usr/share/man/man3/lrintf.3
-#usr/share/man/man3/lrintl.3
-#usr/share/man/man3/lround.3
-#usr/share/man/man3/lroundf.3
-#usr/share/man/man3/lroundl.3
-#usr/share/man/man3/lsearch.3
-#usr/share/man/man3/lseek64.3
-#usr/share/man/man3/makecontext.3
-#usr/share/man/man3/malloc.3
-#usr/share/man/man3/malloc_hook.3
-#usr/share/man/man3/mblen.3
-#usr/share/man/man3/mbrlen.3
-#usr/share/man/man3/mbrtowc.3
-#usr/share/man/man3/mbsinit.3
-#usr/share/man/man3/mbsnrtowcs.3
-#usr/share/man/man3/mbsrtowcs.3
-#usr/share/man/man3/mbstowcs.3
-#usr/share/man/man3/mbtowc.3
-#usr/share/man/man3/memalign.3
-#usr/share/man/man3/memccpy.3
-#usr/share/man/man3/memchr.3
-#usr/share/man/man3/memcmp.3
-#usr/share/man/man3/memcpy.3
-#usr/share/man/man3/memfrob.3
-#usr/share/man/man3/memmem.3
-#usr/share/man/man3/memmove.3
-#usr/share/man/man3/mempcpy.3
-#usr/share/man/man3/memrchr.3
-#usr/share/man/man3/memset.3
-#usr/share/man/man3/mkdtemp.3
-#usr/share/man/man3/mkfifo.3
-#usr/share/man/man3/mkfifoat.3
-#usr/share/man/man3/mkstemp.3
-#usr/share/man/man3/mktemp.3
-#usr/share/man/man3/mktime.3
-#usr/share/man/man3/mmap64.3
-#usr/share/man/man3/modf.3
-#usr/share/man/man3/modff.3
-#usr/share/man/man3/modfl.3
-#usr/share/man/man3/mpool.3
-#usr/share/man/man3/mq_close.3
-#usr/share/man/man3/mq_getattr.3
-#usr/share/man/man3/mq_notify.3
-#usr/share/man/man3/mq_open.3
-#usr/share/man/man3/mq_receive.3
-#usr/share/man/man3/mq_send.3
-#usr/share/man/man3/mq_setattr.3
-#usr/share/man/man3/mq_timedreceive.3
-#usr/share/man/man3/mq_timedsend.3
-#usr/share/man/man3/mq_unlink.3
-#usr/share/man/man3/mrand48.3
-#usr/share/man/man3/mrand48_r.3
-#usr/share/man/man3/mtrace.3
-#usr/share/man/man3/muntrace.3
-#usr/share/man/man3/nan.3
-#usr/share/man/man3/nanf.3
-#usr/share/man/man3/nanl.3
-#usr/share/man/man3/nearbyint.3
-#usr/share/man/man3/nearbyintf.3
-#usr/share/man/man3/nearbyintl.3
-#usr/share/man/man3/netlink.3
-#usr/share/man/man3/nextafter.3
-#usr/share/man/man3/nextafterf.3
-#usr/share/man/man3/nextafterl.3
-#usr/share/man/man3/nexttoward.3
-#usr/share/man/man3/nexttowardf.3
-#usr/share/man/man3/nexttowardl.3
-#usr/share/man/man3/nftw.3
-#usr/share/man/man3/nl_langinfo.3
-#usr/share/man/man3/nrand48.3
-#usr/share/man/man3/nrand48_r.3
-#usr/share/man/man3/ntohl.3
-#usr/share/man/man3/ntohs.3
-#usr/share/man/man3/offsetof.3
-#usr/share/man/man3/on_exit.3
-#usr/share/man/man3/open_memstream.3
-#usr/share/man/man3/opendir.3
-#usr/share/man/man3/openlog.3
-#usr/share/man/man3/openpty.3
-#usr/share/man/man3/passwd2des.3
-#usr/share/man/man3/pathconf.3
-#usr/share/man/man3/pclose.3
-#usr/share/man/man3/perror.3
-#usr/share/man/man3/pmap_getmaps.3
-#usr/share/man/man3/pmap_getport.3
-#usr/share/man/man3/pmap_rmtcall.3
-#usr/share/man/man3/pmap_set.3
-#usr/share/man/man3/pmap_unset.3
-#usr/share/man/man3/popen.3
-#usr/share/man/man3/posix_fallocate.3
-#usr/share/man/man3/posix_memalign.3
-#usr/share/man/man3/posix_openpt.3
-#usr/share/man/man3/pow.3
-#usr/share/man/man3/pow10.3
-#usr/share/man/man3/pow10f.3
-#usr/share/man/man3/pow10l.3
-#usr/share/man/man3/powf.3
-#usr/share/man/man3/powl.3
-#usr/share/man/man3/printf.3
-#usr/share/man/man3/profil.3
-#usr/share/man/man3/program_invocation_name.3
-#usr/share/man/man3/program_invocation_short_name.3
-#usr/share/man/man3/psignal.3
-#usr/share/man/man3/ptsname.3
-#usr/share/man/man3/ptsname_r.3
-#usr/share/man/man3/putc.3
-#usr/share/man/man3/putc_unlocked.3
-#usr/share/man/man3/putchar.3
-#usr/share/man/man3/putchar_unlocked.3
-#usr/share/man/man3/putenv.3
-#usr/share/man/man3/putgrent.3
-#usr/share/man/man3/putpwent.3
-#usr/share/man/man3/puts.3
-#usr/share/man/man3/putspent.3
-#usr/share/man/man3/pututline.3
-#usr/share/man/man3/pututxline.3
-#usr/share/man/man3/putw.3
-#usr/share/man/man3/putwc.3
-#usr/share/man/man3/putwc_unlocked.3
-#usr/share/man/man3/putwchar.3
-#usr/share/man/man3/putwchar_unlocked.3
-#usr/share/man/man3/qecvt.3
-#usr/share/man/man3/qecvt_r.3
-#usr/share/man/man3/qfcvt.3
-#usr/share/man/man3/qfcvt_r.3
-#usr/share/man/man3/qgcvt.3
-#usr/share/man/man3/qsort.3
-#usr/share/man/man3/queue.3
-#usr/share/man/man3/raise.3
-#usr/share/man/man3/rand.3
-#usr/share/man/man3/rand_r.3
-#usr/share/man/man3/random.3
-#usr/share/man/man3/rcmd.3
-#usr/share/man/man3/re_comp.3
-#usr/share/man/man3/re_exec.3
-#usr/share/man/man3/readdir.3
-#usr/share/man/man3/realloc.3
-#usr/share/man/man3/realpath.3
-#usr/share/man/man3/recno.3
-#usr/share/man/man3/regcomp.3
-#usr/share/man/man3/regerror.3
-#usr/share/man/man3/regex.3
-#usr/share/man/man3/regexec.3
-#usr/share/man/man3/regfree.3
-#usr/share/man/man3/registerrpc.3
-#usr/share/man/man3/remainder.3
-#usr/share/man/man3/remainderf.3
-#usr/share/man/man3/remainderl.3
-#usr/share/man/man3/remove.3
-#usr/share/man/man3/remque.3
-#usr/share/man/man3/remquo.3
-#usr/share/man/man3/remquof.3
-#usr/share/man/man3/remquol.3
-#usr/share/man/man3/res_init.3
-#usr/share/man/man3/res_mkquery.3
-#usr/share/man/man3/res_query.3
-#usr/share/man/man3/res_querydomain.3
-#usr/share/man/man3/res_search.3
-#usr/share/man/man3/res_send.3
-#usr/share/man/man3/resolver.3
-#usr/share/man/man3/rewind.3
-#usr/share/man/man3/rewinddir.3
-#usr/share/man/man3/rexec.3
-#usr/share/man/man3/rindex.3
-#usr/share/man/man3/rint.3
-#usr/share/man/man3/rintf.3
-#usr/share/man/man3/rintl.3
-#usr/share/man/man3/round.3
-#usr/share/man/man3/roundf.3
-#usr/share/man/man3/roundl.3
-#usr/share/man/man3/rpc.3
-#usr/share/man/man3/rpmatch.3
-#usr/share/man/man3/rresvport.3
-#usr/share/man/man3/rtime.3
-#usr/share/man/man3/rtnetlink.3
-#usr/share/man/man3/ruserok.3
-#usr/share/man/man3/scalb.3
-#usr/share/man/man3/scalbf.3
-#usr/share/man/man3/scalbl.3
-#usr/share/man/man3/scalbln.3
-#usr/share/man/man3/scalblnf.3
-#usr/share/man/man3/scalblnl.3
-#usr/share/man/man3/scalbn.3
-#usr/share/man/man3/scalbnf.3
-#usr/share/man/man3/scalbnl.3
-#usr/share/man/man3/scandir.3
-#usr/share/man/man3/scanf.3
-#usr/share/man/man3/seed48.3
-#usr/share/man/man3/seed48_r.3
-#usr/share/man/man3/seekdir.3
-#usr/share/man/man3/sem_close.3
-#usr/share/man/man3/sem_destroy.3
-#usr/share/man/man3/sem_getvalue.3
-#usr/share/man/man3/sem_init.3
-#usr/share/man/man3/sem_open.3
-#usr/share/man/man3/sem_post.3
-#usr/share/man/man3/sem_unlink.3
-#usr/share/man/man3/sem_wait.3
-#usr/share/man/man3/setaliasent.3
-#usr/share/man/man3/setbuf.3
-#usr/share/man/man3/setbuffer.3
-#usr/share/man/man3/setenv.3
-#usr/share/man/man3/setfsent.3
-#usr/share/man/man3/setgrent.3
-#usr/share/man/man3/sethostent.3
-#usr/share/man/man3/setjmp.3
-#usr/share/man/man3/setkey.3
-#usr/share/man/man3/setlinebuf.3
-#usr/share/man/man3/setlocale.3
-#usr/share/man/man3/setlogmask.3
-#usr/share/man/man3/setmntent.3
-#usr/share/man/man3/setnetent.3
-#usr/share/man/man3/setnetgrent.3
-#usr/share/man/man3/setprotoent.3
-#usr/share/man/man3/setpwent.3
-#usr/share/man/man3/setrpcent.3
-#usr/share/man/man3/setservent.3
-#usr/share/man/man3/setspent.3
-#usr/share/man/man3/setstate.3
-#usr/share/man/man3/setttyent.3
-#usr/share/man/man3/setusershell.3
-#usr/share/man/man3/setutent.3
-#usr/share/man/man3/setutxent.3
-#usr/share/man/man3/setvbuf.3
-#usr/share/man/man3/sgetspent.3
-#usr/share/man/man3/sgetspent_r.3
-#usr/share/man/man3/shm_open.3
-#usr/share/man/man3/shm_unlink.3
-#usr/share/man/man3/sigaddset.3
-#usr/share/man/man3/sigandset.3
-#usr/share/man/man3/sigblock.3
-#usr/share/man/man3/sigdelset.3
-#usr/share/man/man3/sigemptyset.3
-#usr/share/man/man3/sigfillset.3
-#usr/share/man/man3/siggetmask.3
-#usr/share/man/man3/sighold.3
-#usr/share/man/man3/sigignore.3
-#usr/share/man/man3/siginterrupt.3
-#usr/share/man/man3/sigisemptyset.3
-#usr/share/man/man3/sigismember.3
-#usr/share/man/man3/siglongjmp.3
-#usr/share/man/man3/sigmask.3
-#usr/share/man/man3/signbit.3
-#usr/share/man/man3/signgam.3
-#usr/share/man/man3/significand.3
-#usr/share/man/man3/significandf.3
-#usr/share/man/man3/significandl.3
-#usr/share/man/man3/sigorset.3
-#usr/share/man/man3/sigpause.3
-#usr/share/man/man3/sigrelse.3
-#usr/share/man/man3/sigset.3
-#usr/share/man/man3/sigsetjmp.3
-#usr/share/man/man3/sigsetmask.3
-#usr/share/man/man3/sigsetops.3
-#usr/share/man/man3/sigvec.3
-#usr/share/man/man3/sin.3
-#usr/share/man/man3/sincos.3
-#usr/share/man/man3/sincosf.3
-#usr/share/man/man3/sincosl.3
-#usr/share/man/man3/sinf.3
-#usr/share/man/man3/sinh.3
-#usr/share/man/man3/sinhf.3
-#usr/share/man/man3/sinhl.3
-#usr/share/man/man3/sinl.3
-#usr/share/man/man3/sleep.3
-#usr/share/man/man3/snprintf.3
-#usr/share/man/man3/sockatmark.3
-#usr/share/man/man3/sprintf.3
-#usr/share/man/man3/sqrt.3
-#usr/share/man/man3/sqrtf.3
-#usr/share/man/man3/sqrtl.3
-#usr/share/man/man3/srand.3
-#usr/share/man/man3/srand48.3
-#usr/share/man/man3/srand48_r.3
-#usr/share/man/man3/srandom.3
-#usr/share/man/man3/sscanf.3
-#usr/share/man/man3/ssignal.3
-#usr/share/man/man3/stdarg.3
-#usr/share/man/man3/stderr.3
-#usr/share/man/man3/stdin.3
-#usr/share/man/man3/stdio.3
-#usr/share/man/man3/stdio_ext.3
-#usr/share/man/man3/stdout.3
-#usr/share/man/man3/stpcpy.3
-#usr/share/man/man3/stpncpy.3
-#usr/share/man/man3/strcasecmp.3
-#usr/share/man/man3/strcasestr.3
-#usr/share/man/man3/strcat.3
-#usr/share/man/man3/strchr.3
-#usr/share/man/man3/strchrnul.3
-#usr/share/man/man3/strcmp.3
-#usr/share/man/man3/strcoll.3
-#usr/share/man/man3/strcpy.3
-#usr/share/man/man3/strcspn.3
-#usr/share/man/man3/strdup.3
-#usr/share/man/man3/strdupa.3
-#usr/share/man/man3/strerror.3
-#usr/share/man/man3/strerror_r.3
-#usr/share/man/man3/strfmon.3
-#usr/share/man/man3/strfry.3
-#usr/share/man/man3/strftime.3
-#usr/share/man/man3/string.3
-#usr/share/man/man3/strlen.3
-#usr/share/man/man3/strncasecmp.3
-#usr/share/man/man3/strncat.3
-#usr/share/man/man3/strncmp.3
-#usr/share/man/man3/strncpy.3
-#usr/share/man/man3/strndup.3
-#usr/share/man/man3/strndupa.3
-#usr/share/man/man3/strnlen.3
-#usr/share/man/man3/strpbrk.3
-#usr/share/man/man3/strptime.3
-#usr/share/man/man3/strrchr.3
-#usr/share/man/man3/strsep.3
-#usr/share/man/man3/strsignal.3
-#usr/share/man/man3/strspn.3
-#usr/share/man/man3/strstr.3
-#usr/share/man/man3/strtod.3
-#usr/share/man/man3/strtof.3
-#usr/share/man/man3/strtoimax.3
-#usr/share/man/man3/strtok.3
-#usr/share/man/man3/strtok_r.3
-#usr/share/man/man3/strtol.3
-#usr/share/man/man3/strtold.3
-#usr/share/man/man3/strtoll.3
-#usr/share/man/man3/strtoq.3
-#usr/share/man/man3/strtoul.3
-#usr/share/man/man3/strtoull.3
-#usr/share/man/man3/strtoumax.3
-#usr/share/man/man3/strtouq.3
-#usr/share/man/man3/strverscmp.3
-#usr/share/man/man3/strxfrm.3
-#usr/share/man/man3/svc_destroy.3
-#usr/share/man/man3/svc_freeargs.3
-#usr/share/man/man3/svc_getargs.3
-#usr/share/man/man3/svc_getcaller.3
-#usr/share/man/man3/svc_getreq.3
-#usr/share/man/man3/svc_getreqset.3
-#usr/share/man/man3/svc_register.3
-#usr/share/man/man3/svc_run.3
-#usr/share/man/man3/svc_sendreply.3
-#usr/share/man/man3/svc_unregister.3
-#usr/share/man/man3/svcerr_auth.3
-#usr/share/man/man3/svcerr_decode.3
-#usr/share/man/man3/svcerr_noproc.3
-#usr/share/man/man3/svcerr_noprog.3
-#usr/share/man/man3/svcerr_progvers.3
-#usr/share/man/man3/svcerr_systemerr.3
-#usr/share/man/man3/svcerr_weakauth.3
-#usr/share/man/man3/svcfd_create.3
-#usr/share/man/man3/svcraw_create.3
-#usr/share/man/man3/svctcp_create.3
-#usr/share/man/man3/svcudp_bufcreate.3
-#usr/share/man/man3/svcudp_create.3
-#usr/share/man/man3/swab.3
-#usr/share/man/man3/swapcontext.3
-#usr/share/man/man3/swprintf.3
-#usr/share/man/man3/sysconf.3
-#usr/share/man/man3/syslog.3
-#usr/share/man/man3/system.3
-#usr/share/man/man3/tan.3
-#usr/share/man/man3/tanf.3
-#usr/share/man/man3/tanh.3
-#usr/share/man/man3/tanhf.3
-#usr/share/man/man3/tanhl.3
-#usr/share/man/man3/tanl.3
-#usr/share/man/man3/tcdrain.3
-#usr/share/man/man3/tcflow.3
-#usr/share/man/man3/tcflush.3
-#usr/share/man/man3/tcgetattr.3
-#usr/share/man/man3/tcgetpgrp.3
-#usr/share/man/man3/tcgetsid.3
-#usr/share/man/man3/tcsendbreak.3
-#usr/share/man/man3/tcsetattr.3
-#usr/share/man/man3/tcsetpgrp.3
-#usr/share/man/man3/tdelete.3
-#usr/share/man/man3/tdestroy.3
-#usr/share/man/man3/telldir.3
-#usr/share/man/man3/tempnam.3
-#usr/share/man/man3/termios.3
-#usr/share/man/man3/tfind.3
-#usr/share/man/man3/tgamma.3
-#usr/share/man/man3/tgammaf.3
-#usr/share/man/man3/tgammal.3
-#usr/share/man/man3/timegm.3
-#usr/share/man/man3/timelocal.3
-#usr/share/man/man3/tmpfile.3
-#usr/share/man/man3/tmpnam.3
-#usr/share/man/man3/tmpnam_r.3
-#usr/share/man/man3/toascii.3
-#usr/share/man/man3/tolower.3
-#usr/share/man/man3/toupper.3
-#usr/share/man/man3/towctrans.3
-#usr/share/man/man3/towlower.3
-#usr/share/man/man3/towupper.3
-#usr/share/man/man3/trunc.3
-#usr/share/man/man3/truncf.3
-#usr/share/man/man3/truncl.3
-#usr/share/man/man3/tsearch.3
-#usr/share/man/man3/ttyname.3
-#usr/share/man/man3/ttyname_r.3
-#usr/share/man/man3/ttyslot.3
-#usr/share/man/man3/twalk.3
-#usr/share/man/man3/tzset.3
-#usr/share/man/man3/ualarm.3
-#usr/share/man/man3/ulckpwdf.3
-#usr/share/man/man3/ulimit.3
-#usr/share/man/man3/undocumented.3
-#usr/share/man/man3/ungetc.3
-#usr/share/man/man3/ungetwc.3
-#usr/share/man/man3/unlocked_stdio.3
-#usr/share/man/man3/unlockpt.3
-#usr/share/man/man3/unsetenv.3
-#usr/share/man/man3/updwtmp.3
-#usr/share/man/man3/usleep.3
-#usr/share/man/man3/utmpname.3
-#usr/share/man/man3/va_arg.3
-#usr/share/man/man3/va_copy.3
-#usr/share/man/man3/va_end.3
-#usr/share/man/man3/va_start.3
-#usr/share/man/man3/valloc.3
-#usr/share/man/man3/vasprintf.3
-#usr/share/man/man3/vdprintf.3
-#usr/share/man/man3/verr.3
-#usr/share/man/man3/verrx.3
-#usr/share/man/man3/versionsort.3
-#usr/share/man/man3/vfprintf.3
-#usr/share/man/man3/vfscanf.3
-#usr/share/man/man3/vfwprintf.3
-#usr/share/man/man3/vprintf.3
-#usr/share/man/man3/vscanf.3
-#usr/share/man/man3/vsnprintf.3
-#usr/share/man/man3/vsprintf.3
-#usr/share/man/man3/vsscanf.3
-#usr/share/man/man3/vswprintf.3
-#usr/share/man/man3/vsyslog.3
-#usr/share/man/man3/vwarn.3
-#usr/share/man/man3/vwarnx.3
-#usr/share/man/man3/vwprintf.3
-#usr/share/man/man3/warn.3
-#usr/share/man/man3/warnx.3
-#usr/share/man/man3/wcpcpy.3
-#usr/share/man/man3/wcpncpy.3
-#usr/share/man/man3/wcrtomb.3
-#usr/share/man/man3/wcscasecmp.3
-#usr/share/man/man3/wcscat.3
-#usr/share/man/man3/wcschr.3
-#usr/share/man/man3/wcscmp.3
-#usr/share/man/man3/wcscpy.3
-#usr/share/man/man3/wcscspn.3
-#usr/share/man/man3/wcsdup.3
-#usr/share/man/man3/wcslen.3
-#usr/share/man/man3/wcsncasecmp.3
-#usr/share/man/man3/wcsncat.3
-#usr/share/man/man3/wcsncmp.3
-#usr/share/man/man3/wcsncpy.3
-#usr/share/man/man3/wcsnlen.3
-#usr/share/man/man3/wcsnrtombs.3
-#usr/share/man/man3/wcspbrk.3
-#usr/share/man/man3/wcsrchr.3
-#usr/share/man/man3/wcsrtombs.3
-#usr/share/man/man3/wcsspn.3
-#usr/share/man/man3/wcsstr.3
-#usr/share/man/man3/wcstoimax.3
-#usr/share/man/man3/wcstok.3
-#usr/share/man/man3/wcstombs.3
-#usr/share/man/man3/wcstoumax.3
-#usr/share/man/man3/wcswidth.3
-#usr/share/man/man3/wctob.3
-#usr/share/man/man3/wctomb.3
-#usr/share/man/man3/wctrans.3
-#usr/share/man/man3/wctype.3
-#usr/share/man/man3/wcwidth.3
-#usr/share/man/man3/wmemchr.3
-#usr/share/man/man3/wmemcmp.3
-#usr/share/man/man3/wmemcpy.3
-#usr/share/man/man3/wmemmove.3
-#usr/share/man/man3/wmempcpy.3
-#usr/share/man/man3/wmemset.3
-#usr/share/man/man3/wordexp.3
-#usr/share/man/man3/wordfree.3
-#usr/share/man/man3/wprintf.3
-#usr/share/man/man3/xcrypt.3
-#usr/share/man/man3/xdecrypt.3
-#usr/share/man/man3/xdr.3
-#usr/share/man/man3/xdr_accepted_reply.3
-#usr/share/man/man3/xdr_array.3
-#usr/share/man/man3/xdr_authunix_parms.3
-#usr/share/man/man3/xdr_bool.3
-#usr/share/man/man3/xdr_bytes.3
-#usr/share/man/man3/xdr_callhdr.3
-#usr/share/man/man3/xdr_callmsg.3
-#usr/share/man/man3/xdr_char.3
-#usr/share/man/man3/xdr_destroy.3
-#usr/share/man/man3/xdr_double.3
-#usr/share/man/man3/xdr_enum.3
-#usr/share/man/man3/xdr_float.3
-#usr/share/man/man3/xdr_free.3
-#usr/share/man/man3/xdr_getpos.3
-#usr/share/man/man3/xdr_inline.3
-#usr/share/man/man3/xdr_int.3
-#usr/share/man/man3/xdr_long.3
-#usr/share/man/man3/xdr_opaque.3
-#usr/share/man/man3/xdr_opaque_auth.3
-#usr/share/man/man3/xdr_pmap.3
-#usr/share/man/man3/xdr_pmaplist.3
-#usr/share/man/man3/xdr_pointer.3
-#usr/share/man/man3/xdr_reference.3
-#usr/share/man/man3/xdr_rejected_reply.3
-#usr/share/man/man3/xdr_replymsg.3
-#usr/share/man/man3/xdr_setpos.3
-#usr/share/man/man3/xdr_short.3
-#usr/share/man/man3/xdr_string.3
-#usr/share/man/man3/xdr_u_char.3
-#usr/share/man/man3/xdr_u_int.3
-#usr/share/man/man3/xdr_u_long.3
-#usr/share/man/man3/xdr_u_short.3
-#usr/share/man/man3/xdr_union.3
-#usr/share/man/man3/xdr_vector.3
-#usr/share/man/man3/xdr_void.3
-#usr/share/man/man3/xdr_wrapstring.3
-#usr/share/man/man3/xdrmem_create.3
-#usr/share/man/man3/xdrrec_create.3
-#usr/share/man/man3/xdrrec_endofrecord.3
-#usr/share/man/man3/xdrrec_eof.3
-#usr/share/man/man3/xdrrec_skiprecord.3
-#usr/share/man/man3/xdrstdio_create.3
-#usr/share/man/man3/xencrypt.3
-#usr/share/man/man3/xprt_register.3
-#usr/share/man/man3/xprt_unregister.3
-#usr/share/man/man3/y0.3
-#usr/share/man/man3/y0f.3
-#usr/share/man/man3/y0l.3
-#usr/share/man/man3/y1.3
-#usr/share/man/man3/y1f.3
-#usr/share/man/man3/y1l.3
-#usr/share/man/man3/yn.3
-#usr/share/man/man3/ynf.3
-#usr/share/man/man3/ynl.3
-#usr/share/man/man3p
-#usr/share/man/man3p/FD_CLR.3p
-#usr/share/man/man3p/FD_ISSET.3p
-#usr/share/man/man3p/FD_SET.3p
-#usr/share/man/man3p/FD_ZERO.3p
-#usr/share/man/man3p/_Exit.3p
-#usr/share/man/man3p/_exit.3p
-#usr/share/man/man3p/_longjmp.3p
-#usr/share/man/man3p/_setjmp.3p
-#usr/share/man/man3p/_tolower.3p
-#usr/share/man/man3p/_toupper.3p
-#usr/share/man/man3p/a64l.3p
-#usr/share/man/man3p/abort.3p
-#usr/share/man/man3p/abs.3p
-#usr/share/man/man3p/accept.3p
-#usr/share/man/man3p/access.3p
-#usr/share/man/man3p/acos.3p
-#usr/share/man/man3p/acosf.3p
-#usr/share/man/man3p/acosh.3p
-#usr/share/man/man3p/acoshf.3p
-#usr/share/man/man3p/acoshl.3p
-#usr/share/man/man3p/acosl.3p
-#usr/share/man/man3p/aio_cancel.3p
-#usr/share/man/man3p/aio_error.3p
-#usr/share/man/man3p/aio_fsync.3p
-#usr/share/man/man3p/aio_read.3p
-#usr/share/man/man3p/aio_return.3p
-#usr/share/man/man3p/aio_suspend.3p
-#usr/share/man/man3p/aio_write.3p
-#usr/share/man/man3p/alarm.3p
-#usr/share/man/man3p/asctime.3p
-#usr/share/man/man3p/asctime_r.3p
-#usr/share/man/man3p/asin.3p
-#usr/share/man/man3p/asinf.3p
-#usr/share/man/man3p/asinh.3p
-#usr/share/man/man3p/asinhf.3p
-#usr/share/man/man3p/asinhl.3p
-#usr/share/man/man3p/asinl.3p
-#usr/share/man/man3p/assert.3p
-#usr/share/man/man3p/atan.3p
-#usr/share/man/man3p/atan2.3p
-#usr/share/man/man3p/atan2f.3p
-#usr/share/man/man3p/atan2l.3p
-#usr/share/man/man3p/atanf.3p
-#usr/share/man/man3p/atanh.3p
-#usr/share/man/man3p/atanhf.3p
-#usr/share/man/man3p/atanhl.3p
-#usr/share/man/man3p/atanl.3p
-#usr/share/man/man3p/atexit.3p
-#usr/share/man/man3p/atof.3p
-#usr/share/man/man3p/atoi.3p
-#usr/share/man/man3p/atol.3p
-#usr/share/man/man3p/atoll.3p
-#usr/share/man/man3p/basename.3p
-#usr/share/man/man3p/bcmp.3p
-#usr/share/man/man3p/bcopy.3p
-#usr/share/man/man3p/bind.3p
-#usr/share/man/man3p/bsd_signal.3p
-#usr/share/man/man3p/bsearch.3p
-#usr/share/man/man3p/btowc.3p
-#usr/share/man/man3p/bzero.3p
-#usr/share/man/man3p/cabs.3p
-#usr/share/man/man3p/cabsf.3p
-#usr/share/man/man3p/cabsl.3p
-#usr/share/man/man3p/cacos.3p
-#usr/share/man/man3p/cacosf.3p
-#usr/share/man/man3p/cacosh.3p
-#usr/share/man/man3p/cacoshf.3p
-#usr/share/man/man3p/cacoshl.3p
-#usr/share/man/man3p/cacosl.3p
-#usr/share/man/man3p/calloc.3p
-#usr/share/man/man3p/carg.3p
-#usr/share/man/man3p/cargf.3p
-#usr/share/man/man3p/cargl.3p
-#usr/share/man/man3p/casin.3p
-#usr/share/man/man3p/casinf.3p
-#usr/share/man/man3p/casinh.3p
-#usr/share/man/man3p/casinhf.3p
-#usr/share/man/man3p/casinhl.3p
-#usr/share/man/man3p/casinl.3p
-#usr/share/man/man3p/catan.3p
-#usr/share/man/man3p/catanf.3p
-#usr/share/man/man3p/catanh.3p
-#usr/share/man/man3p/catanhf.3p
-#usr/share/man/man3p/catanhl.3p
-#usr/share/man/man3p/catanl.3p
-#usr/share/man/man3p/catclose.3p
-#usr/share/man/man3p/catgets.3p
-#usr/share/man/man3p/catopen.3p
-#usr/share/man/man3p/cbrt.3p
-#usr/share/man/man3p/cbrtf.3p
-#usr/share/man/man3p/cbrtl.3p
-#usr/share/man/man3p/ccos.3p
-#usr/share/man/man3p/ccosf.3p
-#usr/share/man/man3p/ccosh.3p
-#usr/share/man/man3p/ccoshf.3p
-#usr/share/man/man3p/ccoshl.3p
-#usr/share/man/man3p/ccosl.3p
-#usr/share/man/man3p/ceil.3p
-#usr/share/man/man3p/ceilf.3p
-#usr/share/man/man3p/ceill.3p
-#usr/share/man/man3p/cexp.3p
-#usr/share/man/man3p/cexpf.3p
-#usr/share/man/man3p/cexpl.3p
-#usr/share/man/man3p/cfgetispeed.3p
-#usr/share/man/man3p/cfgetospeed.3p
-#usr/share/man/man3p/cfsetispeed.3p
-#usr/share/man/man3p/cfsetospeed.3p
-#usr/share/man/man3p/chdir.3p
-#usr/share/man/man3p/chmod.3p
-#usr/share/man/man3p/chown.3p
-#usr/share/man/man3p/cimag.3p
-#usr/share/man/man3p/cimagf.3p
-#usr/share/man/man3p/cimagl.3p
-#usr/share/man/man3p/clearerr.3p
-#usr/share/man/man3p/clock.3p
-#usr/share/man/man3p/clock_getcpuclockid.3p
-#usr/share/man/man3p/clock_getres.3p
-#usr/share/man/man3p/clock_gettime.3p
-#usr/share/man/man3p/clock_nanosleep.3p
-#usr/share/man/man3p/clock_settime.3p
-#usr/share/man/man3p/clog.3p
-#usr/share/man/man3p/clogf.3p
-#usr/share/man/man3p/clogl.3p
-#usr/share/man/man3p/close.3p
-#usr/share/man/man3p/closedir.3p
-#usr/share/man/man3p/closelog.3p
-#usr/share/man/man3p/confstr.3p
-#usr/share/man/man3p/conj.3p
-#usr/share/man/man3p/conjf.3p
-#usr/share/man/man3p/conjl.3p
-#usr/share/man/man3p/connect.3p
-#usr/share/man/man3p/copysign.3p
-#usr/share/man/man3p/copysignf.3p
-#usr/share/man/man3p/copysignl.3p
-#usr/share/man/man3p/cos.3p
-#usr/share/man/man3p/cosf.3p
-#usr/share/man/man3p/cosh.3p
-#usr/share/man/man3p/coshf.3p
-#usr/share/man/man3p/coshl.3p
-#usr/share/man/man3p/cosl.3p
-#usr/share/man/man3p/cpow.3p
-#usr/share/man/man3p/cpowf.3p
-#usr/share/man/man3p/cpowl.3p
-#usr/share/man/man3p/cproj.3p
-#usr/share/man/man3p/cprojf.3p
-#usr/share/man/man3p/cprojl.3p
-#usr/share/man/man3p/creal.3p
-#usr/share/man/man3p/crealf.3p
-#usr/share/man/man3p/creall.3p
-#usr/share/man/man3p/creat.3p
-#usr/share/man/man3p/crypt.3p
-#usr/share/man/man3p/csin.3p
-#usr/share/man/man3p/csinf.3p
-#usr/share/man/man3p/csinh.3p
-#usr/share/man/man3p/csinhf.3p
-#usr/share/man/man3p/csinhl.3p
-#usr/share/man/man3p/csinl.3p
-#usr/share/man/man3p/csqrt.3p
-#usr/share/man/man3p/csqrtf.3p
-#usr/share/man/man3p/csqrtl.3p
-#usr/share/man/man3p/ctan.3p
-#usr/share/man/man3p/ctanf.3p
-#usr/share/man/man3p/ctanh.3p
-#usr/share/man/man3p/ctanhf.3p
-#usr/share/man/man3p/ctanhl.3p
-#usr/share/man/man3p/ctanl.3p
-#usr/share/man/man3p/ctermid.3p
-#usr/share/man/man3p/ctime.3p
-#usr/share/man/man3p/ctime_r.3p
-#usr/share/man/man3p/daylight.3p
-#usr/share/man/man3p/dbm_clearerr.3p
-#usr/share/man/man3p/dbm_close.3p
-#usr/share/man/man3p/dbm_delete.3p
-#usr/share/man/man3p/dbm_error.3p
-#usr/share/man/man3p/dbm_fetch.3p
-#usr/share/man/man3p/dbm_firstkey.3p
-#usr/share/man/man3p/dbm_nextkey.3p
-#usr/share/man/man3p/dbm_open.3p
-#usr/share/man/man3p/dbm_store.3p
-#usr/share/man/man3p/difftime.3p
-#usr/share/man/man3p/dirname.3p
-#usr/share/man/man3p/div.3p
-#usr/share/man/man3p/dlclose.3p
-#usr/share/man/man3p/dlerror.3p
-#usr/share/man/man3p/dlopen.3p
-#usr/share/man/man3p/dlsym.3p
-#usr/share/man/man3p/drand48.3p
-#usr/share/man/man3p/dup.3p
-#usr/share/man/man3p/dup2.3p
-#usr/share/man/man3p/ecvt.3p
-#usr/share/man/man3p/encrypt.3p
-#usr/share/man/man3p/endgrent.3p
-#usr/share/man/man3p/endhostent.3p
-#usr/share/man/man3p/endnetent.3p
-#usr/share/man/man3p/endprotoent.3p
-#usr/share/man/man3p/endpwent.3p
-#usr/share/man/man3p/endservent.3p
-#usr/share/man/man3p/endutxent.3p
-#usr/share/man/man3p/environ.3p
-#usr/share/man/man3p/erand48.3p
-#usr/share/man/man3p/erf.3p
-#usr/share/man/man3p/erfc.3p
-#usr/share/man/man3p/erfcf.3p
-#usr/share/man/man3p/erfcl.3p
-#usr/share/man/man3p/erff.3p
-#usr/share/man/man3p/erfl.3p
-#usr/share/man/man3p/errno.3p
-#usr/share/man/man3p/exec.3p
-#usr/share/man/man3p/execl.3p
-#usr/share/man/man3p/execle.3p
-#usr/share/man/man3p/execlp.3p
-#usr/share/man/man3p/execv.3p
-#usr/share/man/man3p/execve.3p
-#usr/share/man/man3p/execvp.3p
-#usr/share/man/man3p/exit.3p
-#usr/share/man/man3p/exp.3p
-#usr/share/man/man3p/exp2.3p
-#usr/share/man/man3p/exp2f.3p
-#usr/share/man/man3p/exp2l.3p
-#usr/share/man/man3p/expf.3p
-#usr/share/man/man3p/expl.3p
-#usr/share/man/man3p/expm1.3p
-#usr/share/man/man3p/expm1f.3p
-#usr/share/man/man3p/expm1l.3p
-#usr/share/man/man3p/fabs.3p
-#usr/share/man/man3p/fabsf.3p
-#usr/share/man/man3p/fabsl.3p
-#usr/share/man/man3p/fattach.3p
-#usr/share/man/man3p/fchdir.3p
-#usr/share/man/man3p/fchmod.3p
-#usr/share/man/man3p/fchown.3p
-#usr/share/man/man3p/fclose.3p
-#usr/share/man/man3p/fcntl.3p
-#usr/share/man/man3p/fcvt.3p
-#usr/share/man/man3p/fdatasync.3p
-#usr/share/man/man3p/fdetach.3p
-#usr/share/man/man3p/fdim.3p
-#usr/share/man/man3p/fdimf.3p
-#usr/share/man/man3p/fdiml.3p
-#usr/share/man/man3p/fdopen.3p
-#usr/share/man/man3p/feclearexcept.3p
-#usr/share/man/man3p/fegetenv.3p
-#usr/share/man/man3p/fegetexceptflag.3p
-#usr/share/man/man3p/fegetround.3p
-#usr/share/man/man3p/feholdexcept.3p
-#usr/share/man/man3p/feof.3p
-#usr/share/man/man3p/feraiseexcept.3p
-#usr/share/man/man3p/ferror.3p
-#usr/share/man/man3p/fesetenv.3p
-#usr/share/man/man3p/fesetexceptflag.3p
-#usr/share/man/man3p/fesetround.3p
-#usr/share/man/man3p/fetestexcept.3p
-#usr/share/man/man3p/feupdateenv.3p
-#usr/share/man/man3p/fflush.3p
-#usr/share/man/man3p/ffs.3p
-#usr/share/man/man3p/fgetc.3p
-#usr/share/man/man3p/fgetpos.3p
-#usr/share/man/man3p/fgets.3p
-#usr/share/man/man3p/fgetwc.3p
-#usr/share/man/man3p/fgetws.3p
-#usr/share/man/man3p/fileno.3p
-#usr/share/man/man3p/flockfile.3p
-#usr/share/man/man3p/floor.3p
-#usr/share/man/man3p/floorf.3p
-#usr/share/man/man3p/floorl.3p
-#usr/share/man/man3p/fma.3p
-#usr/share/man/man3p/fmaf.3p
-#usr/share/man/man3p/fmal.3p
-#usr/share/man/man3p/fmax.3p
-#usr/share/man/man3p/fmaxf.3p
-#usr/share/man/man3p/fmaxl.3p
-#usr/share/man/man3p/fmin.3p
-#usr/share/man/man3p/fminf.3p
-#usr/share/man/man3p/fminl.3p
-#usr/share/man/man3p/fmod.3p
-#usr/share/man/man3p/fmodf.3p
-#usr/share/man/man3p/fmodl.3p
-#usr/share/man/man3p/fmtmsg.3p
-#usr/share/man/man3p/fnmatch.3p
-#usr/share/man/man3p/fopen.3p
-#usr/share/man/man3p/fork.3p
-#usr/share/man/man3p/fpathconf.3p
-#usr/share/man/man3p/fpclassify.3p
-#usr/share/man/man3p/fprintf.3p
-#usr/share/man/man3p/fputc.3p
-#usr/share/man/man3p/fputs.3p
-#usr/share/man/man3p/fputwc.3p
-#usr/share/man/man3p/fputws.3p
-#usr/share/man/man3p/fread.3p
-#usr/share/man/man3p/free.3p
-#usr/share/man/man3p/freeaddrinfo.3p
-#usr/share/man/man3p/freopen.3p
-#usr/share/man/man3p/frexp.3p
-#usr/share/man/man3p/frexpf.3p
-#usr/share/man/man3p/frexpl.3p
-#usr/share/man/man3p/fscanf.3p
-#usr/share/man/man3p/fseek.3p
-#usr/share/man/man3p/fseeko.3p
-#usr/share/man/man3p/fsetpos.3p
-#usr/share/man/man3p/fstat.3p
-#usr/share/man/man3p/fstatvfs.3p
-#usr/share/man/man3p/fsync.3p
-#usr/share/man/man3p/ftell.3p
-#usr/share/man/man3p/ftello.3p
-#usr/share/man/man3p/ftime.3p
-#usr/share/man/man3p/ftok.3p
-#usr/share/man/man3p/ftruncate.3p
-#usr/share/man/man3p/ftrylockfile.3p
-#usr/share/man/man3p/ftw.3p
-#usr/share/man/man3p/funlockfile.3p
-#usr/share/man/man3p/fwide.3p
-#usr/share/man/man3p/fwprintf.3p
-#usr/share/man/man3p/fwrite.3p
-#usr/share/man/man3p/fwscanf.3p
-#usr/share/man/man3p/gai_strerror.3p
-#usr/share/man/man3p/gcvt.3p
-#usr/share/man/man3p/getaddrinfo.3p
-#usr/share/man/man3p/getc.3p
-#usr/share/man/man3p/getc_unlocked.3p
-#usr/share/man/man3p/getchar.3p
-#usr/share/man/man3p/getchar_unlocked.3p
-#usr/share/man/man3p/getcontext.3p
-#usr/share/man/man3p/getcwd.3p
-#usr/share/man/man3p/getdate.3p
-#usr/share/man/man3p/getdate_err.3p
-#usr/share/man/man3p/getegid.3p
-#usr/share/man/man3p/getenv.3p
-#usr/share/man/man3p/geteuid.3p
-#usr/share/man/man3p/getgid.3p
-#usr/share/man/man3p/getgrent.3p
-#usr/share/man/man3p/getgrgid.3p
-#usr/share/man/man3p/getgrgid_r.3p
-#usr/share/man/man3p/getgrnam.3p
-#usr/share/man/man3p/getgrnam_r.3p
-#usr/share/man/man3p/getgroups.3p
-#usr/share/man/man3p/gethostbyaddr.3p
-#usr/share/man/man3p/gethostbyname.3p
-#usr/share/man/man3p/gethostent.3p
-#usr/share/man/man3p/gethostid.3p
-#usr/share/man/man3p/gethostname.3p
-#usr/share/man/man3p/getitimer.3p
-#usr/share/man/man3p/getlogin.3p
-#usr/share/man/man3p/getlogin_r.3p
-#usr/share/man/man3p/getmsg.3p
-#usr/share/man/man3p/getnameinfo.3p
-#usr/share/man/man3p/getnetbyaddr.3p
-#usr/share/man/man3p/getnetbyname.3p
-#usr/share/man/man3p/getnetent.3p
-#usr/share/man/man3p/getopt.3p
-#usr/share/man/man3p/getpeername.3p
-#usr/share/man/man3p/getpgid.3p
-#usr/share/man/man3p/getpgrp.3p
-#usr/share/man/man3p/getpid.3p
-#usr/share/man/man3p/getpmsg.3p
-#usr/share/man/man3p/getppid.3p
-#usr/share/man/man3p/getpriority.3p
-#usr/share/man/man3p/getprotobyname.3p
-#usr/share/man/man3p/getprotobynumber.3p
-#usr/share/man/man3p/getprotoent.3p
-#usr/share/man/man3p/getpwent.3p
-#usr/share/man/man3p/getpwnam.3p
-#usr/share/man/man3p/getpwnam_r.3p
-#usr/share/man/man3p/getpwuid.3p
-#usr/share/man/man3p/getpwuid_r.3p
-#usr/share/man/man3p/getrlimit.3p
-#usr/share/man/man3p/getrusage.3p
-#usr/share/man/man3p/gets.3p
-#usr/share/man/man3p/getservbyname.3p
-#usr/share/man/man3p/getservbyport.3p
-#usr/share/man/man3p/getservent.3p
-#usr/share/man/man3p/getsid.3p
-#usr/share/man/man3p/getsockname.3p
-#usr/share/man/man3p/getsockopt.3p
-#usr/share/man/man3p/getsubopt.3p
-#usr/share/man/man3p/gettimeofday.3p
-#usr/share/man/man3p/getuid.3p
-#usr/share/man/man3p/getutxent.3p
-#usr/share/man/man3p/getutxid.3p
-#usr/share/man/man3p/getutxline.3p
-#usr/share/man/man3p/getwc.3p
-#usr/share/man/man3p/getwchar.3p
-#usr/share/man/man3p/getwd.3p
-#usr/share/man/man3p/glob.3p
-#usr/share/man/man3p/globfree.3p
-#usr/share/man/man3p/gmtime.3p
-#usr/share/man/man3p/gmtime_r.3p
-#usr/share/man/man3p/grantpt.3p
-#usr/share/man/man3p/h_errno.3p
-#usr/share/man/man3p/hcreate.3p
-#usr/share/man/man3p/hdestroy.3p
-#usr/share/man/man3p/hsearch.3p
-#usr/share/man/man3p/htonl.3p
-#usr/share/man/man3p/htons.3p
-#usr/share/man/man3p/hypot.3p
-#usr/share/man/man3p/hypotf.3p
-#usr/share/man/man3p/hypotl.3p
-#usr/share/man/man3p/iconv.3p
-#usr/share/man/man3p/iconv_close.3p
-#usr/share/man/man3p/iconv_open.3p
-#usr/share/man/man3p/if_freenameindex.3p
-#usr/share/man/man3p/if_indextoname.3p
-#usr/share/man/man3p/if_nameindex.3p
-#usr/share/man/man3p/if_nametoindex.3p
-#usr/share/man/man3p/ilogb.3p
-#usr/share/man/man3p/ilogbf.3p
-#usr/share/man/man3p/ilogbl.3p
-#usr/share/man/man3p/imaxabs.3p
-#usr/share/man/man3p/imaxdiv.3p
-#usr/share/man/man3p/index.3p
-#usr/share/man/man3p/inet_addr.3p
-#usr/share/man/man3p/inet_ntoa.3p
-#usr/share/man/man3p/inet_ntop.3p
-#usr/share/man/man3p/inet_pton.3p
-#usr/share/man/man3p/initstate.3p
-#usr/share/man/man3p/insque.3p
-#usr/share/man/man3p/ioctl.3p
-#usr/share/man/man3p/isalnum.3p
-#usr/share/man/man3p/isalpha.3p
-#usr/share/man/man3p/isascii.3p
-#usr/share/man/man3p/isastream.3p
-#usr/share/man/man3p/isatty.3p
-#usr/share/man/man3p/isblank.3p
-#usr/share/man/man3p/iscntrl.3p
-#usr/share/man/man3p/isdigit.3p
-#usr/share/man/man3p/isfinite.3p
-#usr/share/man/man3p/isgraph.3p
-#usr/share/man/man3p/isgreater.3p
-#usr/share/man/man3p/isgreaterequal.3p
-#usr/share/man/man3p/isinf.3p
-#usr/share/man/man3p/isless.3p
-#usr/share/man/man3p/islessequal.3p
-#usr/share/man/man3p/islessgreater.3p
-#usr/share/man/man3p/islower.3p
-#usr/share/man/man3p/isnan.3p
-#usr/share/man/man3p/isnormal.3p
-#usr/share/man/man3p/isprint.3p
-#usr/share/man/man3p/ispunct.3p
-#usr/share/man/man3p/isspace.3p
-#usr/share/man/man3p/isunordered.3p
-#usr/share/man/man3p/isupper.3p
-#usr/share/man/man3p/iswalnum.3p
-#usr/share/man/man3p/iswalpha.3p
-#usr/share/man/man3p/iswblank.3p
-#usr/share/man/man3p/iswcntrl.3p
-#usr/share/man/man3p/iswctype.3p
-#usr/share/man/man3p/iswdigit.3p
-#usr/share/man/man3p/iswgraph.3p
-#usr/share/man/man3p/iswlower.3p
-#usr/share/man/man3p/iswprint.3p
-#usr/share/man/man3p/iswpunct.3p
-#usr/share/man/man3p/iswspace.3p
-#usr/share/man/man3p/iswupper.3p
-#usr/share/man/man3p/iswxdigit.3p
-#usr/share/man/man3p/isxdigit.3p
-#usr/share/man/man3p/j0.3p
-#usr/share/man/man3p/j1.3p
-#usr/share/man/man3p/jn.3p
-#usr/share/man/man3p/jrand48.3p
-#usr/share/man/man3p/kill.3p
-#usr/share/man/man3p/killpg.3p
-#usr/share/man/man3p/l64a.3p
-#usr/share/man/man3p/labs.3p
-#usr/share/man/man3p/lchown.3p
-#usr/share/man/man3p/lcong48.3p
-#usr/share/man/man3p/ldexp.3p
-#usr/share/man/man3p/ldexpf.3p
-#usr/share/man/man3p/ldexpl.3p
-#usr/share/man/man3p/ldiv.3p
-#usr/share/man/man3p/lfind.3p
-#usr/share/man/man3p/lgamma.3p
-#usr/share/man/man3p/lgammaf.3p
-#usr/share/man/man3p/lgammal.3p
-#usr/share/man/man3p/link.3p
-#usr/share/man/man3p/lio_listio.3p
-#usr/share/man/man3p/listen.3p
-#usr/share/man/man3p/llabs.3p
-#usr/share/man/man3p/lldiv.3p
-#usr/share/man/man3p/llrint.3p
-#usr/share/man/man3p/llrintf.3p
-#usr/share/man/man3p/llrintl.3p
-#usr/share/man/man3p/llround.3p
-#usr/share/man/man3p/llroundf.3p
-#usr/share/man/man3p/llroundl.3p
-#usr/share/man/man3p/localeconv.3p
-#usr/share/man/man3p/localtime.3p
-#usr/share/man/man3p/localtime_r.3p
-#usr/share/man/man3p/lockf.3p
-#usr/share/man/man3p/log.3p
-#usr/share/man/man3p/log10.3p
-#usr/share/man/man3p/log10f.3p
-#usr/share/man/man3p/log10l.3p
-#usr/share/man/man3p/log1p.3p
-#usr/share/man/man3p/log1pf.3p
-#usr/share/man/man3p/log1pl.3p
-#usr/share/man/man3p/log2.3p
-#usr/share/man/man3p/log2f.3p
-#usr/share/man/man3p/log2l.3p
-#usr/share/man/man3p/logb.3p
-#usr/share/man/man3p/logbf.3p
-#usr/share/man/man3p/logbl.3p
-#usr/share/man/man3p/logf.3p
-#usr/share/man/man3p/logl.3p
-#usr/share/man/man3p/longjmp.3p
-#usr/share/man/man3p/lrand48.3p
-#usr/share/man/man3p/lrint.3p
-#usr/share/man/man3p/lrintf.3p
-#usr/share/man/man3p/lrintl.3p
-#usr/share/man/man3p/lround.3p
-#usr/share/man/man3p/lroundf.3p
-#usr/share/man/man3p/lroundl.3p
-#usr/share/man/man3p/lsearch.3p
-#usr/share/man/man3p/lseek.3p
-#usr/share/man/man3p/lstat.3p
-#usr/share/man/man3p/makecontext.3p
-#usr/share/man/man3p/malloc.3p
-#usr/share/man/man3p/mblen.3p
-#usr/share/man/man3p/mbrlen.3p
-#usr/share/man/man3p/mbrtowc.3p
-#usr/share/man/man3p/mbsinit.3p
-#usr/share/man/man3p/mbsrtowcs.3p
-#usr/share/man/man3p/mbstowcs.3p
-#usr/share/man/man3p/mbtowc.3p
-#usr/share/man/man3p/memccpy.3p
-#usr/share/man/man3p/memchr.3p
-#usr/share/man/man3p/memcmp.3p
-#usr/share/man/man3p/memcpy.3p
-#usr/share/man/man3p/memmove.3p
-#usr/share/man/man3p/memset.3p
-#usr/share/man/man3p/mkdir.3p
-#usr/share/man/man3p/mkfifo.3p
-#usr/share/man/man3p/mknod.3p
-#usr/share/man/man3p/mkstemp.3p
-#usr/share/man/man3p/mktemp.3p
-#usr/share/man/man3p/mktime.3p
-#usr/share/man/man3p/mlock.3p
-#usr/share/man/man3p/mlockall.3p
-#usr/share/man/man3p/mmap.3p
-#usr/share/man/man3p/modf.3p
-#usr/share/man/man3p/modff.3p
-#usr/share/man/man3p/modfl.3p
-#usr/share/man/man3p/mprotect.3p
-#usr/share/man/man3p/mq_close.3p
-#usr/share/man/man3p/mq_getattr.3p
-#usr/share/man/man3p/mq_notify.3p
-#usr/share/man/man3p/mq_open.3p
-#usr/share/man/man3p/mq_receive.3p
-#usr/share/man/man3p/mq_send.3p
-#usr/share/man/man3p/mq_setattr.3p
-#usr/share/man/man3p/mq_timedreceive.3p
-#usr/share/man/man3p/mq_timedsend.3p
-#usr/share/man/man3p/mq_unlink.3p
-#usr/share/man/man3p/mrand48.3p
-#usr/share/man/man3p/msgctl.3p
-#usr/share/man/man3p/msgget.3p
-#usr/share/man/man3p/msgrcv.3p
-#usr/share/man/man3p/msgsnd.3p
-#usr/share/man/man3p/msync.3p
-#usr/share/man/man3p/munlock.3p
-#usr/share/man/man3p/munlockall.3p
-#usr/share/man/man3p/munmap.3p
-#usr/share/man/man3p/nan.3p
-#usr/share/man/man3p/nanf.3p
-#usr/share/man/man3p/nanl.3p
-#usr/share/man/man3p/nanosleep.3p
-#usr/share/man/man3p/nearbyint.3p
-#usr/share/man/man3p/nearbyintf.3p
-#usr/share/man/man3p/nearbyintl.3p
-#usr/share/man/man3p/nextafter.3p
-#usr/share/man/man3p/nextafterf.3p
-#usr/share/man/man3p/nextafterl.3p
-#usr/share/man/man3p/nexttoward.3p
-#usr/share/man/man3p/nexttowardf.3p
-#usr/share/man/man3p/nexttowardl.3p
-#usr/share/man/man3p/nftw.3p
-#usr/share/man/man3p/nice.3p
-#usr/share/man/man3p/nl_langinfo.3p
-#usr/share/man/man3p/nrand48.3p
-#usr/share/man/man3p/ntohl.3p
-#usr/share/man/man3p/ntohs.3p
-#usr/share/man/man3p/open.3p
-#usr/share/man/man3p/opendir.3p
-#usr/share/man/man3p/openlog.3p
-#usr/share/man/man3p/optarg.3p
-#usr/share/man/man3p/opterr.3p
-#usr/share/man/man3p/optind.3p
-#usr/share/man/man3p/optopt.3p
-#usr/share/man/man3p/pathconf.3p
-#usr/share/man/man3p/pause.3p
-#usr/share/man/man3p/pclose.3p
-#usr/share/man/man3p/perror.3p
-#usr/share/man/man3p/pipe.3p
-#usr/share/man/man3p/poll.3p
-#usr/share/man/man3p/popen.3p
-#usr/share/man/man3p/posix_fadvise.3p
-#usr/share/man/man3p/posix_fallocate.3p
-#usr/share/man/man3p/posix_madvise.3p
-#usr/share/man/man3p/posix_mem_offset.3p
-#usr/share/man/man3p/posix_memalign.3p
-#usr/share/man/man3p/posix_openpt.3p
-#usr/share/man/man3p/posix_spawn.3p
-#usr/share/man/man3p/posix_spawn_file_actions_addclose.3p
-#usr/share/man/man3p/posix_spawn_file_actions_adddup2.3p
-#usr/share/man/man3p/posix_spawn_file_actions_addopen.3p
-#usr/share/man/man3p/posix_spawn_file_actions_destroy.3p
-#usr/share/man/man3p/posix_spawn_file_actions_init.3p
-#usr/share/man/man3p/posix_spawnattr_destroy.3p
-#usr/share/man/man3p/posix_spawnattr_getflags.3p
-#usr/share/man/man3p/posix_spawnattr_getpgroup.3p
-#usr/share/man/man3p/posix_spawnattr_getschedparam.3p
-#usr/share/man/man3p/posix_spawnattr_getschedpolicy.3p
-#usr/share/man/man3p/posix_spawnattr_getsigdefault.3p
-#usr/share/man/man3p/posix_spawnattr_getsigmask.3p
-#usr/share/man/man3p/posix_spawnattr_init.3p
-#usr/share/man/man3p/posix_spawnattr_setflags.3p
-#usr/share/man/man3p/posix_spawnattr_setpgroup.3p
-#usr/share/man/man3p/posix_spawnattr_setschedparam.3p
-#usr/share/man/man3p/posix_spawnattr_setschedpolicy.3p
-#usr/share/man/man3p/posix_spawnattr_setsigdefault.3p
-#usr/share/man/man3p/posix_spawnattr_setsigmask.3p
-#usr/share/man/man3p/posix_spawnp.3p
-#usr/share/man/man3p/posix_trace_attr_destroy.3p
-#usr/share/man/man3p/posix_trace_attr_getclockres.3p
-#usr/share/man/man3p/posix_trace_attr_getcreatetime.3p
-#usr/share/man/man3p/posix_trace_attr_getgenversion.3p
-#usr/share/man/man3p/posix_trace_attr_getinherited.3p
-#usr/share/man/man3p/posix_trace_attr_getlogfullpolicy.3p
-#usr/share/man/man3p/posix_trace_attr_getlogsize.3p
-#usr/share/man/man3p/posix_trace_attr_getmaxdatasize.3p
-#usr/share/man/man3p/posix_trace_attr_getmaxsystemeventsize.3p
-#usr/share/man/man3p/posix_trace_attr_getmaxusereventsize.3p
-#usr/share/man/man3p/posix_trace_attr_getname.3p
-#usr/share/man/man3p/posix_trace_attr_getstreamfullpolicy.3p
-#usr/share/man/man3p/posix_trace_attr_getstreamsize.3p
-#usr/share/man/man3p/posix_trace_attr_init.3p
-#usr/share/man/man3p/posix_trace_attr_setinherited.3p
-#usr/share/man/man3p/posix_trace_attr_setlogfullpolicy.3p
-#usr/share/man/man3p/posix_trace_attr_setlogsize.3p
-#usr/share/man/man3p/posix_trace_attr_setmaxdatasize.3p
-#usr/share/man/man3p/posix_trace_attr_setname.3p
-#usr/share/man/man3p/posix_trace_attr_setstreamfullpolicy.3p
-#usr/share/man/man3p/posix_trace_attr_setstreamsize.3p
-#usr/share/man/man3p/posix_trace_clear.3p
-#usr/share/man/man3p/posix_trace_close.3p
-#usr/share/man/man3p/posix_trace_create.3p
-#usr/share/man/man3p/posix_trace_create_withlog.3p
-#usr/share/man/man3p/posix_trace_event.3p
-#usr/share/man/man3p/posix_trace_eventid_equal.3p
-#usr/share/man/man3p/posix_trace_eventid_get_name.3p
-#usr/share/man/man3p/posix_trace_eventid_open.3p
-#usr/share/man/man3p/posix_trace_eventset_add.3p
-#usr/share/man/man3p/posix_trace_eventset_del.3p
-#usr/share/man/man3p/posix_trace_eventset_empty.3p
-#usr/share/man/man3p/posix_trace_eventset_fill.3p
-#usr/share/man/man3p/posix_trace_eventset_ismember.3p
-#usr/share/man/man3p/posix_trace_eventtypelist_getnext_id.3p
-#usr/share/man/man3p/posix_trace_eventtypelist_rewind.3p
-#usr/share/man/man3p/posix_trace_flush.3p
-#usr/share/man/man3p/posix_trace_get_attr.3p
-#usr/share/man/man3p/posix_trace_get_filter.3p
-#usr/share/man/man3p/posix_trace_get_status.3p
-#usr/share/man/man3p/posix_trace_getnext_event.3p
-#usr/share/man/man3p/posix_trace_open.3p
-#usr/share/man/man3p/posix_trace_rewind.3p
-#usr/share/man/man3p/posix_trace_set_filter.3p
-#usr/share/man/man3p/posix_trace_shutdown.3p
-#usr/share/man/man3p/posix_trace_start.3p
-#usr/share/man/man3p/posix_trace_stop.3p
-#usr/share/man/man3p/posix_trace_timedgetnext_event.3p
-#usr/share/man/man3p/posix_trace_trid_eventid_open.3p
-#usr/share/man/man3p/posix_trace_trygetnext_event.3p
-#usr/share/man/man3p/posix_typed_mem_get_info.3p
-#usr/share/man/man3p/posix_typed_mem_open.3p
-#usr/share/man/man3p/pow.3p
-#usr/share/man/man3p/powf.3p
-#usr/share/man/man3p/powl.3p
-#usr/share/man/man3p/pread.3p
-#usr/share/man/man3p/printf.3p
-#usr/share/man/man3p/pselect.3p
-#usr/share/man/man3p/pthread_atfork.3p
-#usr/share/man/man3p/pthread_attr_destroy.3p
-#usr/share/man/man3p/pthread_attr_getdetachstate.3p
-#usr/share/man/man3p/pthread_attr_getguardsize.3p
-#usr/share/man/man3p/pthread_attr_getinheritsched.3p
-#usr/share/man/man3p/pthread_attr_getschedparam.3p
-#usr/share/man/man3p/pthread_attr_getschedpolicy.3p
-#usr/share/man/man3p/pthread_attr_getscope.3p
-#usr/share/man/man3p/pthread_attr_getstack.3p
-#usr/share/man/man3p/pthread_attr_getstackaddr.3p
-#usr/share/man/man3p/pthread_attr_getstacksize.3p
-#usr/share/man/man3p/pthread_attr_init.3p
-#usr/share/man/man3p/pthread_attr_setdetachstate.3p
-#usr/share/man/man3p/pthread_attr_setguardsize.3p
-#usr/share/man/man3p/pthread_attr_setinheritsched.3p
-#usr/share/man/man3p/pthread_attr_setschedparam.3p
-#usr/share/man/man3p/pthread_attr_setschedpolicy.3p
-#usr/share/man/man3p/pthread_attr_setscope.3p
-#usr/share/man/man3p/pthread_attr_setstack.3p
-#usr/share/man/man3p/pthread_attr_setstackaddr.3p
-#usr/share/man/man3p/pthread_attr_setstacksize.3p
-#usr/share/man/man3p/pthread_barrier_destroy.3p
-#usr/share/man/man3p/pthread_barrier_init.3p
-#usr/share/man/man3p/pthread_barrier_wait.3p
-#usr/share/man/man3p/pthread_barrierattr_destroy.3p
-#usr/share/man/man3p/pthread_barrierattr_getpshared.3p
-#usr/share/man/man3p/pthread_barrierattr_init.3p
-#usr/share/man/man3p/pthread_barrierattr_setpshared.3p
-#usr/share/man/man3p/pthread_cancel.3p
-#usr/share/man/man3p/pthread_cleanup_pop.3p
-#usr/share/man/man3p/pthread_cleanup_push.3p
-#usr/share/man/man3p/pthread_cond_broadcast.3p
-#usr/share/man/man3p/pthread_cond_destroy.3p
-#usr/share/man/man3p/pthread_cond_init.3p
-#usr/share/man/man3p/pthread_cond_signal.3p
-#usr/share/man/man3p/pthread_cond_timedwait.3p
-#usr/share/man/man3p/pthread_cond_wait.3p
-#usr/share/man/man3p/pthread_condattr_destroy.3p
-#usr/share/man/man3p/pthread_condattr_getclock.3p
-#usr/share/man/man3p/pthread_condattr_getpshared.3p
-#usr/share/man/man3p/pthread_condattr_init.3p
-#usr/share/man/man3p/pthread_condattr_setclock.3p
-#usr/share/man/man3p/pthread_condattr_setpshared.3p
-#usr/share/man/man3p/pthread_create.3p
-#usr/share/man/man3p/pthread_detach.3p
-#usr/share/man/man3p/pthread_equal.3p
-#usr/share/man/man3p/pthread_exit.3p
-#usr/share/man/man3p/pthread_getconcurrency.3p
-#usr/share/man/man3p/pthread_getcpuclockid.3p
-#usr/share/man/man3p/pthread_getschedparam.3p
-#usr/share/man/man3p/pthread_getspecific.3p
-#usr/share/man/man3p/pthread_join.3p
-#usr/share/man/man3p/pthread_key_create.3p
-#usr/share/man/man3p/pthread_key_delete.3p
-#usr/share/man/man3p/pthread_kill.3p
-#usr/share/man/man3p/pthread_mutex_destroy.3p
-#usr/share/man/man3p/pthread_mutex_getprioceiling.3p
-#usr/share/man/man3p/pthread_mutex_init.3p
-#usr/share/man/man3p/pthread_mutex_lock.3p
-#usr/share/man/man3p/pthread_mutex_setprioceiling.3p
-#usr/share/man/man3p/pthread_mutex_timedlock.3p
-#usr/share/man/man3p/pthread_mutex_trylock.3p
-#usr/share/man/man3p/pthread_mutex_unlock.3p
-#usr/share/man/man3p/pthread_mutexattr_destroy.3p
-#usr/share/man/man3p/pthread_mutexattr_getprioceiling.3p
-#usr/share/man/man3p/pthread_mutexattr_getprotocol.3p
-#usr/share/man/man3p/pthread_mutexattr_getpshared.3p
-#usr/share/man/man3p/pthread_mutexattr_gettype.3p
-#usr/share/man/man3p/pthread_mutexattr_init.3p
-#usr/share/man/man3p/pthread_mutexattr_setprioceiling.3p
-#usr/share/man/man3p/pthread_mutexattr_setprotocol.3p
-#usr/share/man/man3p/pthread_mutexattr_setpshared.3p
-#usr/share/man/man3p/pthread_mutexattr_settype.3p
-#usr/share/man/man3p/pthread_once.3p
-#usr/share/man/man3p/pthread_rwlock_destroy.3p
-#usr/share/man/man3p/pthread_rwlock_init.3p
-#usr/share/man/man3p/pthread_rwlock_rdlock.3p
-#usr/share/man/man3p/pthread_rwlock_timedrdlock.3p
-#usr/share/man/man3p/pthread_rwlock_timedwrlock.3p
-#usr/share/man/man3p/pthread_rwlock_tryrdlock.3p
-#usr/share/man/man3p/pthread_rwlock_trywrlock.3p
-#usr/share/man/man3p/pthread_rwlock_unlock.3p
-#usr/share/man/man3p/pthread_rwlock_wrlock.3p
-#usr/share/man/man3p/pthread_rwlockattr_destroy.3p
-#usr/share/man/man3p/pthread_rwlockattr_getpshared.3p
-#usr/share/man/man3p/pthread_rwlockattr_init.3p
-#usr/share/man/man3p/pthread_rwlockattr_setpshared.3p
-#usr/share/man/man3p/pthread_self.3p
-#usr/share/man/man3p/pthread_setcancelstate.3p
-#usr/share/man/man3p/pthread_setcanceltype.3p
-#usr/share/man/man3p/pthread_setconcurrency.3p
-#usr/share/man/man3p/pthread_setschedparam.3p
-#usr/share/man/man3p/pthread_setschedprio.3p
-#usr/share/man/man3p/pthread_setspecific.3p
-#usr/share/man/man3p/pthread_sigmask.3p
-#usr/share/man/man3p/pthread_spin_destroy.3p
-#usr/share/man/man3p/pthread_spin_init.3p
-#usr/share/man/man3p/pthread_spin_lock.3p
-#usr/share/man/man3p/pthread_spin_trylock.3p
-#usr/share/man/man3p/pthread_spin_unlock.3p
-#usr/share/man/man3p/pthread_testcancel.3p
-#usr/share/man/man3p/ptsname.3p
-#usr/share/man/man3p/putc.3p
-#usr/share/man/man3p/putc_unlocked.3p
-#usr/share/man/man3p/putchar.3p
-#usr/share/man/man3p/putchar_unlocked.3p
-#usr/share/man/man3p/putenv.3p
-#usr/share/man/man3p/putmsg.3p
-#usr/share/man/man3p/putpmsg.3p
-#usr/share/man/man3p/puts.3p
-#usr/share/man/man3p/pututxline.3p
-#usr/share/man/man3p/putwc.3p
-#usr/share/man/man3p/putwchar.3p
-#usr/share/man/man3p/pwrite.3p
-#usr/share/man/man3p/qsort.3p
-#usr/share/man/man3p/raise.3p
-#usr/share/man/man3p/rand.3p
-#usr/share/man/man3p/rand_r.3p
-#usr/share/man/man3p/random.3p
-#usr/share/man/man3p/read.3p
-#usr/share/man/man3p/readdir.3p
-#usr/share/man/man3p/readdir_r.3p
-#usr/share/man/man3p/readlink.3p
-#usr/share/man/man3p/readv.3p
-#usr/share/man/man3p/realloc.3p
-#usr/share/man/man3p/realpath.3p
-#usr/share/man/man3p/recv.3p
-#usr/share/man/man3p/recvfrom.3p
-#usr/share/man/man3p/recvmsg.3p
-#usr/share/man/man3p/regcomp.3p
-#usr/share/man/man3p/regerror.3p
-#usr/share/man/man3p/regexec.3p
-#usr/share/man/man3p/regfree.3p
-#usr/share/man/man3p/remainder.3p
-#usr/share/man/man3p/remainderf.3p
-#usr/share/man/man3p/remainderl.3p
-#usr/share/man/man3p/remove.3p
-#usr/share/man/man3p/remque.3p
-#usr/share/man/man3p/remquo.3p
-#usr/share/man/man3p/remquof.3p
-#usr/share/man/man3p/remquol.3p
-#usr/share/man/man3p/rename.3p
-#usr/share/man/man3p/rewind.3p
-#usr/share/man/man3p/rewinddir.3p
-#usr/share/man/man3p/rindex.3p
-#usr/share/man/man3p/rint.3p
-#usr/share/man/man3p/rintf.3p
-#usr/share/man/man3p/rintl.3p
-#usr/share/man/man3p/rmdir.3p
-#usr/share/man/man3p/round.3p
-#usr/share/man/man3p/roundf.3p
-#usr/share/man/man3p/roundl.3p
-#usr/share/man/man3p/scalb.3p
-#usr/share/man/man3p/scalbln.3p
-#usr/share/man/man3p/scalblnf.3p
-#usr/share/man/man3p/scalblnl.3p
-#usr/share/man/man3p/scalbn.3p
-#usr/share/man/man3p/scalbnf.3p
-#usr/share/man/man3p/scalbnl.3p
-#usr/share/man/man3p/scanf.3p
-#usr/share/man/man3p/sched_get_priority_max.3p
-#usr/share/man/man3p/sched_get_priority_min.3p
-#usr/share/man/man3p/sched_getparam.3p
-#usr/share/man/man3p/sched_getscheduler.3p
-#usr/share/man/man3p/sched_rr_get_interval.3p
-#usr/share/man/man3p/sched_setparam.3p
-#usr/share/man/man3p/sched_setscheduler.3p
-#usr/share/man/man3p/sched_yield.3p
-#usr/share/man/man3p/seed48.3p
-#usr/share/man/man3p/seekdir.3p
-#usr/share/man/man3p/select.3p
-#usr/share/man/man3p/sem_close.3p
-#usr/share/man/man3p/sem_destroy.3p
-#usr/share/man/man3p/sem_getvalue.3p
-#usr/share/man/man3p/sem_init.3p
-#usr/share/man/man3p/sem_open.3p
-#usr/share/man/man3p/sem_post.3p
-#usr/share/man/man3p/sem_timedwait.3p
-#usr/share/man/man3p/sem_trywait.3p
-#usr/share/man/man3p/sem_unlink.3p
-#usr/share/man/man3p/sem_wait.3p
-#usr/share/man/man3p/semctl.3p
-#usr/share/man/man3p/semget.3p
-#usr/share/man/man3p/semop.3p
-#usr/share/man/man3p/send.3p
-#usr/share/man/man3p/sendmsg.3p
-#usr/share/man/man3p/sendto.3p
-#usr/share/man/man3p/setbuf.3p
-#usr/share/man/man3p/setcontext.3p
-#usr/share/man/man3p/setegid.3p
-#usr/share/man/man3p/setenv.3p
-#usr/share/man/man3p/seteuid.3p
-#usr/share/man/man3p/setgid.3p
-#usr/share/man/man3p/setgrent.3p
-#usr/share/man/man3p/sethostent.3p
-#usr/share/man/man3p/setitimer.3p
-#usr/share/man/man3p/setjmp.3p
-#usr/share/man/man3p/setkey.3p
-#usr/share/man/man3p/setlocale.3p
-#usr/share/man/man3p/setlogmask.3p
-#usr/share/man/man3p/setnetent.3p
-#usr/share/man/man3p/setpgid.3p
-#usr/share/man/man3p/setpgrp.3p
-#usr/share/man/man3p/setpriority.3p
-#usr/share/man/man3p/setprotoent.3p
-#usr/share/man/man3p/setpwent.3p
-#usr/share/man/man3p/setregid.3p
-#usr/share/man/man3p/setreuid.3p
-#usr/share/man/man3p/setrlimit.3p
-#usr/share/man/man3p/setservent.3p
-#usr/share/man/man3p/setsid.3p
-#usr/share/man/man3p/setsockopt.3p
-#usr/share/man/man3p/setstate.3p
-#usr/share/man/man3p/setuid.3p
-#usr/share/man/man3p/setutxent.3p
-#usr/share/man/man3p/setvbuf.3p
-#usr/share/man/man3p/shm_open.3p
-#usr/share/man/man3p/shm_unlink.3p
-#usr/share/man/man3p/shmat.3p
-#usr/share/man/man3p/shmctl.3p
-#usr/share/man/man3p/shmdt.3p
-#usr/share/man/man3p/shmget.3p
-#usr/share/man/man3p/shutdown.3p
-#usr/share/man/man3p/sigaction.3p
-#usr/share/man/man3p/sigaddset.3p
-#usr/share/man/man3p/sigaltstack.3p
-#usr/share/man/man3p/sigdelset.3p
-#usr/share/man/man3p/sigemptyset.3p
-#usr/share/man/man3p/sigfillset.3p
-#usr/share/man/man3p/sighold.3p
-#usr/share/man/man3p/sigignore.3p
-#usr/share/man/man3p/siginterrupt.3p
-#usr/share/man/man3p/sigismember.3p
-#usr/share/man/man3p/siglongjmp.3p
-#usr/share/man/man3p/signal.3p
-#usr/share/man/man3p/signbit.3p
-#usr/share/man/man3p/signgam.3p
-#usr/share/man/man3p/sigpause.3p
-#usr/share/man/man3p/sigpending.3p
-#usr/share/man/man3p/sigprocmask.3p
-#usr/share/man/man3p/sigqueue.3p
-#usr/share/man/man3p/sigrelse.3p
-#usr/share/man/man3p/sigset.3p
-#usr/share/man/man3p/sigsetjmp.3p
-#usr/share/man/man3p/sigsuspend.3p
-#usr/share/man/man3p/sigtimedwait.3p
-#usr/share/man/man3p/sigwait.3p
-#usr/share/man/man3p/sigwaitinfo.3p
-#usr/share/man/man3p/sin.3p
-#usr/share/man/man3p/sinf.3p
-#usr/share/man/man3p/sinh.3p
-#usr/share/man/man3p/sinhf.3p
-#usr/share/man/man3p/sinhl.3p
-#usr/share/man/man3p/sinl.3p
-#usr/share/man/man3p/sleep.3p
-#usr/share/man/man3p/snprintf.3p
-#usr/share/man/man3p/sockatmark.3p
-#usr/share/man/man3p/socket.3p
-#usr/share/man/man3p/socketpair.3p
-#usr/share/man/man3p/sprintf.3p
-#usr/share/man/man3p/sqrt.3p
-#usr/share/man/man3p/sqrtf.3p
-#usr/share/man/man3p/sqrtl.3p
-#usr/share/man/man3p/srand.3p
-#usr/share/man/man3p/srand48.3p
-#usr/share/man/man3p/srandom.3p
-#usr/share/man/man3p/sscanf.3p
-#usr/share/man/man3p/stat.3p
-#usr/share/man/man3p/statvfs.3p
-#usr/share/man/man3p/stderr.3p
-#usr/share/man/man3p/stdin.3p
-#usr/share/man/man3p/stdout.3p
-#usr/share/man/man3p/strcasecmp.3p
-#usr/share/man/man3p/strcat.3p
-#usr/share/man/man3p/strchr.3p
-#usr/share/man/man3p/strcmp.3p
-#usr/share/man/man3p/strcoll.3p
-#usr/share/man/man3p/strcpy.3p
-#usr/share/man/man3p/strcspn.3p
-#usr/share/man/man3p/strdup.3p
-#usr/share/man/man3p/strerror.3p
-#usr/share/man/man3p/strerror_r.3p
-#usr/share/man/man3p/strfmon.3p
-#usr/share/man/man3p/strftime.3p
-#usr/share/man/man3p/strlen.3p
-#usr/share/man/man3p/strncasecmp.3p
-#usr/share/man/man3p/strncat.3p
-#usr/share/man/man3p/strncmp.3p
-#usr/share/man/man3p/strncpy.3p
-#usr/share/man/man3p/strpbrk.3p
-#usr/share/man/man3p/strptime.3p
-#usr/share/man/man3p/strrchr.3p
-#usr/share/man/man3p/strspn.3p
-#usr/share/man/man3p/strstr.3p
-#usr/share/man/man3p/strtod.3p
-#usr/share/man/man3p/strtof.3p
-#usr/share/man/man3p/strtoimax.3p
-#usr/share/man/man3p/strtok.3p
-#usr/share/man/man3p/strtok_r.3p
-#usr/share/man/man3p/strtol.3p
-#usr/share/man/man3p/strtold.3p
-#usr/share/man/man3p/strtoll.3p
-#usr/share/man/man3p/strtoul.3p
-#usr/share/man/man3p/strtoull.3p
-#usr/share/man/man3p/strtoumax.3p
-#usr/share/man/man3p/strxfrm.3p
-#usr/share/man/man3p/swab.3p
-#usr/share/man/man3p/swapcontext.3p
-#usr/share/man/man3p/swprintf.3p
-#usr/share/man/man3p/swscanf.3p
-#usr/share/man/man3p/symlink.3p
-#usr/share/man/man3p/sync.3p
-#usr/share/man/man3p/sysconf.3p
-#usr/share/man/man3p/syslog.3p
-#usr/share/man/man3p/system.3p
-#usr/share/man/man3p/tan.3p
-#usr/share/man/man3p/tanf.3p
-#usr/share/man/man3p/tanh.3p
-#usr/share/man/man3p/tanhf.3p
-#usr/share/man/man3p/tanhl.3p
-#usr/share/man/man3p/tanl.3p
-#usr/share/man/man3p/tcdrain.3p
-#usr/share/man/man3p/tcflow.3p
-#usr/share/man/man3p/tcflush.3p
-#usr/share/man/man3p/tcgetattr.3p
-#usr/share/man/man3p/tcgetpgrp.3p
-#usr/share/man/man3p/tcgetsid.3p
-#usr/share/man/man3p/tcsendbreak.3p
-#usr/share/man/man3p/tcsetattr.3p
-#usr/share/man/man3p/tcsetpgrp.3p
-#usr/share/man/man3p/tdelete.3p
-#usr/share/man/man3p/telldir.3p
-#usr/share/man/man3p/tempnam.3p
-#usr/share/man/man3p/tfind.3p
-#usr/share/man/man3p/tgamma.3p
-#usr/share/man/man3p/tgammaf.3p
-#usr/share/man/man3p/tgammal.3p
-#usr/share/man/man3p/time.3p
-#usr/share/man/man3p/timer_create.3p
-#usr/share/man/man3p/timer_delete.3p
-#usr/share/man/man3p/timer_getoverrun.3p
-#usr/share/man/man3p/timer_gettime.3p
-#usr/share/man/man3p/timer_settime.3p
-#usr/share/man/man3p/times.3p
-#usr/share/man/man3p/timezone.3p
-#usr/share/man/man3p/tmpfile.3p
-#usr/share/man/man3p/tmpnam.3p
-#usr/share/man/man3p/toascii.3p
-#usr/share/man/man3p/tolower.3p
-#usr/share/man/man3p/toupper.3p
-#usr/share/man/man3p/towctrans.3p
-#usr/share/man/man3p/towlower.3p
-#usr/share/man/man3p/towupper.3p
-#usr/share/man/man3p/trunc.3p
-#usr/share/man/man3p/truncate.3p
-#usr/share/man/man3p/truncf.3p
-#usr/share/man/man3p/truncl.3p
-#usr/share/man/man3p/tsearch.3p
-#usr/share/man/man3p/ttyname.3p
-#usr/share/man/man3p/ttyname_r.3p
-#usr/share/man/man3p/twalk.3p
-#usr/share/man/man3p/tzname.3p
-#usr/share/man/man3p/tzset.3p
-#usr/share/man/man3p/ualarm.3p
-#usr/share/man/man3p/ulimit.3p
-#usr/share/man/man3p/umask.3p
-#usr/share/man/man3p/uname.3p
-#usr/share/man/man3p/ungetc.3p
-#usr/share/man/man3p/ungetwc.3p
-#usr/share/man/man3p/unlink.3p
-#usr/share/man/man3p/unlockpt.3p
-#usr/share/man/man3p/unsetenv.3p
-#usr/share/man/man3p/usleep.3p
-#usr/share/man/man3p/utime.3p
-#usr/share/man/man3p/utimes.3p
-#usr/share/man/man3p/va_arg.3p
-#usr/share/man/man3p/va_copy.3p
-#usr/share/man/man3p/va_end.3p
-#usr/share/man/man3p/va_start.3p
-#usr/share/man/man3p/vfork.3p
-#usr/share/man/man3p/vfprintf.3p
-#usr/share/man/man3p/vfscanf.3p
-#usr/share/man/man3p/vfwprintf.3p
-#usr/share/man/man3p/vfwscanf.3p
-#usr/share/man/man3p/vprintf.3p
-#usr/share/man/man3p/vscanf.3p
-#usr/share/man/man3p/vsnprintf.3p
-#usr/share/man/man3p/vsprintf.3p
-#usr/share/man/man3p/vsscanf.3p
-#usr/share/man/man3p/vswprintf.3p
-#usr/share/man/man3p/vswscanf.3p
-#usr/share/man/man3p/vwprintf.3p
-#usr/share/man/man3p/vwscanf.3p
-#usr/share/man/man3p/wait.3p
-#usr/share/man/man3p/waitid.3p
-#usr/share/man/man3p/waitpid.3p
-#usr/share/man/man3p/wcrtomb.3p
-#usr/share/man/man3p/wcscat.3p
-#usr/share/man/man3p/wcschr.3p
-#usr/share/man/man3p/wcscmp.3p
-#usr/share/man/man3p/wcscoll.3p
-#usr/share/man/man3p/wcscpy.3p
-#usr/share/man/man3p/wcscspn.3p
-#usr/share/man/man3p/wcsftime.3p
-#usr/share/man/man3p/wcslen.3p
-#usr/share/man/man3p/wcsncat.3p
-#usr/share/man/man3p/wcsncmp.3p
-#usr/share/man/man3p/wcsncpy.3p
-#usr/share/man/man3p/wcspbrk.3p
-#usr/share/man/man3p/wcsrchr.3p
-#usr/share/man/man3p/wcsrtombs.3p
-#usr/share/man/man3p/wcsspn.3p
-#usr/share/man/man3p/wcsstr.3p
-#usr/share/man/man3p/wcstod.3p
-#usr/share/man/man3p/wcstof.3p
-#usr/share/man/man3p/wcstoimax.3p
-#usr/share/man/man3p/wcstok.3p
-#usr/share/man/man3p/wcstol.3p
-#usr/share/man/man3p/wcstold.3p
-#usr/share/man/man3p/wcstoll.3p
-#usr/share/man/man3p/wcstombs.3p
-#usr/share/man/man3p/wcstoul.3p
-#usr/share/man/man3p/wcstoull.3p
-#usr/share/man/man3p/wcstoumax.3p
-#usr/share/man/man3p/wcswcs.3p
-#usr/share/man/man3p/wcswidth.3p
-#usr/share/man/man3p/wcsxfrm.3p
-#usr/share/man/man3p/wctob.3p
-#usr/share/man/man3p/wctomb.3p
-#usr/share/man/man3p/wctrans.3p
-#usr/share/man/man3p/wctype.3p
-#usr/share/man/man3p/wcwidth.3p
-#usr/share/man/man3p/wmemchr.3p
-#usr/share/man/man3p/wmemcmp.3p
-#usr/share/man/man3p/wmemcpy.3p
-#usr/share/man/man3p/wmemmove.3p
-#usr/share/man/man3p/wmemset.3p
-#usr/share/man/man3p/wordexp.3p
-#usr/share/man/man3p/wordfree.3p
-#usr/share/man/man3p/wprintf.3p
-#usr/share/man/man3p/write.3p
-#usr/share/man/man3p/writev.3p
-#usr/share/man/man3p/wscanf.3p
-#usr/share/man/man3p/y0.3p
-#usr/share/man/man3p/y1.3p
-#usr/share/man/man3p/yn.3p
-#usr/share/man/man4/console.4
-#usr/share/man/man4/console_codes.4
-#usr/share/man/man4/console_ioctl.4
-#usr/share/man/man4/dsp56k.4
-#usr/share/man/man4/epoll.4
-#usr/share/man/man4/fd.4
-#usr/share/man/man4/fifo.4
-#usr/share/man/man4/full.4
-#usr/share/man/man4/futex.4
-#usr/share/man/man4/hd.4
-#usr/share/man/man4/initrd.4
-#usr/share/man/man4/intro.4
-#usr/share/man/man4/kmem.4
-#usr/share/man/man4/lp.4
-#usr/share/man/man4/mem.4
-#usr/share/man/man4/mouse.4
-#usr/share/man/man4/null.4
-#usr/share/man/man4/port.4
-#usr/share/man/man4/ptmx.4
-#usr/share/man/man4/pts.4
-#usr/share/man/man4/ram.4
-#usr/share/man/man4/random.4
-#usr/share/man/man4/rtc.4
-#usr/share/man/man4/sd.4
-#usr/share/man/man4/sk98lin.4
-#usr/share/man/man4/st.4
-#usr/share/man/man4/tty.4
-#usr/share/man/man4/ttyS.4
-#usr/share/man/man4/tty_ioctl.4
-#usr/share/man/man4/urandom.4
-#usr/share/man/man4/vcs.4
-#usr/share/man/man4/vcsa.4
-#usr/share/man/man4/wavelan.4
-#usr/share/man/man4/zero.4
-#usr/share/man/man5/acct.5
-#usr/share/man/man5/charmap.5
-#usr/share/man/man5/complex.5
-#usr/share/man/man5/core.5
-#usr/share/man/man5/dir_colors.5
-#usr/share/man/man5/elf.5
-#usr/share/man/man5/environ.5
-#usr/share/man/man5/fs.5
-#usr/share/man/man5/ftpusers.5
-#usr/share/man/man5/group.5
-#usr/share/man/man5/host.conf.5
-#usr/share/man/man5/hosts.5
-#usr/share/man/man5/hosts.equiv.5
-#usr/share/man/man5/intro.5
-#usr/share/man/man5/ipc.5
-#usr/share/man/man5/issue.5
-#usr/share/man/man5/locale.5
-#usr/share/man/man5/motd.5
-#usr/share/man/man5/nologin.5
-#usr/share/man/man5/nscd.conf.5
-#usr/share/man/man5/nsswitch.conf.5
-#usr/share/man/man5/passwd.5
-#usr/share/man/man5/proc.5
-#usr/share/man/man5/protocols.5
-#usr/share/man/man5/resolv.conf.5
-#usr/share/man/man5/resolver.5
-#usr/share/man/man5/rpc.5
-#usr/share/man/man5/securetty.5
-#usr/share/man/man5/services.5
-#usr/share/man/man5/shells.5
-#usr/share/man/man5/slabinfo.5
-#usr/share/man/man5/termcap.5
-#usr/share/man/man5/ttytype.5
-#usr/share/man/man5/tzfile.5
-#usr/share/man/man5/utmp.5
-#usr/share/man/man5/wtmp.5
-#usr/share/man/man6/intro.6
-#usr/share/man/man7/LDP.7
-#usr/share/man/man7/arp.7
-#usr/share/man/man7/ascii.7
-#usr/share/man/man7/boot.7
-#usr/share/man/man7/bootparam.7
-#usr/share/man/man7/capabilities.7
-#usr/share/man/man7/charsets.7
-#usr/share/man/man7/complex.7
-#usr/share/man/man7/ddp.7
-#usr/share/man/man7/environ.7
-#usr/share/man/man7/epoll.7
-#usr/share/man/man7/feature_test_macros.7
-#usr/share/man/man7/fifo.7
-#usr/share/man/man7/futex.7
-#usr/share/man/man7/glob.7
-#usr/share/man/man7/hier.7
-#usr/share/man/man7/icmp.7
-#usr/share/man/man7/inotify.7
-#usr/share/man/man7/intro.7
-#usr/share/man/man7/ip.7
-#usr/share/man/man7/ipv6.7
-#usr/share/man/man7/iso-8859-1.7
-#usr/share/man/man7/iso-8859-15.7
-#usr/share/man/man7/iso-8859-16.7
-#usr/share/man/man7/iso-8859-2.7
-#usr/share/man/man7/iso-8859-7.7
-#usr/share/man/man7/iso-8859-9.7
-#usr/share/man/man7/iso_8859-1.7
-#usr/share/man/man7/iso_8859-15.7
-#usr/share/man/man7/iso_8859-16.7
-#usr/share/man/man7/iso_8859-2.7
-#usr/share/man/man7/iso_8859-7.7
-#usr/share/man/man7/iso_8859-9.7
-#usr/share/man/man7/iso_8859_1.7
-#usr/share/man/man7/iso_8859_15.7
-#usr/share/man/man7/iso_8859_16.7
-#usr/share/man/man7/iso_8859_2.7
-#usr/share/man/man7/iso_8859_7.7
-#usr/share/man/man7/iso_8859_9.7
-#usr/share/man/man7/koi8-r.7
-#usr/share/man/man7/latin1.7
-#usr/share/man/man7/latin10.7
-#usr/share/man/man7/latin2.7
-#usr/share/man/man7/latin5.7
-#usr/share/man/man7/latin9.7
-#usr/share/man/man7/locale.7
-#usr/share/man/man7/mailaddr.7
-#usr/share/man/man7/man.7
-#usr/share/man/man7/mdoc.7
-#usr/share/man/man7/mdoc.samples.7
-#usr/share/man/man7/mq_overview.7
-#usr/share/man/man7/netdevice.7
-#usr/share/man/man7/netlink.7
-#usr/share/man/man7/operator.7
-#usr/share/man/man7/packet.7
-#usr/share/man/man7/pipe.7
-#usr/share/man/man7/posixoptions.7
-#usr/share/man/man7/pthreads.7
-#usr/share/man/man7/pty.7
-#usr/share/man/man7/raw.7
-#usr/share/man/man7/regex.7
-#usr/share/man/man7/rtnetlink.7
-#usr/share/man/man7/sem_overview.7
-#usr/share/man/man7/signal.7
-#usr/share/man/man7/socket.7
-#usr/share/man/man7/suffixes.7
-#usr/share/man/man7/svipc.7
-#usr/share/man/man7/tcp.7
-#usr/share/man/man7/time.7
-#usr/share/man/man7/udp.7
-#usr/share/man/man7/unicode.7
-#usr/share/man/man7/units.7
-#usr/share/man/man7/unix.7
-#usr/share/man/man7/uri.7
-#usr/share/man/man7/url.7
-#usr/share/man/man7/urn.7
-#usr/share/man/man7/utf-8.7
-#usr/share/man/man7/utf8.7
-#usr/share/man/man7/x25.7
-#usr/share/man/man8/intro.8
-#usr/share/man/man8/ld-linux.8
-#usr/share/man/man8/ld-linux.so.8
-#usr/share/man/man8/ld.so.8
-#usr/share/man/man8/ldconfig.8
-#usr/share/man/man8/nscd.8
-#usr/share/man/man8/sync.8
-#usr/share/man/man8/tzselect.8
-#usr/share/man/man8/zdump.8
-#usr/share/man/man8/zic.8
-#usr/share/man/man9
-#usr/share/man/man9/ksoftirqd.9
+#usr/local/share/man/man1/getent.1
+#usr/local/share/man/man1/iconv.1
+#usr/local/share/man/man1/intro.1
+#usr/local/share/man/man1/ldd.1
+#usr/local/share/man/man1/locale.1
+#usr/local/share/man/man1/localedef.1
+#usr/local/share/man/man1/memusage.1
+#usr/local/share/man/man1/memusagestat.1
+#usr/local/share/man/man1/mtrace.1
+#usr/local/share/man/man1/pldd.1
+#usr/local/share/man/man1/sprof.1
+#usr/local/share/man/man1/time.1
+#usr/local/share/man/man2/_Exit.2
+#usr/local/share/man/man2/__clone2.2
+#usr/local/share/man/man2/_exit.2
+#usr/local/share/man/man2/_llseek.2
+#usr/local/share/man/man2/_newselect.2
+#usr/local/share/man/man2/_syscall.2
+#usr/local/share/man/man2/_sysctl.2
+#usr/local/share/man/man2/accept.2
+#usr/local/share/man/man2/accept4.2
+#usr/local/share/man/man2/access.2
+#usr/local/share/man/man2/acct.2
+#usr/local/share/man/man2/add_key.2
+#usr/local/share/man/man2/adjtimex.2
+#usr/local/share/man/man2/afs_syscall.2
+#usr/local/share/man/man2/alarm.2
+#usr/local/share/man/man2/alloc_hugepages.2
+#usr/local/share/man/man2/arch_prctl.2
+#usr/local/share/man/man2/arm_fadvise.2
+#usr/local/share/man/man2/arm_fadvise64_64.2
+#usr/local/share/man/man2/arm_sync_file_range.2
+#usr/local/share/man/man2/bdflush.2
+#usr/local/share/man/man2/bind.2
+#usr/local/share/man/man2/bpf.2
+#usr/local/share/man/man2/break.2
+#usr/local/share/man/man2/brk.2
+#usr/local/share/man/man2/cacheflush.2
+#usr/local/share/man/man2/capget.2
+#usr/local/share/man/man2/capset.2
+#usr/local/share/man/man2/chdir.2
+#usr/local/share/man/man2/chmod.2
+#usr/local/share/man/man2/chown.2
+#usr/local/share/man/man2/chown32.2
+#usr/local/share/man/man2/chroot.2
+#usr/local/share/man/man2/clock_adjtime.2
+#usr/local/share/man/man2/clock_getres.2
+#usr/local/share/man/man2/clock_gettime.2
+#usr/local/share/man/man2/clock_nanosleep.2
+#usr/local/share/man/man2/clock_settime.2
+#usr/local/share/man/man2/clone.2
+#usr/local/share/man/man2/clone2.2
+#usr/local/share/man/man2/clone3.2
+#usr/local/share/man/man2/close.2
+#usr/local/share/man/man2/close_range.2
+#usr/local/share/man/man2/connect.2
+#usr/local/share/man/man2/copy_file_range.2
+#usr/local/share/man/man2/creat.2
+#usr/local/share/man/man2/create_module.2
+#usr/local/share/man/man2/delete_module.2
+#usr/local/share/man/man2/dup.2
+#usr/local/share/man/man2/dup2.2
+#usr/local/share/man/man2/dup3.2
+#usr/local/share/man/man2/epoll_create.2
+#usr/local/share/man/man2/epoll_create1.2
+#usr/local/share/man/man2/epoll_ctl.2
+#usr/local/share/man/man2/epoll_pwait.2
+#usr/local/share/man/man2/epoll_pwait2.2
+#usr/local/share/man/man2/epoll_wait.2
+#usr/local/share/man/man2/eventfd.2
+#usr/local/share/man/man2/eventfd2.2
+#usr/local/share/man/man2/execve.2
+#usr/local/share/man/man2/execveat.2
+#usr/local/share/man/man2/exit.2
+#usr/local/share/man/man2/exit_group.2
+#usr/local/share/man/man2/faccessat.2
+#usr/local/share/man/man2/faccessat2.2
+#usr/local/share/man/man2/fadvise64.2
+#usr/local/share/man/man2/fadvise64_64.2
+#usr/local/share/man/man2/fallocate.2
+#usr/local/share/man/man2/fanotify_init.2
+#usr/local/share/man/man2/fanotify_mark.2
+#usr/local/share/man/man2/fattach.2
+#usr/local/share/man/man2/fchdir.2
+#usr/local/share/man/man2/fchmod.2
+#usr/local/share/man/man2/fchmodat.2
+#usr/local/share/man/man2/fchown.2
+#usr/local/share/man/man2/fchown32.2
+#usr/local/share/man/man2/fchownat.2
+#usr/local/share/man/man2/fcntl.2
+#usr/local/share/man/man2/fcntl64.2
+#usr/local/share/man/man2/fdatasync.2
+#usr/local/share/man/man2/fdetach.2
+#usr/local/share/man/man2/fgetxattr.2
+#usr/local/share/man/man2/finit_module.2
+#usr/local/share/man/man2/flistxattr.2
+#usr/local/share/man/man2/flock.2
+#usr/local/share/man/man2/fork.2
+#usr/local/share/man/man2/free_hugepages.2
+#usr/local/share/man/man2/fremovexattr.2
+#usr/local/share/man/man2/fsetxattr.2
+#usr/local/share/man/man2/fstat.2
+#usr/local/share/man/man2/fstat64.2
+#usr/local/share/man/man2/fstatat.2
+#usr/local/share/man/man2/fstatat64.2
+#usr/local/share/man/man2/fstatfs.2
+#usr/local/share/man/man2/fstatfs64.2
+#usr/local/share/man/man2/fsync.2
+#usr/local/share/man/man2/ftruncate.2
+#usr/local/share/man/man2/ftruncate64.2
+#usr/local/share/man/man2/futex.2
+#usr/local/share/man/man2/futimesat.2
+#usr/local/share/man/man2/get_kernel_syms.2
+#usr/local/share/man/man2/get_mempolicy.2
+#usr/local/share/man/man2/get_robust_list.2
+#usr/local/share/man/man2/get_thread_area.2
+#usr/local/share/man/man2/getcpu.2
+#usr/local/share/man/man2/getcwd.2
+#usr/local/share/man/man2/getdents.2
+#usr/local/share/man/man2/getdents64.2
+#usr/local/share/man/man2/getdomainname.2
+#usr/local/share/man/man2/getegid.2
+#usr/local/share/man/man2/getegid32.2
+#usr/local/share/man/man2/geteuid.2
+#usr/local/share/man/man2/geteuid32.2
+#usr/local/share/man/man2/getgid.2
+#usr/local/share/man/man2/getgid32.2
+#usr/local/share/man/man2/getgroups.2
+#usr/local/share/man/man2/getgroups32.2
+#usr/local/share/man/man2/gethostname.2
+#usr/local/share/man/man2/getitimer.2
+#usr/local/share/man/man2/getmsg.2
+#usr/local/share/man/man2/getpagesize.2
+#usr/local/share/man/man2/getpeername.2
+#usr/local/share/man/man2/getpgid.2
+#usr/local/share/man/man2/getpgrp.2
+#usr/local/share/man/man2/getpid.2
+#usr/local/share/man/man2/getpmsg.2
+#usr/local/share/man/man2/getppid.2
+#usr/local/share/man/man2/getpriority.2
+#usr/local/share/man/man2/getrandom.2
+#usr/local/share/man/man2/getresgid.2
+#usr/local/share/man/man2/getresgid32.2
+#usr/local/share/man/man2/getresuid.2
+#usr/local/share/man/man2/getresuid32.2
+#usr/local/share/man/man2/getrlimit.2
+#usr/local/share/man/man2/getrusage.2
+#usr/local/share/man/man2/getsid.2
+#usr/local/share/man/man2/getsockname.2
+#usr/local/share/man/man2/getsockopt.2
+#usr/local/share/man/man2/gettid.2
+#usr/local/share/man/man2/gettimeofday.2
+#usr/local/share/man/man2/getuid.2
+#usr/local/share/man/man2/getuid32.2
+#usr/local/share/man/man2/getunwind.2
+#usr/local/share/man/man2/getxattr.2
+#usr/local/share/man/man2/gtty.2
+#usr/local/share/man/man2/idle.2
+#usr/local/share/man/man2/inb.2
+#usr/local/share/man/man2/inb_p.2
+#usr/local/share/man/man2/init_module.2
+#usr/local/share/man/man2/inl.2
+#usr/local/share/man/man2/inl_p.2
+#usr/local/share/man/man2/inotify_add_watch.2
+#usr/local/share/man/man2/inotify_init.2
+#usr/local/share/man/man2/inotify_init1.2
+#usr/local/share/man/man2/inotify_rm_watch.2
+#usr/local/share/man/man2/insb.2
+#usr/local/share/man/man2/insl.2
+#usr/local/share/man/man2/insw.2
+#usr/local/share/man/man2/intro.2
+#usr/local/share/man/man2/inw.2
+#usr/local/share/man/man2/inw_p.2
+#usr/local/share/man/man2/io_cancel.2
+#usr/local/share/man/man2/io_destroy.2
+#usr/local/share/man/man2/io_getevents.2
+#usr/local/share/man/man2/io_setup.2
+#usr/local/share/man/man2/io_submit.2
+#usr/local/share/man/man2/ioctl.2
+#usr/local/share/man/man2/ioctl_console.2
+#usr/local/share/man/man2/ioctl_fat.2
+#usr/local/share/man/man2/ioctl_ficlone.2
+#usr/local/share/man/man2/ioctl_ficlonerange.2
+#usr/local/share/man/man2/ioctl_fideduperange.2
+#usr/local/share/man/man2/ioctl_fslabel.2
+#usr/local/share/man/man2/ioctl_getfsmap.2
+#usr/local/share/man/man2/ioctl_iflags.2
+#usr/local/share/man/man2/ioctl_ns.2
+#usr/local/share/man/man2/ioctl_tty.2
+#usr/local/share/man/man2/ioctl_userfaultfd.2
+#usr/local/share/man/man2/ioperm.2
+#usr/local/share/man/man2/iopl.2
+#usr/local/share/man/man2/ioprio_get.2
+#usr/local/share/man/man2/ioprio_set.2
+#usr/local/share/man/man2/ipc.2
+#usr/local/share/man/man2/isastream.2
+#usr/local/share/man/man2/kcmp.2
+#usr/local/share/man/man2/kexec_file_load.2
+#usr/local/share/man/man2/kexec_load.2
+#usr/local/share/man/man2/keyctl.2
+#usr/local/share/man/man2/kill.2
+#usr/local/share/man/man2/lchown.2
+#usr/local/share/man/man2/lchown32.2
+#usr/local/share/man/man2/lgetxattr.2
+#usr/local/share/man/man2/link.2
+#usr/local/share/man/man2/linkat.2
+#usr/local/share/man/man2/listen.2
+#usr/local/share/man/man2/listxattr.2
+#usr/local/share/man/man2/llistxattr.2
+#usr/local/share/man/man2/llseek.2
+#usr/local/share/man/man2/lock.2
+#usr/local/share/man/man2/lookup_dcookie.2
+#usr/local/share/man/man2/lremovexattr.2
+#usr/local/share/man/man2/lseek.2
+#usr/local/share/man/man2/lsetxattr.2
+#usr/local/share/man/man2/lstat.2
+#usr/local/share/man/man2/lstat64.2
+#usr/local/share/man/man2/madvise.2
+#usr/local/share/man/man2/madvise1.2
+#usr/local/share/man/man2/mbind.2
+#usr/local/share/man/man2/membarrier.2
+#usr/local/share/man/man2/memfd_create.2
+#usr/local/share/man/man2/migrate_pages.2
+#usr/local/share/man/man2/mincore.2
+#usr/local/share/man/man2/mkdir.2
+#usr/local/share/man/man2/mkdirat.2
+#usr/local/share/man/man2/mknod.2
+#usr/local/share/man/man2/mknodat.2
+#usr/local/share/man/man2/mlock.2
+#usr/local/share/man/man2/mlock2.2
+#usr/local/share/man/man2/mlockall.2
+#usr/local/share/man/man2/mmap.2
+#usr/local/share/man/man2/mmap2.2
+#usr/local/share/man/man2/modify_ldt.2
+#usr/local/share/man/man2/mount.2
+#usr/local/share/man/man2/mount_setattr.2
+#usr/local/share/man/man2/move_pages.2
+#usr/local/share/man/man2/mprotect.2
+#usr/local/share/man/man2/mpx.2
+#usr/local/share/man/man2/mq_getsetattr.2
+#usr/local/share/man/man2/mq_notify.2
+#usr/local/share/man/man2/mq_open.2
+#usr/local/share/man/man2/mq_timedreceive.2
+#usr/local/share/man/man2/mq_timedsend.2
+#usr/local/share/man/man2/mq_unlink.2
+#usr/local/share/man/man2/mremap.2
+#usr/local/share/man/man2/msgctl.2
+#usr/local/share/man/man2/msgget.2
+#usr/local/share/man/man2/msgop.2
+#usr/local/share/man/man2/msgrcv.2
+#usr/local/share/man/man2/msgsnd.2
+#usr/local/share/man/man2/msync.2
+#usr/local/share/man/man2/munlock.2
+#usr/local/share/man/man2/munlockall.2
+#usr/local/share/man/man2/munmap.2
+#usr/local/share/man/man2/name_to_handle_at.2
+#usr/local/share/man/man2/nanosleep.2
+#usr/local/share/man/man2/newfstatat.2
+#usr/local/share/man/man2/nfsservctl.2
+#usr/local/share/man/man2/nice.2
+#usr/local/share/man/man2/oldfstat.2
+#usr/local/share/man/man2/oldlstat.2
+#usr/local/share/man/man2/oldolduname.2
+#usr/local/share/man/man2/oldstat.2
+#usr/local/share/man/man2/olduname.2
+#usr/local/share/man/man2/open.2
+#usr/local/share/man/man2/open_by_handle_at.2
+#usr/local/share/man/man2/openat.2
+#usr/local/share/man/man2/openat2.2
+#usr/local/share/man/man2/outb.2
+#usr/local/share/man/man2/outb_p.2
+#usr/local/share/man/man2/outl.2
+#usr/local/share/man/man2/outl_p.2
+#usr/local/share/man/man2/outsb.2
+#usr/local/share/man/man2/outsl.2
+#usr/local/share/man/man2/outsw.2
+#usr/local/share/man/man2/outw.2
+#usr/local/share/man/man2/outw_p.2
+#usr/local/share/man/man2/pause.2
+#usr/local/share/man/man2/pciconfig_iobase.2
+#usr/local/share/man/man2/pciconfig_read.2
+#usr/local/share/man/man2/pciconfig_write.2
+#usr/local/share/man/man2/perf_event_open.2
+#usr/local/share/man/man2/perfmonctl.2
+#usr/local/share/man/man2/personality.2
+#usr/local/share/man/man2/phys.2
+#usr/local/share/man/man2/pidfd_getfd.2
+#usr/local/share/man/man2/pidfd_open.2
+#usr/local/share/man/man2/pidfd_send_signal.2
+#usr/local/share/man/man2/pipe.2
+#usr/local/share/man/man2/pipe2.2
+#usr/local/share/man/man2/pivot_root.2
+#usr/local/share/man/man2/pkey_alloc.2
+#usr/local/share/man/man2/pkey_free.2
+#usr/local/share/man/man2/pkey_mprotect.2
+#usr/local/share/man/man2/poll.2
+#usr/local/share/man/man2/posix_fadvise.2
+#usr/local/share/man/man2/ppoll.2
+#usr/local/share/man/man2/prctl.2
+#usr/local/share/man/man2/pread.2
+#usr/local/share/man/man2/pread64.2
+#usr/local/share/man/man2/preadv.2
+#usr/local/share/man/man2/preadv2.2
+#usr/local/share/man/man2/prlimit.2
+#usr/local/share/man/man2/prlimit64.2
+#usr/local/share/man/man2/process_madvise.2
+#usr/local/share/man/man2/process_vm_readv.2
+#usr/local/share/man/man2/process_vm_writev.2
+#usr/local/share/man/man2/prof.2
+#usr/local/share/man/man2/pselect.2
+#usr/local/share/man/man2/pselect6.2
+#usr/local/share/man/man2/ptrace.2
+#usr/local/share/man/man2/putmsg.2
+#usr/local/share/man/man2/putpmsg.2
+#usr/local/share/man/man2/pwrite.2
+#usr/local/share/man/man2/pwrite64.2
+#usr/local/share/man/man2/pwritev.2
+#usr/local/share/man/man2/pwritev2.2
+#usr/local/share/man/man2/query_module.2
+#usr/local/share/man/man2/quotactl.2
+#usr/local/share/man/man2/read.2
+#usr/local/share/man/man2/readahead.2
+#usr/local/share/man/man2/readdir.2
+#usr/local/share/man/man2/readlink.2
+#usr/local/share/man/man2/readlinkat.2
+#usr/local/share/man/man2/readv.2
+#usr/local/share/man/man2/reboot.2
+#usr/local/share/man/man2/recv.2
+#usr/local/share/man/man2/recvfrom.2
+#usr/local/share/man/man2/recvmmsg.2
+#usr/local/share/man/man2/recvmsg.2
+#usr/local/share/man/man2/remap_file_pages.2
+#usr/local/share/man/man2/removexattr.2
+#usr/local/share/man/man2/rename.2
+#usr/local/share/man/man2/renameat.2
+#usr/local/share/man/man2/renameat2.2
+#usr/local/share/man/man2/request_key.2
+#usr/local/share/man/man2/restart_syscall.2
+#usr/local/share/man/man2/rmdir.2
+#usr/local/share/man/man2/rt_sigaction.2
+#usr/local/share/man/man2/rt_sigpending.2
+#usr/local/share/man/man2/rt_sigprocmask.2
+#usr/local/share/man/man2/rt_sigqueueinfo.2
+#usr/local/share/man/man2/rt_sigreturn.2
+#usr/local/share/man/man2/rt_sigsuspend.2
+#usr/local/share/man/man2/rt_sigtimedwait.2
+#usr/local/share/man/man2/rt_tgsigqueueinfo.2
+#usr/local/share/man/man2/s390_guarded_storage.2
+#usr/local/share/man/man2/s390_pci_mmio_read.2
+#usr/local/share/man/man2/s390_pci_mmio_write.2
+#usr/local/share/man/man2/s390_runtime_instr.2
+#usr/local/share/man/man2/s390_sthyi.2
+#usr/local/share/man/man2/sbrk.2
+#usr/local/share/man/man2/sched_get_priority_max.2
+#usr/local/share/man/man2/sched_get_priority_min.2
+#usr/local/share/man/man2/sched_getaffinity.2
+#usr/local/share/man/man2/sched_getattr.2
+#usr/local/share/man/man2/sched_getparam.2
+#usr/local/share/man/man2/sched_getscheduler.2
+#usr/local/share/man/man2/sched_rr_get_interval.2
+#usr/local/share/man/man2/sched_setaffinity.2
+#usr/local/share/man/man2/sched_setattr.2
+#usr/local/share/man/man2/sched_setparam.2
+#usr/local/share/man/man2/sched_setscheduler.2
+#usr/local/share/man/man2/sched_yield.2
+#usr/local/share/man/man2/seccomp.2
+#usr/local/share/man/man2/seccomp_unotify.2
+#usr/local/share/man/man2/security.2
+#usr/local/share/man/man2/select.2
+#usr/local/share/man/man2/select_tut.2
+#usr/local/share/man/man2/semctl.2
+#usr/local/share/man/man2/semget.2
+#usr/local/share/man/man2/semop.2
+#usr/local/share/man/man2/semtimedop.2
+#usr/local/share/man/man2/send.2
+#usr/local/share/man/man2/sendfile.2
+#usr/local/share/man/man2/sendfile64.2
+#usr/local/share/man/man2/sendmmsg.2
+#usr/local/share/man/man2/sendmsg.2
+#usr/local/share/man/man2/sendto.2
+#usr/local/share/man/man2/set_mempolicy.2
+#usr/local/share/man/man2/set_robust_list.2
+#usr/local/share/man/man2/set_thread_area.2
+#usr/local/share/man/man2/set_tid_address.2
+#usr/local/share/man/man2/setdomainname.2
+#usr/local/share/man/man2/setegid.2
+#usr/local/share/man/man2/seteuid.2
+#usr/local/share/man/man2/setfsgid.2
+#usr/local/share/man/man2/setfsgid32.2
+#usr/local/share/man/man2/setfsuid.2
+#usr/local/share/man/man2/setfsuid32.2
+#usr/local/share/man/man2/setgid.2
+#usr/local/share/man/man2/setgid32.2
+#usr/local/share/man/man2/setgroups.2
+#usr/local/share/man/man2/setgroups32.2
+#usr/local/share/man/man2/sethostname.2
+#usr/local/share/man/man2/setitimer.2
+#usr/local/share/man/man2/setns.2
+#usr/local/share/man/man2/setpgid.2
+#usr/local/share/man/man2/setpgrp.2
+#usr/local/share/man/man2/setpriority.2
+#usr/local/share/man/man2/setregid.2
+#usr/local/share/man/man2/setregid32.2
+#usr/local/share/man/man2/setresgid.2
+#usr/local/share/man/man2/setresgid32.2
+#usr/local/share/man/man2/setresuid.2
+#usr/local/share/man/man2/setresuid32.2
+#usr/local/share/man/man2/setreuid.2
+#usr/local/share/man/man2/setreuid32.2
+#usr/local/share/man/man2/setrlimit.2
+#usr/local/share/man/man2/setsid.2
+#usr/local/share/man/man2/setsockopt.2
+#usr/local/share/man/man2/settimeofday.2
+#usr/local/share/man/man2/setuid.2
+#usr/local/share/man/man2/setuid32.2
+#usr/local/share/man/man2/setup.2
+#usr/local/share/man/man2/setxattr.2
+#usr/local/share/man/man2/sgetmask.2
+#usr/local/share/man/man2/shmat.2
+#usr/local/share/man/man2/shmctl.2
+#usr/local/share/man/man2/shmdt.2
+#usr/local/share/man/man2/shmget.2
+#usr/local/share/man/man2/shmop.2
+#usr/local/share/man/man2/shutdown.2
+#usr/local/share/man/man2/sigaction.2
+#usr/local/share/man/man2/sigaltstack.2
+#usr/local/share/man/man2/signal.2
+#usr/local/share/man/man2/signalfd.2
+#usr/local/share/man/man2/signalfd4.2
+#usr/local/share/man/man2/sigpending.2
+#usr/local/share/man/man2/sigprocmask.2
+#usr/local/share/man/man2/sigreturn.2
+#usr/local/share/man/man2/sigsuspend.2
+#usr/local/share/man/man2/sigtimedwait.2
+#usr/local/share/man/man2/sigwaitinfo.2
+#usr/local/share/man/man2/socket.2
+#usr/local/share/man/man2/socketcall.2
+#usr/local/share/man/man2/socketpair.2
+#usr/local/share/man/man2/splice.2
+#usr/local/share/man/man2/spu_create.2
+#usr/local/share/man/man2/spu_run.2
+#usr/local/share/man/man2/ssetmask.2
+#usr/local/share/man/man2/stat.2
+#usr/local/share/man/man2/stat64.2
+#usr/local/share/man/man2/statfs.2
+#usr/local/share/man/man2/statfs64.2
+#usr/local/share/man/man2/statx.2
+#usr/local/share/man/man2/stime.2
+#usr/local/share/man/man2/stty.2
+#usr/local/share/man/man2/subpage_prot.2
+#usr/local/share/man/man2/swapoff.2
+#usr/local/share/man/man2/swapon.2
+#usr/local/share/man/man2/symlink.2
+#usr/local/share/man/man2/symlinkat.2
+#usr/local/share/man/man2/sync.2
+#usr/local/share/man/man2/sync_file_range.2
+#usr/local/share/man/man2/sync_file_range2.2
+#usr/local/share/man/man2/syncfs.2
+#usr/local/share/man/man2/syscall.2
+#usr/local/share/man/man2/syscalls.2
+#usr/local/share/man/man2/sysctl.2
+#usr/local/share/man/man2/sysfs.2
+#usr/local/share/man/man2/sysinfo.2
+#usr/local/share/man/man2/syslog.2
+#usr/local/share/man/man2/tee.2
+#usr/local/share/man/man2/tgkill.2
+#usr/local/share/man/man2/time.2
+#usr/local/share/man/man2/timer_create.2
+#usr/local/share/man/man2/timer_delete.2
+#usr/local/share/man/man2/timer_getoverrun.2
+#usr/local/share/man/man2/timer_gettime.2
+#usr/local/share/man/man2/timer_settime.2
+#usr/local/share/man/man2/timerfd_create.2
+#usr/local/share/man/man2/timerfd_gettime.2
+#usr/local/share/man/man2/timerfd_settime.2
+#usr/local/share/man/man2/times.2
+#usr/local/share/man/man2/tkill.2
+#usr/local/share/man/man2/truncate.2
+#usr/local/share/man/man2/truncate64.2
+#usr/local/share/man/man2/tuxcall.2
+#usr/local/share/man/man2/ugetrlimit.2
+#usr/local/share/man/man2/umask.2
+#usr/local/share/man/man2/umount.2
+#usr/local/share/man/man2/umount2.2
+#usr/local/share/man/man2/uname.2
+#usr/local/share/man/man2/unimplemented.2
+#usr/local/share/man/man2/unlink.2
+#usr/local/share/man/man2/unlinkat.2
+#usr/local/share/man/man2/unshare.2
+#usr/local/share/man/man2/uselib.2
+#usr/local/share/man/man2/userfaultfd.2
+#usr/local/share/man/man2/ustat.2
+#usr/local/share/man/man2/utime.2
+#usr/local/share/man/man2/utimensat.2
+#usr/local/share/man/man2/utimes.2
+#usr/local/share/man/man2/vfork.2
+#usr/local/share/man/man2/vhangup.2
+#usr/local/share/man/man2/vm86.2
+#usr/local/share/man/man2/vm86old.2
+#usr/local/share/man/man2/vmsplice.2
+#usr/local/share/man/man2/vserver.2
+#usr/local/share/man/man2/wait.2
+#usr/local/share/man/man2/wait3.2
+#usr/local/share/man/man2/wait4.2
+#usr/local/share/man/man2/waitid.2
+#usr/local/share/man/man2/waitpid.2
+#usr/local/share/man/man2/write.2
+#usr/local/share/man/man2/writev.2
+#usr/local/share/man/man3/CIRCLEQ_EMPTY.3
+#usr/local/share/man/man3/CIRCLEQ_ENTRY.3
+#usr/local/share/man/man3/CIRCLEQ_FIRST.3
+#usr/local/share/man/man3/CIRCLEQ_FOREACH.3
+#usr/local/share/man/man3/CIRCLEQ_FOREACH_REVERSE.3
+#usr/local/share/man/man3/CIRCLEQ_HEAD.3
+#usr/local/share/man/man3/CIRCLEQ_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/CIRCLEQ_INIT.3
+#usr/local/share/man/man3/CIRCLEQ_INSERT_AFTER.3
+#usr/local/share/man/man3/CIRCLEQ_INSERT_BEFORE.3
+#usr/local/share/man/man3/CIRCLEQ_INSERT_HEAD.3
+#usr/local/share/man/man3/CIRCLEQ_INSERT_TAIL.3
+#usr/local/share/man/man3/CIRCLEQ_LAST.3
+#usr/local/share/man/man3/CIRCLEQ_LOOP_NEXT.3
+#usr/local/share/man/man3/CIRCLEQ_LOOP_PREV.3
+#usr/local/share/man/man3/CIRCLEQ_NEXT.3
+#usr/local/share/man/man3/CIRCLEQ_PREV.3
+#usr/local/share/man/man3/CIRCLEQ_REMOVE.3
+#usr/local/share/man/man3/CMSG_ALIGN.3
+#usr/local/share/man/man3/CMSG_DATA.3
+#usr/local/share/man/man3/CMSG_FIRSTHDR.3
+#usr/local/share/man/man3/CMSG_LEN.3
+#usr/local/share/man/man3/CMSG_NXTHDR.3
+#usr/local/share/man/man3/CMSG_SPACE.3
+#usr/local/share/man/man3/CPU_ALLOC.3
+#usr/local/share/man/man3/CPU_ALLOC_SIZE.3
+#usr/local/share/man/man3/CPU_AND.3
+#usr/local/share/man/man3/CPU_AND_S.3
+#usr/local/share/man/man3/CPU_CLR.3
+#usr/local/share/man/man3/CPU_CLR_S.3
+#usr/local/share/man/man3/CPU_COUNT.3
+#usr/local/share/man/man3/CPU_COUNT_S.3
+#usr/local/share/man/man3/CPU_EQUAL.3
+#usr/local/share/man/man3/CPU_EQUAL_S.3
+#usr/local/share/man/man3/CPU_FREE.3
+#usr/local/share/man/man3/CPU_ISSET.3
+#usr/local/share/man/man3/CPU_ISSET_S.3
+#usr/local/share/man/man3/CPU_OR.3
+#usr/local/share/man/man3/CPU_OR_S.3
+#usr/local/share/man/man3/CPU_SET.3
+#usr/local/share/man/man3/CPU_SET_S.3
+#usr/local/share/man/man3/CPU_XOR.3
+#usr/local/share/man/man3/CPU_XOR_S.3
+#usr/local/share/man/man3/CPU_ZERO.3
+#usr/local/share/man/man3/CPU_ZERO_S.3
+#usr/local/share/man/man3/DES_FAILED.3
+#usr/local/share/man/man3/FD_CLR.3
+#usr/local/share/man/man3/FD_ISSET.3
+#usr/local/share/man/man3/FD_SET.3
+#usr/local/share/man/man3/FD_ZERO.3
+#usr/local/share/man/man3/FILE.3
+#usr/local/share/man/man3/HUGE_VAL.3
+#usr/local/share/man/man3/HUGE_VALF.3
+#usr/local/share/man/man3/HUGE_VALL.3
+#usr/local/share/man/man3/INFINITY.3
+#usr/local/share/man/man3/LIST_EMPTY.3
+#usr/local/share/man/man3/LIST_ENTRY.3
+#usr/local/share/man/man3/LIST_FIRST.3
+#usr/local/share/man/man3/LIST_FOREACH.3
+#usr/local/share/man/man3/LIST_HEAD.3
+#usr/local/share/man/man3/LIST_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/LIST_INIT.3
+#usr/local/share/man/man3/LIST_INSERT_AFTER.3
+#usr/local/share/man/man3/LIST_INSERT_BEFORE.3
+#usr/local/share/man/man3/LIST_INSERT_HEAD.3
+#usr/local/share/man/man3/LIST_NEXT.3
+#usr/local/share/man/man3/LIST_REMOVE.3
+#usr/local/share/man/man3/MAX.3
+#usr/local/share/man/man3/MB_CUR_MAX.3
+#usr/local/share/man/man3/MB_LEN_MAX.3
+#usr/local/share/man/man3/MIN.3
+#usr/local/share/man/man3/NAN.3
+#usr/local/share/man/man3/SIMPLEQ_EMPTY.3
+#usr/local/share/man/man3/SIMPLEQ_ENTRY.3
+#usr/local/share/man/man3/SIMPLEQ_FIRST.3
+#usr/local/share/man/man3/SIMPLEQ_FOREACH.3
+#usr/local/share/man/man3/SIMPLEQ_HEAD.3
+#usr/local/share/man/man3/SIMPLEQ_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/SIMPLEQ_INIT.3
+#usr/local/share/man/man3/SIMPLEQ_INSERT_AFTER.3
+#usr/local/share/man/man3/SIMPLEQ_INSERT_HEAD.3
+#usr/local/share/man/man3/SIMPLEQ_INSERT_TAIL.3
+#usr/local/share/man/man3/SIMPLEQ_NEXT.3
+#usr/local/share/man/man3/SIMPLEQ_REMOVE.3
+#usr/local/share/man/man3/SIMPLEQ_REMOVE_HEAD.3
+#usr/local/share/man/man3/SLIST_EMPTY.3
+#usr/local/share/man/man3/SLIST_ENTRY.3
+#usr/local/share/man/man3/SLIST_FIRST.3
+#usr/local/share/man/man3/SLIST_FOREACH.3
+#usr/local/share/man/man3/SLIST_HEAD.3
+#usr/local/share/man/man3/SLIST_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/SLIST_INIT.3
+#usr/local/share/man/man3/SLIST_INSERT_AFTER.3
+#usr/local/share/man/man3/SLIST_INSERT_HEAD.3
+#usr/local/share/man/man3/SLIST_NEXT.3
+#usr/local/share/man/man3/SLIST_REMOVE.3
+#usr/local/share/man/man3/SLIST_REMOVE_HEAD.3
+#usr/local/share/man/man3/STAILQ_CONCAT.3
+#usr/local/share/man/man3/STAILQ_EMPTY.3
+#usr/local/share/man/man3/STAILQ_ENTRY.3
+#usr/local/share/man/man3/STAILQ_FIRST.3
+#usr/local/share/man/man3/STAILQ_FOREACH.3
+#usr/local/share/man/man3/STAILQ_HEAD.3
+#usr/local/share/man/man3/STAILQ_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/STAILQ_INIT.3
+#usr/local/share/man/man3/STAILQ_INSERT_AFTER.3
+#usr/local/share/man/man3/STAILQ_INSERT_HEAD.3
+#usr/local/share/man/man3/STAILQ_INSERT_TAIL.3
+#usr/local/share/man/man3/STAILQ_NEXT.3
+#usr/local/share/man/man3/STAILQ_REMOVE.3
+#usr/local/share/man/man3/STAILQ_REMOVE_HEAD.3
+#usr/local/share/man/man3/TAILQ_CONCAT.3
+#usr/local/share/man/man3/TAILQ_EMPTY.3
+#usr/local/share/man/man3/TAILQ_ENTRY.3
+#usr/local/share/man/man3/TAILQ_FIRST.3
+#usr/local/share/man/man3/TAILQ_FOREACH.3
+#usr/local/share/man/man3/TAILQ_FOREACH_REVERSE.3
+#usr/local/share/man/man3/TAILQ_HEAD.3
+#usr/local/share/man/man3/TAILQ_HEAD_INITIALIZER.3
+#usr/local/share/man/man3/TAILQ_INIT.3
+#usr/local/share/man/man3/TAILQ_INSERT_AFTER.3
+#usr/local/share/man/man3/TAILQ_INSERT_BEFORE.3
+#usr/local/share/man/man3/TAILQ_INSERT_HEAD.3
+#usr/local/share/man/man3/TAILQ_INSERT_TAIL.3
+#usr/local/share/man/man3/TAILQ_LAST.3
+#usr/local/share/man/man3/TAILQ_NEXT.3
+#usr/local/share/man/man3/TAILQ_PREV.3
+#usr/local/share/man/man3/TAILQ_REMOVE.3
+#usr/local/share/man/man3/TAILQ_SWAP.3
+#usr/local/share/man/man3/__after_morecore_hook.3
+#usr/local/share/man/man3/__fbufsize.3
+#usr/local/share/man/man3/__flbf.3
+#usr/local/share/man/man3/__fpending.3
+#usr/local/share/man/man3/__fpurge.3
+#usr/local/share/man/man3/__freadable.3
+#usr/local/share/man/man3/__freading.3
+#usr/local/share/man/man3/__free_hook.3
+#usr/local/share/man/man3/__fsetlocking.3
+#usr/local/share/man/man3/__fwritable.3
+#usr/local/share/man/man3/__fwriting.3
+#usr/local/share/man/man3/__malloc_hook.3
+#usr/local/share/man/man3/__malloc_initialize_hook.3
+#usr/local/share/man/man3/__memalign_hook.3
+#usr/local/share/man/man3/__ppc_get_timebase.3
+#usr/local/share/man/man3/__ppc_get_timebase_freq.3
+#usr/local/share/man/man3/__ppc_mdoio.3
+#usr/local/share/man/man3/__ppc_mdoom.3
+#usr/local/share/man/man3/__ppc_set_ppr_low.3
+#usr/local/share/man/man3/__ppc_set_ppr_med.3
+#usr/local/share/man/man3/__ppc_set_ppr_med_high.3
+#usr/local/share/man/man3/__ppc_set_ppr_med_low.3
+#usr/local/share/man/man3/__ppc_set_ppr_very_low.3
+#usr/local/share/man/man3/__ppc_yield.3
+#usr/local/share/man/man3/__realloc_hook.3
+#usr/local/share/man/man3/__setfpucw.3
+#usr/local/share/man/man3/_flushlbf.3
+#usr/local/share/man/man3/a64l.3
+#usr/local/share/man/man3/abort.3
+#usr/local/share/man/man3/abs.3
+#usr/local/share/man/man3/acos.3
+#usr/local/share/man/man3/acosf.3
+#usr/local/share/man/man3/acosh.3
+#usr/local/share/man/man3/acoshf.3
+#usr/local/share/man/man3/acoshl.3
+#usr/local/share/man/man3/acosl.3
+#usr/local/share/man/man3/addmntent.3
+#usr/local/share/man/man3/addseverity.3
+#usr/local/share/man/man3/adjtime.3
+#usr/local/share/man/man3/aio_cancel.3
+#usr/local/share/man/man3/aio_error.3
+#usr/local/share/man/man3/aio_fsync.3
+#usr/local/share/man/man3/aio_init.3
+#usr/local/share/man/man3/aio_read.3
+#usr/local/share/man/man3/aio_return.3
+#usr/local/share/man/man3/aio_suspend.3
+#usr/local/share/man/man3/aio_write.3
+#usr/local/share/man/man3/aiocb.3
+#usr/local/share/man/man3/aligned_alloc.3
+#usr/local/share/man/man3/alloca.3
+#usr/local/share/man/man3/alphasort.3
+#usr/local/share/man/man3/argz.3
+#usr/local/share/man/man3/argz_add.3
+#usr/local/share/man/man3/argz_add_sep.3
+#usr/local/share/man/man3/argz_append.3
+#usr/local/share/man/man3/argz_count.3
+#usr/local/share/man/man3/argz_create.3
+#usr/local/share/man/man3/argz_create_sep.3
+#usr/local/share/man/man3/argz_delete.3
+#usr/local/share/man/man3/argz_extract.3
+#usr/local/share/man/man3/argz_insert.3
+#usr/local/share/man/man3/argz_next.3
+#usr/local/share/man/man3/argz_replace.3
+#usr/local/share/man/man3/argz_stringify.3
+#usr/local/share/man/man3/asctime.3
+#usr/local/share/man/man3/asctime_r.3
+#usr/local/share/man/man3/asin.3
+#usr/local/share/man/man3/asinf.3
+#usr/local/share/man/man3/asinh.3
+#usr/local/share/man/man3/asinhf.3
+#usr/local/share/man/man3/asinhl.3
+#usr/local/share/man/man3/asinl.3
+#usr/local/share/man/man3/asprintf.3
+#usr/local/share/man/man3/assert.3
+#usr/local/share/man/man3/assert_perror.3
+#usr/local/share/man/man3/atan.3
+#usr/local/share/man/man3/atan2.3
+#usr/local/share/man/man3/atan2f.3
+#usr/local/share/man/man3/atan2l.3
+#usr/local/share/man/man3/atanf.3
+#usr/local/share/man/man3/atanh.3
+#usr/local/share/man/man3/atanhf.3
+#usr/local/share/man/man3/atanhl.3
+#usr/local/share/man/man3/atanl.3
+#usr/local/share/man/man3/atexit.3
+#usr/local/share/man/man3/atof.3
+#usr/local/share/man/man3/atoi.3
+#usr/local/share/man/man3/atol.3
+#usr/local/share/man/man3/atoll.3
+#usr/local/share/man/man3/atoq.3
+#usr/local/share/man/man3/auth_destroy.3
+#usr/local/share/man/man3/authnone_create.3
+#usr/local/share/man/man3/authunix_create.3
+#usr/local/share/man/man3/authunix_create_default.3
+#usr/local/share/man/man3/backtrace.3
+#usr/local/share/man/man3/backtrace_symbols.3
+#usr/local/share/man/man3/backtrace_symbols_fd.3
+#usr/local/share/man/man3/basename.3
+#usr/local/share/man/man3/bcmp.3
+#usr/local/share/man/man3/bcopy.3
+#usr/local/share/man/man3/be16toh.3
+#usr/local/share/man/man3/be32toh.3
+#usr/local/share/man/man3/be64toh.3
+#usr/local/share/man/man3/bindresvport.3
+#usr/local/share/man/man3/blkcnt_t.3
+#usr/local/share/man/man3/blksize_t.3
+#usr/local/share/man/man3/bsd_signal.3
+#usr/local/share/man/man3/bsearch.3
+#usr/local/share/man/man3/bstring.3
+#usr/local/share/man/man3/bswap.3
+#usr/local/share/man/man3/bswap_16.3
+#usr/local/share/man/man3/bswap_32.3
+#usr/local/share/man/man3/bswap_64.3
+#usr/local/share/man/man3/btowc.3
+#usr/local/share/man/man3/btree.3
+#usr/local/share/man/man3/byteorder.3
+#usr/local/share/man/man3/bzero.3
+#usr/local/share/man/man3/cabs.3
+#usr/local/share/man/man3/cabsf.3
+#usr/local/share/man/man3/cabsl.3
+#usr/local/share/man/man3/cacos.3
+#usr/local/share/man/man3/cacosf.3
+#usr/local/share/man/man3/cacosh.3
+#usr/local/share/man/man3/cacoshf.3
+#usr/local/share/man/man3/cacoshl.3
+#usr/local/share/man/man3/cacosl.3
+#usr/local/share/man/man3/calloc.3
+#usr/local/share/man/man3/callrpc.3
+#usr/local/share/man/man3/canonicalize_file_name.3
+#usr/local/share/man/man3/carg.3
+#usr/local/share/man/man3/cargf.3
+#usr/local/share/man/man3/cargl.3
+#usr/local/share/man/man3/casin.3
+#usr/local/share/man/man3/casinf.3
+#usr/local/share/man/man3/casinh.3
+#usr/local/share/man/man3/casinhf.3
+#usr/local/share/man/man3/casinhl.3
+#usr/local/share/man/man3/casinl.3
+#usr/local/share/man/man3/catan.3
+#usr/local/share/man/man3/catanf.3
+#usr/local/share/man/man3/catanh.3
+#usr/local/share/man/man3/catanhf.3
+#usr/local/share/man/man3/catanhl.3
+#usr/local/share/man/man3/catanl.3
+#usr/local/share/man/man3/catclose.3
+#usr/local/share/man/man3/catgets.3
+#usr/local/share/man/man3/catopen.3
+#usr/local/share/man/man3/cbc_crypt.3
+#usr/local/share/man/man3/cbrt.3
+#usr/local/share/man/man3/cbrtf.3
+#usr/local/share/man/man3/cbrtl.3
+#usr/local/share/man/man3/cc_t.3
+#usr/local/share/man/man3/ccos.3
+#usr/local/share/man/man3/ccosf.3
+#usr/local/share/man/man3/ccosh.3
+#usr/local/share/man/man3/ccoshf.3
+#usr/local/share/man/man3/ccoshl.3
+#usr/local/share/man/man3/ccosl.3
+#usr/local/share/man/man3/ceil.3
+#usr/local/share/man/man3/ceilf.3
+#usr/local/share/man/man3/ceill.3
+#usr/local/share/man/man3/cexp.3
+#usr/local/share/man/man3/cexp2.3
+#usr/local/share/man/man3/cexp2f.3
+#usr/local/share/man/man3/cexp2l.3
+#usr/local/share/man/man3/cexpf.3
+#usr/local/share/man/man3/cexpl.3
+#usr/local/share/man/man3/cfgetispeed.3
+#usr/local/share/man/man3/cfgetospeed.3
+#usr/local/share/man/man3/cfmakeraw.3
+#usr/local/share/man/man3/cfree.3
+#usr/local/share/man/man3/cfsetispeed.3
+#usr/local/share/man/man3/cfsetospeed.3
+#usr/local/share/man/man3/cfsetspeed.3
+#usr/local/share/man/man3/cimag.3
+#usr/local/share/man/man3/cimagf.3
+#usr/local/share/man/man3/cimagl.3
+#usr/local/share/man/man3/circleq.3
+#usr/local/share/man/man3/clearenv.3
+#usr/local/share/man/man3/clearerr.3
+#usr/local/share/man/man3/clearerr_unlocked.3
+#usr/local/share/man/man3/clnt_broadcast.3
+#usr/local/share/man/man3/clnt_call.3
+#usr/local/share/man/man3/clnt_control.3
+#usr/local/share/man/man3/clnt_create.3
+#usr/local/share/man/man3/clnt_destroy.3
+#usr/local/share/man/man3/clnt_freeres.3
+#usr/local/share/man/man3/clnt_geterr.3
+#usr/local/share/man/man3/clnt_pcreateerror.3
+#usr/local/share/man/man3/clnt_perrno.3
+#usr/local/share/man/man3/clnt_perror.3
+#usr/local/share/man/man3/clnt_spcreateerror.3
+#usr/local/share/man/man3/clnt_sperrno.3
+#usr/local/share/man/man3/clnt_sperror.3
+#usr/local/share/man/man3/clntraw_create.3
+#usr/local/share/man/man3/clnttcp_create.3
+#usr/local/share/man/man3/clntudp_bufcreate.3
+#usr/local/share/man/man3/clntudp_create.3
+#usr/local/share/man/man3/clock.3
+#usr/local/share/man/man3/clock_getcpuclockid.3
+#usr/local/share/man/man3/clock_t.3
+#usr/local/share/man/man3/clockid_t.3
+#usr/local/share/man/man3/clog.3
+#usr/local/share/man/man3/clog10.3
+#usr/local/share/man/man3/clog10f.3
+#usr/local/share/man/man3/clog10l.3
+#usr/local/share/man/man3/clog2.3
+#usr/local/share/man/man3/clog2f.3
+#usr/local/share/man/man3/clog2l.3
+#usr/local/share/man/man3/clogf.3
+#usr/local/share/man/man3/clogl.3
+#usr/local/share/man/man3/closedir.3
+#usr/local/share/man/man3/closelog.3
+#usr/local/share/man/man3/cmsg.3
+#usr/local/share/man/man3/confstr.3
+#usr/local/share/man/man3/conj.3
+#usr/local/share/man/man3/conjf.3
+#usr/local/share/man/man3/conjl.3
+#usr/local/share/man/man3/copysign.3
+#usr/local/share/man/man3/copysignf.3
+#usr/local/share/man/man3/copysignl.3
+#usr/local/share/man/man3/cos.3
+#usr/local/share/man/man3/cosf.3
+#usr/local/share/man/man3/cosh.3
+#usr/local/share/man/man3/coshf.3
+#usr/local/share/man/man3/coshl.3
+#usr/local/share/man/man3/cosl.3
+#usr/local/share/man/man3/cpow.3
+#usr/local/share/man/man3/cpowf.3
+#usr/local/share/man/man3/cpowl.3
+#usr/local/share/man/man3/cproj.3
+#usr/local/share/man/man3/cprojf.3
+#usr/local/share/man/man3/cprojl.3
+#usr/local/share/man/man3/creal.3
+#usr/local/share/man/man3/crealf.3
+#usr/local/share/man/man3/creall.3
+#usr/local/share/man/man3/crypt.3
+#usr/local/share/man/man3/crypt_r.3
+#usr/local/share/man/man3/csin.3
+#usr/local/share/man/man3/csinf.3
+#usr/local/share/man/man3/csinh.3
+#usr/local/share/man/man3/csinhf.3
+#usr/local/share/man/man3/csinhl.3
+#usr/local/share/man/man3/csinl.3
+#usr/local/share/man/man3/csqrt.3
+#usr/local/share/man/man3/csqrtf.3
+#usr/local/share/man/man3/csqrtl.3
+#usr/local/share/man/man3/ctan.3
+#usr/local/share/man/man3/ctanf.3
+#usr/local/share/man/man3/ctanh.3
+#usr/local/share/man/man3/ctanhf.3
+#usr/local/share/man/man3/ctanhl.3
+#usr/local/share/man/man3/ctanl.3
+#usr/local/share/man/man3/ctermid.3
+#usr/local/share/man/man3/ctime.3
+#usr/local/share/man/man3/ctime_r.3
+#usr/local/share/man/man3/cuserid.3
+#usr/local/share/man/man3/daemon.3
+#usr/local/share/man/man3/daylight.3
+#usr/local/share/man/man3/db.3
+#usr/local/share/man/man3/dbopen.3
+#usr/local/share/man/man3/des_crypt.3
+#usr/local/share/man/man3/des_setparity.3
+#usr/local/share/man/man3/dev_t.3
+#usr/local/share/man/man3/difftime.3
+#usr/local/share/man/man3/dirfd.3
+#usr/local/share/man/man3/dirname.3
+#usr/local/share/man/man3/div.3
+#usr/local/share/man/man3/div_t.3
+#usr/local/share/man/man3/dl_iterate_phdr.3
+#usr/local/share/man/man3/dladdr.3
+#usr/local/share/man/man3/dladdr1.3
+#usr/local/share/man/man3/dlclose.3
+#usr/local/share/man/man3/dlerror.3
+#usr/local/share/man/man3/dlinfo.3
+#usr/local/share/man/man3/dlmopen.3
+#usr/local/share/man/man3/dlopen.3
+#usr/local/share/man/man3/dlsym.3
+#usr/local/share/man/man3/dlvsym.3
+#usr/local/share/man/man3/dn_comp.3
+#usr/local/share/man/man3/dn_expand.3
+#usr/local/share/man/man3/double_t.3
+#usr/local/share/man/man3/dprintf.3
+#usr/local/share/man/man3/drand48.3
+#usr/local/share/man/man3/drand48_r.3
+#usr/local/share/man/man3/drem.3
+#usr/local/share/man/man3/dremf.3
+#usr/local/share/man/man3/dreml.3
+#usr/local/share/man/man3/duplocale.3
+#usr/local/share/man/man3/dysize.3
+#usr/local/share/man/man3/eaccess.3
+#usr/local/share/man/man3/ecb_crypt.3
+#usr/local/share/man/man3/ecvt.3
+#usr/local/share/man/man3/ecvt_r.3
+#usr/local/share/man/man3/edata.3
+#usr/local/share/man/man3/encrypt.3
+#usr/local/share/man/man3/encrypt_r.3
+#usr/local/share/man/man3/end.3
+#usr/local/share/man/man3/endaliasent.3
+#usr/local/share/man/man3/endfsent.3
+#usr/local/share/man/man3/endgrent.3
+#usr/local/share/man/man3/endhostent.3
+#usr/local/share/man/man3/endian.3
+#usr/local/share/man/man3/endmntent.3
+#usr/local/share/man/man3/endnetent.3
+#usr/local/share/man/man3/endnetgrent.3
+#usr/local/share/man/man3/endprotoent.3
+#usr/local/share/man/man3/endpwent.3
+#usr/local/share/man/man3/endrpcent.3
+#usr/local/share/man/man3/endservent.3
+#usr/local/share/man/man3/endspent.3
+#usr/local/share/man/man3/endttyent.3
+#usr/local/share/man/man3/endusershell.3
+#usr/local/share/man/man3/endutent.3
+#usr/local/share/man/man3/endutxent.3
+#usr/local/share/man/man3/envz.3
+#usr/local/share/man/man3/envz_add.3
+#usr/local/share/man/man3/envz_entry.3
+#usr/local/share/man/man3/envz_get.3
+#usr/local/share/man/man3/envz_merge.3
+#usr/local/share/man/man3/envz_remove.3
+#usr/local/share/man/man3/envz_strip.3
+#usr/local/share/man/man3/erand48.3
+#usr/local/share/man/man3/erand48_r.3
+#usr/local/share/man/man3/erf.3
+#usr/local/share/man/man3/erfc.3
+#usr/local/share/man/man3/erfcf.3
+#usr/local/share/man/man3/erfcl.3
+#usr/local/share/man/man3/erff.3
+#usr/local/share/man/man3/erfl.3
+#usr/local/share/man/man3/err.3
+#usr/local/share/man/man3/errno.3
+#usr/local/share/man/man3/error.3
+#usr/local/share/man/man3/error_at_line.3
+#usr/local/share/man/man3/error_message_count.3
+#usr/local/share/man/man3/error_one_per_line.3
+#usr/local/share/man/man3/error_print_progname.3
+#usr/local/share/man/man3/errx.3
+#usr/local/share/man/man3/etext.3
+#usr/local/share/man/man3/ether_aton.3
+#usr/local/share/man/man3/ether_aton_r.3
+#usr/local/share/man/man3/ether_hostton.3
+#usr/local/share/man/man3/ether_line.3
+#usr/local/share/man/man3/ether_ntoa.3
+#usr/local/share/man/man3/ether_ntoa_r.3
+#usr/local/share/man/man3/ether_ntohost.3
+#usr/local/share/man/man3/euidaccess.3
+#usr/local/share/man/man3/eventfd_read.3
+#usr/local/share/man/man3/eventfd_write.3
+#usr/local/share/man/man3/exec.3
+#usr/local/share/man/man3/execl.3
+#usr/local/share/man/man3/execle.3
+#usr/local/share/man/man3/execlp.3
+#usr/local/share/man/man3/execv.3
+#usr/local/share/man/man3/execvp.3
+#usr/local/share/man/man3/execvpe.3
+#usr/local/share/man/man3/exit.3
+#usr/local/share/man/man3/exp.3
+#usr/local/share/man/man3/exp10.3
+#usr/local/share/man/man3/exp10f.3
+#usr/local/share/man/man3/exp10l.3
+#usr/local/share/man/man3/exp2.3
+#usr/local/share/man/man3/exp2f.3
+#usr/local/share/man/man3/exp2l.3
+#usr/local/share/man/man3/expf.3
+#usr/local/share/man/man3/expl.3
+#usr/local/share/man/man3/explicit_bzero.3
+#usr/local/share/man/man3/expm1.3
+#usr/local/share/man/man3/expm1f.3
+#usr/local/share/man/man3/expm1l.3
+#usr/local/share/man/man3/fabs.3
+#usr/local/share/man/man3/fabsf.3
+#usr/local/share/man/man3/fabsl.3
+#usr/local/share/man/man3/fclose.3
+#usr/local/share/man/man3/fcloseall.3
+#usr/local/share/man/man3/fcvt.3
+#usr/local/share/man/man3/fcvt_r.3
+#usr/local/share/man/man3/fdim.3
+#usr/local/share/man/man3/fdimf.3
+#usr/local/share/man/man3/fdiml.3
+#usr/local/share/man/man3/fdopen.3
+#usr/local/share/man/man3/fdopendir.3
+#usr/local/share/man/man3/feclearexcept.3
+#usr/local/share/man/man3/fedisableexcept.3
+#usr/local/share/man/man3/feenableexcept.3
+#usr/local/share/man/man3/fegetenv.3
+#usr/local/share/man/man3/fegetexcept.3
+#usr/local/share/man/man3/fegetexceptflag.3
+#usr/local/share/man/man3/fegetround.3
+#usr/local/share/man/man3/feholdexcept.3
+#usr/local/share/man/man3/fenv.3
+#usr/local/share/man/man3/fenv_t.3
+#usr/local/share/man/man3/feof.3
+#usr/local/share/man/man3/feof_unlocked.3
+#usr/local/share/man/man3/feraiseexcept.3
+#usr/local/share/man/man3/ferror.3
+#usr/local/share/man/man3/ferror_unlocked.3
+#usr/local/share/man/man3/fesetenv.3
+#usr/local/share/man/man3/fesetexceptflag.3
+#usr/local/share/man/man3/fesetround.3
+#usr/local/share/man/man3/fetestexcept.3
+#usr/local/share/man/man3/feupdateenv.3
+#usr/local/share/man/man3/fexcept_t.3
+#usr/local/share/man/man3/fexecve.3
+#usr/local/share/man/man3/fflush.3
+#usr/local/share/man/man3/fflush_unlocked.3
+#usr/local/share/man/man3/ffs.3
+#usr/local/share/man/man3/ffsl.3
+#usr/local/share/man/man3/ffsll.3
+#usr/local/share/man/man3/fgetc.3
+#usr/local/share/man/man3/fgetc_unlocked.3
+#usr/local/share/man/man3/fgetgrent.3
+#usr/local/share/man/man3/fgetgrent_r.3
+#usr/local/share/man/man3/fgetpos.3
+#usr/local/share/man/man3/fgetpwent.3
+#usr/local/share/man/man3/fgetpwent_r.3
+#usr/local/share/man/man3/fgets.3
+#usr/local/share/man/man3/fgets_unlocked.3
+#usr/local/share/man/man3/fgetspent.3
+#usr/local/share/man/man3/fgetspent_r.3
+#usr/local/share/man/man3/fgetwc.3
+#usr/local/share/man/man3/fgetwc_unlocked.3
+#usr/local/share/man/man3/fgetws.3
+#usr/local/share/man/man3/fgetws_unlocked.3
+#usr/local/share/man/man3/fileno.3
+#usr/local/share/man/man3/fileno_unlocked.3
+#usr/local/share/man/man3/finite.3
+#usr/local/share/man/man3/finitef.3
+#usr/local/share/man/man3/finitel.3
+#usr/local/share/man/man3/float_t.3
+#usr/local/share/man/man3/flockfile.3
+#usr/local/share/man/man3/floor.3
+#usr/local/share/man/man3/floorf.3
+#usr/local/share/man/man3/floorl.3
+#usr/local/share/man/man3/fma.3
+#usr/local/share/man/man3/fmaf.3
+#usr/local/share/man/man3/fmal.3
+#usr/local/share/man/man3/fmax.3
+#usr/local/share/man/man3/fmaxf.3
+#usr/local/share/man/man3/fmaxl.3
+#usr/local/share/man/man3/fmemopen.3
+#usr/local/share/man/man3/fmin.3
+#usr/local/share/man/man3/fminf.3
+#usr/local/share/man/man3/fminl.3
+#usr/local/share/man/man3/fmod.3
+#usr/local/share/man/man3/fmodf.3
+#usr/local/share/man/man3/fmodl.3
+#usr/local/share/man/man3/fmtmsg.3
+#usr/local/share/man/man3/fnmatch.3
+#usr/local/share/man/man3/fopen.3
+#usr/local/share/man/man3/fopencookie.3
+#usr/local/share/man/man3/forkpty.3
+#usr/local/share/man/man3/fpathconf.3
+#usr/local/share/man/man3/fpclassify.3
+#usr/local/share/man/man3/fprintf.3
+#usr/local/share/man/man3/fpurge.3
+#usr/local/share/man/man3/fputc.3
+#usr/local/share/man/man3/fputc_unlocked.3
+#usr/local/share/man/man3/fputs.3
+#usr/local/share/man/man3/fputs_unlocked.3
+#usr/local/share/man/man3/fputwc.3
+#usr/local/share/man/man3/fputwc_unlocked.3
+#usr/local/share/man/man3/fputws.3
+#usr/local/share/man/man3/fputws_unlocked.3
+#usr/local/share/man/man3/fread.3
+#usr/local/share/man/man3/fread_unlocked.3
+#usr/local/share/man/man3/free.3
+#usr/local/share/man/man3/freeaddrinfo.3
+#usr/local/share/man/man3/freehostent.3
+#usr/local/share/man/man3/freeifaddrs.3
+#usr/local/share/man/man3/freelocale.3
+#usr/local/share/man/man3/freopen.3
+#usr/local/share/man/man3/frexp.3
+#usr/local/share/man/man3/frexpf.3
+#usr/local/share/man/man3/frexpl.3
+#usr/local/share/man/man3/fscanf.3
+#usr/local/share/man/man3/fseek.3
+#usr/local/share/man/man3/fseeko.3
+#usr/local/share/man/man3/fsetpos.3
+#usr/local/share/man/man3/fstatvfs.3
+#usr/local/share/man/man3/ftell.3
+#usr/local/share/man/man3/ftello.3
+#usr/local/share/man/man3/ftime.3
+#usr/local/share/man/man3/ftok.3
+#usr/local/share/man/man3/ftrylockfile.3
+#usr/local/share/man/man3/fts.3
+#usr/local/share/man/man3/fts_children.3
+#usr/local/share/man/man3/fts_close.3
+#usr/local/share/man/man3/fts_open.3
+#usr/local/share/man/man3/fts_read.3
+#usr/local/share/man/man3/fts_set.3
+#usr/local/share/man/man3/ftw.3
+#usr/local/share/man/man3/funlockfile.3
+#usr/local/share/man/man3/futimens.3
+#usr/local/share/man/man3/futimes.3
+#usr/local/share/man/man3/fwide.3
+#usr/local/share/man/man3/fwprintf.3
+#usr/local/share/man/man3/fwrite.3
+#usr/local/share/man/man3/fwrite_unlocked.3
+#usr/local/share/man/man3/gai_cancel.3
+#usr/local/share/man/man3/gai_error.3
+#usr/local/share/man/man3/gai_strerror.3
+#usr/local/share/man/man3/gai_suspend.3
+#usr/local/share/man/man3/gamma.3
+#usr/local/share/man/man3/gammaf.3
+#usr/local/share/man/man3/gammal.3
+#usr/local/share/man/man3/gcvt.3
+#usr/local/share/man/man3/get_avphys_pages.3
+#usr/local/share/man/man3/get_current_dir_name.3
+#usr/local/share/man/man3/get_myaddress.3
+#usr/local/share/man/man3/get_nprocs.3
+#usr/local/share/man/man3/get_nprocs_conf.3
+#usr/local/share/man/man3/get_phys_pages.3
+#usr/local/share/man/man3/getaddrinfo.3
+#usr/local/share/man/man3/getaddrinfo_a.3
+#usr/local/share/man/man3/getaliasbyname.3
+#usr/local/share/man/man3/getaliasbyname_r.3
+#usr/local/share/man/man3/getaliasent.3
+#usr/local/share/man/man3/getaliasent_r.3
+#usr/local/share/man/man3/getauxval.3
+#usr/local/share/man/man3/getc.3
+#usr/local/share/man/man3/getc_unlocked.3
+#usr/local/share/man/man3/getchar.3
+#usr/local/share/man/man3/getchar_unlocked.3
+#usr/local/share/man/man3/getcontext.3
+#usr/local/share/man/man3/getcwd.3
+#usr/local/share/man/man3/getdate.3
+#usr/local/share/man/man3/getdate_err.3
+#usr/local/share/man/man3/getdate_r.3
+#usr/local/share/man/man3/getdelim.3
+#usr/local/share/man/man3/getdirentries.3
+#usr/local/share/man/man3/getdtablesize.3
+#usr/local/share/man/man3/getentropy.3
+#usr/local/share/man/man3/getenv.3
+#usr/local/share/man/man3/getfsent.3
+#usr/local/share/man/man3/getfsfile.3
+#usr/local/share/man/man3/getfsspec.3
+#usr/local/share/man/man3/getgrent.3
+#usr/local/share/man/man3/getgrent_r.3
+#usr/local/share/man/man3/getgrgid.3
+#usr/local/share/man/man3/getgrgid_r.3
+#usr/local/share/man/man3/getgrnam.3
+#usr/local/share/man/man3/getgrnam_r.3
+#usr/local/share/man/man3/getgrouplist.3
+#usr/local/share/man/man3/gethostbyaddr.3
+#usr/local/share/man/man3/gethostbyaddr_r.3
+#usr/local/share/man/man3/gethostbyname.3
+#usr/local/share/man/man3/gethostbyname2.3
+#usr/local/share/man/man3/gethostbyname2_r.3
+#usr/local/share/man/man3/gethostbyname_r.3
+#usr/local/share/man/man3/gethostent.3
+#usr/local/share/man/man3/gethostent_r.3
+#usr/local/share/man/man3/gethostid.3
+#usr/local/share/man/man3/getifaddrs.3
+#usr/local/share/man/man3/getipnodebyaddr.3
+#usr/local/share/man/man3/getipnodebyname.3
+#usr/local/share/man/man3/getline.3
+#usr/local/share/man/man3/getloadavg.3
+#usr/local/share/man/man3/getlogin.3
+#usr/local/share/man/man3/getlogin_r.3
+#usr/local/share/man/man3/getmntent.3
+#usr/local/share/man/man3/getmntent_r.3
+#usr/local/share/man/man3/getnameinfo.3
+#usr/local/share/man/man3/getnetbyaddr.3
+#usr/local/share/man/man3/getnetbyaddr_r.3
+#usr/local/share/man/man3/getnetbyname.3
+#usr/local/share/man/man3/getnetbyname_r.3
+#usr/local/share/man/man3/getnetent.3
+#usr/local/share/man/man3/getnetent_r.3
+#usr/local/share/man/man3/getnetgrent.3
+#usr/local/share/man/man3/getnetgrent_r.3
+#usr/local/share/man/man3/getopt.3
+#usr/local/share/man/man3/getopt_long.3
+#usr/local/share/man/man3/getopt_long_only.3
+#usr/local/share/man/man3/getpass.3
+#usr/local/share/man/man3/getprotobyname.3
+#usr/local/share/man/man3/getprotobyname_r.3
+#usr/local/share/man/man3/getprotobynumber.3
+#usr/local/share/man/man3/getprotobynumber_r.3
+#usr/local/share/man/man3/getprotoent.3
+#usr/local/share/man/man3/getprotoent_r.3
+#usr/local/share/man/man3/getpt.3
+#usr/local/share/man/man3/getpw.3
+#usr/local/share/man/man3/getpwent.3
+#usr/local/share/man/man3/getpwent_r.3
+#usr/local/share/man/man3/getpwnam.3
+#usr/local/share/man/man3/getpwnam_r.3
+#usr/local/share/man/man3/getpwuid.3
+#usr/local/share/man/man3/getpwuid_r.3
+#usr/local/share/man/man3/getrpcbyname.3
+#usr/local/share/man/man3/getrpcbyname_r.3
+#usr/local/share/man/man3/getrpcbynumber.3
+#usr/local/share/man/man3/getrpcbynumber_r.3
+#usr/local/share/man/man3/getrpcent.3
+#usr/local/share/man/man3/getrpcent_r.3
+#usr/local/share/man/man3/getrpcport.3
+#usr/local/share/man/man3/gets.3
+#usr/local/share/man/man3/getservbyname.3
+#usr/local/share/man/man3/getservbyname_r.3
+#usr/local/share/man/man3/getservbyport.3
+#usr/local/share/man/man3/getservbyport_r.3
+#usr/local/share/man/man3/getservent.3
+#usr/local/share/man/man3/getservent_r.3
+#usr/local/share/man/man3/getspent.3
+#usr/local/share/man/man3/getspent_r.3
+#usr/local/share/man/man3/getspnam.3
+#usr/local/share/man/man3/getspnam_r.3
+#usr/local/share/man/man3/getsubopt.3
+#usr/local/share/man/man3/getttyent.3
+#usr/local/share/man/man3/getttynam.3
+#usr/local/share/man/man3/getusershell.3
+#usr/local/share/man/man3/getutent.3
+#usr/local/share/man/man3/getutent_r.3
+#usr/local/share/man/man3/getutid.3
+#usr/local/share/man/man3/getutid_r.3
+#usr/local/share/man/man3/getutline.3
+#usr/local/share/man/man3/getutline_r.3
+#usr/local/share/man/man3/getutmp.3
+#usr/local/share/man/man3/getutmpx.3
+#usr/local/share/man/man3/getutxent.3
+#usr/local/share/man/man3/getutxid.3
+#usr/local/share/man/man3/getutxline.3
+#usr/local/share/man/man3/getw.3
+#usr/local/share/man/man3/getwc.3
+#usr/local/share/man/man3/getwc_unlocked.3
+#usr/local/share/man/man3/getwchar.3
+#usr/local/share/man/man3/getwchar_unlocked.3
+#usr/local/share/man/man3/getwd.3
+#usr/local/share/man/man3/gid_t.3
+#usr/local/share/man/man3/glob.3
+#usr/local/share/man/man3/globfree.3
+#usr/local/share/man/man3/gmtime.3
+#usr/local/share/man/man3/gmtime_r.3
+#usr/local/share/man/man3/gnu_dev_major.3
+#usr/local/share/man/man3/gnu_dev_makedev.3
+#usr/local/share/man/man3/gnu_dev_minor.3
+#usr/local/share/man/man3/gnu_get_libc_release.3
+#usr/local/share/man/man3/gnu_get_libc_version.3
+#usr/local/share/man/man3/grantpt.3
+#usr/local/share/man/man3/group_member.3
+#usr/local/share/man/man3/gsignal.3
+#usr/local/share/man/man3/h_errno.3
+#usr/local/share/man/man3/hash.3
+#usr/local/share/man/man3/hasmntopt.3
+#usr/local/share/man/man3/hcreate.3
+#usr/local/share/man/man3/hcreate_r.3
+#usr/local/share/man/man3/hdestroy.3
+#usr/local/share/man/man3/hdestroy_r.3
+#usr/local/share/man/man3/herror.3
+#usr/local/share/man/man3/hsearch.3
+#usr/local/share/man/man3/hsearch_r.3
+#usr/local/share/man/man3/hstrerror.3
+#usr/local/share/man/man3/htobe16.3
+#usr/local/share/man/man3/htobe32.3
+#usr/local/share/man/man3/htobe64.3
+#usr/local/share/man/man3/htole16.3
+#usr/local/share/man/man3/htole32.3
+#usr/local/share/man/man3/htole64.3
+#usr/local/share/man/man3/htonl.3
+#usr/local/share/man/man3/htons.3
+#usr/local/share/man/man3/hypot.3
+#usr/local/share/man/man3/hypotf.3
+#usr/local/share/man/man3/hypotl.3
+#usr/local/share/man/man3/iconv.3
+#usr/local/share/man/man3/iconv_close.3
+#usr/local/share/man/man3/iconv_open.3
+#usr/local/share/man/man3/id_t.3
+#usr/local/share/man/man3/if_freenameindex.3
+#usr/local/share/man/man3/if_indextoname.3
+#usr/local/share/man/man3/if_nameindex.3
+#usr/local/share/man/man3/if_nametoindex.3
+#usr/local/share/man/man3/ilogb.3
+#usr/local/share/man/man3/ilogbf.3
+#usr/local/share/man/man3/ilogbl.3
+#usr/local/share/man/man3/imaxabs.3
+#usr/local/share/man/man3/imaxdiv.3
+#usr/local/share/man/man3/imaxdiv_t.3
+#usr/local/share/man/man3/index.3
+#usr/local/share/man/man3/inet.3
+#usr/local/share/man/man3/inet_addr.3
+#usr/local/share/man/man3/inet_aton.3
+#usr/local/share/man/man3/inet_lnaof.3
+#usr/local/share/man/man3/inet_makeaddr.3
+#usr/local/share/man/man3/inet_net_ntop.3
+#usr/local/share/man/man3/inet_net_pton.3
+#usr/local/share/man/man3/inet_netof.3
+#usr/local/share/man/man3/inet_network.3
+#usr/local/share/man/man3/inet_ntoa.3
+#usr/local/share/man/man3/inet_ntop.3
+#usr/local/share/man/man3/inet_pton.3
+#usr/local/share/man/man3/initgroups.3
+#usr/local/share/man/man3/initstate.3
+#usr/local/share/man/man3/initstate_r.3
+#usr/local/share/man/man3/innetgr.3
+#usr/local/share/man/man3/insque.3
+#usr/local/share/man/man3/int16_t.3
+#usr/local/share/man/man3/int32_t.3
+#usr/local/share/man/man3/int64_t.3
+#usr/local/share/man/man3/int8_t.3
+#usr/local/share/man/man3/intN_t.3
+#usr/local/share/man/man3/intmax_t.3
+#usr/local/share/man/man3/intptr_t.3
+#usr/local/share/man/man3/intro.3
+#usr/local/share/man/man3/iruserok.3
+#usr/local/share/man/man3/iruserok_af.3
+#usr/local/share/man/man3/isalnum.3
+#usr/local/share/man/man3/isalnum_l.3
+#usr/local/share/man/man3/isalpha.3
+#usr/local/share/man/man3/isalpha_l.3
+#usr/local/share/man/man3/isascii.3
+#usr/local/share/man/man3/isascii_l.3
+#usr/local/share/man/man3/isatty.3
+#usr/local/share/man/man3/isblank.3
+#usr/local/share/man/man3/isblank_l.3
+#usr/local/share/man/man3/iscntrl.3
+#usr/local/share/man/man3/iscntrl_l.3
+#usr/local/share/man/man3/isdigit.3
+#usr/local/share/man/man3/isdigit_l.3
+#usr/local/share/man/man3/isfdtype.3
+#usr/local/share/man/man3/isfinite.3
+#usr/local/share/man/man3/isgraph.3
+#usr/local/share/man/man3/isgraph_l.3
+#usr/local/share/man/man3/isgreater.3
+#usr/local/share/man/man3/isgreaterequal.3
+#usr/local/share/man/man3/isinf.3
+#usr/local/share/man/man3/isinff.3
+#usr/local/share/man/man3/isinfl.3
+#usr/local/share/man/man3/isless.3
+#usr/local/share/man/man3/islessequal.3
+#usr/local/share/man/man3/islessgreater.3
+#usr/local/share/man/man3/islower.3
+#usr/local/share/man/man3/islower_l.3
+#usr/local/share/man/man3/isnan.3
+#usr/local/share/man/man3/isnanf.3
+#usr/local/share/man/man3/isnanl.3
+#usr/local/share/man/man3/isnormal.3
+#usr/local/share/man/man3/isprint.3
+#usr/local/share/man/man3/isprint_l.3
+#usr/local/share/man/man3/ispunct.3
+#usr/local/share/man/man3/ispunct_l.3
+#usr/local/share/man/man3/isspace.3
+#usr/local/share/man/man3/isspace_l.3
+#usr/local/share/man/man3/isunordered.3
+#usr/local/share/man/man3/isupper.3
+#usr/local/share/man/man3/isupper_l.3
+#usr/local/share/man/man3/iswalnum.3
+#usr/local/share/man/man3/iswalpha.3
+#usr/local/share/man/man3/iswblank.3
+#usr/local/share/man/man3/iswcntrl.3
+#usr/local/share/man/man3/iswctype.3
+#usr/local/share/man/man3/iswdigit.3
+#usr/local/share/man/man3/iswgraph.3
+#usr/local/share/man/man3/iswlower.3
+#usr/local/share/man/man3/iswprint.3
+#usr/local/share/man/man3/iswpunct.3
+#usr/local/share/man/man3/iswspace.3
+#usr/local/share/man/man3/iswupper.3
+#usr/local/share/man/man3/iswxdigit.3
+#usr/local/share/man/man3/isxdigit.3
+#usr/local/share/man/man3/isxdigit_l.3
+#usr/local/share/man/man3/j0.3
+#usr/local/share/man/man3/j0f.3
+#usr/local/share/man/man3/j0l.3
+#usr/local/share/man/man3/j1.3
+#usr/local/share/man/man3/j1f.3
+#usr/local/share/man/man3/j1l.3
+#usr/local/share/man/man3/jn.3
+#usr/local/share/man/man3/jnf.3
+#usr/local/share/man/man3/jnl.3
+#usr/local/share/man/man3/jrand48.3
+#usr/local/share/man/man3/jrand48_r.3
+#usr/local/share/man/man3/key_decryptsession.3
+#usr/local/share/man/man3/key_encryptsession.3
+#usr/local/share/man/man3/key_gendes.3
+#usr/local/share/man/man3/key_secretkey_is_set.3
+#usr/local/share/man/man3/key_setsecret.3
+#usr/local/share/man/man3/killpg.3
+#usr/local/share/man/man3/klogctl.3
+#usr/local/share/man/man3/l64a.3
+#usr/local/share/man/man3/labs.3
+#usr/local/share/man/man3/lckpwdf.3
+#usr/local/share/man/man3/lcong48.3
+#usr/local/share/man/man3/lcong48_r.3
+#usr/local/share/man/man3/lconv.3
+#usr/local/share/man/man3/ldexp.3
+#usr/local/share/man/man3/ldexpf.3
+#usr/local/share/man/man3/ldexpl.3
+#usr/local/share/man/man3/ldiv.3
+#usr/local/share/man/man3/ldiv_t.3
+#usr/local/share/man/man3/le16toh.3
+#usr/local/share/man/man3/le32toh.3
+#usr/local/share/man/man3/le64toh.3
+#usr/local/share/man/man3/lfind.3
+#usr/local/share/man/man3/lgamma.3
+#usr/local/share/man/man3/lgamma_r.3
+#usr/local/share/man/man3/lgammaf.3
+#usr/local/share/man/man3/lgammaf_r.3
+#usr/local/share/man/man3/lgammal.3
+#usr/local/share/man/man3/lgammal_r.3
+#usr/local/share/man/man3/lio_listio.3
+#usr/local/share/man/man3/list.3
+#usr/local/share/man/man3/llabs.3
+#usr/local/share/man/man3/lldiv.3
+#usr/local/share/man/man3/lldiv_t.3
+#usr/local/share/man/man3/llrint.3
+#usr/local/share/man/man3/llrintf.3
+#usr/local/share/man/man3/llrintl.3
+#usr/local/share/man/man3/llround.3
+#usr/local/share/man/man3/llroundf.3
+#usr/local/share/man/man3/llroundl.3
+#usr/local/share/man/man3/localeconv.3
+#usr/local/share/man/man3/localtime.3
+#usr/local/share/man/man3/localtime_r.3
+#usr/local/share/man/man3/lockf.3
+#usr/local/share/man/man3/log.3
+#usr/local/share/man/man3/log10.3
+#usr/local/share/man/man3/log10f.3
+#usr/local/share/man/man3/log10l.3
+#usr/local/share/man/man3/log1p.3
+#usr/local/share/man/man3/log1pf.3
+#usr/local/share/man/man3/log1pl.3
+#usr/local/share/man/man3/log2.3
+#usr/local/share/man/man3/log2f.3
+#usr/local/share/man/man3/log2l.3
+#usr/local/share/man/man3/logb.3
+#usr/local/share/man/man3/logbf.3
+#usr/local/share/man/man3/logbl.3
+#usr/local/share/man/man3/logf.3
+#usr/local/share/man/man3/login.3
+#usr/local/share/man/man3/login_tty.3
+#usr/local/share/man/man3/logl.3
+#usr/local/share/man/man3/logout.3
+#usr/local/share/man/man3/logwtmp.3
+#usr/local/share/man/man3/longjmp.3
+#usr/local/share/man/man3/lrand48.3
+#usr/local/share/man/man3/lrand48_r.3
+#usr/local/share/man/man3/lrint.3
+#usr/local/share/man/man3/lrintf.3
+#usr/local/share/man/man3/lrintl.3
+#usr/local/share/man/man3/lround.3
+#usr/local/share/man/man3/lroundf.3
+#usr/local/share/man/man3/lroundl.3
+#usr/local/share/man/man3/lsearch.3
+#usr/local/share/man/man3/lseek64.3
+#usr/local/share/man/man3/lutimes.3
+#usr/local/share/man/man3/major.3
+#usr/local/share/man/man3/makecontext.3
+#usr/local/share/man/man3/makedev.3
+#usr/local/share/man/man3/mallinfo.3
+#usr/local/share/man/man3/mallinfo2.3
+#usr/local/share/man/man3/malloc.3
+#usr/local/share/man/man3/malloc_get_state.3
+#usr/local/share/man/man3/malloc_hook.3
+#usr/local/share/man/man3/malloc_info.3
+#usr/local/share/man/man3/malloc_set_state.3
+#usr/local/share/man/man3/malloc_stats.3
+#usr/local/share/man/man3/malloc_trim.3
+#usr/local/share/man/man3/malloc_usable_size.3
+#usr/local/share/man/man3/mallopt.3
+#usr/local/share/man/man3/matherr.3
+#usr/local/share/man/man3/mblen.3
+#usr/local/share/man/man3/mbrlen.3
+#usr/local/share/man/man3/mbrtowc.3
+#usr/local/share/man/man3/mbsinit.3
+#usr/local/share/man/man3/mbsnrtowcs.3
+#usr/local/share/man/man3/mbsrtowcs.3
+#usr/local/share/man/man3/mbstowcs.3
+#usr/local/share/man/man3/mbtowc.3
+#usr/local/share/man/man3/mcheck.3
+#usr/local/share/man/man3/mcheck_check_all.3
+#usr/local/share/man/man3/mcheck_pedantic.3
+#usr/local/share/man/man3/memalign.3
+#usr/local/share/man/man3/memccpy.3
+#usr/local/share/man/man3/memchr.3
+#usr/local/share/man/man3/memcmp.3
+#usr/local/share/man/man3/memcpy.3
+#usr/local/share/man/man3/memfrob.3
+#usr/local/share/man/man3/memmem.3
+#usr/local/share/man/man3/memmove.3
+#usr/local/share/man/man3/mempcpy.3
+#usr/local/share/man/man3/memrchr.3
+#usr/local/share/man/man3/memset.3
+#usr/local/share/man/man3/minor.3
+#usr/local/share/man/man3/mkdtemp.3
+#usr/local/share/man/man3/mkfifo.3
+#usr/local/share/man/man3/mkfifoat.3
+#usr/local/share/man/man3/mkostemp.3
+#usr/local/share/man/man3/mkostemps.3
+#usr/local/share/man/man3/mkstemp.3
+#usr/local/share/man/man3/mkstemps.3
+#usr/local/share/man/man3/mktemp.3
+#usr/local/share/man/man3/mktime.3
+#usr/local/share/man/man3/mmap64.3
+#usr/local/share/man/man3/mode_t.3
+#usr/local/share/man/man3/modf.3
+#usr/local/share/man/man3/modff.3
+#usr/local/share/man/man3/modfl.3
+#usr/local/share/man/man3/mpool.3
+#usr/local/share/man/man3/mprobe.3
+#usr/local/share/man/man3/mq_close.3
+#usr/local/share/man/man3/mq_getattr.3
+#usr/local/share/man/man3/mq_notify.3
+#usr/local/share/man/man3/mq_open.3
+#usr/local/share/man/man3/mq_receive.3
+#usr/local/share/man/man3/mq_send.3
+#usr/local/share/man/man3/mq_setattr.3
+#usr/local/share/man/man3/mq_timedreceive.3
+#usr/local/share/man/man3/mq_timedsend.3
+#usr/local/share/man/man3/mq_unlink.3
+#usr/local/share/man/man3/mrand48.3
+#usr/local/share/man/man3/mrand48_r.3
+#usr/local/share/man/man3/mtrace.3
+#usr/local/share/man/man3/muntrace.3
+#usr/local/share/man/man3/nan.3
+#usr/local/share/man/man3/nanf.3
+#usr/local/share/man/man3/nanl.3
+#usr/local/share/man/man3/nearbyint.3
+#usr/local/share/man/man3/nearbyintf.3
+#usr/local/share/man/man3/nearbyintl.3
+#usr/local/share/man/man3/netlink.3
+#usr/local/share/man/man3/newlocale.3
+#usr/local/share/man/man3/nextafter.3
+#usr/local/share/man/man3/nextafterf.3
+#usr/local/share/man/man3/nextafterl.3
+#usr/local/share/man/man3/nextdown.3
+#usr/local/share/man/man3/nextdownf.3
+#usr/local/share/man/man3/nextdownl.3
+#usr/local/share/man/man3/nexttoward.3
+#usr/local/share/man/man3/nexttowardf.3
+#usr/local/share/man/man3/nexttowardl.3
+#usr/local/share/man/man3/nextup.3
+#usr/local/share/man/man3/nextupf.3
+#usr/local/share/man/man3/nextupl.3
+#usr/local/share/man/man3/nftw.3
+#usr/local/share/man/man3/nl_langinfo.3
+#usr/local/share/man/man3/nl_langinfo_l.3
+#usr/local/share/man/man3/nrand48.3
+#usr/local/share/man/man3/nrand48_r.3
+#usr/local/share/man/man3/ntohl.3
+#usr/local/share/man/man3/ntohs.3
+#usr/local/share/man/man3/ntp_adjtime.3
+#usr/local/share/man/man3/ntp_gettime.3
+#usr/local/share/man/man3/ntp_gettimex.3
+#usr/local/share/man/man3/off64_t.3
+#usr/local/share/man/man3/off_t.3
+#usr/local/share/man/man3/offsetof.3
+#usr/local/share/man/man3/on_exit.3
+#usr/local/share/man/man3/open_memstream.3
+#usr/local/share/man/man3/open_wmemstream.3
+#usr/local/share/man/man3/opendir.3
+#usr/local/share/man/man3/openlog.3
+#usr/local/share/man/man3/openpty.3
+#usr/local/share/man/man3/optarg.3
+#usr/local/share/man/man3/opterr.3
+#usr/local/share/man/man3/optind.3
+#usr/local/share/man/man3/optopt.3
+#usr/local/share/man/man3/passwd2des.3
+#usr/local/share/man/man3/pathconf.3
+#usr/local/share/man/man3/pclose.3
+#usr/local/share/man/man3/perror.3
+#usr/local/share/man/man3/pid_t.3
+#usr/local/share/man/man3/pmap_getmaps.3
+#usr/local/share/man/man3/pmap_getport.3
+#usr/local/share/man/man3/pmap_rmtcall.3
+#usr/local/share/man/man3/pmap_set.3
+#usr/local/share/man/man3/pmap_unset.3
+#usr/local/share/man/man3/popen.3
+#usr/local/share/man/man3/posix_fallocate.3
+#usr/local/share/man/man3/posix_madvise.3
+#usr/local/share/man/man3/posix_memalign.3
+#usr/local/share/man/man3/posix_openpt.3
+#usr/local/share/man/man3/posix_spawn.3
+#usr/local/share/man/man3/posix_spawnp.3
+#usr/local/share/man/man3/pow.3
+#usr/local/share/man/man3/pow10.3
+#usr/local/share/man/man3/pow10f.3
+#usr/local/share/man/man3/pow10l.3
+#usr/local/share/man/man3/powf.3
+#usr/local/share/man/man3/powl.3
+#usr/local/share/man/man3/printf.3
+#usr/local/share/man/man3/profil.3
+#usr/local/share/man/man3/program_invocation_name.3
+#usr/local/share/man/man3/program_invocation_short_name.3
+#usr/local/share/man/man3/psiginfo.3
+#usr/local/share/man/man3/psignal.3
+#usr/local/share/man/man3/pthread_atfork.3
+#usr/local/share/man/man3/pthread_attr_destroy.3
+#usr/local/share/man/man3/pthread_attr_getaffinity_np.3
+#usr/local/share/man/man3/pthread_attr_getdetachstate.3
+#usr/local/share/man/man3/pthread_attr_getguardsize.3
+#usr/local/share/man/man3/pthread_attr_getinheritsched.3
+#usr/local/share/man/man3/pthread_attr_getschedparam.3
+#usr/local/share/man/man3/pthread_attr_getschedpolicy.3
+#usr/local/share/man/man3/pthread_attr_getscope.3
+#usr/local/share/man/man3/pthread_attr_getsigmask_np.3
+#usr/local/share/man/man3/pthread_attr_getstack.3
+#usr/local/share/man/man3/pthread_attr_getstackaddr.3
+#usr/local/share/man/man3/pthread_attr_getstacksize.3
+#usr/local/share/man/man3/pthread_attr_init.3
+#usr/local/share/man/man3/pthread_attr_setaffinity_np.3
+#usr/local/share/man/man3/pthread_attr_setdetachstate.3
+#usr/local/share/man/man3/pthread_attr_setguardsize.3
+#usr/local/share/man/man3/pthread_attr_setinheritsched.3
+#usr/local/share/man/man3/pthread_attr_setschedparam.3
+#usr/local/share/man/man3/pthread_attr_setschedpolicy.3
+#usr/local/share/man/man3/pthread_attr_setscope.3
+#usr/local/share/man/man3/pthread_attr_setsigmask_np.3
+#usr/local/share/man/man3/pthread_attr_setstack.3
+#usr/local/share/man/man3/pthread_attr_setstackaddr.3
+#usr/local/share/man/man3/pthread_attr_setstacksize.3
+#usr/local/share/man/man3/pthread_cancel.3
+#usr/local/share/man/man3/pthread_cleanup_pop.3
+#usr/local/share/man/man3/pthread_cleanup_pop_restore_np.3
+#usr/local/share/man/man3/pthread_cleanup_push.3
+#usr/local/share/man/man3/pthread_cleanup_push_defer_np.3
+#usr/local/share/man/man3/pthread_create.3
+#usr/local/share/man/man3/pthread_detach.3
+#usr/local/share/man/man3/pthread_equal.3
+#usr/local/share/man/man3/pthread_exit.3
+#usr/local/share/man/man3/pthread_getaffinity_np.3
+#usr/local/share/man/man3/pthread_getattr_default_np.3
+#usr/local/share/man/man3/pthread_getattr_np.3
+#usr/local/share/man/man3/pthread_getconcurrency.3
+#usr/local/share/man/man3/pthread_getcpuclockid.3
+#usr/local/share/man/man3/pthread_getname_np.3
+#usr/local/share/man/man3/pthread_getschedparam.3
+#usr/local/share/man/man3/pthread_join.3
+#usr/local/share/man/man3/pthread_kill.3
+#usr/local/share/man/man3/pthread_kill_other_threads_np.3
+#usr/local/share/man/man3/pthread_mutex_consistent.3
+#usr/local/share/man/man3/pthread_mutex_consistent_np.3
+#usr/local/share/man/man3/pthread_mutexattr_destroy.3
+#usr/local/share/man/man3/pthread_mutexattr_getpshared.3
+#usr/local/share/man/man3/pthread_mutexattr_getrobust.3
+#usr/local/share/man/man3/pthread_mutexattr_getrobust_np.3
+#usr/local/share/man/man3/pthread_mutexattr_init.3
+#usr/local/share/man/man3/pthread_mutexattr_setpshared.3
+#usr/local/share/man/man3/pthread_mutexattr_setrobust.3
+#usr/local/share/man/man3/pthread_mutexattr_setrobust_np.3
+#usr/local/share/man/man3/pthread_rwlockattr_getkind_np.3
+#usr/local/share/man/man3/pthread_rwlockattr_setkind_np.3
+#usr/local/share/man/man3/pthread_self.3
+#usr/local/share/man/man3/pthread_setaffinity_np.3
+#usr/local/share/man/man3/pthread_setattr_default_np.3
+#usr/local/share/man/man3/pthread_setcancelstate.3
+#usr/local/share/man/man3/pthread_setcanceltype.3
+#usr/local/share/man/man3/pthread_setconcurrency.3
+#usr/local/share/man/man3/pthread_setname_np.3
+#usr/local/share/man/man3/pthread_setschedparam.3
+#usr/local/share/man/man3/pthread_setschedprio.3
+#usr/local/share/man/man3/pthread_sigmask.3
+#usr/local/share/man/man3/pthread_sigqueue.3
+#usr/local/share/man/man3/pthread_spin_destroy.3
+#usr/local/share/man/man3/pthread_spin_init.3
+#usr/local/share/man/man3/pthread_spin_lock.3
+#usr/local/share/man/man3/pthread_spin_trylock.3
+#usr/local/share/man/man3/pthread_spin_unlock.3
+#usr/local/share/man/man3/pthread_testcancel.3
+#usr/local/share/man/man3/pthread_timedjoin_np.3
+#usr/local/share/man/man3/pthread_tryjoin_np.3
+#usr/local/share/man/man3/pthread_yield.3
+#usr/local/share/man/man3/ptrdiff_t.3
+#usr/local/share/man/man3/ptsname.3
+#usr/local/share/man/man3/ptsname_r.3
+#usr/local/share/man/man3/putc.3
+#usr/local/share/man/man3/putc_unlocked.3
+#usr/local/share/man/man3/putchar.3
+#usr/local/share/man/man3/putchar_unlocked.3
+#usr/local/share/man/man3/putenv.3
+#usr/local/share/man/man3/putgrent.3
+#usr/local/share/man/man3/putpwent.3
+#usr/local/share/man/man3/puts.3
+#usr/local/share/man/man3/putspent.3
+#usr/local/share/man/man3/pututline.3
+#usr/local/share/man/man3/pututxline.3
+#usr/local/share/man/man3/putw.3
+#usr/local/share/man/man3/putwc.3
+#usr/local/share/man/man3/putwc_unlocked.3
+#usr/local/share/man/man3/putwchar.3
+#usr/local/share/man/man3/putwchar_unlocked.3
+#usr/local/share/man/man3/pvalloc.3
+#usr/local/share/man/man3/qecvt.3
+#usr/local/share/man/man3/qecvt_r.3
+#usr/local/share/man/man3/qfcvt.3
+#usr/local/share/man/man3/qfcvt_r.3
+#usr/local/share/man/man3/qgcvt.3
+#usr/local/share/man/man3/qsort.3
+#usr/local/share/man/man3/qsort_r.3
+#usr/local/share/man/man3/queue.3
+#usr/local/share/man/man3/raise.3
+#usr/local/share/man/man3/rand.3
+#usr/local/share/man/man3/rand_r.3
+#usr/local/share/man/man3/random.3
+#usr/local/share/man/man3/random_r.3
+#usr/local/share/man/man3/rawmemchr.3
+#usr/local/share/man/man3/rcmd.3
+#usr/local/share/man/man3/rcmd_af.3
+#usr/local/share/man/man3/re_comp.3
+#usr/local/share/man/man3/re_exec.3
+#usr/local/share/man/man3/readdir.3
+#usr/local/share/man/man3/readdir_r.3
+#usr/local/share/man/man3/realloc.3
+#usr/local/share/man/man3/reallocarray.3
+#usr/local/share/man/man3/realpath.3
+#usr/local/share/man/man3/recno.3
+#usr/local/share/man/man3/regcomp.3
+#usr/local/share/man/man3/regerror.3
+#usr/local/share/man/man3/regex.3
+#usr/local/share/man/man3/regex_t.3
+#usr/local/share/man/man3/regexec.3
+#usr/local/share/man/man3/regfree.3
+#usr/local/share/man/man3/registerrpc.3
+#usr/local/share/man/man3/regmatch_t.3
+#usr/local/share/man/man3/regoff_t.3
+#usr/local/share/man/man3/remainder.3
+#usr/local/share/man/man3/remainderf.3
+#usr/local/share/man/man3/remainderl.3
+#usr/local/share/man/man3/remove.3
+#usr/local/share/man/man3/remque.3
+#usr/local/share/man/man3/remquo.3
+#usr/local/share/man/man3/remquof.3
+#usr/local/share/man/man3/remquol.3
+#usr/local/share/man/man3/res_init.3
+#usr/local/share/man/man3/res_mkquery.3
+#usr/local/share/man/man3/res_nclose.3
+#usr/local/share/man/man3/res_ninit.3
+#usr/local/share/man/man3/res_nmkquery.3
+#usr/local/share/man/man3/res_nquery.3
+#usr/local/share/man/man3/res_nquerydomain.3
+#usr/local/share/man/man3/res_nsearch.3
+#usr/local/share/man/man3/res_nsend.3
+#usr/local/share/man/man3/res_query.3
+#usr/local/share/man/man3/res_querydomain.3
+#usr/local/share/man/man3/res_search.3
+#usr/local/share/man/man3/res_send.3
+#usr/local/share/man/man3/resolver.3
+#usr/local/share/man/man3/rewind.3
+#usr/local/share/man/man3/rewinddir.3
+#usr/local/share/man/man3/rexec.3
+#usr/local/share/man/man3/rexec_af.3
+#usr/local/share/man/man3/rindex.3
+#usr/local/share/man/man3/rint.3
+#usr/local/share/man/man3/rintf.3
+#usr/local/share/man/man3/rintl.3
+#usr/local/share/man/man3/round.3
+#usr/local/share/man/man3/roundf.3
+#usr/local/share/man/man3/roundl.3
+#usr/local/share/man/man3/rpc.3
+#usr/local/share/man/man3/rpmatch.3
+#usr/local/share/man/man3/rresvport.3
+#usr/local/share/man/man3/rresvport_af.3
+#usr/local/share/man/man3/rtime.3
+#usr/local/share/man/man3/rtnetlink.3
+#usr/local/share/man/man3/ruserok.3
+#usr/local/share/man/man3/ruserok_af.3
+#usr/local/share/man/man3/scalb.3
+#usr/local/share/man/man3/scalbf.3
+#usr/local/share/man/man3/scalbl.3
+#usr/local/share/man/man3/scalbln.3
+#usr/local/share/man/man3/scalblnf.3
+#usr/local/share/man/man3/scalblnl.3
+#usr/local/share/man/man3/scalbn.3
+#usr/local/share/man/man3/scalbnf.3
+#usr/local/share/man/man3/scalbnl.3
+#usr/local/share/man/man3/scandir.3
+#usr/local/share/man/man3/scandirat.3
+#usr/local/share/man/man3/scanf.3
+#usr/local/share/man/man3/sched_getcpu.3
+#usr/local/share/man/man3/secure_getenv.3
+#usr/local/share/man/man3/seed48.3
+#usr/local/share/man/man3/seed48_r.3
+#usr/local/share/man/man3/seekdir.3
+#usr/local/share/man/man3/sem_close.3
+#usr/local/share/man/man3/sem_destroy.3
+#usr/local/share/man/man3/sem_getvalue.3
+#usr/local/share/man/man3/sem_init.3
+#usr/local/share/man/man3/sem_open.3
+#usr/local/share/man/man3/sem_post.3
+#usr/local/share/man/man3/sem_timedwait.3
+#usr/local/share/man/man3/sem_trywait.3
+#usr/local/share/man/man3/sem_unlink.3
+#usr/local/share/man/man3/sem_wait.3
+#usr/local/share/man/man3/setaliasent.3
+#usr/local/share/man/man3/setbuf.3
+#usr/local/share/man/man3/setbuffer.3
+#usr/local/share/man/man3/setcontext.3
+#usr/local/share/man/man3/setenv.3
+#usr/local/share/man/man3/setfsent.3
+#usr/local/share/man/man3/setgrent.3
+#usr/local/share/man/man3/sethostent.3
+#usr/local/share/man/man3/sethostid.3
+#usr/local/share/man/man3/setjmp.3
+#usr/local/share/man/man3/setkey.3
+#usr/local/share/man/man3/setkey_r.3
+#usr/local/share/man/man3/setlinebuf.3
+#usr/local/share/man/man3/setlocale.3
+#usr/local/share/man/man3/setlogmask.3
+#usr/local/share/man/man3/setmntent.3
+#usr/local/share/man/man3/setnetent.3
+#usr/local/share/man/man3/setnetgrent.3
+#usr/local/share/man/man3/setprotoent.3
+#usr/local/share/man/man3/setpwent.3
+#usr/local/share/man/man3/setrpcent.3
+#usr/local/share/man/man3/setservent.3
+#usr/local/share/man/man3/setspent.3
+#usr/local/share/man/man3/setstate.3
+#usr/local/share/man/man3/setstate_r.3
+#usr/local/share/man/man3/setttyent.3
+#usr/local/share/man/man3/setusershell.3
+#usr/local/share/man/man3/setutent.3
+#usr/local/share/man/man3/setutxent.3
+#usr/local/share/man/man3/setvbuf.3
+#usr/local/share/man/man3/sgetspent.3
+#usr/local/share/man/man3/sgetspent_r.3
+#usr/local/share/man/man3/shm_open.3
+#usr/local/share/man/man3/shm_unlink.3
+#usr/local/share/man/man3/sigabbrev_np.3
+#usr/local/share/man/man3/sigaddset.3
+#usr/local/share/man/man3/sigandset.3
+#usr/local/share/man/man3/sigblock.3
+#usr/local/share/man/man3/sigdelset.3
+#usr/local/share/man/man3/sigdescr_np.3
+#usr/local/share/man/man3/sigemptyset.3
+#usr/local/share/man/man3/sigfillset.3
+#usr/local/share/man/man3/siggetmask.3
+#usr/local/share/man/man3/sighold.3
+#usr/local/share/man/man3/sigignore.3
+#usr/local/share/man/man3/siginfo_t.3
+#usr/local/share/man/man3/siginterrupt.3
+#usr/local/share/man/man3/sigisemptyset.3
+#usr/local/share/man/man3/sigismember.3
+#usr/local/share/man/man3/siglongjmp.3
+#usr/local/share/man/man3/sigmask.3
+#usr/local/share/man/man3/signbit.3
+#usr/local/share/man/man3/signgam.3
+#usr/local/share/man/man3/significand.3
+#usr/local/share/man/man3/significandf.3
+#usr/local/share/man/man3/significandl.3
+#usr/local/share/man/man3/sigorset.3
+#usr/local/share/man/man3/sigpause.3
+#usr/local/share/man/man3/sigqueue.3
+#usr/local/share/man/man3/sigrelse.3
+#usr/local/share/man/man3/sigset.3
+#usr/local/share/man/man3/sigset_t.3
+#usr/local/share/man/man3/sigsetjmp.3
+#usr/local/share/man/man3/sigsetmask.3
+#usr/local/share/man/man3/sigsetops.3
+#usr/local/share/man/man3/sigstack.3
+#usr/local/share/man/man3/sigval.3
+#usr/local/share/man/man3/sigvec.3
+#usr/local/share/man/man3/sigwait.3
+#usr/local/share/man/man3/simpleq.3
+#usr/local/share/man/man3/sin.3
+#usr/local/share/man/man3/sincos.3
+#usr/local/share/man/man3/sincosf.3
+#usr/local/share/man/man3/sincosl.3
+#usr/local/share/man/man3/sinf.3
+#usr/local/share/man/man3/sinh.3
+#usr/local/share/man/man3/sinhf.3
+#usr/local/share/man/man3/sinhl.3
+#usr/local/share/man/man3/sinl.3
+#usr/local/share/man/man3/size_t.3
+#usr/local/share/man/man3/sleep.3
+#usr/local/share/man/man3/slist.3
+#usr/local/share/man/man3/snprintf.3
+#usr/local/share/man/man3/sockaddr.3
+#usr/local/share/man/man3/sockatmark.3
+#usr/local/share/man/man3/socklen_t.3
+#usr/local/share/man/man3/sprintf.3
+#usr/local/share/man/man3/sqrt.3
+#usr/local/share/man/man3/sqrtf.3
+#usr/local/share/man/man3/sqrtl.3
+#usr/local/share/man/man3/srand.3
+#usr/local/share/man/man3/srand48.3
+#usr/local/share/man/man3/srand48_r.3
+#usr/local/share/man/man3/srandom.3
+#usr/local/share/man/man3/srandom_r.3
+#usr/local/share/man/man3/sscanf.3
+#usr/local/share/man/man3/ssignal.3
+#usr/local/share/man/man3/ssize_t.3
+#usr/local/share/man/man3/stailq.3
+#usr/local/share/man/man3/statvfs.3
+#usr/local/share/man/man3/stdarg.3
+#usr/local/share/man/man3/stderr.3
+#usr/local/share/man/man3/stdin.3
+#usr/local/share/man/man3/stdio.3
+#usr/local/share/man/man3/stdio_ext.3
+#usr/local/share/man/man3/stdout.3
+#usr/local/share/man/man3/stpcpy.3
+#usr/local/share/man/man3/stpncpy.3
+#usr/local/share/man/man3/strcasecmp.3
+#usr/local/share/man/man3/strcasestr.3
+#usr/local/share/man/man3/strcat.3
+#usr/local/share/man/man3/strchr.3
+#usr/local/share/man/man3/strchrnul.3
+#usr/local/share/man/man3/strcmp.3
+#usr/local/share/man/man3/strcoll.3
+#usr/local/share/man/man3/strcpy.3
+#usr/local/share/man/man3/strcspn.3
+#usr/local/share/man/man3/strdup.3
+#usr/local/share/man/man3/strdupa.3
+#usr/local/share/man/man3/strerror.3
+#usr/local/share/man/man3/strerror_l.3
+#usr/local/share/man/man3/strerror_r.3
+#usr/local/share/man/man3/strerrordesc_np.3
+#usr/local/share/man/man3/strerrorname_np.3
+#usr/local/share/man/man3/strfmon.3
+#usr/local/share/man/man3/strfmon_l.3
+#usr/local/share/man/man3/strfromd.3
+#usr/local/share/man/man3/strfromf.3
+#usr/local/share/man/man3/strfroml.3
+#usr/local/share/man/man3/strfry.3
+#usr/local/share/man/man3/strftime.3
+#usr/local/share/man/man3/string.3
+#usr/local/share/man/man3/strlen.3
+#usr/local/share/man/man3/strncasecmp.3
+#usr/local/share/man/man3/strncat.3
+#usr/local/share/man/man3/strncmp.3
+#usr/local/share/man/man3/strncpy.3
+#usr/local/share/man/man3/strndup.3
+#usr/local/share/man/man3/strndupa.3
+#usr/local/share/man/man3/strnlen.3
+#usr/local/share/man/man3/strpbrk.3
+#usr/local/share/man/man3/strptime.3
+#usr/local/share/man/man3/strrchr.3
+#usr/local/share/man/man3/strsep.3
+#usr/local/share/man/man3/strsignal.3
+#usr/local/share/man/man3/strspn.3
+#usr/local/share/man/man3/strstr.3
+#usr/local/share/man/man3/strtod.3
+#usr/local/share/man/man3/strtof.3
+#usr/local/share/man/man3/strtoimax.3
+#usr/local/share/man/man3/strtok.3
+#usr/local/share/man/man3/strtok_r.3
+#usr/local/share/man/man3/strtol.3
+#usr/local/share/man/man3/strtold.3
+#usr/local/share/man/man3/strtoll.3
+#usr/local/share/man/man3/strtoq.3
+#usr/local/share/man/man3/strtoul.3
+#usr/local/share/man/man3/strtoull.3
+#usr/local/share/man/man3/strtoumax.3
+#usr/local/share/man/man3/strtouq.3
+#usr/local/share/man/man3/strverscmp.3
+#usr/local/share/man/man3/strxfrm.3
+#usr/local/share/man/man3/suseconds_t.3
+#usr/local/share/man/man3/svc_destroy.3
+#usr/local/share/man/man3/svc_freeargs.3
+#usr/local/share/man/man3/svc_getargs.3
+#usr/local/share/man/man3/svc_getcaller.3
+#usr/local/share/man/man3/svc_getreq.3
+#usr/local/share/man/man3/svc_getreqset.3
+#usr/local/share/man/man3/svc_register.3
+#usr/local/share/man/man3/svc_run.3
+#usr/local/share/man/man3/svc_sendreply.3
+#usr/local/share/man/man3/svc_unregister.3
+#usr/local/share/man/man3/svcerr_auth.3
+#usr/local/share/man/man3/svcerr_decode.3
+#usr/local/share/man/man3/svcerr_noproc.3
+#usr/local/share/man/man3/svcerr_noprog.3
+#usr/local/share/man/man3/svcerr_progvers.3
+#usr/local/share/man/man3/svcerr_systemerr.3
+#usr/local/share/man/man3/svcerr_weakauth.3
+#usr/local/share/man/man3/svcfd_create.3
+#usr/local/share/man/man3/svcraw_create.3
+#usr/local/share/man/man3/svctcp_create.3
+#usr/local/share/man/man3/svcudp_bufcreate.3
+#usr/local/share/man/man3/svcudp_create.3
+#usr/local/share/man/man3/swab.3
+#usr/local/share/man/man3/swapcontext.3
+#usr/local/share/man/man3/swprintf.3
+#usr/local/share/man/man3/sys_errlist.3
+#usr/local/share/man/man3/sys_nerr.3
+#usr/local/share/man/man3/sys_siglist.3
+#usr/local/share/man/man3/sysconf.3
+#usr/local/share/man/man3/syslog.3
+#usr/local/share/man/man3/system.3
+#usr/local/share/man/man3/sysv_signal.3
+#usr/local/share/man/man3/tailq.3
+#usr/local/share/man/man3/tan.3
+#usr/local/share/man/man3/tanf.3
+#usr/local/share/man/man3/tanh.3
+#usr/local/share/man/man3/tanhf.3
+#usr/local/share/man/man3/tanhl.3
+#usr/local/share/man/man3/tanl.3
+#usr/local/share/man/man3/tcdrain.3
+#usr/local/share/man/man3/tcflow.3
+#usr/local/share/man/man3/tcflush.3
+#usr/local/share/man/man3/tcgetattr.3
+#usr/local/share/man/man3/tcgetpgrp.3
+#usr/local/share/man/man3/tcgetsid.3
+#usr/local/share/man/man3/tcsendbreak.3
+#usr/local/share/man/man3/tcsetattr.3
+#usr/local/share/man/man3/tcsetpgrp.3
+#usr/local/share/man/man3/tdelete.3
+#usr/local/share/man/man3/tdestroy.3
+#usr/local/share/man/man3/telldir.3
+#usr/local/share/man/man3/tempnam.3
+#usr/local/share/man/man3/termios.3
+#usr/local/share/man/man3/tfind.3
+#usr/local/share/man/man3/tgamma.3
+#usr/local/share/man/man3/tgammaf.3
+#usr/local/share/man/man3/tgammal.3
+#usr/local/share/man/man3/time_t.3
+#usr/local/share/man/man3/timegm.3
+#usr/local/share/man/man3/timelocal.3
+#usr/local/share/man/man3/timer_t.3
+#usr/local/share/man/man3/timeradd.3
+#usr/local/share/man/man3/timerclear.3
+#usr/local/share/man/man3/timercmp.3
+#usr/local/share/man/man3/timerisset.3
+#usr/local/share/man/man3/timersub.3
+#usr/local/share/man/man3/timespec.3
+#usr/local/share/man/man3/timeval.3
+#usr/local/share/man/man3/timezone.3
+#usr/local/share/man/man3/tmpfile.3
+#usr/local/share/man/man3/tmpnam.3
+#usr/local/share/man/man3/tmpnam_r.3
+#usr/local/share/man/man3/toascii.3
+#usr/local/share/man/man3/tolower.3
+#usr/local/share/man/man3/tolower_l.3
+#usr/local/share/man/man3/toupper.3
+#usr/local/share/man/man3/toupper_l.3
+#usr/local/share/man/man3/towctrans.3
+#usr/local/share/man/man3/towlower.3
+#usr/local/share/man/man3/towlower_l.3
+#usr/local/share/man/man3/towupper.3
+#usr/local/share/man/man3/towupper_l.3
+#usr/local/share/man/man3/trunc.3
+#usr/local/share/man/man3/truncf.3
+#usr/local/share/man/man3/truncl.3
+#usr/local/share/man/man3/tsearch.3
+#usr/local/share/man/man3/ttyname.3
+#usr/local/share/man/man3/ttyname_r.3
+#usr/local/share/man/man3/ttyslot.3
+#usr/local/share/man/man3/twalk.3
+#usr/local/share/man/man3/twalk_r.3
+#usr/local/share/man/man3/tzname.3
+#usr/local/share/man/man3/tzset.3
+#usr/local/share/man/man3/ualarm.3
+#usr/local/share/man/man3/uid_t.3
+#usr/local/share/man/man3/uint16_t.3
+#usr/local/share/man/man3/uint32_t.3
+#usr/local/share/man/man3/uint64_t.3
+#usr/local/share/man/man3/uint8_t.3
+#usr/local/share/man/man3/uintN_t.3
+#usr/local/share/man/man3/uintmax_t.3
+#usr/local/share/man/man3/uintptr_t.3
+#usr/local/share/man/man3/ulckpwdf.3
+#usr/local/share/man/man3/ulimit.3
+#usr/local/share/man/man3/undocumented.3
+#usr/local/share/man/man3/ungetc.3
+#usr/local/share/man/man3/ungetwc.3
+#usr/local/share/man/man3/unlocked_stdio.3
+#usr/local/share/man/man3/unlockpt.3
+#usr/local/share/man/man3/unsetenv.3
+#usr/local/share/man/man3/updwtmp.3
+#usr/local/share/man/man3/updwtmpx.3
+#usr/local/share/man/man3/uselocale.3
+#usr/local/share/man/man3/usleep.3
+#usr/local/share/man/man3/utmpname.3
+#usr/local/share/man/man3/utmpxname.3
+#usr/local/share/man/man3/va_arg.3
+#usr/local/share/man/man3/va_copy.3
+#usr/local/share/man/man3/va_end.3
+#usr/local/share/man/man3/va_list.3
+#usr/local/share/man/man3/va_start.3
+#usr/local/share/man/man3/valloc.3
+#usr/local/share/man/man3/vasprintf.3
+#usr/local/share/man/man3/vdprintf.3
+#usr/local/share/man/man3/verr.3
+#usr/local/share/man/man3/verrx.3
+#usr/local/share/man/man3/versionsort.3
+#usr/local/share/man/man3/vfprintf.3
+#usr/local/share/man/man3/vfscanf.3
+#usr/local/share/man/man3/vfwprintf.3
+#usr/local/share/man/man3/vlimit.3
+#usr/local/share/man/man3/void.3
+#usr/local/share/man/man3/vprintf.3
+#usr/local/share/man/man3/vscanf.3
+#usr/local/share/man/man3/vsnprintf.3
+#usr/local/share/man/man3/vsprintf.3
+#usr/local/share/man/man3/vsscanf.3
+#usr/local/share/man/man3/vswprintf.3
+#usr/local/share/man/man3/vsyslog.3
+#usr/local/share/man/man3/vtimes.3
+#usr/local/share/man/man3/vwarn.3
+#usr/local/share/man/man3/vwarnx.3
+#usr/local/share/man/man3/vwprintf.3
+#usr/local/share/man/man3/warn.3
+#usr/local/share/man/man3/warnx.3
+#usr/local/share/man/man3/wcpcpy.3
+#usr/local/share/man/man3/wcpncpy.3
+#usr/local/share/man/man3/wcrtomb.3
+#usr/local/share/man/man3/wcscasecmp.3
+#usr/local/share/man/man3/wcscat.3
+#usr/local/share/man/man3/wcschr.3
+#usr/local/share/man/man3/wcscmp.3
+#usr/local/share/man/man3/wcscpy.3
+#usr/local/share/man/man3/wcscspn.3
+#usr/local/share/man/man3/wcsdup.3
+#usr/local/share/man/man3/wcslen.3
+#usr/local/share/man/man3/wcsncasecmp.3
+#usr/local/share/man/man3/wcsncat.3
+#usr/local/share/man/man3/wcsncmp.3
+#usr/local/share/man/man3/wcsncpy.3
+#usr/local/share/man/man3/wcsnlen.3
+#usr/local/share/man/man3/wcsnrtombs.3
+#usr/local/share/man/man3/wcspbrk.3
+#usr/local/share/man/man3/wcsrchr.3
+#usr/local/share/man/man3/wcsrtombs.3
+#usr/local/share/man/man3/wcsspn.3
+#usr/local/share/man/man3/wcsstr.3
+#usr/local/share/man/man3/wcstoimax.3
+#usr/local/share/man/man3/wcstok.3
+#usr/local/share/man/man3/wcstombs.3
+#usr/local/share/man/man3/wcstoumax.3
+#usr/local/share/man/man3/wcswidth.3
+#usr/local/share/man/man3/wctob.3
+#usr/local/share/man/man3/wctomb.3
+#usr/local/share/man/man3/wctrans.3
+#usr/local/share/man/man3/wctype.3
+#usr/local/share/man/man3/wcwidth.3
+#usr/local/share/man/man3/wmemchr.3
+#usr/local/share/man/man3/wmemcmp.3
+#usr/local/share/man/man3/wmemcpy.3
+#usr/local/share/man/man3/wmemmove.3
+#usr/local/share/man/man3/wmempcpy.3
+#usr/local/share/man/man3/wmemset.3
+#usr/local/share/man/man3/wordexp.3
+#usr/local/share/man/man3/wordfree.3
+#usr/local/share/man/man3/wprintf.3
+#usr/local/share/man/man3/xcrypt.3
+#usr/local/share/man/man3/xdecrypt.3
+#usr/local/share/man/man3/xdr.3
+#usr/local/share/man/man3/xdr_accepted_reply.3
+#usr/local/share/man/man3/xdr_array.3
+#usr/local/share/man/man3/xdr_authunix_parms.3
+#usr/local/share/man/man3/xdr_bool.3
+#usr/local/share/man/man3/xdr_bytes.3
+#usr/local/share/man/man3/xdr_callhdr.3
+#usr/local/share/man/man3/xdr_callmsg.3
+#usr/local/share/man/man3/xdr_char.3
+#usr/local/share/man/man3/xdr_destroy.3
+#usr/local/share/man/man3/xdr_double.3
+#usr/local/share/man/man3/xdr_enum.3
+#usr/local/share/man/man3/xdr_float.3
+#usr/local/share/man/man3/xdr_free.3
+#usr/local/share/man/man3/xdr_getpos.3
+#usr/local/share/man/man3/xdr_inline.3
+#usr/local/share/man/man3/xdr_int.3
+#usr/local/share/man/man3/xdr_long.3
+#usr/local/share/man/man3/xdr_opaque.3
+#usr/local/share/man/man3/xdr_opaque_auth.3
+#usr/local/share/man/man3/xdr_pmap.3
+#usr/local/share/man/man3/xdr_pmaplist.3
+#usr/local/share/man/man3/xdr_pointer.3
+#usr/local/share/man/man3/xdr_reference.3
+#usr/local/share/man/man3/xdr_rejected_reply.3
+#usr/local/share/man/man3/xdr_replymsg.3
+#usr/local/share/man/man3/xdr_setpos.3
+#usr/local/share/man/man3/xdr_short.3
+#usr/local/share/man/man3/xdr_string.3
+#usr/local/share/man/man3/xdr_u_char.3
+#usr/local/share/man/man3/xdr_u_int.3
+#usr/local/share/man/man3/xdr_u_long.3
+#usr/local/share/man/man3/xdr_u_short.3
+#usr/local/share/man/man3/xdr_union.3
+#usr/local/share/man/man3/xdr_vector.3
+#usr/local/share/man/man3/xdr_void.3
+#usr/local/share/man/man3/xdr_wrapstring.3
+#usr/local/share/man/man3/xdrmem_create.3
+#usr/local/share/man/man3/xdrrec_create.3
+#usr/local/share/man/man3/xdrrec_endofrecord.3
+#usr/local/share/man/man3/xdrrec_eof.3
+#usr/local/share/man/man3/xdrrec_skiprecord.3
+#usr/local/share/man/man3/xdrstdio_create.3
+#usr/local/share/man/man3/xencrypt.3
+#usr/local/share/man/man3/xprt_register.3
+#usr/local/share/man/man3/xprt_unregister.3
+#usr/local/share/man/man3/y0.3
+#usr/local/share/man/man3/y0f.3
+#usr/local/share/man/man3/y0l.3
+#usr/local/share/man/man3/y1.3
+#usr/local/share/man/man3/y1f.3
+#usr/local/share/man/man3/y1l.3
+#usr/local/share/man/man3/yn.3
+#usr/local/share/man/man3/ynf.3
+#usr/local/share/man/man3/ynl.3
+#usr/local/share/man/man4/cciss.4
+#usr/local/share/man/man4/console_codes.4
+#usr/local/share/man/man4/console_ioctl.4
+#usr/local/share/man/man4/cpuid.4
+#usr/local/share/man/man4/dsp56k.4
+#usr/local/share/man/man4/fd.4
+#usr/local/share/man/man4/full.4
+#usr/local/share/man/man4/fuse.4
+#usr/local/share/man/man4/hd.4
+#usr/local/share/man/man4/hpsa.4
+#usr/local/share/man/man4/initrd.4
+#usr/local/share/man/man4/intro.4
+#usr/local/share/man/man4/kmem.4
+#usr/local/share/man/man4/lirc.4
+#usr/local/share/man/man4/loop-control.4
+#usr/local/share/man/man4/loop.4
+#usr/local/share/man/man4/lp.4
+#usr/local/share/man/man4/mem.4
+#usr/local/share/man/man4/mouse.4
+#usr/local/share/man/man4/msr.4
+#usr/local/share/man/man4/null.4
+#usr/local/share/man/man4/port.4
+#usr/local/share/man/man4/ptmx.4
+#usr/local/share/man/man4/pts.4
+#usr/local/share/man/man4/ram.4
+#usr/local/share/man/man4/random.4
+#usr/local/share/man/man4/rtc.4
+#usr/local/share/man/man4/sd.4
+#usr/local/share/man/man4/sk98lin.4
+#usr/local/share/man/man4/smartpqi.4
+#usr/local/share/man/man4/st.4
+#usr/local/share/man/man4/tty.4
+#usr/local/share/man/man4/ttyS.4
+#usr/local/share/man/man4/tty_ioctl.4
+#usr/local/share/man/man4/urandom.4
+#usr/local/share/man/man4/vcs.4
+#usr/local/share/man/man4/vcsa.4
+#usr/local/share/man/man4/veth.4
+#usr/local/share/man/man4/wavelan.4
+#usr/local/share/man/man4/zero.4
+#usr/local/share/man/man5/acct.5
+#usr/local/share/man/man5/charmap.5
+#usr/local/share/man/man5/core.5
+#usr/local/share/man/man5/dir_colors.5
+#usr/local/share/man/man5/elf.5
+#usr/local/share/man/man5/filesystems.5
+#usr/local/share/man/man5/fs.5
+#usr/local/share/man/man5/ftpusers.5
+#usr/local/share/man/man5/gai.conf.5
+#usr/local/share/man/man5/group.5
+#usr/local/share/man/man5/host.conf.5
+#usr/local/share/man/man5/hosts.5
+#usr/local/share/man/man5/hosts.equiv.5
+#usr/local/share/man/man5/intro.5
+#usr/local/share/man/man5/issue.5
+#usr/local/share/man/man5/locale.5
+#usr/local/share/man/man5/motd.5
+#usr/local/share/man/man5/networks.5
+#usr/local/share/man/man5/nologin.5
+#usr/local/share/man/man5/nscd.conf.5
+#usr/local/share/man/man5/nss.5
+#usr/local/share/man/man5/nsswitch.conf.5
+#usr/local/share/man/man5/passwd.5
+#usr/local/share/man/man5/proc.5
+#usr/local/share/man/man5/procfs.5
+#usr/local/share/man/man5/protocols.5
+#usr/local/share/man/man5/repertoiremap.5
+#usr/local/share/man/man5/resolv.conf.5
+#usr/local/share/man/man5/resolver.5
+#usr/local/share/man/man5/rpc.5
+#usr/local/share/man/man5/securetty.5
+#usr/local/share/man/man5/services.5
+#usr/local/share/man/man5/shells.5
+#usr/local/share/man/man5/slabinfo.5
+#usr/local/share/man/man5/sysfs.5
+#usr/local/share/man/man5/termcap.5
+#usr/local/share/man/man5/tmpfs.5
+#usr/local/share/man/man5/ttytype.5
+#usr/local/share/man/man5/tzfile.5
+#usr/local/share/man/man5/utmp.5
+#usr/local/share/man/man5/utmpx.5
+#usr/local/share/man/man5/wtmp.5
+#usr/local/share/man/man6/intro.6
+#usr/local/share/man/man7/address_families.7
+#usr/local/share/man/man7/aio.7
+#usr/local/share/man/man7/armscii-8.7
+#usr/local/share/man/man7/arp.7
+#usr/local/share/man/man7/ascii.7
+#usr/local/share/man/man7/attributes.7
+#usr/local/share/man/man7/boot.7
+#usr/local/share/man/man7/bootparam.7
+#usr/local/share/man/man7/bpf-helpers.7
+#usr/local/share/man/man7/capabilities.7
+#usr/local/share/man/man7/cgroup_namespaces.7
+#usr/local/share/man/man7/cgroups.7
+#usr/local/share/man/man7/charsets.7
+#usr/local/share/man/man7/complex.7
+#usr/local/share/man/man7/cp1251.7
+#usr/local/share/man/man7/cp1252.7
+#usr/local/share/man/man7/cpuset.7
+#usr/local/share/man/man7/credentials.7
+#usr/local/share/man/man7/ddp.7
+#usr/local/share/man/man7/environ.7
+#usr/local/share/man/man7/epoll.7
+#usr/local/share/man/man7/fanotify.7
+#usr/local/share/man/man7/feature_test_macros.7
+#usr/local/share/man/man7/fifo.7
+#usr/local/share/man/man7/futex.7
+#usr/local/share/man/man7/glibc.7
+#usr/local/share/man/man7/glob.7
+#usr/local/share/man/man7/hier.7
+#usr/local/share/man/man7/hostname.7
+#usr/local/share/man/man7/icmp.7
+#usr/local/share/man/man7/inode.7
+#usr/local/share/man/man7/inotify.7
+#usr/local/share/man/man7/intro.7
+#usr/local/share/man/man7/ip.7
+#usr/local/share/man/man7/ipc_namespaces.7
+#usr/local/share/man/man7/ipv6.7
+#usr/local/share/man/man7/iso-8859-1.7
+#usr/local/share/man/man7/iso-8859-10.7
+#usr/local/share/man/man7/iso-8859-11.7
+#usr/local/share/man/man7/iso-8859-13.7
+#usr/local/share/man/man7/iso-8859-14.7
+#usr/local/share/man/man7/iso-8859-15.7
+#usr/local/share/man/man7/iso-8859-16.7
+#usr/local/share/man/man7/iso-8859-2.7
+#usr/local/share/man/man7/iso-8859-3.7
+#usr/local/share/man/man7/iso-8859-4.7
+#usr/local/share/man/man7/iso-8859-5.7
+#usr/local/share/man/man7/iso-8859-6.7
+#usr/local/share/man/man7/iso-8859-7.7
+#usr/local/share/man/man7/iso-8859-8.7
+#usr/local/share/man/man7/iso-8859-9.7
+#usr/local/share/man/man7/iso_8859-1.7
+#usr/local/share/man/man7/iso_8859-10.7
+#usr/local/share/man/man7/iso_8859-11.7
+#usr/local/share/man/man7/iso_8859-13.7
+#usr/local/share/man/man7/iso_8859-14.7
+#usr/local/share/man/man7/iso_8859-15.7
+#usr/local/share/man/man7/iso_8859-16.7
+#usr/local/share/man/man7/iso_8859-2.7
+#usr/local/share/man/man7/iso_8859-3.7
+#usr/local/share/man/man7/iso_8859-4.7
+#usr/local/share/man/man7/iso_8859-5.7
+#usr/local/share/man/man7/iso_8859-6.7
+#usr/local/share/man/man7/iso_8859-7.7
+#usr/local/share/man/man7/iso_8859-8.7
+#usr/local/share/man/man7/iso_8859-9.7
+#usr/local/share/man/man7/iso_8859_1.7
+#usr/local/share/man/man7/iso_8859_10.7
+#usr/local/share/man/man7/iso_8859_11.7
+#usr/local/share/man/man7/iso_8859_13.7
+#usr/local/share/man/man7/iso_8859_14.7
+#usr/local/share/man/man7/iso_8859_15.7
+#usr/local/share/man/man7/iso_8859_16.7
+#usr/local/share/man/man7/iso_8859_2.7
+#usr/local/share/man/man7/iso_8859_3.7
+#usr/local/share/man/man7/iso_8859_4.7
+#usr/local/share/man/man7/iso_8859_5.7
+#usr/local/share/man/man7/iso_8859_6.7
+#usr/local/share/man/man7/iso_8859_7.7
+#usr/local/share/man/man7/iso_8859_8.7
+#usr/local/share/man/man7/iso_8859_9.7
+#usr/local/share/man/man7/kernel_lockdown.7
+#usr/local/share/man/man7/keyrings.7
+#usr/local/share/man/man7/koi8-r.7
+#usr/local/share/man/man7/koi8-u.7
+#usr/local/share/man/man7/latin1.7
+#usr/local/share/man/man7/latin10.7
+#usr/local/share/man/man7/latin2.7
+#usr/local/share/man/man7/latin3.7
+#usr/local/share/man/man7/latin4.7
+#usr/local/share/man/man7/latin5.7
+#usr/local/share/man/man7/latin6.7
+#usr/local/share/man/man7/latin7.7
+#usr/local/share/man/man7/latin8.7
+#usr/local/share/man/man7/latin9.7
+#usr/local/share/man/man7/libc.7
+#usr/local/share/man/man7/locale.7
+#usr/local/share/man/man7/mailaddr.7
+#usr/local/share/man/man7/man-pages.7
+#usr/local/share/man/man7/man.7
+#usr/local/share/man/man7/math_error.7
+#usr/local/share/man/man7/mount_namespaces.7
+#usr/local/share/man/man7/mq_overview.7
+#usr/local/share/man/man7/namespaces.7
+#usr/local/share/man/man7/netdevice.7
+#usr/local/share/man/man7/netlink.7
+#usr/local/share/man/man7/network_namespaces.7
+#usr/local/share/man/man7/nptl.7
+#usr/local/share/man/man7/numa.7
+#usr/local/share/man/man7/operator.7
+#usr/local/share/man/man7/packet.7
+#usr/local/share/man/man7/path_resolution.7
+#usr/local/share/man/man7/persistent-keyring.7
+#usr/local/share/man/man7/pid_namespaces.7
+#usr/local/share/man/man7/pipe.7
+#usr/local/share/man/man7/pkeys.7
+#usr/local/share/man/man7/posixoptions.7
+#usr/local/share/man/man7/precedence.7
+#usr/local/share/man/man7/process-keyring.7
+#usr/local/share/man/man7/pthreads.7
+#usr/local/share/man/man7/pty.7
+#usr/local/share/man/man7/queue.7
+#usr/local/share/man/man7/random.7
+#usr/local/share/man/man7/raw.7
+#usr/local/share/man/man7/regex.7
+#usr/local/share/man/man7/rtld-audit.7
+#usr/local/share/man/man7/rtnetlink.7
+#usr/local/share/man/man7/sched.7
+#usr/local/share/man/man7/sem_overview.7
+#usr/local/share/man/man7/session-keyring.7
+#usr/local/share/man/man7/shm_overview.7
+#usr/local/share/man/man7/sigevent.7
+#usr/local/share/man/man7/signal-safety.7
+#usr/local/share/man/man7/signal.7
+#usr/local/share/man/man7/sock_diag.7
+#usr/local/share/man/man7/socket.7
+#usr/local/share/man/man7/spufs.7
+#usr/local/share/man/man7/standards.7
+#usr/local/share/man/man7/suffixes.7
+#usr/local/share/man/man7/svipc.7
+#usr/local/share/man/man7/symlink.7
+#usr/local/share/man/man7/system_data_types.7
+#usr/local/share/man/man7/sysvipc.7
+#usr/local/share/man/man7/tcp.7
+#usr/local/share/man/man7/termio.7
+#usr/local/share/man/man7/thread-keyring.7
+#usr/local/share/man/man7/time.7
+#usr/local/share/man/man7/time_namespaces.7
+#usr/local/share/man/man7/tis-620.7
+#usr/local/share/man/man7/udp.7
+#usr/local/share/man/man7/udplite.7
+#usr/local/share/man/man7/unicode.7
+#usr/local/share/man/man7/units.7
+#usr/local/share/man/man7/unix.7
+#usr/local/share/man/man7/uri.7
+#usr/local/share/man/man7/url.7
+#usr/local/share/man/man7/urn.7
+#usr/local/share/man/man7/user-keyring.7
+#usr/local/share/man/man7/user-session-keyring.7
+#usr/local/share/man/man7/user_namespaces.7
+#usr/local/share/man/man7/utf-8.7
+#usr/local/share/man/man7/utf8.7
+#usr/local/share/man/man7/uts_namespaces.7
+#usr/local/share/man/man7/vdso.7
+#usr/local/share/man/man7/vsock.7
+#usr/local/share/man/man7/x25.7
+#usr/local/share/man/man7/xattr.7
+#usr/local/share/man/man8/iconvconfig.8
+#usr/local/share/man/man8/intro.8
+#usr/local/share/man/man8/ld-linux.8
+#usr/local/share/man/man8/ld-linux.so.8
+#usr/local/share/man/man8/ld.so.8
+#usr/local/share/man/man8/ldconfig.8
+#usr/local/share/man/man8/nscd.8
+#usr/local/share/man/man8/sln.8
+#usr/local/share/man/man8/tzselect.8
+#usr/local/share/man/man8/zdump.8
+#usr/local/share/man/man8/zic.8
diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson
index 69d645bb7..0dc77629b 100644
--- a/config/rootfiles/common/meson
+++ b/config/rootfiles/common/meson
@@ -1,11 +1,11 @@
 #usr/bin/meson
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/meson-0.60.1-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/meson-0.62.1-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/mesonbuild
 #usr/lib/python3.10/site-packages/mesonbuild/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/_pathlib.py
@@ -28,18 +28,22 @@
 #usr/lib/python3.10/site-packages/mesonbuild/backend/vs2015backend.py
 #usr/lib/python3.10/site-packages/mesonbuild/backend/vs2017backend.py
 #usr/lib/python3.10/site-packages/mesonbuild/backend/vs2019backend.py
+#usr/lib/python3.10/site-packages/mesonbuild/backend/vs2022backend.py
 #usr/lib/python3.10/site-packages/mesonbuild/backend/xcodebackend.py
 #usr/lib/python3.10/site-packages/mesonbuild/build.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/__init__.py
-#usr/lib/python3.10/site-packages/mesonbuild/cmake/client.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/common.py
+#usr/lib/python3.10/site-packages/mesonbuild/cmake/data
+#usr/lib/python3.10/site-packages/mesonbuild/cmake/data/__init__.py
+#usr/lib/python3.10/site-packages/mesonbuild/cmake/data/preload.cmake
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/executor.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/fileapi.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/generator.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/interpreter.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/toolchain.py
 #usr/lib/python3.10/site-packages/mesonbuild/cmake/traceparser.py
+#usr/lib/python3.10/site-packages/mesonbuild/cmake/tracetargets.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/c.py
@@ -56,7 +60,6 @@
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/arm.py
-#usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/c2000.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/ccrx.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/clang.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/clike.py
@@ -67,6 +70,7 @@
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/intel.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/islinker.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/pgi.py
+#usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/ti.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/visualstudio.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/xc16.py
 #usr/lib/python3.10/site-packages/mesonbuild/compilers/objc.py
@@ -83,6 +87,11 @@
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/coarrays.py
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/configtool.py
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/cuda.py
+#usr/lib/python3.10/site-packages/mesonbuild/dependencies/data
+#usr/lib/python3.10/site-packages/mesonbuild/dependencies/data/CMakeLists.txt
+#usr/lib/python3.10/site-packages/mesonbuild/dependencies/data/CMakeListsLLVM.txt
+#usr/lib/python3.10/site-packages/mesonbuild/dependencies/data/CMakePathInfo.txt
+#usr/lib/python3.10/site-packages/mesonbuild/dependencies/data/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/detect.py
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/dev.py
 #usr/lib/python3.10/site-packages/mesonbuild/dependencies/dub.py
@@ -165,13 +174,13 @@
 #usr/lib/python3.10/site-packages/mesonbuild/modules/qt4.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/qt5.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/qt6.py
-#usr/lib/python3.10/site-packages/mesonbuild/modules/rpm.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/sourceset.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_cuda.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_external_project.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_icestorm.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_rust.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_simd.py
+#usr/lib/python3.10/site-packages/mesonbuild/modules/unstable_wayland.py
 #usr/lib/python3.10/site-packages/mesonbuild/modules/windows.py
 #usr/lib/python3.10/site-packages/mesonbuild/mparser.py
 #usr/lib/python3.10/site-packages/mesonbuild/msetup.py
@@ -188,24 +197,27 @@
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/cleantrees.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/cmake_run_ctgt.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/cmd_or_ps.ps1
+#usr/lib/python3.10/site-packages/mesonbuild/scripts/copy.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/coverage.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/delwithsuffix.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/depfixer.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/depscan.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/dirchanger.py
+#usr/lib/python3.10/site-packages/mesonbuild/scripts/env2mfile.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/externalproject.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/gettext.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/gtkdochelper.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/hotdochelper.py
+#usr/lib/python3.10/site-packages/mesonbuild/scripts/itstool.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/meson_exe.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/msgfmthelper.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/regen_checker.py
+#usr/lib/python3.10/site-packages/mesonbuild/scripts/run_tool.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/scanbuild.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/symbolextractor.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/tags.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/uninstall.py
 #usr/lib/python3.10/site-packages/mesonbuild/scripts/vcstagger.py
-#usr/lib/python3.10/site-packages/mesonbuild/scripts/yelphelper.py
 #usr/lib/python3.10/site-packages/mesonbuild/templates
 #usr/lib/python3.10/site-packages/mesonbuild/templates/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/templates/cpptemplates.py
@@ -221,6 +233,7 @@
 #usr/lib/python3.10/site-packages/mesonbuild/templates/rusttemplates.py
 #usr/lib/python3.10/site-packages/mesonbuild/templates/samplefactory.py
 #usr/lib/python3.10/site-packages/mesonbuild/templates/sampleimpl.py
+#usr/lib/python3.10/site-packages/mesonbuild/templates/valatemplates.py
 #usr/lib/python3.10/site-packages/mesonbuild/wrap
 #usr/lib/python3.10/site-packages/mesonbuild/wrap/__init__.py
 #usr/lib/python3.10/site-packages/mesonbuild/wrap/wrap.py
diff --git a/config/rootfiles/common/multipath-tools b/config/rootfiles/common/multipath-tools
index aa3f9d138..1f87feb0d 100644
--- a/config/rootfiles/common/multipath-tools
+++ b/config/rootfiles/common/multipath-tools
@@ -1,4 +1,8 @@
 #sbin/kpartx
+#usr/lib/udev
+#usr/lib/udev/kpartx_id
+#usr/lib/udev/rules.d
 #usr/lib/udev/rules.d/11-dm-parts.rules
+#usr/lib/udev/rules.d/66-kpartx.rules
 #usr/lib/udev/rules.d/68-del-part-nodes.rules
-#usr/share/man/man8/kpartx.8.gz
+#usr/share/man/man8/kpartx.8
diff --git a/config/rootfiles/common/oinkmaster b/config/rootfiles/common/oinkmaster
deleted file mode 100644
index 2557353fa..000000000
--- a/config/rootfiles/common/oinkmaster
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/local/bin/oinkmaster.pl
-var/ipfire/suricata/oinkmaster.conf
diff --git a/config/rootfiles/common/openjpeg b/config/rootfiles/common/openjpeg
index bafa62afc..3540d2297 100644
--- a/config/rootfiles/common/openjpeg
+++ b/config/rootfiles/common/openjpeg
@@ -1,15 +1,15 @@
 usr/bin/opj_compress
 usr/bin/opj_decompress
 usr/bin/opj_dump
-#usr/include/openjpeg-2.3
-#usr/include/openjpeg-2.3/openjpeg.h
-#usr/include/openjpeg-2.3/opj_config.h
-#usr/include/openjpeg-2.3/opj_stdint.h
+#usr/include/openjpeg-2.4
+#usr/include/openjpeg-2.4/openjpeg.h
+#usr/include/openjpeg-2.4/opj_config.h
+#usr/include/openjpeg-2.4/opj_stdint.h
 #usr/lib/libopenjp2.so
-usr/lib/libopenjp2.so.2.3.1
+usr/lib/libopenjp2.so.2.4.0
 usr/lib/libopenjp2.so.7
-#usr/lib/openjpeg-2.3
-#usr/lib/openjpeg-2.3/OpenJPEGConfig.cmake
-#usr/lib/openjpeg-2.3/OpenJPEGTargets-release.cmake
-#usr/lib/openjpeg-2.3/OpenJPEGTargets.cmake
+#usr/lib/openjpeg-2.4
+#usr/lib/openjpeg-2.4/OpenJPEGConfig.cmake
+#usr/lib/openjpeg-2.4/OpenJPEGTargets-release.cmake
+#usr/lib/openjpeg-2.4/OpenJPEGTargets.cmake
 #usr/lib/pkgconfig/libopenjp2.pc
diff --git a/config/rootfiles/common/openldap b/config/rootfiles/common/openldap
index 8d42b8880..45e731ee4 100644
--- a/config/rootfiles/common/openldap
+++ b/config/rootfiles/common/openldap
@@ -10,6 +10,7 @@
 #usr/bin/ldappasswd
 #usr/bin/ldapsearch
 #usr/bin/ldapurl
+#usr/bin/ldapvc
 #usr/bin/ldapwhoami
 #usr/include/lber.h
 #usr/include/lber_types.h
@@ -21,18 +22,16 @@
 #usr/include/ldif.h
 #usr/include/openldap.h
 #usr/include/slapi-plugin.h
-usr/lib/liblber-2.4.so.2
-usr/lib/liblber-2.4.so.2.10.12
 #usr/lib/liblber.la
 #usr/lib/liblber.so
-usr/lib/libldap-2.4.so.2
-usr/lib/libldap-2.4.so.2.10.12
+usr/lib/liblber.so.2
+usr/lib/liblber.so.2.0.200
 #usr/lib/libldap.la
 #usr/lib/libldap.so
-usr/lib/libldap_r-2.4.so.2
-usr/lib/libldap_r-2.4.so.2.10.12
-#usr/lib/libldap_r.la
-#usr/lib/libldap_r.so
+usr/lib/libldap.so.2
+usr/lib/libldap.so.2.0.200
+#usr/lib/pkgconfig/lber.pc
+#usr/lib/pkgconfig/ldap.pc
 #usr/share/man/man1/ldapadd.1
 #usr/share/man/man1/ldapcompare.1
 #usr/share/man/man1/ldapdelete.1
@@ -42,6 +41,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man1/ldappasswd.1
 #usr/share/man/man1/ldapsearch.1
 #usr/share/man/man1/ldapurl.1
+#usr/share/man/man1/ldapvc.1
 #usr/share/man/man1/ldapwhoami.1
 #usr/share/man/man3/ber_alloc_t.3
 #usr/share/man/man3/ber_bvarray_add.3
@@ -136,6 +136,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man3/ldap_first_message.3
 #usr/share/man/man3/ldap_first_reference.3
 #usr/share/man/man3/ldap_free_urldesc.3
+#usr/share/man/man3/ldap_get_attribute_ber.3
 #usr/share/man/man3/ldap_get_dn.3
 #usr/share/man/man3/ldap_get_option.3
 #usr/share/man/man3/ldap_get_values.3
@@ -175,6 +176,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man3/ldap_objectclass_free.3
 #usr/share/man/man3/ldap_open.3
 #usr/share/man/man3/ldap_parse_extended_result.3
+#usr/share/man/man3/ldap_parse_intermediate.3
 #usr/share/man/man3/ldap_parse_reference.3
 #usr/share/man/man3/ldap_parse_result.3
 #usr/share/man/man3/ldap_parse_sasl_bind_result.3
@@ -227,23 +229,22 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man3/ldap_value_free_len.3
 #usr/share/man/man5/ldap.conf.5
 #usr/share/man/man5/ldif.5
-#usr/share/man/man5/slapd-bdb.5
+#usr/share/man/man5/lloadd.conf.5
+#usr/share/man/man5/slapd-asyncmeta.5
 #usr/share/man/man5/slapd-config.5
 #usr/share/man/man5/slapd-dnssrv.5
-#usr/share/man/man5/slapd-hdb.5
 #usr/share/man/man5/slapd-ldap.5
 #usr/share/man/man5/slapd-ldif.5
 #usr/share/man/man5/slapd-mdb.5
 #usr/share/man/man5/slapd-meta.5
 #usr/share/man/man5/slapd-monitor.5
-#usr/share/man/man5/slapd-ndb.5
 #usr/share/man/man5/slapd-null.5
 #usr/share/man/man5/slapd-passwd.5
 #usr/share/man/man5/slapd-perl.5
 #usr/share/man/man5/slapd-relay.5
-#usr/share/man/man5/slapd-shell.5
 #usr/share/man/man5/slapd-sock.5
 #usr/share/man/man5/slapd-sql.5
+#usr/share/man/man5/slapd-wt.5
 #usr/share/man/man5/slapd.access.5
 #usr/share/man/man5/slapd.backends.5
 #usr/share/man/man5/slapd.conf.5
@@ -251,17 +252,22 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man5/slapd.plugin.5
 #usr/share/man/man5/slapo-accesslog.5
 #usr/share/man/man5/slapo-auditlog.5
+#usr/share/man/man5/slapo-autoca.5
 #usr/share/man/man5/slapo-chain.5
 #usr/share/man/man5/slapo-collect.5
 #usr/share/man/man5/slapo-constraint.5
 #usr/share/man/man5/slapo-dds.5
+#usr/share/man/man5/slapo-deref.5
 #usr/share/man/man5/slapo-dyngroup.5
 #usr/share/man/man5/slapo-dynlist.5
+#usr/share/man/man5/slapo-homedir.5
 #usr/share/man/man5/slapo-memberof.5
+#usr/share/man/man5/slapo-otp.5
 #usr/share/man/man5/slapo-pbind.5
 #usr/share/man/man5/slapo-pcache.5
 #usr/share/man/man5/slapo-ppolicy.5
 #usr/share/man/man5/slapo-refint.5
+#usr/share/man/man5/slapo-remoteauth.5
 #usr/share/man/man5/slapo-retcode.5
 #usr/share/man/man5/slapo-rwm.5
 #usr/share/man/man5/slapo-sock.5
@@ -270,6 +276,8 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man5/slapo-translucent.5
 #usr/share/man/man5/slapo-unique.5
 #usr/share/man/man5/slapo-valsort.5
+#usr/share/man/man5/slappw-argon2.5
+#usr/share/man/man8/lloadd.8
 #usr/share/man/man8/slapacl.8
 #usr/share/man/man8/slapadd.8
 #usr/share/man/man8/slapauth.8
@@ -277,6 +285,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
 #usr/share/man/man8/slapd.8
 #usr/share/man/man8/slapdn.8
 #usr/share/man/man8/slapindex.8
+#usr/share/man/man8/slapmodify.8
 #usr/share/man/man8/slappasswd.8
 #usr/share/man/man8/slapschema.8
 #usr/share/man/man8/slaptest.8
diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango
index c009e6210..fe3164613 100644
--- a/config/rootfiles/common/pango
+++ b/config/rootfiles/common/pango
@@ -41,13 +41,13 @@ usr/bin/pango-view
 #usr/include/pango-1.0/pango/pangoft2.h
 #usr/lib/libpango-1.0.so
 usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.5000.4
+usr/lib/libpango-1.0.so.0.5000.6
 #usr/lib/libpangocairo-1.0.so
 usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.5000.4
+#usr/lib/libpangocairo-1.0.so.0.5000.6
 #usr/lib/libpangoft2-1.0.so
 usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.5000.4
+#usr/lib/libpangoft2-1.0.so.0.5000.6
 #usr/lib/pkgconfig/pango.pc
 #usr/lib/pkgconfig/pangocairo.pc
 #usr/lib/pkgconfig/pangofc.pc
diff --git a/config/rootfiles/common/parted b/config/rootfiles/common/parted
index 0dab6ae3b..d88a506c5 100644
--- a/config/rootfiles/common/parted
+++ b/config/rootfiles/common/parted
@@ -14,12 +14,12 @@
 #usr/lib/libparted-fs-resize.la
 #usr/lib/libparted-fs-resize.so
 usr/lib/libparted-fs-resize.so.0
-usr/lib/libparted-fs-resize.so.0.0.3
+usr/lib/libparted-fs-resize.so.0.0.4
 #usr/lib/libparted.a
 #usr/lib/libparted.la
 #usr/lib/libparted.so
 usr/lib/libparted.so.2
-usr/lib/libparted.so.2.0.3
+usr/lib/libparted.so.2.0.4
 #usr/lib/pkgconfig/libparted-fs-resize.pc
 #usr/lib/pkgconfig/libparted.pc
 usr/sbin/parted
diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils
index 17a3ede66..6d5cc55a4 100644
--- a/config/rootfiles/common/pciutils
+++ b/config/rootfiles/common/pciutils
@@ -1,7 +1,7 @@
 bin/lspci
 bin/setpci
 lib/libpci.so.3
-lib/libpci.so.3.7.0
+lib/libpci.so.3.8.0
 sbin/update-pciids
 #usr/include/pci
 #usr/include/pci/config.h
diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2
index 9d3e33496..716f23661 100644
--- a/config/rootfiles/common/pcre2
+++ b/config/rootfiles/common/pcre2
@@ -6,132 +6,132 @@
 #usr/lib/libpcre2-16.la
 #usr/lib/libpcre2-16.so
 usr/lib/libpcre2-16.so.0
-usr/lib/libpcre2-16.so.0.10.4
+usr/lib/libpcre2-16.so.0.11.0
 #usr/lib/libpcre2-32.la
 #usr/lib/libpcre2-32.so
 usr/lib/libpcre2-32.so.0
-usr/lib/libpcre2-32.so.0.10.4
+usr/lib/libpcre2-32.so.0.11.0
 #usr/lib/libpcre2-8.la
 #usr/lib/libpcre2-8.so
 usr/lib/libpcre2-8.so.0
-usr/lib/libpcre2-8.so.0.10.4
+usr/lib/libpcre2-8.so.0.11.0
 #usr/lib/libpcre2-posix.la
 #usr/lib/libpcre2-posix.so
 usr/lib/libpcre2-posix.so.3
-usr/lib/libpcre2-posix.so.3.0.1
+usr/lib/libpcre2-posix.so.3.0.2
 #usr/lib/pkgconfig/libpcre2-16.pc
 #usr/lib/pkgconfig/libpcre2-32.pc
 #usr/lib/pkgconfig/libpcre2-8.pc
 #usr/lib/pkgconfig/libpcre2-posix.pc
-#usr/share/doc/pcre-pcre2-10.39
-#usr/share/doc/pcre-pcre2-10.39/AUTHORS
-#usr/share/doc/pcre-pcre2-10.39/COPYING
-#usr/share/doc/pcre-pcre2-10.39/ChangeLog
-#usr/share/doc/pcre-pcre2-10.39/LICENCE
-#usr/share/doc/pcre-pcre2-10.39/NEWS
-#usr/share/doc/pcre-pcre2-10.39/README
-#usr/share/doc/pcre-pcre2-10.39/html
-#usr/share/doc/pcre-pcre2-10.39/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre-pcre2-10.39/html/README.txt
-#usr/share/doc/pcre-pcre2-10.39/html/index.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2-config.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_callout_enumerate.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_code_copy.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_code_copy_with_tables.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_code_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_compile.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_compile_context_copy.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_compile_context_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_compile_context_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_config.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_convert_context_copy.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_convert_context_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_convert_context_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_converted_pattern_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_dfa_match.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_general_context_copy.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_general_context_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_general_context_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_error_message.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_mark.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_match_data_size.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_ovector_count.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_ovector_pointer.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_get_startchar.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_compile.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_free_unused_memory.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_match.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_stack_assign.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_stack_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_jit_stack_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_maketables.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_maketables_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_context_copy.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_context_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_context_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_data_create.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_data_create_from_pattern.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_match_data_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_pattern_convert.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_pattern_info.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_serialize_decode.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_serialize_encode.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_serialize_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_serialize_get_number_of_codes.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_bsr.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_callout.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_character_tables.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_compile_extra_options.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_compile_recursion_guard.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_depth_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_glob_escape.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_glob_separator.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_heap_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_match_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_max_pattern_length.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_newline.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_offset_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_parens_nest_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_recursion_limit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_recursion_memory_management.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_set_substitute_callout.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substitute.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_copy_byname.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_copy_bynumber.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_get_byname.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_get_bynumber.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_length_byname.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_length_bynumber.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_list_free.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_list_get.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_nametable_scan.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2_substring_number_from_name.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2api.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2build.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2callout.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2compat.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2convert.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2demo.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2grep.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2jit.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2limits.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2matching.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2partial.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2pattern.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2perform.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2posix.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2sample.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2serialize.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2syntax.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2test.html
-#usr/share/doc/pcre-pcre2-10.39/html/pcre2unicode.html
-#usr/share/doc/pcre-pcre2-10.39/pcre2-config.txt
-#usr/share/doc/pcre-pcre2-10.39/pcre2.txt
-#usr/share/doc/pcre-pcre2-10.39/pcre2grep.txt
-#usr/share/doc/pcre-pcre2-10.39/pcre2test.txt
+#usr/share/doc/pcre-pcre2-10.40
+#usr/share/doc/pcre-pcre2-10.40/AUTHORS
+#usr/share/doc/pcre-pcre2-10.40/COPYING
+#usr/share/doc/pcre-pcre2-10.40/ChangeLog
+#usr/share/doc/pcre-pcre2-10.40/LICENCE
+#usr/share/doc/pcre-pcre2-10.40/NEWS
+#usr/share/doc/pcre-pcre2-10.40/README
+#usr/share/doc/pcre-pcre2-10.40/html
+#usr/share/doc/pcre-pcre2-10.40/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre2-10.40/html/README.txt
+#usr/share/doc/pcre-pcre2-10.40/html/index.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2-config.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_callout_enumerate.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy_with_tables.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_copy.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_config.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_copy.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_converted_pattern_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_dfa_match.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_copy.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_error_message.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_mark.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_match_data_size.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_count.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_pointer.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_startchar.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_compile.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_free_unused_memory.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_match.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_assign.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_copy.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create_from_pattern.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_convert.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_info.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_decode.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_encode.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_get_number_of_codes.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_bsr.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_callout.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_character_tables.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_extra_options.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_recursion_guard.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_depth_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_escape.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_separator.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_heap_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_match_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_max_pattern_length.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_newline.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_offset_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_parens_nest_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_limit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_memory_management.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_substitute_callout.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substitute.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_byname.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_bynumber.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_byname.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_bynumber.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_byname.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_bynumber.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_free.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_get.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_nametable_scan.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_number_from_name.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2api.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2build.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2callout.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2compat.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2convert.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2demo.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2grep.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2jit.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2limits.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2matching.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2partial.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2pattern.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2perform.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2posix.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2sample.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2serialize.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2syntax.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2test.html
+#usr/share/doc/pcre-pcre2-10.40/html/pcre2unicode.html
+#usr/share/doc/pcre-pcre2-10.40/pcre2-config.txt
+#usr/share/doc/pcre-pcre2-10.40/pcre2.txt
+#usr/share/doc/pcre-pcre2-10.40/pcre2grep.txt
+#usr/share/doc/pcre-pcre2-10.40/pcre2test.txt
 #usr/share/man/man1/pcre2-config.1
 #usr/share/man/man1/pcre2grep.1
 #usr/share/man/man1/pcre2test.1
diff --git a/config/rootfiles/common/pigz b/config/rootfiles/common/pigz
deleted file mode 100644
index 618d92464..000000000
--- a/config/rootfiles/common/pigz
+++ /dev/null
@@ -1,2 +0,0 @@
-#usr/bin/pigz
-#usr/bin/unpigz
diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
index 8bd35c272..0ea058043 100644
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -173,8 +173,8 @@ usr/lib/libpoppler-cpp.so.0.9.0
 usr/lib/libpoppler-glib.so.8
 usr/lib/libpoppler-glib.so.8.23.0
 #usr/lib/libpoppler.so
-usr/lib/libpoppler.so.118
-usr/lib/libpoppler.so.118.0.0
+usr/lib/libpoppler.so.120
+#usr/lib/libpoppler.so.120.0.0
 #usr/lib/pkgconfig/poppler-cpp.pc
 #usr/lib/pkgconfig/poppler-glib.pc
 #usr/lib/pkgconfig/poppler.pc
diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps
index fc7d9326e..144af75d7 100644
--- a/config/rootfiles/common/procps
+++ b/config/rootfiles/common/procps
@@ -1,16 +1,16 @@
 bin/kill
 bin/ps
-#lib/libprocps.a
-#lib/libprocps.la
-#lib/libprocps.so
-lib/libprocps.so.8
-lib/libprocps.so.8.0.2
+#lib/libproc-2.la
+#lib/libproc-2.so
+lib/libproc-2.so.0
+lib/libproc-2.so.0.0.0
 #lib/pkgconfig
-#lib/pkgconfig/libprocps.pc
+#lib/pkgconfig/libproc-2.pc
 sbin/sysctl
 usr/bin/free
 usr/bin/pgrep
 usr/bin/pidof
+usr/bin/pidwait
 #usr/bin/pkill
 #usr/bin/pmap
 #usr/bin/pwdx
@@ -20,23 +20,19 @@ usr/bin/top
 usr/bin/vmstat
 usr/bin/w
 usr/bin/watch
-#usr/include/proc
-#usr/include/proc/alloc.h
-#usr/include/proc/devname.h
-#usr/include/proc/escape.h
-#usr/include/proc/numa.h
-#usr/include/proc/procps.h
-#usr/include/proc/pwcache.h
-#usr/include/proc/readproc.h
-#usr/include/proc/sig.h
-#usr/include/proc/slab.h
-#usr/include/proc/sysinfo.h
-#usr/include/proc/version.h
-#usr/include/proc/wchan.h
-#usr/include/proc/whattime.h
+#usr/include/procps
+#usr/include/procps/diskstats.h
+#usr/include/procps/meminfo.h
+#usr/include/procps/misc.h
+#usr/include/procps/pids.h
+#usr/include/procps/slabinfo.h
+#usr/include/procps/stat.h
+#usr/include/procps/vmstat.h
+#usr/include/procps/xtra-procps-debug.h
 #usr/share/doc/procps-ng
 #usr/share/doc/procps-ng/FAQ
 #usr/share/doc/procps-ng/bugs.md
+#usr/share/doc/procps-ng/libproc.supp
 #usr/share/locale/de/LC_MESSAGES/procps-ng.mo
 #usr/share/locale/fr/LC_MESSAGES/procps-ng.mo
 #usr/share/locale/pl/LC_MESSAGES/procps-ng.mo
@@ -49,9 +45,9 @@ usr/bin/watch
 #usr/share/man/man1/kill.1
 #usr/share/man/man1/pgrep.1
 #usr/share/man/man1/pidof.1
+#usr/share/man/man1/pidwait.1
 #usr/share/man/man1/pkill.1
 #usr/share/man/man1/pmap.1
-#usr/share/man/man1/procps.1
 #usr/share/man/man1/ps.1
 #usr/share/man/man1/pwdx.1
 #usr/share/man/man1/slabtop.1
@@ -59,9 +55,9 @@ usr/bin/watch
 #usr/share/man/man1/top.1
 #usr/share/man/man1/w.1
 #usr/share/man/man1/watch.1
-#usr/share/man/man3/openproc.3
-#usr/share/man/man3/readproc.3
-#usr/share/man/man3/readproctab.3
+#usr/share/man/man3/procps.3
+#usr/share/man/man3/procps_misc.3
+#usr/share/man/man3/procps_pids.3
 #usr/share/man/man5/sysctl.conf.5
 #usr/share/man/man8/sysctl.8
 #usr/share/man/man8/vmstat.8
diff --git a/config/rootfiles/common/python3-setuptools-rust b/config/rootfiles/common/python3-setuptools-rust
index cc21721c5..a35daef85 100644
--- a/config/rootfiles/common/python3-setuptools-rust
+++ b/config/rootfiles/common/python3-setuptools-rust
@@ -1,12 +1,12 @@
 usr/lib/python3.10/site-packages/setuptools_rust
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools_rust-1.1.2-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools_rust-1.2.0-py3.10.egg-info/zip-safe
 usr/lib/python3.10/site-packages/setuptools_rust/__init__.py
 usr/lib/python3.10/site-packages/setuptools_rust/build.py
 usr/lib/python3.10/site-packages/setuptools_rust/clean.py
diff --git a/config/rootfiles/common/python3-setuptools-scm b/config/rootfiles/common/python3-setuptools-scm
index 8f16d3e91..9c37580db 100644
--- a/config/rootfiles/common/python3-setuptools-scm
+++ b/config/rootfiles/common/python3-setuptools-scm
@@ -1,14 +1,17 @@
 #usr/lib/python3.10/site-packages/setuptools_scm
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools_scm-6.3.2-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools_scm-6.4.2-py3.10.egg-info/zip-safe
 #usr/lib/python3.10/site-packages/setuptools_scm/__init__.py
 #usr/lib/python3.10/site-packages/setuptools_scm/__main__.py
+usr/lib/python3.10/site-packages/setuptools_scm/_entrypoints.py
+usr/lib/python3.10/site-packages/setuptools_scm/_overrides.py
+usr/lib/python3.10/site-packages/setuptools_scm/_types.py
 #usr/lib/python3.10/site-packages/setuptools_scm/_version_cls.py
 #usr/lib/python3.10/site-packages/setuptools_scm/config.py
 #usr/lib/python3.10/site-packages/setuptools_scm/discover.py
diff --git a/config/rootfiles/common/python3-tomli b/config/rootfiles/common/python3-tomli
index 5c24ff0ea..30605a46a 100644
--- a/config/rootfiles/common/python3-tomli
+++ b/config/rootfiles/common/python3-tomli
@@ -1,9 +1,9 @@
 #usr/lib/python3.10/site-packages/tomli
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/tomli-2.0.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/tomli-2.0.1-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/tomli/__init__.py
 #usr/lib/python3.10/site-packages/tomli/_parser.py
 #usr/lib/python3.10/site-packages/tomli/_re.py
diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm
deleted file mode 100644
index 439c42965..000000000
--- a/config/rootfiles/common/sdparm
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/bin/sas_disk_blink
-#usr/bin/scsi_ch_swp
-usr/bin/sdparm
-#usr/share/man/man8/sas_disk_blink.8
-#usr/share/man/man8/scsi_ch_swp.8
-#usr/share/man/man8/sdparm.8
diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 7f9ff8156..043aba072 100644
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -1,6 +1,7 @@
 etc/suricata
 etc/suricata/suricata.yaml
 usr/bin/suricata
+usr/sbin/convert-ids-backend-files
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
 #usr/share/doc/suricata/Basic_Setup.txt
@@ -37,7 +38,8 @@ usr/share/suricata
 #usr/share/suricata/rules/smtp-events.rules
 #usr/share/suricata/rules/stream-events.rules
 #usr/share/suricata/rules/tls-events.rules
-var/ipfire/suricata/suricata-default-rules.yaml
+#usr/share/suricata/threshold.config
+var/cache/suricata
 var/lib/suricata
 var/log/suricata
 #var/log/suricata/certs
diff --git a/config/rootfiles/core/167/filelists/core-files b/config/rootfiles/core/168/core-files
similarity index 100%
rename from config/rootfiles/core/167/filelists/core-files
rename to config/rootfiles/core/168/core-files
diff --git a/config/rootfiles/core/167/exclude b/config/rootfiles/core/168/exclude
similarity index 100%
rename from config/rootfiles/core/167/exclude
rename to config/rootfiles/core/168/exclude
diff --git a/config/rootfiles/core/168/filelists/aarch64/efibootmgr b/config/rootfiles/core/168/filelists/aarch64/efibootmgr
new file mode 120000
index 000000000..55970e1dd
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/aarch64/efibootmgr
@@ -0,0 +1 @@
+../../../../common/aarch64/efibootmgr
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/backup b/config/rootfiles/core/168/filelists/backup
new file mode 120000
index 000000000..38e28a8b4
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/backup
@@ -0,0 +1 @@
+../../../common/backup
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/bind b/config/rootfiles/core/168/filelists/bind
similarity index 100%
rename from config/rootfiles/core/167/filelists/bind
rename to config/rootfiles/core/168/filelists/bind
diff --git a/config/rootfiles/core/167/filelists/curl b/config/rootfiles/core/168/filelists/curl
similarity index 100%
rename from config/rootfiles/core/167/filelists/curl
rename to config/rootfiles/core/168/filelists/curl
diff --git a/config/rootfiles/core/168/filelists/expat b/config/rootfiles/core/168/filelists/expat
new file mode 120000
index 000000000..e1923cf63
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/expat
@@ -0,0 +1 @@
+../../../common/expat
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files
new file mode 100644
index 000000000..159d43d86
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/files
@@ -0,0 +1,406 @@
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/red
+etc/sysctl.conf
+lib/firmware/amd/amd_sev_fam17h_model0xh.sbin
+lib/firmware/amd/amd_sev_fam17h_model3xh.sbin
+lib/firmware/amd/amd_sev_fam19h_model0xh.sbin
+lib/firmware/amdgpu/aldebaran_mec2.bin
+lib/firmware/amdgpu/aldebaran_mec.bin
+lib/firmware/amdgpu/aldebaran_rlc.bin
+lib/firmware/amdgpu/aldebaran_sdma.bin
+lib/firmware/amdgpu/aldebaran_smc.bin
+lib/firmware/amdgpu/aldebaran_sos.bin
+lib/firmware/amdgpu/aldebaran_ta.bin
+lib/firmware/amdgpu/aldebaran_vcn.bin
+lib/firmware/amdgpu/arcturus_sdma.bin
+lib/firmware/amdgpu/beige_goby_ce.bin
+lib/firmware/amdgpu/beige_goby_dmcub.bin
+lib/firmware/amdgpu/beige_goby_me.bin
+lib/firmware/amdgpu/beige_goby_mec2.bin
+lib/firmware/amdgpu/beige_goby_mec.bin
+lib/firmware/amdgpu/beige_goby_pfp.bin
+lib/firmware/amdgpu/beige_goby_rlc.bin
+lib/firmware/amdgpu/beige_goby_sdma.bin
+lib/firmware/amdgpu/beige_goby_smc.bin
+lib/firmware/amdgpu/beige_goby_sos.bin
+lib/firmware/amdgpu/beige_goby_ta.bin
+lib/firmware/amdgpu/beige_goby_vcn.bin
+lib/firmware/amdgpu/cyan_skillfish2_ce.bin
+lib/firmware/amdgpu/cyan_skillfish2_me.bin
+lib/firmware/amdgpu/cyan_skillfish2_mec2.bin
+lib/firmware/amdgpu/cyan_skillfish2_mec.bin
+lib/firmware/amdgpu/cyan_skillfish2_pfp.bin
+lib/firmware/amdgpu/dcn_3_1_6_dmcub.bin
+lib/firmware/amdgpu/dimgrey_cavefish_ce.bin
+lib/firmware/amdgpu/dimgrey_cavefish_dmcub.bin
+lib/firmware/amdgpu/dimgrey_cavefish_me.bin
+lib/firmware/amdgpu/dimgrey_cavefish_mec2.bin
+lib/firmware/amdgpu/dimgrey_cavefish_mec.bin
+lib/firmware/amdgpu/dimgrey_cavefish_pfp.bin
+lib/firmware/amdgpu/dimgrey_cavefish_rlc.bin
+lib/firmware/amdgpu/dimgrey_cavefish_sdma.bin
+lib/firmware/amdgpu/dimgrey_cavefish_smc.bin
+lib/firmware/amdgpu/dimgrey_cavefish_sos.bin
+lib/firmware/amdgpu/dimgrey_cavefish_ta.bin
+lib/firmware/amdgpu/dimgrey_cavefish_vcn.bin
+lib/firmware/amdgpu/gc_10_3_7_ce.bin
+lib/firmware/amdgpu/gc_10_3_7_me.bin
+lib/firmware/amdgpu/gc_10_3_7_mec2.bin
+lib/firmware/amdgpu/gc_10_3_7_mec.bin
+lib/firmware/amdgpu/gc_10_3_7_pfp.bin
+lib/firmware/amdgpu/gc_10_3_7_rlc.bin
+lib/firmware/amdgpu/green_sardine_asd.bin
+lib/firmware/amdgpu/green_sardine_ce.bin
+lib/firmware/amdgpu/green_sardine_dmcub.bin
+lib/firmware/amdgpu/green_sardine_me.bin
+lib/firmware/amdgpu/green_sardine_mec2.bin
+lib/firmware/amdgpu/green_sardine_mec.bin
+lib/firmware/amdgpu/green_sardine_pfp.bin
+lib/firmware/amdgpu/green_sardine_rlc.bin
+lib/firmware/amdgpu/green_sardine_ta.bin
+lib/firmware/amdgpu/green_sardine_vcn.bin
+lib/firmware/amdgpu/navi10_asd.bin
+lib/firmware/amdgpu/navi10_ce.bin
+lib/firmware/amdgpu/navi10_me.bin
+lib/firmware/amdgpu/navi10_mec2.bin
+lib/firmware/amdgpu/navi10_mec.bin
+lib/firmware/amdgpu/navi10_pfp.bin
+lib/firmware/amdgpu/navi10_sos.bin
+lib/firmware/amdgpu/navi10_ta.bin
+lib/firmware/amdgpu/navi10_vcn.bin
+lib/firmware/amdgpu/navi12_asd.bin
+lib/firmware/amdgpu/navi12_sdma1.bin
+lib/firmware/amdgpu/navi12_sdma.bin
+lib/firmware/amdgpu/navi12_sos.bin
+lib/firmware/amdgpu/navi12_ta.bin
+lib/firmware/amdgpu/navi12_vcn.bin
+lib/firmware/amdgpu/navi14_asd.bin
+lib/firmware/amdgpu/navi14_smc.bin
+lib/firmware/amdgpu/navi14_sos.bin
+lib/firmware/amdgpu/navi14_ta.bin
+lib/firmware/amdgpu/navi14_vcn.bin
+lib/firmware/amdgpu/navy_flounder_ce.bin
+lib/firmware/amdgpu/navy_flounder_dmcub.bin
+lib/firmware/amdgpu/navy_flounder_me.bin
+lib/firmware/amdgpu/navy_flounder_mec2.bin
+lib/firmware/amdgpu/navy_flounder_mec.bin
+lib/firmware/amdgpu/navy_flounder_pfp.bin
+lib/firmware/amdgpu/navy_flounder_rlc.bin
+lib/firmware/amdgpu/navy_flounder_sdma.bin
+lib/firmware/amdgpu/navy_flounder_smc.bin
+lib/firmware/amdgpu/navy_flounder_sos.bin
+lib/firmware/amdgpu/navy_flounder_ta.bin
+lib/firmware/amdgpu/navy_flounder_vcn.bin
+lib/firmware/amdgpu/picasso_asd.bin
+lib/firmware/amdgpu/picasso_ce.bin
+lib/firmware/amdgpu/picasso_me.bin
+lib/firmware/amdgpu/picasso_mec2.bin
+lib/firmware/amdgpu/picasso_mec.bin
+lib/firmware/amdgpu/picasso_pfp.bin
+lib/firmware/amdgpu/picasso_ta.bin
+lib/firmware/amdgpu/picasso_vcn.bin
+lib/firmware/amdgpu/psp_13_0_8_asd.bin
+lib/firmware/amdgpu/psp_13_0_8_ta.bin
+lib/firmware/amdgpu/psp_13_0_8_toc.bin
+lib/firmware/amdgpu/raven2_asd.bin
+lib/firmware/amdgpu/raven2_ce.bin
+lib/firmware/amdgpu/raven2_me.bin
+lib/firmware/amdgpu/raven2_mec2.bin
+lib/firmware/amdgpu/raven2_mec.bin
+lib/firmware/amdgpu/raven2_pfp.bin
+lib/firmware/amdgpu/raven2_ta.bin
+lib/firmware/amdgpu/raven2_vcn.bin
+lib/firmware/amdgpu/raven_asd.bin
+lib/firmware/amdgpu/raven_ce.bin
+lib/firmware/amdgpu/raven_me.bin
+lib/firmware/amdgpu/raven_mec2.bin
+lib/firmware/amdgpu/raven_mec.bin
+lib/firmware/amdgpu/raven_pfp.bin
+lib/firmware/amdgpu/raven_ta.bin
+lib/firmware/amdgpu/raven_vcn.bin
+lib/firmware/amdgpu/renoir_asd.bin
+lib/firmware/amdgpu/renoir_ce.bin
+lib/firmware/amdgpu/renoir_dmcub.bin
+lib/firmware/amdgpu/renoir_me.bin
+lib/firmware/amdgpu/renoir_mec2.bin
+lib/firmware/amdgpu/renoir_mec.bin
+lib/firmware/amdgpu/renoir_pfp.bin
+lib/firmware/amdgpu/renoir_rlc.bin
+lib/firmware/amdgpu/renoir_ta.bin
+lib/firmware/amdgpu/renoir_vcn.bin
+lib/firmware/amdgpu/sdma_5_2_7.bin
+lib/firmware/amdgpu/sienna_cichlid_ce.bin
+lib/firmware/amdgpu/sienna_cichlid_dmcub.bin
+lib/firmware/amdgpu/sienna_cichlid_me.bin
+lib/firmware/amdgpu/sienna_cichlid_mec2.bin
+lib/firmware/amdgpu/sienna_cichlid_mec.bin
+lib/firmware/amdgpu/sienna_cichlid_pfp.bin
+lib/firmware/amdgpu/sienna_cichlid_rlc.bin
+lib/firmware/amdgpu/sienna_cichlid_sdma.bin
+lib/firmware/amdgpu/sienna_cichlid_smc.bin
+lib/firmware/amdgpu/sienna_cichlid_sos.bin
+lib/firmware/amdgpu/sienna_cichlid_ta.bin
+lib/firmware/amdgpu/sienna_cichlid_vcn.bin
+lib/firmware/amdgpu/vangogh_asd.bin
+lib/firmware/amdgpu/vangogh_ce.bin
+lib/firmware/amdgpu/vangogh_me.bin
+lib/firmware/amdgpu/vangogh_mec2.bin
+lib/firmware/amdgpu/vangogh_mec.bin
+lib/firmware/amdgpu/vangogh_pfp.bin
+lib/firmware/amdgpu/vega10_asd.bin
+lib/firmware/amdgpu/vega10_ce.bin
+lib/firmware/amdgpu/vega10_me.bin
+lib/firmware/amdgpu/vega10_mec2.bin
+lib/firmware/amdgpu/vega10_mec.bin
+lib/firmware/amdgpu/vega10_pfp.bin
+lib/firmware/amdgpu/vega12_asd.bin
+lib/firmware/amdgpu/vega12_ce.bin
+lib/firmware/amdgpu/vega12_me.bin
+lib/firmware/amdgpu/vega12_mec2.bin
+lib/firmware/amdgpu/vega12_mec.bin
+lib/firmware/amdgpu/vega12_pfp.bin
+lib/firmware/amdgpu/vega20_asd.bin
+lib/firmware/amdgpu/vega20_ce.bin
+lib/firmware/amdgpu/vega20_me.bin
+lib/firmware/amdgpu/vega20_mec2.bin
+lib/firmware/amdgpu/vega20_mec.bin
+lib/firmware/amdgpu/vega20_pfp.bin
+lib/firmware/amdgpu/yellow_carp_asd.bin
+lib/firmware/amdgpu/yellow_carp_ce.bin
+lib/firmware/amdgpu/yellow_carp_dmcub.bin
+lib/firmware/amdgpu/yellow_carp_me.bin
+lib/firmware/amdgpu/yellow_carp_mec2.bin
+lib/firmware/amdgpu/yellow_carp_mec.bin
+lib/firmware/amdgpu/yellow_carp_pfp.bin
+lib/firmware/amdgpu/yellow_carp_rlc.bin
+lib/firmware/amdgpu/yellow_carp_ta.bin
+lib/firmware/amd-ucode/microcode_amd_fam17h.bin
+lib/firmware/amd-ucode/microcode_amd_fam19h.bin
+lib/firmware/amphion/vpu/vpu_fw_imx8_dec.bin
+lib/firmware/amphion/vpu/vpu_fw_imx8_enc.bin
+lib/firmware/ath11k/WCN6855/hw2.0/amss.bin
+lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin
+lib/firmware/ath11k/WCN6855/hw2.0/m3.bin
+lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
+lib/firmware/ath11k/WCN6855/hw2.1/amss.bin
+lib/firmware/ath11k/WCN6855/hw2.1/board-2.bin
+lib/firmware/ath11k/WCN6855/hw2.1/m3.bin
+lib/firmware/ath11k/WCN6855/hw2.1/regdb.bin
+lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt
+lib/firmware/brcm/brcmfmac4356-sdio.AP6356S.txt
+lib/firmware/brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt
+lib/firmware/cnm/wave521c_j721s2_codec_fw.bin
+lib/firmware/cxgb4/t4fw-1.26.6.0.bin
+lib/firmware/cxgb4/t5fw-1.26.6.0.bin
+lib/firmware/cxgb4/t6fw-1.26.6.0.bin
+lib/firmware/i915/adlp_dmc_ver2_16.bin
+lib/firmware/i915/adlp_guc_69.0.3.bin
+lib/firmware/i915/bxt_guc_69.0.3.bin
+lib/firmware/i915/cml_guc_69.0.3.bin
+lib/firmware/i915/dg1_guc_69.0.3.bin
+lib/firmware/i915/ehl_guc_69.0.3.bin
+lib/firmware/i915/glk_guc_69.0.3.bin
+lib/firmware/i915/icl_guc_69.0.3.bin
+lib/firmware/i915/kbl_guc_69.0.3.bin
+lib/firmware/i915/skl_guc_69.0.3.bin
+lib/firmware/i915/tgl_guc_69.0.3.bin
+lib/firmware/intel/ibt-0040-0041.sfi
+lib/firmware/intel/ibt-0040-1020.sfi
+lib/firmware/intel/ibt-0040-2120.sfi
+lib/firmware/intel/ibt-0040-4150.sfi
+lib/firmware/intel/ibt-0041-0041.sfi
+lib/firmware/intel/ibt-1040-0041.sfi
+lib/firmware/intel/ibt-1040-1020.sfi
+lib/firmware/intel/ibt-1040-2120.sfi
+lib/firmware/intel/ibt-1040-4150.sfi
+lib/firmware/intel/ibt-11-5.sfi
+lib/firmware/intel/ibt-12-16.sfi
+lib/firmware/intel/ibt-17-16-1.sfi
+lib/firmware/intel/ibt-17-2.sfi
+lib/firmware/intel/ibt-18-16-1.sfi
+lib/firmware/intel/ibt-18-2.sfi
+lib/firmware/intel/ibt-19-0-0.sfi
+lib/firmware/intel/ibt-19-0-1.sfi
+lib/firmware/intel/ibt-19-0-4.sfi
+lib/firmware/intel/ibt-19-16-4.sfi
+lib/firmware/intel/ibt-19-240-1.sfi
+lib/firmware/intel/ibt-19-240-4.sfi
+lib/firmware/intel/ibt-19-32-0.sfi
+lib/firmware/intel/ibt-19-32-1.sfi
+lib/firmware/intel/ibt-19-32-4.sfi
+lib/firmware/intel/ibt-20-0-3.sfi
+lib/firmware/intel/ibt-20-1-3.sfi
+lib/firmware/intel/ibt-20-1-4.sfi
+lib/firmware/intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
+lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.31.0.pkg
+lib/firmware/intel/ice/ddp-wireless_edge
+lib/firmware/intel/ice/ddp-wireless_edge/ice_wireless_edge-1.3.7.0.pkg
+lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode
+lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode
+lib/firmware/iwlwifi-cc-a0-66.ucode
+lib/firmware/iwlwifi-cc-a0-68.ucode
+lib/firmware/iwlwifi-cc-a0-71.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-66.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-68.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-71.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-66.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-68.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-71.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-66.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-68.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-71.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-66.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-68.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-71.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-66.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-68.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-71.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-66.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-68.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-71.ucode
+lib/firmware/iwlwifi-so-a0-gf4-a0-68.ucode
+lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode
+lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm
+lib/firmware/iwlwifi-so-a0-gf-a0-68.ucode
+lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode
+lib/firmware/iwlwifi-so-a0-gf-a0.pnvm
+lib/firmware/iwlwifi-so-a0-hr-b0-68.ucode
+lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode
+lib/firmware/iwlwifi-so-a0-jf-b0-68.ucode
+lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0-68.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode
+lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm
+lib/firmware/mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
+lib/firmware/mediatek/mt7915_eeprom.bin
+lib/firmware/mediatek/mt7915_eeprom_dbdc.bin
+lib/firmware/mediatek/mt7915_rom_patch.bin
+lib/firmware/mediatek/mt7915_wa.bin
+lib/firmware/mediatek/mt7915_wm.bin
+lib/firmware/mediatek/mt7916_eeprom.bin
+lib/firmware/mediatek/mt7916_rom_patch.bin
+lib/firmware/mediatek/mt7916_wa.bin
+lib/firmware/mediatek/mt7916_wm.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976_dbdc.bin
+lib/firmware/mediatek/mt7986_eeprom_mt7976_dual.bin
+lib/firmware/mediatek/mt7986_rom_patch.bin
+lib/firmware/mediatek/mt7986_rom_patch_mt7975.bin
+lib/firmware/mediatek/mt7986_wa.bin
+lib/firmware/mediatek/mt7986_wm.bin
+lib/firmware/mediatek/mt7986_wm_mt7975.bin
+lib/firmware/mediatek/mt8173/vpu_d.bin
+lib/firmware/mediatek/mt8173/vpu_p.bin
+lib/firmware/mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
+lib/firmware/mediatek/WIFI_RAM_CODE_MT7961_1.bin
+lib/firmware/mrvl/cpt01/ae.out
+lib/firmware/mrvl/cpt01/ie.out
+lib/firmware/mrvl/cpt01/se.out
+lib/firmware/mrvl/cpt02/ae.out
+lib/firmware/mrvl/cpt02/ie.out
+lib/firmware/mrvl/cpt02/se.out
+lib/firmware/mrvl/cpt03/ae.out
+lib/firmware/mrvl/cpt03/ie.out
+lib/firmware/mrvl/cpt03/se.out
+lib/firmware/mrvl/cpt04/ae.out
+lib/firmware/mrvl/cpt04/ie.out
+lib/firmware/mrvl/cpt04/se.out
+lib/firmware/nvidia/ga102/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga102/acr/ucode_asb.bin
+lib/firmware/nvidia/ga102/acr/ucode_unload.bin
+lib/firmware/nvidia/ga102/gr/fecs_bl.bin
+lib/firmware/nvidia/ga102/gr/fecs_sig.bin
+lib/firmware/nvidia/ga102/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga102/gr/gpccs_sig.bin
+lib/firmware/nvidia/ga102/gr/NET_img.bin
+lib/firmware/nvidia/ga102/nvdec/scrubber.bin
+lib/firmware/nvidia/ga102/sec2/desc.bin
+lib/firmware/nvidia/ga102/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga102/sec2/image.bin
+lib/firmware/nvidia/ga102/sec2/sig.bin
+lib/firmware/nvidia/ga103/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga103/acr/ucode_asb.bin
+lib/firmware/nvidia/ga103/acr/ucode_unload.bin
+lib/firmware/nvidia/ga103/gr/fecs_bl.bin
+lib/firmware/nvidia/ga103/gr/fecs_sig.bin
+lib/firmware/nvidia/ga103/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga103/gr/gpccs_sig.bin
+lib/firmware/nvidia/ga103/gr/NET_img.bin
+lib/firmware/nvidia/ga103/nvdec/scrubber.bin
+lib/firmware/nvidia/ga103/sec2/desc.bin
+lib/firmware/nvidia/ga103/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga103/sec2/image.bin
+lib/firmware/nvidia/ga103/sec2/sig.bin
+lib/firmware/nvidia/ga104/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga104/acr/ucode_asb.bin
+lib/firmware/nvidia/ga104/acr/ucode_unload.bin
+lib/firmware/nvidia/ga104/gr/fecs_bl.bin
+lib/firmware/nvidia/ga104/gr/fecs_sig.bin
+lib/firmware/nvidia/ga104/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga104/gr/gpccs_sig.bin
+lib/firmware/nvidia/ga104/gr/NET_img.bin
+lib/firmware/nvidia/ga104/nvdec/scrubber.bin
+lib/firmware/nvidia/ga104/sec2/desc.bin
+lib/firmware/nvidia/ga104/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga104/sec2/image.bin
+lib/firmware/nvidia/ga104/sec2/sig.bin
+lib/firmware/nvidia/ga106/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga106/acr/ucode_asb.bin
+lib/firmware/nvidia/ga106/acr/ucode_unload.bin
+lib/firmware/nvidia/ga106/gr/fecs_bl.bin
+lib/firmware/nvidia/ga106/gr/fecs_sig.bin
+lib/firmware/nvidia/ga106/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga106/gr/gpccs_sig.bin
+lib/firmware/nvidia/ga106/gr/NET_img.bin
+lib/firmware/nvidia/ga106/nvdec/scrubber.bin
+lib/firmware/nvidia/ga106/sec2/desc.bin
+lib/firmware/nvidia/ga106/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga106/sec2/image.bin
+lib/firmware/nvidia/ga106/sec2/sig.bin
+lib/firmware/nvidia/ga107/acr/ucode_ahesasc.bin
+lib/firmware/nvidia/ga107/acr/ucode_asb.bin
+lib/firmware/nvidia/ga107/acr/ucode_unload.bin
+lib/firmware/nvidia/ga107/gr/fecs_bl.bin
+lib/firmware/nvidia/ga107/gr/fecs_sig.bin
+lib/firmware/nvidia/ga107/gr/gpccs_bl.bin
+lib/firmware/nvidia/ga107/gr/gpccs_sig.bin
+lib/firmware/nvidia/ga107/gr/NET_img.bin
+lib/firmware/nvidia/ga107/nvdec/scrubber.bin
+lib/firmware/nvidia/ga107/sec2/desc.bin
+lib/firmware/nvidia/ga107/sec2/hs_bl_sig.bin
+lib/firmware/nvidia/ga107/sec2/image.bin
+lib/firmware/nvidia/ga107/sec2/sig.bin
+lib/firmware/qca/nvm_usb_00130201_010a.bin
+lib/firmware/qca/nvm_usb_00130201_010b.bin
+lib/firmware/qca/nvm_usb_00130201_0303.bin
+lib/firmware/qca/nvm_usb_00130201.bin
+lib/firmware/qca/nvm_usb_00130201_gf_010a.bin
+lib/firmware/qca/nvm_usb_00130201_gf_010b.bin
+lib/firmware/qca/nvm_usb_00130201_gf_0303.bin
+lib/firmware/qca/nvm_usb_00130201_gf.bin
+lib/firmware/qca/rampatch_usb_00130200.bin
+lib/firmware/qca/rampatch_usb_00130201.bin
+lib/firmware/rtl_bt/rtl8822cs_fw.bin
+lib/firmware/rtl_bt/rtl8822cu_fw.bin
+lib/firmware/rtl_bt/rtl8852au_fw.bin
+lib/firmware/rtl_bt/rtl8852bu_config.bin
+lib/firmware/rtl_bt/rtl8852bu_fw.bin
+lib/firmware/rtw88/rtw8821c_fw.bin
+lib/firmware/rtw88/rtw8822c_fw.bin
+lib/firmware/rtw89/rtw8852a_fw.bin
+lib/firmware/wfx/wfm_wf200_C0.sec
+usr/bin/fcrontab
+usr/lib/firewall/rules.pl
+usr/local/bin/update-ids-ruleset
+usr/sbin/convert-ids-backend-files
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/wakeonlan.cgi
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+var/ipfire/header.pl
+var/ipfire/ids-functions.pl
+var/ipfire/menu.d/20-status.menu
+var/ipfire/menu.d/30-network.menu
diff --git a/config/rootfiles/core/168/filelists/freetype b/config/rootfiles/core/168/filelists/freetype
new file mode 120000
index 000000000..79ec5c42e
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/freetype
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/fribidi b/config/rootfiles/core/168/filelists/fribidi
new file mode 120000
index 000000000..1a17a37c9
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/fribidi
@@ -0,0 +1 @@
+../../../common/fribidi
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/harfbuzz b/config/rootfiles/core/168/filelists/harfbuzz
similarity index 100%
rename from config/rootfiles/core/167/filelists/harfbuzz
rename to config/rootfiles/core/168/filelists/harfbuzz
diff --git a/config/rootfiles/core/168/filelists/iana-etc b/config/rootfiles/core/168/filelists/iana-etc
new file mode 120000
index 000000000..1f3d54dbd
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/iana-etc
@@ -0,0 +1 @@
+../../../common/iana-etc
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/ipset b/config/rootfiles/core/168/filelists/ipset
new file mode 120000
index 000000000..2b43691f2
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/ipset
@@ -0,0 +1 @@
+../../../common/ipset
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/knot b/config/rootfiles/core/168/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libaio b/config/rootfiles/core/168/filelists/libaio
new file mode 120000
index 000000000..9788a2bc1
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libaio
@@ -0,0 +1 @@
+../../../common/libaio
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libcap b/config/rootfiles/core/168/filelists/libcap
new file mode 120000
index 000000000..ed67d950a
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libcap
@@ -0,0 +1 @@
+../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libcap-ng b/config/rootfiles/core/168/filelists/libcap-ng
new file mode 120000
index 000000000..f58b21141
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libcap-ng
@@ -0,0 +1 @@
+../../../common/libcap-ng
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libgcrypt b/config/rootfiles/core/168/filelists/libgcrypt
new file mode 120000
index 000000000..2df12a20e
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libhtp b/config/rootfiles/core/168/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libinih b/config/rootfiles/core/168/filelists/libinih
new file mode 120000
index 000000000..7f703bed7
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libinih
@@ -0,0 +1 @@
+../../../common/libinih
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libmnl b/config/rootfiles/core/168/filelists/libmnl
new file mode 120000
index 000000000..f671c4175
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libmnl
@@ -0,0 +1 @@
+../../../common/libmnl
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/libnfnetlink b/config/rootfiles/core/168/filelists/libnfnetlink
new file mode 120000
index 000000000..605e72d90
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/libnfnetlink
@@ -0,0 +1 @@
+../../../common/libnfnetlink
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/logwatch b/config/rootfiles/core/168/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/mpfr b/config/rootfiles/core/168/filelists/mpfr
new file mode 120000
index 000000000..c8468bf42
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/mpfr
@@ -0,0 +1 @@
+../../../common/mpfr
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/nano b/config/rootfiles/core/168/filelists/nano
similarity index 100%
rename from config/rootfiles/core/167/filelists/nano
rename to config/rootfiles/core/168/filelists/nano
diff --git a/config/rootfiles/core/168/filelists/openjpeg b/config/rootfiles/core/168/filelists/openjpeg
new file mode 120000
index 000000000..5b71a3c93
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/openjpeg
@@ -0,0 +1 @@
+../../../common/openjpeg
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/openldap b/config/rootfiles/core/168/filelists/openldap
new file mode 120000
index 000000000..80c324f76
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/openldap
@@ -0,0 +1 @@
+../../../common/openldap
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/openssh b/config/rootfiles/core/168/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/167/filelists/openssh
rename to config/rootfiles/core/168/filelists/openssh
diff --git a/config/rootfiles/core/167/filelists/openssl b/config/rootfiles/core/168/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/167/filelists/openssl
rename to config/rootfiles/core/168/filelists/openssl
diff --git a/config/rootfiles/core/168/filelists/openvpn b/config/rootfiles/core/168/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/pango b/config/rootfiles/core/168/filelists/pango
similarity index 100%
rename from config/rootfiles/core/167/filelists/pango
rename to config/rootfiles/core/168/filelists/pango
diff --git a/config/rootfiles/core/168/filelists/pciutils b/config/rootfiles/core/168/filelists/pciutils
new file mode 120000
index 000000000..aeb45e7b3
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/pciutils
@@ -0,0 +1 @@
+../../../common/pciutils
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/pcre2 b/config/rootfiles/core/168/filelists/pcre2
new file mode 120000
index 000000000..4482caeae
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/pcre2
@@ -0,0 +1 @@
+../../../common/pcre2
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/perl-libwww b/config/rootfiles/core/168/filelists/perl-libwww
new file mode 120000
index 000000000..6b8bff6e1
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/perl-libwww
@@ -0,0 +1 @@
+../../../common/perl-libwww
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/poppler b/config/rootfiles/core/168/filelists/poppler
new file mode 120000
index 000000000..39aa6c263
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/procps b/config/rootfiles/core/168/filelists/procps
new file mode 120000
index 000000000..e17e8ed70
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/procps
@@ -0,0 +1 @@
+../../../common/procps
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/sqlite b/config/rootfiles/core/168/filelists/sqlite
similarity index 100%
rename from config/rootfiles/core/167/filelists/sqlite
rename to config/rootfiles/core/168/filelists/sqlite
diff --git a/config/rootfiles/core/168/filelists/squid b/config/rootfiles/core/168/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/suricata b/config/rootfiles/core/168/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/vnstat b/config/rootfiles/core/168/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/167/filelists/vnstat
rename to config/rootfiles/core/168/filelists/vnstat
diff --git a/config/rootfiles/core/168/filelists/whois b/config/rootfiles/core/168/filelists/whois
new file mode 120000
index 000000000..60cbd1894
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/whois
@@ -0,0 +1 @@
+../../../common/whois
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/x86_64/efibootmgr b/config/rootfiles/core/168/filelists/x86_64/efibootmgr
new file mode 120000
index 000000000..d6964dba9
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/x86_64/efibootmgr
@@ -0,0 +1 @@
+../../../../common/x86_64/efibootmgr
\ No newline at end of file
diff --git a/config/rootfiles/core/168/filelists/x86_64/intel-microcode b/config/rootfiles/core/168/filelists/x86_64/intel-microcode
new file mode 120000
index 000000000..d5ac074e2
--- /dev/null
+++ b/config/rootfiles/core/168/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
new file mode 100644
index 000000000..d21f648dd
--- /dev/null
+++ b/config/rootfiles/core/168/update.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2022 IPFire-Team info@ipfire.org.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=168
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/squid stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+/etc/init.d/suricata stop
+
+# Remove files
+rm -rvf \
+	/etc/fcron.daily/suricata \
+	/etc/fcron.weekly/suricata \
+	/lib/firmware/cxgb4/t4fw-1.26.4.0.bin \
+	/lib/firmware/cxgb4/t5fw-1.26.4.0.bin \
+	/lib/firmware/cxgb4/t6fw-1.26.4.0.bin \
+	/lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.20.0.pkg \
+	/lib/firmware/silabs \
+	/lib/libprocps.so* \
+	/usr/bin/dnet-config \
+	/usr/bin/sdparm \
+	/usr/lib/libart_lgpl_2.so* \
+	/usr/lib/libdnet.la \
+	/usr/lib/libdnet.so* \
+	/usr/lib/libevent-1.4.so* \
+	/usr/lib/libevent_core-1.4.so* \
+	/usr/lib/libevent_extra-1.4.so* \
+	/usr/lib/liblber-2.4.so* \
+	/usr/lib/libnl.so* \
+	/usr/lib/libpri.so* \
+	/usr/lib/libsolv.so* \
+	/usr/lib/libsolvext.so* \
+	/usr/lib/libusb.so \
+	/usr/lib/libusb-0.1.so* \
+	/usr/sbin/dnet
+
+# Remove netbpm add-on, if installed
+if [ -e "/opt/pakfire/db/installed/meta-netbpm" ]; then
+	for i in $(</opt/pakfire/db/rootfiles/netbpm); do
+		rm -rfv "/${i}"
+	done
+fi
+rm -vf \
+	/opt/pakfire/db/installed/meta-netbpm \
+	/opt/pakfire/db/meta/meta-netbpm \
+	/opt/pakfire/db/rootfiles/netbpm
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Run IDSv4 converter
+convert-ids-backend-files
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Delete orphaned Oinkmaster and Suricata default ruleset
+rm -vf \
+	/usr/local/bin/oinkmaster.pl \
+	/var/ipfire/suricata/oinkmaster.conf \
+	/var/ipfire/suricata/suricata-default-rules.yaml
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Apply sysctl changes
+/etc/init.d/sysctl start
+
+# Fix permissions of /etc/sudoers.d/
+chmod -v 750 /etc/sudoers.d
+chmod -v 640 /etc/sudoers.d/*
+
+# Rebuild initial ramdisk to apply microcode updates
+dracut --regenerate-all --force
+case "$(uname -m)" in
+        armv*)
+                mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+                rm /boot/initramfs-${KVER}-ipfire.img
+                ;;
+        aarch64)
+                mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+                # dont remove initramfs because grub need this to boot.
+                ;;
+esac
+
+
+# Start services
+/etc/init.d/fcron restart
+/etc/init.d/sshd restart
+/etc/init.d/vnstatd restart
+/etc/init.d/squid start
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/suricata start
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/167/exclude b/config/rootfiles/oldcore/167/exclude
new file mode 100644
index 000000000..b22e5e943
--- /dev/null
+++ b/config/rootfiles/oldcore/167/exclude
@@ -0,0 +1,35 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/167/filelists/aarch64/linux b/config/rootfiles/oldcore/167/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/linux
diff --git a/config/rootfiles/core/167/filelists/aarch64/u-boot b/config/rootfiles/oldcore/167/filelists/aarch64/u-boot
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/u-boot
rename to config/rootfiles/oldcore/167/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/167/filelists/aarch64/util-linux b/config/rootfiles/oldcore/167/filelists/aarch64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/aarch64/util-linux
rename to config/rootfiles/oldcore/167/filelists/aarch64/util-linux
diff --git a/config/rootfiles/core/167/filelists/apache2 b/config/rootfiles/oldcore/167/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/167/filelists/apache2
rename to config/rootfiles/oldcore/167/filelists/apache2
diff --git a/config/rootfiles/core/167/filelists/armv6l/linux b/config/rootfiles/oldcore/167/filelists/armv6l/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/linux
diff --git a/config/rootfiles/core/167/filelists/armv6l/util-linux b/config/rootfiles/oldcore/167/filelists/armv6l/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/armv6l/util-linux
rename to config/rootfiles/oldcore/167/filelists/armv6l/util-linux
diff --git a/config/rootfiles/oldcore/167/filelists/bind b/config/rootfiles/oldcore/167/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/ca-certificates b/config/rootfiles/oldcore/167/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/167/filelists/ca-certificates
rename to config/rootfiles/oldcore/167/filelists/ca-certificates
diff --git a/config/rootfiles/oldcore/167/filelists/core-files b/config/rootfiles/oldcore/167/filelists/core-files
new file mode 100644
index 000000000..0dec37e53
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/core-files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/167/filelists/coreutils b/config/rootfiles/oldcore/167/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/167/filelists/coreutils
rename to config/rootfiles/oldcore/167/filelists/coreutils
diff --git a/config/rootfiles/oldcore/167/filelists/curl b/config/rootfiles/oldcore/167/filelists/curl
new file mode 120000
index 000000000..4b84bef53
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/ddns b/config/rootfiles/oldcore/167/filelists/ddns
similarity index 100%
rename from config/rootfiles/core/167/filelists/ddns
rename to config/rootfiles/oldcore/167/filelists/ddns
diff --git a/config/rootfiles/core/167/filelists/dracut b/config/rootfiles/oldcore/167/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/167/filelists/dracut
rename to config/rootfiles/oldcore/167/filelists/dracut
diff --git a/config/rootfiles/core/167/filelists/elinks b/config/rootfiles/oldcore/167/filelists/elinks
similarity index 100%
rename from config/rootfiles/core/167/filelists/elinks
rename to config/rootfiles/oldcore/167/filelists/elinks
diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/oldcore/167/filelists/files
similarity index 100%
rename from config/rootfiles/core/167/filelists/files
rename to config/rootfiles/oldcore/167/filelists/files
diff --git a/config/rootfiles/core/167/filelists/gzip b/config/rootfiles/oldcore/167/filelists/gzip
similarity index 100%
rename from config/rootfiles/core/167/filelists/gzip
rename to config/rootfiles/oldcore/167/filelists/gzip
diff --git a/config/rootfiles/oldcore/167/filelists/harfbuzz b/config/rootfiles/oldcore/167/filelists/harfbuzz
new file mode 120000
index 000000000..ffe1e0d0b
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/harfbuzz
@@ -0,0 +1 @@
+../../../common/harfbuzz
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/hwdata b/config/rootfiles/oldcore/167/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/167/filelists/hwdata
rename to config/rootfiles/oldcore/167/filelists/hwdata
diff --git a/config/rootfiles/core/167/filelists/iproute2 b/config/rootfiles/oldcore/167/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/167/filelists/iproute2
rename to config/rootfiles/oldcore/167/filelists/iproute2
diff --git a/config/rootfiles/core/167/filelists/libdnet b/config/rootfiles/oldcore/167/filelists/libdnet
similarity index 100%
rename from config/rootfiles/core/167/filelists/libdnet
rename to config/rootfiles/oldcore/167/filelists/libdnet
diff --git a/config/rootfiles/core/167/filelists/libloc b/config/rootfiles/oldcore/167/filelists/libloc
similarity index 100%
rename from config/rootfiles/core/167/filelists/libloc
rename to config/rootfiles/oldcore/167/filelists/libloc
diff --git a/config/rootfiles/oldcore/167/filelists/misc-progs b/config/rootfiles/oldcore/167/filelists/misc-progs
new file mode 120000
index 000000000..7223caddd
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/167/filelists/nano b/config/rootfiles/oldcore/167/filelists/nano
new file mode 120000
index 000000000..2f07279c0
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/nano
@@ -0,0 +1 @@
+../../../common/nano
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/ntfs-3g b/config/rootfiles/oldcore/167/filelists/ntfs-3g
similarity index 100%
rename from config/rootfiles/core/167/filelists/ntfs-3g
rename to config/rootfiles/oldcore/167/filelists/ntfs-3g
diff --git a/config/rootfiles/oldcore/167/filelists/openssh b/config/rootfiles/oldcore/167/filelists/openssh
new file mode 120000
index 000000000..d8c77fd8e
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/167/filelists/openssl b/config/rootfiles/oldcore/167/filelists/openssl
new file mode 120000
index 000000000..e011a9266
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/pakfire b/config/rootfiles/oldcore/167/filelists/pakfire
similarity index 100%
rename from config/rootfiles/core/167/filelists/pakfire
rename to config/rootfiles/oldcore/167/filelists/pakfire
diff --git a/config/rootfiles/oldcore/167/filelists/pango b/config/rootfiles/oldcore/167/filelists/pango
new file mode 120000
index 000000000..6c37231c7
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/pango
@@ -0,0 +1 @@
+../../../common/pango
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/pcmciautils b/config/rootfiles/oldcore/167/filelists/pcmciautils
similarity index 100%
rename from config/rootfiles/core/167/filelists/pcmciautils
rename to config/rootfiles/oldcore/167/filelists/pcmciautils
diff --git a/config/rootfiles/core/167/filelists/perl-CGI b/config/rootfiles/oldcore/167/filelists/perl-CGI
similarity index 100%
rename from config/rootfiles/core/167/filelists/perl-CGI
rename to config/rootfiles/oldcore/167/filelists/perl-CGI
diff --git a/config/rootfiles/core/167/filelists/psmisc b/config/rootfiles/oldcore/167/filelists/psmisc
similarity index 100%
rename from config/rootfiles/core/167/filelists/psmisc
rename to config/rootfiles/oldcore/167/filelists/psmisc
diff --git a/config/rootfiles/core/167/filelists/rrdtool b/config/rootfiles/oldcore/167/filelists/rrdtool
similarity index 100%
rename from config/rootfiles/core/167/filelists/rrdtool
rename to config/rootfiles/oldcore/167/filelists/rrdtool
diff --git a/config/rootfiles/core/167/filelists/smartmontools b/config/rootfiles/oldcore/167/filelists/smartmontools
similarity index 100%
rename from config/rootfiles/core/167/filelists/smartmontools
rename to config/rootfiles/oldcore/167/filelists/smartmontools
diff --git a/config/rootfiles/oldcore/167/filelists/sqlite b/config/rootfiles/oldcore/167/filelists/sqlite
new file mode 120000
index 000000000..4ea569766
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/sqlite
@@ -0,0 +1 @@
+../../../common/sqlite
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/strongswan b/config/rootfiles/oldcore/167/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/167/filelists/strongswan
rename to config/rootfiles/oldcore/167/filelists/strongswan
diff --git a/config/rootfiles/core/167/filelists/sudo b/config/rootfiles/oldcore/167/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/167/filelists/sudo
rename to config/rootfiles/oldcore/167/filelists/sudo
diff --git a/config/rootfiles/oldcore/167/filelists/vnstat b/config/rootfiles/oldcore/167/filelists/vnstat
new file mode 120000
index 000000000..2e2e6100b
--- /dev/null
+++ b/config/rootfiles/oldcore/167/filelists/vnstat
@@ -0,0 +1 @@
+../../../common/vnstat
\ No newline at end of file
diff --git a/config/rootfiles/core/167/filelists/wget b/config/rootfiles/oldcore/167/filelists/wget
similarity index 100%
rename from config/rootfiles/core/167/filelists/wget
rename to config/rootfiles/oldcore/167/filelists/wget
diff --git a/config/rootfiles/core/167/filelists/wireless-regdb b/config/rootfiles/oldcore/167/filelists/wireless-regdb
similarity index 100%
rename from config/rootfiles/core/167/filelists/wireless-regdb
rename to config/rootfiles/oldcore/167/filelists/wireless-regdb
diff --git a/config/rootfiles/core/167/filelists/x86_64/linux b/config/rootfiles/oldcore/167/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/linux
diff --git a/config/rootfiles/core/167/filelists/x86_64/util-linux b/config/rootfiles/oldcore/167/filelists/x86_64/util-linux
similarity index 100%
rename from config/rootfiles/core/167/filelists/x86_64/util-linux
rename to config/rootfiles/oldcore/167/filelists/x86_64/util-linux
diff --git a/config/rootfiles/core/167/filelists/xfsprogs b/config/rootfiles/oldcore/167/filelists/xfsprogs
similarity index 100%
rename from config/rootfiles/core/167/filelists/xfsprogs
rename to config/rootfiles/oldcore/167/filelists/xfsprogs
diff --git a/config/rootfiles/core/167/filelists/xz b/config/rootfiles/oldcore/167/filelists/xz
similarity index 100%
rename from config/rootfiles/core/167/filelists/xz
rename to config/rootfiles/oldcore/167/filelists/xz
diff --git a/config/rootfiles/core/167/filelists/zlib b/config/rootfiles/oldcore/167/filelists/zlib
similarity index 100%
rename from config/rootfiles/core/167/filelists/zlib
rename to config/rootfiles/oldcore/167/filelists/zlib
diff --git a/config/rootfiles/core/167/update.sh b/config/rootfiles/oldcore/167/update.sh
similarity index 100%
rename from config/rootfiles/core/167/update.sh
rename to config/rootfiles/oldcore/167/update.sh
diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 4ed0807ef..49d924537 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -159,9 +159,7 @@ usr/lib/libndr.so.2.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
-usr/lib/libnss_winbind.so
 usr/lib/libnss_winbind.so.2
-usr/lib/libnss_wins.so
 usr/lib/libnss_wins.so.2
 usr/lib/libsamba-credentials.so
 usr/lib/libsamba-credentials.so.1
@@ -283,7 +281,11 @@ usr/lib/python3.10/site-packages/samba/emulate/traffic_packets.py
 usr/lib/python3.10/site-packages/samba/forest_update.py
 usr/lib/python3.10/site-packages/samba/gensec.cpython-310-aarch64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/getopt.py
+usr/lib/python3.10/site-packages/samba/gp_cert_auto_enroll_ext.py
+usr/lib/python3.10/site-packages/samba/gp_chromium_ext.py
 usr/lib/python3.10/site-packages/samba/gp_ext_loader.py
+usr/lib/python3.10/site-packages/samba/gp_firefox_ext.py
+usr/lib/python3.10/site-packages/samba/gp_firewalld_ext.py
 usr/lib/python3.10/site-packages/samba/gp_gnome_settings_ext.py
 usr/lib/python3.10/site-packages/samba/gp_msgs_ext.py
 #usr/lib/python3.10/site-packages/samba/gp_parse
@@ -494,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_constants.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
@@ -573,6 +576,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/help.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_lmdb_size.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_member.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ntacl.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ou.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/passwordsettings.py
@@ -605,6 +609,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py
 #usr/lib/python3.10/site-packages/samba/tests/source.py
+#usr/lib/python3.10/site-packages/samba/tests/source_chars.py
 #usr/lib/python3.10/site-packages/samba/tests/strings.py
 #usr/lib/python3.10/site-packages/samba/tests/subunitrun.py
 #usr/lib/python3.10/site-packages/samba/tests/tdb_util.py
@@ -659,10 +664,12 @@ usr/lib/samba/libCHARSET3-samba4.so
 usr/lib/samba/libLIBWBCLIENT-OLD-samba4.so
 usr/lib/samba/libMESSAGING-SEND-samba4.so
 usr/lib/samba/libMESSAGING-samba4.so
+usr/lib/samba/libREG-FULL-samba4.so
+usr/lib/samba/libRPC-SERVER-LOOP-samba4.so
+usr/lib/samba/libRPC-WORKER-samba4.so
 usr/lib/samba/libaddns-samba4.so
 usr/lib/samba/libads-samba4.so
-usr/lib/samba/libasn1-samba4.so.8
-usr/lib/samba/libasn1-samba4.so.8.0.0
+usr/lib/samba/libasn1-samba4.so
 usr/lib/samba/libasn1util-samba4.so
 usr/lib/samba/libauth-samba4.so
 usr/lib/samba/libauth-unix-token-samba4.so
@@ -680,8 +687,7 @@ usr/lib/samba/libcluster-samba4.so
 usr/lib/samba/libcmdline-contexts-samba4.so
 usr/lib/samba/libcmdline-samba4.so
 usr/lib/samba/libcmocka-samba4.so
-usr/lib/samba/libcom_err-samba4.so.0
-usr/lib/samba/libcom_err-samba4.so.0.25
+usr/lib/samba/libcom-err-samba4.so
 usr/lib/samba/libcommon-auth-samba4.so
 usr/lib/samba/libdbwrap-samba4.so
 usr/lib/samba/libdcerpc-pkt-auth-samba4.so
@@ -696,33 +702,25 @@ usr/lib/samba/libgensec-samba4.so
 usr/lib/samba/libgpext-samba4.so
 usr/lib/samba/libgpo-samba4.so
 usr/lib/samba/libgse-samba4.so
-usr/lib/samba/libgssapi-samba4.so.2
-usr/lib/samba/libgssapi-samba4.so.2.0.0
-usr/lib/samba/libhcrypto-samba4.so.5
-usr/lib/samba/libhcrypto-samba4.so.5.0.1
-usr/lib/samba/libhdb-samba4.so.11
-usr/lib/samba/libhdb-samba4.so.11.0.2
-usr/lib/samba/libheimbase-samba4.so.1
-usr/lib/samba/libheimbase-samba4.so.1.0.0
-usr/lib/samba/libheimntlm-samba4.so.1
-usr/lib/samba/libheimntlm-samba4.so.1.0.1
+usr/lib/samba/libgss-preauth-samba4.so
+usr/lib/samba/libgssapi-samba4.so
+usr/lib/samba/libhcrypto-samba4.so
+usr/lib/samba/libhdb-samba4.so
+usr/lib/samba/libheimbase-samba4.so
+usr/lib/samba/libheimntlm-samba4.so
 usr/lib/samba/libhttp-samba4.so
-usr/lib/samba/libhx509-samba4.so.5
-usr/lib/samba/libhx509-samba4.so.5.0.0
+usr/lib/samba/libhx509-samba4.so
 usr/lib/samba/libidmap-samba4.so
 usr/lib/samba/libinterfaces-samba4.so
 usr/lib/samba/libiov-buf-samba4.so
-usr/lib/samba/libkdc-samba4.so.2
-usr/lib/samba/libkdc-samba4.so.2.0.0
-usr/lib/samba/libkrb5-samba4.so.26
-usr/lib/samba/libkrb5-samba4.so.26.0.0
+usr/lib/samba/libkdc-samba4.so
+usr/lib/samba/libkrb5-samba4.so
 usr/lib/samba/libkrb5samba-samba4.so
 usr/lib/samba/libldb-cmdline-samba4.so
 usr/lib/samba/libldb-key-value-samba4.so
+usr/lib/samba/libldb-samba4.so
 usr/lib/samba/libldb-tdb-err-map-samba4.so
 usr/lib/samba/libldb-tdb-int-samba4.so
-usr/lib/samba/libldb.so.2
-usr/lib/samba/libldb.so.2.4.1
 usr/lib/samba/libldbsamba-samba4.so
 usr/lib/samba/liblibcli-lsa3-samba4.so
 usr/lib/samba/liblibcli-netlogon3-samba4.so
@@ -741,14 +739,11 @@ usr/lib/samba/libnss-info-samba4.so
 usr/lib/samba/libposix-eadb-samba4.so
 usr/lib/samba/libprinter-driver-samba4.so
 usr/lib/samba/libprinting-migrate-samba4.so
-usr/lib/samba/libpyldb-util.cpython-310-aarch64-linux-gnu.so.2
-usr/lib/samba/libpyldb-util.cpython-310-aarch64-linux-gnu.so.2.4.1
-usr/lib/samba/libpytalloc-util.cpython-310-aarch64-linux-gnu.so.2
-usr/lib/samba/libpytalloc-util.cpython-310-aarch64-linux-gnu.so.2.3.3
+usr/lib/samba/libpyldb-util.cpython-310-aarch64-linux-gnu-samba4.so
+usr/lib/samba/libpytalloc-util.cpython-310-aarch64-linux-gnu-samba4.so
 usr/lib/samba/libregistry-samba4.so
 usr/lib/samba/libreplace-samba4.so
-usr/lib/samba/libroken-samba4.so.19
-usr/lib/samba/libroken-samba4.so.19.0.1
+usr/lib/samba/libroken-samba4.so
 usr/lib/samba/libsamba-cluster-support-samba4.so
 usr/lib/samba/libsamba-debug-samba4.so
 usr/lib/samba/libsamba-modules-samba4.so
@@ -772,22 +767,17 @@ usr/lib/samba/libsocket-blocking-samba4.so
 usr/lib/samba/libsys-rw-samba4.so
 usr/lib/samba/libtalloc-report-printf-samba4.so
 usr/lib/samba/libtalloc-report-samba4.so
-usr/lib/samba/libtalloc.so.2
-usr/lib/samba/libtalloc.so.2.3.3
+usr/lib/samba/libtalloc-samba4.so
+usr/lib/samba/libtdb-samba4.so
 usr/lib/samba/libtdb-wrap-samba4.so
-usr/lib/samba/libtdb.so.1
-usr/lib/samba/libtdb.so.1.4.4
-usr/lib/samba/libtevent.so.0
-usr/lib/samba/libtevent.so.0.11.0
+usr/lib/samba/libtevent-samba4.so
 usr/lib/samba/libtime-basic-samba4.so
 usr/lib/samba/libtorture-samba4.so
 usr/lib/samba/libtrusts-util-samba4.so
 usr/lib/samba/libutil-reg-samba4.so
 usr/lib/samba/libutil-setid-samba4.so
 usr/lib/samba/libutil-tdb-samba4.so
-usr/lib/samba/libwinbind-client-samba4.so
-usr/lib/samba/libwind-samba4.so.0
-usr/lib/samba/libwind-samba4.so.0.0.0
+usr/lib/samba/libwind-samba4.so
 usr/lib/samba/libxattr-tdb-samba4.so
 usr/lib/samba/nss_info
 usr/lib/samba/nss_info/hash.so
@@ -838,7 +828,16 @@ usr/lib/samba/vfs/xattr_tdb.so
 usr/lib/security
 usr/lib/security/pam_winbind.so
 #usr/libexec/samba
+usr/libexec/samba/rpcd_classic
+usr/libexec/samba/rpcd_epmapper
+usr/libexec/samba/rpcd_fsrvp
+usr/libexec/samba/rpcd_lsad
+usr/libexec/samba/rpcd_mdssvc
+usr/libexec/samba/rpcd_rpcecho
+usr/libexec/samba/rpcd_spoolss
+usr/libexec/samba/rpcd_winreg
 usr/libexec/samba/samba-bgqd
+usr/libexec/samba/samba-dcerpcd
 usr/libexec/samba/smbspool_krb5_wrapper
 usr/sbin/eventlogadm
 usr/sbin/nmbd
diff --git a/config/rootfiles/packages/armv6l/borgbackup b/config/rootfiles/packages/armv6l/borgbackup
index b1bf310c6..05b63ad38 100644
--- a/config/rootfiles/packages/armv6l/borgbackup
+++ b/config/rootfiles/packages/armv6l/borgbackup
@@ -7,15 +7,6 @@ usr/lib/python3.10/site-packages/borg/_version.py
 #usr/lib/python3.10/site-packages/borg/algorithms
 usr/lib/python3.10/site-packages/borg/algorithms/__init__.py
 usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-arm-linux-gnueabi.so
-#usr/lib/python3.10/site-packages/borg/algorithms/msgpack
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-arm-linux-gnueabi.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-arm-linux-gnueabi.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py
 usr/lib/python3.10/site-packages/borg/archive.py
 usr/lib/python3.10/site-packages/borg/archiver.py
 usr/lib/python3.10/site-packages/borg/cache.py
@@ -30,8 +21,22 @@ usr/lib/python3.10/site-packages/borg/crypto/keymanager.py
 usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-arm-linux-gnueabi.so
 usr/lib/python3.10/site-packages/borg/crypto/nonces.py
 usr/lib/python3.10/site-packages/borg/fuse.py
+usr/lib/python3.10/site-packages/borg/fuse_impl.py
 usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-arm-linux-gnueabi.so
-usr/lib/python3.10/site-packages/borg/helpers.py
+#usr/lib/python3.10/site-packages/borg/helpers
+usr/lib/python3.10/site-packages/borg/helpers/__init__.py
+usr/lib/python3.10/site-packages/borg/helpers/checks.py
+usr/lib/python3.10/site-packages/borg/helpers/datastruct.py
+usr/lib/python3.10/site-packages/borg/helpers/errors.py
+usr/lib/python3.10/site-packages/borg/helpers/fs.py
+usr/lib/python3.10/site-packages/borg/helpers/manifest.py
+usr/lib/python3.10/site-packages/borg/helpers/misc.py
+usr/lib/python3.10/site-packages/borg/helpers/msgpack.py
+usr/lib/python3.10/site-packages/borg/helpers/parseformat.py
+usr/lib/python3.10/site-packages/borg/helpers/process.py
+usr/lib/python3.10/site-packages/borg/helpers/progress.py
+usr/lib/python3.10/site-packages/borg/helpers/time.py
+usr/lib/python3.10/site-packages/borg/helpers/yes.py
 usr/lib/python3.10/site-packages/borg/item.cpython-310-arm-linux-gnueabi.so
 usr/lib/python3.10/site-packages/borg/locking.py
 usr/lib/python3.10/site-packages/borg/logger.py
@@ -45,6 +50,8 @@ usr/lib/python3.10/site-packages/borg/platform/base.py
 usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-arm-linux-gnueabi.so
 usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-arm-linux-gnueabi.so
 usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-arm-linux-gnueabi.so
+usr/lib/python3.10/site-packages/borg/platform/xattr.py
+usr/lib/python3.10/site-packages/borg/platformflags.py
 usr/lib/python3.10/site-packages/borg/remote.py
 usr/lib/python3.10/site-packages/borg/repository.py
 usr/lib/python3.10/site-packages/borg/selftest.py
@@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py
 usr/lib/python3.10/site-packages/borg/testsuite/cache.py
 usr/lib/python3.10/site-packages/borg/testsuite/checksums.py
 usr/lib/python3.10/site-packages/borg/testsuite/chunker.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py
 usr/lib/python3.10/site-packages/borg/testsuite/compress.py
 usr/lib/python3.10/site-packages/borg/testsuite/crypto.py
+usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
 usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
 usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
 usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
@@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py
 usr/lib/python3.10/site-packages/borg/upgrader.py
 usr/lib/python3.10/site-packages/borg/version.py
 usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/armv6l/samba b/config/rootfiles/packages/armv6l/samba
index da62d0369..440f29cb2 100644
--- a/config/rootfiles/packages/armv6l/samba
+++ b/config/rootfiles/packages/armv6l/samba
@@ -159,9 +159,7 @@ usr/lib/libndr.so.2.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
-usr/lib/libnss_winbind.so
 usr/lib/libnss_winbind.so.2
-usr/lib/libnss_wins.so
 usr/lib/libnss_wins.so.2
 usr/lib/libsamba-credentials.so
 usr/lib/libsamba-credentials.so.1
@@ -283,7 +281,11 @@ usr/lib/python3.10/site-packages/samba/emulate/traffic_packets.py
 usr/lib/python3.10/site-packages/samba/forest_update.py
 usr/lib/python3.10/site-packages/samba/gensec.cpython-310-arm-linux-gnueabi.so
 usr/lib/python3.10/site-packages/samba/getopt.py
+usr/lib/python3.10/site-packages/samba/gp_cert_auto_enroll_ext.py
+usr/lib/python3.10/site-packages/samba/gp_chromium_ext.py
 usr/lib/python3.10/site-packages/samba/gp_ext_loader.py
+usr/lib/python3.10/site-packages/samba/gp_firefox_ext.py
+usr/lib/python3.10/site-packages/samba/gp_firewalld_ext.py
 usr/lib/python3.10/site-packages/samba/gp_gnome_settings_ext.py
 usr/lib/python3.10/site-packages/samba/gp_msgs_ext.py
 #usr/lib/python3.10/site-packages/samba/gp_parse
@@ -494,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_constants.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
@@ -573,6 +576,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/help.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_lmdb_size.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_member.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ntacl.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ou.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/passwordsettings.py
@@ -605,6 +609,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py
 #usr/lib/python3.10/site-packages/samba/tests/source.py
+#usr/lib/python3.10/site-packages/samba/tests/source_chars.py
 #usr/lib/python3.10/site-packages/samba/tests/strings.py
 #usr/lib/python3.10/site-packages/samba/tests/subunitrun.py
 #usr/lib/python3.10/site-packages/samba/tests/tdb_util.py
@@ -659,10 +664,12 @@ usr/lib/samba/libCHARSET3-samba4.so
 usr/lib/samba/libLIBWBCLIENT-OLD-samba4.so
 usr/lib/samba/libMESSAGING-SEND-samba4.so
 usr/lib/samba/libMESSAGING-samba4.so
+usr/lib/samba/libREG-FULL-samba4.so
+usr/lib/samba/libRPC-SERVER-LOOP-samba4.so
+usr/lib/samba/libRPC-WORKER-samba4.so
 usr/lib/samba/libaddns-samba4.so
 usr/lib/samba/libads-samba4.so
-usr/lib/samba/libasn1-samba4.so.8
-usr/lib/samba/libasn1-samba4.so.8.0.0
+usr/lib/samba/libasn1-samba4.so
 usr/lib/samba/libasn1util-samba4.so
 usr/lib/samba/libauth-samba4.so
 usr/lib/samba/libauth-unix-token-samba4.so
@@ -680,8 +687,7 @@ usr/lib/samba/libcluster-samba4.so
 usr/lib/samba/libcmdline-contexts-samba4.so
 usr/lib/samba/libcmdline-samba4.so
 usr/lib/samba/libcmocka-samba4.so
-usr/lib/samba/libcom_err-samba4.so.0
-usr/lib/samba/libcom_err-samba4.so.0.25
+usr/lib/samba/libcom-err-samba4.so
 usr/lib/samba/libcommon-auth-samba4.so
 usr/lib/samba/libdbwrap-samba4.so
 usr/lib/samba/libdcerpc-pkt-auth-samba4.so
@@ -696,33 +702,25 @@ usr/lib/samba/libgensec-samba4.so
 usr/lib/samba/libgpext-samba4.so
 usr/lib/samba/libgpo-samba4.so
 usr/lib/samba/libgse-samba4.so
-usr/lib/samba/libgssapi-samba4.so.2
-usr/lib/samba/libgssapi-samba4.so.2.0.0
-usr/lib/samba/libhcrypto-samba4.so.5
-usr/lib/samba/libhcrypto-samba4.so.5.0.1
-usr/lib/samba/libhdb-samba4.so.11
-usr/lib/samba/libhdb-samba4.so.11.0.2
-usr/lib/samba/libheimbase-samba4.so.1
-usr/lib/samba/libheimbase-samba4.so.1.0.0
-usr/lib/samba/libheimntlm-samba4.so.1
-usr/lib/samba/libheimntlm-samba4.so.1.0.1
+usr/lib/samba/libgss-preauth-samba4.so
+usr/lib/samba/libgssapi-samba4.so
+usr/lib/samba/libhcrypto-samba4.so
+usr/lib/samba/libhdb-samba4.so
+usr/lib/samba/libheimbase-samba4.so
+usr/lib/samba/libheimntlm-samba4.so
 usr/lib/samba/libhttp-samba4.so
-usr/lib/samba/libhx509-samba4.so.5
-usr/lib/samba/libhx509-samba4.so.5.0.0
+usr/lib/samba/libhx509-samba4.so
 usr/lib/samba/libidmap-samba4.so
 usr/lib/samba/libinterfaces-samba4.so
 usr/lib/samba/libiov-buf-samba4.so
-usr/lib/samba/libkdc-samba4.so.2
-usr/lib/samba/libkdc-samba4.so.2.0.0
-usr/lib/samba/libkrb5-samba4.so.26
-usr/lib/samba/libkrb5-samba4.so.26.0.0
+usr/lib/samba/libkdc-samba4.so
+usr/lib/samba/libkrb5-samba4.so
 usr/lib/samba/libkrb5samba-samba4.so
 usr/lib/samba/libldb-cmdline-samba4.so
 usr/lib/samba/libldb-key-value-samba4.so
+usr/lib/samba/libldb-samba4.so
 usr/lib/samba/libldb-tdb-err-map-samba4.so
 usr/lib/samba/libldb-tdb-int-samba4.so
-usr/lib/samba/libldb.so.2
-usr/lib/samba/libldb.so.2.4.1
 usr/lib/samba/libldbsamba-samba4.so
 usr/lib/samba/liblibcli-lsa3-samba4.so
 usr/lib/samba/liblibcli-netlogon3-samba4.so
@@ -741,14 +739,11 @@ usr/lib/samba/libnss-info-samba4.so
 usr/lib/samba/libposix-eadb-samba4.so
 usr/lib/samba/libprinter-driver-samba4.so
 usr/lib/samba/libprinting-migrate-samba4.so
-usr/lib/samba/libpyldb-util.cpython-310-arm-linux-gnueabi.so.2
-usr/lib/samba/libpyldb-util.cpython-310-arm-linux-gnueabi.so.2.4.1
-usr/lib/samba/libpytalloc-util.cpython-310-arm-linux-gnueabi.so.2
-usr/lib/samba/libpytalloc-util.cpython-310-arm-linux-gnueabi.so.2.3.3
+usr/lib/samba/libpyldb-util.cpython-310-arm-linux-gnueabi-samba4.so
+usr/lib/samba/libpytalloc-util.cpython-310-arm-linux-gnueabi-samba4.so
 usr/lib/samba/libregistry-samba4.so
 usr/lib/samba/libreplace-samba4.so
-usr/lib/samba/libroken-samba4.so.19
-usr/lib/samba/libroken-samba4.so.19.0.1
+usr/lib/samba/libroken-samba4.so
 usr/lib/samba/libsamba-cluster-support-samba4.so
 usr/lib/samba/libsamba-debug-samba4.so
 usr/lib/samba/libsamba-modules-samba4.so
@@ -772,22 +767,17 @@ usr/lib/samba/libsocket-blocking-samba4.so
 usr/lib/samba/libsys-rw-samba4.so
 usr/lib/samba/libtalloc-report-printf-samba4.so
 usr/lib/samba/libtalloc-report-samba4.so
-usr/lib/samba/libtalloc.so.2
-usr/lib/samba/libtalloc.so.2.3.3
+usr/lib/samba/libtalloc-samba4.so
+usr/lib/samba/libtdb-samba4.so
 usr/lib/samba/libtdb-wrap-samba4.so
-usr/lib/samba/libtdb.so.1
-usr/lib/samba/libtdb.so.1.4.4
-usr/lib/samba/libtevent.so.0
-usr/lib/samba/libtevent.so.0.11.0
+usr/lib/samba/libtevent-samba4.so
 usr/lib/samba/libtime-basic-samba4.so
 usr/lib/samba/libtorture-samba4.so
 usr/lib/samba/libtrusts-util-samba4.so
 usr/lib/samba/libutil-reg-samba4.so
 usr/lib/samba/libutil-setid-samba4.so
 usr/lib/samba/libutil-tdb-samba4.so
-usr/lib/samba/libwinbind-client-samba4.so
-usr/lib/samba/libwind-samba4.so.0
-usr/lib/samba/libwind-samba4.so.0.0.0
+usr/lib/samba/libwind-samba4.so
 usr/lib/samba/libxattr-tdb-samba4.so
 usr/lib/samba/nss_info
 usr/lib/samba/nss_info/hash.so
@@ -838,7 +828,16 @@ usr/lib/samba/vfs/xattr_tdb.so
 usr/lib/security
 usr/lib/security/pam_winbind.so
 #usr/libexec/samba
+usr/libexec/samba/rpcd_classic
+usr/libexec/samba/rpcd_epmapper
+usr/libexec/samba/rpcd_fsrvp
+usr/libexec/samba/rpcd_lsad
+usr/libexec/samba/rpcd_mdssvc
+usr/libexec/samba/rpcd_rpcecho
+usr/libexec/samba/rpcd_spoolss
+usr/libexec/samba/rpcd_winreg
 usr/libexec/samba/samba-bgqd
+usr/libexec/samba/samba-dcerpcd
 usr/libexec/samba/smbspool_krb5_wrapper
 usr/sbin/eventlogadm
 usr/sbin/nmbd
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
index dccaf4711..a27b7c11c 100644
--- a/config/rootfiles/packages/borgbackup
+++ b/config/rootfiles/packages/borgbackup
@@ -7,15 +7,6 @@ usr/lib/python3.10/site-packages/borg/_version.py
 #usr/lib/python3.10/site-packages/borg/algorithms
 usr/lib/python3.10/site-packages/borg/algorithms/__init__.py
 usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so
-#usr/lib/python3.10/site-packages/borg/algorithms/msgpack
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py
-usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py
 usr/lib/python3.10/site-packages/borg/archive.py
 usr/lib/python3.10/site-packages/borg/archiver.py
 usr/lib/python3.10/site-packages/borg/cache.py
@@ -30,8 +21,22 @@ usr/lib/python3.10/site-packages/borg/crypto/keymanager.py
 usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/crypto/nonces.py
 usr/lib/python3.10/site-packages/borg/fuse.py
+usr/lib/python3.10/site-packages/borg/fuse_impl.py
 usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/helpers.py
+#usr/lib/python3.10/site-packages/borg/helpers
+usr/lib/python3.10/site-packages/borg/helpers/__init__.py
+usr/lib/python3.10/site-packages/borg/helpers/checks.py
+usr/lib/python3.10/site-packages/borg/helpers/datastruct.py
+usr/lib/python3.10/site-packages/borg/helpers/errors.py
+usr/lib/python3.10/site-packages/borg/helpers/fs.py
+usr/lib/python3.10/site-packages/borg/helpers/manifest.py
+usr/lib/python3.10/site-packages/borg/helpers/misc.py
+usr/lib/python3.10/site-packages/borg/helpers/msgpack.py
+usr/lib/python3.10/site-packages/borg/helpers/parseformat.py
+usr/lib/python3.10/site-packages/borg/helpers/process.py
+usr/lib/python3.10/site-packages/borg/helpers/progress.py
+usr/lib/python3.10/site-packages/borg/helpers/time.py
+usr/lib/python3.10/site-packages/borg/helpers/yes.py
 usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/locking.py
 usr/lib/python3.10/site-packages/borg/logger.py
@@ -45,6 +50,8 @@ usr/lib/python3.10/site-packages/borg/platform/base.py
 usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/xattr.py
+usr/lib/python3.10/site-packages/borg/platformflags.py
 usr/lib/python3.10/site-packages/borg/remote.py
 usr/lib/python3.10/site-packages/borg/repository.py
 usr/lib/python3.10/site-packages/borg/selftest.py
@@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py
 usr/lib/python3.10/site-packages/borg/testsuite/cache.py
 usr/lib/python3.10/site-packages/borg/testsuite/checksums.py
 usr/lib/python3.10/site-packages/borg/testsuite/chunker.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py
+usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py
 usr/lib/python3.10/site-packages/borg/testsuite/compress.py
 usr/lib/python3.10/site-packages/borg/testsuite/crypto.py
+usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
 usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
 usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
 usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
@@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py
 usr/lib/python3.10/site-packages/borg/upgrader.py
 usr/lib/python3.10/site-packages/borg/version.py
 usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index abcb6c695..82817a942 100644
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -37,11 +37,10 @@ usr/bin/dbus-uuidgen
 #usr/lib/dbus-1.0/include
 #usr/lib/dbus-1.0/include/dbus
 #usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
-#usr/lib/libdbus-1.a
 #usr/lib/libdbus-1.la
-usr/lib/libdbus-1.so
+#usr/lib/libdbus-1.so
 usr/lib/libdbus-1.so.3
-usr/lib/libdbus-1.so.3.19.13
+usr/lib/libdbus-1.so.3.32.0
 #usr/lib/pkgconfig/dbus-1.pc
 usr/libexec/dbus-daemon-launch-helper
 #usr/share/dbus-1
@@ -58,8 +57,10 @@ usr/share/dbus-1/system.d
 #usr/share/doc/dbus/examples/GetAllMatchRules.py
 #usr/share/doc/dbus/examples/example-session-disable-stats.conf
 #usr/share/doc/dbus/examples/example-system-enable-stats.conf
+#usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf
 #usr/share/doc/dbus/system-activation.txt
 #usr/share/xml/dbus-1
 #usr/share/xml/dbus-1/busconfig.dtd
+#usr/share/xml/dbus-1/catalog.xml
 #usr/share/xml/dbus-1/introspect.dtd
 var/lib/dbus
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 0c803e964..e2bce72bb 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -66,6 +66,7 @@ usr/libexec/git-core/git-for-each-repo
 usr/libexec/git-core/git-format-patch
 usr/libexec/git-core/git-fsck
 usr/libexec/git-core/git-fsck-objects
+usr/libexec/git-core/git-fsmonitor--daemon
 usr/libexec/git-core/git-gc
 usr/libexec/git-core/git-get-tar-commit-id
 usr/libexec/git-core/git-grep
@@ -73,6 +74,7 @@ usr/libexec/git-core/git-grep
 #usr/libexec/git-core/git-gui--askpass
 usr/libexec/git-core/git-hash-object
 usr/libexec/git-core/git-help
+usr/libexec/git-core/git-hook
 usr/libexec/git-core/git-http-backend
 usr/libexec/git-core/git-http-fetch
 usr/libexec/git-core/git-http-push
diff --git a/config/rootfiles/packages/hplip b/config/rootfiles/packages/hplip
index 4aa5803b9..86b7a4cfc 100644
--- a/config/rootfiles/packages/hplip
+++ b/config/rootfiles/packages/hplip
@@ -1,40 +1,40 @@
-#usr/share/doc/hplip-3.22.2
-#usr/share/doc/hplip-3.22.2/COPYING
-#usr/share/doc/hplip-3.22.2/README_LIBJPG
-#usr/share/doc/hplip-3.22.2/commandline.html
-#usr/share/doc/hplip-3.22.2/copying.html
-#usr/share/doc/hplip-3.22.2/copyright
-#usr/share/doc/hplip-3.22.2/devicemanager.html
-#usr/share/doc/hplip-3.22.2/faxtrouble.html
-#usr/share/doc/hplip-3.22.2/gettinghelp.html
-#usr/share/doc/hplip-3.22.2/hpscan.html
-#usr/share/doc/hplip-3.22.2/images
-#usr/share/doc/hplip-3.22.2/images/favicon.ico
-#usr/share/doc/hplip-3.22.2/images/print.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_actions.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_fax.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_print_control.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_print_settings.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_status.png
-#usr/share/doc/hplip-3.22.2/images/toolbox_supplies.png
-#usr/share/doc/hplip-3.22.2/images/xsane.png
-#usr/share/doc/hplip-3.22.2/index.html
-#usr/share/doc/hplip-3.22.2/mainttask.html
-#usr/share/doc/hplip-3.22.2/plugins.html
-#usr/share/doc/hplip-3.22.2/print.html
-#usr/share/doc/hplip-3.22.2/printing.html
-#usr/share/doc/hplip-3.22.2/printoptions.html
-#usr/share/doc/hplip-3.22.2/printtroubleshooting.html
-#usr/share/doc/hplip-3.22.2/scanning.html
-#usr/share/doc/hplip-3.22.2/scantrouble.html
-#usr/share/doc/hplip-3.22.2/sendfax.html
-#usr/share/doc/hplip-3.22.2/setup.html
-#usr/share/doc/hplip-3.22.2/styles
-#usr/share/doc/hplip-3.22.2/styles/css.css
-#usr/share/doc/hplip-3.22.2/systray.html
-#usr/share/doc/hplip-3.22.2/troubleshooting.html
-#usr/share/doc/hplip-3.22.2/uninstalling.html
-#usr/share/doc/hplip-3.22.2/upgrading.html
+#usr/share/doc/hplip-3.22.4
+#usr/share/doc/hplip-3.22.4/COPYING
+#usr/share/doc/hplip-3.22.4/README_LIBJPG
+#usr/share/doc/hplip-3.22.4/commandline.html
+#usr/share/doc/hplip-3.22.4/copying.html
+#usr/share/doc/hplip-3.22.4/copyright
+#usr/share/doc/hplip-3.22.4/devicemanager.html
+#usr/share/doc/hplip-3.22.4/faxtrouble.html
+#usr/share/doc/hplip-3.22.4/gettinghelp.html
+#usr/share/doc/hplip-3.22.4/hpscan.html
+#usr/share/doc/hplip-3.22.4/images
+#usr/share/doc/hplip-3.22.4/images/favicon.ico
+#usr/share/doc/hplip-3.22.4/images/print.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_actions.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_fax.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_print_control.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_print_settings.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_status.png
+#usr/share/doc/hplip-3.22.4/images/toolbox_supplies.png
+#usr/share/doc/hplip-3.22.4/images/xsane.png
+#usr/share/doc/hplip-3.22.4/index.html
+#usr/share/doc/hplip-3.22.4/mainttask.html
+#usr/share/doc/hplip-3.22.4/plugins.html
+#usr/share/doc/hplip-3.22.4/print.html
+#usr/share/doc/hplip-3.22.4/printing.html
+#usr/share/doc/hplip-3.22.4/printoptions.html
+#usr/share/doc/hplip-3.22.4/printtroubleshooting.html
+#usr/share/doc/hplip-3.22.4/scanning.html
+#usr/share/doc/hplip-3.22.4/scantrouble.html
+#usr/share/doc/hplip-3.22.4/sendfax.html
+#usr/share/doc/hplip-3.22.4/setup.html
+#usr/share/doc/hplip-3.22.4/styles
+#usr/share/doc/hplip-3.22.4/styles/css.css
+#usr/share/doc/hplip-3.22.4/systray.html
+#usr/share/doc/hplip-3.22.4/troubleshooting.html
+#usr/share/doc/hplip-3.22.4/uninstalling.html
+#usr/share/doc/hplip-3.22.4/upgrading.html
 #usr/share/hplip
 usr/share/hplip/dat2drv
 usr/share/hplip/locatedriver
@@ -847,6 +847,10 @@ usr/share/ppd/HP
 #usr/share/ppd/HP/hp-laserjet_p4515tn.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p4515x.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_4001-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_4002-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_4003-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_4004-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_m118-m119-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
@@ -862,6 +866,10 @@ usr/share/ppd/HP
 #usr/share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_4101-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_4102-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_4103-ps.ppd.gz
+#usr/share/ppd/HP/hp-laserjet_pro_mfp_4104-ps.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_mfp_m125nr.ppd.gz
 #usr/share/ppd/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz
diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived
index 4865db0b0..b0fbe7363 100644
--- a/config/rootfiles/packages/keepalived
+++ b/config/rootfiles/packages/keepalived
@@ -1,8 +1,6 @@
 #etc/keepalived
-etc/keepalived/keepalived.conf
+etc/keepalived/keepalived.conf.sample
 etc/keepalived/samples
-#etc/keepalived/samples/client.pem
-#etc/keepalived/samples/dh1024.pem
 #etc/keepalived/samples/keepalived.conf.HTTP_GET.port
 #etc/keepalived/samples/keepalived.conf.IPv6
 #etc/keepalived/samples/keepalived.conf.PING_CHECK
@@ -28,7 +26,6 @@ etc/keepalived/samples
 #etc/keepalived/samples/keepalived.conf.vrrp.scripts
 #etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress
 #etc/keepalived/samples/keepalived.conf.vrrp.sync
-#etc/keepalived/samples/root.pem
 #etc/keepalived/samples/sample.misccheck.smbcheck.sh
 #etc/keepalived/samples/sample_notify_fifo.sh
 etc/rc.d/init.d/keepalived
diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc
index d2a59e059..ba5894dc4 100644
--- a/config/rootfiles/packages/lcdproc
+++ b/config/rootfiles/packages/lcdproc
@@ -1,12 +1,12 @@
-etc/rc.d/init.d/lcdproc
-etc/rc.d/rc0.d/K40lcdproc
-etc/rc.d/rc3.d/S60lcdproc
-etc/rc.d/rc6.d/K40lcdproc
 #etc/lcdproc
 etc/lcdproc/LCDd.conf
 etc/lcdproc/lcdexec.conf
 etc/lcdproc/lcdproc.conf
 etc/lcdproc/lcdvc.conf
+etc/rc.d/init.d/lcdproc
+etc/rc.d/rc0.d/K40lcdproc
+etc/rc.d/rc3.d/S60lcdproc
+etc/rc.d/rc6.d/K40lcdproc
 usr/bin/fortune.pl
 usr/bin/iosock.pl
 usr/bin/lcdexec
@@ -25,10 +25,12 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/MD8800.so
 #usr/lib/lcdproc/MtxOrb.so
 #usr/lib/lcdproc/NoritakeVFD.so
+#usr/lib/lcdproc/Olimex_MOD_LCD1x9.so
 #usr/lib/lcdproc/SureElec.so
 #usr/lib/lcdproc/bayrad.so
 #usr/lib/lcdproc/curses.so
 #usr/lib/lcdproc/ea65.so
+#usr/lib/lcdproc/futaba.so
 #usr/lib/lcdproc/glcd.so
 #usr/lib/lcdproc/glk.so
 #usr/lib/lcdproc/hd44780.so
@@ -40,6 +42,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/lb216.so
 #usr/lib/lcdproc/lcdm001.so
 #usr/lib/lcdproc/lcterm.so
+#usr/lib/lcdproc/linux_input.so
 #usr/lib/lcdproc/ms6931.so
 #usr/lib/lcdproc/mtc_s16209x.so
 #usr/lib/lcdproc/picolcd.so
@@ -57,6 +60,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/text.so
 #usr/lib/lcdproc/tyan.so
 #usr/lib/lcdproc/vlsys_m428.so
+#usr/lib/lcdproc/yard2LCD.so
 usr/sbin/LCDd
 #usr/share/man/man1/lcdexec.1
 #usr/share/man/man1/lcdproc.1
diff --git a/config/rootfiles/packages/libpri b/config/rootfiles/packages/libpri
deleted file mode 100644
index 19fd87485..000000000
--- a/config/rootfiles/packages/libpri
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/include/libpri.h
-#usr/lib/libpri.a
-usr/lib/libpri.so
-usr/lib/libpri.so.1.4
diff --git a/config/rootfiles/packages/libseccomp b/config/rootfiles/packages/libseccomp
index e7f19721a..ff8d4dcae 100644
--- a/config/rootfiles/packages/libseccomp
+++ b/config/rootfiles/packages/libseccomp
@@ -4,7 +4,7 @@ usr/bin/scmp_sys_resolver
 #usr/lib/libseccomp.la
 #usr/lib/libseccomp.so
 usr/lib/libseccomp.so.2
-usr/lib/libseccomp.so.2.5.3
+usr/lib/libseccomp.so.2.5.4
 #usr/lib/pkgconfig/libseccomp.pc
 #usr/share/man/man1/scmp_sys_resolver.1
 #usr/share/man/man3/seccomp_api_get.3
diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv
deleted file mode 100644
index 8a9c1a246..000000000
--- a/config/rootfiles/packages/libsolv
+++ /dev/null
@@ -1,52 +0,0 @@
-#usr/include/solv
-#usr/include/solv/bitmap.h
-#usr/include/solv/chksum.h
-#usr/include/solv/dataiterator.h
-#usr/include/solv/dirpool.h
-#usr/include/solv/evr.h
-#usr/include/solv/hash.h
-#usr/include/solv/knownid.h
-#usr/include/solv/policy.h
-#usr/include/solv/pool.h
-#usr/include/solv/poolarch.h
-#usr/include/solv/poolid.h
-#usr/include/solv/pooltypes.h
-#usr/include/solv/poolvendor.h
-#usr/include/solv/problems.h
-#usr/include/solv/queue.h
-#usr/include/solv/repo.h
-#usr/include/solv/repo_solv.h
-#usr/include/solv/repo_write.h
-#usr/include/solv/repodata.h
-#usr/include/solv/rules.h
-#usr/include/solv/selection.h
-#usr/include/solv/solv_xfopen.h
-#usr/include/solv/solvable.h
-#usr/include/solv/solver.h
-#usr/include/solv/solverdebug.h
-#usr/include/solv/solvversion.h
-#usr/include/solv/strpool.h
-#usr/include/solv/testcase.h
-#usr/include/solv/tools_util.h
-#usr/include/solv/transaction.h
-#usr/include/solv/util.h
-#usr/lib/libsolv.so
-usr/lib/libsolv.so.1
-#usr/lib/libsolvext.so
-usr/lib/libsolvext.so.1
-#usr/lib/pkgconfig/libsolv.pc
-#usr/lib/pkgconfig/libsolvext.pc
-#usr/share/cmake
-#usr/share/cmake/Modules
-#usr/share/cmake/Modules/FindLibSolv.cmake
-#usr/share/man/man1/dumpsolv.1
-#usr/share/man/man1/installcheck.1
-#usr/share/man/man1/mergesolv.1
-#usr/share/man/man1/repo2solv.1
-#usr/share/man/man1/solv.1
-#usr/share/man/man1/testsolv.1
-#usr/share/man/man3/libsolv-bindings.3
-#usr/share/man/man3/libsolv-constantids.3
-#usr/share/man/man3/libsolv-history.3
-#usr/share/man/man3/libsolv-pool.3
-#usr/share/man/man3/libsolv.3
diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 1faf7ee76..9d063581b 100644
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -158,6 +158,7 @@ usr/share/mc/syntax/debian-sources-list.syntax
 usr/share/mc/syntax/diff.syntax
 usr/share/mc/syntax/dlink.syntax
 usr/share/mc/syntax/dos.syntax
+usr/share/mc/syntax/dot.syntax
 usr/share/mc/syntax/ebuild.syntax
 usr/share/mc/syntax/eiffel.syntax
 usr/share/mc/syntax/erlang.syntax
@@ -173,9 +174,9 @@ usr/share/mc/syntax/idl.syntax
 usr/share/mc/syntax/ini.syntax
 usr/share/mc/syntax/j.syntax
 usr/share/mc/syntax/jal.syntax
-usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
+usr/share/mc/syntax/json.syntax
 usr/share/mc/syntax/kotlin.syntax
 usr/share/mc/syntax/latex.syntax
 usr/share/mc/syntax/lisp.syntax
@@ -211,6 +212,7 @@ usr/share/mc/syntax/sh.syntax
 usr/share/mc/syntax/slang.syntax
 usr/share/mc/syntax/smalltalk.syntax
 usr/share/mc/syntax/spec.syntax
+usr/share/mc/syntax/spice.syntax
 usr/share/mc/syntax/sql.syntax
 usr/share/mc/syntax/strace.syntax
 usr/share/mc/syntax/swift.syntax
diff --git a/config/rootfiles/packages/netpbm b/config/rootfiles/packages/netpbm
deleted file mode 100644
index e3e13fa36..000000000
--- a/config/rootfiles/packages/netpbm
+++ /dev/null
@@ -1,397 +0,0 @@
-#usr/bin/411toppm
-#usr/bin/anytopnm
-#usr/bin/asciitopgm
-#usr/bin/atktopbm
-#usr/bin/avstopam
-#usr/bin/bioradtopgm
-#usr/bin/bmptopnm
-#usr/bin/bmptoppm
-#usr/bin/brushtopbm
-#usr/bin/cameratopam
-#usr/bin/cistopbm
-#usr/bin/cmuwmtopbm
-#usr/bin/ddbugtopbm
-#usr/bin/doc.url
-#usr/bin/escp2topbm
-#usr/bin/eyuvtoppm
-#usr/bin/fiascotopnm
-#usr/bin/fitstopnm
-#usr/bin/fstopgm
-#usr/bin/g3topbm
-#usr/bin/gemtopbm
-#usr/bin/gemtopnm
-#usr/bin/giftopnm
-#usr/bin/gouldtoppm
-#usr/bin/hdifftopam
-#usr/bin/hipstopgm
-#usr/bin/hpcdtoppm
-#usr/bin/icontopbm
-#usr/bin/ilbmtoppm
-#usr/bin/imgtoppm
-#usr/bin/infotopam
-#usr/bin/jbigtopnm
-#usr/bin/jpeg2ktopam
-#usr/bin/jpegtopnm
-#usr/bin/leaftoppm
-#usr/bin/lispmtopgm
-#usr/bin/macptopbm
-#usr/bin/manweb
-#usr/bin/mdatopbm
-#usr/bin/mgrtopbm
-#usr/bin/mrftopbm
-#usr/bin/mtvtoppm
-#usr/bin/neotoppm
-#usr/bin/palmtopnm
-#usr/bin/pamaddnoise
-#usr/bin/pamarith
-#usr/bin/pambackground
-#usr/bin/pambayer
-#usr/bin/pamchannel
-#usr/bin/pamcomp
-#usr/bin/pamcrater
-#usr/bin/pamcut
-#usr/bin/pamdeinterlace
-#usr/bin/pamdepth
-#usr/bin/pamdice
-#usr/bin/pamditherbw
-#usr/bin/pamedge
-#usr/bin/pamendian
-#usr/bin/pamenlarge
-#usr/bin/pamexec
-#usr/bin/pamfile
-#usr/bin/pamfix
-#usr/bin/pamfixtrunc
-#usr/bin/pamflip
-#usr/bin/pamfunc
-#usr/bin/pamgauss
-#usr/bin/pamgradient
-#usr/bin/pamlookup
-#usr/bin/pammasksharpen
-#usr/bin/pammixinterlace
-#usr/bin/pammosaicknit
-#usr/bin/pamoil
-#usr/bin/pampaintspill
-#usr/bin/pamperspective
-#usr/bin/pampick
-#usr/bin/pampop9
-#usr/bin/pamrecolor
-#usr/bin/pamrgbatopng
-#usr/bin/pamrubber
-#usr/bin/pamscale
-#usr/bin/pamseq
-#usr/bin/pamshadedrelief
-#usr/bin/pamsharpmap
-#usr/bin/pamsharpness
-#usr/bin/pamsistoaglyph
-#usr/bin/pamslice
-#usr/bin/pamsplit
-#usr/bin/pamstack
-#usr/bin/pamstereogram
-#usr/bin/pamstretch
-#usr/bin/pamstretch-gen
-#usr/bin/pamsumm
-#usr/bin/pamsummcol
-#usr/bin/pamthreshold
-#usr/bin/pamtilt
-#usr/bin/pamtoavs
-#usr/bin/pamtodjvurle
-#usr/bin/pamtofits
-#usr/bin/pamtogif
-#usr/bin/pamtohdiff
-#usr/bin/pamtohtmltbl
-#usr/bin/pamtojpeg2k
-#usr/bin/pamtompfont
-#usr/bin/pamtooctaveimg
-#usr/bin/pamtopam
-#usr/bin/pamtopdbimg
-#usr/bin/pamtopfm
-#usr/bin/pamtopng
-#usr/bin/pamtopnm
-#usr/bin/pamtosrf
-#usr/bin/pamtosvg
-#usr/bin/pamtotga
-#usr/bin/pamtotiff
-#usr/bin/pamtouil
-#usr/bin/pamtowinicon
-#usr/bin/pamtoxvmini
-#usr/bin/pamundice
-#usr/bin/pamunlookup
-#usr/bin/pamvalidate
-#usr/bin/pamwipeout
-#usr/bin/pbmclean
-#usr/bin/pbmlife
-#usr/bin/pbmmake
-#usr/bin/pbmmask
-#usr/bin/pbmminkowski
-#usr/bin/pbmpage
-#usr/bin/pbmpscale
-#usr/bin/pbmreduce
-#usr/bin/pbmtext
-#usr/bin/pbmtextps
-#usr/bin/pbmto10x
-#usr/bin/pbmto4425
-#usr/bin/pbmtoascii
-#usr/bin/pbmtoatk
-#usr/bin/pbmtobbnbg
-#usr/bin/pbmtocis
-#usr/bin/pbmtocmuwm
-#usr/bin/pbmtodjvurle
-#usr/bin/pbmtoepsi
-#usr/bin/pbmtoepson
-#usr/bin/pbmtoescp2
-#usr/bin/pbmtog3
-#usr/bin/pbmtogem
-#usr/bin/pbmtogo
-#usr/bin/pbmtoibm23xx
-#usr/bin/pbmtoicon
-#usr/bin/pbmtolj
-#usr/bin/pbmtoln03
-#usr/bin/pbmtolps
-#usr/bin/pbmtomacp
-#usr/bin/pbmtomatrixorbital
-#usr/bin/pbmtomda
-#usr/bin/pbmtomgr
-#usr/bin/pbmtomrf
-#usr/bin/pbmtonokia
-#usr/bin/pbmtopgm
-#usr/bin/pbmtopi3
-#usr/bin/pbmtopk
-#usr/bin/pbmtoplot
-#usr/bin/pbmtoppa
-#usr/bin/pbmtopsg3
-#usr/bin/pbmtoptx
-#usr/bin/pbmtosunicon
-#usr/bin/pbmtowbmp
-#usr/bin/pbmtox10bm
-#usr/bin/pbmtoxbm
-#usr/bin/pbmtoybm
-#usr/bin/pbmtozinc
-#usr/bin/pbmupc
-#usr/bin/pc1toppm
-#usr/bin/pcdovtoppm
-#usr/bin/pcxtoppm
-#usr/bin/pdbimgtopam
-#usr/bin/pfmtopam
-#usr/bin/pgmabel
-#usr/bin/pgmbentley
-#usr/bin/pgmcrater
-#usr/bin/pgmdeshadow
-#usr/bin/pgmedge
-#usr/bin/pgmenhance
-#usr/bin/pgmhist
-#usr/bin/pgmkernel
-#usr/bin/pgmmake
-#usr/bin/pgmmedian
-#usr/bin/pgmminkowski
-#usr/bin/pgmmorphconv
-#usr/bin/pgmnoise
-#usr/bin/pgmnorm
-#usr/bin/pgmoil
-#usr/bin/pgmramp
-#usr/bin/pgmslice
-#usr/bin/pgmtexture
-#usr/bin/pgmtofs
-#usr/bin/pgmtolispm
-#usr/bin/pgmtopbm
-#usr/bin/pgmtopgm
-#usr/bin/pgmtoppm
-#usr/bin/pgmtosbig
-#usr/bin/pgmtost4
-#usr/bin/pi1toppm
-#usr/bin/pi3topbm
-#usr/bin/picttoppm
-#usr/bin/pjtoppm
-#usr/bin/pktopbm
-#usr/bin/pngtopam
-#usr/bin/pngtopnm
-#usr/bin/pnmalias
-#usr/bin/pnmarith
-#usr/bin/pnmcat
-#usr/bin/pnmcolormap
-#usr/bin/pnmcomp
-#usr/bin/pnmconvol
-#usr/bin/pnmcrop
-#usr/bin/pnmcut
-#usr/bin/pnmdepth
-#usr/bin/pnmenlarge
-#usr/bin/pnmfile
-#usr/bin/pnmflip
-#usr/bin/pnmgamma
-#usr/bin/pnmhisteq
-#usr/bin/pnmhistmap
-#usr/bin/pnmindex
-#usr/bin/pnminterp
-#usr/bin/pnminvert
-#usr/bin/pnmmargin
-#usr/bin/pnmmercator
-#usr/bin/pnmmontage
-#usr/bin/pnmnlfilt
-#usr/bin/pnmnoraw
-#usr/bin/pnmnorm
-#usr/bin/pnmpad
-#usr/bin/pnmpaste
-#usr/bin/pnmpsnr
-#usr/bin/pnmquant
-#usr/bin/pnmquantall
-#usr/bin/pnmremap
-#usr/bin/pnmrotate
-#usr/bin/pnmscale
-#usr/bin/pnmscalefixed
-#usr/bin/pnmshear
-#usr/bin/pnmsmooth
-#usr/bin/pnmsplit
-#usr/bin/pnmstitch
-#usr/bin/pnmtile
-#usr/bin/pnmtoddif
-#usr/bin/pnmtofiasco
-#usr/bin/pnmtofits
-#usr/bin/pnmtojbig
-usr/bin/pnmtojpeg
-#usr/bin/pnmtopalm
-#usr/bin/pnmtopclxl
-#usr/bin/pnmtoplainpnm
-usr/bin/pnmtopng
-#usr/bin/pnmtopnm
-#usr/bin/pnmtops
-#usr/bin/pnmtorast
-#usr/bin/pnmtorle
-#usr/bin/pnmtosgi
-#usr/bin/pnmtosir
-usr/bin/pnmtotiff
-#usr/bin/pnmtotiffcmyk
-#usr/bin/pnmtoxwd
-#usr/bin/ppm3d
-#usr/bin/ppmbrighten
-#usr/bin/ppmchange
-#usr/bin/ppmcie
-#usr/bin/ppmcolormask
-#usr/bin/ppmcolors
-#usr/bin/ppmdcfont
-#usr/bin/ppmddumpfont
-#usr/bin/ppmdim
-#usr/bin/ppmdist
-#usr/bin/ppmdither
-#usr/bin/ppmdmkfont
-#usr/bin/ppmdraw
-#usr/bin/ppmfade
-#usr/bin/ppmflash
-#usr/bin/ppmforge
-#usr/bin/ppmglobe
-#usr/bin/ppmhist
-#usr/bin/ppmlabel
-#usr/bin/ppmmake
-#usr/bin/ppmmix
-#usr/bin/ppmnorm
-#usr/bin/ppmntsc
-#usr/bin/ppmpat
-#usr/bin/ppmquant
-#usr/bin/ppmquantall
-#usr/bin/ppmrainbow
-#usr/bin/ppmrelief
-#usr/bin/ppmrough
-#usr/bin/ppmshadow
-#usr/bin/ppmshift
-#usr/bin/ppmspread
-#usr/bin/ppmtoacad
-#usr/bin/ppmtoapplevol
-#usr/bin/ppmtoarbtxt
-#usr/bin/ppmtoascii
-#usr/bin/ppmtobmp
-#usr/bin/ppmtoeyuv
-#usr/bin/ppmtogif
-#usr/bin/ppmtoicr
-#usr/bin/ppmtoilbm
-#usr/bin/ppmtojpeg
-#usr/bin/ppmtoleaf
-#usr/bin/ppmtolj
-#usr/bin/ppmtomap
-#usr/bin/ppmtomitsu
-#usr/bin/ppmtompeg
-#usr/bin/ppmtoneo
-#usr/bin/ppmtopcx
-#usr/bin/ppmtopgm
-#usr/bin/ppmtopi1
-#usr/bin/ppmtopict
-#usr/bin/ppmtopj
-#usr/bin/ppmtopjxl
-#usr/bin/ppmtoppm
-#usr/bin/ppmtopuzz
-#usr/bin/ppmtorgb3
-#usr/bin/ppmtosixel
-#usr/bin/ppmtospu
-#usr/bin/ppmtoterm
-#usr/bin/ppmtotga
-#usr/bin/ppmtouil
-#usr/bin/ppmtowinicon
-#usr/bin/ppmtoxpm
-#usr/bin/ppmtoyuv
-#usr/bin/ppmtoyuvsplit
-#usr/bin/ppmtv
-#usr/bin/ppmwheel
-#usr/bin/psidtopgm
-#usr/bin/pstopnm
-#usr/bin/qrttoppm
-#usr/bin/rasttopnm
-#usr/bin/rawtopgm
-#usr/bin/rawtoppm
-#usr/bin/rgb3toppm
-#usr/bin/rlatopam
-#usr/bin/rletopnm
-#usr/bin/sbigtopgm
-#usr/bin/sgitopnm
-#usr/bin/sirtopnm
-#usr/bin/sldtoppm
-#usr/bin/spctoppm
-#usr/bin/spottopgm
-#usr/bin/sputoppm
-#usr/bin/srftopam
-#usr/bin/st4topgm
-#usr/bin/sunicontopnm
-#usr/bin/svgtopam
-#usr/bin/tgatoppm
-#usr/bin/thinkjettopbm
-#usr/bin/tifftopnm
-#usr/bin/wbmptopbm
-#usr/bin/winicontopam
-#usr/bin/winicontoppm
-#usr/bin/xbmtopbm
-#usr/bin/ximtoppm
-#usr/bin/xpmtoppm
-#usr/bin/xvminitoppm
-#usr/bin/xwdtopnm
-#usr/bin/ybmtopbm
-#usr/bin/yuvsplittoppm
-#usr/bin/yuvtoppm
-#usr/bin/yuy2topam
-#usr/bin/zeisstopnm
-#usr/include/netpbm
-#usr/include/netpbm/colorname.h
-#usr/include/netpbm/mallocvar.h
-#usr/include/netpbm/pam.h
-#usr/include/netpbm/pamdraw.h
-#usr/include/netpbm/pammap.h
-#usr/include/netpbm/pbm.h
-#usr/include/netpbm/pbmfont.h
-#usr/include/netpbm/pgm.h
-#usr/include/netpbm/pm.h
-#usr/include/netpbm/pm_config.h
-#usr/include/netpbm/pm_gamma.h
-#usr/include/netpbm/pm_system.h
-#usr/include/netpbm/pnm.h
-#usr/include/netpbm/ppm.h
-#usr/include/netpbm/ppmcmap.h
-#usr/include/netpbm/ppmdfont.h
-#usr/include/netpbm/ppmdraw.h
-#usr/include/netpbm/ppmfloyd.h
-#usr/include/netpbm/runlength.h
-#usr/include/netpbm/shhopt.h
-usr/lib/libnetpbm.so
-usr/lib/libnetpbm.so.11
-usr/lib/libnetpbm.so.11.73
-#usr/share/netpbm
-usr/share/netpbm/palmcolor8.map
-usr/share/netpbm/palmgray1.map
-usr/share/netpbm/palmgray2.map
-usr/share/netpbm/palmgray4.map
-usr/share/netpbm/pcxstd.ppm
-#usr/share/netpbm/rgb.txt
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index 18034fd82..8c4fb78da 100644
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -1,6 +1,8 @@
 usr/bin/nmap
 usr/bin/nping
 #usr/share/man/de/man1/nmap.1
+#usr/share/man/es
+#usr/share/man/es/man1
 #usr/share/man/es/man1/nmap.1
 #usr/share/man/fr/man1/nmap.1
 #usr/share/man/hr
@@ -10,6 +12,8 @@ usr/bin/nping
 #usr/share/man/hu/man1
 #usr/share/man/hu/man1/nmap.1
 #usr/share/man/it/man1/nmap.1
+#usr/share/man/ja
+#usr/share/man/ja/man1
 #usr/share/man/ja/man1/nmap.1
 #usr/share/man/man1/nmap.1
 #usr/share/man/man1/nping.1
diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut
index b01381d74..3bf9d03a9 100644
--- a/config/rootfiles/packages/nut
+++ b/config/rootfiles/packages/nut
@@ -5,6 +5,7 @@ etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
+etc/rc.d/init.d/nut
 etc/udev/rules.d/62-nut-usbups.rules
 usr/bin/al175
 usr/bin/apcsmart
@@ -36,10 +37,11 @@ usr/bin/metasys
 usr/bin/mge-shut
 usr/bin/mge-utalk
 usr/bin/microdowell
+usr/bin/microsol-apc
 usr/bin/nut-scanner
 usr/bin/nutdrv_atcl_usb
 usr/bin/nutdrv_qx
-usr/bin/oldmge-shut
+usr/bin/nutdrv_siemens-sitop
 usr/bin/oneac
 usr/bin/optiups
 usr/bin/powercom
@@ -63,21 +65,22 @@ usr/bin/upsrw
 usr/bin/upssched-cmd
 usr/bin/usbhid-ups
 usr/bin/victronups
-#usr/lib/libnutclient.a
 #usr/lib/libnutclient.la
-usr/lib/libnutclient.so
-usr/lib/libnutclient.so.0
-usr/lib/libnutclient.so.0.0.0
-#usr/lib/libnutscan.a
+#usr/lib/libnutclient.so
+usr/lib/libnutclient.so.2
+usr/lib/libnutclient.so.2.0.0
+#usr/lib/libnutclientstub.la
+#usr/lib/libnutclientstub.so
+usr/lib/libnutclientstub.so.1
+usr/lib/libnutclientstub.so.1.0.0
 #usr/lib/libnutscan.la
-usr/lib/libnutscan.so
-usr/lib/libnutscan.so.1
-usr/lib/libnutscan.so.1.0.0
-#usr/lib/libupsclient.a
+#usr/lib/libnutscan.so
+usr/lib/libnutscan.so.2
+usr/lib/libnutscan.so.2.0.0
 #usr/lib/libupsclient.la
-usr/lib/libupsclient.so
-usr/lib/libupsclient.so.4
-usr/lib/libupsclient.so.4.0.0
+#usr/lib/libupsclient.so
+usr/lib/libupsclient.so.6
+usr/lib/libupsclient.so.6.0.0
 usr/sbin/upsd
 usr/sbin/upsdrvctl
 usr/sbin/upsmon
@@ -119,10 +122,13 @@ usr/share/driver.list
 #usr/share/man/man8/mge-shut.8
 #usr/share/man/man8/mge-utalk.8
 #usr/share/man/man8/microdowell.8
+#usr/share/man/man8/microsol-apc.8
+#usr/share/man/man8/nut-driver-enumerator.8
 #usr/share/man/man8/nut-recorder.8
 #usr/share/man/man8/nut-scanner.8
 #usr/share/man/man8/nutdrv_atcl_usb.8
 #usr/share/man/man8/nutdrv_qx.8
+#usr/share/man/man8/nutdrv_siemens_sitop.8
 #usr/share/man/man8/nutupsdrv.8
 #usr/share/man/man8/oneac.8
 #usr/share/man/man8/optiups.8
@@ -143,12 +149,14 @@ usr/share/driver.list
 #usr/share/man/man8/upscode2.8
 #usr/share/man/man8/upsd.8
 #usr/share/man/man8/upsdrvctl.8
+#usr/share/man/man8/upsdrvsvcctl.8
 #usr/share/man/man8/upslog.8
 #usr/share/man/man8/upsmon.8
 #usr/share/man/man8/upsrw.8
 #usr/share/man/man8/upssched.8
 #usr/share/man/man8/usbhid-ups.8
 #usr/share/man/man8/victronups.8
+#usr/share/solaris-init
+#usr/share/solaris-init/nut
 var/ipfire/backup/addons/includes/nut
 var/state/ups
-etc/rc.d/init.d/nut
diff --git a/config/rootfiles/packages/oci-cli b/config/rootfiles/packages/oci-cli
index 8f500d888..a6dc0f315 100644
--- a/config/rootfiles/packages/oci-cli
+++ b/config/rootfiles/packages/oci-cli
@@ -4,13 +4,13 @@ usr/lib/python3.10/site-packages/common_util
 usr/lib/python3.10/site-packages/common_util/__init__.py
 usr/lib/python3.10/site-packages/common_util/ignored_commands.py
 usr/lib/python3.10/site-packages/oci_cli
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/oci_cli-3.4.2-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/PKG-INFO
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/SOURCES.txt
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/dependency_links.txt
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/entry_points.txt
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/requires.txt
+usr/lib/python3.10/site-packages/oci_cli-3.7.3-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/oci_cli/__init__.py
 usr/lib/python3.10/site-packages/oci_cli/aliasing
 usr/lib/python3.10/site-packages/oci_cli/aliasing/__init__.py
@@ -88,6 +88,32 @@ usr/lib/python3.10/site-packages/services/ai_language/src/oci_cli_ai_service_lan
 usr/lib/python3.10/site-packages/services/ai_language/src/oci_cli_ai_service_language/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ai_language/tests
 usr/lib/python3.10/site-packages/services/ai_language/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_speech
+usr/lib/python3.10/site-packages/services/ai_speech/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_speech/src
+usr/lib/python3.10/site-packages/services/ai_speech/src/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech
+usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/__init__.py
+usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/aiservicespeech_cli_extended.py
+#usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/generated
+usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/generated/__init__.py
+usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/generated/aiservicespeech_cli.py
+usr/lib/python3.10/site-packages/services/ai_speech/src/oci_cli_ai_service_speech/generated/client_mappings.py
+#usr/lib/python3.10/site-packages/services/ai_speech/tests
+usr/lib/python3.10/site-packages/services/ai_speech/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_vision
+usr/lib/python3.10/site-packages/services/ai_vision/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_vision/src
+usr/lib/python3.10/site-packages/services/ai_vision/src/__init__.py
+#usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision
+usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/__init__.py
+usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/aiservicevision_cli_extended.py
+#usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/generated
+usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/generated/__init__.py
+usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/generated/aiservicevision_cli.py
+usr/lib/python3.10/site-packages/services/ai_vision/src/oci_cli_ai_service_vision/generated/client_mappings.py
+#usr/lib/python3.10/site-packages/services/ai_vision/tests
+usr/lib/python3.10/site-packages/services/ai_vision/tests/__init__.py
 usr/lib/python3.10/site-packages/services/analytics
 usr/lib/python3.10/site-packages/services/analytics/__init__.py
 usr/lib/python3.10/site-packages/services/analytics/src
@@ -112,6 +138,13 @@ usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_anno
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement/generated/__init__.py
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement/generated/announcement_cli.py
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement/generated/client_mappings.py
+#usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription
+usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/__init__.py
+usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/announcementsubscription_cli_extended.py
+#usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/generated
+usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/generated/__init__.py
+usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/generated/announcementsubscription_cli.py
+usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcement_subscription/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcements_preferences
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcements_preferences/__init__.py
 usr/lib/python3.10/site-packages/services/announcements_service/src/oci_cli_announcements_preferences/announcementspreferences_cli_extended.py
@@ -489,6 +522,31 @@ usr/lib/python3.10/site-packages/services/core/src/oci_cli_virtual_network/gener
 usr/lib/python3.10/site-packages/services/core/src/oci_cli_virtual_network/virtualnetwork_cli_extended.py
 usr/lib/python3.10/site-packages/services/core/tests
 usr/lib/python3.10/site-packages/services/core/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/dashboard_service
+usr/lib/python3.10/site-packages/services/dashboard_service/__init__.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src
+usr/lib/python3.10/site-packages/services/dashboard_service/src/__init__.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/__init__.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/dashboard_cli_extended.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/generated
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/generated/__init__.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard/generated/dashboard_cli.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/__init__.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/dashboardgroup_cli_extended.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/generated
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/generated/__init__.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_group/generated/dashboardgroup_cli.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_service
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_service/__init__.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_service/generated
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_service/generated/__init__.py
+usr/lib/python3.10/site-packages/services/dashboard_service/src/oci_cli_dashboard_service/generated/dashboard_service_service_cli.py
+#usr/lib/python3.10/site-packages/services/dashboard_service/tests
+usr/lib/python3.10/site-packages/services/dashboard_service/tests/__init__.py
 usr/lib/python3.10/site-packages/services/data_catalog
 usr/lib/python3.10/site-packages/services/data_catalog/__init__.py
 usr/lib/python3.10/site-packages/services/data_catalog/src
@@ -502,186 +560,211 @@ usr/lib/python3.10/site-packages/services/data_catalog/src/oci_cli_data_catalog/
 usr/lib/python3.10/site-packages/services/data_catalog/src/oci_cli_data_catalog/generated/datacatalog_cli.py
 usr/lib/python3.10/site-packages/services/data_catalog/tests
 usr/lib/python3.10/site-packages/services/data_catalog/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_flow
+#usr/lib/python3.10/site-packages/services/data_connectivity
+usr/lib/python3.10/site-packages/services/data_connectivity/__init__.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src
+usr/lib/python3.10/site-packages/services/data_connectivity/src/__init__.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity/__init__.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity/generated
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity/generated/__init__.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity/generated/data_connectivity_service_cli.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/__init__.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/dataconnectivitymanagement_cli_extended.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/generated
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/generated/__init__.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_data_connectivity_management/generated/dataconnectivitymanagement_cli.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/__init__.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/generated
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/generated/__init__.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/generated/networkvalidation_cli.py
+usr/lib/python3.10/site-packages/services/data_connectivity/src/oci_cli_network_validation/networkvalidation_cli_extended.py
+#usr/lib/python3.10/site-packages/services/data_connectivity/tests
+usr/lib/python3.10/site-packages/services/data_connectivity/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/data_flow
 usr/lib/python3.10/site-packages/services/data_flow/__init__.py
-usr/lib/python3.10/site-packages/services/data_flow/src
+#usr/lib/python3.10/site-packages/services/data_flow/src
 usr/lib/python3.10/site-packages/services/data_flow/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow
+#usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow
 usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/__init__.py
 usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/dataflow_cli_extended.py
-usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/generated
+#usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/generated
 usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py
-usr/lib/python3.10/site-packages/services/data_flow/tests
+#usr/lib/python3.10/site-packages/services/data_flow/tests
 usr/lib/python3.10/site-packages/services/data_flow/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_integration
+#usr/lib/python3.10/site-packages/services/data_integration
 usr/lib/python3.10/site-packages/services/data_integration/__init__.py
-usr/lib/python3.10/site-packages/services/data_integration/src
+#usr/lib/python3.10/site-packages/services/data_integration/src
 usr/lib/python3.10/site-packages/services/data_integration/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration
+#usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration
 usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/__init__.py
 usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/dataintegration_cli_extended.py
-usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/generated
+#usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/generated
 usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_integration/src/oci_cli_data_integration/generated/dataintegration_cli.py
-usr/lib/python3.10/site-packages/services/data_integration/tests
+#usr/lib/python3.10/site-packages/services/data_integration/tests
 usr/lib/python3.10/site-packages/services/data_integration/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service
+#usr/lib/python3.10/site-packages/services/data_labeling_service
 usr/lib/python3.10/site-packages/services/data_labeling_service/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service/src
+#usr/lib/python3.10/site-packages/services/data_labeling_service/src
 usr/lib/python3.10/site-packages/services/data_labeling_service/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management
+#usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management
 usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/generated
+#usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/generated
 usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_labeling_service/src/oci_cli_data_labeling_management/generated/datalabelingmanagement_cli.py
-usr/lib/python3.10/site-packages/services/data_labeling_service/tests
+#usr/lib/python3.10/site-packages/services/data_labeling_service/tests
 usr/lib/python3.10/site-packages/services/data_labeling_service/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane
+#usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src
+#usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling
+#usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/__init__.py
-usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated
+#usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/src/oci_cli_data_labeling/generated/datalabeling_cli.py
-usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/tests
+#usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/tests
 usr/lib/python3.10/site-packages/services/data_labeling_service_dataplane/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_safe
+#usr/lib/python3.10/site-packages/services/data_safe
 usr/lib/python3.10/site-packages/services/data_safe/__init__.py
-usr/lib/python3.10/site-packages/services/data_safe/src
+#usr/lib/python3.10/site-packages/services/data_safe/src
 usr/lib/python3.10/site-packages/services/data_safe/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe
+#usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe
 usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/__init__.py
 usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/datasafe_cli_extended.py
-usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/generated
+#usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/generated
 usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_safe/src/oci_cli_data_safe/generated/datasafe_cli.py
-usr/lib/python3.10/site-packages/services/data_safe/tests
+#usr/lib/python3.10/site-packages/services/data_safe/tests
 usr/lib/python3.10/site-packages/services/data_safe/tests/__init__.py
-usr/lib/python3.10/site-packages/services/data_science
+#usr/lib/python3.10/site-packages/services/data_science
 usr/lib/python3.10/site-packages/services/data_science/__init__.py
-usr/lib/python3.10/site-packages/services/data_science/src
+#usr/lib/python3.10/site-packages/services/data_science/src
 usr/lib/python3.10/site-packages/services/data_science/src/__init__.py
-usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science
+#usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science
 usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/__init__.py
 usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/datascience_cli_extended.py
-usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/generated
+#usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/generated
 usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/generated/__init__.py
 usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/data_science/src/oci_cli_data_science/generated/datascience_cli.py
-usr/lib/python3.10/site-packages/services/data_science/tests
+#usr/lib/python3.10/site-packages/services/data_science/tests
 usr/lib/python3.10/site-packages/services/data_science/tests/__init__.py
-usr/lib/python3.10/site-packages/services/database
+#usr/lib/python3.10/site-packages/services/database
 usr/lib/python3.10/site-packages/services/database/__init__.py
-usr/lib/python3.10/site-packages/services/database/src
+#usr/lib/python3.10/site-packages/services/database/src
 usr/lib/python3.10/site-packages/services/database/src/__init__.py
-usr/lib/python3.10/site-packages/services/database/src/oci_cli_database
+#usr/lib/python3.10/site-packages/services/database/src/oci_cli_database
 usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/__init__.py
 usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/database_cli_extended.py
-usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/generated
+#usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/generated
 usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/database/src/oci_cli_database/generated/database_cli.py
-usr/lib/python3.10/site-packages/services/database/tests
+#usr/lib/python3.10/site-packages/services/database/tests
 usr/lib/python3.10/site-packages/services/database/tests/__init__.py
-usr/lib/python3.10/site-packages/services/database_management
+#usr/lib/python3.10/site-packages/services/database_management
 usr/lib/python3.10/site-packages/services/database_management/__init__.py
-usr/lib/python3.10/site-packages/services/database_management/src
+#usr/lib/python3.10/site-packages/services/database_management/src
 usr/lib/python3.10/site-packages/services/database_management/src/__init__.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management/__init__.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management/generated
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management/generated
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_database_management/generated/database_management_service_cli.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/__init__.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/dbmanagement_cli_extended.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/generated
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/generated
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_db_management/generated/dbmanagement_cli.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/__init__.py
-usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/generated
+#usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/generated
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/generated/sqltuning_cli.py
 usr/lib/python3.10/site-packages/services/database_management/src/oci_cli_sql_tuning/sqltuning_cli_extended.py
-usr/lib/python3.10/site-packages/services/database_management/tests
+#usr/lib/python3.10/site-packages/services/database_management/tests
 usr/lib/python3.10/site-packages/services/database_management/tests/__init__.py
-usr/lib/python3.10/site-packages/services/database_migration
+#usr/lib/python3.10/site-packages/services/database_migration
 usr/lib/python3.10/site-packages/services/database_migration/__init__.py
-usr/lib/python3.10/site-packages/services/database_migration/src
+#usr/lib/python3.10/site-packages/services/database_migration/src
 usr/lib/python3.10/site-packages/services/database_migration/src/__init__.py
-usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration
+#usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration
 usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/__init__.py
 usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/databasemigration_cli_extended.py
-usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/generated
+#usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/generated
 usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/database_migration/src/oci_cli_database_migration/generated/databasemigration_cli.py
-usr/lib/python3.10/site-packages/services/database_migration/tests
+#usr/lib/python3.10/site-packages/services/database_migration/tests
 usr/lib/python3.10/site-packages/services/database_migration/tests/__init__.py
-usr/lib/python3.10/site-packages/services/database_tools
+#usr/lib/python3.10/site-packages/services/database_tools
 usr/lib/python3.10/site-packages/services/database_tools/__init__.py
-usr/lib/python3.10/site-packages/services/database_tools/src
+#usr/lib/python3.10/site-packages/services/database_tools/src
 usr/lib/python3.10/site-packages/services/database_tools/src/__init__.py
-usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools
+#usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools
 usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/__init__.py
 usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/databasetools_cli_extended.py
-usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/generated
+#usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/generated
 usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/generated/__init__.py
 usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/database_tools/src/oci_cli_database_tools/generated/databasetools_cli.py
-usr/lib/python3.10/site-packages/services/database_tools/tests
+#usr/lib/python3.10/site-packages/services/database_tools/tests
 usr/lib/python3.10/site-packages/services/database_tools/tests/__init__.py
-usr/lib/python3.10/site-packages/services/devops
+#usr/lib/python3.10/site-packages/services/devops
 usr/lib/python3.10/site-packages/services/devops/__init__.py
-usr/lib/python3.10/site-packages/services/devops/src
+#usr/lib/python3.10/site-packages/services/devops/src
 usr/lib/python3.10/site-packages/services/devops/src/__init__.py
-usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops
+#usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/__init__.py
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/devops_build_cli_extended.py
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/devops_cli_extended.py
-usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/generated
+#usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/generated
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/generated/__init__.py
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/devops/src/oci_cli_devops/generated/devops_cli.py
-usr/lib/python3.10/site-packages/services/devops/tests
+#usr/lib/python3.10/site-packages/services/devops/tests
 usr/lib/python3.10/site-packages/services/devops/tests/__init__.py
-usr/lib/python3.10/site-packages/services/dns
+#usr/lib/python3.10/site-packages/services/dns
 usr/lib/python3.10/site-packages/services/dns/__init__.py
-usr/lib/python3.10/site-packages/services/dns/src
+#usr/lib/python3.10/site-packages/services/dns/src
 usr/lib/python3.10/site-packages/services/dns/src/__init__.py
-usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns
+#usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns
 usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/__init__.py
 usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/dns_cli_extended.py
-usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/generated
+#usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/generated
 usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dns/src/oci_cli_dns/generated/dns_cli.py
-usr/lib/python3.10/site-packages/services/dns/tests
+#usr/lib/python3.10/site-packages/services/dns/tests
 usr/lib/python3.10/site-packages/services/dns/tests/__init__.py
-usr/lib/python3.10/site-packages/services/dts
+#usr/lib/python3.10/site-packages/services/dts
 usr/lib/python3.10/site-packages/services/dts/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src
+#usr/lib/python3.10/site-packages/services/dts/src
 usr/lib/python3.10/site-packages/services/dts/src/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/applianceexportjob_cli_extended.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/applianceexportjob_constants.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/generated/applianceexportjob_cli.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/generated/client_mappings.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/manifest_constants.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/manifest_iterator.py
@@ -690,7 +773,7 @@ usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/m
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/manifest_stats_consumer.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/manifest_writer.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_appliance_export_job/manifest/object_uploader.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/appliance_auth_manager.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/appliance_cert_manager.py
@@ -705,18 +788,18 @@ usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/base_client.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/cli_utils.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/dts_service_cli_extended.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/dts_transform.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/generated/dts_service_cli.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/nfs_dataset_client_proxy.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/nfsdataset_cli_extended.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/diagnose_tools_client.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/diagnose_tools_client_composite_operations.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/models
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/models
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/models/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/models/dataset_seal_status.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/models/details.py
@@ -733,459 +816,459 @@ usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/physical_transfer_appliance_client_composite_operations.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physical_appliance_control_plane/service_endpoints.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_dts/physicalappliance_cli_extended.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_shipping_vendors/generated/shippingvendors_cli.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/generated/transferappliance_cli.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance/transferappliance_cli_extended.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/generated/transferapplianceentitlement_cli.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_appliance_entitlement/transferapplianceentitlement_cli_extended.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_device/generated/transferdevice_cli.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/generated/transferjob_cli.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_job/transferjob_cli_extended.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/__init__.py
-usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/generated
+#usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/generated
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/generated/__init__.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/dts/src/oci_cli_transfer_package/generated/transferpackage_cli.py
-usr/lib/python3.10/site-packages/services/dts/tests
+#usr/lib/python3.10/site-packages/services/dts/tests
 usr/lib/python3.10/site-packages/services/dts/tests/__init__.py
-usr/lib/python3.10/site-packages/services/email
+#usr/lib/python3.10/site-packages/services/email
 usr/lib/python3.10/site-packages/services/email/__init__.py
-usr/lib/python3.10/site-packages/services/email/src
+#usr/lib/python3.10/site-packages/services/email/src
 usr/lib/python3.10/site-packages/services/email/src/__init__.py
-usr/lib/python3.10/site-packages/services/email/src/oci_cli_email
+#usr/lib/python3.10/site-packages/services/email/src/oci_cli_email
 usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/__init__.py
 usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/email_cli_extended.py
-usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/generated
+#usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/generated
 usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/generated/__init__.py
 usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/email/src/oci_cli_email/generated/email_cli.py
-usr/lib/python3.10/site-packages/services/email/tests
+#usr/lib/python3.10/site-packages/services/email/tests
 usr/lib/python3.10/site-packages/services/email/tests/__init__.py
-usr/lib/python3.10/site-packages/services/events
+#usr/lib/python3.10/site-packages/services/events
 usr/lib/python3.10/site-packages/services/events/__init__.py
-usr/lib/python3.10/site-packages/services/events/src
+#usr/lib/python3.10/site-packages/services/events/src
 usr/lib/python3.10/site-packages/services/events/src/__init__.py
-usr/lib/python3.10/site-packages/services/events/src/oci_cli_events
+#usr/lib/python3.10/site-packages/services/events/src/oci_cli_events
 usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/__init__.py
-usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/generated
+#usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/generated
 usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/generated/__init__.py
 usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/events/src/oci_cli_events/generated/events_cli.py
-usr/lib/python3.10/site-packages/services/events/tests
+#usr/lib/python3.10/site-packages/services/events/tests
 usr/lib/python3.10/site-packages/services/events/tests/__init__.py
-usr/lib/python3.10/site-packages/services/file_storage
+#usr/lib/python3.10/site-packages/services/file_storage
 usr/lib/python3.10/site-packages/services/file_storage/__init__.py
-usr/lib/python3.10/site-packages/services/file_storage/src
+#usr/lib/python3.10/site-packages/services/file_storage/src
 usr/lib/python3.10/site-packages/services/file_storage/src/__init__.py
-usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage
+#usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage
 usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/__init__.py
-usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/generated
+#usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/generated
 usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/generated/__init__.py
 usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/file_storage/src/oci_cli_file_storage/generated/filestorage_cli.py
-usr/lib/python3.10/site-packages/services/file_storage/tests
+#usr/lib/python3.10/site-packages/services/file_storage/tests
 usr/lib/python3.10/site-packages/services/file_storage/tests/__init__.py
-usr/lib/python3.10/site-packages/services/functions
+#usr/lib/python3.10/site-packages/services/functions
 usr/lib/python3.10/site-packages/services/functions/__init__.py
-usr/lib/python3.10/site-packages/services/functions/src
+#usr/lib/python3.10/site-packages/services/functions/src
 usr/lib/python3.10/site-packages/services/functions/src/__init__.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/__init__.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/functions_cli_extended.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/generated
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/generated
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/generated/__init__.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions/generated/fn_service_cli.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/__init__.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/generated
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/generated
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/generated/__init__.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_invoke/generated/functionsinvoke_cli.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/__init__.py
-usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/generated
+#usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/generated
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/functions/src/oci_cli_functions_management/generated/functionsmanagement_cli.py
-usr/lib/python3.10/site-packages/services/functions/tests
+#usr/lib/python3.10/site-packages/services/functions/tests
 usr/lib/python3.10/site-packages/services/functions/tests/__init__.py
-usr/lib/python3.10/site-packages/services/generic_artifacts_content
+#usr/lib/python3.10/site-packages/services/generic_artifacts_content
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/__init__.py
-usr/lib/python3.10/site-packages/services/generic_artifacts_content/src
+#usr/lib/python3.10/site-packages/services/generic_artifacts_content/src
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/__init__.py
-usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content
+#usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/__init__.py
-usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated
+#usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/__init__.py
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generated/genericartifactscontent_cli.py
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/src/oci_cli_generic_artifacts_content/generic_artifacts_content_cli_extended.py
-usr/lib/python3.10/site-packages/services/generic_artifacts_content/tests
+#usr/lib/python3.10/site-packages/services/generic_artifacts_content/tests
 usr/lib/python3.10/site-packages/services/generic_artifacts_content/tests/__init__.py
-usr/lib/python3.10/site-packages/services/golden_gate
+#usr/lib/python3.10/site-packages/services/golden_gate
 usr/lib/python3.10/site-packages/services/golden_gate/__init__.py
-usr/lib/python3.10/site-packages/services/golden_gate/src
+#usr/lib/python3.10/site-packages/services/golden_gate/src
 usr/lib/python3.10/site-packages/services/golden_gate/src/__init__.py
-usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate
+#usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate
 usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/__init__.py
-usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/generated
+#usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/generated
 usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/generated/__init__.py
 usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/generated/goldengate_cli.py
 usr/lib/python3.10/site-packages/services/golden_gate/src/oci_cli_golden_gate/golden_gate_cli_extended.py
-usr/lib/python3.10/site-packages/services/golden_gate/tests
+#usr/lib/python3.10/site-packages/services/golden_gate/tests
 usr/lib/python3.10/site-packages/services/golden_gate/tests/__init__.py
-usr/lib/python3.10/site-packages/services/healthchecks
+#usr/lib/python3.10/site-packages/services/healthchecks
 usr/lib/python3.10/site-packages/services/healthchecks/__init__.py
-usr/lib/python3.10/site-packages/services/healthchecks/src
+#usr/lib/python3.10/site-packages/services/healthchecks/src
 usr/lib/python3.10/site-packages/services/healthchecks/src/__init__.py
-usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks
+#usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks
 usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/__init__.py
-usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/generated
+#usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/generated
 usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/generated/__init__.py
 usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/generated/healthchecks_cli.py
 usr/lib/python3.10/site-packages/services/healthchecks/src/oci_cli_health_checks/healthchecks_cli_extended.py
-usr/lib/python3.10/site-packages/services/healthchecks/tests
+#usr/lib/python3.10/site-packages/services/healthchecks/tests
 usr/lib/python3.10/site-packages/services/healthchecks/tests/__init__.py
-usr/lib/python3.10/site-packages/services/identity
+#usr/lib/python3.10/site-packages/services/identity
 usr/lib/python3.10/site-packages/services/identity/__init__.py
-usr/lib/python3.10/site-packages/services/identity/src
+#usr/lib/python3.10/site-packages/services/identity/src
 usr/lib/python3.10/site-packages/services/identity/src/__init__.py
-usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity
+#usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity
 usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/__init__.py
-usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/generated
+#usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/generated
 usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/generated/__init__.py
 usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/generated/identity_cli.py
 usr/lib/python3.10/site-packages/services/identity/src/oci_cli_identity/identity_cli_extended.py
-usr/lib/python3.10/site-packages/services/identity/tests
+#usr/lib/python3.10/site-packages/services/identity/tests
 usr/lib/python3.10/site-packages/services/identity/tests/__init__.py
-usr/lib/python3.10/site-packages/services/identity_data_plane
+#usr/lib/python3.10/site-packages/services/identity_data_plane
 usr/lib/python3.10/site-packages/services/identity_data_plane/__init__.py
-usr/lib/python3.10/site-packages/services/identity_data_plane/src
+#usr/lib/python3.10/site-packages/services/identity_data_plane/src
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/__init__.py
-usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane
+#usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/__init__.py
-usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/generated
+#usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/generated
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/generated/__init__.py
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/generated/dataplane_cli.py
 usr/lib/python3.10/site-packages/services/identity_data_plane/src/oci_cli_dataplane/identity_data_plane_cli_extended.py
-usr/lib/python3.10/site-packages/services/identity_data_plane/tests
+#usr/lib/python3.10/site-packages/services/identity_data_plane/tests
 usr/lib/python3.10/site-packages/services/identity_data_plane/tests/__init__.py
-usr/lib/python3.10/site-packages/services/integration
+#usr/lib/python3.10/site-packages/services/integration
 usr/lib/python3.10/site-packages/services/integration/__init__.py
-usr/lib/python3.10/site-packages/services/integration/src
+#usr/lib/python3.10/site-packages/services/integration/src
 usr/lib/python3.10/site-packages/services/integration/src/__init__.py
-usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance
+#usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance
 usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/__init__.py
-usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/generated
+#usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/generated
 usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/generated/__init__.py
 usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/generated/integrationinstance_cli.py
 usr/lib/python3.10/site-packages/services/integration/src/oci_cli_integration_instance/integration_cli_extended.py
-usr/lib/python3.10/site-packages/services/integration/tests
+#usr/lib/python3.10/site-packages/services/integration/tests
 usr/lib/python3.10/site-packages/services/integration/tests/__init__.py
-usr/lib/python3.10/site-packages/services/jms
+#usr/lib/python3.10/site-packages/services/jms
 usr/lib/python3.10/site-packages/services/jms/__init__.py
-usr/lib/python3.10/site-packages/services/jms/src
+#usr/lib/python3.10/site-packages/services/jms/src
 usr/lib/python3.10/site-packages/services/jms/src/__init__.py
-usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service
+#usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service
 usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/__init__.py
-usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/generated
+#usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/generated
 usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/generated/__init__.py
 usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/generated/javamanagementservice_cli.py
 usr/lib/python3.10/site-packages/services/jms/src/oci_cli_java_management_service/javamanagementservice_cli_extended.py
-usr/lib/python3.10/site-packages/services/jms/tests
+#usr/lib/python3.10/site-packages/services/jms/tests
 usr/lib/python3.10/site-packages/services/jms/tests/__init__.py
-usr/lib/python3.10/site-packages/services/key_management
+#usr/lib/python3.10/site-packages/services/key_management
 usr/lib/python3.10/site-packages/services/key_management/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src
+#usr/lib/python3.10/site-packages/services/key_management/src
 usr/lib/python3.10/site-packages/services/key_management/src/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/generated
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/generated
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/generated/kms_service_cli.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_key_management/kms_cli_extended.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/generated
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/generated
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/generated/__init__.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_crypto/generated/kmscrypto_cli.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/generated
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/generated
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/generated/kmsmanagement_cli.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_management/kms_management_cli_extended.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/__init__.py
-usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/generated
+#usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/generated
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/generated/__init__.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/generated/kmsvault_cli.py
 usr/lib/python3.10/site-packages/services/key_management/src/oci_cli_kms_vault/kms_vault_cli_extended.py
-usr/lib/python3.10/site-packages/services/key_management/tests
+#usr/lib/python3.10/site-packages/services/key_management/tests
 usr/lib/python3.10/site-packages/services/key_management/tests/__init__.py
-usr/lib/python3.10/site-packages/services/limits
+#usr/lib/python3.10/site-packages/services/limits
 usr/lib/python3.10/site-packages/services/limits/__init__.py
-usr/lib/python3.10/site-packages/services/limits/src
+#usr/lib/python3.10/site-packages/services/limits/src
 usr/lib/python3.10/site-packages/services/limits/src/__init__.py
-usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits
+#usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/__init__.py
-usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated
+#usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated/__init__.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated/limits_cli.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/generated/limits_service_cli.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_limits/limits_cli_extended.py
-usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas
+#usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/__init__.py
-usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/generated
+#usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/generated
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/generated/__init__.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/generated/quotas_cli.py
 usr/lib/python3.10/site-packages/services/limits/src/oci_cli_quotas/quotas_cli_extended.py
-usr/lib/python3.10/site-packages/services/limits/tests
+#usr/lib/python3.10/site-packages/services/limits/tests
 usr/lib/python3.10/site-packages/services/limits/tests/__init__.py
-usr/lib/python3.10/site-packages/services/load_balancer
+#usr/lib/python3.10/site-packages/services/load_balancer
 usr/lib/python3.10/site-packages/services/load_balancer/__init__.py
-usr/lib/python3.10/site-packages/services/load_balancer/src
+#usr/lib/python3.10/site-packages/services/load_balancer/src
 usr/lib/python3.10/site-packages/services/load_balancer/src/__init__.py
-usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer
+#usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer
 usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/__init__.py
-usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/generated
+#usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/generated
 usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/generated/__init__.py
 usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/generated/loadbalancer_cli.py
 usr/lib/python3.10/site-packages/services/load_balancer/src/oci_cli_load_balancer/lb_cli_extended.py
-usr/lib/python3.10/site-packages/services/load_balancer/tests
+#usr/lib/python3.10/site-packages/services/load_balancer/tests
 usr/lib/python3.10/site-packages/services/load_balancer/tests/__init__.py
-usr/lib/python3.10/site-packages/services/log_analytics
+#usr/lib/python3.10/site-packages/services/log_analytics
 usr/lib/python3.10/site-packages/services/log_analytics/__init__.py
-usr/lib/python3.10/site-packages/services/log_analytics/src
+#usr/lib/python3.10/site-packages/services/log_analytics/src
 usr/lib/python3.10/site-packages/services/log_analytics/src/__init__.py
-usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics
+#usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics
 usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/__init__.py
-usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/generated
+#usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/generated
 usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/generated/__init__.py
 usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/generated/loganalytics_cli.py
 usr/lib/python3.10/site-packages/services/log_analytics/src/oci_cli_log_analytics/log_analytics_cli_extended.py
-usr/lib/python3.10/site-packages/services/log_analytics/tests
+#usr/lib/python3.10/site-packages/services/log_analytics/tests
 usr/lib/python3.10/site-packages/services/log_analytics/tests/__init__.py
-usr/lib/python3.10/site-packages/services/logging
+#usr/lib/python3.10/site-packages/services/logging
 usr/lib/python3.10/site-packages/services/logging/__init__.py
-usr/lib/python3.10/site-packages/services/logging/src
+#usr/lib/python3.10/site-packages/services/logging/src
 usr/lib/python3.10/site-packages/services/logging/src/__init__.py
-usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management
+#usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management
 usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/__init__.py
-usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/generated
+#usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/generated
 usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/generated/loggingmanagement_cli.py
 usr/lib/python3.10/site-packages/services/logging/src/oci_cli_logging_management/loggingmanagement_cli_extended.py
-usr/lib/python3.10/site-packages/services/logging/tests
+#usr/lib/python3.10/site-packages/services/logging/tests
 usr/lib/python3.10/site-packages/services/logging/tests/__init__.py
-usr/lib/python3.10/site-packages/services/loggingingestion
+#usr/lib/python3.10/site-packages/services/loggingingestion
 usr/lib/python3.10/site-packages/services/loggingingestion/__init__.py
-usr/lib/python3.10/site-packages/services/loggingingestion/src
+#usr/lib/python3.10/site-packages/services/loggingingestion/src
 usr/lib/python3.10/site-packages/services/loggingingestion/src/__init__.py
-usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging
+#usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging
 usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/__init__.py
-usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/generated
+#usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/generated
 usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/generated/__init__.py
 usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/generated/logging_cli.py
 usr/lib/python3.10/site-packages/services/loggingingestion/src/oci_cli_logging/logging_cli_extended.py
-usr/lib/python3.10/site-packages/services/loggingingestion/tests
+#usr/lib/python3.10/site-packages/services/loggingingestion/tests
 usr/lib/python3.10/site-packages/services/loggingingestion/tests/__init__.py
-usr/lib/python3.10/site-packages/services/loggingsearch
+#usr/lib/python3.10/site-packages/services/loggingsearch
 usr/lib/python3.10/site-packages/services/loggingsearch/__init__.py
-usr/lib/python3.10/site-packages/services/loggingsearch/src
+#usr/lib/python3.10/site-packages/services/loggingsearch/src
 usr/lib/python3.10/site-packages/services/loggingsearch/src/__init__.py
-usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search
+#usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search
 usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/__init__.py
-usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/generated
+#usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/generated
 usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/generated/__init__.py
 usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/generated/logsearch_cli.py
 usr/lib/python3.10/site-packages/services/loggingsearch/src/oci_cli_log_search/log_search_cli_extended.py
-usr/lib/python3.10/site-packages/services/loggingsearch/tests
+#usr/lib/python3.10/site-packages/services/loggingsearch/tests
 usr/lib/python3.10/site-packages/services/loggingsearch/tests/__init__.py
-usr/lib/python3.10/site-packages/services/management_agent
+#usr/lib/python3.10/site-packages/services/management_agent
 usr/lib/python3.10/site-packages/services/management_agent/__init__.py
-usr/lib/python3.10/site-packages/services/management_agent/src
+#usr/lib/python3.10/site-packages/services/management_agent/src
 usr/lib/python3.10/site-packages/services/management_agent/src/__init__.py
-usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent
+#usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent
 usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/__init__.py
-usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/generated
+#usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/generated
 usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/generated/__init__.py
 usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/generated/managementagent_cli.py
 usr/lib/python3.10/site-packages/services/management_agent/src/oci_cli_management_agent/management_agent_cli_extended.py
-usr/lib/python3.10/site-packages/services/management_agent/tests
+#usr/lib/python3.10/site-packages/services/management_agent/tests
 usr/lib/python3.10/site-packages/services/management_agent/tests/__init__.py
-usr/lib/python3.10/site-packages/services/management_dashboard
+#usr/lib/python3.10/site-packages/services/management_dashboard
 usr/lib/python3.10/site-packages/services/management_dashboard/__init__.py
-usr/lib/python3.10/site-packages/services/management_dashboard/src
+#usr/lib/python3.10/site-packages/services/management_dashboard/src
 usr/lib/python3.10/site-packages/services/management_dashboard/src/__init__.py
-usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis
+#usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis
 usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/__init__.py
-usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/generated
+#usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/generated
 usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/generated/__init__.py
 usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/generated/dashxapis_cli.py
 usr/lib/python3.10/site-packages/services/management_dashboard/src/oci_cli_dashx_apis/management_dashboard_cli_extended.py
-usr/lib/python3.10/site-packages/services/management_dashboard/tests
+#usr/lib/python3.10/site-packages/services/management_dashboard/tests
 usr/lib/python3.10/site-packages/services/management_dashboard/tests/__init__.py
-usr/lib/python3.10/site-packages/services/marketplace
+#usr/lib/python3.10/site-packages/services/marketplace
 usr/lib/python3.10/site-packages/services/marketplace/__init__.py
-usr/lib/python3.10/site-packages/services/marketplace/src
+#usr/lib/python3.10/site-packages/services/marketplace/src
 usr/lib/python3.10/site-packages/services/marketplace/src/__init__.py
-usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account
+#usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/__init__.py
-usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/generated
+#usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/generated
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/generated/__init__.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/generated/account_cli.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_account/generated/client_mappings.py
-usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace
+#usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/__init__.py
-usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated
+#usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated/__init__.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated/marketplace_cli.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/generated/marketplace_service_cli.py
 usr/lib/python3.10/site-packages/services/marketplace/src/oci_cli_marketplace/marketplace_cli_extended.py
-usr/lib/python3.10/site-packages/services/marketplace/tests
+#usr/lib/python3.10/site-packages/services/marketplace/tests
 usr/lib/python3.10/site-packages/services/marketplace/tests/__init__.py
-usr/lib/python3.10/site-packages/services/monitoring
+#usr/lib/python3.10/site-packages/services/monitoring
 usr/lib/python3.10/site-packages/services/monitoring/__init__.py
-usr/lib/python3.10/site-packages/services/monitoring/src
+#usr/lib/python3.10/site-packages/services/monitoring/src
 usr/lib/python3.10/site-packages/services/monitoring/src/__init__.py
-usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring
+#usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring
 usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/__init__.py
-usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/generated
+#usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/generated
 usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/generated/__init__.py
 usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/generated/monitoring_cli.py
 usr/lib/python3.10/site-packages/services/monitoring/src/oci_cli_monitoring/monitoring_cli_extended.py
-usr/lib/python3.10/site-packages/services/monitoring/tests
+#usr/lib/python3.10/site-packages/services/monitoring/tests
 usr/lib/python3.10/site-packages/services/monitoring/tests/__init__.py
-usr/lib/python3.10/site-packages/services/mysql
+#usr/lib/python3.10/site-packages/services/mysql
 usr/lib/python3.10/site-packages/services/mysql/__init__.py
-usr/lib/python3.10/site-packages/services/mysql/src
+#usr/lib/python3.10/site-packages/services/mysql/src
 usr/lib/python3.10/site-packages/services/mysql/src/__init__.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/channels_cli_extended.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/generated/channels_cli.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_channels/generated/client_mappings.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/db_backups_cli_extended.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_backups/generated/dbbackups_cli.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/db_system_cli_extended.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_db_system/generated/dbsystem_cli.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql/__init__.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysql/generated/mysql_service_cli.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/__init__.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/generated/mysqlaas_cli.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_mysqlaas/mysqlaas_cli_extended.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/__init__.py
-usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/generated
+#usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/generated
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/generated/__init__.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/generated/workrequests_cli.py
 usr/lib/python3.10/site-packages/services/mysql/src/oci_cli_work_requests/work_requests_cli_extended.py
-usr/lib/python3.10/site-packages/services/mysql/tests
+#usr/lib/python3.10/site-packages/services/mysql/tests
 usr/lib/python3.10/site-packages/services/mysql/tests/__init__.py
-usr/lib/python3.10/site-packages/services/network_load_balancer
+#usr/lib/python3.10/site-packages/services/network_load_balancer
 usr/lib/python3.10/site-packages/services/network_load_balancer/__init__.py
-usr/lib/python3.10/site-packages/services/network_load_balancer/src
+#usr/lib/python3.10/site-packages/services/network_load_balancer/src
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/__init__.py
-usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer
+#usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/__init__.py
-usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/generated
+#usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/generated
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/__init__.py
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/generated/networkloadbalancer_cli.py
 usr/lib/python3.10/site-packages/services/network_load_balancer/src/oci_cli_network_load_balancer/networkloadbalancer_cli_extended.py
-usr/lib/python3.10/site-packages/services/network_load_balancer/tests
+#usr/lib/python3.10/site-packages/services/network_load_balancer/tests
 usr/lib/python3.10/site-packages/services/network_load_balancer/tests/__init__.py
-usr/lib/python3.10/site-packages/services/nosql
+#usr/lib/python3.10/site-packages/services/nosql
 usr/lib/python3.10/site-packages/services/nosql/__init__.py
-usr/lib/python3.10/site-packages/services/nosql/src
+#usr/lib/python3.10/site-packages/services/nosql/src
 usr/lib/python3.10/site-packages/services/nosql/src/__init__.py
-usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql
+#usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql
 usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/__init__.py
-usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/generated
+#usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/generated
 usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/generated/__init__.py
 usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/generated/nosql_cli.py
 usr/lib/python3.10/site-packages/services/nosql/src/oci_cli_nosql/nosql_cli_extended.py
-usr/lib/python3.10/site-packages/services/nosql/tests
+#usr/lib/python3.10/site-packages/services/nosql/tests
 usr/lib/python3.10/site-packages/services/nosql/tests/__init__.py
-usr/lib/python3.10/site-packages/services/object_storage
+#usr/lib/python3.10/site-packages/services/object_storage
 usr/lib/python3.10/site-packages/services/object_storage/__init__.py
-usr/lib/python3.10/site-packages/services/object_storage/src
+#usr/lib/python3.10/site-packages/services/object_storage/src
 usr/lib/python3.10/site-packages/services/object_storage/src/__init__.py
-usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage
+#usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/__init__.py
-usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/generated
+#usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/generated
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/generated/__init__.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/generated/objectstorage_cli.py
-usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager
+#usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/__init__.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/delete_tasks.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/get_object_tasks.py
@@ -1199,489 +1282,605 @@ usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_stor
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/work_pool_task.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/wrapped_semaphore.py
 usr/lib/python3.10/site-packages/services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py
-usr/lib/python3.10/site-packages/services/object_storage/tests
+#usr/lib/python3.10/site-packages/services/object_storage/tests
 usr/lib/python3.10/site-packages/services/object_storage/tests/__init__.py
-usr/lib/python3.10/site-packages/services/oce
+#usr/lib/python3.10/site-packages/services/oce
 usr/lib/python3.10/site-packages/services/oce/__init__.py
-usr/lib/python3.10/site-packages/services/oce/src
+#usr/lib/python3.10/site-packages/services/oce/src
 usr/lib/python3.10/site-packages/services/oce/src/__init__.py
-usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance
+#usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance
 usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/__init__.py
-usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/generated
+#usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/generated
 usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/generated/__init__.py
 usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/generated/oceinstance_cli.py
 usr/lib/python3.10/site-packages/services/oce/src/oci_cli_oce_instance/oce_cli_extended.py
-usr/lib/python3.10/site-packages/services/oce/tests
+#usr/lib/python3.10/site-packages/services/oce/tests
 usr/lib/python3.10/site-packages/services/oce/tests/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp
+#usr/lib/python3.10/site-packages/services/ocvp
 usr/lib/python3.10/site-packages/services/ocvp/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp/src
+#usr/lib/python3.10/site-packages/services/ocvp/src
 usr/lib/python3.10/site-packages/services/ocvp/src/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/__init__.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/esxi_host_cli_extended.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/generated
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/generated
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_esxi_host/generated/esxihost_cli.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp/generated
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp/generated
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_ocvp/generated/ocvs_service_cli.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/generated
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/generated
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/generated/sddc_cli.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_sddc/sddc_cli_extended.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/__init__.py
-usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/generated
+#usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/generated
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/generated/workrequest_cli.py
 usr/lib/python3.10/site-packages/services/ocvp/src/oci_cli_work_request/work_request_cli_extended.py
-usr/lib/python3.10/site-packages/services/ocvp/tests
+#usr/lib/python3.10/site-packages/services/ocvp/tests
 usr/lib/python3.10/site-packages/services/ocvp/tests/__init__.py
-usr/lib/python3.10/site-packages/services/oda
+#usr/lib/python3.10/site-packages/services/oda
 usr/lib/python3.10/site-packages/services/oda/__init__.py
-usr/lib/python3.10/site-packages/services/oda/src
+#usr/lib/python3.10/site-packages/services/oda/src
 usr/lib/python3.10/site-packages/services/oda/src/__init__.py
-usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda
+#usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda
 usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/__init__.py
-usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/generated
+#usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/generated
 usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/generated/__init__.py
 usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/generated/oda_cli.py
 usr/lib/python3.10/site-packages/services/oda/src/oci_cli_oda/oda_cli_extended.py
-usr/lib/python3.10/site-packages/services/oda/tests
+#usr/lib/python3.10/site-packages/services/oda/tests
 usr/lib/python3.10/site-packages/services/oda/tests/__init__.py
-usr/lib/python3.10/site-packages/services/ons
+#usr/lib/python3.10/site-packages/services/ons
 usr/lib/python3.10/site-packages/services/ons/__init__.py
-usr/lib/python3.10/site-packages/services/ons/src
+#usr/lib/python3.10/site-packages/services/ons/src
 usr/lib/python3.10/site-packages/services/ons/src/__init__.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/__init__.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/generated
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/generated
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_control_plane/generated/notificationcontrolplane_cli.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/__init__.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/generated
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/generated
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_notification_data_plane/generated/notificationdataplane_cli.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/__init__.py
-usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/generated
+#usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/generated
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/generated/__init__.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/generated/ons_service_cli.py
 usr/lib/python3.10/site-packages/services/ons/src/oci_cli_ons/ons_cli_extended.py
-usr/lib/python3.10/site-packages/services/ons/tests
+#usr/lib/python3.10/site-packages/services/ons/tests
 usr/lib/python3.10/site-packages/services/ons/tests/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control
+#usr/lib/python3.10/site-packages/services/operator_access_control
 usr/lib/python3.10/site-packages/services/operator_access_control/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src
+#usr/lib/python3.10/site-packages/services/operator_access_control/src
 usr/lib/python3.10/site-packages/services/operator_access_control/src/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/generated
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/generated
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/generated/__init__.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/generated/accessrequests_cli.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_access_requests/generated/client_mappings.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/generated
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/generated
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/generated/__init__.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/generated/opctl_service_cli.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_access_control/operator_access_control_cli_extended.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/generated
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/generated
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/generated/__init__.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_actions/generated/operatoractions_cli.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/generated
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/generated
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/generated/__init__.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control/generated/operatorcontrol_cli.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/__init__.py
-usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/generated
+#usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/generated
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/__init__.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/operator_access_control/src/oci_cli_operator_control_assignment/generated/operatorcontrolassignment_cli.py
-usr/lib/python3.10/site-packages/services/operator_access_control/tests
+#usr/lib/python3.10/site-packages/services/operator_access_control/tests
 usr/lib/python3.10/site-packages/services/operator_access_control/tests/__init__.py
-usr/lib/python3.10/site-packages/services/opsi
+#usr/lib/python3.10/site-packages/services/opsi
 usr/lib/python3.10/site-packages/services/opsi/__init__.py
-usr/lib/python3.10/site-packages/services/opsi/src
+#usr/lib/python3.10/site-packages/services/opsi/src
 usr/lib/python3.10/site-packages/services/opsi/src/__init__.py
-usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights
+#usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights
 usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/__init__.py
-usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/generated
+#usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/generated
 usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/generated/__init__.py
 usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/generated/operationsinsights_cli.py
 usr/lib/python3.10/site-packages/services/opsi/src/oci_cli_operations_insights/operationsinsights_cli_extended.py
-usr/lib/python3.10/site-packages/services/opsi/tests
+#usr/lib/python3.10/site-packages/services/opsi/tests
 usr/lib/python3.10/site-packages/services/opsi/tests/__init__.py
-usr/lib/python3.10/site-packages/services/optimizer
+#usr/lib/python3.10/site-packages/services/optimizer
 usr/lib/python3.10/site-packages/services/optimizer/__init__.py
-usr/lib/python3.10/site-packages/services/optimizer/src
+#usr/lib/python3.10/site-packages/services/optimizer/src
 usr/lib/python3.10/site-packages/services/optimizer/src/__init__.py
-usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer
+#usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer
 usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/__init__.py
-usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/generated
+#usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/generated
 usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/generated/__init__.py
 usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/generated/optimizer_cli.py
 usr/lib/python3.10/site-packages/services/optimizer/src/oci_cli_optimizer/optimizer_cli_extended.py
-usr/lib/python3.10/site-packages/services/optimizer/tests
+#usr/lib/python3.10/site-packages/services/optimizer/tests
 usr/lib/python3.10/site-packages/services/optimizer/tests/__init__.py
-usr/lib/python3.10/site-packages/services/os_management
+#usr/lib/python3.10/site-packages/services/os_management
 usr/lib/python3.10/site-packages/services/os_management/__init__.py
-usr/lib/python3.10/site-packages/services/os_management/src
+#usr/lib/python3.10/site-packages/services/os_management/src
 usr/lib/python3.10/site-packages/services/os_management/src/__init__.py
-usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event
+#usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/__init__.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/event_cli_extended.py
-usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/generated
+#usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/generated
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/generated/__init__.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_event/generated/event_cli.py
-usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management
+#usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/__init__.py
-usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated
+#usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated/__init__.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated/os_management_service_cli.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/generated/osmanagement_cli.py
 usr/lib/python3.10/site-packages/services/os_management/src/oci_cli_os_management/osmanagement_cli_extended.py
-usr/lib/python3.10/site-packages/services/os_management/tests
+#usr/lib/python3.10/site-packages/services/os_management/tests
 usr/lib/python3.10/site-packages/services/os_management/tests/__init__.py
-usr/lib/python3.10/site-packages/services/osp_gateway
+#usr/lib/python3.10/site-packages/services/osp_gateway
 usr/lib/python3.10/site-packages/services/osp_gateway/__init__.py
-usr/lib/python3.10/site-packages/services/osp_gateway/src
+#usr/lib/python3.10/site-packages/services/osp_gateway/src
 usr/lib/python3.10/site-packages/services/osp_gateway/src/__init__.py
-usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service
 usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/__init__.py
-usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/generated
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/generated
 usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/generated/__init__.py
 usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_invoice_service/generated/invoiceservice_cli.py
-usr/lib/python3.10/site-packages/services/osp_gateway/tests
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_osp_gateway
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_osp_gateway/__init__.py
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_osp_gateway/generated
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_osp_gateway/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_osp_gateway/generated/osp_gateway_service_cli.py
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service/__init__.py
+#usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service/generated
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osp_gateway/src/oci_cli_subscription_service/generated/subscriptionservice_cli.py
+#usr/lib/python3.10/site-packages/services/osp_gateway/tests
 usr/lib/python3.10/site-packages/services/osp_gateway/tests/__init__.py
-usr/lib/python3.10/site-packages/services/resource_manager
+#usr/lib/python3.10/site-packages/services/osub_billing_schedule
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_billing_schedule/src
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/billingschedule_cli.py
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/src/oci_cli_billing_schedule/generated/client_mappings.py
+#usr/lib/python3.10/site-packages/services/osub_billing_schedule/tests
+usr/lib/python3.10/site-packages/services/osub_billing_schedule/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_organization_subscription
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_organization_subscription/src
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/src/oci_cli_organization_subscription/generated/organizationsubscription_cli.py
+#usr/lib/python3.10/site-packages/services/osub_organization_subscription/tests
+usr/lib/python3.10/site-packages/services/osub_organization_subscription/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription
+usr/lib/python3.10/site-packages/services/osub_subscription/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src
+usr/lib/python3.10/site-packages/services/osub_subscription/src/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment/generated
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_commitment/generated/commitment_cli.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_osub_subscription
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_osub_subscription/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_osub_subscription/generated
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_osub_subscription/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_osub_subscription/generated/osub_subscription_service_cli.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard/generated
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_ratecard/generated/ratecard_cli.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription/generated
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osub_subscription/src/oci_cli_subscription/generated/subscription_cli.py
+#usr/lib/python3.10/site-packages/services/osub_subscription/tests
+usr/lib/python3.10/site-packages/services/osub_subscription/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_usage
+usr/lib/python3.10/site-packages/services/osub_usage/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_usage/src
+usr/lib/python3.10/site-packages/services/osub_usage/src/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage
+usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage/__init__.py
+#usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage/generated
+usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage/generated/__init__.py
+usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/osub_usage/src/oci_cli_computed_usage/generated/computedusage_cli.py
+#usr/lib/python3.10/site-packages/services/osub_usage/tests
+usr/lib/python3.10/site-packages/services/osub_usage/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/resource_manager
 usr/lib/python3.10/site-packages/services/resource_manager/__init__.py
-usr/lib/python3.10/site-packages/services/resource_manager/src
+#usr/lib/python3.10/site-packages/services/resource_manager/src
 usr/lib/python3.10/site-packages/services/resource_manager/src/__init__.py
-usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager
+#usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager
 usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/__init__.py
-usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/generated
+#usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/generated
 usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/generated/__init__.py
 usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/generated/resourcemanager_cli.py
 usr/lib/python3.10/site-packages/services/resource_manager/src/oci_cli_resource_manager/resourcemanager_cli_extended.py
-usr/lib/python3.10/site-packages/services/resource_manager/tests
+#usr/lib/python3.10/site-packages/services/resource_manager/tests
 usr/lib/python3.10/site-packages/services/resource_manager/tests/__init__.py
-usr/lib/python3.10/site-packages/services/resource_search
+#usr/lib/python3.10/site-packages/services/resource_search
 usr/lib/python3.10/site-packages/services/resource_search/__init__.py
-usr/lib/python3.10/site-packages/services/resource_search/src
+#usr/lib/python3.10/site-packages/services/resource_search/src
 usr/lib/python3.10/site-packages/services/resource_search/src/__init__.py
-usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search
+#usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search
 usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/__init__.py
-usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/generated
+#usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/generated
 usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/generated/__init__.py
 usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/generated/resourcesearch_cli.py
 usr/lib/python3.10/site-packages/services/resource_search/src/oci_cli_resource_search/resourcesearch_cli_extended.py
-usr/lib/python3.10/site-packages/services/resource_search/tests
+#usr/lib/python3.10/site-packages/services/resource_search/tests
 usr/lib/python3.10/site-packages/services/resource_search/tests/__init__.py
-usr/lib/python3.10/site-packages/services/rover
+#usr/lib/python3.10/site-packages/services/rover
 usr/lib/python3.10/site-packages/services/rover/__init__.py
-usr/lib/python3.10/site-packages/services/rover/src
+#usr/lib/python3.10/site-packages/services/rover/src
 usr/lib/python3.10/site-packages/services/rover/src/__init__.py
 usr/lib/python3.10/site-packages/services/rover/src/constants.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/__init__.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/generated
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/generated
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/generated/__init__.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/generated/rover_service_cli.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover/rover_utils.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/__init__.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/generated
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/generated
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/generated/__init__.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/generated/rovercluster_cli.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/rovercluster_cli_extended.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement
+usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_cluster/roverstations_cli_clusterextended.py
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/__init__.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/generated
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/generated
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/generated/__init__.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/generated/roverentitlement_cli.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_entitlement/roverentitlement_cli_extended.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/__init__.py
-usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/generated
+#usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/generated
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/generated/__init__.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/generated/rovernode_cli.py
 usr/lib/python3.10/site-packages/services/rover/src/oci_cli_rover_node/rovernode_cli_extended.py
-usr/lib/python3.10/site-packages/services/rover/tests
+#usr/lib/python3.10/site-packages/services/rover/tests
 usr/lib/python3.10/site-packages/services/rover/tests/__init__.py
-usr/lib/python3.10/site-packages/services/sch
+#usr/lib/python3.10/site-packages/services/sch
 usr/lib/python3.10/site-packages/services/sch/__init__.py
-usr/lib/python3.10/site-packages/services/sch/src
+#usr/lib/python3.10/site-packages/services/sch/src
 usr/lib/python3.10/site-packages/services/sch/src/__init__.py
-usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector
+#usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector
 usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/__init__.py
-usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/generated
+#usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/generated
 usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/generated/__init__.py
 usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/generated/serviceconnector_cli.py
 usr/lib/python3.10/site-packages/services/sch/src/oci_cli_service_connector/sch_cli_extended.py
-usr/lib/python3.10/site-packages/services/sch/tests
+#usr/lib/python3.10/site-packages/services/sch/tests
 usr/lib/python3.10/site-packages/services/sch/tests/__init__.py
-usr/lib/python3.10/site-packages/services/secrets
+#usr/lib/python3.10/site-packages/services/secrets
 usr/lib/python3.10/site-packages/services/secrets/__init__.py
-usr/lib/python3.10/site-packages/services/secrets/src
+#usr/lib/python3.10/site-packages/services/secrets/src
 usr/lib/python3.10/site-packages/services/secrets/src/__init__.py
-usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets
+#usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets
 usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/__init__.py
-usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/generated
+#usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/generated
 usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/generated/__init__.py
 usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/generated/secrets_cli.py
 usr/lib/python3.10/site-packages/services/secrets/src/oci_cli_secrets/secrets_cli_extended.py
-usr/lib/python3.10/site-packages/services/secrets/tests
+#usr/lib/python3.10/site-packages/services/secrets/tests
 usr/lib/python3.10/site-packages/services/secrets/tests/__init__.py
-usr/lib/python3.10/site-packages/services/service_catalog
+#usr/lib/python3.10/site-packages/services/service_catalog
 usr/lib/python3.10/site-packages/services/service_catalog/__init__.py
-usr/lib/python3.10/site-packages/services/service_catalog/src
+#usr/lib/python3.10/site-packages/services/service_catalog/src
 usr/lib/python3.10/site-packages/services/service_catalog/src/__init__.py
-usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog
+#usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog
 usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/__init__.py
-usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/generated
+#usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/generated
 usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/generated/__init__.py
 usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/generated/servicecatalog_cli.py
 usr/lib/python3.10/site-packages/services/service_catalog/src/oci_cli_service_catalog/servicecatalog_cli_extended.py
-usr/lib/python3.10/site-packages/services/service_catalog/tests
+#usr/lib/python3.10/site-packages/services/service_catalog/tests
 usr/lib/python3.10/site-packages/services/service_catalog/tests/__init__.py
-usr/lib/python3.10/site-packages/services/service_manager_proxy
+#usr/lib/python3.10/site-packages/services/service_manager_proxy
 usr/lib/python3.10/site-packages/services/service_manager_proxy/__init__.py
-usr/lib/python3.10/site-packages/services/service_manager_proxy/src
+#usr/lib/python3.10/site-packages/services/service_manager_proxy/src
 usr/lib/python3.10/site-packages/services/service_manager_proxy/src/__init__.py
-usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy
+#usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy
 usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/__init__.py
-usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated
+#usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated
 usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/__init__.py
 usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/service_manager_proxy/src/oci_cli_service_manager_proxy/generated/servicemanagerproxy_cli.py
-usr/lib/python3.10/site-packages/services/service_manager_proxy/tests
+#usr/lib/python3.10/site-packages/services/service_manager_proxy/tests
 usr/lib/python3.10/site-packages/services/service_manager_proxy/tests/__init__.py
-usr/lib/python3.10/site-packages/services/streaming
+#usr/lib/python3.10/site-packages/services/stack_monitoring
+usr/lib/python3.10/site-packages/services/stack_monitoring/__init__.py
+#usr/lib/python3.10/site-packages/services/stack_monitoring/src
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/__init__.py
+#usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/__init__.py
+#usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/generated
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/__init__.py
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/generated/stackmonitoring_cli.py
+usr/lib/python3.10/site-packages/services/stack_monitoring/src/oci_cli_stack_monitoring/stackmonitoring_cli_extended.py
+#usr/lib/python3.10/site-packages/services/stack_monitoring/tests
+usr/lib/python3.10/site-packages/services/stack_monitoring/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/streaming
 usr/lib/python3.10/site-packages/services/streaming/__init__.py
-usr/lib/python3.10/site-packages/services/streaming/src
+#usr/lib/python3.10/site-packages/services/streaming/src
 usr/lib/python3.10/site-packages/services/streaming/src/__init__.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/__init__.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/generated
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/generated
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/generated/__init__.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream/generated/stream_cli.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/__init__.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/generated
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/generated
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/generated/__init__.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_stream_admin/generated/streamadmin_cli.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/__init__.py
-usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/generated
+#usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/generated
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/generated/__init__.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/generated/streaming_service_cli.py
 usr/lib/python3.10/site-packages/services/streaming/src/oci_cli_streaming/streaming_cli_extended.py
-usr/lib/python3.10/site-packages/services/streaming/tests
+#usr/lib/python3.10/site-packages/services/streaming/tests
 usr/lib/python3.10/site-packages/services/streaming/tests/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/domain_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain/generated/domain_cli.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/domaingovernance_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_domain_governance/generated/domaingovernance_cli.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/generated/link_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_link/link_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/generated/orders_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_orders/orders_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/generated/organization_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_organization/organization_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/generated/recipientinvitation_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_recipient_invitation/recipientinvitation_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/generated/senderinvitation_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_sender_invitation/senderinvitation_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/generated/subscription_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_subscription/subscription_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/generated/organizations_service_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_tenant_manager_control_plane/organizations_service_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/__init__.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/generated
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/generated
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/__init__.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/generated/workrequest_cli.py
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/src/oci_cli_work_request/workrequest_cli_extended.py
-usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/tests
+#usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/tests
 usr/lib/python3.10/site-packages/services/tenant_manager_control_plane/tests/__init__.py
-usr/lib/python3.10/site-packages/services/usage
+#usr/lib/python3.10/site-packages/services/threat_intelligence
+usr/lib/python3.10/site-packages/services/threat_intelligence/__init__.py
+#usr/lib/python3.10/site-packages/services/threat_intelligence/src
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/__init__.py
+#usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/__init__.py
+#usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/generated
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/generated/__init__.py
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/generated/threatintel_cli.py
+usr/lib/python3.10/site-packages/services/threat_intelligence/src/oci_cli_threatintel/threatintel_cli_extended.py
+#usr/lib/python3.10/site-packages/services/threat_intelligence/tests
+usr/lib/python3.10/site-packages/services/threat_intelligence/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/usage
 usr/lib/python3.10/site-packages/services/usage/__init__.py
-usr/lib/python3.10/site-packages/services/usage/src
+#usr/lib/python3.10/site-packages/services/usage/src
 usr/lib/python3.10/site-packages/services/usage/src/__init__.py
-usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards
+#usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards
 usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/__init__.py
-usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/generated
+#usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/generated
 usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/generated/__init__.py
 usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/usage/src/oci_cli_rewards/generated/rewards_cli.py
-usr/lib/python3.10/site-packages/services/usage/tests
+#usr/lib/python3.10/site-packages/services/usage/tests
 usr/lib/python3.10/site-packages/services/usage/tests/__init__.py
-usr/lib/python3.10/site-packages/services/usage_api
+#usr/lib/python3.10/site-packages/services/usage_api
 usr/lib/python3.10/site-packages/services/usage_api/__init__.py
-usr/lib/python3.10/site-packages/services/usage_api/src
+#usr/lib/python3.10/site-packages/services/usage_api/src
 usr/lib/python3.10/site-packages/services/usage_api/src/__init__.py
-usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi
+#usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi
 usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/__init__.py
-usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/generated
+#usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/generated
 usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/generated/__init__.py
 usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/usage_api/src/oci_cli_usageapi/generated/usageapi_cli.py
-usr/lib/python3.10/site-packages/services/usage_api/tests
+#usr/lib/python3.10/site-packages/services/usage_api/tests
 usr/lib/python3.10/site-packages/services/usage_api/tests/__init__.py
-usr/lib/python3.10/site-packages/services/vault
+#usr/lib/python3.10/site-packages/services/vault
 usr/lib/python3.10/site-packages/services/vault/__init__.py
-usr/lib/python3.10/site-packages/services/vault/src
+#usr/lib/python3.10/site-packages/services/vault/src
 usr/lib/python3.10/site-packages/services/vault/src/__init__.py
-usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults
+#usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults
 usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/__init__.py
-usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/generated
+#usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/generated
 usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/generated/__init__.py
 usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/generated/vaults_cli.py
 usr/lib/python3.10/site-packages/services/vault/src/oci_cli_vaults/vaults_cli_extended.py
-usr/lib/python3.10/site-packages/services/vault/tests
+#usr/lib/python3.10/site-packages/services/vault/tests
 usr/lib/python3.10/site-packages/services/vault/tests/__init__.py
-usr/lib/python3.10/site-packages/services/vulnerability_scanning
+#usr/lib/python3.10/site-packages/services/visual_builder
+usr/lib/python3.10/site-packages/services/visual_builder/__init__.py
+#usr/lib/python3.10/site-packages/services/visual_builder/src
+usr/lib/python3.10/site-packages/services/visual_builder/src/__init__.py
+#usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance
+usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/__init__.py
+#usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/generated
+usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/generated/__init__.py
+usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/generated/client_mappings.py
+usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/generated/vbinstance_cli.py
+usr/lib/python3.10/site-packages/services/visual_builder/src/oci_cli_vb_instance/vbinstance_cli_extended.py
+#usr/lib/python3.10/site-packages/services/visual_builder/tests
+usr/lib/python3.10/site-packages/services/visual_builder/tests/__init__.py
+#usr/lib/python3.10/site-packages/services/vulnerability_scanning
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/__init__.py
-usr/lib/python3.10/site-packages/services/vulnerability_scanning/src
+#usr/lib/python3.10/site-packages/services/vulnerability_scanning/src
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/__init__.py
-usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning
+#usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/__init__.py
-usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated
+#usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/__init__.py
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/generated/vulnerabilityscanning_cli.py
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/src/oci_cli_vulnerability_scanning/vss_cli_extended.py
-usr/lib/python3.10/site-packages/services/vulnerability_scanning/tests
+#usr/lib/python3.10/site-packages/services/vulnerability_scanning/tests
 usr/lib/python3.10/site-packages/services/vulnerability_scanning/tests/__init__.py
-usr/lib/python3.10/site-packages/services/waas
+#usr/lib/python3.10/site-packages/services/waas
 usr/lib/python3.10/site-packages/services/waas/__init__.py
-usr/lib/python3.10/site-packages/services/waas/src
+#usr/lib/python3.10/site-packages/services/waas/src
 usr/lib/python3.10/site-packages/services/waas/src/__init__.py
-usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect
+#usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/__init__.py
-usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/generated
+#usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/generated
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/generated/__init__.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/generated/redirect_cli.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_redirect/redirect_cli_extended.py
-usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas
+#usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/__init__.py
-usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated
+#usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated/__init__.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated/waas_cli.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/generated/waas_service_cli.py
 usr/lib/python3.10/site-packages/services/waas/src/oci_cli_waas/waas_cli_extended.py
-usr/lib/python3.10/site-packages/services/waas/tests
+#usr/lib/python3.10/site-packages/services/waas/tests
 usr/lib/python3.10/site-packages/services/waas/tests/__init__.py
-usr/lib/python3.10/site-packages/services/waf
+#usr/lib/python3.10/site-packages/services/waf
 usr/lib/python3.10/site-packages/services/waf/__init__.py
-usr/lib/python3.10/site-packages/services/waf/src
+#usr/lib/python3.10/site-packages/services/waf/src
 usr/lib/python3.10/site-packages/services/waf/src/__init__.py
-usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf
+#usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf
 usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/__init__.py
-usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/generated
+#usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/generated
 usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/generated/__init__.py
 usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/generated/waf_cli.py
 usr/lib/python3.10/site-packages/services/waf/src/oci_cli_waf/waf_cli_extended.py
-usr/lib/python3.10/site-packages/services/waf/tests
+#usr/lib/python3.10/site-packages/services/waf/tests
 usr/lib/python3.10/site-packages/services/waf/tests/__init__.py
-usr/lib/python3.10/site-packages/services/work_requests
+#usr/lib/python3.10/site-packages/services/work_requests
 usr/lib/python3.10/site-packages/services/work_requests/__init__.py
-usr/lib/python3.10/site-packages/services/work_requests/src
+#usr/lib/python3.10/site-packages/services/work_requests/src
 usr/lib/python3.10/site-packages/services/work_requests/src/__init__.py
-usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request
+#usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request
 usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/__init__.py
-usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/generated
+#usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/generated
 usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/generated/__init__.py
 usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/generated/client_mappings.py
 usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/generated/workrequest_cli.py
 usr/lib/python3.10/site-packages/services/work_requests/src/oci_cli_work_request/workrequest_cli_extended.py
-usr/lib/python3.10/site-packages/services/work_requests/tests
+#usr/lib/python3.10/site-packages/services/work_requests/tests
 usr/lib/python3.10/site-packages/services/work_requests/tests/__init__.py
diff --git a/config/rootfiles/packages/oci-python-sdk b/config/rootfiles/packages/oci-python-sdk
index 108ef0636..58fd22912 100644
--- a/config/rootfiles/packages/oci-python-sdk
+++ b/config/rootfiles/packages/oci-python-sdk
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/oci
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/oci-2.54.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/oci-2.64.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/oci/__init__.py
 usr/lib/python3.10/site-packages/oci/_vendor
 usr/lib/python3.10/site-packages/oci/_vendor/__init__.py
@@ -252,6 +252,116 @@ usr/lib/python3.10/site-packages/oci/ai_language/models/sentiments_document.py
 usr/lib/python3.10/site-packages/oci/ai_language/models/text_classification.py
 usr/lib/python3.10/site-packages/oci/ai_language/models/text_classification_document.py
 usr/lib/python3.10/site-packages/oci/ai_language/models/text_classification_document_result.py
+#usr/lib/python3.10/site-packages/oci/ai_speech
+usr/lib/python3.10/site-packages/oci/ai_speech/__init__.py
+usr/lib/python3.10/site-packages/oci/ai_speech/ai_service_speech_client.py
+usr/lib/python3.10/site-packages/oci/ai_speech/ai_service_speech_client_composite_operations.py
+#usr/lib/python3.10/site-packages/oci/ai_speech/models
+usr/lib/python3.10/site-packages/oci/ai_speech/models/__init__.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/audio_format_details.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/change_transcription_job_compartment_details.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/create_transcription_job_details.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/input_location.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/object_list_file_input_location.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/object_list_inline_input_location.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/object_location.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/output_location.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/profanity_transcription_filter.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_filter.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_job.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_job_collection.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_job_summary.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_model_details.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_normalization.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_task.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_task_collection.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/transcription_task_summary.py
+usr/lib/python3.10/site-packages/oci/ai_speech/models/update_transcription_job_details.py
+#usr/lib/python3.10/site-packages/oci/ai_vision
+usr/lib/python3.10/site-packages/oci/ai_vision/__init__.py
+usr/lib/python3.10/site-packages/oci/ai_vision/ai_service_vision_client.py
+usr/lib/python3.10/site-packages/oci/ai_vision/ai_service_vision_client_composite_operations.py
+#usr/lib/python3.10/site-packages/oci/ai_vision/models
+usr/lib/python3.10/site-packages/oci/ai_vision/models/__init__.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/analyze_document_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/analyze_document_result.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/analyze_image_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/analyze_image_result.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/bounding_polygon.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/cell.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/change_model_compartment_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/change_project_compartment_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/create_document_job_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/create_image_job_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/create_model_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/create_project_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/data_science_labeling_dataset.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/dataset.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/detected_document_type.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/detected_language.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/dimensions.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_classification_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_field.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_job.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_key_value_detection_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_language_classification_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_metadata.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_table_detection_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/document_text_detection_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/field_label.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/field_name.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/field_value.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_classification_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_job.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_object.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_object_detection_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_text.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/image_text_detection_feature.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/inline_document_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/inline_image_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/input_location.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/label.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/line.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/model.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/model_collection.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/model_summary.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/normalized_vertex.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/object_list_inline_input_location.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/object_location.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/object_storage_dataset.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/object_storage_document_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/object_storage_image_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/ontology_class.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/output_location.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/page.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/processing_error.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/project.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/project_collection.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/project_summary.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/table.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/table_row.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/update_model_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/update_project_details.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_array.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_date.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_integer.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_number.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_phone_number.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_string.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/value_time.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/word.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_error.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_error_collection.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_log_entry.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_log_entry_collection.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_resource.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_summary.py
+usr/lib/python3.10/site-packages/oci/ai_vision/models/work_request_summary_collection.py
 usr/lib/python3.10/site-packages/oci/analytics
 usr/lib/python3.10/site-packages/oci/analytics/__init__.py
 usr/lib/python3.10/site-packages/oci/analytics/analytics_client.py
@@ -272,6 +382,7 @@ usr/lib/python3.10/site-packages/oci/analytics/models/private_endpoint_details.p
 usr/lib/python3.10/site-packages/oci/analytics/models/private_source_dns_zone.py
 usr/lib/python3.10/site-packages/oci/analytics/models/public_endpoint_details.py
 usr/lib/python3.10/site-packages/oci/analytics/models/scale_analytics_instance_details.py
+usr/lib/python3.10/site-packages/oci/analytics/models/set_kms_key_details.py
 usr/lib/python3.10/site-packages/oci/analytics/models/update_analytics_instance_details.py
 usr/lib/python3.10/site-packages/oci/analytics/models/update_private_access_channel_details.py
 usr/lib/python3.10/site-packages/oci/analytics/models/update_vanity_url_details.py
@@ -286,12 +397,17 @@ usr/lib/python3.10/site-packages/oci/announcements_service
 usr/lib/python3.10/site-packages/oci/announcements_service/__init__.py
 usr/lib/python3.10/site-packages/oci/announcements_service/announcement_client.py
 usr/lib/python3.10/site-packages/oci/announcements_service/announcement_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/announcements_service/announcement_subscription_client.py
+usr/lib/python3.10/site-packages/oci/announcements_service/announcement_subscription_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/announcements_service/announcements_preferences_client.py
 usr/lib/python3.10/site-packages/oci/announcements_service/announcements_preferences_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models
 usr/lib/python3.10/site-packages/oci/announcements_service/models/__init__.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/affected_resource.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement_subscription.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement_subscription_collection.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement_subscription_summary.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement_summary.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/announcement_user_status_details.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/announcements_collection.py
@@ -300,9 +416,17 @@ usr/lib/python3.10/site-packages/oci/announcements_service/models/announcements_
 usr/lib/python3.10/site-packages/oci/announcements_service/models/base_announcement.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/base_announcements_preferences.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/base_create_announcements_preferences_details.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/change_announcement_subscription_compartment_details.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/create_announcement_subscription_details.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/create_announcements_preferences_details.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/create_filter_group_details.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/filter.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/filter_group.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/filter_group_details.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/model_property.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/update_announcement_subscription_details.py
 usr/lib/python3.10/site-packages/oci/announcements_service/models/update_announcements_preferences_details.py
+usr/lib/python3.10/site-packages/oci/announcements_service/models/update_filter_group_details.py
 usr/lib/python3.10/site-packages/oci/apigateway
 usr/lib/python3.10/site-packages/oci/apigateway/__init__.py
 usr/lib/python3.10/site-packages/oci/apigateway/api_gateway_client.py
@@ -514,6 +638,8 @@ usr/lib/python3.10/site-packages/oci/apm_traces
 usr/lib/python3.10/site-packages/oci/apm_traces/__init__.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models
 usr/lib/python3.10/site-packages/oci/apm_traces/models/__init__.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/aggregated_snapshot.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/aggregated_stack_trace.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/query_details.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/query_result_metadata_summary.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/query_result_response.py
@@ -522,12 +648,17 @@ usr/lib/python3.10/site-packages/oci/apm_traces/models/query_result_row_type_sum
 usr/lib/python3.10/site-packages/oci/apm_traces/models/query_results_grouped_by_summary.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/query_results_ordered_by_summary.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/quick_pick_summary.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/snapshot_detail.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/span.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/span_log.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/span_log_collection.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/span_snapshot.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/stack_trace_element.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/tag.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/thread_snapshot.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/trace.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/trace_service_summary.py
+usr/lib/python3.10/site-packages/oci/apm_traces/models/trace_snapshot.py
 usr/lib/python3.10/site-packages/oci/apm_traces/models/trace_span_summary.py
 usr/lib/python3.10/site-packages/oci/apm_traces/query_client.py
 usr/lib/python3.10/site-packages/oci/apm_traces/query_client_composite_operations.py
@@ -1030,6 +1161,8 @@ usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_aggregation.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_endpoint_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_endpoint_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_history_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_history_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_summary.py
@@ -1037,6 +1170,18 @@ usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_trend_aggregatio
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/problem_trend_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/recommendation_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/recommendation_summary_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/request_summarized_trend_resource_risk_scores_details.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_endpoint_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_endpoint_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_impacted_resource_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_impacted_resource_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_risk_score_aggregation_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_risk_score_aggregation_summary_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_profile_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_risk_score_aggregation.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_risk_score_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_type_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/resource_type_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/responder_activity_collection.py
@@ -1068,8 +1213,18 @@ usr/lib/python3.10/site-packages/oci/cloud_guard/models/security_score_aggregati
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/security_score_trend_aggregation.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/security_score_trend_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/service_type_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_endpoint_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_endpoint_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_impacted_resource_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_impacted_resource_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/sighting_type.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/simple_condition.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/skip_bulk_responder_execution_details.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/tactic_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/tactic_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_collection.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_detector_details.py
@@ -1089,6 +1244,8 @@ usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_responder_recipe_
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_responder_recipe_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_selected.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/target_summary.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/technique_collection.py
+usr/lib/python3.10/site-packages/oci/cloud_guard/models/technique_summary.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/trigger_responder_details.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/update_bulk_problem_status_details.py
 usr/lib/python3.10/site-packages/oci/cloud_guard/models/update_configuration_details.py
@@ -1190,6 +1347,8 @@ usr/lib/python3.10/site-packages/oci/container_engine/models/node_source_details
 usr/lib/python3.10/site-packages/oci/container_engine/models/node_source_option.py
 usr/lib/python3.10/site-packages/oci/container_engine/models/node_source_via_image_details.py
 usr/lib/python3.10/site-packages/oci/container_engine/models/node_source_via_image_option.py
+usr/lib/python3.10/site-packages/oci/container_engine/models/persistent_volume_config_details.py
+usr/lib/python3.10/site-packages/oci/container_engine/models/service_lb_config_details.py
 usr/lib/python3.10/site-packages/oci/container_engine/models/update_cluster_details.py
 usr/lib/python3.10/site-packages/oci/container_engine/models/update_cluster_endpoint_config_details.py
 usr/lib/python3.10/site-packages/oci/container_engine/models/update_cluster_options_details.py
@@ -1220,7 +1379,9 @@ usr/lib/python3.10/site-packages/oci/core/models/add_image_shape_compatibility_e
 usr/lib/python3.10/site-packages/oci/core/models/add_network_security_group_security_rules_details.py
 usr/lib/python3.10/site-packages/oci/core/models/add_public_ip_pool_capacity_details.py
 usr/lib/python3.10/site-packages/oci/core/models/add_security_rule_details.py
+usr/lib/python3.10/site-packages/oci/core/models/add_subnet_ipv6_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/add_vcn_cidr_details.py
+usr/lib/python3.10/site-packages/oci/core/models/add_vcn_ipv6_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/added_network_security_group_security_rules.py
 usr/lib/python3.10/site-packages/oci/core/models/allowed_ike_ip_sec_parameters.py
 usr/lib/python3.10/site-packages/oci/core/models/allowed_phase_one_parameters.py
@@ -1270,6 +1431,8 @@ usr/lib/python3.10/site-packages/oci/core/models/byoip_allocated_range_summary.p
 usr/lib/python3.10/site-packages/oci/core/models/byoip_range.py
 usr/lib/python3.10/site-packages/oci/core/models/byoip_range_collection.py
 usr/lib/python3.10/site-packages/oci/core/models/byoip_range_summary.py
+usr/lib/python3.10/site-packages/oci/core/models/byoip_range_vcn_ipv6_allocation_summary.py
+usr/lib/python3.10/site-packages/oci/core/models/byoipv6_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/capacity_reservation_instance_summary.py
 usr/lib/python3.10/site-packages/oci/core/models/capture_console_history_details.py
 usr/lib/python3.10/site-packages/oci/core/models/change_boot_volume_backup_compartment_details.py
@@ -1415,6 +1578,7 @@ usr/lib/python3.10/site-packages/oci/core/models/drg.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_id_drg_route_distribution_match_criteria.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_info.py
+usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_match_all_drg_route_distribution_match_criteria.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_network_create_details.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_network_details.py
 usr/lib/python3.10/site-packages/oci/core/models/drg_attachment_network_update_details.py
@@ -1526,6 +1690,7 @@ usr/lib/python3.10/site-packages/oci/core/models/macsec_properties.py
 usr/lib/python3.10/site-packages/oci/core/models/measured_boot_entry.py
 usr/lib/python3.10/site-packages/oci/core/models/measured_boot_report.py
 usr/lib/python3.10/site-packages/oci/core/models/measured_boot_report_measurements.py
+usr/lib/python3.10/site-packages/oci/core/models/member_replica.py
 usr/lib/python3.10/site-packages/oci/core/models/modify_vcn_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/multipath_device.py
 usr/lib/python3.10/site-packages/oci/core/models/nat_gateway.py
@@ -1551,7 +1716,9 @@ usr/lib/python3.10/site-packages/oci/core/models/remove_drg_route_distribution_s
 usr/lib/python3.10/site-packages/oci/core/models/remove_drg_route_rules_details.py
 usr/lib/python3.10/site-packages/oci/core/models/remove_network_security_group_security_rules_details.py
 usr/lib/python3.10/site-packages/oci/core/models/remove_public_ip_pool_capacity_details.py
+usr/lib/python3.10/site-packages/oci/core/models/remove_subnet_ipv6_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/remove_vcn_cidr_details.py
+usr/lib/python3.10/site-packages/oci/core/models/remove_vcn_ipv6_cidr_details.py
 usr/lib/python3.10/site-packages/oci/core/models/route_rule.py
 usr/lib/python3.10/site-packages/oci/core/models/route_table.py
 usr/lib/python3.10/site-packages/oci/core/models/security_list.py
@@ -1561,6 +1728,7 @@ usr/lib/python3.10/site-packages/oci/core/models/service_gateway.py
 usr/lib/python3.10/site-packages/oci/core/models/service_id_request_details.py
 usr/lib/python3.10/site-packages/oci/core/models/service_id_response_details.py
 usr/lib/python3.10/site-packages/oci/core/models/shape.py
+usr/lib/python3.10/site-packages/oci/core/models/shape_alternative_object.py
 usr/lib/python3.10/site-packages/oci/core/models/shape_max_vnic_attachment_options.py
 usr/lib/python3.10/site-packages/oci/core/models/shape_measured_boot_options.py
 usr/lib/python3.10/site-packages/oci/core/models/shape_memory_options.py
@@ -1678,9 +1846,13 @@ usr/lib/python3.10/site-packages/oci/core/models/volume_backup_policy_assignment
 usr/lib/python3.10/site-packages/oci/core/models/volume_backup_schedule.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group_backup.py
+usr/lib/python3.10/site-packages/oci/core/models/volume_group_replica.py
+usr/lib/python3.10/site-packages/oci/core/models/volume_group_replica_details.py
+usr/lib/python3.10/site-packages/oci/core/models/volume_group_replica_info.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group_source_details.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group_source_from_volume_group_backup_details.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group_source_from_volume_group_details.py
+usr/lib/python3.10/site-packages/oci/core/models/volume_group_source_from_volume_group_replica_details.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_group_source_from_volumes_details.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_kms_key.py
 usr/lib/python3.10/site-packages/oci/core/models/volume_source_details.py
@@ -1689,6 +1861,27 @@ usr/lib/python3.10/site-packages/oci/core/models/volume_source_from_volume_backu
 usr/lib/python3.10/site-packages/oci/core/models/volume_source_from_volume_details.py
 usr/lib/python3.10/site-packages/oci/core/virtual_network_client.py
 usr/lib/python3.10/site-packages/oci/core/virtual_network_client_composite_operations.py
+#usr/lib/python3.10/site-packages/oci/dashboard_service
+usr/lib/python3.10/site-packages/oci/dashboard_service/__init__.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/dashboard_client.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/dashboard_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/dashboard_group_client.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/dashboard_group_client_composite_operations.py
+#usr/lib/python3.10/site-packages/oci/dashboard_service/models
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/__init__.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/create_dashboard_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/create_dashboard_group_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/create_v1_dashboard_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard_collection.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard_group.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard_group_collection.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard_group_summary.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/dashboard_summary.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/update_dashboard_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/update_dashboard_group_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/update_v1_dashboard_details.py
+usr/lib/python3.10/site-packages/oci/dashboard_service/models/v1_dashboard.py
 usr/lib/python3.10/site-packages/oci/data_catalog
 usr/lib/python3.10/site-packages/oci/data_catalog/__init__.py
 usr/lib/python3.10/site-packages/oci/data_catalog/data_catalog_client.py
@@ -1858,6 +2051,223 @@ usr/lib/python3.10/site-packages/oci/data_catalog/models/work_request.py
 usr/lib/python3.10/site-packages/oci/data_catalog/models/work_request_error.py
 usr/lib/python3.10/site-packages/oci/data_catalog/models/work_request_log.py
 usr/lib/python3.10/site-packages/oci/data_catalog/models/work_request_resource.py
+#usr/lib/python3.10/site-packages/oci/data_connectivity
+usr/lib/python3.10/site-packages/oci/data_connectivity/__init__.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/data_connectivity_management_client.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/data_connectivity_management_client_composite_operations.py
+#usr/lib/python3.10/site-packages/oci/data_connectivity/models
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/__init__.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/abstract_call_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/abstract_data_operation_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/abstract_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/abstract_read_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/abstract_write_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/aggregator_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/attach_data_asset_info.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/attribute_profile_result.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/avro_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/base_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/bicc_read_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/bip_call_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/call_operation_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/change_endpoint_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/change_registry_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/column.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/composite_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/compression.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/config_definition.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/config_parameter_definition.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/config_parameter_value.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/config_values.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/configured_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_property.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_validation.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_validation_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connection_validation_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connectivity_validation.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/connector_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_attach_data_asset_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_connection_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_connection_validation_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_connectivity_validation_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_data_asset_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_data_preview_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_data_profile_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_de_reference_artifact_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_detach_data_asset_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_dp_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_dp_endpoint_from_private.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_dp_endpoint_from_public.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_from_data_store.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_from_file.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_from_sql.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_from_table.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_entity_shape_from_view.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_execute_operation_job_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_folder_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_full_push_down_task_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_reference_artifact_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_registry_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/create_test_network_connectivity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/csv_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_asset.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_asset_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_asset_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_data_store.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_data_store_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_file.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_file_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_sql.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_sql_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_table.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_table_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_view.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_from_view_entity_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_from_data_store.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_from_file.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_from_sql.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_from_table.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_entity_summary_from_view.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_format.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_preview.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_profile.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/data_type_stat.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/date_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/de_reference_info.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/derived_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/detach_data_asset_info.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_from_private.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_from_private_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_from_public.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_from_public_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_summary_from_private.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/dp_endpoint_summary_from_public.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/endpoint.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/endpoint_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/endpoint_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_profile_result.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape_from_data_store.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape_from_file.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape_from_sql.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape_from_table.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/entity_shape_from_view.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/error_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/execute_operation_job.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/execute_operation_job_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/external_storage.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/filter_push.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/folder.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/folder_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/folder_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/foreign_key.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/full_push_down_task_response.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/hdfs_write_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/histogram.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/input_port.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/join.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/json_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/key.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/key_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/key_range.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/key_range_partition_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/message.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/native_shape_field.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/network_connectivity_status.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/network_connectivity_status_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/numeric_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/object_freq_stat.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/object_metadata.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/object_storage_write_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_exec_result.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_from_procedure.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_input_record.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/operation_summary_from_procedure.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/oracle_adwc_write_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/oracle_atp_write_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/oracle_read_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/oracle_read_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/oracle_write_attributes.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/outlier.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/output_port.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/parameter.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/parent_reference.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/parquet_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/partition_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/primary_key.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/profile_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/profile_stat.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/push_down_operation.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/query.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/read_operation_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/reference_artifact_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/reference_artifact_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/reference_info.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/registry.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/registry_metadata.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/registry_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/registry_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/row.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/schema.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/schema_drift_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/schema_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/schema_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/select.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/shape.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/shape_field.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/sort.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/sort_clause.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/source.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/string_attribute.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/structured_type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/target.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/test_network_connectivity.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/type.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/type_library.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/type_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/type_system.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/typed_object.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/types_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/unique_key.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_connection_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_data_asset_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_dp_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_dp_endpoint_from_private.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_dp_endpoint_from_public.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_folder_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/update_registry_details.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/validation_message.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/validation_result.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_error.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_error_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_error_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_log.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_log_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_resource.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_summary.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/work_request_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/models/write_operation_config.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/network_validation_client.py
+usr/lib/python3.10/site-packages/oci/data_connectivity/network_validation_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/data_flow
 usr/lib/python3.10/site-packages/oci/data_flow/__init__.py
 usr/lib/python3.10/site-packages/oci/data_flow/data_flow_client.py
@@ -1899,6 +2309,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/__init__.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_data_operation_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_field.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_formatted_text.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_frequency_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_read_attribute.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/abstract_write_attribute.py
@@ -1908,12 +2319,14 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/application.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/application_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/application_summary.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/application_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/auth_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/auth_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/avro_format_attribute.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/base_type.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/bicc_read_attributes.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/cancel_rest_call_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/change_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/change_dis_application_compartment_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/child_reference.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/child_reference_detail.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/composite_field_map.py
@@ -1985,6 +2398,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/create_data_asset_f
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_data_asset_from_oracle.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_data_flow_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_data_flow_validation_details.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/create_dis_application_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_entity_shape_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_entity_shape_from_file.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/create_entity_shape_from_sql.py
@@ -2072,6 +2486,9 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/derived_field.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/derived_type.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/direct_field_map.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/direct_named_field_map.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/dis_application.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/dis_application_summary.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/dis_application_summary_collection.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/distinct.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/dynamic_input_field.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/dynamic_proxy_field.py
@@ -2118,6 +2535,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/java_type.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/join.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/joiner.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/json_format_attribute.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/json_text.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/key.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/key_attribute.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/key_range.py
@@ -2166,6 +2584,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/pipeline_summary_co
 usr/lib/python3.10/site-packages/oci/data_integration/models/pipeline_validation.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/pipeline_validation_summary.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/pipeline_validation_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/poll_rest_call_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/primary_key.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/project.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/project_details.py
@@ -2193,6 +2612,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/reference_used_by.p
 usr/lib/python3.10/site-packages/oci/data_integration/models/registry_metadata.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/rename_rule.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/resource_configuration.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/resource_principal_auth_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/rest_call_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/root_object.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/rule_based_field_map.py
@@ -2204,6 +2624,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/schema.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/schema_drift_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/schema_summary.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/schema_summary_collection.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/scope_reference.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/script.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/secret_config.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/select.py
@@ -2251,6 +2672,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/time.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/type_library.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/type_list_rule.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/type_system.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/typed_expression.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/typed_name_pattern_rule.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/typed_object.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/ui_properties.py
@@ -2277,6 +2699,7 @@ usr/lib/python3.10/site-packages/oci/data_integration/models/update_data_asset_f
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_data_asset_from_object_storage.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_data_asset_from_oracle.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_data_flow_details.py
+usr/lib/python3.10/site-packages/oci/data_integration/models/update_dis_application_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_external_publication_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_folder_details.py
 usr/lib/python3.10/site-packages/oci/data_integration/models/update_function_library_details.py
@@ -2331,6 +2754,7 @@ usr/lib/python3.10/site-packages/oci/data_labeling_service/models/dataset_format
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/dataset_source_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/dataset_summary.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/document_dataset_format_details.py
+usr/lib/python3.10/site-packages/oci/data_labeling_service/models/export_format.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/generate_dataset_records_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/image_dataset_format_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service/models/initial_record_generation_configuration.py
@@ -2373,9 +2797,11 @@ usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/data
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/dataset_format_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/dataset_source_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/document_dataset_format_details.py
+usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/document_metadata.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/entity.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/generic_entity.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/image_dataset_format_details.py
+usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/image_metadata.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/image_object_selection_entity.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/initial_record_generation_configuration.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/label.py
@@ -2389,9 +2815,11 @@ usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/reco
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/record_analytics_aggregation.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/record_analytics_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/record_collection.py
+usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/record_metadata.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/record_summary.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/source_details.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/text_dataset_format_details.py
+usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/text_metadata.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/text_selection_entity.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/text_span.py
 usr/lib/python3.10/site-packages/oci/data_labeling_service_dataplane/models/update_annotation_details.py
@@ -2403,18 +2831,107 @@ usr/lib/python3.10/site-packages/oci/data_safe/data_safe_client_composite_operat
 usr/lib/python3.10/site-packages/oci/data_safe/models
 usr/lib/python3.10/site-packages/oci/data_safe/models/__init__.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/activate_target_database_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_aggregation_items.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_analytics_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy_rule.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy_rule_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy_rule_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_policy_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alert_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/alerts_aggregation_dimension.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/apply_discovery_job_results_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_archive_retrieval.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_archive_retrieval_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_archive_retrieval_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_conditions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_event_aggregation_dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_event_aggregation_items.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_event_analytics_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_event_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_event_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy_aggregation_items.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy_analytic_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy_dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_policy_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile_aggregation_items.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile_analytic_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile_dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_profile_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_specification.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail_aggregation_items.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail_analytic_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail_dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/audit_trail_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/autonomous_database_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/available_audit_volume_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/available_audit_volume_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/calculate_audit_volume_available_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/calculate_audit_volume_collected_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_alert_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_alert_policy_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_audit_archive_retrieval_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_audit_policy_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_audit_profile_compartment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/change_data_safe_private_endpoint_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_discovery_job_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_library_masking_format_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_masking_policy_compartment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/change_on_prem_connector_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_report_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_report_definition_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_retention_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/change_security_assessment_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_sensitive_data_model_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_sensitive_type_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/change_target_alert_policy_association_compartment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/change_target_database_compartment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/change_user_assessment_compartment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/collected_audit_volume_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/collected_audit_volume_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_filter.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_sorting.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_source_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_source_from_sdm_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_source_from_target_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/column_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/compare_security_assessment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/compare_user_assessment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/compatible_formats_for_data_types.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/compatible_formats_for_sensitive_types.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/connection_option.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_alert_policy_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_alert_policy_rule_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_audit_archive_retrieval_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_audit_policy_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_audit_profile_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_column_source_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_column_source_from_sdm_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_column_source_from_target_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/create_data_safe_private_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_discovery_job_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_library_masking_format_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_masking_column_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_masking_policy_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/create_on_prem_connector_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_report_definition_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/create_security_assessment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_sensitive_category_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_sensitive_column_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_sensitive_data_model_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_sensitive_type_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_sensitive_type_pattern_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/create_target_alert_policy_association_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/create_target_database_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/create_user_assessment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/credentials.py
@@ -2423,26 +2940,109 @@ usr/lib/python3.10/site-packages/oci/data_safe/models/data_safe_private_endpoint
 usr/lib/python3.10/site-packages/oci/data_safe/models/data_safe_private_endpoint_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/database_cloud_service_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/database_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/delete_rows_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/deterministic_encryption_date_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/deterministic_encryption_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/deterministic_substitution_format_entry.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/diffs.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_analytics_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_analytics_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job_result.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job_result_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job_result_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/discovery_job_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/download_discovery_report_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/download_masking_log_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/download_masking_policy_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/download_masking_report_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/download_security_assessment_report_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/download_sensitive_data_model_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/download_user_assessment_report_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/enable_conditions.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/enable_data_safe_configuration_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/finding.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/finding_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/fixed_number_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/fixed_string_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/format_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/formats_for_data_type.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/formats_for_sensitive_type.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/generate_discovery_report_for_download_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/generate_masking_policy_for_download_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/generate_masking_report_for_download_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/generate_on_prem_connector_configuration_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/generate_report_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/generate_security_assessment_report_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/generate_sensitive_data_model_for_download_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/generate_user_assessment_report_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/global_settings.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/grant_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/initialization_parameter.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/installed_database_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/library_masking_format.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/library_masking_format_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/library_masking_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/library_masking_format_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/mask_data_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masked_column_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masked_column_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_analytics_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_analytics_dimensions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_analytics_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_column.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_column_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_column_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_format.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_policy.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_policy_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_policy_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_report.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_report_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/masking_report_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/modified_attributes.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/modify_global_settings_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/null_value_format_entry.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/on_prem_connector.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/on_prem_connector_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/on_premise_connector.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_alert_policy_rule_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_alerts_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_discovery_job_result_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_insert_instruction.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_instruction.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_masking_columns_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_merge_instruction.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_remove_instruction.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/patch_sensitive_column_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/ppf_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/preserve_original_data_format_entry.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/private_endpoint.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/profile_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/provision_audit_conditions.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/provision_audit_policy_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_date_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_decimal_number_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_digits_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_list_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_number_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_string_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/random_substitution_format_entry.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/references.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/regular_expression_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report_definition.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report_definition_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report_definition_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/report_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/role_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/run_security_assessment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/run_user_assessment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/schema_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/section_statistics.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment_base_line_details.py
@@ -2450,13 +3050,54 @@ usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment_compar
 usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment_comparison_per_target.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment_statistics.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/security_assessment_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_category.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_column.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_column_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_column_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_data_model.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_data_model_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_data_model_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_type.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_type_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_type_pattern.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sensitive_type_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/shuffle_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/sql_expression_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/start_audit_trail_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/substring_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/table_summary.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/target_alert_policy_association.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/target_alert_policy_association_collection.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/target_alert_policy_association_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/target_database.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/target_database_summary.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/tls_config.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/truncate_table_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/udf_format_entry.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_alert_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_alert_policy_rule_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_audit_archive_retrieval_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_audit_policy_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_audit_profile_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_audit_trail_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_column_source_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_column_source_sdm_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_column_source_target_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_data_safe_private_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_library_masking_format_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_masking_column_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_masking_policy_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_on_prem_connector_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_on_prem_connector_wallet_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_report_definition_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_security_assessment_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_sensitive_category_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_sensitive_column_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_sensitive_data_model_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_sensitive_type_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_sensitive_type_pattern_details.py
+usr/lib/python3.10/site-packages/oci/data_safe/models/update_target_alert_policy_association_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_target_database_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/update_user_assessment_details.py
 usr/lib/python3.10/site-packages/oci/data_safe/models/user_aggregation.py
@@ -2492,6 +3133,7 @@ usr/lib/python3.10/site-packages/oci/data_science/models/create_model_provenance
 usr/lib/python3.10/site-packages/oci/data_science/models/create_notebook_session_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/create_project_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/default_job_configuration_details.py
+usr/lib/python3.10/site-packages/oci/data_science/models/fast_launch_job_config_summary.py
 usr/lib/python3.10/site-packages/oci/data_science/models/fixed_size_scaling_policy.py
 usr/lib/python3.10/site-packages/oci/data_science/models/instance_configuration.py
 usr/lib/python3.10/site-packages/oci/data_science/models/job.py
@@ -2504,6 +3146,7 @@ usr/lib/python3.10/site-packages/oci/data_science/models/job_run_summary.py
 usr/lib/python3.10/site-packages/oci/data_science/models/job_shape_summary.py
 usr/lib/python3.10/site-packages/oci/data_science/models/job_summary.py
 usr/lib/python3.10/site-packages/oci/data_science/models/log_details.py
+usr/lib/python3.10/site-packages/oci/data_science/models/managed_egress_standalone_job_infrastructure_configuration_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/metadata.py
 usr/lib/python3.10/site-packages/oci/data_science/models/model.py
 usr/lib/python3.10/site-packages/oci/data_science/models/model_configuration_details.py
@@ -2514,6 +3157,7 @@ usr/lib/python3.10/site-packages/oci/data_science/models/model_deployment_summar
 usr/lib/python3.10/site-packages/oci/data_science/models/model_provenance.py
 usr/lib/python3.10/site-packages/oci/data_science/models/model_summary.py
 usr/lib/python3.10/site-packages/oci/data_science/models/notebook_session.py
+usr/lib/python3.10/site-packages/oci/data_science/models/notebook_session_config_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/notebook_session_configuration_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/notebook_session_shape_config_details.py
 usr/lib/python3.10/site-packages/oci/data_science/models/notebook_session_shape_summary.py
@@ -2657,6 +3301,7 @@ usr/lib/python3.10/site-packages/oci/database/models/create_recovery_appliance_b
 usr/lib/python3.10/site-packages/oci/database/models/create_refreshable_autonomous_database_clone_details.py
 usr/lib/python3.10/site-packages/oci/database/models/create_vm_cluster_details.py
 usr/lib/python3.10/site-packages/oci/database/models/customer_contact.py
+usr/lib/python3.10/site-packages/oci/database/models/data_collection_options.py
 usr/lib/python3.10/site-packages/oci/database/models/data_guard_association.py
 usr/lib/python3.10/site-packages/oci/database/models/data_guard_association_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/database.py
@@ -2688,21 +3333,29 @@ usr/lib/python3.10/site-packages/oci/database/models/db_node.py
 usr/lib/python3.10/site-packages/oci/database/models/db_node_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/db_server.py
 usr/lib/python3.10/site-packages/oci/database/models/db_server_details.py
+usr/lib/python3.10/site-packages/oci/database/models/db_server_patching_details.py
 usr/lib/python3.10/site-packages/oci/database/models/db_server_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/db_system.py
 usr/lib/python3.10/site-packages/oci/database/models/db_system_options.py
 usr/lib/python3.10/site-packages/oci/database/models/db_system_shape_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/db_system_summary.py
+usr/lib/python3.10/site-packages/oci/database/models/db_system_upgrade_history_entry.py
+usr/lib/python3.10/site-packages/oci/database/models/db_system_upgrade_history_entry_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/db_version_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/deregister_autonomous_database_data_safe_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_database_management_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_container_database_database_management_details.py
+usr/lib/python3.10/site-packages/oci/database/models/enable_external_container_database_stack_monitoring_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_database_management_details_base.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_database_operations_insights_details_base.py
+usr/lib/python3.10/site-packages/oci/database/models/enable_external_database_stack_monitoring_details_base.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_non_container_database_database_management_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_non_container_database_operations_insights_details.py
+usr/lib/python3.10/site-packages/oci/database/models/enable_external_non_container_database_stack_monitoring_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_pluggable_database_database_management_details.py
 usr/lib/python3.10/site-packages/oci/database/models/enable_external_pluggable_database_operations_insights_details.py
+usr/lib/python3.10/site-packages/oci/database/models/enable_external_pluggable_database_stack_monitoring_details.py
+usr/lib/python3.10/site-packages/oci/database/models/estimated_patching_time.py
 usr/lib/python3.10/site-packages/oci/database/models/exadata_db_system_migration.py
 usr/lib/python3.10/site-packages/oci/database/models/exadata_db_system_migration_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/exadata_infrastructure.py
@@ -2772,8 +3425,10 @@ usr/lib/python3.10/site-packages/oci/database/models/restore_database_details.py
 usr/lib/python3.10/site-packages/oci/database/models/scan_details.py
 usr/lib/python3.10/site-packages/oci/database/models/scheduled_operation_details.py
 usr/lib/python3.10/site-packages/oci/database/models/self_mount_details.py
+usr/lib/python3.10/site-packages/oci/database/models/stack_monitoring_config.py
 usr/lib/python3.10/site-packages/oci/database/models/switchover_data_guard_association_details.py
 usr/lib/python3.10/site-packages/oci/database/models/update.py
+usr/lib/python3.10/site-packages/oci/database/models/update_autonomous_container_database_data_guard_association_details.py
 usr/lib/python3.10/site-packages/oci/database/models/update_autonomous_container_database_details.py
 usr/lib/python3.10/site-packages/oci/database/models/update_autonomous_database_details.py
 usr/lib/python3.10/site-packages/oci/database/models/update_autonomous_database_wallet_details.py
@@ -2805,6 +3460,7 @@ usr/lib/python3.10/site-packages/oci/database/models/update_summary.py
 usr/lib/python3.10/site-packages/oci/database/models/update_vm_cluster_details.py
 usr/lib/python3.10/site-packages/oci/database/models/update_vm_cluster_network_details.py
 usr/lib/python3.10/site-packages/oci/database/models/upgrade_database_details.py
+usr/lib/python3.10/site-packages/oci/database/models/upgrade_db_system_details.py
 usr/lib/python3.10/site-packages/oci/database/models/vm_cluster.py
 usr/lib/python3.10/site-packages/oci/database/models/vm_cluster_network.py
 usr/lib/python3.10/site-packages/oci/database/models/vm_cluster_network_details.py
@@ -2824,8 +3480,12 @@ usr/lib/python3.10/site-packages/oci/database_management/db_management_client_co
 usr/lib/python3.10/site-packages/oci/database_management/models
 usr/lib/python3.10/site-packages/oci/database_management/models/__init__.py
 usr/lib/python3.10/site-packages/oci/database_management/models/activity_time_series_metrics.py
+usr/lib/python3.10/site-packages/oci/database_management/models/add_data_files_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/add_managed_database_to_managed_database_group_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/allowed_parameter_value.py
+usr/lib/python3.10/site-packages/oci/database_management/models/asm_property.py
+usr/lib/python3.10/site-packages/oci/database_management/models/asm_property_collection.py
+usr/lib/python3.10/site-packages/oci/database_management/models/asm_property_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/associated_database_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/associated_database_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/awr_db_collection.py
@@ -2868,6 +3528,7 @@ usr/lib/python3.10/site-packages/oci/database_management/models/create_db_manage
 usr/lib/python3.10/site-packages/oci/database_management/models/create_job_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/create_managed_database_group_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/create_sql_job_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/create_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/data_access_container_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/data_access_container_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/database_credentials.py
@@ -2887,6 +3548,7 @@ usr/lib/python3.10/site-packages/oci/database_management/models/db_management_pr
 usr/lib/python3.10/site-packages/oci/database_management/models/db_management_private_endpoint_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/db_management_private_endpoint_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/drop_sql_tuning_task_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/drop_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/execution_plan_stats_comparision.py
 usr/lib/python3.10/site-packages/oci/database_management/models/failed_connections_aggregate_metrics.py
 usr/lib/python3.10/site-packages/oci/database_management/models/fleet_metric_definition.py
@@ -2929,8 +3591,10 @@ usr/lib/python3.10/site-packages/oci/database_management/models/proxied_for_user
 usr/lib/python3.10/site-packages/oci/database_management/models/proxied_for_user_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/proxy_user_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/proxy_user_summary.py
+usr/lib/python3.10/site-packages/oci/database_management/models/remove_data_file_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/remove_managed_database_from_managed_database_group_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/reset_database_parameters_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/resize_data_file_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/role_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/role_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/sql_job.py
@@ -2961,7 +3625,12 @@ usr/lib/python3.10/site-packages/oci/database_management/models/statements_aggre
 usr/lib/python3.10/site-packages/oci/database_management/models/system_privilege_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/system_privilege_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/tablespace.py
+usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_admin_credential_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_admin_password_credential_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_admin_secret_credential_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_admin_status.py
 usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_collection.py
+usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_storage_size.py
 usr/lib/python3.10/site-packages/oci/database_management/models/tablespace_summary.py
 usr/lib/python3.10/site-packages/oci/database_management/models/time_series_metric_data_point.py
 usr/lib/python3.10/site-packages/oci/database_management/models/time_series_metric_definition.py
@@ -2970,6 +3639,7 @@ usr/lib/python3.10/site-packages/oci/database_management/models/update_db_manage
 usr/lib/python3.10/site-packages/oci/database_management/models/update_job_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/update_managed_database_group_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/update_sql_job_details.py
+usr/lib/python3.10/site-packages/oci/database_management/models/update_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_management/models/user.py
 usr/lib/python3.10/site-packages/oci/database_management/models/user_collection.py
 usr/lib/python3.10/site-packages/oci/database_management/models/user_summary.py
@@ -2989,6 +3659,9 @@ usr/lib/python3.10/site-packages/oci/database_migration/database_migration_clien
 usr/lib/python3.10/site-packages/oci/database_migration/database_migration_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/database_migration/models
 usr/lib/python3.10/site-packages/oci/database_migration/models/__init__.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/adb_dedicated_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/adb_dedicated_remap_target_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/adb_serverles_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/admin_credentials.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/advisor_report.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/advisor_report_bucket_details.py
@@ -2999,6 +3672,7 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/agent_collection.
 usr/lib/python3.10/site-packages/oci/database_migration/models/agent_image_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/agent_image_summary.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/agent_summary.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/aws_s3_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/change_agent_compartment_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/change_connection_compartment_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/change_migration_compartment_details.py
@@ -3007,9 +3681,13 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/connect_descripto
 usr/lib/python3.10/site-packages/oci/database_migration/models/connection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/connection_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/connection_summary.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_adb_dedicated_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_adb_dedicated_remap_target_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_adb_serverles_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_admin_credentials.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_advisor_settings.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_agent_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_aws_s3_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_connect_descriptor.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_connection_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_curl_transfer_details.py
@@ -3025,11 +3703,14 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/create_golden_gat
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_golden_gate_settings.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_host_dump_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_migration_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_non_adb_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_non_adb_remap_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_object_store_bucket.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_oci_cli_dump_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_private_endpoint.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_replicat.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_ssh_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/create_target_type_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/create_vault_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/curl_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/data_pump_parameters.py
@@ -3039,6 +3720,8 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/database_link_det
 usr/lib/python3.10/site-packages/oci/database_migration/models/database_object.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/directory_object.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/dump_transfer_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/excluded_object_summary.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/excluded_object_summary_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/extract.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/generate_token.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/golden_gate_details.py
@@ -3056,11 +3739,15 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/migration.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_job_progress_resource.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_job_progress_summary.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/migration_object_collection.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/migration_object_summary.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_object_type_summary.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_object_type_summary_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_phase_collection.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_phase_summary.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/migration_summary.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/non_adb_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/non_adb_remap_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/object_store_bucket.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/oci_cli_dump_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/par_link.py
@@ -3071,10 +3758,15 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/replicat.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/resume_job_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/ssh_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/start_migration_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/target_type_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/unsupported_database_object.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_adb_dedicated_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_adb_dedicated_remap_target_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_adb_serverles_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_admin_credentials.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_advisor_settings.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_agent_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_aws_s3_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_connect_descriptor.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_connection_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_curl_transfer_details.py
@@ -3091,11 +3783,16 @@ usr/lib/python3.10/site-packages/oci/database_migration/models/update_golden_gat
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_host_dump_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_job_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_migration_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_non_adb_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_non_adb_remap_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_object_store_bucket.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_oci_cli_dump_transfer_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_private_endpoint.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_replicat.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_ssh_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_target_defaults_auto_create_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_target_defaults_remap_tablespace_details.py
+usr/lib/python3.10/site-packages/oci/database_migration/models/update_target_type_tablespace_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/update_vault_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/vault_details.py
 usr/lib/python3.10/site-packages/oci/database_migration/models/work_request.py
@@ -3216,13 +3913,23 @@ usr/lib/python3.10/site-packages/oci/devops/models/cancel_build_run_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/cancel_deployment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/change_project_compartment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/commit_info.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_traffic_shift_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_traffic_shift_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_blue_green_traffic_shift_deploy_stage_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_by_ids_selector.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_by_query_selector.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_approval_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_approval_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_approval_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_traffic_shift_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_traffic_shift_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_canary_traffic_shift_deploy_stage_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_deploy_environment.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_deploy_environment_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/compute_instance_group_deploy_stage.py
@@ -3246,6 +3953,11 @@ usr/lib/python3.10/site-packages/oci/devops/models/create_build_pipeline_details
 usr/lib/python3.10/site-packages/oci/devops/models/create_build_pipeline_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_build_run_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_build_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_blue_green_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_blue_green_traffic_shift_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_canary_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_canary_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_canary_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_deploy_environment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_compute_instance_group_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_connection_details.py
@@ -3267,11 +3979,17 @@ usr/lib/python3.10/site-packages/oci/devops/models/create_gitlab_trigger_details
 usr/lib/python3.10/site-packages/oci/devops/models/create_invoke_function_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_load_balancer_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_manual_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_oke_blue_green_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_oke_blue_green_traffic_shift_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_oke_canary_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_oke_canary_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_oke_canary_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_oke_cluster_deploy_environment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_oke_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_project_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_repository_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_single_deploy_stage_deployment_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/create_single_deploy_stage_redeployment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_trigger_deployment_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_trigger_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/create_wait_criteria_details.py
@@ -3381,14 +4099,35 @@ usr/lib/python3.10/site-packages/oci/devops/models/manual_approval_deploy_stage_
 usr/lib/python3.10/site-packages/oci/devops/models/manual_approval_deploy_stage_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/manual_build_run_source.py
 usr/lib/python3.10/site-packages/oci/devops/models/mirror_repository_config.py
+usr/lib/python3.10/site-packages/oci/devops/models/network_channel.py
+usr/lib/python3.10/site-packages/oci/devops/models/nginx_blue_green_strategy.py
+usr/lib/python3.10/site-packages/oci/devops/models/nginx_canary_strategy.py
 usr/lib/python3.10/site-packages/oci/devops/models/no_deploy_stage_rollback_policy.py
 usr/lib/python3.10/site-packages/oci/devops/models/notification_config.py
 usr/lib/python3.10/site-packages/oci/devops/models/ocir_deploy_artifact_source.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_deploy_stage.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_strategy.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_traffic_shift_deploy_stage.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_traffic_shift_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_blue_green_traffic_shift_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_approval_deploy_stage.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_approval_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_approval_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_deploy_stage.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_strategy.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_traffic_shift_deploy_stage.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_traffic_shift_deploy_stage_execution_progress.py
+usr/lib/python3.10/site-packages/oci/devops/models/oke_canary_traffic_shift_deploy_stage_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/oke_cluster_deploy_environment.py
 usr/lib/python3.10/site-packages/oci/devops/models/oke_cluster_deploy_environment_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/oke_deploy_stage.py
 usr/lib/python3.10/site-packages/oci/devops/models/oke_deploy_stage_execution_progress.py
 usr/lib/python3.10/site-packages/oci/devops/models/oke_deploy_stage_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/private_endpoint_channel.py
 usr/lib/python3.10/site-packages/oci/devops/models/project.py
 usr/lib/python3.10/site-packages/oci/devops/models/project_collection.py
 usr/lib/python3.10/site-packages/oci/devops/models/project_summary.py
@@ -3421,6 +4160,8 @@ usr/lib/python3.10/site-packages/oci/devops/models/run_pipeline_deploy_stage_exe
 usr/lib/python3.10/site-packages/oci/devops/models/run_validation_test_on_compute_instance_deploy_stage_execution_progress.py
 usr/lib/python3.10/site-packages/oci/devops/models/single_deploy_stage_deployment.py
 usr/lib/python3.10/site-packages/oci/devops/models/single_deploy_stage_deployment_summary.py
+usr/lib/python3.10/site-packages/oci/devops/models/single_deploy_stage_redeployment.py
+usr/lib/python3.10/site-packages/oci/devops/models/single_deploy_stage_redeployment_summary.py
 usr/lib/python3.10/site-packages/oci/devops/models/trigger.py
 usr/lib/python3.10/site-packages/oci/devops/models/trigger_action.py
 usr/lib/python3.10/site-packages/oci/devops/models/trigger_build_pipeline_action.py
@@ -3437,6 +4178,11 @@ usr/lib/python3.10/site-packages/oci/devops/models/update_build_pipeline_details
 usr/lib/python3.10/site-packages/oci/devops/models/update_build_pipeline_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_build_run_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_build_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_blue_green_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_blue_green_traffic_shift_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_canary_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_canary_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_canary_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_deploy_environment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_compute_instance_group_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_connection_details.py
@@ -3458,11 +4204,17 @@ usr/lib/python3.10/site-packages/oci/devops/models/update_gitlab_trigger_details
 usr/lib/python3.10/site-packages/oci/devops/models/update_invoke_function_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_load_balancer_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_manual_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_oke_blue_green_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_oke_blue_green_traffic_shift_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_oke_canary_approval_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_oke_canary_deploy_stage_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_oke_canary_traffic_shift_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_oke_cluster_deploy_environment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_oke_deploy_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_project_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_repository_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_single_deploy_stage_deployment_details.py
+usr/lib/python3.10/site-packages/oci/devops/models/update_single_deploy_stage_redeployment_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_trigger_deployment_stage_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_trigger_details.py
 usr/lib/python3.10/site-packages/oci/devops/models/update_wait_criteria_details.py
@@ -4038,20 +4790,33 @@ usr/lib/python3.10/site-packages/oci/jms/models
 usr/lib/python3.10/site-packages/oci/jms/models/__init__.py
 usr/lib/python3.10/site-packages/oci/jms/models/application_usage.py
 usr/lib/python3.10/site-packages/oci/jms/models/application_usage_collection.py
+usr/lib/python3.10/site-packages/oci/jms/models/blocklist.py
+usr/lib/python3.10/site-packages/oci/jms/models/blocklist_collection.py
+usr/lib/python3.10/site-packages/oci/jms/models/blocklist_entry.py
+usr/lib/python3.10/site-packages/oci/jms/models/blocklist_target.py
 usr/lib/python3.10/site-packages/oci/jms/models/change_fleet_compartment_details.py
+usr/lib/python3.10/site-packages/oci/jms/models/create_blocklist_details.py
 usr/lib/python3.10/site-packages/oci/jms/models/create_fleet_details.py
+usr/lib/python3.10/site-packages/oci/jms/models/custom_log.py
+usr/lib/python3.10/site-packages/oci/jms/models/existing_installation_site_id.py
 usr/lib/python3.10/site-packages/oci/jms/models/fleet.py
 usr/lib/python3.10/site-packages/oci/jms/models/fleet_agent_configuration.py
 usr/lib/python3.10/site-packages/oci/jms/models/fleet_agent_os_configuration.py
 usr/lib/python3.10/site-packages/oci/jms/models/fleet_collection.py
 usr/lib/python3.10/site-packages/oci/jms/models/fleet_summary.py
+usr/lib/python3.10/site-packages/oci/jms/models/installation_site.py
+usr/lib/python3.10/site-packages/oci/jms/models/installation_site_collection.py
+usr/lib/python3.10/site-packages/oci/jms/models/installation_site_summary.py
 usr/lib/python3.10/site-packages/oci/jms/models/installation_usage.py
 usr/lib/python3.10/site-packages/oci/jms/models/installation_usage_collection.py
+usr/lib/python3.10/site-packages/oci/jms/models/java_runtime_id.py
 usr/lib/python3.10/site-packages/oci/jms/models/jre_usage.py
 usr/lib/python3.10/site-packages/oci/jms/models/jre_usage_collection.py
 usr/lib/python3.10/site-packages/oci/jms/models/managed_instance_usage.py
 usr/lib/python3.10/site-packages/oci/jms/models/managed_instance_usage_collection.py
 usr/lib/python3.10/site-packages/oci/jms/models/operating_system.py
+usr/lib/python3.10/site-packages/oci/jms/models/principal.py
+usr/lib/python3.10/site-packages/oci/jms/models/remove_fleet_installation_sites_details.py
 usr/lib/python3.10/site-packages/oci/jms/models/request_summarized_application_usage_details.py
 usr/lib/python3.10/site-packages/oci/jms/models/request_summarized_installation_usage_details.py
 usr/lib/python3.10/site-packages/oci/jms/models/request_summarized_jre_usage_details.py
@@ -4059,6 +4824,8 @@ usr/lib/python3.10/site-packages/oci/jms/models/request_summarized_managed_insta
 usr/lib/python3.10/site-packages/oci/jms/models/resource_inventory.py
 usr/lib/python3.10/site-packages/oci/jms/models/update_fleet_agent_configuration_details.py
 usr/lib/python3.10/site-packages/oci/jms/models/update_fleet_details.py
+usr/lib/python3.10/site-packages/oci/jms/models/work_item_collection.py
+usr/lib/python3.10/site-packages/oci/jms/models/work_item_summary.py
 usr/lib/python3.10/site-packages/oci/jms/models/work_request.py
 usr/lib/python3.10/site-packages/oci/jms/models/work_request_collection.py
 usr/lib/python3.10/site-packages/oci/jms/models/work_request_error.py
@@ -4736,6 +5503,7 @@ usr/lib/python3.10/site-packages/oci/marketplace/models/eula.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/free_text_search_details.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/image_listing_package.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/image_publication_package.py
+usr/lib/python3.10/site-packages/oci/marketplace/models/international_market_price.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/item.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/launch_eligibility.py
 usr/lib/python3.10/site-packages/oci/marketplace/models/link.py
@@ -4840,6 +5608,7 @@ usr/lib/python3.10/site-packages/oci/mysql/models/create_db_system_source_detail
 usr/lib/python3.10/site-packages/oci/mysql/models/create_db_system_source_from_backup_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/create_db_system_source_from_none_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/create_db_system_source_import_from_url_details.py
+usr/lib/python3.10/site-packages/oci/mysql/models/create_deletion_policy_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/create_maintenance_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/db_system.py
 usr/lib/python3.10/site-packages/oci/mysql/models/db_system_endpoint.py
@@ -4850,6 +5619,7 @@ usr/lib/python3.10/site-packages/oci/mysql/models/db_system_source_from_backup.p
 usr/lib/python3.10/site-packages/oci/mysql/models/db_system_source_from_none.py
 usr/lib/python3.10/site-packages/oci/mysql/models/db_system_source_import_from_url.py
 usr/lib/python3.10/site-packages/oci/mysql/models/db_system_summary.py
+usr/lib/python3.10/site-packages/oci/mysql/models/deletion_policy_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/heat_wave_cluster.py
 usr/lib/python3.10/site-packages/oci/mysql/models/heat_wave_cluster_memory_estimate.py
 usr/lib/python3.10/site-packages/oci/mysql/models/heat_wave_cluster_schema_memory_estimate.py
@@ -4871,6 +5641,7 @@ usr/lib/python3.10/site-packages/oci/mysql/models/update_channel_target_details.
 usr/lib/python3.10/site-packages/oci/mysql/models/update_channel_target_from_db_system_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/update_configuration_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/update_db_system_details.py
+usr/lib/python3.10/site-packages/oci/mysql/models/update_deletion_policy_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/update_heat_wave_cluster_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/update_maintenance_details.py
 usr/lib/python3.10/site-packages/oci/mysql/models/version.py
@@ -5072,6 +5843,8 @@ usr/lib/python3.10/site-packages/oci/ocvp/models/hcx_license_summary.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/sddc.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/sddc_collection.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/sddc_summary.py
+usr/lib/python3.10/site-packages/oci/ocvp/models/supported_host_shape_collection.py
+usr/lib/python3.10/site-packages/oci/ocvp/models/supported_host_shape_summary.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/supported_sku_summary.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/supported_sku_summary_collection.py
 usr/lib/python3.10/site-packages/oci/ocvp/models/supported_vmware_software_version_collection.py
@@ -5186,6 +5959,8 @@ usr/lib/python3.10/site-packages/oci/opsi/models/change_database_insight_compart
 usr/lib/python3.10/site-packages/oci/opsi/models/change_enterprise_manager_bridge_compartment_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/change_exadata_insight_compartment_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/change_host_insight_compartment_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/change_operations_insights_private_endpoint_compartment_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/change_pe_comanaged_database_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/connection_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_awr_hub_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_database_insight_details.py
@@ -5197,8 +5972,11 @@ usr/lib/python3.10/site-packages/oci/opsi/models/create_enterprise_manager_bridg
 usr/lib/python3.10/site-packages/oci/opsi/models/create_exadata_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_host_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_macs_managed_external_host_insight_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/create_operations_insights_private_endpoint_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_operations_insights_warehouse_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/create_operations_insights_warehouse_user_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/create_pe_comanaged_database_insight_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/credential_by_vault.py
 usr/lib/python3.10/site-packages/oci/opsi/models/credential_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/credentials_by_source.py
 usr/lib/python3.10/site-packages/oci/opsi/models/database_configuration_collection.py
@@ -5229,6 +6007,7 @@ usr/lib/python3.10/site-packages/oci/opsi/models/enable_em_managed_external_host
 usr/lib/python3.10/site-packages/oci/opsi/models/enable_exadata_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/enable_host_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/enable_macs_managed_external_host_insight_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/enable_pe_comanaged_database_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/enterprise_manager_bridge.py
 usr/lib/python3.10/site-packages/oci/opsi/models/enterprise_manager_bridge_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/enterprise_manager_bridge_summary.py
@@ -5280,6 +6059,7 @@ usr/lib/python3.10/site-packages/oci/opsi/models/host_product.py
 usr/lib/python3.10/site-packages/oci/opsi/models/host_resource_allocation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/host_resource_capacity_trend_aggregation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/host_resource_statistics.py
+usr/lib/python3.10/site-packages/oci/opsi/models/host_top_processes.py
 usr/lib/python3.10/site-packages/oci/opsi/models/hosted_entity_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/hosted_entity_summary.py
 usr/lib/python3.10/site-packages/oci/opsi/models/importable_agent_entity_summary.py
@@ -5307,6 +6087,9 @@ usr/lib/python3.10/site-packages/oci/opsi/models/macs_managed_external_database_
 usr/lib/python3.10/site-packages/oci/opsi/models/macs_managed_external_host_configuration_summary.py
 usr/lib/python3.10/site-packages/oci/opsi/models/macs_managed_external_host_insight.py
 usr/lib/python3.10/site-packages/oci/opsi/models/macs_managed_external_host_insight_summary.py
+usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_private_endpoint.py
+usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_private_endpoint_collection.py
+usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_private_endpoint_summary.py
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse.py
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse_summary.py
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse_summary_collection.py
@@ -5315,6 +6098,11 @@ usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse_u
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse_user_summary_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouse_users.py
 usr/lib/python3.10/site-packages/oci/opsi/models/operations_insights_warehouses.py
+usr/lib/python3.10/site-packages/oci/opsi/models/pe_comanaged_database_connection_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/pe_comanaged_database_host_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/pe_comanaged_database_insight.py
+usr/lib/python3.10/site-packages/oci/opsi/models/pe_comanaged_database_insight_summary.py
+usr/lib/python3.10/site-packages/oci/opsi/models/pe_comanaged_managed_external_database_configuration_summary.py
 usr/lib/python3.10/site-packages/oci/opsi/models/projected_data_item.py
 usr/lib/python3.10/site-packages/oci/opsi/models/resource_capacity_trend_aggregation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/resource_insight_current_utilization.py
@@ -5374,10 +6162,13 @@ usr/lib/python3.10/site-packages/oci/opsi/models/summarize_host_insight_resource
 usr/lib/python3.10/site-packages/oci/opsi/models/summarize_host_insight_resource_usage_aggregation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/summarize_host_insight_resource_usage_trend_aggregation_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/summarize_host_insight_resource_utilization_insight_aggregation.py
+usr/lib/python3.10/site-packages/oci/opsi/models/summarize_host_insights_top_processes_usage_trend_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/summarize_operations_insights_warehouse_resource_usage_aggregation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/summary_statistics.py
 usr/lib/python3.10/site-packages/oci/opsi/models/tablespace_usage_trend.py
 usr/lib/python3.10/site-packages/oci/opsi/models/tablespace_usage_trend_aggregation.py
+usr/lib/python3.10/site-packages/oci/opsi/models/top_processes_usage_trend.py
+usr/lib/python3.10/site-packages/oci/opsi/models/top_processes_usage_trend_aggregation.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_autonomous_database_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_awr_hub_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_database_insight_details.py
@@ -5389,8 +6180,10 @@ usr/lib/python3.10/site-packages/oci/opsi/models/update_exadata_insight_details.
 usr/lib/python3.10/site-packages/oci/opsi/models/update_host_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_macs_managed_external_database_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_macs_managed_external_host_insight_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/update_operations_insights_private_endpoint_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_operations_insights_warehouse_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/update_operations_insights_warehouse_user_details.py
+usr/lib/python3.10/site-packages/oci/opsi/models/update_pe_comanaged_database_insight_details.py
 usr/lib/python3.10/site-packages/oci/opsi/models/work_request.py
 usr/lib/python3.10/site-packages/oci/opsi/models/work_request_collection.py
 usr/lib/python3.10/site-packages/oci/opsi/models/work_request_error.py
@@ -5538,19 +6331,84 @@ usr/lib/python3.10/site-packages/oci/osp_gateway/invoice_service_client_composit
 usr/lib/python3.10/site-packages/oci/osp_gateway/models
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/__init__.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/address.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/authorize_subscription_payment_details.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/authorize_subscription_payment_receipt.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/bill_to_address.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/billing_address.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/country.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/credit_card_payment_detail.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/credit_card_payment_option.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/currency.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/invoice.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/invoice_collection.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/invoice_line_collection.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/invoice_line_summary.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/invoice_summary.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/merchant_defined_data.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/other_payment_detail.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/pay_invoice_details.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/pay_invoice_receipt.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/pay_subscription_details.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/pay_subscription_receipt.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/payment_detail.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/payment_gateway.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/payment_option.py
 usr/lib/python3.10/site-packages/oci/osp_gateway/models/paypal_payment_detail.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/paypal_payment_option.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/subscription.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/subscription_collection.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/subscription_summary.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/tax_info.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/models/update_subscription_details.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/subscription_service_client.py
+usr/lib/python3.10/site-packages/oci/osp_gateway/subscription_service_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/billing_schedule_client.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/billing_schedule_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/models
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/models/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/models/billing_schedule_summary.py
+usr/lib/python3.10/site-packages/oci/osub_billing_schedule/models/product.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/models
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/models/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/models/currency.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/models/subscription_summary.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/organization_subscription_client.py
+usr/lib/python3.10/site-packages/oci/osub_organization_subscription/organization_subscription_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_subscription
+usr/lib/python3.10/site-packages/oci/osub_subscription/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/commitment_client.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/commitment_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/commitment.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/commitment_detail.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/commitment_summary.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/currency.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/product.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/rate_card_summary.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/rate_card_tier.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/subscribed_service_summary.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/subscription_product.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/models/subscription_summary.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/ratecard_client.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/ratecard_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/subscription_client.py
+usr/lib/python3.10/site-packages/oci/osub_subscription/subscription_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_usage
+usr/lib/python3.10/site-packages/oci/osub_usage/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_usage/computed_usage_client.py
+usr/lib/python3.10/site-packages/oci/osub_usage/computed_usage_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models
+usr/lib/python3.10/site-packages/oci/osub_usage/models/__init__.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models/computed_usage.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models/computed_usage_aggregated_summary.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models/computed_usage_aggregation.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models/computed_usage_summary.py
+usr/lib/python3.10/site-packages/oci/osub_usage/models/product.py
 usr/lib/python3.10/site-packages/oci/pagination
 usr/lib/python3.10/site-packages/oci/pagination/__init__.py
 usr/lib/python3.10/site-packages/oci/pagination/pagination_utils.py
@@ -5813,6 +6671,56 @@ usr/lib/python3.10/site-packages/oci/service_manager_proxy/models/service_enviro
 usr/lib/python3.10/site-packages/oci/service_manager_proxy/service_manager_proxy_client.py
 usr/lib/python3.10/site-packages/oci/service_manager_proxy/service_manager_proxy_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/signer.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring
+usr/lib/python3.10/site-packages/oci/stack_monitoring/__init__.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/__init__.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/associate_monitored_resources_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/association_resource_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/change_monitored_resource_compartment_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/connection_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/create_discovery_job_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/create_monitored_resource_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/credential_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/credential_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/credential_property.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/disassociate_monitored_resources_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_job.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_job_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_job_log_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_job_log_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/discovery_job_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/encrypted_credentials.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_alias_credential.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_alias_source_credential.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_association.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_association_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_associations_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_credential.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_member_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_members_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_property.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/monitored_resource_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/plain_text_credentials.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/pre_existing_credentials.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/property_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/search_monitored_resource_associations_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/search_monitored_resource_members_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/search_monitored_resources_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/update_monitored_resource_details.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_error.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_error_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_log_entry.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_log_entry_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_resource.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_summary.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/models/work_request_summary_collection.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/stack_monitoring_client.py
+usr/lib/python3.10/site-packages/oci/stack_monitoring/stack_monitoring_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/streaming
 usr/lib/python3.10/site-packages/oci/streaming/__init__.py
 usr/lib/python3.10/site-packages/oci/streaming/models
@@ -5929,6 +6837,28 @@ usr/lib/python3.10/site-packages/oci/tenant_manager_control_plane/subscription_c
 usr/lib/python3.10/site-packages/oci/tenant_manager_control_plane/subscription_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/tenant_manager_control_plane/work_request_client.py
 usr/lib/python3.10/site-packages/oci/tenant_manager_control_plane/work_request_client_composite_operations.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence
+usr/lib/python3.10/site-packages/oci/threat_intelligence/__init__.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/__init__.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/data_attribution.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/data_visibility.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/entity_reference.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_attribute.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_count_collection.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_count_dimensions.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_count_summary.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_reference.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_relationship.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_source_summary.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_summary.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/indicator_summary_collection.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/threat_type.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/threat_type_summary.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/models/threat_types_collection.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/threatintel_client.py
+usr/lib/python3.10/site-packages/oci/threat_intelligence/threatintel_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/usage
 usr/lib/python3.10/site-packages/oci/usage/__init__.py
 usr/lib/python3.10/site-packages/oci/usage/models
@@ -6001,6 +6931,32 @@ usr/lib/python3.10/site-packages/oci/vault/models/update_secret_details.py
 usr/lib/python3.10/site-packages/oci/vault/vaults_client.py
 usr/lib/python3.10/site-packages/oci/vault/vaults_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/version.py
+usr/lib/python3.10/site-packages/oci/visual_builder
+usr/lib/python3.10/site-packages/oci/visual_builder/__init__.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models
+usr/lib/python3.10/site-packages/oci/visual_builder/models/__init__.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/application_summary.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/application_summary_collection.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/change_vb_instance_compartment_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/create_custom_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/create_vb_instance_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/custom_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/request_summarized_applications_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/update_custom_endpoint_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/update_vb_instance_details.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/vb_instance.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/vb_instance_summary.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/vb_instance_summary_collection.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_error.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_error_collection.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_log_entry.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_log_entry_collection.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_resource.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_summary.py
+usr/lib/python3.10/site-packages/oci/visual_builder/models/work_request_summary_collection.py
+usr/lib/python3.10/site-packages/oci/visual_builder/vb_instance_client.py
+usr/lib/python3.10/site-packages/oci/visual_builder/vb_instance_client_composite_operations.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/__init__.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models
@@ -6068,6 +7024,7 @@ usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/host_vulnerab
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/host_vulnerability_impacted_host_summary_collection.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/host_vulnerability_summary.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/host_vulnerability_summary_collection.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/impacted_resources_count.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/ocir_container_scan_registry.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/schedule.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/update_container_scan_recipe_details.py
@@ -6076,6 +7033,13 @@ usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/update_contai
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/update_host_scan_recipe_details.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/update_host_scan_target_details.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/update_ocir_container_scan_registry_details.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_impacted_container_summary.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_impacted_container_summary_collection.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_impacted_host_summary.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_impacted_host_summary_collection.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_summary.py
+usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/vulnerability_summary_collection.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/work_request.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/work_request_collection.py
 usr/lib/python3.10/site-packages/oci/vulnerability_scanning/models/work_request_error.py
diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
index 81e2e8292..c1b349528 100644
--- a/config/rootfiles/packages/openvmtools
+++ b/config/rootfiles/packages/openvmtools
@@ -14,14 +14,15 @@ etc/vmware-tools/statechange.subr
 etc/vmware-tools/suspend-vm-default
 etc/vmware-tools/tools.conf.example
 lib/udev/rules.d/99-vmware-scsi-udev.rules
-sbin/mount.vmhgfs
 usr/bin/vm-support
+usr/bin/vmhgfs-fuse
 usr/bin/vmtoolsd
 usr/bin/vmware-checkvm
 usr/bin/vmware-hgfsclient
 usr/bin/vmware-namespace-cmd
 usr/bin/vmware-rpctool
 usr/bin/vmware-toolbox-cmd
+usr/bin/vmware-vmblock-fuse
 usr/bin/vmware-xferlogs
 #usr/include/vmGuestLib
 #usr/include/vmGuestLib/includeCheck.h
@@ -57,6 +58,7 @@ usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
 usr/lib/open-vm-tools/plugins/common/libvix.so
 usr/lib/open-vm-tools/plugins/vmsvc
 usr/lib/open-vm-tools/plugins/vmsvc/libappInfo.so
+usr/lib/open-vm-tools/plugins/vmsvc/libcomponentMgr.so
 usr/lib/open-vm-tools/plugins/vmsvc/libgdp.so
 usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 usr/lib/open-vm-tools/plugins/vmsvc/libguestStore.so
@@ -65,7 +67,6 @@ usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so
 usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
 usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
 #usr/lib/pkgconfig/vmguestlib.pc
-usr/sbin/mount.vmhgfs
 #usr/share/open-vm-tools
 #usr/share/open-vm-tools/messages
 #usr/share/open-vm-tools/messages/de
diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index de4f03efa..3811becf6 100644
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,8 +1,8 @@
 #lib/firmware/pcengines
 #lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.15.0.1.rom
-lib/firmware/pcengines/apu/apu2_v4.15.0.1.rom
-lib/firmware/pcengines/apu/apu3_v4.15.0.1.rom
-lib/firmware/pcengines/apu/apu4_v4.15.0.1.rom
-lib/firmware/pcengines/apu/apu5_v4.15.0.1.rom
-lib/firmware/pcengines/apu/apu6_v4.15.0.1.rom
+lib/firmware/pcengines/apu/apu1_v4.16.0.3.rom
+lib/firmware/pcengines/apu/apu2_v4.16.0.3.rom
+lib/firmware/pcengines/apu/apu3_v4.16.0.3.rom
+lib/firmware/pcengines/apu/apu4_v4.16.0.3.rom
+lib/firmware/pcengines/apu/apu5_v4.16.0.3.rom
+lib/firmware/pcengines/apu/apu6_v4.16.0.3.rom
diff --git a/config/rootfiles/packages/perl-JSON b/config/rootfiles/packages/perl-JSON
new file mode 100644
index 000000000..e6c4dbb94
--- /dev/null
+++ b/config/rootfiles/packages/perl-JSON
@@ -0,0 +1,14 @@
+#usr/lib/perl5/site_perl/5.32.1/JSON
+usr/lib/perl5/site_perl/5.32.1/JSON.pm
+#usr/lib/perl5/site_perl/5.32.1/JSON/backportPP
+usr/lib/perl5/site_perl/5.32.1/JSON/backportPP.pm
+usr/lib/perl5/site_perl/5.32.1/JSON/backportPP/Boolean.pm
+usr/lib/perl5/site_perl/5.32.1/JSON/backportPP/Compat5005.pm
+usr/lib/perl5/site_perl/5.32.1/JSON/backportPP/Compat5006.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/JSON
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/JSON/.packlist
+#usr/share/man/man3/JSON.3
+#usr/share/man/man3/JSON::backportPP.3
+#usr/share/man/man3/JSON::backportPP::Boolean.3
+#usr/share/man/man3/JSON::backportPP::Compat5005.3
+#usr/share/man/man3/JSON::backportPP::Compat5006.3
diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop
index b7d2550a6..3ec61dd8e 100644
--- a/config/rootfiles/packages/powertop
+++ b/config/rootfiles/packages/powertop
@@ -1,4 +1,5 @@
 usr/sbin/powertop
+#usr/share/bash-completion/completions/powertop
 #usr/share/locale/ca/LC_MESSAGES/powertop.mo
 #usr/share/locale/cs_CZ/LC_MESSAGES/powertop.mo
 #usr/share/locale/de_DE
diff --git a/config/rootfiles/packages/python3-botocore b/config/rootfiles/packages/python3-botocore
index c99fe5d25..638dff0eb 100644
--- a/config/rootfiles/packages/python3-botocore
+++ b/config/rootfiles/packages/python3-botocore
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/botocore
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/botocore-1.23.21-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/botocore-1.24.37-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/botocore/__init__.py
 usr/lib/python3.10/site-packages/botocore/args.py
 usr/lib/python3.10/site-packages/botocore/auth.py
@@ -159,6 +159,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/batch/2016-08-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/billingconductor/2021-07-30/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/braket
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01
 #usr/lib/python3.10/site-packages/botocore/data/braket/2019-09-01/paginators-1.json
@@ -690,6 +695,10 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/examples-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/gamelift/2015-10-01/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/gamesparks/2021-08-17/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/glacier
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01
 #usr/lib/python3.10/site-packages/botocore/data/glacier/2012-06-01/examples-1.json
@@ -851,6 +860,11 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/kendra/2019-02-03/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/keyspaces/2022-02-10/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/kinesis
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media
 #usr/lib/python3.10/site-packages/botocore/data/kinesis-video-archived-media/2017-09-30
@@ -1142,6 +1156,12 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-email/2018-07-26/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/paginators-1.sdk-extras.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice-v2/2022-03-31/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint-sms-voice/2018-09-05/service-2.json
 #usr/lib/python3.10/site-packages/botocore/data/pinpoint/2016-12-01
@@ -1316,6 +1336,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/sdb/2009-04-15/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/sdk-default-configuration.json
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17
 #usr/lib/python3.10/site-packages/botocore/data/secretsmanager/2017-10-17/examples-1.json
@@ -1473,6 +1494,7 @@ usr/lib/python3.10/site-packages/botocore/crt/auth.py
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/paginators-1.json
 #usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/service-2.json
+#usr/lib/python3.10/site-packages/botocore/data/transfer/2018-11-05/waiters-2.json
 #usr/lib/python3.10/site-packages/botocore/data/translate
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01
 #usr/lib/python3.10/site-packages/botocore/data/translate/2017-07-01/examples-1.json
@@ -1562,6 +1584,7 @@ usr/lib/python3.10/site-packages/botocore/exceptions.py
 usr/lib/python3.10/site-packages/botocore/handlers.py
 usr/lib/python3.10/site-packages/botocore/history.py
 usr/lib/python3.10/site-packages/botocore/hooks.py
+#usr/lib/python3.10/site-packages/botocore/httpchecksum.py
 usr/lib/python3.10/site-packages/botocore/httpsession.py
 usr/lib/python3.10/site-packages/botocore/loaders.py
 usr/lib/python3.10/site-packages/botocore/model.py
diff --git a/config/rootfiles/packages/python3-charset-normalizer b/config/rootfiles/packages/python3-charset-normalizer
index 8c754ad65..5088aa60d 100644
--- a/config/rootfiles/packages/python3-charset-normalizer
+++ b/config/rootfiles/packages/python3-charset-normalizer
@@ -1,12 +1,12 @@
 usr/bin/normalizer
 usr/lib/python3.10/site-packages/charset_normalizer
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/charset_normalizer-2.0.10-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/charset_normalizer-2.0.12-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/charset_normalizer/__init__.py
 usr/lib/python3.10/site-packages/charset_normalizer/api.py
 usr/lib/python3.10/site-packages/charset_normalizer/assets
diff --git a/config/rootfiles/packages/python3-click b/config/rootfiles/packages/python3-click
index f72d4a679..90264aa75 100644
--- a/config/rootfiles/packages/python3-click
+++ b/config/rootfiles/packages/python3-click
@@ -1,15 +1,14 @@
 usr/lib/python3.10/site-packages/click
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/click-8.0.3-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/click-8.1.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/click/__init__.py
 usr/lib/python3.10/site-packages/click/_compat.py
 usr/lib/python3.10/site-packages/click/_termui_impl.py
 usr/lib/python3.10/site-packages/click/_textwrap.py
-usr/lib/python3.10/site-packages/click/_unicodefun.py
 usr/lib/python3.10/site-packages/click/_winconsole.py
 usr/lib/python3.10/site-packages/click/core.py
 usr/lib/python3.10/site-packages/click/decorators.py
diff --git a/config/rootfiles/packages/python3-flit b/config/rootfiles/packages/python3-flit
index ac483dddf..2dcda51fd 100644
--- a/config/rootfiles/packages/python3-flit
+++ b/config/rootfiles/packages/python3-flit
@@ -1,11 +1,11 @@
 usr/lib/python3.10/site-packages/flit_core
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/INSTALLER
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/METADATA
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/RECORD
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/REQUESTED
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/WHEEL
-#usr/lib/python3.10/site-packages/flit_core-3.6.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/flit_core-3.7.1.dist-info/direct_url.json
 usr/lib/python3.10/site-packages/flit_core/__init__.py
 usr/lib/python3.10/site-packages/flit_core/buildapi.py
 usr/lib/python3.10/site-packages/flit_core/common.py
@@ -26,6 +26,11 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/constructed_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras-dev-conflict.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/extras.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/__init__.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/package1/_version.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/imported_version/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/inclusion/LICENSES/README
@@ -83,6 +88,16 @@ usr/lib/python3.10/site-packages/flit_core/sdist.py
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-extra-envmark.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/samples/requires-requests.toml
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/LICENSE
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/README.rst
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/data/share/man/man1/foo.1
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/module1.py
+#usr/lib/python3.10/site-packages/flit_core/tests/samples/with_data_dir/pyproject.toml
 #usr/lib/python3.10/site-packages/flit_core/tests/test_build_thyself.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_buildapi.py
 #usr/lib/python3.10/site-packages/flit_core/tests/test_common.py
diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
index 5232c958b..6e15e60fd 100644
--- a/config/rootfiles/packages/python3-jmespath
+++ b/config/rootfiles/packages/python3-jmespath
@@ -1,10 +1,10 @@
 usr/bin/jp.py
 #usr/lib/python3.10/site-packages/jmespath
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/jmespath-0.10.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/jmespath-1.0.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/jmespath/__init__.py
 usr/lib/python3.10/site-packages/jmespath/ast.py
 usr/lib/python3.10/site-packages/jmespath/compat.py
diff --git a/config/rootfiles/packages/python3-pkgconfig b/config/rootfiles/packages/python3-pkgconfig
new file mode 100644
index 000000000..54c0155a4
--- /dev/null
+++ b/config/rootfiles/packages/python3-pkgconfig
@@ -0,0 +1,8 @@
+usr/lib/python3.10/site-packages/pkgconfig
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/pkgconfig/__init__.py
+usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py
diff --git a/config/rootfiles/packages/python3-pyparsing b/config/rootfiles/packages/python3-pyparsing
index 3dbfdcdaf..08099a30a 100644
--- a/config/rootfiles/packages/python3-pyparsing
+++ b/config/rootfiles/packages/python3-pyparsing
@@ -1,22 +1,22 @@
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/actions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/common.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/core.py
-#usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/__init__.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/diagram/template.jinja2
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/exceptions.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/helpers.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/results.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/testing.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/unicode.py
-usr/lib/python3.10/site-packages/pyparsing-3.0.6-py3.10.egg/pyparsing/util.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/__init__.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/actions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/common.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/core.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/__init__.py
+#usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/diagram/template.jinja2
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/exceptions.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/helpers.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/results.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/testing.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/unicode.py
+usr/lib/python3.10/site-packages/pyparsing-3.0.7-py3.10.egg/pyparsing/util.py
diff --git a/config/rootfiles/packages/python3-pytz b/config/rootfiles/packages/python3-pytz
index 5a7484621..040b17c99 100644
--- a/config/rootfiles/packages/python3-pytz
+++ b/config/rootfiles/packages/python3-pytz
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/pytz
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/pytz-2021.3-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pytz-2022.1-py3.10.egg-info/zip-safe
 usr/lib/python3.10/site-packages/pytz/__init__.py
 usr/lib/python3.10/site-packages/pytz/exceptions.py
 usr/lib/python3.10/site-packages/pytz/lazy.py
diff --git a/config/rootfiles/packages/python3-s3transfer b/config/rootfiles/packages/python3-s3transfer
index 07e2def39..6723f3498 100644
--- a/config/rootfiles/packages/python3-s3transfer
+++ b/config/rootfiles/packages/python3-s3transfer
@@ -1,10 +1,10 @@
 #usr/lib/python3.10/site-packages/s3transfer
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/s3transfer-0.5.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/s3transfer-0.5.2-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/s3transfer/__init__.py
 usr/lib/python3.10/site-packages/s3transfer/bandwidth.py
 usr/lib/python3.10/site-packages/s3transfer/compat.py
diff --git a/config/rootfiles/packages/python3-semantic-version b/config/rootfiles/packages/python3-semantic-version
index 5c4ff5ec3..a5be99d34 100644
--- a/config/rootfiles/packages/python3-semantic-version
+++ b/config/rootfiles/packages/python3-semantic-version
@@ -1,10 +1,11 @@
 usr/lib/python3.10/site-packages/semantic_version
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/semantic_version-2.8.5-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/not-zip-safe
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/semantic_version-2.9.0-py3.10.egg-info/top_level.txt
 usr/lib/python3.10/site-packages/semantic_version/__init__.py
 usr/lib/python3.10/site-packages/semantic_version/base.py
 usr/lib/python3.10/site-packages/semantic_version/django_fields.py
diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
index 1f491c8a7..1f7447cb2 100644
--- a/config/rootfiles/packages/python3-setuptools
+++ b/config/rootfiles/packages/python3-setuptools
@@ -1,179 +1,252 @@
 #usr/lib/python3.10/site-packages/easy-install.pth
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/PKG-INFO
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/entry_points.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/not-zip-safe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/requires.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/EGG-INFO/top_level.txt
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/_distutils_hack/override.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/extern/__init__.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/pkg_resources/tests/data/my-test-package-source/setup.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_deprecation_warning.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/ccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cmd.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/check.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/clean.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_data.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/core.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/debug.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dir_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/extension.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/file_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/filelist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/log.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py35compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/py38compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/spawn.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/sysconfig.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/text_file.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_imp.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/ordered_set.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/packaging/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/_vendor/pyparsing.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/archive_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/build_meta.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-32.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli-arm64.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/cli.exe
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/alias.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_egg.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/bdist_rpm.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_clib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_ext.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/build_py.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/develop.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/dist_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/easy_install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_egg_info.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_lib.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/install_scripts.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/launcher
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/PKG-INFO
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/entry_points.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/not-zip-safe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/requires.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/EGG-INFO/top_level.txt
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/_distutils_hack/override.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/appdirs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/pyparsing.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/_vendor/zipp.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/pkg_resources/extern/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_deprecation_warning.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_macos_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/_msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/bcppcompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/ccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cmd.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_msi.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/bdist_wininst.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/build_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/check.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/clean.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_data.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_headers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/install_scripts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/py37compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/config.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/core.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/cygwinccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/debug.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dir_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/extension.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/fancy_getopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/file_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/filelist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/log.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvc9compiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/msvccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py35compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/py38compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/spawn.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/sysconfig.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/text_file.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/unixccompiler.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_distutils/versionpredicate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_entry_points.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_imp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_importlib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_path.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_reqs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_collections.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_functools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_meta.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_metadata/_text.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_adapters.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_common.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_itertools.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/_legacy.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/abc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/readers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/importlib_resources/simple.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/context.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/functools.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/jaraco/text/__init__.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/more.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/nspektr/_compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/ordered_set.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__about__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/_structures.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/markers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/requirements.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/specifiers.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/tags.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/packaging/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/pyparsing.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_parser.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_re.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/tomli/_types.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/typing_extensions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/_vendor/zipp.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/archive_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/build_meta.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/cli.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/alias.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_egg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/bdist_rpm.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_clib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_ext.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/build_py.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/develop.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/dist_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/easy_install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_egg_info.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_lib.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/install_scripts.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/launcher
 #manifest.xml
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/py36compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/register.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/rotate.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/saveopts.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/sdist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/setopt.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/test.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/command/upload_docs.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/config.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dep_util.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/depends.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/dist.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/errors.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extension.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/extern/__init__.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/glob.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-32.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui-arm64.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/gui.exe
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/installer.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/launch.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/monkey.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/msvc.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/namespaces.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/package_index.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/py34compat.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/sandbox.py
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/py36compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/register.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/rotate.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/saveopts.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/sdist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/setopt.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/test.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/command/upload_docs.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_apply_pyprojecttoml.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/error_reporting.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/extra_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/_validate_pyproject/formats.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/expand.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/pyprojecttoml.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/config/setupcfg.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dep_util.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/depends.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/discovery.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/dist.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/errors.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extension.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/extern/__init__.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/glob.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-32.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui-arm64.exe
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/gui.exe
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/installer.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/launch.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/logging.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/monkey.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/msvc.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/namespaces.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/package_index.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/py34compat.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/sandbox.py
+#usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script
 #(dev).tmpl
-#usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/script.tmpl
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/unicode_utils.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/version.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/wheel.py
-usr/lib/python3.10/site-packages/setuptools-59.5.0-py3.10.egg/setuptools/windows_support.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/script.tmpl
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/unicode_utils.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/version.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/wheel.py
+usr/lib/python3.10/site-packages/setuptools-62.0.0-py3.10.egg/setuptools/windows_support.py
 #usr/lib/python3.10/site-packages/setuptools.pth
diff --git a/config/rootfiles/packages/python3-typing-extensions b/config/rootfiles/packages/python3-typing-extensions
index 3cf68834d..fb11f5a4c 100644
--- a/config/rootfiles/packages/python3-typing-extensions
+++ b/config/rootfiles/packages/python3-typing-extensions
@@ -1,6 +1,6 @@
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/LICENSE
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/METADATA
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/RECORD
-#usr/lib/python3.10/site-packages/typing_extensions-4.0.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/typing_extensions-4.1.1.dist-info/WHEEL
 usr/lib/python3.10/site-packages/typing_extensions.py
diff --git a/config/rootfiles/packages/python3-urllib3 b/config/rootfiles/packages/python3-urllib3
index 9a76302cb..5d486273e 100644
--- a/config/rootfiles/packages/python3-urllib3
+++ b/config/rootfiles/packages/python3-urllib3
@@ -1,10 +1,10 @@
 usr/lib/python3.10/site-packages/urllib3
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/urllib3-1.26.7-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/urllib3-1.26.9-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/urllib3/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/_collections.py
 #usr/lib/python3.10/site-packages/urllib3/_version.py
@@ -31,9 +31,6 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/__init__.py
 #usr/lib/python3.10/site-packages/urllib3/packages/backports/makefile.py
 #usr/lib/python3.10/site-packages/urllib3/packages/six.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/__init__.py
-#usr/lib/python3.10/site-packages/urllib3/packages/ssl_match_hostname/_implementation.py
 #usr/lib/python3.10/site-packages/urllib3/poolmanager.py
 #usr/lib/python3.10/site-packages/urllib3/request.py
 #usr/lib/python3.10/site-packages/urllib3/response.py
@@ -46,6 +43,7 @@ usr/lib/python3.10/site-packages/urllib3
 #usr/lib/python3.10/site-packages/urllib3/util/response.py
 #usr/lib/python3.10/site-packages/urllib3/util/retry.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssl_.py
+#usr/lib/python3.10/site-packages/urllib3/util/ssl_match_hostname.py
 #usr/lib/python3.10/site-packages/urllib3/util/ssltransport.py
 #usr/lib/python3.10/site-packages/urllib3/util/timeout.py
 #usr/lib/python3.10/site-packages/urllib3/util/url.py
diff --git a/config/rootfiles/packages/sdl2 b/config/rootfiles/packages/sdl2
index ae18130fb..a95500017 100644
--- a/config/rootfiles/packages/sdl2
+++ b/config/rootfiles/packages/sdl2
@@ -81,7 +81,7 @@
 #usr/lib/cmake/SDL2/sdl2-config-version.cmake
 #usr/lib/cmake/SDL2/sdl2-config.cmake
 usr/lib/libSDL2-2.0.so.0
-usr/lib/libSDL2-2.0.so.0.18.2
+usr/lib/libSDL2-2.0.so.0.22.0
 #usr/lib/libSDL2.la
 usr/lib/libSDL2.so
 #usr/lib/libSDL2_test.a
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index f46d7ba01..937ddd3d6 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -44,6 +44,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/crc32-tvb.h
 #usr/include/wireshark/epan/crc6-tvb.h
 #usr/include/wireshark/epan/crc8-tvb.h
+#usr/include/wireshark/epan/dccpservicecodes.h
 #usr/include/wireshark/epan/decode_as.h
 #usr/include/wireshark/epan/dfilter
 #usr/include/wireshark/epan/dfilter/dfilter.h
@@ -51,6 +52,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/diam_dict.h
 #usr/include/wireshark/epan/disabled_protos.h
 #usr/include/wireshark/epan/dissectors
+#usr/include/wireshark/epan/dissectors/cond_ace_token_enum.h
 #usr/include/wireshark/epan/dissectors/file-rbm.h
 #usr/include/wireshark/epan/dissectors/packet-6lowpan.h
 #usr/include/wireshark/epan/dissectors/packet-a21.h
@@ -61,10 +63,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-adb_service.h
 #usr/include/wireshark/epan/dissectors/packet-afp.h
 #usr/include/wireshark/epan/dissectors/packet-alcap.h
+#usr/include/wireshark/epan/dissectors/packet-amp.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_a.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_map.h
 #usr/include/wireshark/epan/dissectors/packet-ansi_tcap.h
 #usr/include/wireshark/epan/dissectors/packet-arp.h
+#usr/include/wireshark/epan/dissectors/packet-asap+enrp-common.h
 #usr/include/wireshark/epan/dissectors/packet-atalk.h
 #usr/include/wireshark/epan/dissectors/packet-atm.h
 #usr/include/wireshark/epan/dissectors/packet-atn-ulcs.h
@@ -75,12 +79,16 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-bgp.h
 #usr/include/wireshark/epan/dissectors/packet-bicc_mst.h
 #usr/include/wireshark/epan/dissectors/packet-bluetooth.h
+#usr/include/wireshark/epan/dissectors/packet-bpsec.h
+#usr/include/wireshark/epan/dissectors/packet-bpv6.h
+#usr/include/wireshark/epan/dissectors/packet-bpv7.h
 #usr/include/wireshark/epan/dissectors/packet-bssap.h
 #usr/include/wireshark/epan/dissectors/packet-bssgp.h
 #usr/include/wireshark/epan/dissectors/packet-btatt.h
 #usr/include/wireshark/epan/dissectors/packet-btavctp.h
 #usr/include/wireshark/epan/dissectors/packet-btavdtp.h
 #usr/include/wireshark/epan/dissectors/packet-btavrcp.h
+#usr/include/wireshark/epan/dissectors/packet-btbredr_rf.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_acl.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h
 #usr/include/wireshark/epan/dissectors/packet-bthci_evt.h
@@ -102,6 +110,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-cmp.h
 #usr/include/wireshark/epan/dissectors/packet-cms.h
 #usr/include/wireshark/epan/dissectors/packet-coap.h
+#usr/include/wireshark/epan/dissectors/packet-cose.h
 #usr/include/wireshark/epan/dissectors/packet-credssp.h
 #usr/include/wireshark/epan/dissectors/packet-crmf.h
 #usr/include/wireshark/epan/dissectors/packet-csn1.h
@@ -132,10 +141,10 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-disp.h
 #usr/include/wireshark/epan/dissectors/packet-dns.h
 #usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h
+#usr/include/wireshark/epan/dissectors/packet-doip.h
 #usr/include/wireshark/epan/dissectors/packet-dop.h
 #usr/include/wireshark/epan/dissectors/packet-dsp.h
 #usr/include/wireshark/epan/dissectors/packet-dtls.h
-#usr/include/wireshark/epan/dissectors/packet-dtn.h
 #usr/include/wireshark/epan/dissectors/packet-dvbci.h
 #usr/include/wireshark/epan/dissectors/packet-e164.h
 #usr/include/wireshark/epan/dissectors/packet-e1ap.h
@@ -162,6 +171,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-fcswils.h
 #usr/include/wireshark/epan/dissectors/packet-ff.h
 #usr/include/wireshark/epan/dissectors/packet-fix.h
+#usr/include/wireshark/epan/dissectors/packet-flexray.h
 #usr/include/wireshark/epan/dissectors/packet-fmp.h
 #usr/include/wireshark/epan/dissectors/packet-frame.h
 #usr/include/wireshark/epan/dissectors/packet-ftam.h
@@ -220,6 +230,8 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-isis-clv.h
 #usr/include/wireshark/epan/dissectors/packet-isis.h
 #usr/include/wireshark/epan/dissectors/packet-isl.h
+#usr/include/wireshark/epan/dissectors/packet-iso10681.h
+#usr/include/wireshark/epan/dissectors/packet-iso15765.h
 #usr/include/wireshark/epan/dissectors/packet-isup.h
 #usr/include/wireshark/epan/dissectors/packet-its.h
 #usr/include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
@@ -237,6 +249,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-lcsap.h
 #usr/include/wireshark/epan/dissectors/packet-ldap.h
 #usr/include/wireshark/epan/dissectors/packet-ldp.h
+#usr/include/wireshark/epan/dissectors/packet-lin.h
 #usr/include/wireshark/epan/dissectors/packet-link16.h
 #usr/include/wireshark/epan/dissectors/packet-lisp.h
 #usr/include/wireshark/epan/dissectors/packet-llc.h
@@ -274,6 +287,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-nisplus.h
 #usr/include/wireshark/epan/dissectors/packet-nlm.h
 #usr/include/wireshark/epan/dissectors/packet-nr-rrc.h
+#usr/include/wireshark/epan/dissectors/packet-nrppa.h
 #usr/include/wireshark/epan/dissectors/packet-nsh.h
 #usr/include/wireshark/epan/dissectors/packet-ntlmssp.h
 #usr/include/wireshark/epan/dissectors/packet-ntp.h
@@ -292,6 +306,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-pcnfsd.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-lte.h
 #usr/include/wireshark/epan/dissectors/packet-pdcp-nr.h
+#usr/include/wireshark/epan/dissectors/packet-pdu-transport.h
 #usr/include/wireshark/epan/dissectors/packet-per.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs1.h
 #usr/include/wireshark/epan/dissectors/packet-pkcs12.h
@@ -334,7 +349,6 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-rtcp.h
 #usr/include/wireshark/epan/dissectors/packet-rtp-events.h
 #usr/include/wireshark/epan/dissectors/packet-rtp.h
-#usr/include/wireshark/epan/dissectors/packet-rtps.h
 #usr/include/wireshark/epan/dissectors/packet-rtse.h
 #usr/include/wireshark/epan/dissectors/packet-rtsp.h
 #usr/include/wireshark/epan/dissectors/packet-rx.h
@@ -367,6 +381,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-smrse.h
 #usr/include/wireshark/epan/dissectors/packet-snmp.h
 #usr/include/wireshark/epan/dissectors/packet-socketcan.h
+#usr/include/wireshark/epan/dissectors/packet-someip.h
 #usr/include/wireshark/epan/dissectors/packet-spice.h
 #usr/include/wireshark/epan/dissectors/packet-sprt.h
 #usr/include/wireshark/epan/dissectors/packet-sscop.h
@@ -380,6 +395,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tacacs.h
 #usr/include/wireshark/epan/dissectors/packet-tcap.h
 #usr/include/wireshark/epan/dissectors/packet-tcp.h
+#usr/include/wireshark/epan/dissectors/packet-tcpclv3.h
 #usr/include/wireshark/epan/dissectors/packet-tetra.h
 #usr/include/wireshark/epan/dissectors/packet-thrift.h
 #usr/include/wireshark/epan/dissectors/packet-tls-utils.h
@@ -391,6 +407,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/dissectors/packet-tte.h
 #usr/include/wireshark/epan/dissectors/packet-ua.h
 #usr/include/wireshark/epan/dissectors/packet-uaudp.h
+#usr/include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
 #usr/include/wireshark/epan/dissectors/packet-ubertooth.h
 #usr/include/wireshark/epan/dissectors/packet-udp.h
 #usr/include/wireshark/epan/dissectors/packet-umts_fp.h
@@ -478,6 +495,7 @@ usr/bin/tshark
 #usr/include/wireshark/epan/packet.h
 #usr/include/wireshark/epan/packet_info.h
 #usr/include/wireshark/epan/params.h
+#usr/include/wireshark/epan/pci-ids.h
 #usr/include/wireshark/epan/plugin_if.h
 #usr/include/wireshark/epan/ppptypes.h
 #usr/include/wireshark/epan/prefs-int.h
@@ -522,27 +540,12 @@ usr/bin/tshark
 #usr/include/wireshark/epan/uat.h
 #usr/include/wireshark/epan/unit_strings.h
 #usr/include/wireshark/epan/value_string.h
-#usr/include/wireshark/epan/wmem
-#usr/include/wireshark/epan/wmem/wmem.h
-#usr/include/wireshark/epan/wmem/wmem_array.h
-#usr/include/wireshark/epan/wmem/wmem_core.h
-#usr/include/wireshark/epan/wmem/wmem_interval_tree.h
-#usr/include/wireshark/epan/wmem/wmem_list.h
-#usr/include/wireshark/epan/wmem/wmem_map.h
-#usr/include/wireshark/epan/wmem/wmem_miscutl.h
-#usr/include/wireshark/epan/wmem/wmem_queue.h
-#usr/include/wireshark/epan/wmem/wmem_scopes.h
-#usr/include/wireshark/epan/wmem/wmem_stack.h
-#usr/include/wireshark/epan/wmem/wmem_strbuf.h
-#usr/include/wireshark/epan/wmem/wmem_strutl.h
-#usr/include/wireshark/epan/wmem/wmem_tree.h
-#usr/include/wireshark/epan/wmem/wmem_user_cb.h
+#usr/include/wireshark/epan/wmem_scopes.h
+#usr/include/wireshark/epan/wscbor.h
 #usr/include/wireshark/epan/x264_prt_id.h
 #usr/include/wireshark/epan/xdlc.h
 #usr/include/wireshark/file.h
 #usr/include/wireshark/globals.h
-#usr/include/wireshark/log.h
-#usr/include/wireshark/version_info.h
 #usr/include/wireshark/wiretap
 #usr/include/wireshark/wiretap/file_wrappers.h
 #usr/include/wireshark/wiretap/merge.h
@@ -550,13 +553,16 @@ usr/bin/tshark
 #usr/include/wireshark/wiretap/pcapng_module.h
 #usr/include/wireshark/wiretap/secrets-types.h
 #usr/include/wireshark/wiretap/wtap.h
+#usr/include/wireshark/wiretap/wtap_modules.h
 #usr/include/wireshark/wiretap/wtap_opttypes.h
 #usr/include/wireshark/ws_attributes.h
 #usr/include/wireshark/ws_compiler_tests.h
 #usr/include/wireshark/ws_diag_control.h
+#usr/include/wireshark/ws_log_defs.h
 #usr/include/wireshark/ws_symbol_export.h
 #usr/include/wireshark/ws_version.h
 #usr/include/wireshark/wsutil
+#usr/include/wireshark/wsutil/802_11-utils.h
 #usr/include/wireshark/wsutil/adler32.h
 #usr/include/wireshark/wsutil/base32.h
 #usr/include/wireshark/wsutil/bits_count_ones.h
@@ -580,9 +586,10 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/curve25519.h
 #usr/include/wireshark/wsutil/eax.h
 #usr/include/wireshark/wsutil/epochs.h
+#usr/include/wireshark/wsutil/exported_pdu_tlvs.h
 #usr/include/wireshark/wsutil/filesystem.h
-#usr/include/wireshark/wsutil/frequency-utils.h
 #usr/include/wireshark/wsutil/g711.h
+#usr/include/wireshark/wsutil/glib-compat.h
 #usr/include/wireshark/wsutil/inet_addr.h
 #usr/include/wireshark/wsutil/inet_ipv4.h
 #usr/include/wireshark/wsutil/inet_ipv6.h
@@ -595,7 +602,6 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/os_version_info.h
 #usr/include/wireshark/wsutil/pint.h
 #usr/include/wireshark/wsutil/please_report_bug.h
-#usr/include/wireshark/wsutil/plugins.h
 #usr/include/wireshark/wsutil/pow2.h
 #usr/include/wireshark/wsutil/privileges.h
 #usr/include/wireshark/wsutil/processes.h
@@ -608,25 +614,43 @@ usr/bin/tshark
 #usr/include/wireshark/wsutil/strtoi.h
 #usr/include/wireshark/wsutil/tempfile.h
 #usr/include/wireshark/wsutil/time_util.h
+#usr/include/wireshark/wsutil/to_str.h
 #usr/include/wireshark/wsutil/type_util.h
 #usr/include/wireshark/wsutil/unicode-utils.h
 #usr/include/wireshark/wsutil/utf8_entities.h
+#usr/include/wireshark/wsutil/wmem
+#usr/include/wireshark/wsutil/wmem/wmem.h
+#usr/include/wireshark/wsutil/wmem/wmem_array.h
+#usr/include/wireshark/wsutil/wmem/wmem_core.h
+#usr/include/wireshark/wsutil/wmem/wmem_interval_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_list.h
+#usr/include/wireshark/wsutil/wmem/wmem_map.h
+#usr/include/wireshark/wsutil/wmem/wmem_miscutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_queue.h
+#usr/include/wireshark/wsutil/wmem/wmem_stack.h
+#usr/include/wireshark/wsutil/wmem/wmem_strbuf.h
+#usr/include/wireshark/wsutil/wmem/wmem_strutl.h
+#usr/include/wireshark/wsutil/wmem/wmem_tree.h
+#usr/include/wireshark/wsutil/wmem/wmem_user_cb.h
+#usr/include/wireshark/wsutil/ws_assert.h
 #usr/include/wireshark/wsutil/ws_cpuid.h
+#usr/include/wireshark/wsutil/ws_getopt.h
 #usr/include/wireshark/wsutil/ws_mempbrk.h
 #usr/include/wireshark/wsutil/ws_mempbrk_int.h
 #usr/include/wireshark/wsutil/ws_pipe.h
-#usr/include/wireshark/wsutil/ws_printf.h
+#usr/include/wireshark/wsutil/ws_roundup.h
 #usr/include/wireshark/wsutil/wsjson.h
+#usr/include/wireshark/wsutil/wslog.h
 #usr/include/wireshark/wsutil/xtea.h
 #usr/lib/libwireshark.so
-usr/lib/libwireshark.so.14
-usr/lib/libwireshark.so.14.0.7
+usr/lib/libwireshark.so.15
+usr/lib/libwireshark.so.15.0.3
 #usr/lib/libwiretap.so
-usr/lib/libwiretap.so.11
-usr/lib/libwiretap.so.11.0.7
+usr/lib/libwiretap.so.12
+usr/lib/libwiretap.so.12.0.3
 #usr/lib/libwsutil.so
-usr/lib/libwsutil.so.12
-usr/lib/libwsutil.so.12.0.0
+usr/lib/libwsutil.so.13
+usr/lib/libwsutil.so.13.1.0
 #usr/lib/pkgconfig/wireshark.pc
 #usr/lib/wireshark
 #usr/lib/wireshark/cmake
@@ -648,81 +672,34 @@ usr/lib/wireshark/extcap/randpktdump
 usr/lib/wireshark/extcap/sshdump
 usr/lib/wireshark/extcap/udpdump
 #usr/lib/wireshark/plugins
-#usr/lib/wireshark/plugins/3.4
-#usr/lib/wireshark/plugins/3.4/codecs
-usr/lib/wireshark/plugins/3.4/codecs/g711.so
-usr/lib/wireshark/plugins/3.4/codecs/g722.so
-usr/lib/wireshark/plugins/3.4/codecs/g726.so
-usr/lib/wireshark/plugins/3.4/codecs/l16mono.so
-usr/lib/wireshark/plugins/3.4/codecs/opus_dec.so
-#usr/lib/wireshark/plugins/3.4/epan
-usr/lib/wireshark/plugins/3.4/epan/ethercat.so
-usr/lib/wireshark/plugins/3.4/epan/gryphon.so
-usr/lib/wireshark/plugins/3.4/epan/irda.so
-usr/lib/wireshark/plugins/3.4/epan/mate.so
-usr/lib/wireshark/plugins/3.4/epan/opcua.so
-usr/lib/wireshark/plugins/3.4/epan/profinet.so
-usr/lib/wireshark/plugins/3.4/epan/stats_tree.so
-usr/lib/wireshark/plugins/3.4/epan/transum.so
-usr/lib/wireshark/plugins/3.4/epan/unistim.so
-usr/lib/wireshark/plugins/3.4/epan/wimax.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxasncp.so
-usr/lib/wireshark/plugins/3.4/epan/wimaxmacphy.so
-#usr/lib/wireshark/plugins/3.4/wiretap
-usr/lib/wireshark/plugins/3.4/wiretap/usbdump.so
-#usr/share/doc/wireshark
-#usr/share/doc/wireshark/androiddump.html
-#usr/share/doc/wireshark/capinfos.html
-#usr/share/doc/wireshark/captype.html
-#usr/share/doc/wireshark/ciscodump.html
-#usr/share/doc/wireshark/dftest.html
-#usr/share/doc/wireshark/dpauxmon.html
-#usr/share/doc/wireshark/dumpcap.html
-#usr/share/doc/wireshark/editcap.html
-#usr/share/doc/wireshark/extcap.html
-#usr/share/doc/wireshark/mergecap.html
-#usr/share/doc/wireshark/randpkt.html
-#usr/share/doc/wireshark/randpktdump.html
-#usr/share/doc/wireshark/rawshark.html
-#usr/share/doc/wireshark/reordercap.html
-#usr/share/doc/wireshark/sshdump.html
-#usr/share/doc/wireshark/text2pcap.html
-#usr/share/doc/wireshark/tshark.html
-#usr/share/doc/wireshark/udpdump.html
-#usr/share/doc/wireshark/wireshark-filter.html
-#usr/share/doc/wireshark/wireshark.html
-#usr/share/man/man1/androiddump.1
-#usr/share/man/man1/capinfos.1
-#usr/share/man/man1/captype.1
-#usr/share/man/man1/ciscodump.1
-#usr/share/man/man1/dftest.1
-#usr/share/man/man1/dpauxmon.1
-#usr/share/man/man1/dumpcap.1
-#usr/share/man/man1/editcap.1
-#usr/share/man/man1/mergecap.1
-#usr/share/man/man1/randpkt.1
-#usr/share/man/man1/randpktdump.1
-#usr/share/man/man1/rawshark.1
-#usr/share/man/man1/reordercap.1
-#usr/share/man/man1/sshdump.1
-#usr/share/man/man1/text2pcap.1
-#usr/share/man/man1/tshark.1
-#usr/share/man/man1/udpdump.1
-#usr/share/man/man1/wireshark.1
-#usr/share/man/man4/extcap.4
-#usr/share/man/man4/wireshark-filter.4
+#usr/lib/wireshark/plugins/3.6
+#usr/lib/wireshark/plugins/3.6/codecs
+usr/lib/wireshark/plugins/3.6/codecs/g711.so
+usr/lib/wireshark/plugins/3.6/codecs/g722.so
+usr/lib/wireshark/plugins/3.6/codecs/g726.so
+usr/lib/wireshark/plugins/3.6/codecs/l16mono.so
+usr/lib/wireshark/plugins/3.6/codecs/opus_dec.so
+#usr/lib/wireshark/plugins/3.6/epan
+usr/lib/wireshark/plugins/3.6/epan/ethercat.so
+usr/lib/wireshark/plugins/3.6/epan/gryphon.so
+usr/lib/wireshark/plugins/3.6/epan/irda.so
+usr/lib/wireshark/plugins/3.6/epan/mate.so
+usr/lib/wireshark/plugins/3.6/epan/opcua.so
+usr/lib/wireshark/plugins/3.6/epan/profinet.so
+usr/lib/wireshark/plugins/3.6/epan/stats_tree.so
+usr/lib/wireshark/plugins/3.6/epan/transum.so
+usr/lib/wireshark/plugins/3.6/epan/unistim.so
+usr/lib/wireshark/plugins/3.6/epan/wimax.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxasncp.so
+usr/lib/wireshark/plugins/3.6/epan/wimaxmacphy.so
+#usr/lib/wireshark/plugins/3.6/wiretap
+usr/lib/wireshark/plugins/3.6/wiretap/usbdump.so
 #usr/share/wireshark
-#usr/share/wireshark/AUTHORS-SHORT
 #usr/share/wireshark/COPYING
-#usr/share/wireshark/androiddump.html
-#usr/share/wireshark/capinfos.html
-#usr/share/wireshark/captype.html
 usr/share/wireshark/cfilters
-#usr/share/wireshark/ciscodump.html
 usr/share/wireshark/colorfilters
 #usr/share/wireshark/dfilter_macros
 usr/share/wireshark/dfilters
-#usr/share/wireshark/dftest.html
 #usr/share/wireshark/diameter
 usr/share/wireshark/diameter/AlcatelLucent.xml
 usr/share/wireshark/diameter/Cisco.xml
@@ -768,13 +745,9 @@ usr/share/wireshark/dtds/smil.dtd
 usr/share/wireshark/dtds/watcherinfo.dtd
 usr/share/wireshark/dtds/xcap-caps.dtd
 usr/share/wireshark/dtds/xcap-error.dtd
-#usr/share/wireshark/dumpcap.html
-#usr/share/wireshark/editcap.html
 usr/share/wireshark/enterprises.tsv
-#usr/share/wireshark/extcap.html
 #usr/share/wireshark/ipmap.html
 #usr/share/wireshark/manuf
-#usr/share/wireshark/mergecap.html
 #usr/share/wireshark/pdml2html.xsl
 #usr/share/wireshark/profiles
 #usr/share/wireshark/profiles/Bluetooth
@@ -996,22 +969,12 @@ usr/share/wireshark/radius/dictionary.yubico
 usr/share/wireshark/radius/dictionary.zeus
 usr/share/wireshark/radius/dictionary.zte
 usr/share/wireshark/radius/dictionary.zyxel
-#usr/share/wireshark/randpkt.html
-#usr/share/wireshark/randpktdump.html
-#usr/share/wireshark/rawshark.html
-#usr/share/wireshark/reordercap.html
 usr/share/wireshark/services
 usr/share/wireshark/smi_modules
-#usr/share/wireshark/sshdump.html
-#usr/share/wireshark/text2pcap.html
 #usr/share/wireshark/tpncp
 usr/share/wireshark/tpncp/tpncp.dat
-#usr/share/wireshark/tshark.html
-#usr/share/wireshark/udpdump.html
 #usr/share/wireshark/wimaxasncp
 usr/share/wireshark/wimaxasncp/dictionary.dtd
 usr/share/wireshark/wimaxasncp/dictionary.xml
-#usr/share/wireshark/wireshark-filter.html
-#usr/share/wireshark/wireshark.html
 usr/share/wireshark/wka
 usr/share/wireshark/ws.css
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index fdbc3c283..8e355e873 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -159,9 +159,7 @@ usr/lib/libndr.so.2.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
-usr/lib/libnss_winbind.so
 usr/lib/libnss_winbind.so.2
-usr/lib/libnss_wins.so
 usr/lib/libnss_wins.so.2
 usr/lib/libsamba-credentials.so
 usr/lib/libsamba-credentials.so.1
@@ -283,7 +281,11 @@ usr/lib/python3.10/site-packages/samba/emulate/traffic_packets.py
 usr/lib/python3.10/site-packages/samba/forest_update.py
 usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/getopt.py
+usr/lib/python3.10/site-packages/samba/gp_cert_auto_enroll_ext.py
+usr/lib/python3.10/site-packages/samba/gp_chromium_ext.py
 usr/lib/python3.10/site-packages/samba/gp_ext_loader.py
+usr/lib/python3.10/site-packages/samba/gp_firefox_ext.py
+usr/lib/python3.10/site-packages/samba/gp_firewalld_ext.py
 usr/lib/python3.10/site-packages/samba/gp_gnome_settings_ext.py
 usr/lib/python3.10/site-packages/samba/gp_msgs_ext.py
 #usr/lib/python3.10/site-packages/samba/gp_parse
@@ -494,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_constants.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
@@ -573,6 +576,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/help.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_lmdb_size.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/join_member.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ntacl.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/ou.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/passwordsettings.py
@@ -605,6 +609,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py
 #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py
 #usr/lib/python3.10/site-packages/samba/tests/source.py
+#usr/lib/python3.10/site-packages/samba/tests/source_chars.py
 #usr/lib/python3.10/site-packages/samba/tests/strings.py
 #usr/lib/python3.10/site-packages/samba/tests/subunitrun.py
 #usr/lib/python3.10/site-packages/samba/tests/tdb_util.py
@@ -659,10 +664,12 @@ usr/lib/samba/libCHARSET3-samba4.so
 usr/lib/samba/libLIBWBCLIENT-OLD-samba4.so
 usr/lib/samba/libMESSAGING-SEND-samba4.so
 usr/lib/samba/libMESSAGING-samba4.so
+usr/lib/samba/libREG-FULL-samba4.so
+usr/lib/samba/libRPC-SERVER-LOOP-samba4.so
+usr/lib/samba/libRPC-WORKER-samba4.so
 usr/lib/samba/libaddns-samba4.so
 usr/lib/samba/libads-samba4.so
-usr/lib/samba/libasn1-samba4.so.8
-usr/lib/samba/libasn1-samba4.so.8.0.0
+usr/lib/samba/libasn1-samba4.so
 usr/lib/samba/libasn1util-samba4.so
 usr/lib/samba/libauth-samba4.so
 usr/lib/samba/libauth-unix-token-samba4.so
@@ -680,8 +687,7 @@ usr/lib/samba/libcluster-samba4.so
 usr/lib/samba/libcmdline-contexts-samba4.so
 usr/lib/samba/libcmdline-samba4.so
 usr/lib/samba/libcmocka-samba4.so
-usr/lib/samba/libcom_err-samba4.so.0
-usr/lib/samba/libcom_err-samba4.so.0.25
+usr/lib/samba/libcom-err-samba4.so
 usr/lib/samba/libcommon-auth-samba4.so
 usr/lib/samba/libdbwrap-samba4.so
 usr/lib/samba/libdcerpc-pkt-auth-samba4.so
@@ -696,33 +702,25 @@ usr/lib/samba/libgensec-samba4.so
 usr/lib/samba/libgpext-samba4.so
 usr/lib/samba/libgpo-samba4.so
 usr/lib/samba/libgse-samba4.so
-usr/lib/samba/libgssapi-samba4.so.2
-usr/lib/samba/libgssapi-samba4.so.2.0.0
-usr/lib/samba/libhcrypto-samba4.so.5
-usr/lib/samba/libhcrypto-samba4.so.5.0.1
-usr/lib/samba/libhdb-samba4.so.11
-usr/lib/samba/libhdb-samba4.so.11.0.2
-usr/lib/samba/libheimbase-samba4.so.1
-usr/lib/samba/libheimbase-samba4.so.1.0.0
-usr/lib/samba/libheimntlm-samba4.so.1
-usr/lib/samba/libheimntlm-samba4.so.1.0.1
+usr/lib/samba/libgss-preauth-samba4.so
+usr/lib/samba/libgssapi-samba4.so
+usr/lib/samba/libhcrypto-samba4.so
+usr/lib/samba/libhdb-samba4.so
+usr/lib/samba/libheimbase-samba4.so
+usr/lib/samba/libheimntlm-samba4.so
 usr/lib/samba/libhttp-samba4.so
-usr/lib/samba/libhx509-samba4.so.5
-usr/lib/samba/libhx509-samba4.so.5.0.0
+usr/lib/samba/libhx509-samba4.so
 usr/lib/samba/libidmap-samba4.so
 usr/lib/samba/libinterfaces-samba4.so
 usr/lib/samba/libiov-buf-samba4.so
-usr/lib/samba/libkdc-samba4.so.2
-usr/lib/samba/libkdc-samba4.so.2.0.0
-usr/lib/samba/libkrb5-samba4.so.26
-usr/lib/samba/libkrb5-samba4.so.26.0.0
+usr/lib/samba/libkdc-samba4.so
+usr/lib/samba/libkrb5-samba4.so
 usr/lib/samba/libkrb5samba-samba4.so
 usr/lib/samba/libldb-cmdline-samba4.so
 usr/lib/samba/libldb-key-value-samba4.so
+usr/lib/samba/libldb-samba4.so
 usr/lib/samba/libldb-tdb-err-map-samba4.so
 usr/lib/samba/libldb-tdb-int-samba4.so
-usr/lib/samba/libldb.so.2
-usr/lib/samba/libldb.so.2.4.1
 usr/lib/samba/libldbsamba-samba4.so
 usr/lib/samba/liblibcli-lsa3-samba4.so
 usr/lib/samba/liblibcli-netlogon3-samba4.so
@@ -741,14 +739,11 @@ usr/lib/samba/libnss-info-samba4.so
 usr/lib/samba/libposix-eadb-samba4.so
 usr/lib/samba/libprinter-driver-samba4.so
 usr/lib/samba/libprinting-migrate-samba4.so
-usr/lib/samba/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2
-usr/lib/samba/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.4.1
-usr/lib/samba/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2
-usr/lib/samba/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3
+usr/lib/samba/libpyldb-util.cpython-310-x86-64-linux-gnu-samba4.so
+usr/lib/samba/libpytalloc-util.cpython-310-x86-64-linux-gnu-samba4.so
 usr/lib/samba/libregistry-samba4.so
 usr/lib/samba/libreplace-samba4.so
-usr/lib/samba/libroken-samba4.so.19
-usr/lib/samba/libroken-samba4.so.19.0.1
+usr/lib/samba/libroken-samba4.so
 usr/lib/samba/libsamba-cluster-support-samba4.so
 usr/lib/samba/libsamba-debug-samba4.so
 usr/lib/samba/libsamba-modules-samba4.so
@@ -772,22 +767,17 @@ usr/lib/samba/libsocket-blocking-samba4.so
 usr/lib/samba/libsys-rw-samba4.so
 usr/lib/samba/libtalloc-report-printf-samba4.so
 usr/lib/samba/libtalloc-report-samba4.so
-usr/lib/samba/libtalloc.so.2
-usr/lib/samba/libtalloc.so.2.3.3
+usr/lib/samba/libtalloc-samba4.so
+usr/lib/samba/libtdb-samba4.so
 usr/lib/samba/libtdb-wrap-samba4.so
-usr/lib/samba/libtdb.so.1
-usr/lib/samba/libtdb.so.1.4.4
-usr/lib/samba/libtevent.so.0
-usr/lib/samba/libtevent.so.0.11.0
+usr/lib/samba/libtevent-samba4.so
 usr/lib/samba/libtime-basic-samba4.so
 usr/lib/samba/libtorture-samba4.so
 usr/lib/samba/libtrusts-util-samba4.so
 usr/lib/samba/libutil-reg-samba4.so
 usr/lib/samba/libutil-setid-samba4.so
 usr/lib/samba/libutil-tdb-samba4.so
-usr/lib/samba/libwinbind-client-samba4.so
-usr/lib/samba/libwind-samba4.so.0
-usr/lib/samba/libwind-samba4.so.0.0.0
+usr/lib/samba/libwind-samba4.so
 usr/lib/samba/libxattr-tdb-samba4.so
 usr/lib/samba/nss_info
 usr/lib/samba/nss_info/hash.so
@@ -838,7 +828,16 @@ usr/lib/samba/vfs/xattr_tdb.so
 usr/lib/security
 usr/lib/security/pam_winbind.so
 #usr/libexec/samba
+usr/libexec/samba/rpcd_classic
+usr/libexec/samba/rpcd_epmapper
+usr/libexec/samba/rpcd_fsrvp
+usr/libexec/samba/rpcd_lsad
+usr/libexec/samba/rpcd_mdssvc
+usr/libexec/samba/rpcd_rpcecho
+usr/libexec/samba/rpcd_spoolss
+usr/libexec/samba/rpcd_winreg
 usr/libexec/samba/samba-bgqd
+usr/libexec/samba/samba-dcerpcd
 usr/libexec/samba/smbspool_krb5_wrapper
 usr/sbin/eventlogadm
 usr/sbin/nmbd
diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config
index 2e2ee60c3..85c069dda 100644
--- a/config/ssh/ssh_config
+++ b/config/ssh/ssh_config
@@ -5,23 +5,27 @@
# Set some basic hardening options for all connections
 Host *
-        # Disable Roaming as it is known to be vulnerable
+        # Disable undocumented roaming feature as it is known to be vulnerable
         UseRoaming no
# Only use secure crypto algorithms
-        KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
+        KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
         Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
         MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
-        # Always visualise server host keys (but helps to identify key based MITM attacks)
+        # Always visualise server host keys (helps to identify key based MITM attacks)
         VisualHostKey yes
# Use SSHFP (might work on some up-to-date networks) to look up host keys
         VerifyHostKeyDNS yes
-        # send keep-alive messages to connected server to avoid broken connections
+        # Send SSH-based keep alive messages to connected server to avoid broken connections
         ServerAliveInterval 10
-        ServerAliveCountMax 6
+        ServerAliveCountMax 30
+
+	# Disable TCP keep alive messages since they can be spoofed and we have SSH-based
+	# keep alive messages enabled; there is no need to do things twice here
+	TCPKeepAlive no
# Ensure only allowed authentication methods are used
         PreferredAuthentications publickey,keyboard-interactive,password
diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index bea5cee53..76c9b3eb1 100644
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -19,9 +19,8 @@ LoginGraceTime 30s
 # Limit maximum instanctes to prevent DoS
 MaxStartups 5
-# Only allow safe crypto algorithms (may break some _very_ outdated clients)
-# See also: https://stribika.github.io/2015/01/04/secure-secure-shell.html
-KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
+# Only allow safe crypto algorithms
+KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
 MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
@@ -47,11 +46,13 @@ AllowTcpForwarding no
 AllowAgentForwarding no
 PermitOpen none
-# Detect broken sessions by sending keep-alive messages to clients via SSH connection
+# Send SSH-based keep alive messages to connected clients to avoid broken connections
 ClientAliveInterval 10
+ClientAliveCountMax 30
-# Close unresponsive SSH sessions which fail to answer keep-alive
-ClientAliveCountMax 6
+# Since TCP keep alive messages can be spoofed and we have the SSH-based already,
+# there is no need for this to be enabled as well
+TCPKeepAlive no
# Add support for SFTP
 Subsystem	sftp	/usr/lib/openssh/sftp-server
diff --git a/config/suricata/convert-ids-backend-files b/config/suricata/convert-ids-backend-files
new file mode 100644
index 000000000..614307380
--- /dev/null
+++ b/config/suricata/convert-ids-backend-files
@@ -0,0 +1,276 @@
+#!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2021 IPFire Development Team info@ipfire.org                #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+use strict;
+
+use File::Copy;
+
+require '/var/ipfire/general-functions.pl';
+require '/var/ipfire/ids-functions.pl';
+
+# Exit if there is no main oinkmaster config file anymore.
+exit 0 unless (-f "$IDS::settingsdir/oinkmaster.conf");
+
+# Array of old files, which are safe to drop.
+my @files_to_drop = (
+	# Old settings files of oinkmaster.
+	"$IDS::settingsdir/oinkmaster.conf",
+	"$IDS::settingsdir/oinkmaster-disabled-sids.conf",
+	"$IDS::settingsdir/oinkmaster-enabled-sids.conf",
+	"$IDS::settingsdir/oinkmaster-modify-sids.conf",
+	"$IDS::settingddir/oinkmaster-provider-includes.conf",
+
+	# Old settingsfiles for suricata.
+	"$IDS::settingsdir/suricata-default-rules.yaml",
+	"$IDS::settingsdir/suricata-static-included-rulefiles.yaml",
+	"$IDS::settingsdir/suricata-used-providers.yaml",
+	"$IDS::settingsdir/suricata-used-rulefiles.yaml"
+);
+
+#
+## Step 1: Stop suricata if it is running.
+#
+my $start_suricata;
+
+# Check if the IDS is running.
+if(&IDS::ids_is_running()) {
+	# Call suricatactrl to stop the IDS.
+	&IDS::call_suricatactrl("stop");
+
+	# Set start_suricata to true to start it
+	# at the end of the script again.
+	$start_suricata = "1";
+
+	# Wait until suricata has stopped.
+	sleep 1 while (-f $IDS::idspidfile);
+}
+
+#
+## Step 2: Move downloaded files to new location.
+#
+
+my $old_dl_rulesfiles_dir = "/var/tmp";
+
+# Open old rules directory and do a directory listsing.
+opendir(DIR, "$old_dl_rulesfiles_dir");
+
+# Loop through the files of the directory.
+while (my $file = readdir(DIR)) {
+	# Check if the file starts with an "idsrules-".
+	if ($file =~ /^idsrules-/) {
+		# Grab the mtime of the file.
+		my $mtime=(stat "$old_dl_rulesfiles_dir/$file")[9];
+
+		# Move the file to its new location.
+		move("$old_dl_rulesfiles_dir/$file", "$IDS::dl_rules_path/$file");
+
+		# Set correct ownership.
+		&IDS::set_ownership("$IDS::dl_rules_path/$file");
+
+		# Restore the mtime on the file.
+		utime(time(), "$mtime", "$IDS::dl_rules_path/$file");
+	}
+}
+
+# Close directory handle.
+closedir(DIR);
+
+# Get all supported providers.
+my @providers = &IDS::get_ruleset_providers();
+
+#
+## Step 3: Convert used rules files.
+#
+
+# Loop through the array of known providers.
+foreach my $provider (@providers) {
+	my %used_rulesfiles = ();
+
+	# Generate old filename which contained the used rulesfile.
+	my $old_used_rulesfiles_file = "$IDS::settingsdir/suricata-$provider-used-rulefiles.yaml";
+
+	# Skip the provider if there is no used rulesfiles file available.
+	next unless (-f $old_used_rulesfiles_file);
+
+	# Open the used rulesfiles file.
+	open(FILE, "$old_used_rulesfiles_file");
+
+	# Read-in the file content.
+	my @file = <FILE>;
+
+	# Close file handle.
+	close(FILE);
+
+	# Loop through the file content.
+	foreach my $line(@file) {
+		chomp($line);
+
+		# Grab the used rulesfile name from the line.
+		if ($line =~ /^\s-\s(.*)/) {
+			my $rulesfile = $1;
+
+			# Add the used rulesfile to the has of used rulesfile for this provider.
+			$used_rulesfiles{$rulesfile} = "enabled";
+		}
+	}
+
+	# Get the filename for the new used rulesfiles file.
+	my $used_rulesfiles_file = &IDS::get_provider_used_rulesfiles_file($provider);
+
+	# Write the file.
+	&General::writehash("$used_rulesfiles_file", %used_rulesfiles);
+
+	# Set the correct ownership for the new file.
+	&IDS::set_ownership("$used_rulesfiles_file");
+
+	# Delete old used rulesfiles file.
+	unlink("$old_used_rulesfiles_file");
+}
+
+#
+## Step 4: Convert ruleset modifictaion files.
+#
+
+# Loop through the array of providers.
+foreach my $provider (@providers) {
+	my %modifications = ();
+
+	# Generate old filename which hold the ruleset modifications.
+	my $old_modifications_file = "$IDS::settingsdir/oinkmaster-$provider-modified-sids.conf";
+
+	# Skip provider if there is no modifications file.
+	next unless (-f $old_modifications_file);
+
+	# Open modifications file.
+	open(FILE, "$old_modifications_file");
+
+	# Read-in file content.
+	my @file = <FILE>;
+
+	# Close file handle.
+	close(FILE);
+
+	# Loop through the file content.
+	foreach my $line (@file) {
+		chomp($line);
+
+		# Split line and assign to an temporary array.
+		my @tmp = split(/ /, $line);
+
+		# Assign nice human-readable variables.
+		my $action = $tmp[0];
+		my $sid = $tmp[1];
+
+		# Process stored rule action and assign to the modifications hash.
+		if ($action eq "enablesid") {
+			$modifications{$sid} = "enabled";
+
+		} elsif ($action eq "disablesid") {
+			$modifications{$sid} = "disabled";
+		}
+	}
+
+	# Get new filename which will hold the ruleset modifications for this provider.
+	my $new_modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+	# Write new modifications file.
+	&General::writehash("$new_modifications_file", %modifications);
+
+	# Set correct ownership for the new modifications file.
+	&IDS::set_ownership("$new_modifications_file");
+
+	# Delete old modifications file.
+	unlink("$old_modifications_file");
+}
+
+#
+## Step 5: Convert MONTIOR_TRAFFIC_ONLY setting.
+#
+
+my %ids_settings = ();
+my %provider_settings = ();
+
+&General::readhash("$IDS::ids_settings_file", %ids_settings);
+&General::readhasharray("$IDS::providers_settings_file", %provider_settings);
+
+# Default to IPS mode.
+my $mode = "IPS";
+
+# Check if MONTOR_TRAFFIC_ONLY has been activated.
+if(($ids_settings{'MONITOR_TRAFFIC_ONLY'} && $ids_settings{'MONITOR_TRAFFIC_ONLY'} eq "on")) {
+	$mode = "IDS";
+}
+
+# Loop through the hash of providers.
+foreach my $key (keys %provider_settings) {
+	# Get and dereference settings array from hash.
+	my @settings = @{ $provider_settings{$key} };
+
+	# Add the mode as last element to the settings array.
+	push(@settings, $mode);
+
+	# Assign the new settings to the hash.
+	$provider_settings{$key} = [ @settings ];
+}
+
+# Write back providers settings.
+&General::writehasharray("$IDS::providers_settings_file", %provider_settings);
+
+#
+## Step 6: Regenerate the ruleset.
+#
+#
+
+# Call oinkmaster wrapper function.
+&IDS::oinkmaster();
+
+#
+## Step 7: Write new config file for suricata which contains the used rulesfiles.
+#
+
+# Get enabled providers.
+my @enabled_providers = &IDS::get_enabled_providers();
+
+# Write used rulesfiles file.
+&IDS::write_used_rulefiles_file(@enabled_providers);
+
+# Set the correct ownership for the new file.
+&IDS::set_ownership("$IDS::suricata_used_rulesfiles_file");
+
+#
+## Step 8: Remove unneeded orphaned files.
+#
+
+# Loop through the array of files which are safe to drop.
+foreach my $file (@files_to_drop) {
+	# Remove the file if it exists.
+	unlink("$file") if (-f "$file");
+}
+
+#
+## Step 9: Start the IDS again, if it was running.
+#
+
+# Check if the IDS is running.
+if($start_suricata) {
+	# Call suricatactrl to perform the start of the IDS.
+	&IDS::call_suricatactrl("start");
+}
diff --git a/config/suricata/suricata-default-rules.yaml b/config/suricata/suricata-default-rules.yaml
deleted file mode 100644
index d6c358add..000000000
--- a/config/suricata/suricata-default-rules.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
----
-
-# Default rules which helps
- - /usr/share/suricata/rules/app-layer-events.rules
- - /usr/share/suricata/rules/decoder-events.rules
- - /usr/share/suricata/rules/dhcp-events.rules
- - /usr/share/suricata/rules/dns-events.rules
- - /usr/share/suricata/rules/files.rules
- - /usr/share/suricata/rules/http-events.rules
- - /usr/share/suricata/rules/ipsec-events.rules
- - /usr/share/suricata/rules/kerberos-events.rules
- - /usr/share/suricata/rules/nfs-events.rules
- - /usr/share/suricata/rules/ntp-events.rules
- - /usr/share/suricata/rules/smb-events.rules
- - /usr/share/suricata/rules/smtp-events.rules
- - /usr/share/suricata/rules/stream-events.rules
- - /usr/share/suricata/rules/tls-events.rules
diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 6fbc7b3ee..03a7a83af 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -47,10 +47,7 @@ vars:
 default-rule-path: /var/lib/suricata
 rule-files:
     # Include enabled ruleset files from external file.
-    include: /var/ipfire/suricata/suricata-used-providers.yaml
-
-    # Include default rules.
-    include: /var/ipfire/suricata/suricata-default-rules.yaml
+    include: /var/ipfire/suricata/suricata-used-rulesfiles.yaml
classification-file: /usr/share/suricata/classification.config
 reference-config-file: /usr/share/suricata/reference.config
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/captive/redirect.cgi b/html/cgi-bin/captive/redirect.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 641fbc01b..26cbc4f6d 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -63,11 +63,11 @@ print <<END
 Michael Tremer,
 Arne Fitzenreiter,
 Stefan Schantl,
+Peter Müller,
 Matthias Fischer,
 Christian Schmidt,
-Peter Müller,
-Alexander Marx,
 Adolf Belka,
+Alexander Marx,
 Erik Kapfer,
 Jan Paul Tücking,
 Jonatan Schlag,
@@ -93,22 +93,23 @@ Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
+Bernhard Bitsch,
 Ronald Wiesinger,
 Florian Bührle,
-Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
 Robin Roevens,
 Alex Koch,
 Dominik Hassler,
+Jon Murphy,
 Larsen,
 Ramax Lo,
 Gabriel Rolland,
-Jon Murphy,
 Marcel Follert,
 Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
+Daniel Weismueller,
 David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
@@ -121,7 +122,6 @@ Axel Gembe,
 Bernhard Held,
 Christoph Anderegg,
 Daniel Aleksandersen,
-Daniel Weismueller,
 Douglas Duckworth,
 Eberhard Beilharz,
 Ersan Yildirim Ersan,
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 76c2b99a9..369bf0276 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -298,7 +298,7 @@ if ($cgiparams{'RULESET'}) {
    # Loop through the array of used providers.
    foreach my $provider (@enabled_providers) {
    	# Gather used rulefiles.
-		my @used_rulesfiles = &IDS::read_used_provider_rulesfiles($provider);
+		my @used_rulesfiles = &IDS::get_provider_used_rulesfiles($provider);
# Loop through the array of used rulesfiles.
    	foreach my $rulefile (@used_rulesfiles) {
@@ -315,36 +315,6 @@ if ($cgiparams{'RULESET'}) {
# Save ruleset.
 if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
-	# Arrays to store which rulefiles have been enabled and will be used.
-	my @enabled_rulefiles;
-
-	# Store if a restart of suricata is required.
-	my $suricata_restart_required;
-
-	# Loop through the hash of idsrules.
-	foreach my $rulefile(keys %idsrules) {
-		# Check if the state of the rulefile has been changed.
-		unless ($cgiparams{$rulefile} eq $idsrules{$rulefile}{'Rulefile'}{'State'}) {
-			# A restart of suricata is required to apply the changes of the used rulefiles.
-			$suricata_restart_required = 1;
-		}
-
-		# Check if the rulefile is enabled.
-		if ($cgiparams{$rulefile} eq "on") {
-			# Add rulefile to the array of enabled rulefiles.
-			push(@enabled_rulefiles, $rulefile);
-
-			# Drop item from cgiparams hash.
-			delete $cgiparams{$rulefile};
-		}
-	}
-
-	# Open oinkmaster main include file for provider modifications.
-	open(OINKM_INCL_FILE, ">", "$IDS::oinkmaster_provider_includes_file") or die "Could not open $IDS::oinkmaster_provider_includes_file. $!\n";
-
-	# Print file header and notice about autogenerated file.
-	print OINKM_INCL_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
    # Get enabled providers.
    my @enabled_providers = &IDS::get_enabled_providers();
@@ -353,14 +323,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	# Hash to store the used-enabled and disabled sids.
    	my %enabled_disabled_sids;
-		# Generate modified sids file name for the current processed provider.
-		my $providers_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+		# Hash to store the enabled rulefiles for the current processed provider.
+		my %used_rulefiles;
-		# Check if a modified sids file for this provider exists.
-		if (-f $providers_modified_sids_file) {
-			# Read-in the file for enabled/disabled sids.
-			%enabled_disabled_sids = &IDS::read_enabled_disabled_sids_file($providers_modified_sids_file);
-		}
+		# Get name of the file which holds the ruleset modification of the provider.
+		my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+		# Get the name of the file which contains the used rulefiles for this provider.
+		my $used_rulefiles_file = &IDS::get_provider_used_rulesfiles_file($provider);
+
+		# Read-in modifications file, if exists.
+		&General::readhash("$modifications_file", %enabled_disabled_sids) if (-f "$modifications_file");
# Loop through the hash of idsrules.
    	foreach my $rulefile (keys %idsrules) {
@@ -373,6 +346,15 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    		# Skip the rulefile if the vendor is not our current processed provider.
    		next unless ($rulefile_vendor eq $provider);
+			# Check if the rulefile is enabled.
+			if ($cgiparams{$rulefile} eq "on") {
+				# Add the rulefile to the hash of enabled rulefiles of this provider.
+				$used_rulefiles{$rulefile} = "enabled";
+
+				# Drop item from cgiparams hash.
+				delete $cgiparams{$rulefile};
+			}
+
    		# Loop through the single rules of the rulefile.
    		foreach my $sid (keys %{$idsrules{$rulefile}}) {
    			# Skip the current sid if it is not numeric.
@@ -409,85 +391,24 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
# Check if the hash for enabled/disabled sids contains any entries.
    	if (%enabled_disabled_sids) {
-			# Open providers modified sids file for writing.
-			open(PROVIDER_MOD_FILE, ">$providers_modified_sids_file") or die "Could not write to $providers_modified_sids_file. $!\n";
-
-			# Write header to the files.
-			print PROVIDER_MOD_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
-			# Loop through the hash.
-			foreach my $sid (keys %enabled_disabled_sids) {
-				# Check if the sid is enabled.
-				if ($enabled_disabled_sids{$sid} eq "enabled") {
-					# Print the sid to the enabled_sids file.
-					print PROVIDER_MOD_FILE "enablesid $sid\n";
-				# Check if the sid is disabled.
-				} elsif ($enabled_disabled_sids{$sid} eq "disabled") {
-					# Print the sid to the disabled_sids file.
-					print PROVIDER_MOD_FILE "disablesid $sid\n";
-				# Something strange happende - skip the current sid.
-				} else {
-					next;
-				}
-			}
-
-			# Close file handle for the providers modified sids file.
-			close(PROVIDER_MOD_FILE);
-
-			# Add the file to the oinkmasters include file.
-			print OINKM_INCL_FILE "include $providers_modified_sids_file\n";
+			# Write the modifications file.
+			&General::writehash("$modifications_file", %enabled_disabled_sids);
    	}
-	}
-
-	# Close the file handle after writing.
-	close(OINKM_INCL_FILE);
-
-	# Handle enabled / disabled rulefiles.
-	#
-
-	# Loop through the array of enabled providers.
-	foreach my $provider(@enabled_providers) {
-		# Array to store the rulefiles which belong to the current processed provider.
-		my @provider_rulefiles = ();
-
-		# Loop through the array of enabled rulefiles.
-		foreach my $rulesfile (@enabled_rulefiles) {
-			# Split the rulefile name.
-			my @filename_parts = split(/-/, "$rulesfile");
-			# Assign vendor name for easy processings.
-			my $vendor = @filename_parts[0];
-
-			# Check if the rulesvendor is our current processed enabled provider.
-			if ("$vendor" eq "$provider") {
-				# Add the rulesfile to the array of provider rulesfiles.
-				push(@provider_rulefiles, $rulesfile);
-			}
-
-			# Call function and write the providers used rulesfile file.
-			&IDS::write_used_provider_rulefiles_file($provider, @provider_rulefiles);
-		}
+		# Write the used rulefiles file.
+		&General::writehash("$used_rulefiles_file", %used_rulefiles);
    }
# Call function to generate and write the used rulefiles file.
-	&IDS::write_main_used_rulefiles_file(@enabled_providers);
+	&IDS::write_used_rulefiles_file(@enabled_providers);
# Lock the webpage and print message.
-	&working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
-	# Call oinkmaster to alter the ruleset.
-	&IDS::oinkmaster();
+	&oinkmaster_web();
# Check if the IDS is running.
    if(&IDS::ids_is_running()) {
-		# Check if a restart of suricata is required.
-		if ($suricata_restart_required) {
-			# Call suricatactrl to perform the restart.
-			&IDS::call_suricatactrl("restart");
-		} else {
-			# Call suricatactrl to perform a reload.
-			&IDS::call_suricatactrl("reload");
-		}
+		# Call suricatactrl to perform a reload.
+		&IDS::call_suricatactrl("reload");
    }
# Reload page.
@@ -512,20 +433,34 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    unless ($errormessage) {
    	# Lock the webpage and print notice about downloading
    	# a new ruleset.
-		&working_notice("$Lang::tr{'ids download new ruleset'}");
+		&_open_working_notice("$Lang::tr{'ids download new ruleset'}");
# Call subfunction to download the ruleset.
-		if(&IDS::downloadruleset($provider)) {
-			$errormessage = "$provider - $Lang::tr{'could not download latest updates'}";
+		my $return = &IDS::downloadruleset($provider);
+
+		# Check if the download function gives a return code.
+		if ($return) {
+			# Handle different return codes.
+			if ($return eq "not modified") {
+				$errormessage = "$provider - $Lang::tr{'ids ruleset is up to date'}";
+			} else {
+				$errormessage = "$provider - $Lang::tr{'could not download latest updates'}: $return";
+			}
# Call function to store the errormessage.
    		&IDS::_store_error_message($errormessage);
+			# Close the working notice.
+			&_close_working_notice();
+
    		# Preform a reload of the page.
    		&reload();
    	} else {
    		# Call subfunction to launch oinkmaster.
-			&IDS::oinkmaster();
+			&oinkmaster_web("nolock");
+
+			# Close the working notice.
+			&_close_working_notice();
# Check if the IDS is running.
    		if(&IDS::ids_is_running()) {
@@ -540,44 +475,46 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
# Reset a provider to it's defaults.
 } elsif ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'ids reset provider'}") {
+	# Get enabled providers.
+	my @enabled_providers = &IDS::get_enabled_providers();
+
    # Grab provider handle from cgihash.
    my $provider = $cgiparams{'PROVIDER'};
# Lock the webpage and print message.
    &working_notice("$Lang::tr{'ids apply ruleset changes'}");
-	# Create new empty file for used rulefiles
-	# for this provider.
-	&IDS::write_used_provider_rulefiles_file($provider);
+	# Get the name of the file which contains the used rulefiles for this provider.
+	my $used_rulefiles_file = &IDS::get_provider_used_rulesfiles_file($provider);
-	# Call function to get the path and name for the given providers
-	# oinkmaster modified sids file.
-	my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+	# Remove the file if it exists.
+	unlink("$used_rulefiles_file") if (-f "$used_rulefiles_file");
+
+	# Call function to get the path and name for file which holds the ruleset modifications
+	# for the given provider.
+	my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
# Check if the file exists.
-	if (-f $provider_modified_sids_file) {
+	if (-f $modifications_file) {
    	# Remove the file, as requested.
-		unlink("$provider_modified_sids_file");
+		unlink("$modifications_file");
    }
-	# Alter the oinkmaster provider includes file and remove the provider.
-	&IDS::alter_oinkmaster_provider_includes_file("remove", $provider);
+	# Write used rulesfiles file.
+	&IDS::write_used_rulefiles_file(@enabled_providers);
# Regenerate ruleset.
-	&IDS::oinkmaster();
+	&oinkmaster_web();
# Check if the IDS is running.
    if(&IDS::ids_is_running()) {
-		# Get enabled providers.
-		my @enabled_providers = &IDS::get_enabled_providers();
-
    	# Get amount of enabled providers.
    	my $amount = @enabled_providers;
# Check if at least one enabled provider remains.
    	if ($amount >= 1) {
    		# Call suricatactrl to perform a reload.
-			&IDS::call_suricatactrl("restart");
+			&IDS::call_suricatactrl("reload");
# Stop suricata if no enabled provider remains.
    	} else {
@@ -638,12 +575,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	&General::writehash("$IDS::ids_settings_file", %cgiparams);
    }
-	# Check if the the automatic rule update hass been touched.
-	if($cgiparams{'AUTOUPDATE_INTERVAL'} ne $oldidssettings{'AUTOUPDATE_INTERVAL'}) {
-		# Call suricatactrl to set the new interval.
-		&IDS::call_suricatactrl("cron", $cgiparams{'AUTOUPDATE_INTERVAL'});
-	}
-
    # Generate file to store the home net.
    &IDS::generate_home_net_file();
@@ -653,24 +584,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    # Generate file to store the HTTP ports.
    &IDS::generate_http_ports_file();
-	# Write the modify sid's file and pass the taken ruleaction.
-	&IDS::write_modify_sids_file();
-
-	# Check if "MONITOR_TRAFFIC_ONLY" has been changed.
-	if($cgiparams{'MONITOR_TRAFFIC_ONLY'} ne $oldidssettings{'MONITOR_TRAFFIC_ONLY'}) {
-		# Check if at least one provider is enabled.
-		if (@enabled_providers) {
-			# Lock the webpage and print message.
-			&working_notice("$Lang::tr{'ids working'}");
-
-			# Call oinkmaster to alter the ruleset.
-			&IDS::oinkmaster();
-
-			# Set reload_page to "True".
-			$reload_page="True";
-		}
-	}
-
    # Check if the IDS currently is running.
    if(&IDS::ids_is_running()) {
    	# Check if ENABLE_IDS is set to on.
@@ -718,7 +631,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	}
# Modify the status of the existing entry.
-		$used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$status_autoupdate", "$used_providers{$id}[3]"];
+		$used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$status_autoupdate", "$used_providers{$id}[3]", "$used_providers{$id}[4]"];
# Write the changed hash to the providers settings file.
    	&General::writehasharray($IDS::providers_settings_file, %used_providers);
@@ -736,6 +649,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    my $provider = $cgiparams{'PROVIDER'};
    my $subscription_code = $cgiparams{'SUBSCRIPTION_CODE'};
    my $status_autoupdate;
+	my $mode;
+	my $regenerate_ruleset_required;
# Handle autoupdate checkbox.
    if ($cgiparams{'ENABLE_AUTOUPDATE'} eq "on") {
@@ -744,6 +659,13 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	$status_autoupdate = "disabled";
    }
+	# Handle monitor traffic only checkbox.
+	if ($cgiparams{'MONITOR_TRAFFIC_ONLY'} eq "on") {
+		$mode = "IDS";
+	} else {
+		$mode = "IPS";
+	}
+
    # Check if we are going to add a new provider.
    if ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'add'}") {
    	# Loop through the hash of used providers.
@@ -784,6 +706,15 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    		# Undef the given ID.
    		undef($cgiparams{'ID'});
+			# Grab the configured mode.
+			my $stored_mode = $used_providers{$id}[4];
+
+			# Check if the ruleset action (mode) has been changed.
+			if ($stored_mode ne $mode) {
+				# It has been changed, so the ruleset needs to be regenerated.
+				$regenerate_ruleset_required = "1";
+			}
+
    		# Grab the configured status of the corresponding entry.
    		$status = $used_providers{$id}[3];
    	} else {
@@ -806,7 +737,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	}
# Add/Modify the entry to/in the used providers hash..
-		$used_providers{$id} = ["$provider", "$subscription_code", "$status_autoupdate", "$status"];
+		$used_providers{$id} = ["$provider", "$subscription_code", "$status_autoupdate", "$status", "$mode"];
# Write the changed hash to the providers settings file.
    	&General::writehasharray($IDS::providers_settings_file, %used_providers);
@@ -830,8 +761,11 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    			&working_notice("$Lang::tr{'ids working'}");
# Download the ruleset.
-				if(&IDS::downloadruleset($provider)) {
-					$errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'ids unable to download the ruleset'}";
+				my $return = &IDS::downloadruleset($provider);
+
+				# Check if the downloader returned a code.
+				if ($return) {
+					$errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'ids unable to download the ruleset'}: $return";
# Call function to store the errormessage.
    				&IDS::_store_error_message($errormessage);
@@ -847,17 +781,24 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
# Cleanup temporary directory.
    				&IDS::cleanup_tmp_directory();
-
-					# Create new empty file for used rulefiles
-					# for this provider.
-					&IDS::write_used_provider_rulefiles_file($provider);
    			}
# Perform a reload of the page.
    			&reload();
+			} else {
+				# Remove the configured provider again.
+				&remove_provider($id);
    		}
    	}
+		# Check if the ruleset has to be regenerated.
+		if ($regenerate_ruleset_required) {
+			# Call oinkmaster web function.
+			&oinkmaster_web();
+
+			# Perform a reload of the page.
+			&reload();
+		}
    }
# Undefine providers flag.
@@ -906,7 +847,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	}
# Modify the status of the existing entry.
-		$used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$used_providers{$id}[2]", "$status"];
+		$used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$used_providers{$id}[2]", "$status", "$used_providers{$id}[4]"];
# Write the changed hash to the providers settings file.
    	&General::writehasharray($IDS::providers_settings_file, %used_providers);
@@ -915,19 +856,12 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    	my @enabled_providers = &IDS::get_enabled_providers();
# Write the main providers include file.
-		&IDS::write_main_used_rulefiles_file(@enabled_providers);
-
-		# Call function to alter the oinkmasters provider includes file and
-		# add or remove the provider.
-		&IDS::alter_oinkmaster_provider_includes_file($provider_includes_action, $provider_handle);
+		&IDS::write_used_rulefiles_file(@enabled_providers);
# Check if oinkmaster has to be executed.
    	if ($oinkmaster eq "True") {
-			# Lock the webpage and print message.
-			&working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
    		# Launch oinkmaster.
-			&IDS::oinkmaster();
+			&oinkmaster_web();
    	}
# Check if the IDS is running.
@@ -969,39 +903,36 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
    # Undef the given ID.
    undef($cgiparams{'ID'});
-	# Lock the webpage and print message.
-	&working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
    # Drop the stored ruleset file.
    &IDS::drop_dl_rulesfile($provider);
+	# Remove may stored etag data.
+	&IDS::remove_from_etags($provider);
+
    # Get the name of the provider rulessets include file.
-	my $provider_used_rulefile = &IDS::get_used_provider_rulesfile_file($provider);
+	my $provider_used_rulefile = &IDS::get_provider_used_rulesfiles_file($provider);
# Drop the file, it is not longer needed.
    unlink("$provider_used_rulefile");
# Call function to get the path and name for the given providers
-	# oinkmaster modified sids file.
-	my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+	# ruleset modifications file..
+	my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
# Check if the file exists.
-	if (-f $provider_modified_sids_file) {
+	if (-f $modifications_file) {
    	# Remove the file, which is not longer needed.
-		unlink("$provider_modified_sids_file");
+		unlink("$modifications_file");
    }
-	# Alter the oinkmaster provider includes file and remove the provider.
-	&IDS::alter_oinkmaster_provider_includes_file("remove", $provider);
-
    # Regenerate ruleset.
-	&IDS::oinkmaster();
+	&oinkmaster_web();
# Gather all enabled providers.
    my @enabled_providers = &IDS::get_enabled_providers();
# Regenerate main providers include file.
-	&IDS::write_main_used_rulefiles_file(@enabled_providers);
+	&IDS::write_used_rulefiles_file(@enabled_providers);
# Check if the IDS is running.
    if(&IDS::ids_is_running()) {
@@ -1064,25 +995,12 @@ sub show_mainpage() {
    &General::readhash("$IDS::ids_settings_file", %idssettings);
    &General::readhasharray("$IDS::providers_settings_file", %used_providers);
-	# If no autoupdate intervall has been configured yet, set default value.
-	unless(exists($idssettings{'AUTOUPDATE_INTERVAL'})) {
-		# Set default to "weekly".
-		$idssettings{'AUTOUPDATE_INTERVAL'} = 'weekly';
-	}
-
    # Read-in ignored hosts.
    &General::readhasharray("$IDS::ignored_file", %ignored) if (-e $IDS::ignored_file);
$checked{'ENABLE_IDS'}{'off'} = '';
    $checked{'ENABLE_IDS'}{'on'} = '';
    $checked{'ENABLE_IDS'}{$idssettings{'ENABLE_IDS'}} = "checked='checked'";
-	$checked{'MONITOR_TRAFFIC_ONLY'}{'off'} = '';
-	$checked{'MONITOR_TRAFFIC_ONLY'}{'on'} = '';
-	$checked{'MONITOR_TRAFFIC_ONLY'}{$idssettings{'MONITOR_TRAFFIC_ONLY'}} = "checked='checked'";
-	$selected{'AUTOUPDATE_INTERVAL'}{'off'} = '';
-	$selected{'AUTOUPDATE_INTERVAL'}{'daily'} = '';
-	$selected{'AUTOUPDATE_INTERVAL'}{'weekly'} = '';
-	$selected{'AUTOUPDATE_INTERVAL'}{$idssettings{'AUTOUPDATE_INTERVAL'}} = "selected='selected'";
# Draw current state of the IDS
    &Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
@@ -1149,8 +1067,6 @@ print <<END
    					<input type='checkbox' name='ENABLE_IDS' $checked{'ENABLE_IDS'}{'on'}>&nbsp;$Lang::tr{'ids enable'}
    				</td>
-					<td class='base' colspan='2'>
-						<input type='checkbox' name='MONITOR_TRAFFIC_ONLY' $checked{'MONITOR_TRAFFIC_ONLY'}{'on'}>&nbsp;$Lang::tr{'ids monitor traffic only'}
    			</td>
    			</tr>
@@ -1198,27 +1114,6 @@ END
print <<END
    			</tr>
-
-				<tr>
-					<td><br><br></td>
-					<td><br><br></td>
-					<td><br><br></td>
-					<td><br><br></td>
-				</tr>
-
-				<tr>
-					<td colspan='4'><b>$Lang::tr{'ids automatic rules update'}</b></td>
-				</tr>
-
-				<tr>
-					<td>
-						<select name='AUTOUPDATE_INTERVAL'>
-							<option value='off' $selected{'AUTOUPDATE_INTERVAL'}{'off'} >- $Lang::tr{'Disabled'} -</option>
-							<option value='daily' $selected{'AUTOUPDATE_INTERVAL'}{'daily'} >$Lang::tr{'Daily'}</option>
-							<option value='weekly' $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} >$Lang::tr{'Weekly'}</option>
-						</select>
-					</td>
-				</tr>
    		</table>
<br><br>
@@ -1275,6 +1170,16 @@ END
    				$col="bgcolor='$color{'color20'}'";
    			}
+				# Handle providers which are not longer supported.
+				unless ($provider_name) {
+					# Set the provider name to the provider handle
+					# to display something helpful.
+					$provider_name = $provider;
+
+					# Assign background color
+					$col="bgcolor='#FF4D4D'";
+				}
+
    			# Choose icons for the checkboxes.
    			my $status_gif;
    			my $status_gdesc;
@@ -1745,6 +1650,12 @@ END
    		$checked{'ENABLE_AUTOUPDATE'} = "checked='checked'";
    	}
+		# Check if the monitor traffic only mode is set for this provider.
+		if ($used_providers{$cgiparams{'ID'}}[4] eq "IDS") {
+			# Set the checkbox to be checked.
+			$checked{'MONITOR_TRAFFIC_ONLY'} = "checked='checked'";
+		}
+
    	# Display section to force an rules update and to reset the provider.
    	&show_additional_provider_actions();
@@ -1842,9 +1753,13 @@ print <<END
    		</tr>
<tr>
-				<td colspan='2'>
+				<td>
    				<input type='checkbox' name='ENABLE_AUTOUPDATE' $checked{'ENABLE_AUTOUPDATE'}>&nbsp;$Lang::tr{'ids enable automatic updates'}
    			</td>
+
+				<td>
+					<input type='checkbox' name='MONITOR_TRAFFIC_ONLY' $checked{'MONITOR_TRAFFIC_ONLY'}>&nbsp;$Lang::tr{'ids monitor traffic only'}
+				</td>
    		</tr>
<tr>
@@ -1874,7 +1789,8 @@ END
 ## Function to show the area where additional provider actions can be done.
 #
 sub show_additional_provider_actions() {
-	my $disabled;
+	my $disabled_reset;
+	my $disabled_update;
    my %used_providers = ();
# Read-in providers settings file.
@@ -1883,13 +1799,18 @@ sub show_additional_provider_actions() {
    # Assign variable for provider handle.
    my $provider = "$used_providers{$cgiparams{'ID'}}[0]";
-	# Call function to get the path and name for the given providers
-	# oinkmaster modified sids file.
-	my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+	# Call function to get the path and name for the given provider
+	# ruleset modifications file.
+	my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
# Disable the reset provider button if no provider modified sids file exists.
-	unless (-f $provider_modified_sids_file) {
-		$disabled = "disabled";
+	unless (-f $modifications_file) {
+		$disabled_reset = "disabled";
+	}
+
+	# Disable the manual update button if the provider is not longer supported.
+	unless ($IDS::Ruleset::Providers{$provider}) {
+		$disabled_update = "disabled";
    }
&Header::openbox('100%', 'center', "");
@@ -1899,8 +1820,8 @@ sub show_additional_provider_actions() {
    			<tr>
    				<td align='center'>
    					<input type='hidden' name='PROVIDER' value='$provider'>
-						<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled>
-						<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}'>
+						<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled_reset>
+						<input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}' $disabled_update>
    				</td>
    			</tr>
    		</table>
@@ -1917,6 +1838,16 @@ END
 sub working_notice ($) {
    my ($message) = @_;
+	&_open_working_notice ($message);
+	&_close_working_notice();
+}
+
+#
+## Private function to lock the page and tell the user what is going on.
+#
+sub _open_working_notice ($) {
+	my ($message) = @_;
+
    &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
    &Header::openbigbox('100%', 'left', '', $errormessage);
    &Header::openbox( 'Waiting', 1,);
@@ -1926,13 +1857,84 @@ sub working_notice ($) {
    				<td><img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' /></td>
    				<td>$message</td>
    			</tr>
-			</table>
 END
+}
+
+#
+## Private function to close a working notice.
+#
+sub _close_working_notice () {
+	print "</table>\n";
+
    &Header::closebox();
    &Header::closebigbox();
    &Header::closepage();
 }
+#
+## Function which locks the webpage and basically does the same as the
+## oinkmaster function, but provides a lot of HTML formated status output.
+#
+sub oinkmaster_web () {
+	my ($nolock) = @_;
+
+	my @enabled_providers = &IDS::get_enabled_providers();
+
+	# Lock the webpage and print message.
+	unless ($nolock) {
+		&_open_working_notice("$Lang::tr{'ids apply ruleset changes'}");
+	}
+
+        # Check if the files in rulesdir have the correct permissions.
+        &IDS::_check_rulesdir_permissions();
+
+	print "<tr><td><br><br></td></tr>\n";
+
+        # Cleanup the rules directory before filling it with the new rulests.
+        &_add_to_notice("$Lang::tr{'ids remove rule structures'}");
+        &IDS::_cleanup_rulesdir();
+
+        # Loop through the array of enabled providers.
+        foreach my $provider (@enabled_providers) {
+                &_add_to_notice("$Lang::tr{'ids extract ruleset'} $provider");
+                # Call the extractruleset function.
+                &IDS::extractruleset($provider);
+        }
+
+        # Call function to process the ruleset and do all modifications.
+        &_add_to_notice("$Lang::tr{'ids adjust ruleset'}");
+        &IDS::process_ruleset(@enabled_providers);
+
+        # Call function to merge the classification files.
+        &_add_to_notice("$Lang::tr{'ids merge classifications'}");
+        &IDS::merge_classifications(@enabled_providers);
+
+        # Call function to merge the sid to message mapping files.
+        &_add_to_notice("$Lang::tr{'ids merge sid files'}");
+        &IDS::merge_sid_msg(@enabled_providers);
+
+        # Cleanup temporary directory.
+        &_add_to_notice("$Lang::tr{'ids cleanup tmp dir'}");
+        &IDS::cleanup_tmp_directory();
+
+	# Finished - print a notice.
+        &_add_to_notice("$Lang::tr{'ids finished'}");
+
+	# Close the working notice.
+	unless ($nolock) {
+		&_close_working_notice();
+	}
+}
+
+#
+## Tiny private function to add a given message to a notice table.
+#
+sub _add_to_notice ($) {
+	my ($message) = @_;
+
+	print "<tr><td colspan='2'><li><b>$message</b></li></td></tr>\n";
+}
+
 #
 ## A tiny function to perform a reload of the webpage after one second.
 #
@@ -2060,6 +2062,9 @@ sub get_provider_name($) {
    my ($handle) = @_;
    my $provider_name;
+	# Early exit if the given provider does not longer exist.
+	return unless ($IDS::Ruleset::Providers{$handle});
+
    # Get the required translation string for the given provider handle.
    my $tr_string = $IDS::Ruleset::Providers{$handle}{'tr_string'};
diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 684764179..c1914f469 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -96,7 +96,7 @@ END
    }
 }
 close DF;
-print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>Inodes</h3>\n";
+print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>$Lang::tr{'inodes'}</h3>\n";
open(DF,'/bin/df -P -i -x rootfs|');
 while(<DF>){
diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 65c67fb90..3e8dc5460 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -21,6 +21,7 @@
use strict;
 use List::Util qw(any);
+use URI;
# enable only the following on debugging purpose
 #use warnings;
@@ -37,19 +38,36 @@ my %color = ();
 my %pakfiresettings = ();
 my %mainsettings = ();
+# The page mode is used to explictly switch between user interface functions:
+my $PM_DEFAULT = 'default'; # Default user interface with command processing
+my $PM_LOGREAD = 'logread'; # Log messages viewer (ignores all commands)
+my $pagemode = $PM_DEFAULT;
+
 # Load general settings
 &General::readhash("${General::swroot}/main/settings", %mainsettings);
+&General::readhash("${General::swroot}/pakfire/settings", %pakfiresettings);
 &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);
-# Get CGI request data
+# Get CGI POST request data
 $cgiparams{'ACTION'} = '';
-$cgiparams{'VALID'} = '';
+$cgiparams{'FORCE'} = '';
$cgiparams{'INSPAKS'} = '';
 $cgiparams{'DELPAKS'} = '';
&Header::getcgihash(%cgiparams);
+# Get CGI GET request data (if available)
+if($ENV{'QUERY_STRING'}) {
+	my $uri = URI->new($ENV{'REQUEST_URI'});
+	my %query = $uri->query_form;
+
+	my $mode = lc($query{'mode'} // '');
+	if(($mode eq $PM_DEFAULT) || ($mode eq $PM_LOGREAD)) {
+		$pagemode = $mode; # Limit to existing modes
+	}
+}
+
 ### Process AJAX/JSON request ###
 if($cgiparams{'ACTION'} eq 'json-getstatus') {
    # Send HTTP headers
@@ -57,7 +75,7 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') {
# Read /var/log/messages backwards until a "Pakfire started" header is found,
    # to capture all messages of the last (i.e. current) Pakfire run
-	my @messages = `tac /var/log/messages | sed -n '/pakfire:/{p;/Pakfire.*started/q}'`;
+	my @messages = `tac /var/log/messages 2>/dev/null | sed -n '/pakfire:/{p;/Pakfire.*started/q}'`;
# Test if the log contains an error message (fastest implementation, stops at first match)
    my $failure = any{ index($_, 'ERROR') != -1 } @messages;
@@ -94,6 +112,43 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') {
    exit;
 }
+### Process Pakfire install/update commands ###
+if(($cgiparams{'ACTION'} ne '') && ($pagemode eq $PM_DEFAULT)) {
+	if(&_is_pakfire_busy()) {
+		$errormessage = $Lang::tr{'pakfire already busy'};
+		$pagemode = $PM_LOGREAD; # Running Pakfire instance found, switch to log viewer mode
+	} elsif(($cgiparams{'ACTION'} eq 'install') && ($cgiparams{'FORCE'} eq 'on')) {
+		my @pkgs = split(/|/, $cgiparams{'INSPAKS'});
+		&General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs);
+		&_http_pagemode_redirect($PM_LOGREAD, 1);
+	} elsif(($cgiparams{'ACTION'} eq 'remove') && ($cgiparams{'FORCE'} eq 'on')) {
+		my @pkgs = split(/|/, $cgiparams{'DELPAKS'});
+		&General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs);
+		&_http_pagemode_redirect($PM_LOGREAD, 1);
+	} elsif($cgiparams{'ACTION'} eq 'update') {
+		&General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
+		&_http_pagemode_redirect($PM_LOGREAD, 1);
+	} elsif($cgiparams{'ACTION'} eq 'upgrade') {
+		&General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors");
+		&_http_pagemode_redirect($PM_LOGREAD, 1);
+	} elsif($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
+		$pakfiresettings{"TREE"} = $cgiparams{"TREE"};
+
+		# Check for valid input
+		if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) {
+			$errormessage .= $Lang::tr{'pakfire invalid tree'};
+		}
+
+		unless ($errormessage) {
+			&General::writehash("${General::swroot}/pakfire/settings", %pakfiresettings);
+
+			# Update lists
+			&General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
+			&_http_pagemode_redirect($PM_LOGREAD, 1);
+		}
+	}
+}
+
 ### Start pakfire page ###
 &Header::showhttpheaders();
@@ -182,128 +237,15 @@ END
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1, $extraHead);
 &Header::openbigbox('100%', 'left', '', $errormessage);
-# Process Pakfire commands
-if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfire_busy())) {
-	my @pkgs = split(/|/, $cgiparams{'INSPAKS'});
-	if ("$cgiparams{'FORCE'}" eq "on") {
-		&General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs);
-	} else {
-		&Header::openbox("100%", "center", $Lang::tr{'request'});
-		my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
-		print <<END;
-		<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'}
-		<pre>
-END
-		foreach (@output) {
-		  $_ =~ s/\[[0-1];[0-9]+m//g;
-			print "$_\n";
-		}
-		print <<END;
-		</pre></td></tr>
-		<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}</td></tr>
-		<tr><td colspan='2'>&nbsp;</td></tr>
-		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-							<input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
-							<input type='hidden' name='FORCE' value='on' />
-							<input type='hidden' name='ACTION' value='install' />
-							<input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
-						</form>
-				</td>
-				<td align='left'>
-						<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-							<input type='hidden' name='ACTION' value='' />
-							<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
-						</form>
-				</td>
-			</tr>
-		</table>
-END
-		&Header::closebox();
-		&Header::closebigbox();
-		&Header::closepage();
-		exit;
-	}
-} elsif (($cgiparams{'ACTION'} eq 'remove') && (! &_is_pakfire_busy())) {
-	my @pkgs = split(/|/, $cgiparams{'DELPAKS'});
-	if ("$cgiparams{'FORCE'}" eq "on") {
-		&General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs);
-	} else {
-		&Header::openbox("100%", "center", $Lang::tr{'request'});
-		my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
-		print <<END;
-		<table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'}
-		<pre>
-END
-		foreach (@output) {
-		  $_ =~ s/\[[0-1];[0-9]+m//g;
-			print "$_\n";
-		}
-		print <<END;
-		</pre></td></tr>
-		<tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}</td></tr>
-		<tr><td colspan='2'>&nbsp;</td></tr>
-		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-							<input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
-							<input type='hidden' name='FORCE' value='on' />
-							<input type='hidden' name='ACTION' value='remove' />
-							<input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
-						</form>
-				</td>
-				<td align='left'>
-						<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-							<input type='hidden' name='ACTION' value='' />
-							<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
-						</form>
-				</td>
-			</tr>
-		</table>
-END
-		&Header::closebox();
-		&Header::closebigbox();
-		&Header::closepage();
-		exit;
-	}
-
-} elsif (($cgiparams{'ACTION'} eq 'update') && (! &_is_pakfire_busy())) {
-	&General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
-} elsif (($cgiparams{'ACTION'} eq 'upgrade') && (! &_is_pakfire_busy())) {
-	&General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors");
-} elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
-	$pakfiresettings{"TREE"} = $cgiparams{"TREE"};
-
-	# Check for valid input
-	if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) {
-		$errormessage .= $Lang::tr{'pakfire invalid tree'};
-	}
-
-	unless ($errormessage) {
-		&General::writehash("${General::swroot}/pakfire/settings", %pakfiresettings);
-
-		# Update lists
-		&General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
-	}
-}
-
-&General::readhash("${General::swroot}/pakfire/settings", %pakfiresettings);
-
-my %selected=();
-my %checked=();
-
-$selected{"TREE"} = ();
-$selected{"TREE"}{"stable"} = "";
-$selected{"TREE"}{"testing"} = "";
-$selected{"TREE"}{"unstable"} = "";
-$selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected";
-
-# DPC move error message to top so it is seen!
+# Show error message
 if ($errormessage) {
    &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
    print "<font class='base'>$errormessage&nbsp;</font>\n";
    &Header::closebox();
 }
-# Show log output while Pakfire is running
-if(&_is_pakfire_busy()) {
+# Show only log output while Pakfire is running and stop afterwards
+if(($pagemode eq $PM_LOGREAD) || (&_is_pakfire_busy())) {
    &Header::openbox("100%", "center", "Pakfire");
print <<END
@@ -333,6 +275,97 @@ END
    exit;
 }
+# Show Pakfire install/remove dependencies and confirm form
+# (_is_pakfire_busy status was checked before and can be omitted)
+if (($cgiparams{'ACTION'} eq 'install') && ($pagemode eq $PM_DEFAULT)) {
+	&Header::openbox("100%", "center", $Lang::tr{'request'});
+
+	my @pkgs = split(/|/, $cgiparams{'INSPAKS'});
+	my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
+	print <<END;
+	<table style="width: 100%"><tr><td colspan='2'><p>$Lang::tr{'pakfire install package'} <strong>@{pkgs}</strong><br>
+		$Lang::tr{'pakfire possible dependency'}</p>
+		<pre>
+END
+	foreach (@output) {
+		$_ =~ s/\[[0-1];[0-9]+m//g;
+		print "$_\n";
+	}
+	print <<END;
+		</pre></td></tr>
+		<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}</td></tr>
+		<tr><td colspan='2'>&nbsp;</td></tr>
+		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+					<input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
+					<input type='hidden' name='FORCE' value='on' />
+					<input type='hidden' name='ACTION' value='install' />
+					<input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
+				</form>
+			</td>
+			<td align='left'>
+				<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+					<input type='hidden' name='ACTION' value='' />
+					<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
+				</form>
+			</td>
+		</tr>
+	</table>
+END
+	&Header::closebox();
+	&Header::closebigbox();
+	&Header::closepage();
+	exit;
+
+} elsif (($cgiparams{'ACTION'} eq 'remove') && ($pagemode eq $PM_DEFAULT)) {
+	&Header::openbox("100%", "center", $Lang::tr{'request'});
+
+	my @pkgs = split(/|/, $cgiparams{'DELPAKS'});
+	my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
+	print <<END;
+	<table style="width: 100%"><tr><td colspan='2'><p>$Lang::tr{'pakfire uninstall package'} <strong>@{pkgs}</strong><br>
+		$Lang::tr{'pakfire possible dependency'}</p>
+		<pre>
+END
+	foreach (@output) {
+		$_ =~ s/\[[0-1];[0-9]+m//g;
+		print "$_\n";
+	}
+	print <<END;
+		</pre></td></tr>
+		<tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}</td></tr>
+		<tr><td colspan='2'>&nbsp;</td></tr>
+		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+					<input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
+					<input type='hidden' name='FORCE' value='on' />
+					<input type='hidden' name='ACTION' value='remove' />
+					<input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
+				</form>
+			</td>
+			<td align='left'>
+				<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+					<input type='hidden' name='ACTION' value='' />
+					<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
+				</form>
+			</td>
+		</tr>
+	</table>
+END
+	&Header::closebox();
+	&Header::closebigbox();
+	&Header::closepage();
+	exit;
+}
+
+# Show Pakfire main page
+my %selected=();
+my %checked=();
+
+$selected{"TREE"} = ();
+$selected{"TREE"}{"stable"} = "";
+$selected{"TREE"}{"testing"} = "";
+$selected{"TREE"}{"unstable"} = "";
+$selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected";
+
 my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;
 chomp($core_release);
 my $core_update_age = &General::age("/opt/pakfire/db/core/mine");
@@ -469,3 +502,23 @@ sub _start_json_output {
    print "Content-Type: application/json\n";
    print "\n"; # End of HTTP headers
 }
+
+# Send HTTP 303 redirect headers to change page mode
+# GET is always used to display the redirected page, which will remove already processed POST form data.
+# Note: Custom headers must be sent before the HTML output is started by &Header::showhttpheaders().
+# If switch_mode is set to true, the global page mode variable ("$pagemode") is also updated immediately.
+sub _http_pagemode_redirect {
+	my ($mode, $switch_mode) = @_;
+	$mode //= $PM_DEFAULT;
+	$switch_mode //= 0;
+
+	# Send HTTP redirect with GET parameter
+	my $location = "https://$ENV%7B%27SERVER_NAME%27%7D:$ENV%7B%27SERVER_PORT%27%7D$ENV%7B%27SCR...";
+	print "Status: 303 See Other\n";
+	print "Location: $location\n";
+
+	# Change global page mode
+	if($switch_mode) {
+		$pagemode = $mode;
+	}
+}
diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi
index c3c4c6911..e88448964 100644
--- a/html/cgi-bin/wakeonlan.cgi
+++ b/html/cgi-bin/wakeonlan.cgi
@@ -173,10 +173,10 @@ if ( $cgiparams{'ACTION'} eq 'wakeup' )
&General::system("/usr/sbin/etherwake", "-i", "$iface", "$mac");
-  # make a box with info, 'refresh' to normal screen after 5 seconds
+  # make a box with info, 'refresh' to normal screen after 3 seconds
   if ( $refresh eq 'yes' )
   {
-    &Header::openpage($Lang::tr{'WakeOnLan'}, 1, "<meta http-equiv='refresh' content='3;url=/cgi-bin/wakeonlan.cgi'");
+    &Header::openpage($Lang::tr{'WakeOnLan'}, 1, "<meta http-equiv='refresh' content='3; url=/cgi-bin/wakeonlan.cgi'>");
     &Header::openbigbox('100%', 'left');
   }
   &Header::openbox('100%', 'left', $Lang::tr{'WakeOnLan'});
diff --git a/html/html/clwarn.cgi b/html/html/clwarn.cgi
old mode 100755
new mode 100644
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index d74c962e4..f90cd5fea 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -31,8 +31,6 @@
 # IPFire default theme.                                                       #
 ###############################################################################
-require "${General::swroot}/lang.pl";
-
 ###############################################################################
 #
 # print menu html elements for submenu entries
@@ -101,23 +99,18 @@ sub openpage {
    my $title = shift;
    my $boh = shift;
    my $extrahead = shift;
-	my $suppressMenu = shift;
+	my $suppressMenu = shift // 0;
    my @tmp = split(/./, basename($0));
    my $scriptName = @tmp[0];
-	@URI=split ('?',  $ENV{'REQUEST_URI'} );
-	&General::readhash("${swroot}/main/settings", %settings);
-	&genmenu();
-
    my $headline = "IPFire";
    if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
    	$headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
    }
-
 print <<END;
 <!DOCTYPE html>
-<html>
+<html lang="$language">
    <head>
    <title>$headline - $title</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -165,7 +158,10 @@ print <<END
 END
 ;
-&showmenu() if ($suppressMenu != 1);
+unless($suppressMenu) {
+	&genmenu();
+	&showmenu();
+}
print <<END
    <div class="bigbox fixed">
@@ -270,5 +266,3 @@ sub openbox {
 sub closebox {
    print "</div>";
 }
-
-1;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6094c191a..7a39e233b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -910,7 +910,7 @@
 'drop action1' => 'Standardverhalten der (Outgoing) Firewall in Modus "Blocked"',
 'drop action2' => 'Standardverhalten der (Input) Firewall',
 'drop forward' => 'Verworfene, von der Firewall weitergeleitete Pakete protokollieren',
-'drop hostile' => 'Pakete von und zu bösartigen Netzen (Spamhaus DROP-Listing, etc.) verwerfen',
+'drop hostile' => 'Pakete von und zu bösartigen Netzen (<a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>-Listing, etc.) verwerfen',
 'drop input' => 'Verworfene eingehende Pakete protokollieren',
 'drop newnotsyn' => 'Verworfene neue Pakete ohne SYN-Markierung protokollieren (NewNotSYN)',
 'drop outgoing' => 'Verworfene, von der Firewall ausgehende Pakete protokollieren',
@@ -1378,21 +1378,27 @@
 'idle timeout' => 'Leerlaufwartezeit in Minuten (0 zum Deaktivieren):',
 'idle timeout not set' => 'Leerlaufwartezeit nicht angegeben.',
 'ids add provider' => 'Provider hinzufügen',
+'ids adjust ruleset' => 'Regelset anpassen und Benutzermodifikationen übernehmen...',
 'ids apply' => 'Übernehmen',
 'ids apply ruleset changes' => 'Regeländerungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
 'ids automatic rules update' => 'Automatische Regelaktualisierung',
+'ids cleanup tmp dir' => 'Temporäres Verzeichnis aufräumen...',
 'ids autoupdates' => 'Automatische Updates',
 'ids could not add provider' => 'Provider konnte nicht hinzugefügt werden',
 'ids customize ruleset' => 'Regelset anpassen',
 'ids download new ruleset' => 'Das neue Regelset wird heruntergeladen und entpackt. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
 'ids enable' => 'Einbruchsverhinderungssystem aktivieren',
 'ids enable automatic updates' => 'Automatische Updates aktivieren',
+'ids extract ruleset' => 'Entpacke Regelset von:',
+'ids finished' => 'Fertig...',
 'ids force ruleset update' => 'Regelset jetzt aktualisieren',
 'ids hide' => 'Verstecken',
 'ids ignored hosts' => 'Ausnahmeliste',
 'ids log hits' => 'Gesamtanzahl der Regeltreffer für',
 'ids log viewer' => 'Protokoll des Einbruchsverhinderungssystems',
 'ids logs' => 'IPS-Protokolldateien',
+'ids merge classifications' => 'Klassifizierungen zusammenführen...',
+'ids merge sid files' => 'Sid-to-message Dateien zusammenführen...',
 'ids monitor traffic only' => 'Netzwerkpakete nur überprüfen (nicht verwerfen)',
 'ids monitored interfaces' => 'Überwachte Netzwerkzonen',
 'ids no enabled ruleset provider' => 'Es ist kein aktivierter Provider verfügbar. Bitte aktivieren Sie einen oder fügen Sie einen Provider hinzu.',
@@ -1400,9 +1406,11 @@
 'ids oinkcode required' => 'Für den ausgewählten Regelsatz wird ein Abonnement oder ein Oinkcode benötigt',
 'ids provider' => 'Regelset-Anbieter',
 'ids provider settings' => 'Regelset-Anbieter-Einstellungen',
+'ids remove rule structures' => 'Entferne alte Regelstrukturen...',
 'ids reset provider' => 'Providereinstellungen zurücksetzen',
 'ids rules update' => 'Regelsatz',
 'ids ruleset autoupdate in progress' => 'Der Regelsatz wird gerade aktualisiert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
+'ids ruleset is up to date' => 'Regelset ist aktuell - Keine Aktualisierung notwendig.',
 'ids ruleset settings' => 'Regelsatzeinstellungen',
 'ids show' => 'Anzeigen',
 'ids the choosen provider is already in use' => 'Der gewhählte Provider wird bereits verwendet.',
@@ -1432,6 +1440,7 @@
 'info' => 'Info',
 'info messages' => 'Info',
 'init string' => 'Initialisierung:',
+'inodes' => 'Index Nodes',
 'insert floppy' => 'Legen Sie eine formatierte Diskette in das Floppy-Laufwerk in IPFire und klicken auf <i>Datensicherung auf Diskette</i>, um die Systemeinstellungen zu sichern.  Überprüfen Sie das Ergebnis sorgfältig, um sicher zu sein, dass die Datensicherung vollständig und erfolgreich abgeschlossen wurde.',
 'install' => 'Installieren',
 'install new update' => 'Installiere neues Update:',
@@ -1981,6 +1990,7 @@
 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
 'pakfire ago' => 'her.',
+'pakfire already busy' => 'Pakfire führt bereits eine Aufgabe aus. Bitte versuchen Sie es später erneut.',
 'pakfire available addons' => 'Verfügbare Addons:',
 'pakfire configuration' => 'Pakfire Konfiguration',
 'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
@@ -2874,7 +2884,6 @@
 'vpn start action start' => 'Immer An',
 'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik',
 'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik',
-'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken',
 'vpn subjectaltname' => 'SubjectAlternativeName',
 'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.',
 'vpn wait' => 'WARTE',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 510ed095b..f90e3103b 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -950,7 +950,7 @@
 'drop action1' => 'Default behaviour of (outgoing) firewall in mode "Blocked"',
 'drop action2' => 'Default behaviour of (input) firewall',
 'drop forward' => 'Log dropped forward packets',
-'drop hostile' => 'Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)',
+'drop hostile' => 'Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)',
 'drop input' => 'Log dropped input packets',
 'drop newnotsyn' => 'Log dropped new not SYN packets',
 'drop outgoing' => 'Log dropped outgoing packets',
@@ -1422,30 +1422,38 @@
 'idle timeout' => 'Idle timeout (mins; 0 to disable):',
 'idle timeout not set' => 'Idle timeout not set.',
 'ids add provider' => 'Add provider',
+'ids adjust ruleset' => 'Adjust rules and add user defined customizations...',
 'ids apply' => 'Apply',
 'ids apply ruleset changes' => 'The ruleset changes are being applied. Please wait until all operations have completed successfully...',
 'ids automatic rules update' => 'Automatic Rule Update',
 'ids autoupdates' => 'Automatic updates',
+'ids cleanup tmp dir' => 'Cleanup temporary directory...',
 'ids could not add provider' => 'Could not add provider',
 'ids customize ruleset' => 'Customize ruleset',
 'ids download new ruleset' => 'Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...',
 'ids enable' => 'Enable Intrusion Prevention System',
 'ids enable automatic updates' => 'Enable automatic updates',
+'ids extract ruleset' => 'Extracting ruleset for provider:',
+'ids finished' => 'Finished...',
 'ids force ruleset update' => 'Force ruleset update',
 'ids hide' => 'Hide',
 'ids ignored hosts' => 'Whitelisted Hosts',
 'ids log hits' => 'Total of number of activated rules for',
 'ids log viewer' => 'IPS Log Viewer',
 'ids logs' => 'IPS Logs',
+'ids merge classifications' => 'Merging classifications...',
+'ids merge sid files' => 'Merging sid to message files...',
 'ids monitor traffic only' => 'Monitor traffic only',
 'ids monitored interfaces' => 'Monitored Interfaces',
 'ids no enabled ruleset provider' => 'No enabled ruleset is available. Please activate or add one first.',
 'ids no network zone' => 'Please select at least one network zone to be monitored',
 'ids provider' => 'Provider',
 'ids provider settings' => 'Provider settings',
+'ids remove rule structures' => 'Remove old rule structures...',
 'ids reset provider' => 'Reset provider',
 'ids rules update' => 'Ruleset',
 'ids ruleset autoupdate in progress' => 'Ruleset update in progress. Please wait until all operations have completed successfully...',
+'ids ruleset is up to date' => 'No update required - The ruleset is up to date.',
 'ids ruleset settings' => 'Ruleset Settings',
 'ids show' => 'Show',
 'ids subscription code required' => 'The selected ruleset requires a subscription code',
@@ -1475,6 +1483,7 @@
 'incorrect password' => 'Incorrect password',
 'info' => 'Info',
 'init string' => 'Init:',
+'inodes' => 'Index-Nodes',
 'insert floppy' => 'To backup to floppy, insert a formatted floppy into the drive on IPFire and click <i>backup to floppy</i> to backup the system configuration. Please examine the results carefully to make sure the backup completed successfully. This can take a while to complete, so please be patient.<p>',
 'insert removable device' => 'Insert a removable device',
 'install' => 'Install',
@@ -2032,6 +2041,7 @@
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire ago' => 'ago.',
+'pakfire already busy' => 'Pakfire is already performing a task. Please try again later.',
 'pakfire available addons' => 'Available Addons:',
 'pakfire configuration' => 'Pakfire Configuration',
 'pakfire core update auto' => 'Install core and addon updates automatically:',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 03fc754df..6dbeebc16 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -955,7 +955,7 @@
 'drop action1' => 'Comportement par défaut du pare-feu (sortant) en mode "Bloqué"',
 'drop action2' => 'Comportement par défaut du pare-feu (entrant)',
 'drop forward' => 'Abandon des paquets avancés par le journal',
-'drop hostile' => 'Abandonner les paquets depuis et vers des réseaux hostiles (répertoriés sur Spamhaus DROP, etc.)',
+'drop hostile' => 'Abandonner les paquets depuis et vers des réseaux hostiles (répertoriés sur <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)',
 'drop input' => 'Suppression des paquets entrants du journal',
 'drop newnotsyn' => 'Supprimer les anciens paquets de synchronisation du journal',
 'drop outgoing' => 'Abandon des paquets sortants par le journal',
@@ -2055,7 +2055,7 @@
 'pakfire last package update' => 'Dernière mise à jour de la liste des paquets : ',
 'pakfire last serverlist update' => 'Dernière mise à jour de la liste des serveurs : ',
 'pakfire last update' => 'Dernière mise à jour : ',
-'pakfire possible dependency' => '<br><br>Il y a peut-être des dépendances, voici la liste des paquets qu'il faut (dés)installer.<br>',
+'pakfire possible dependency' => 'Il y a peut-être des dépendances, voici la liste des paquets qu'il faut (dés)installer.',
 'pakfire register' => 'S'inscrire au serveur pakfire :',
 'pakfire return' => 'Retour à Pakfire',
 'pakfire system state' => 'Statut système PakFire ',
@@ -2949,7 +2949,6 @@
 'vpn start action start' => 'Toujours démarré',
 'vpn statistic n2n' => 'OpenVPN (site-à-site)',
 'vpn statistic rw' => 'OpenVPN (client nomade)',
-'vpn statistics n2n' => 'OpenVPN (site-à-site)',
 'vpn subjectaltname' => 'Nom de l'objet',
 'vpn subjectaltname missing' => 'Le nom de l'objet ne peut être vide.',
 'vpn wait' => 'ATTENTE',
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 8514ee644..724caaebc 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       =
diff --git a/lfs/bind b/lfs/bind
index c558cfa01..e3efc84a1 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER        = 9.16.27
+VER        = 9.16.28
THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf
+$(DL_FILE)_BLAKE2 = 55932faa004c2021cd4c3384c14d4a58ca43d5a853602e271b58c9022256a5ec2eb1317168ac07c2b233b19407ddfb8c7f64a50d93169207cb3b4fe535a78afa
install : $(TARGET)
diff --git a/lfs/bird b/lfs/bird
index c140aa811..591ccc6a7 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -26,7 +26,7 @@ include Config
SUMMARY    = The BIRD Internet Routing Daemon
-VER        = 2.0.8
+VER        = 2.0.9
THISAPP    = bird-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bird
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a
+$(DL_FILE)_BLAKE2 = 5226058ba8989a28e8151906e194fd3065276034f1304e0e45772b17f3d8095eff6add211320a23418bfb57b2c16c96594fb85345355e3b870d7bfa2cfe119b9
install : $(TARGET)
diff --git a/lfs/borgbackup b/lfs/borgbackup
index 9244900bf..bfdc9e3ff 100644
--- a/lfs/borgbackup
+++ b/lfs/borgbackup
@@ -24,7 +24,7 @@
include Config
-VER        = 1.1.17
+VER        = 1.2.0
 SUMMARY    = Deduplicating backup program with compression and authenticated encryption
THISAPP    = borgbackup-$(VER)
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = borgbackup
-PAK_VER    = 10
+PAK_VER    = 11
-DEPS       =
+DEPS       = python3-pkgconfig
SERVICES   =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078
+$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec
install : $(TARGET)
diff --git a/lfs/cups b/lfs/cups
index a07131156..cd4519b63 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 24
+PAK_VER    = 25
DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
diff --git a/lfs/curl b/lfs/curl
index 8700c9bda..ebb3a45a1 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
include Config
-VER        = 7.82.0
+VER        = 7.83.0
THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750
+$(DL_FILE)_BLAKE2 = 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7
install : $(TARGET)
diff --git a/lfs/dbus b/lfs/dbus
index c854359a0..c816b2c07 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -26,15 +26,15 @@ include Config
SUMMARY    = D-Bus Message Bus System
-VER        = 1.12.20
+VER        = 1.14.0
THISAPP    = dbus-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b
+$(DL_FILE)_BLAKE2 = ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf
install : $(TARGET)
@@ -81,9 +81,12 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_SRC)/dbus*
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-				     --localstatedir=/var
+	cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+	                    --prefix=/usr \
+	                    --sysconfdir=/etc \
+				        --localstatedir=/var \
+				        --disable-static
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/efibootmgr b/lfs/efibootmgr
index 9eb9a5304..2b399349c 100644
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
include Config
-VER        = 16
+VER        = 17
THISAPP    = efibootmgr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232
+$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9
install : $(TARGET)
@@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	# Compile fix
+	cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
+
    cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
    	EFIDIR=$(SNAME) $(MAKETUNING)
    cd $(DIR_APP) && make install EFIDIR=$(SNAME)
diff --git a/lfs/expat b/lfs/expat
index 244139682..76f5a8e94 100644
--- a/lfs/expat
+++ b/lfs/expat
@@ -24,7 +24,7 @@
include Config
-VER        = 2.4.6
+VER        = 2.4.8
THISAPP    = expat-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4f41b019107f1dfc5d1b45fd5844069472e5ad2e5208ef5d7b9e4a9bdb020440d46c5ef1c7cc34fb846fc1f63b37b5ac57b692dfdcb59e52c94383945b0f456d
+$(DL_FILE)_BLAKE2 = a829bd94d2cc9b305874ae2539dd4388ea99eaed21d2da17bbd99a1e7735b0f7cb910d096f72c71b128dcb8ffdff9021109e7ff5e562d8cefad228fd8d66f897
install : $(TARGET)
diff --git a/lfs/pigz b/lfs/fmt
similarity index 85%
rename from lfs/pigz
rename to lfs/fmt
index 7fe9177ef..754de03b1 100644
--- a/lfs/pigz
+++ b/lfs/fmt
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,9 +24,9 @@
include Config
-VER        = 2.6
+VER        = 8.1.1
-THISAPP    = pigz-$(VER)
+THISAPP    = fmt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba
+$(DL_FILE)_BLAKE2 = 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9
install : $(TARGET)
@@ -73,8 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
-	cd $(DIR_APP) && install -m 755 pigz /usr/bin/pigz
-	ln -svf pigz /usr/bin/unpigz
+	cd $(DIR_APP) && mkdir -pv build
+	cd $(DIR_APP)/build && cmake .. \
+	                    -DCMAKE_INSTALL_PREFIX=/usr \
+	                    -DBUILD_SHARED_LIBS=TRUE
+	cd $(DIR_APP)/build && make $(MAKETUNING)
+	cd $(DIR_APP)/build && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/freetype b/lfs/freetype
index 8a308d70d..5233f7bb8 100644
--- a/lfs/freetype
+++ b/lfs/freetype
@@ -24,7 +24,7 @@
include Config
-VER        = 2.11.1
+VER        = 2.12.1
THISAPP    = freetype-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b
+$(DL_FILE)_BLAKE2 = c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278
install : $(TARGET)
diff --git a/lfs/fribidi b/lfs/fribidi
index e9c362788..75ea2d148 100644
--- a/lfs/fribidi
+++ b/lfs/fribidi
@@ -24,7 +24,7 @@
include Config
-VER        = 1.0.11
+VER        = 1.0.12
THISAPP    = fribidi-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84
+$(DL_FILE)_BLAKE2 = f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5
install : $(TARGET)
diff --git a/lfs/gcc b/lfs/gcc
index 5ce29a13d..1d9d172c2 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -250,6 +250,7 @@ ifeq "$(TOOLCHAIN)" "1"
    cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.xz
    cd $(DIR_APP) && mv -v gmp-$(GMP_VER) gmp
    cd $(DIR_APP) && tar xfa $(DIR_DL)/mpfr-$(MPFR_VER).tar.xz
+	cd $(DIR_APP)/mpfr-$(MPFR_VER) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
    cd $(DIR_APP) && mv -v mpfr-$(MPFR_VER) mpfr
    cd $(DIR_APP) && tar xfa $(DIR_DL)/mpc-$(MPC_VER).tar.gz
    cd $(DIR_APP) && mv -v mpc-$(MPC_VER) mpc
diff --git a/lfs/git b/lfs/git
index bbb033655..d61e429f6 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
include Config
-VER        = 2.35.1
+VER        = 2.36.0
 SUMMARY    = Fast, scalable, distributed revision control system
THISAPP    = git-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 22
+PAK_VER    = 23
DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025
+$(DL_FILE)_BLAKE2 = 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88
install : $(TARGET)
diff --git a/lfs/haproxy b/lfs/haproxy
index 96911574d..7fa3b024e 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -26,7 +26,7 @@ include Config
SUMMARY    = The Reliable, High Performance TCP/HTTP Load Balancer
-VER        = 2.4.15
+VER        = 2.5.5
# From: https://www.haproxy.org/download/2.4/src/haproxy-2.4.15.tar.gz
@@ -36,7 +36,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 20
+PAK_VER    = 21
DEPS       =
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
+$(DL_FILE)_BLAKE2 = 0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5
install : $(TARGET)
diff --git a/lfs/harfbuzz b/lfs/harfbuzz
index 752f75c5f..8fe4c9026 100644
--- a/lfs/harfbuzz
+++ b/lfs/harfbuzz
@@ -24,7 +24,7 @@
include Config
-VER        = 3.4.0
+VER        = 4.2.0
THISAPP    = harfbuzz-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3a39e2d3e358e21d74fdd667cef56bc0c7bc74f15336217d561a1dc3f06978c6e3ced73875fa7121122c6bf4153f2dae6c5e5e112dc9a793249d2f10d2fb87b8
+$(DL_FILE)_BLAKE2 = 90c9ef62780cefd8bb7b79ad31b17db5a0b8b56bee436a69191c8d26f0e9d36ecbf59656dc0846bfa19cb6dc741eac3507d3fe6b0f79df283af60e1b0220611b
install : $(TARGET)
diff --git a/lfs/hplip b/lfs/hplip
index 9c8e240ea..8c25f8f4d 100644
--- a/lfs/hplip
+++ b/lfs/hplip
@@ -26,7 +26,7 @@ include Config
SUMMARY    = HP's Printing, Scanning, and Faxing Software
-VER        = 3.22.2
+VER        = 3.22.4
THISAPP    = hplip-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hplip
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d262307430b5a4ca05f2a58cdadc212e93b73141906c0852a2b9b2ced33b942dbec6d9f2fc1f79773d3d37a9d71f37b5fe457ba574d7bf826cd3afeb80d4f05d
+$(DL_FILE)_BLAKE2 = 6446cecad6a9dea4685874da4879b604ad5c68842783741e8ee87b5cf957a8cc69269ced0a4fa40077abcc35fd0cd8f0103f90e02f1a1244a28617dfd0cd4036
install : $(TARGET)
diff --git a/lfs/iana-etc b/lfs/iana-etc
index ff8ed825b..da17194b5 100644
--- a/lfs/iana-etc
+++ b/lfs/iana-etc
@@ -24,7 +24,7 @@
include Config
-VER        = 20220207
+VER        = 20220414
THISAPP    = iana-etc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 928e4b188f22cac7cfa8881cc75265cd223b9b2fd2181353ace9aaa8ff9f961f7cc9e3b8ddcbfaf3c2a55f888ac79f1a1213f86b6333a9d4083f92da7ccf59ee
+$(DL_FILE)_BLAKE2 = f3f10401bcaaeeec08a0b8d82de265a237e8260a0240b2aaaa286dc593716cc64ec8d56985bbe0b4ea0a2fb93e786b6fe9fff8737245990a88808070ec11e260
install : $(TARGET)
diff --git a/lfs/icinga b/lfs/icinga
index c3ac0e494..b251608ba 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       = nagios-plugins
diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index dcac1a4db..73ccb4623 100644
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 20220207
+VER        = 20220419
THISAPP    = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8c47a330794615b6684084976b6bb9e8800cd2869f81ecc33b28b54441b220a645502c0ade0cbd58e91879a652ff6bca181800004de477fc74033413ea4b1c8f
+$(DL_FILE)_BLAKE2 = 69d296efad5329324a47640eace5d1a10e38b85cb8b7ac5baa9f14c40391ff809ae17cb7814f99f2e43910fe4c4b02dc77ffea7bb5f2b58069b2c17029e9f76a
install : $(TARGET)
diff --git a/lfs/ipset b/lfs/ipset
index 7b7612875..1dae6f936 100644
--- a/lfs/ipset
+++ b/lfs/ipset
@@ -24,7 +24,7 @@
include Config
-VER        = 7.11
+VER        = 7.15
THISAPP    = ipset-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
+$(DL_FILE)_BLAKE2 = 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
install : $(TARGET)
diff --git a/lfs/ipvsadm b/lfs/ipvsadm
index a1e9cb5a1..3108c2e2f 100644
--- a/lfs/ipvsadm
+++ b/lfs/ipvsadm
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A Utility for Administering the Linux Virtual Server
-VER        = 1.29
+VER        = 1.31
THISAPP    = ipvsadm-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipvsadm
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 29f8c353f5c7a6a461b17b0ef7fa4c7803fe52cae5f8f719b25370f502d8724e0847bb3b4e25312b95a49a4bfcd0b6562f61118506c477eafbd1a99fc7c3914c
+$(DL_FILE)_BLAKE2 = a42ceea834fb16e25ea34417227f6b632fe3b94c8a7ce5d3daff4375884fd47f14999551eab3bf7226d5eb02f25aef4c77a8287592b642946683bc5ddc6783da
install : $(TARGET)
diff --git a/lfs/keepalived b/lfs/keepalived
index 0b45f24d9..d6c913f7a 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A keepalive facility for Linux
-VER        = 2.2.4
+VER        = 2.2.7
THISAPP    = keepalived-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = keepalived
-PAK_VER    = 10
+PAK_VER    = 11
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 835198fb23312e87894e7740427411d974c00f71029b273d8da3e787ef92848127d896b456fb40db8d802b6c7555e6524872f136f868e19c62387a9471e44b0f
+$(DL_FILE)_BLAKE2 = 62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc
install : $(TARGET)
diff --git a/lfs/knot b/lfs/knot
index e3a9924d4..0c0c033c0 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 3.1.1
+VER        = 3.1.7
THISAPP    = knot-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff
+$(DL_FILE)_BLAKE2 = d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047
install : $(TARGET)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index bc416386f..2b47e40f3 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Daemon capable of showing info on LCD displays
-VER        = 0.5.7
+VER        = 0.5.9
THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcdproc
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 499d46585633ee6968adc1b5eb916f9737610606b0a8497f72f09cfa75fbd41c880d81ea2be44c50b1d124adf2c70ed49a9ae9a1c70a89899ad932cef7f10b89
+$(DL_FILE)_BLAKE2 = 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17
install : $(TARGET)
diff --git a/lfs/libaio b/lfs/libaio
index 3584a4cdb..e74f7e6f2 100644
--- a/lfs/libaio
+++ b/lfs/libaio
@@ -24,7 +24,7 @@
include Config
-VER        = 0.3.112
+VER        = 0.3.113
THISAPP    = libaio-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba
+$(DL_FILE)_BLAKE2 = 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57
install : $(TARGET)
diff --git a/lfs/libart b/lfs/libart
deleted file mode 100644
index b5f463683..000000000
--- a/lfs/libart
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.3.21
-
-THISAPP    = libart_lgpl-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libcap b/lfs/libcap
index 2b38e8075..21facbe01 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -24,7 +24,7 @@
include Config
-VER        = 2.63
+VER        = 2.64
THISAPP    = libcap-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a49a628f5b9ddf5a3d077428544a53b9cdedf62053ff296a0aa7d61e12ca05f9ba7597f20ee16a3843736bee2417a3d1585ad6b336651fcb3e4ee29b108cfa0f
+$(DL_FILE)_BLAKE2 = 078ce2505a79c1bd4ca0a8eaf3444178bc19a566f0505d28c6959f86fbbac2fe2fc88c06fd0d988087a6e20e8ec66a2633146cea957f0f3fd92eaff4f81d7c66
install : $(TARGET)
@@ -71,11 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    # Prevent a static library from being installed
-	cd $(DIR_APP) && sed -i '/install.*STALIBNAME/d' libcap/Makefile
+	cd $(DIR_APP) && sed -i '/install -m.*STA/d' libcap/Makefile
    cd $(DIR_APP) && make GOLANG=no
    cd $(DIR_APP) && make install GOLANG=no
    rm -vf /lib/libcap.so
-	ln -svf /lib/libcap.so.2.61 /usr/lib/libcap.so
+	ln -svf /lib/libcap.so.2.64 /usr/lib/libcap.so
    chmod +x /lib/libcap.so.*
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/libcap-ng b/lfs/libcap-ng
index 70212ab61..1bf9945c4 100644
--- a/lfs/libcap-ng
+++ b/lfs/libcap-ng
@@ -24,7 +24,7 @@
include Config
-VER        = 0.8.2
+VER        = 0.8.3
THISAPP    = libcap-ng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7e721d05b92fd3708b970527e76b1898daa91bde3ab6ed5d8f23b1435404fbe7d15731461c6d9d2c791738e5498d1f5eaba727413480d34b7edea13c8691c32b
+$(DL_FILE)_BLAKE2 = c54dd753e0ef6dd21bcf6af7b003f85ded9faf2fbf1ea834cda6b181b165ff4b11a0284c23c73d0e6f97a810b3e6a63fceeb57ff583a2b32f23924bdee597ef5
install : $(TARGET)
diff --git a/lfs/libevent b/lfs/libevent
deleted file mode 100644
index 7a043a6ed..000000000
--- a/lfs/libevent
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.4.14b-stable
-
-THISAPP    = libevent-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = e4d5c6ff7b479544bf583b8e40c3273237f6d3e0acd07b73b6aebeaac670198d1f9ad269429afc985a488f7ce14343788d7d9bcb78de617d8781bed09de48856
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libgcrypt b/lfs/libgcrypt
index 04ced7775..bf81a0645 100644
--- a/lfs/libgcrypt
+++ b/lfs/libgcrypt
@@ -24,7 +24,7 @@
include Config
-VER        = 1.9.4
+VER        = 1.10.1
THISAPP    = libgcrypt-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33
+$(DL_FILE)_BLAKE2 = 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a
install : $(TARGET)
diff --git a/lfs/libhtp b/lfs/libhtp
index 3dad9955b..ffc82f8cd 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 0.5.39
+VER        = 0.5.40
THISAPP    = libhtp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712
+$(DL_FILE)_BLAKE2 = 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce
install : $(TARGET)
diff --git a/lfs/libinih b/lfs/libinih
index df46d5218..0b4793d5d 100644
--- a/lfs/libinih
+++ b/lfs/libinih
@@ -24,7 +24,7 @@
include Config
-VER        = r53
+VER        = r55
THISAPP    = inih-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9
+$(DL_FILE)_BLAKE2 = 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236
install : $(TARGET)
diff --git a/lfs/libmnl b/lfs/libmnl
index 72273e3aa..9a96cdb7c 100644
--- a/lfs/libmnl
+++ b/lfs/libmnl
@@ -24,7 +24,7 @@
include Config
-VER        = 1.0.4
+VER        = 1.0.5
THISAPP    = libmnl-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8
+$(DL_FILE)_BLAKE2 = 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6
install : $(TARGET)
diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink
index 38f9cdc10..f5a15d5c3 100644
--- a/lfs/libnfnetlink
+++ b/lfs/libnfnetlink
@@ -24,7 +24,7 @@
include Config
-VER        = 1.0.1
+VER        = 1.0.2
THISAPP    = libnfnetlink-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3
+$(DL_FILE)_BLAKE2 = 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4
install : $(TARGET)
diff --git a/lfs/libnl b/lfs/libnl
deleted file mode 100644
index 61b458cac..000000000
--- a/lfs/libnl
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.1.4
-
-THISAPP    = libnl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libdnet b/lfs/libpipeline
similarity index 90%
rename from lfs/libdnet
rename to lfs/libpipeline
index 073685791..66b72d07d 100644
--- a/lfs/libdnet
+++ b/lfs/libpipeline
@@ -24,9 +24,9 @@
include Config
-VER        = 1.14
+VER        = 1.5.6
-THISAPP    = libdnet-libdnet-$(VER)
+THISAPP    = libpipeline-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a
+$(DL_FILE)_BLAKE2 = 813009e37ddb9a63da57e11ce71040646449b10140f5dd42cca02d280a3adb2173207af857ebca24777fdc8d30e426c41ad51f356f285decfe007b5829d9730f
install : $(TARGET)
@@ -69,11 +69,11 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
+
    cd $(DIR_APP) && ./configure \
-			--prefix=/usr \
-			--disable-static
+	                --prefix=/usr
    cd $(DIR_APP) && make
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/libseccomp b/lfs/libseccomp
index 89b71e8dd..ada345c2f 100644
--- a/lfs/libseccomp
+++ b/lfs/libseccomp
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A Seccomp (mode 2) helper library
-VER        = 2.5.3
+VER        = 2.5.4
THISAPP    = libseccomp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libseccomp
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7
+$(DL_FILE)_BLAKE2 = 38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229
install : $(TARGET)
diff --git a/lfs/libsolv b/lfs/libsolv
deleted file mode 100644
index d6efc6488..000000000
--- a/lfs/libsolv
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY    = Package dependency solver using a satisfiability algorithm
-
-VER        = 0.7.19
-
-THISAPP    = libsolv-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-PROG       = libsolv
-DEPS       =
-PAK_VER    = 4
-
-SERVICES   =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 32fa800eb3d6ff764499816af9cff3c11210e3845ed28902ee3c2865b4842df1db2a659e1453ac1f7541e6188e264e943b8271465bef0a78a3a982a112b0c58c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist :
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-	# Who releases code with -Werror?
-	cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt
-
-	# Disable bindings, examples and tools.
-	cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt
-	cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
-	cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
-
-	cd $(DIR_APP) && mkdir build
-	cd $(DIR_APP)/build && cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=1 \
-		-DENABLE_PERL=0 \
-		-DENABLE_PYTHON=0 \
-		-DENABLE_RUBY=0
-	cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
-	cd $(DIR_APP)/build && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libusb-compat b/lfs/libusb-compat
deleted file mode 100644
index f82d36c5a..000000000
--- a/lfs/libusb-compat
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.1.5
-
-THISAPP    = libusb-compat-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
-	cd $(DIR_APP) && make -j $(PARALLELISM)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index 7616e5a11..fd150c011 100644
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -24,7 +24,7 @@
include Config
-VER        = 20211216
+VER        = 20220411
THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9de3bf59aa66ea926e6f2029050c33b3d40157c09f9485f775920687f544c6be27d54a7af5e25a7c9955af662d905b51bf273aed1f3b8aa70ed9d1c6a58b4e67
+$(DL_FILE)_BLAKE2 = 92aa5dd25de0779a597f1fd13a039b7bf131c4e8a760b5a6c77273d4c07a12b1ed8dfa3ea8a2f38b6362070318ed4e7d4f207e301a9c891d43c1a205cf9a00c1
install : $(TARGET)
diff --git a/lfs/logwatch b/lfs/logwatch
index 262809f2b..8631f4541 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 7.5.5
+VER        = 7.6
THISAPP    = logwatch-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241
+$(DL_FILE)_BLAKE2 = fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656
install : $(TARGET)
@@ -73,8 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR="/tmp"/g" -i install_logwatch.sh
cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.6-disable_iptables.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
@cd $(DIR_APP) && chmod 755 install_logwatch.sh
    cd $(DIR_APP) && yes "" | ./install_logwatch.sh
@@ -106,8 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    ln -vsf /usr/share/logwatch/default.conf /etc/logwatch/conf
-mkdir -p /etc/sudoers.d
-	chmod -v 755 /etc/sudoers.d
-	install -v -m 644 $(DIR_SRC)/config/logwatch/sudoers/logwatch-mdadm \
+	chmod -v 750 /etc/sudoers.d
+	install -v -m 640 $(DIR_SRC)/config/logwatch/sudoers/logwatch-mdadm \
                 /etc/sudoers.d/logwatch-mdadm
@rm -rf $(DIR_APP)
diff --git a/lfs/lynis b/lfs/lynis
index c2fa262b0..bc6b29297 100644
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Security and System auditing tool
-VER        = 3.0.6
+VER        = 3.0.7
THISAPP    = lynis-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
PROG       = lynis
-PAK_VER    = 10
+PAK_VER    = 11
DEPS       =
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 49abad8af63e4eeb3585a241d34433f85f84719a0bbd0c2c1f87a2ab45fc0f88193236f3b10261a59e1c6efd9352134a29b8f311c5a5a749eccede2c8353c6e7
+$(DL_FILE)_BLAKE2 = d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67
install : $(TARGET)
diff --git a/lfs/man b/lfs/man
index 16a3eae89..c6038c255 100644
--- a/lfs/man
+++ b/lfs/man
@@ -24,10 +24,10 @@
include Config
-VER        = 2.4.3
+VER        = 2.10.2
THISAPP    = man-db-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 022f3c39296e47b5fca348e49cfde234af304dbb815ff8a2977c75b8fe1890f9922ecb12e1271be4eb161cea50f3153c396b37b240104e009dd163c5dc998131
+$(DL_FILE)_BLAKE2 = 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599
install : $(TARGET)
@@ -69,21 +69,19 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && mv man/de{_DE.88591,}
-	cd $(DIR_APP) && mv man/es{_ES.88591,}
-	cd $(DIR_APP) && mv man/it{_IT.88591,}
-	cd $(DIR_APP) && mv man/ja{_JP.eucJP,}
-	cd $(DIR_APP) && sed -i "s/-I-//g" {lib,src}/Makefile*
-	cd $(DIR_APP) && sed -i 's,*_*,??,' man/Makefile.in
-	cd $(DIR_APP) && sed -i '/\t/usr/man/d' src/man_db.conf.in
-	cd $(DIR_APP) && echo -e "#define WEB_BROWSER "exec /usr/bin/lynx"" >> include/manconfig.h.in
-	cd $(DIR_APP) && echo -e "#define COL "/usr/bin/col"" >> include/manconfig.h.in
-	cd $(DIR_APP) && echo -e "#define VGRIND "/usr/bin/vgrind"" >> include/manconfig.h.in
-	cd $(DIR_APP) && echo -e "#define GRAP "/usr/bin/grap"" >> include/manconfig.h.in
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-mb-groff --disable-setuid
+	cd $(DIR_APP) && ./configure \
+	                --prefix=/usr \
+	                --sysconfdir=/etc \
+	                --disable-setuid \
+	                --enable-cache-owner=bin \
+                    --with-browser=/usr/bin/lynx \
+                    --with-vgrind=/usr/bin/vgrind \
+                    --with-grap=/usr/bin/grap \
+                    --with-systemdtmpfilesdir= \
+                    --with-systemdsystemunitdir=
    cd $(DIR_APP) && make
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/man-pages b/lfs/man-pages
index 913a78cc9..af3f46fbf 100644
--- a/lfs/man-pages
+++ b/lfs/man-pages
@@ -24,10 +24,10 @@
include Config
-VER        = 2.34
+VER        = 5.13
THISAPP    = man-pages-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b839071b3b7327f95603bacb48e6b3baaa505811e1dda23c7d82e9cd9a5e78e56212162f5f39e995d77fbdbc57937779de25f6b93e09fa574ef9435dd0133fd0
+$(DL_FILE)_BLAKE2 = 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
diff --git a/lfs/mc b/lfs/mc
index 36d60b416..5c77e544d 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Midnight Commander
-VER        = 4.8.27
+VER        = 4.8.28
THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 22
+PAK_VER    = 23
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f
+$(DL_FILE)_BLAKE2 = f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436
install : $(TARGET)
diff --git a/lfs/mcelog b/lfs/mcelog
index 8b75feecf..0f4694f2b 100644
--- a/lfs/mcelog
+++ b/lfs/mcelog
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Log Machine Check Events
-VER        = 175
+VER        = 181
THISAPP    = mcelog-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mcelog
-PAK_VER    = 2
+PAK_VER    = 3
 SUP_ARCH   = x86_64
DEPS       =
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64
+$(DL_FILE)_BLAKE2 = 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de
install : $(TARGET)
@@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	# Fix Python interpreter call in genconfig.py script
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mcelog-181-fix-Python-call.patch
+
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/meson b/lfs/meson
index 167373987..bc6cfbb2d 100644
--- a/lfs/meson
+++ b/lfs/meson
@@ -24,7 +24,7 @@
include Config
-VER        = 0.60.1
+VER        = 0.62.1
THISAPP    = meson-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ba9fce07f4b1c54cd65b8cf4e6c57c95f2729f42a9ff1bae3907802dcdedd933c2031b1d9546b608cbb87c1364170d32501cbd6e856cc95a713930efcadc8ae9
+$(DL_FILE)_BLAKE2 = 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f
install : $(TARGET)
diff --git a/lfs/minidlna b/lfs/minidlna
index 17cf76339..0fa7aec96 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = ffmpeg flac libexif libid3tag libogg
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/minidlna-1.3.0-fix-DNS-rebinding-issue-CVE-2022-26505.patch
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
    cd $(DIR_APP) && make install
diff --git a/lfs/mpc b/lfs/mpc
index 06aa9c890..78fd9488c 100644
--- a/lfs/mpc
+++ b/lfs/mpc
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Client for the Music Player Daemon
-VER        = 0.33
+VER        = 0.34
THISAPP    = mpc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpc
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = mpd libmpdclient
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2
+$(DL_FILE)_BLAKE2 = 709f54ceebd66f703e5b1bf6ff8deb890e484fdc29c0b2198922763e347caac89d6eec5f74101f9fa860436e7493e2b02cc6b1b26e800e783546fe5a0c6e0d8f
install : $(TARGET)
diff --git a/lfs/mpd b/lfs/mpd
index 90c8cec41..e4381fc1b 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Music Player Daemon
-VER        = 0.22.6
+VER        = 0.23.6
THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 24
+PAK_VER    = 25
 SUP_ARCH   = aarch64 armv6l x86_64
DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c
+$(DL_FILE)_BLAKE2 = 5ccb4a7c06c4317e3285846a261438bdcc10db5eaf71fcba969bcae8321ca50bb26fe9317e23e38eca1c4a8785015596064d5bfc692bf66f8007d0d2a1b71cbb
install : $(TARGET)
diff --git a/lfs/mpfr b/lfs/mpfr
index b1c04afeb..221c9c527 100644
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
    cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
    	--enable-thread-safe
    cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/mtr b/lfs/mtr
index aadb71d5b..dd190a90f 100644
--- a/lfs/mtr
+++ b/lfs/mtr
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Ping and Traceroute Network Diagnostic Tool
-VER        = 0.94
+VER        = 0.95
THISAPP    = mtr-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mtr
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 08f646774eaa323861863f08aa6f91995135923f1597d26790d3dce9d617700b41120686f71105054fb7f75b558c8753119dc5431c4584d88f8bef5629e0ebfa
+$(DL_FILE)_BLAKE2 = 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b
install : $(TARGET)
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && ./bootstrap.sh
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/multipath-tools b/lfs/multipath-tools
index 3dcf1e906..61b6183f0 100644
--- a/lfs/multipath-tools
+++ b/lfs/multipath-tools
@@ -24,7 +24,7 @@
include Config
-VER        = 386d288
+VER        = 0.8.9
THISAPP    = multipath-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b1cfde006416359f008c80f13f457a8eb79e4f5fd1c4dc222e8d5719f15e898e94527174c9ba28c736cb0b51870f5c4b690ed4b6ee1427673ac7d1746b79fadc
+$(DL_FILE)_BLAKE2 = b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30
install : $(TARGET)
diff --git a/lfs/nano b/lfs/nano
index 1d684d0b1..05e63528c 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER        = 6.2
+VER        = 6.3
THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 89e75fdd222a4d5e5eceb164a3b4eaf8ad24622fae95dd142556e110a63ad1202d489b7881fc063ecc716d9a409021cd7184c70116f68aa7e188012c2510ecde
+$(DL_FILE)_BLAKE2 = 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92
install : $(TARGET)
diff --git a/lfs/nasm b/lfs/nasm
index 3988297ae..635597c4a 100644
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -24,7 +24,7 @@
include Config
-VER        = 2.14.02
+VER        = 2.15.05
THISAPP    = nasm-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4
+$(DL_FILE)_BLAKE2 = a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35
install : $(TARGET)
diff --git a/lfs/ncdu b/lfs/ncdu
index 1e63a45aa..f1338f033 100644
--- a/lfs/ncdu
+++ b/lfs/ncdu
@@ -27,7 +27,7 @@ include Config
SUMMARY    = NCurses Disk Usage
-VER        = 1.16
+VER        = 1.17
THISAPP    = ncdu-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ncdu
-PAK_VER    = 2
+PAK_VER    = 3
DEPS	    =
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 61d004581bdcf1885bec24d0a1de4fc890fe91bba511abbdbc507a48f31946caf5c7324979e8410e53cfca8ada1b20342b737dc4e8b1f034f2fca5aea84e4369
+$(DL_FILE)_BLAKE2 = 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f
install : $(TARGET)
diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat
deleted file mode 100644
index fc63ab1b1..000000000
--- a/lfs/ncurses-compat
+++ /dev/null
@@ -1,130 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 5.9
-
-THISAPP    = ncurses-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-# Normal build or $(TOOLS_DIR) build.
-#
-ifeq "$(ROOT)" ""
-  TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
-else
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = $(TOOLS_DIR)
-endif
-
-EXTRA_CONFIG += \
-	--prefix=$(PREFIX) \
-	--with-shared \
-	--without-debug \
-	--without-ada \
-	--with-ospeed=unsigned \
-	--with-chtype=long \
-	--enable-hard-tabs \
-	--enable-xmc-glitch \
-	--enable-colorfgbg \
-	--enable-overwrite \
-	--with-termlib=tinfo \
-	--disable-nls
-
-export CPPFLAGS = -P
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && mkdir -pv narrowc widec
-
-	# Build narrowc version.
-	cd $(DIR_APP)/narrowc && ln -svf ../configure .
-	cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
-	cd $(DIR_APP)/narrowc && make libs
-	cd $(DIR_APP)/narrowc && make -C progs
-
-	# Build widec version.
-	cd $(DIR_APP)/widec && ln -svf ../configure .
-	cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
-		--enable-widec --without-progs
-	cd $(DIR_APP)/widec && make libs
-
-	# Install everything.
-	cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
-	rm -vf $(PREFIX)/lib/libtinfo.*
-	cd $(DIR_APP) && make -C widec install.{libs,includes,man}
-
-	# don't require -ltinfo when linking with --no-add-needed
-	for l in $(PREFIX)/lib/libncurses{,w}.so; do \
-		soname=$$(basename $$(readlink $$l)); \
-		rm -f $$l; \
-		echo "INPUT($$soname -ltinfo)" > $$l; \
-	done
-
-	rm -vf $(PREFIX)/lib/libcurses{,w}.so
-	echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
-	echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
-	echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/netpbm b/lfs/netpbm
deleted file mode 100644
index 03f537abd..000000000
--- a/lfs/netpbm
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY    = A Graphics Conversion Package
-
-VER        = 10.73.31
-
-THISAPP    = netpbm-$(VER)
-DL_FILE    = $(THISAPP).tgz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = netpbm
-PAK_VER    = 3
-
-DEPS       =
-
-SERVICES   =
-
-CFLAGS    += -flax-vector-conversions
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 6bac4048e60e1605edb8d65be51c153431b03f305057dd64e4da912633a539d987cc6bda71960799004cc70faf957fa3e504ed6f24b6c3bb8996b90d34529309
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	rm -rf /usr/netpbm
-	cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP)
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" #The build of this version cannot be parallelized
-	cd $(DIR_APP) && make package PKGDIR=/usr/netpbm
-	mkdir -pv /usr/include/netpbm
-	mkdir -pv /usr/share/netpbm
-	mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm
-	mv -fv /usr/netpbm/lib/* /usr/lib
-	mv -fv /usr/netpbm/bin/* /usr/bin
-	mv -fv /usr/netpbm/misc/* /usr/share/netpbm
-	rm -Rfv /usr/netpbm/
-	cd /usr/lib && ln -sfv libnetpbm.so.11.73 libnetpbm.so
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/nfs b/lfs/nfs
index e9c404131..c8fe3ca5f 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -26,15 +26,15 @@ include Config
SUMMARY    = Support Utilities for Kernel nfsd
-VER        = 2.5.3
+VER        = 2.6.1
THISAPP    = nfs-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 16
+PAK_VER    = 17
DEPS       = rpcbind
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 89120d8268e6c1db3b731f67604368ac245c76fc5b290ed63c5251a08b2c3e8309199217ae1407aebc43aeab8910a1a6f97fec60b9a73661e87220c718e082e0
+$(DL_FILE)_BLAKE2 = fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d
install : $(TARGET)
diff --git a/lfs/nginx b/lfs/nginx
index bf5ebb1a3..994ede775 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -25,7 +25,7 @@
 include Config
SUMMARY    = A HTTP server and IMAP/POP3 proxy server
-VER        = 1.19.2
+VER        = 1.21.6
THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = nginx
-PAK_VER	   = 11
+PAK_VER	   = 12
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = db00b5945ed82fe90059269ba987931642981a2b8fa1cb24e0d842b97d89857993f99443c644d9217af29430b868ee8efd90dbc5daefd719d0f98c0766601554
+$(DL_FILE)_BLAKE2 = 815d035df33bd947eec41a2f5c993d1f179aa0bd4d069280916aa089a2f96fd3bada7a7192b4a0ef7b8f43036f3a2def0e93d8c8f720dd7145a5d55ea058652f
install : $(TARGET)
diff --git a/lfs/nut b/lfs/nut
index cd0af7ec5..619918b5b 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Network UPS Tools Core (Uninterruptible Power Supply Monitoring)
-VER        = 2.7.4
+VER        = 2.8.0
THISAPP    = nut-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308
+$(DL_FILE)_BLAKE2 = 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94
install : $(TARGET)
@@ -84,9 +84,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/nut \
-			--with-usb --with-user=root --with-group=nut \
-			--with-wrap=no --with-udev-dir=/etc/udev
+	cd $(DIR_APP) && ./configure \
+	                    --prefix=/usr \
+	                    --sysconfdir=/etc/nut \
+			            --with-usb \
+			            --with-user=root \
+			            --with-group=nut \
+			            --with-wrap=no \
+			            --with-udev-dir=/etc/udev \
+			            --disable-static
    cd $(DIR_APP) && make #$(MAKETUNING)
    cd $(DIR_APP) && make install
 #	sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules
diff --git a/lfs/oci-cli b/lfs/oci-cli
index 2629af509..24bbd489d 100644
--- a/lfs/oci-cli
+++ b/lfs/oci-cli
@@ -24,7 +24,7 @@
include Config
-VER        = 3.4.2
+VER        = 3.7.3
THISAPP    = oci-cli-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = oci-cli
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = oci-python-sdk python3-arrow python3-jmespath python3-six \
    python3-terminaltables
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5fa57d28eb3839bf291cb9b1d2b0b404f0232d119af06044224097610f114bd31c9ea2d2f5c732601f9d505ffc0033e5b4609968790d195b53d85203a8ddb707
+$(DL_FILE)_BLAKE2 = 18982b6633e1df16dfd381df0f6aa78bab33b0e4ad733ca518410704d5f10b5fc3e511fa7c7440455ceb648c70c7138034fcabe043e124b9065743174275409d
install : $(TARGET)
diff --git a/lfs/oci-python-sdk b/lfs/oci-python-sdk
index 7df084f4a..3f9b768fd 100644
--- a/lfs/oci-python-sdk
+++ b/lfs/oci-python-sdk
@@ -24,7 +24,7 @@
include Config
-VER        = 2.54.0
+VER        = 2.64.0
THISAPP    = oci-python-sdk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = oci-python-sdk
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = python3-certifi python3-click python3-circuitbreaker \
    python3-cryptography python3-dateutil python3-pytz python3-six
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 891b3217446fe76cc4e74fa7abafa9b6c8c4e60510f54b91cff8050422b93618620425db9591f5a1e7c07ea1befbc8097f2b42cb6a08f5bb6ae7f52048c35b05
+$(DL_FILE)_BLAKE2 = 1c7b2b1980354865a2d48fc542fc83dbae53c284251341dc10e45f4b9a42dfc1aafb530b4871af1432fb1aaa89fdb15bf4cb6007ea7454da02c1b9c6793d10c0
install : $(TARGET)
diff --git a/lfs/oinkmaster b/lfs/oinkmaster
deleted file mode 100644
index 1b437c0cd..000000000
--- a/lfs/oinkmaster
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.0
-THISAPP    = oinkmaster-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = f5c096b8f03a5952670c6942dc1020bd6b37bf8ec897a975671e20ec4099b54851f61320a695d2562c56981861f5096a739d06baad5e5c9b7c62585d21b2a189
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf  $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-2.0-add_community_rules.patch
-	cd $(DIR_APP) && chown nobody:nobody oinkmaster.pl
-	cd $(DIR_APP) && install -m 0644 $(DIR_SRC)/config/oinkmaster/oinkmaster.conf \
-		/var/ipfire/suricata/
-	cd /var/ipfire/suricata && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-tmp.patch
-	cd $(DIR_APP) && install -m 0755 oinkmaster.pl /usr/local/bin/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/openjpeg b/lfs/openjpeg
index 0b8dec349..54fa69339 100644
--- a/lfs/openjpeg
+++ b/lfs/openjpeg
@@ -24,7 +24,7 @@
include Config
-VER        = 2.3.1
+VER        = 2.4.0
THISAPP    = openjpeg-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9
+$(DL_FILE)_BLAKE2 = ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf
install : $(TARGET)
diff --git a/lfs/openldap b/lfs/openldap
index 60d46a249..195aa4af2 100644
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -24,7 +24,7 @@
include Config
-VER        = 2.4.49
+VER        = 2.6.1
THISAPP    = openldap-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ee777588d758f6704b0d38b90feb85b27e2307510a05d1d147324e9958a6f6fc5bc7dd521a1462971c3f707429ad38fab734f508d71fd88b447770e112e844a2
+$(DL_FILE)_BLAKE2 = 08bb7ec0354d689b65673d6c4c05a3299ba4f1655cbcccb710b6c9ca66fd636d6b2d89faa8d32278d253a1647deae8b1e86e8e275b890208bfac4ca663a40523
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.4.49-consolidated-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.6.1-consolidated-2.patch
    cd $(DIR_APP) && autoconf
    cd $(DIR_APP) && ./configure \
    	--prefix=/usr \
diff --git a/lfs/openssh b/lfs/openssh
index 8c958e9fe..302ae6041 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 8.9p1
+VER        = 9.0p1
THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b
+$(DL_FILE)_BLAKE2 = 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2
install : $(TARGET)
diff --git a/lfs/openssl b/lfs/openssl
index 2aa0aeb86..a1328fcd0 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER        = 1.1.1n
+VER        = 1.1.1o
THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -74,7 +74,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398
+$(DL_FILE)_BLAKE2 = 5bd355fd17adf43ba4e3bf1a8036ceb724edd4f4ab80dc25aecc3d2647372e9db2bc12e2b89791fc4b6f7fd95a7b68e00490d09ca6518d25ab990ee27798e641
install : $(TARGET)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index df508e47b..1207f9e2e 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Open Virtual Machine Tools
-VER        = stable-11.3.0
+VER        = stable-12.0.0
THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)/open-vm-tools
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64
 PROG       = openvmtools
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = libtirpc
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 65dcc52658c9e3dd5bd451df354f4bebb411ba45807f8279786f86c95708e0ddc3accf7140cd2b353d514b349264aae77487cec3693acc3919053d656f339935
+$(DL_FILE)_BLAKE2 = 7958d43567c8620ab95ded57f8d7f472a7a361c2734b384a7443cede57f73a3f9f77f0949c5e6995635c5475b12405f7b8699c4dc0d81654767b3fd7102c1fc2
install : $(TARGET)
diff --git a/lfs/openvpn b/lfs/openvpn
index 9b2e7853c..27a052ae1 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,10 +24,10 @@
include Config
-VER        = 2.5.4
+VER        = 2.5.6
THISAPP    = openvpn-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ebc711981ab93da69ba033f3cf1ea1c99e86f700ec98809a3c401d59a6ecf53f977935aafd37df0233a0498762db01bed0555aeb99ab7e7903274e4d78997301
+$(DL_FILE)_BLAKE2 = d0466d2b95dae892606b6369d2c227add1de43fb708bf1c31a3ef78b28fc37382d501cc559767c8c8358ec28b88d3eb80a0eb915d7872ce30757c7080a37fde2
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure \
    	--prefix=/usr \
    	--sysconfdir=/var/ipfire/ovpn \
diff --git a/lfs/pango b/lfs/pango
index 1a8d64c36..759f269ae 100644
--- a/lfs/pango
+++ b/lfs/pango
@@ -24,7 +24,7 @@
include Config
-VER        = 1.50.4
+VER        = 1.50.6
THISAPP    = pango-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 310a7be79ebf693b3a7775fa86557539bf4ea682b0903266248ab2812504e805024b14a917531e71ad9b5637d4d3f3c1a06b84188eb01aeed37fdcc7d11679a9
+$(DL_FILE)_BLAKE2 = 63cad33f5fe5361642edb0e26a11c45e28e23400f29c078079fa9ce4411eca90c67fdd789e8cf9caec0f1d4a6b5d619808d8dcf53447f961b66db17e1bbcdb97
install : $(TARGET)
diff --git a/lfs/parted b/lfs/parted
index 09a6423a9..78914aa98 100644
--- a/lfs/parted
+++ b/lfs/parted
@@ -26,7 +26,7 @@ include Config
SUMMARY    = GNU partitioner
-VER        = 3.4
+VER        = 3.5
THISAPP    = parted-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
PROG       = parted
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711
+$(DL_FILE)_BLAKE2 = 5a63987f4d2c0bfd28f36112c2354f8dce7f87e962f4772bb0db34c070dd773b280959c6c33128422e8d60efe454c825401551c3c88541839b9a859a3d207f55
install : $(TARGET)
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index d919675e8..9cc6c7e09 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,14 +26,14 @@ include Config
SUMMARY    = Firmware files for PC Engines apu system boards
-VER        = 4.15.0.1
+VER        = 4.16.0.3
THISAPP    = pcengines-apu-firmware-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pcengines-apu-firmware
-PAK_VER    = 10
+PAK_VER    = 11
 SUP_ARCH   = x86_64
DEPS       = firmware-update
@@ -59,12 +59,12 @@ apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
 apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
 apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom
-apu1_v$(VER).rom_BLAKE2 = 317bf51d82c1c99514d3dc3d6324e8f6c6b4768f2052902673a21fbdb554f6602940dbd531a80074a00ca9777d72bd8772deac5be2e4df38c8675e1d67d426ee
-apu2_v$(VER).rom_BLAKE2 = eaa5fa9bf1b0f1439b41cc2d48e0db24fb3e1096419ca728c98644d43a5bf0164380ab7173cbcbcf14b38052128c4b6c0bd8032e65f12c6f79262801fc534875
-apu3_v$(VER).rom_BLAKE2 = 11af9de100d7da62edd585c1327325cdd661eafc1e540f9395728ee47e35acf427348b29e011f5269e86ab6d6923f7e2a47b59cdf7d5a982cbe4328abc10652c
-apu4_v$(VER).rom_BLAKE2 = bf57beb63cd7581d6d3f24e2c6f51f15c540dc99036a2ccc22ecf9e3fbc8f37bf5bc46bb96fa9f854b952aa9a09130d7096f0a3c372b040cfcfc2abbf644c428
-apu5_v$(VER).rom_BLAKE2 = e296e2e168be85220f22e00d7cd075c73660f18ffb28b26a16c01129f77e2ed50148b3c95405945bcacdebf9d6e4e76ef08ffcef362898c46a381453844d9606
-apu6_v$(VER).rom_BLAKE2 = d6ce353299499be201af03ee678aa8bf3e33bdc2c9c952e91242b67febf9678bb85b6f6ed1b7d7b4278f5921cadb306451603d6c59bdf45d70793faf2c26312b
+apu1_v$(VER).rom_BLAKE2 = 3223d7ca35797a3e4eaea993fd93eeece842e46829cf3a39625ad3a3b5eceb241812b25198a94545f4de42b4bf2d31503746f08e9b361cff2d7ce11ec0ba24d9
+apu2_v$(VER).rom_BLAKE2 = 8d6ddb76189813546c3594ef9f92e341e99cbec8bb3df414589625815269b2fe0973a01185a35f0afe9dd16949ccaccc3d9bf3baee2de696450dfd17c96175d7
+apu3_v$(VER).rom_BLAKE2 = 64405157e7bfeca467b70fe4982a844763ed3b1c95d7aac75210cbb14e7e0de0a6c34708002a5be94344eaf96cd1d187ce03e8c0d0f8597048e70c7ab9fa6e14
+apu4_v$(VER).rom_BLAKE2 = 4a29d17b2040edc880aea277789cc6158b00c834dba110b2eda2692a1571d51e01cfdec361ca4acdcfc019e4ae904c55dafff18020e7d23eabec5037f4ca7369
+apu5_v$(VER).rom_BLAKE2 = db3b87945578a2a86b17d998e2fc316b654a78201b852804ae7067b92d22033817d5a77da3736d31ec54ef5d296ad38e735709a232e9e6cad9674e543306cff6
+apu6_v$(VER).rom_BLAKE2 = e9a8bd06658f7df4c09ad304145272419bef7022d0ac577b0f8777f75b90e020790cbfba9c6a2fd5abf52205901ec735b6e2fe52fa9d22040a12b13e0959fb65
install : $(TARGET)
diff --git a/lfs/pciutils b/lfs/pciutils
index caa5d7a4b..e01559b1e 100644
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -24,7 +24,7 @@
include Config
-VER        = 3.7.0
+VER        = 3.8.0
THISAPP    = pciutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a
+$(DL_FILE)_BLAKE2 = 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4
install : $(TARGET)
diff --git a/lfs/pcre2 b/lfs/pcre2
index 9684709d9..b57af0971 100644
--- a/lfs/pcre2
+++ b/lfs/pcre2
@@ -24,10 +24,10 @@
include Config
-VER        = 10.39
+VER        = 10.40
THISAPP    = pcre2-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 01df50fc4b791402156cfd2282e7ad82616d71dff12dbedc091b3a036f1fd1c933ebd870ccdd86a6da400732e5a63922c6f6731ea9759065a8de9485a7e842f7
+$(DL_FILE)_BLAKE2 = 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b
install : $(TARGET)
diff --git a/lfs/sdparm b/lfs/perl-JSON
similarity index 85%
rename from lfs/sdparm
rename to lfs/perl-JSON
index d77542db0..796c1f034 100644
--- a/lfs/sdparm
+++ b/lfs/perl-JSON
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2019  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -18,20 +18,28 @@
 #                                                                             #
 ###############################################################################
+
 ###############################################################################
 # Definitions
 ###############################################################################
-
 include Config
-VER        = 1.12
+SUMMARY    = JSON (JavaScript Object Notation) encoder/decoder
+
+VER        = 4.05
-THISAPP    = sdparm-$(VER)
-DL_FILE    = $(THISAPP).tgz
+THISAPP    = JSON-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-JSON
+DEPS       =
+PAK_VER    = 1
+
+SERVICES   =
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6
+$(DL_FILE)_BLAKE2 = 0ecf27b15a780833fe6cb12bece6eaa5a75de92a02f901014105d1435857867d86ccad94e2666195fc66ed41f45f8f91061a06b1e5e05f3a332803b46bb4b53e
install : $(TARGET)
@@ -73,9 +81,8 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
    cd $(DIR_APP) && make install
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/perl-libwww b/lfs/perl-libwww
index b10df97ed..cec71ffca 100644
--- a/lfs/perl-libwww
+++ b/lfs/perl-libwww
@@ -24,7 +24,7 @@
include Config
-VER        = 6.61
+VER        = 6.62
THISAPP    = libwww-perl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 962e81682cad3c12d24d150db4559a133047379aea7f4835d10041591d95cfde2090f5f3fe22750d971524dbae8aaa3c185a5f37f75ad1ce66ba58038164b09c
+$(DL_FILE)_BLAKE2 = 8ffdb0572b161d0f8215978749ef620e83b1f54d404bbb9667e85d51cd81a73fc0904fe9af247602587681e8a9e6faca2cd8b868ea8a3376d2e82ae41b9a27ec
install : $(TARGET)
diff --git a/lfs/poppler b/lfs/poppler
index 45007543c..4de368ef8 100644
--- a/lfs/poppler
+++ b/lfs/poppler
@@ -24,7 +24,7 @@
include Config
-VER        = 22.02.0
+VER        = 22.04.0
THISAPP    = poppler-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 97d27fb6d31535b5fce0aa518d00ab9da218a8d49dcb45dbaa5ab3cc669d8ffc75e07bd617b5fe9842c8b7b8ac843e9aa07ee0d31504f1e2b6c4f89b2177add6
+$(DL_FILE)_BLAKE2 = ea38e4d6bd4bbbbb2024fdceb35c4868e9c70ea597b231d221f4f61635b9d92ffbaca4bb196f06b4b04a3d787a7251f36760f4a6dd466c1c055e13034affb55e
install : $(TARGET)
diff --git a/lfs/postfix b/lfs/postfix
index 2fec602f3..6fe12c9c8 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A fast, secure, and flexible mailer
-VER        = 3.7.0
+VER        = 3.7.1
THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 34
+PAK_VER    = 35
DEPS       =
@@ -70,7 +70,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb
+$(DL_FILE)_BLAKE2 = d0bfdbc5105407e5143823e8e14b49e60d5c248eac435279a5fe803b370b46a56de9aff39fdf94398758863f753e43e889e2dffbb393ab63cf486d4fd3f5cf99
install : $(TARGET)
diff --git a/lfs/powertop b/lfs/powertop
index c687cf729..c909a73bf 100644
--- a/lfs/powertop
+++ b/lfs/powertop
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A Linux Tool to Find out What is Using Power on a Laptop
-VER        = v2.10
+VER        = 2.14
THISAPP    = powertop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = powertop
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41
+$(DL_FILE)_BLAKE2 = 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc
install : $(TARGET)
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    $(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && ./autogen.sh
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/procps b/lfs/procps
index 258d1c769..5189e477b 100644
--- a/lfs/procps
+++ b/lfs/procps
@@ -24,7 +24,7 @@
include Config
-VER        = v3.3.16
+VER        = v4.0.0
THISAPP    = procps-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 44b5871deeba9d37a38a113937c8b632cc3e400d184fbdf9d64d53370c4f52d1339c1b5e15cc7d53141c4774f993de0cafc0b53aeff6d7fb658126c9b9ad88da
+$(DL_FILE)_BLAKE2 = 5b6c684aaaf4114ea6d53287f220fbc375556a9630a54d9ad8e0750d1d373ab73cf38e06df7cc663853d11fa69237ecd89dffaf3a84dc57df652357983f536cb
install : $(TARGET)
@@ -73,7 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && ./autogen.sh
    cd $(DIR_APP) && ./configure \
    			--prefix=/usr \
-				--libdir=/lib
+				--libdir=/lib \
+				--disable-static
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
diff --git a/lfs/python3-botocore b/lfs/python3-botocore
index e310d2394..cbda1ca52 100644
--- a/lfs/python3-botocore
+++ b/lfs/python3-botocore
@@ -24,7 +24,7 @@
include Config
-VER        = 1.23.21
+VER        = 1.24.37
 SUMMARY    = Python interface for AWS
THISAPP    = botocore-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-botocore
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       = python3-dateutil python3-jmespath python3-urllib3
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 18dbd124834a16e5ebf925e8bd1c38ac86a87bbf2c7f10afb2b885833d95bf16893ea287585b3c70d656b888fd59e02b8e1ab4b9eec06d57ba9d1693e1a3fed2
+$(DL_FILE)_BLAKE2 = 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908
install : $(TARGET)
diff --git a/lfs/python3-charset-normalizer b/lfs/python3-charset-normalizer
index 1a235915c..ef4feb91c 100644
--- a/lfs/python3-charset-normalizer
+++ b/lfs/python3-charset-normalizer
@@ -24,15 +24,15 @@
include Config
-VER        = 2.0.10
+VER        = 2.0.12
-THISAPP    = charset_normalizer-$(VER)
+THISAPP    = charset-normalizer-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-charset-normalizer
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 935af7625c138f8751de60c4179ee6b0195e99366c7bbecd8e9dfdf09ea557e2eb7cb86830321f91b3b7aa3fc1b3cc376266a4c22d23aabc6dfa6b9db57beb45
+$(DL_FILE)_BLAKE2 = 01a7bbc89df0236ea2383589acd76880065c28137eb201cce7795a7ca4b7c2d471f0b16e68c2022b943e1b4cde530e726cffc36112b0b3626ee32904805b76f3
install : $(TARGET)
diff --git a/lfs/python3-click b/lfs/python3-click
index e923a8d00..615f5e399 100644
--- a/lfs/python3-click
+++ b/lfs/python3-click
@@ -24,7 +24,7 @@
include Config
-VER        = 8.0.3
+VER        = 8.1.2
THISAPP    = click-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-click
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9e42e167e26a03b4ddb238943ed5cb4d291231ceb0f56a6e74f9930c8f64f4ae44b0495a85c6abcb2167dc633bbc5e90d1a21da843a799e266e6560a7b3b909d
+$(DL_FILE)_BLAKE2 = e0ac04e4583dadba61ca42640f6d75ade30c62bd46b5fd0d15378e00f102f29160190c8ebb01de637c5446d9d06b687bddba4b78b3b3c80bb6e64ba46df866fa
install : $(TARGET)
diff --git a/lfs/python3-flit b/lfs/python3-flit
index c445b623b..36cd59596 100644
--- a/lfs/python3-flit
+++ b/lfs/python3-flit
@@ -24,7 +24,7 @@
include Config
-VER        = 3.6.0
+VER        = 3.7.1
THISAPP    = flit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-flit
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c0f81d1429f9f8a51804c1f13cf936272d7c0fe2ba7a19d477a26b42dbde01c539ca0169ae195e9cbf3ef97764b938b6f3241b48e8a48955e0dadf541a116521
+$(DL_FILE)_BLAKE2 = b94f8bbe00c2c5fb28bddbdcf240255ed53ec3b24d2eab1a33e37261cf32a92a0171ea01ad1488384c15f46acbf84d47c4679b318932a3ee78f22c1d161156b0
install : $(TARGET)
diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
index 3b6fc8d09..f3bb34ff3 100644
--- a/lfs/python3-jmespath
+++ b/lfs/python3-jmespath
@@ -24,7 +24,7 @@
include Config
-VER        = 0.10.0
+VER        = 1.0.0
 SUMMARY    = Python module for declarative JSON document element extraction
THISAPP    = jmespath-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/jmespath-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-jmespath
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8d827e61363a8d9e974ab465efd05e50ba9ce7a35e2457b43bbdd33a740c5d40dd8c397767709c4a96e157ec31f2e9388ecaed25191ceb77b0574fb4372d5247
+$(DL_FILE)_BLAKE2 = 579a9b3273fb266ea4974aef7a266d084f00169ee645ec8cebbe9d8e838bd4d69c03e952e84a430d6a47de14ee7c7830fffc07dd049929a05945f23dff43f194
install : $(TARGET)
diff --git a/lfs/libpri b/lfs/python3-pkgconfig
similarity index 85%
rename from lfs/libpri
rename to lfs/python3-pkgconfig
index 3236bbff8..a91aca39b 100644
--- a/lfs/libpri
+++ b/lfs/python3-pkgconfig
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,16 @@
include Config
-SUMMARY    = An implementation of Primary Rate ISDN
+VER        = 1.5.5
+SUMMARY    = Python module to interface Python with pkg-config
-VER        = 1.4.10.2
-
-THISAPP    = libpri-$(VER)
+THISAPP    = pkgconfig-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libpri
-PAK_VER    = 2
+PROG       = python3-pkgconfig
+PAK_VER    = 1
DEPS       =
@@ -48,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 62f642ced45c969bf1bc3117110b35e891497de7414da11f622de868188b4b0558194cb39f4bb8941e6229fba1974a4905163f1df92f6f3c25411cf9cfa9b22f
+$(DL_FILE)_BLAKE2 = 0eb3ff11b1fdcd3b1b4d3310d408d5f9a036a48c0f3176d77a13e566df35beea8ee6b3afe4c7643cc1808584e525f4d0fac9ab706b751c933f853ed1e9aecd0e
install : $(TARGET)
@@ -59,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 b2 : $(subst %,%_BLAKE2,$(objects))
dist:
-	$(PAK)
+	@$(PAK)
###############################################################################
 # Downloading, checking, b2sum
@@ -81,8 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) \
-		CFLAGS="$(CFLAGS)"
-	cd $(DIR_APP) && make install KVERS=$(KVER)
+	cd $(DIR_APP) && python3 setup.py build
+	cd $(DIR_APP) && python3 setup.py install --root=/
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/python3-pyparsing b/lfs/python3-pyparsing
index 270466f44..14920ecce 100644
--- a/lfs/python3-pyparsing
+++ b/lfs/python3-pyparsing
@@ -24,7 +24,7 @@
include Config
-VER        = 3.0.6
+VER        = 3.0.7
 SUMMARY    = Grammar Parser Library for Python
THISAPP    = pyparsing-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-pyparsing
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = bf79fdb20c6dbcec5a79956ed8c68e56edbadd4d71f44a35107dfb0652c1d2ecbc980c95e729f35f94dce5783ad8159848563dadc529d0f4b48a1ce61e12a3aa
+$(DL_FILE)_BLAKE2 = 1f098dd2ae6ffef6f98a44137769198ebad6af1642c1bc784284bedbcd28c617993fb51901d179962ca05f3f8699d24c04b0df5e5e5168a572c0deb506ad4e54
install : $(TARGET)
diff --git a/lfs/python3-pytz b/lfs/python3-pytz
index 68b7ad652..5567ce74f 100644
--- a/lfs/python3-pytz
+++ b/lfs/python3-pytz
@@ -24,7 +24,7 @@
include Config
-VER        = 2021.3
+VER        = 2022.1
THISAPP    = pytz-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-pytz
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89
+$(DL_FILE)_BLAKE2 = 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe
install : $(TARGET)
diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer
index a8b2e459b..3c18becc2 100644
--- a/lfs/python3-s3transfer
+++ b/lfs/python3-s3transfer
@@ -24,7 +24,7 @@
include Config
-VER        = 0.5.0
+VER        = 0.5.2
 SUMMARY    = Python S3 transfer manager
THISAPP    = s3transfer-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-s3transfer
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36
+$(DL_FILE)_BLAKE2 = 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213
install : $(TARGET)
diff --git a/lfs/python3-semantic-version b/lfs/python3-semantic-version
index 2153b0403..8b9979cf4 100644
--- a/lfs/python3-semantic-version
+++ b/lfs/python3-semantic-version
@@ -24,7 +24,7 @@
include Config
-VER        = 2.8.5
+VER        = 2.9.0
THISAPP    = semantic_version-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-semantic-version
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19
+$(DL_FILE)_BLAKE2 = c487c49ad17e7ca224ca4b6602abb42d1406dad8d70a3f5d0c536160e5b2d706ff0e1497961e3b9e0391c6d773ab7d0e9699f171f5781cec1d36025450cb7019
install : $(TARGET)
diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools
index 992583153..3575a7a77 100644
--- a/lfs/python3-setuptools
+++ b/lfs/python3-setuptools
@@ -24,7 +24,7 @@
include Config
-VER        = 59.5.0
+VER        = 62.0.0
 SUMMARY    = Enhancements to distutils for building and distributing Python packages
THISAPP    = setuptools-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 51b3435a1d7962a06f7cf07c31487a1404274a54a1fae0567c3953686cbf3b3160327a56c599e80ce70fe8f56dc817fc76d0e4371d3622b5c6235b0fdc555980
+$(DL_FILE)_BLAKE2 = 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63
install : $(TARGET)
diff --git a/lfs/python3-setuptools-rust b/lfs/python3-setuptools-rust
index 8d8b2cc4b..4bf85961c 100644
--- a/lfs/python3-setuptools-rust
+++ b/lfs/python3-setuptools-rust
@@ -24,7 +24,7 @@
include Config
-VER        = 1.1.2
+VER        = 1.2.0
THISAPP    = setuptools-rust-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2b66f886db4be992be5f910cd56d1449f0f23d306880755692a53216e6c764bc6ec34e552f5485f444408421ccaeb8cc353d5553cf8a95a1a4daa815f5600167
+$(DL_FILE)_BLAKE2 = 9028e3c02cf1090aaba5c78495d01eb01d3608242ab6b3fab2b76928e199a93bad2e1dbcd94d24689c7d42160c4dd409656f230493801906fc15f4235de7b68c
install : $(TARGET)
diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm
index 8e29b2798..561138c0a 100644
--- a/lfs/python3-setuptools-scm
+++ b/lfs/python3-setuptools-scm
@@ -24,7 +24,7 @@
include Config
-VER        = 6.3.2
+VER        = 6.4.2
 SUMMARY    = Python setuptools handler for SCM tags
THISAPP    = setuptools_scm-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools-scm
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343
+$(DL_FILE)_BLAKE2 = e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439
install : $(TARGET)
diff --git a/lfs/python3-tomli b/lfs/python3-tomli
index bfa6e0a3a..d543b69b9 100644
--- a/lfs/python3-tomli
+++ b/lfs/python3-tomli
@@ -24,7 +24,7 @@
include Config
-VER        = 2.0.0
+VER        = 2.0.1
THISAPP    = tomli-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-tomli
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b3b17674ed08250e85b3b3b4e57364f201f3c795b6792155a220af5c682eede584aaac02159b5829b70ad7c196036e94d0db1983c7c581b67c574d392026234f
+$(DL_FILE)_BLAKE2 = e0e8b6e73ab39fcc6ec7a29cd4368d66b997e4c48b98a38d43ba813e841f33fef305028425474f67aee931118bbf2f05c147b65af729c34d67834802b6a42ad8
install : $(TARGET)
diff --git a/lfs/python3-typing-extensions b/lfs/python3-typing-extensions
index a7686547a..c3b306097 100644
--- a/lfs/python3-typing-extensions
+++ b/lfs/python3-typing-extensions
@@ -24,7 +24,7 @@
include Config
-VER        = 4.0.1
+VER        = 4.1.1
THISAPP    = typing_extensions-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-typing-extensions
-PAK_VER    = 1
+PAK_VER    = 2
###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 66fb0fdb73d434333347b953b6ffb982247f3869a4678f6f6ac6a95cec51bccd2d1109d6e9d9f611786bd3ef144175a1b21a43b5346d5a88c1eb99ad31246528
+$(DL_FILE)_BLAKE2 = 18953565f4181d648faf780db8594963813d0b26d479e5235cd75d262490b479e957f55734bb6d6d22c31fe2ccec1ac5490e7a64a469528d386e5de2751c6b1a
install : $(TARGET)
diff --git a/lfs/python3-urllib3 b/lfs/python3-urllib3
index ec43d9cd3..411a52b8d 100644
--- a/lfs/python3-urllib3
+++ b/lfs/python3-urllib3
@@ -24,7 +24,7 @@
include Config
-VER        = 1.26.7
+VER        = 1.26.9
 SUMMARY   = HTTP library with thread-safe connection pooling, file post, and more
THISAPP    = urllib3-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-urllib3
-PAK_VER    = 2
+PAK_VER    = 3
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5a95ea4df2e5a66ac7f3059b5453e122ae0e40531a23cb743e5a9574778a370d0cee3cb63fe6b29483b27c4a6ec498266ec5a0434db882ce0a79fb8d8400e08d
+$(DL_FILE)_BLAKE2 = 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f
install : $(TARGET)
diff --git a/lfs/rsync b/lfs/rsync
index 7422a5d13..f40c28ce2 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Versatile tool for fast incremental file transfer
-VER        = 3.2.3
+VER        = 3.2.4
THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 13
+PAK_VER    = 14
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25
+$(DL_FILE)_BLAKE2 = a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80
install : $(TARGET)
diff --git a/lfs/samba b/lfs/samba
index 84800c4dd..97fe96918 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER        = 4.15.5
+VER        = 4.16.0
 SUMMARY    = A SMB/CIFS File, Print, and Authentication Server
THISAPP    = samba-$(VER)
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 83
+PAK_VER    = 84
-DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
+DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp perl-JSON
SERVICES   = samba
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 355970b9918e95f925636cdea919e123b072f8710134fe6310637c29b2b5e1bc55d7b66d9674a68408ce5f14545a2cb9a94f596f90204935addb2f8f6a503873
+$(DL_FILE)_BLAKE2 = 6ea27634690d00779ec7f671e48b17246285c9576221d9b9b3f9238cd72310e8aaaeb646031212e65c239d2e959deef7bd9739932db0c716b7ea79cc11f2f7b8
install : $(TARGET)
diff --git a/lfs/sarg b/lfs/sarg
index b75d185ed..d38933fb0 100644
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       =
diff --git a/lfs/sdl2 b/lfs/sdl2
index fb9bee353..0e1d70950 100644
--- a/lfs/sdl2
+++ b/lfs/sdl2
@@ -24,7 +24,7 @@
include Config
-VER        = 2.0.20
+VER        = 2.0.22
 SUMMARY    = Simple DirectMedia Layer Library
THISAPP    = SDL2-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sdl2
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       = alsa
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623
+$(DL_FILE)_BLAKE2 = 7f8b3efa709a0514f6a76df4ffc8b756d287d1e372ed107d0525a22cb5e6a168709136d375b6708b2073a76dd30d1bf06203d2c5c3eb2990e80519c7d1558df5
install : $(TARGET)
diff --git a/lfs/setup b/lfs/setup
index 5779406ef..82286d6a0 100644
--- a/lfs/setup
+++ b/lfs/setup
@@ -58,5 +58,9 @@ $(TARGET) :
    	--with-config-root="$(CONFIG_ROOT)"
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
+
+	# Fix file permissions of /etc/sudoers.d/setup
+	chmod 640 /etc/sudoers.d/setup
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker
index ac798e77f..bfb429363 100644
--- a/lfs/spectre-meltdown-checker
+++ b/lfs/spectre-meltdown-checker
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Spectre & Meltdown Vulnerability Checker
-VER        = 0.44
+VER        = 0.45
THISAPP    = spectre-meltdown-checker-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spectre-meltdown-checker
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 120c7a6fd9e4df27daf605f8c9d62fb999f164578c02499651d19e48ca9af88fbc09338f85b6e05a2b139ac7d83193768f337651e276af7099fdee22bf1c5354
+$(DL_FILE)_BLAKE2 = 14d49f40458167ab9af04cc31c9a0b9f8cb5f1e9417f5ac0bab0290be01cf14a737c716d8d28873fee1870535c0b36a56dac2d39f2cc7a000d27f0643a94cff7
install : $(TARGET)
diff --git a/lfs/sqlite b/lfs/sqlite
index 7986b2ce5..076943280 100644
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -24,7 +24,7 @@
include Config
-VER        = 3380000
+VER        = 3380300
THISAPP    = sqlite-autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0b4eff73e9a7b317d080439c9e74b47a09e8809d4629a2ee31d410df2ce626d6bd6e9c5bdc5d0d4f104d981ee7b3a8a31bf2d7153932ad866f5e876c1608f6da
+$(DL_FILE)_BLAKE2 = 35271246a27597ce88b4eaa1ff483b42421371737b5fe357eb6d2ad1d9c543b2d60341f7ee63f7dc95e374f61c539a607472b53881027c843b0da07704dd200f
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid
index ceaddac86..7b77e568f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
include Config
-VER        = 5.4.1
+VER        = 5.5
THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8
+$(DL_FILE)_BLAKE2 = aef52ba0b47098f823d3f2bbe55e015c12b853bcc0a414bc94a4103009a05fee2c33263b8ade9b31cd22068e964d7f37fc0a497877d26ff836bc2193a6d0e8fc
install : $(TARGET)
diff --git a/lfs/strace b/lfs/strace
index 6202d78c1..4c6c12a14 100644
--- a/lfs/strace
+++ b/lfs/strace
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A utility to trace the system calls of a program
-VER        = 5.14
+VER        = 5.17
 SUP_ARCHES = x86_64 armv6l aarch64
THISAPP    = strace-$(VER)
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = strace
-PAK_VER    = 6
+PAK_VER    = 7
DEPS       = elfutils
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f
+$(DL_FILE)_BLAKE2 = 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec
install : $(TARGET)
diff --git a/lfs/stress b/lfs/stress
index 808575af5..52860f078 100644
--- a/lfs/stress
+++ b/lfs/stress
@@ -11,7 +11,7 @@ include Config
SUMMARY    = Tool to load and stress a computer
-VER        = 1.0.4
+VER        = 1.0.5
THISAPP    = stress-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -19,7 +19,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stress
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       =
@@ -33,7 +33,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = dcda33bec9b2228e93b6e9e33fc6238554b04036bd7478df6580f54557d639ab4a28fb820766f386e7d3d6338452dae7ee4b649554df2313bea80dfbb23653cf
+$(DL_FILE)_BLAKE2 = 7bc4a1d7739828ccd4b58c814e8ded42cddbd0b226bb29e916fe220835bcfa9dcdb86191bb321247aa98bd0e58791556713770bdeda5dad399aa61f2703a766c
install : $(TARGET)
@@ -66,6 +66,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./autogen.sh
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/stunnel b/lfs/stunnel
index 70755f7db..cddfa947b 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -24,7 +24,7 @@
include Config
-VER        = 5.62
+VER        = 5.63
 SUMMARY    = Universal TLS Tunnel
THISAPP    = stunnel-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stunnel
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1
+$(DL_FILE)_BLAKE2 = 4558f233bae0972853239b4ad8638cbf8402baf221c8b65f0b8857c624735430ed026fa4cfac8212e60737f1f522e38898da5056a66e3374509886b02068e1db
install : $(TARGET)
diff --git a/lfs/suricata b/lfs/suricata
index 80e0923d3..1ebcb4ba4 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 5.0.8
+VER        = 5.0.9
THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5c13aea176b6666477c620d1ed294310ee84ec706abbc740a23d66722297c09b61f253bbe17700cd58f8ce439987c9b13f312aba37d911b6522e4848e7c1b0cd
+$(DL_FILE)_BLAKE2 = 02ab99585233a47b1577e55060ba1141c339718e5bd39b6f4d38bb9384fd459aae353f313083048128507f9023a8bcfea3e5a5bcc9ea0c75cfc9c288ca9db6b6
install : $(TARGET)
@@ -70,9 +70,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-disable-sid-2210059.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disable-sid-2210059.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
    cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
    	--prefix=/usr \
    	--sysconfdir=/etc \
@@ -98,15 +98,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    # Install IPFire related config file.
    install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
-	# Install yaml file for loading default rules.
-	install -m 0664 $(DIR_SRC)/config/suricata/suricata-default-rules.yaml /var/ipfire/suricata
-
-	# Set correct ownership for the default rules file.
-	chown nobody:nobody /var/ipfire/suricata/suricata-default-rules.yaml
-
    # Create emtpy rules directory.
    -mkdir -p /var/lib/suricata
+	# Create empty cache directory.
+	-mkdir -p /var/cache/suricata
+
    # Move config files for references, threshold and classification
    # to the rules directory.
    rm -rfv /etc/suricata/*.config
@@ -115,15 +112,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    # (File has to be writeable for the nobody user)
    chown nobody:nobody /usr/share/suricata/classification.config
+	# Create empty threshold config file.
+	touch /usr/share/suricata/threshold.config
+
+	# Set correct ownership for the threshold.config file.
+	chown nobody:nobody /usr/share/suricata/threshold.config
+
    # Set correct ownership for /var/lib/suricata and the
    # contained files
    chown -R nobody:nobody /var/lib/suricata
+	# Set correct ownership for the cache directory.
+	chown nobody:nobody /var/cache/suricata
+
    # Create logging directory.
    -mkdir -p /var/log/suricata
# Set correct ownership for /var/log/suricata.
    chown suricata:suricata /var/log/suricata
+	# Install converter script needed for Core Update 167
+	install -m 0755 $(DIR_SRC)/config/suricata/convert-ids-backend-files /usr/sbin/convert-ids-backend-files
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/tor b/lfs/tor
index 259b9564c..e6751fb84 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -26,7 +26,7 @@ include Config
SUMMARY    = Anonymizing overlay network for TCP (The onion router)
-VER        = 0.4.6.10
+VER        = 0.4.7.7
THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 68
+PAK_VER    = 69
DEPS       = libseccomp
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4bdf8ab8ac992866ffc18711de0ad9e19b496398dfdace4d3902273822666dcfda3acd825ee22251cd8d671ff563702c6f24fe8670719a2c75d144cfe9219f68
+$(DL_FILE)_BLAKE2 = 18acfbe017b2ad456184f6031881149717f6fecad0d3e6daf90241a5a8ef296c32a36ace266d38b703f34b66d71e282c803f03f2059502c6ff6f4fdfb6641a97
install : $(TARGET)
diff --git a/lfs/tshark b/lfs/tshark
index be732c97e..eb89f7474 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -26,7 +26,7 @@ include Config
SUMMARY    = A Network Traffic Analyser
-VER        = 3.4.7
+VER        = 3.6.3
THISAPP    = wireshark-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
 DEPS       = krb5 c-ares
-PAK_VER    = 11
+PAK_VER    = 12
SERVICES   =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5
+$(DL_FILE)_BLAKE2 = 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
install : $(TARGET)
diff --git a/lfs/vnstat b/lfs/vnstat
index e4859be0b..a7b28f3fd 100644
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 2.7
+VER        = 2.9
THISAPP    = vnstat-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3
+$(DL_FILE)_BLAKE2 = 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a
install : $(TARGET)
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make all $(MAKETUNING)		LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
    cd $(DIR_APP) && make install
+	sed -i 's|^;||g' /etc/vnstat.conf
    sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf
    sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf
    sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf
diff --git a/lfs/whois b/lfs/whois
index 5dee31d4a..19989af36 100644
--- a/lfs/whois
+++ b/lfs/whois
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 5.5.10
+VER        = 5.5.13
THISAPP    = whois_$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f3a2c6d0f46f2091ce8e201a1a670d144b4707cd6928a80da76c6b302fb105dab11d7bf90ac8473d40c0da0ad709956ab3d4b9a2db861b7111603b6037593cf3
+$(DL_FILE)_BLAKE2 = 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5
install : $(TARGET)
diff --git a/lfs/wio b/lfs/wio
index a87fa635e..be80cef22 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -1,6 +1,21 @@
 ###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) 2007-2021  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
 ###############################################################################
###############################################################################
@@ -17,7 +32,7 @@ THISAPP    = wio-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wio
-PAK_VER    = 14
+PAK_VER    = 15
DEPS       =
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index c44f2b5f5..63566c1a7 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -113,7 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(call INSTALL_INITSCRIPTS,$(SERVICES))
# Install sudoers include file
-	install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \
+	install -v -m 640 $(DIR_SRC)/config/zabbix_agentd/sudoers \
    	/etc/sudoers.d/zabbix
# Install include file for backup
diff --git a/make.sh b/make.sh
index 95e6e89db..3ed9190b9 100755
--- a/make.sh
+++ b/make.sh
@@ -23,7 +23,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.27"							# Version number
-CORE="167"							# Core Level (Filename)
+CORE="168"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 MAX_RETRIES=1							# prefetch/check loop
@@ -1127,6 +1127,7 @@ buildbase() {
    lfsmake2 pkg-config
    lfsmake2 procps
    lfsmake2 make
+	lfsmake2 libpipeline
    lfsmake2 man
    lfsmake2 net-tools
    lfsmake2 patch
@@ -1155,7 +1156,6 @@ buildipfire() {
   lfsmake2 popt
   lfsmake2 libedit
   lfsmake2 libusb
-  lfsmake2 libusb-compat
   lfsmake2 libpcap
   lfsmake2 ppp
   lfsmake2 pptp
@@ -1204,7 +1204,6 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 json-c
   lfsmake2 libconfig
-  lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
   lfsmake2 apr
@@ -1318,7 +1317,6 @@ buildipfire() {
   lfsmake2 ca-certificates
   lfsmake2 fireinfo
   lfsmake2 libnet
-  lfsmake2 libnl
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
@@ -1331,7 +1329,6 @@ buildipfire() {
   lfsmake2 libexif
   lfsmake2 libpng
   lfsmake2 libtiff
-  lfsmake2 libart
   lfsmake2 gd
   lfsmake2 slang
   lfsmake2 newt
@@ -1379,7 +1376,6 @@ buildipfire() {
   lfsmake2 perl-HTTP-Date
   lfsmake2 gnupg
   lfsmake2 hdparm
-  lfsmake2 sdparm
   lfsmake2 whatmask
   lfsmake2 libtirpc
   lfsmake2 conntrack-tools
@@ -1421,6 +1417,7 @@ buildipfire() {
   lfsmake2 perl-XML-Parser
   lfsmake2 perl-Crypt-PasswdMD5
   lfsmake2 perl-Net-Telnet
+  lfsmake2 perl-JSON
   lfsmake2 python3-setuptools
   lfsmake2 python3-inotify
   lfsmake2 python3-docutils
@@ -1439,7 +1436,6 @@ buildipfire() {
   lfsmake2 pango
   lfsmake2 rrdtool
   lfsmake2 setup
-  lfsmake2 libdnet
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
@@ -1447,7 +1443,6 @@ buildipfire() {
   lfsmake2 ragel
   lfsmake2 hyperscan
   lfsmake2 suricata
-  lfsmake2 oinkmaster
   lfsmake2 ids-ruleset-sources
   lfsmake2 squid
   lfsmake2 squidguard
@@ -1537,7 +1532,6 @@ buildipfire() {
   lfsmake2 libusbredir
   lfsmake2 libseccomp
   lfsmake2 qemu
-  lfsmake2 netpbm
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
@@ -1553,6 +1547,7 @@ buildipfire() {
   lfsmake2 vdr_dvbapi
   lfsmake2 vdr_eepg
   lfsmake2 w_scan
+  lfsmake2 fmt
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
@@ -1592,7 +1587,6 @@ buildipfire() {
   lfsmake2 monit
   lfsmake2 nut
   lfsmake2 watchdog
-  lfsmake2 libpri
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree
@@ -1605,7 +1599,6 @@ buildipfire() {
   lfsmake2 u-boot
   lfsmake2 u-boot-friendlyarm
   lfsmake2 wireless-regdb
-  lfsmake2 libsolv
   lfsmake2 ddns
   lfsmake2 python3-pycparser
   lfsmake2 python3-charset-normalizer
@@ -1641,6 +1634,7 @@ buildipfire() {
   lfsmake2 python3-click
   lfsmake2 python3-arrow
   lfsmake2 python3-terminaltables
+  lfsmake2 python3-pkgconfig
   lfsmake2 aws-cli
   lfsmake2 oci-python-sdk
   lfsmake2 oci-cli
@@ -1677,7 +1671,6 @@ buildipfire() {
   lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
   lfsmake2 proxy-accounting
-  lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
   lfsmake2 lua
diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any
index 0facf23d8..15197badb 100644
--- a/src/initscripts/networking/any
+++ b/src/initscripts/networking/any
@@ -83,9 +83,6 @@ case "${1}" in
    		fi
    	fi
-		# Create & Enable vnstat data collection
-		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
    	if [ ! "${ADDRESS}" == "1.1.1.1" ]; then
    		boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
    		ip addr add ${args} dev ${DEVICE}
@@ -100,8 +97,6 @@ case "${1}" in
    		evaluate_retval
    	fi
-		# Disable vnstat collection
-		/usr/bin/vnstat -u -i ${DEVICE}	-r --disable > /dev/null 2>&1
    	exit 0;
    	;;
 esac
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 38129deeb..fc10e077a 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -103,9 +103,6 @@ case "${1}" in
    		fi
    	fi
-		## Create & Enable vnstat
-		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
    	if [ "${TYPE}" == "STATIC" ]; then
    		# Set the MTU
    		if [ -n "${MTU}" ]; then
@@ -176,9 +173,6 @@ case "${1}" in
    			dhcpcd_start "${DEVICE}"
    		fi
-			## Create & Enable vnstat
-			/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
-
    	elif [ "$TYPE" == "PPPOE" ]; then
if ( ps ax | grep -q [p]ppd ); then 
@@ -459,8 +453,7 @@ case "${1}" in
    			evaluate_retval
    			# echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC
    		fi
-			## Create & Enable vnstat
-			/usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
+
    		/etc/rc.d/init.d/connectd start
    		# Add a NaN value to ppp0 rrd to supress spikes at reconnect
    		rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \
@@ -485,8 +478,6 @@ case "${1}" in
elif [ "$TYPE" == "PPPOE" ]; then
    		boot_mesg "Bringing down the PPP interface ..."
-			## Disable vnstat collection
-			/usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
    		rm -f /var/ipfire/red/keepconnected
    		killall -w -s TERM /usr/sbin/pppd 2>/dev/null
    		evaluate_retval
@@ -533,9 +524,6 @@ case "${1}" in
    	killall -w -s KILL pptp >/dev/null 2>&1
    	killall -w -s KILL br2684ctl >/dev/null 2>&1
-		## Disable vnstat collection
-		/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
-
    	exit 0;
    	;;
 esac
diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh
index b3f0f1368..cc5866971 100644
--- a/src/paks/cups/install.sh
+++ b/src/paks/cups/install.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+restore_backup "${NAME}"
 /etc/init.d/messagebus reload
 start_service --delay 300 --background ${NAME}
 ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups
diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh
index 01b13de76..d4abdde63 100644
--- a/src/paks/cups/uninstall.sh
+++ b/src/paks/cups/uninstall.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+make_backup "${NAME}"
 remove_files
 rm -rf /etc/rc.d/rc*.d/*cups
 /etc/init.d/messagebus reload
diff --git a/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch b/src/patches/logwatch/logwatch-7.6-disable_iptables.patch
similarity index 80%
rename from src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
rename to src/patches/logwatch/logwatch-7.6-disable_iptables.patch
index 8ad0c3b3d..99c5b493b 100644
--- a/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
+++ b/src/patches/logwatch/logwatch-7.6-disable_iptables.patch
@@ -1,7 +1,7 @@
 diff -U 3 a/conf/logwatch.conf b/conf/logwatch.conf
---- a/conf/logwatch.conf	Thu Sep 19 01:58:55 2019
-+++ b/conf/logwatch.conf	Thu Nov 26 18:46:12 2020
-@@ -94,6 +94,10 @@
+--- a/conf/logwatch.conf	Sat Jan 22 01:00:00 2022
++++ b/conf/logwatch.conf	Sun Apr 10 10:33:20 2022
+@@ -96,6 +96,10 @@
                              # prints useful system configuration info.
  Service = "-eximstats"      # Prevents execution of eximstats service, which
                              # is a wrapper for the eximstats program.
diff --git a/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch b/src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
similarity index 56%
rename from src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
rename to src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
index b7034077b..af792250f 100644
--- a/src/patches/logwatch/logwatch-7.5.5-enable-mdadm-sudo.patch
+++ b/src/patches/logwatch/logwatch-7.6-enable-mdadm-sudo.patch
@@ -1,6 +1,6 @@
-diff -Naur logwatch-7.5.5-orig/conf/services/mdadm.conf logwatch-7.5.5/conf/services/mdadm.conf
---- logwatch-7.5.5-orig/conf/services/mdadm.conf	2021-01-22 21:59:40.000000000 +0100
-+++ logwatch-7.5.5/conf/services/mdadm.conf	2021-10-04 13:52:30.850057355 +0200
+diff -U 3 a/conf/services/mdadm.conf b/conf/services/mdadm.conf
+--- a/conf/services/mdadm.conf	Sat Jan 22 01:00:00 2022
++++ b/conf/services/mdadm.conf	Sun Apr 10 10:48:21 2022
 @@ -13,7 +13,7 @@
  # Logwatch will try to find md devices in /etc/mdadm.conf or 
  # /etc/mdadm/mdadm.conf. If none of these files exist it can scan actively
@@ -10,19 +10,19 @@ diff -Naur logwatch-7.5.5-orig/conf/services/mdadm.conf logwatch-7.5.5/conf/serv
# Logwatch will emit an error for md devices listed in /etc/mdadm.conf
  # that are not present.  If you do not want this (e.g. raid devices may come
-diff -Naur logwatch-7.5.5-orig/scripts/services/mdadm logwatch-7.5.5/scripts/services/mdadm
---- logwatch-7.5.5-orig/scripts/services/mdadm	2021-01-22 21:59:40.000000000 +0100
-+++ logwatch-7.5.5/scripts/services/mdadm	2021-10-06 11:41:14.800307603 +0200
-@@ -35,7 +35,7 @@
- } elsif ( -f "/etc/mdadm/mdadm.conf" ) {
-   open(MDADM,"< /etc/mdadm/mdadm.conf");
- } elsif ($enable_scan) {
--  open(MDADM,"mdadm --detail --scan 2>/dev/null|");
-+  open(MDADM,"sudo mdadm --detail --scan 2>/dev/null|");
- }
- while (<MDADM>) {
-   if (/^ARRAY/) {
-@@ -51,7 +51,7 @@
+diff -U 3 a/scripts/services/mdadm b/scripts/services/mdadm
+--- a/scripts/services/mdadm	Sat Jan 22 01:00:00 2022
++++ b/scripts/services/mdadm	Sun Apr 10 10:38:19 2022
+@@ -36,7 +36,7 @@
+ if (
+     open($mdadm, "<", "/etc/mdadm.conf") or
+     open($mdadm, "<", "/etc/mdadm/mdadm.conf") or
+-    open($mdadm, "<", "mdadm --detail --scan 2>/dev/null|")) {
++    open($mdadm, "<", "sudo mdadm --detail --scan 2>/dev/null|")) {
+    while (<$mdadm>) {
+        if (/^ARRAY/) {
+          push(@devices,(split())[1]);
+@@ -52,7 +52,7 @@
      next;
    }
@@ -31,7 +31,7 @@ diff -Naur logwatch-7.5.5-orig/scripts/services/mdadm logwatch-7.5.5/scripts/ser
    while (<MDADM>) {
      if ($_ =~ /cannot open .*: No such file or directory/) {
        print $_ unless $ignore_missing;
-@@ -74,7 +74,11 @@
+@@ -75,7 +75,11 @@
if ($Detail <= 4) {
      if (lc($mdhash{'state'}) =~ /clean|active/) {
diff --git a/src/patches/mcelog-181-fix-Python-call.patch b/src/patches/mcelog-181-fix-Python-call.patch
new file mode 100644
index 000000000..b0781f828
--- /dev/null
+++ b/src/patches/mcelog-181-fix-Python-call.patch
@@ -0,0 +1,8 @@
+--- mcelog-181.orig/genconfig.py	2022-04-23 14:54:26.721031777 +0000
++++ mcelog-181/genconfig.py	2022-04-23 14:54:35.577658935 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # generate man config documentation from mcelog.conf example
+ # genconfig.py mcelog.conf intro.html
+ from __future__ import print_function
diff --git a/src/patches/minidlna-1.3.0-fix-DNS-rebinding-issue-CVE-2022-26505.patch b/src/patches/minidlna-1.3.0-fix-DNS-rebinding-issue-CVE-2022-26505.patch
new file mode 100644
index 000000000..c28425811
--- /dev/null
+++ b/src/patches/minidlna-1.3.0-fix-DNS-rebinding-issue-CVE-2022-26505.patch
@@ -0,0 +1,44 @@
+--- minidlna-1.3.0/upnphttp.c.orig	2020-11-24 19:53:50.000000000 +0100
++++ minidlna-1.3.0/upnphttp.c	2022-04-30 12:59:23.432073807 +0200
+@@ -273,6 +273,11 @@
+ 				p = colon + 1;
+ 				while(isspace(*p))
+ 					p++;
++				    n = 0;
++				    while(p[n] >= ' ')
++					    n++;
++				    h->req_Host = p;
++				    h->req_HostLen = n;					
+ 				for(n = 0; n < n_lan_addr; n++)
+ 				{
+ 					for(i = 0; lan_addr[n].str[i]; i++)
+@@ -909,6 +914,18 @@
+ 	}
+ 
+ 	DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf);
++	if(h->req_Host && h->req_HostLen > 0) {
++		const char *ptr = h->req_Host;
++		DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host);
++		for(i = 0; i < h->req_HostLen; i++) {
++			if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) {
++				DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host);
++				Send404(h);/* 403 */
++				return;
++			}
++			ptr++;
++		}
++	}	
+ 	if(strcmp("POST", HttpCommand) == 0)
+ 	{
+ 		h->req_command = EPost;
+--- minidlna-1.3.0/upnphttp.h.orig	2020-11-24 19:53:50.000000000 +0100
++++ minidlna-1.3.0/upnphttp.h	2022-04-30 13:00:22.619152312 +0200
+@@ -89,6 +89,8 @@
+ 	struct client_cache_s * req_client;
+ 	const char * req_soapAction;
+ 	int req_soapActionLen;
++	const char * req_Host;        /* Host: header */
++	int req_HostLen;
+ 	const char * req_Callback;	/* For SUBSCRIBE */
+ 	int req_CallbackLen;
+ 	const char * req_NT;
diff --git a/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch b/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
new file mode 100644
index 000000000..3ecb16f1b
--- /dev/null
+++ b/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch
@@ -0,0 +1,2976 @@
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:40:40.079363480 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:40:40.119363040 +0000
+@@ -0,0 +1 @@
++decimal128-conv
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2020-07-10 11:52:33.000000000 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:40:40.119363040 +0000
+@@ -1 +1 @@
+-4.1.0
++4.1.0-p1
+diff -Naurd mpfr-4.1.0-a/src/get_d128.c mpfr-4.1.0-b/src/get_d128.c
+--- mpfr-4.1.0-a/src/get_d128.c	2020-04-08 22:39:35.000000000 +0000
++++ mpfr-4.1.0-b/src/get_d128.c	2021-02-11 12:40:40.103363216 +0000
+@@ -40,22 +40,21 @@
+ static _Decimal128
+ get_decimal128_nan (void)
+ {
+-  return (_Decimal128) MPFR_DBL_NAN;
++  return 0.0dl / 0.0dl;
+ }
+ 
+ /* construct the decimal128 Inf with given sign */
+ static _Decimal128
+ get_decimal128_inf (int negative)
+ {
+-  return (_Decimal128) (negative ? MPFR_DBL_INFM : MPFR_DBL_INFP);
++  return negative ? - 1.0dl / 0.0dl : 1.0dl / 0.0dl;
+ }
+ 
+ /* construct the decimal128 zero with given sign */
+ static _Decimal128
+ get_decimal128_zero (int negative)
+ {
+-  _Decimal128 zero = 0;
+-  return (_Decimal128) (negative ? -zero : zero);
++  return negative ? - 0.0dl : 0.0dl;
+ }
+ 
+ /* construct the decimal128 smallest non-zero with given sign:
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2020-07-10 11:52:33.000000000 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:40:40.115363084 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0"
++#define MPFR_VERSION_STRING "4.1.0-p1"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2020-07-10 11:52:33.000000000 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:40:40.119363040 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0";
++  return "4.1.0-p1";
+ }
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:43:51.761257868 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:43:51.801257430 +0000
+@@ -0,0 +1 @@
++random_deviate
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:40:40.119363040 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:43:51.801257430 +0000
+@@ -1 +1 @@
+-4.1.0-p1
++4.1.0-p2
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:40:40.115363084 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:43:51.801257430 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p1"
++#define MPFR_VERSION_STRING "4.1.0-p2"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
+--- mpfr-4.1.0-a/src/random_deviate.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/random_deviate.c	2021-02-11 12:43:51.789257562 +0000
+@@ -289,6 +289,7 @@
+   mpfr_random_size_t p = mpfr_get_prec (z); /* Number of bits in result */
+   mpz_t t;
+   int inex;
++  mpfr_exp_t negxe;
+ 
+   if (n == 0)
+     {
+@@ -370,14 +371,22 @@
+   mpz_setbit (t, 0);     /* Set the trailing bit so result is always inexact */
+   if (neg)
+     mpz_neg (t, t);
+-  /* Is -x->e representable as a mpfr_exp_t? */
+-  MPFR_ASSERTN (x->e <= (mpfr_uexp_t)(-1) >> 1);
++  /* Portable version of the negation of x->e, with a check of overflow. */
++  if (MPFR_UNLIKELY (x->e > MPFR_EXP_MAX))
++    {
++      /* Overflow, except when x->e = MPFR_EXP_MAX + 1 = - MPFR_EXP_MIN. */
++      MPFR_ASSERTN (MPFR_EXP_MIN + MPFR_EXP_MAX == -1 &&
++                    x->e == (mpfr_random_size_t) MPFR_EXP_MAX + 1);
++      negxe = MPFR_EXP_MIN;
++    }
++  else
++    negxe = - (mpfr_exp_t) x->e;
+   /*
+    * Let mpfr_set_z_2exp do all the work of rounding to the requested
+    * precision, setting overflow/underflow flags, and returning the right
+    * inexact value.
+    */
+-  inex = mpfr_set_z_2exp (z, t, -x->e, rnd);
++  inex = mpfr_set_z_2exp (z, t, negxe, rnd);
+   mpz_clear (t);
+   return inex;
+ }
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:40:40.119363040 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:43:51.801257430 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p1";
++  return "4.1.0-p2";
+ }
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:46:49.075316772 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:46:49.115316335 +0000
+@@ -0,0 +1 @@
++set_z_2exp-overflow
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:43:51.801257430 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:46:49.115316335 +0000
+@@ -1 +1 @@
+-4.1.0-p2
++4.1.0-p3
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:43:51.801257430 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:46:49.115316335 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p2"
++#define MPFR_VERSION_STRING "4.1.0-p3"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/set_z_exp.c mpfr-4.1.0-b/src/set_z_exp.c
+--- mpfr-4.1.0-a/src/set_z_exp.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/set_z_exp.c	2021-02-11 12:46:49.103316466 +0000
+@@ -28,10 +28,11 @@
+ int
+ mpfr_set_z_2exp (mpfr_ptr f, mpz_srcptr z, mpfr_exp_t e, mpfr_rnd_t rnd_mode)
+ {
+-  mp_size_t fn, zn, dif, en;
++  mp_size_t fn, zn, dif;
+   int k, sign_z, inex;
+   mp_limb_t *fp, *zp;
+-  mpfr_exp_t exp;
++  mpfr_exp_t exp, nmax;
++  mpfr_uexp_t uexp;
+ 
+   sign_z = mpz_sgn (z);
+   if (MPFR_UNLIKELY (sign_z == 0)) /* ignore the exponent for 0 */
+@@ -43,10 +44,15 @@
+   MPFR_ASSERTD (sign_z == MPFR_SIGN_POS || sign_z == MPFR_SIGN_NEG);
+ 
+   zn = ABSIZ(z); /* limb size of z */
+-  /* compute en = floor(e/GMP_NUMB_BITS) */
+-  en = (e >= 0) ? e / GMP_NUMB_BITS : (e + 1) / GMP_NUMB_BITS - 1;
+   MPFR_ASSERTD (zn >= 1);
+-  if (MPFR_UNLIKELY (zn + en > MPFR_EMAX_MAX / GMP_NUMB_BITS + 1))
++  nmax = MPFR_EMAX_MAX / GMP_NUMB_BITS + 1;
++  /* Detect early overflow with zn + en > nmax,
++     where en = floor(e / GMP_NUMB_BITS).
++     This is checked without an integer overflow (even assuming some
++     future version of GMP, where limitations may be removed). */
++  if (MPFR_UNLIKELY (e >= 0 ?
++                     zn > nmax - e / GMP_NUMB_BITS :
++                     zn + (e + 1) / GMP_NUMB_BITS - 1 > nmax))
+     return mpfr_overflow (f, rnd_mode, sign_z);
+   /* because zn + en >= MPFR_EMAX_MAX / GMP_NUMB_BITS + 2
+      implies (zn + en) * GMP_NUMB_BITS >= MPFR_EMAX_MAX + GMP_NUMB_BITS + 1
+@@ -64,8 +70,21 @@
+      and exp = zn * GMP_NUMB_BITS + e - k
+              <= (zn + en) * GMP_NUMB_BITS - k + GMP_NUMB_BITS - 1
+              <= MPFR_EMAX_MAX + 2 * GMP_NUMB_BITS - 1 */
+-  exp = (mpfr_prec_t) zn * GMP_NUMB_BITS + e - k;
++  /* We need to compute exp = zn * GMP_NUMB_BITS + e - k with well-defined
++     operations (no integer overflows / no implementation-defined results).
++     The mathematical result of zn * GMP_NUMB_BITS may be larger than
++     the largest value of mpfr_exp_t while exp could still be less than
++     __gmpfr_emax. Thanks to early overflow detection, we can compute the
++     result in modular arithmetic, using mpfr_uexp_t, and convert it to
++     mpfr_exp_t. */
++  uexp = (mpfr_uexp_t) zn * GMP_NUMB_BITS + (mpfr_uexp_t) e - k;
++
++  /* Convert to signed in a portable way (see doc/README.dev).
++     On most platforms, this can be optimized to identity (no-op). */
++  exp = uexp > MPFR_EXP_MAX ? -1 - (mpfr_exp_t) ~uexp : (mpfr_exp_t) uexp;
++
+   /* The exponent will be exp or exp + 1 (due to rounding) */
++
+   if (MPFR_UNLIKELY (exp > __gmpfr_emax))
+     return mpfr_overflow (f, rnd_mode, sign_z);
+   if (MPFR_UNLIKELY (exp + 1 < __gmpfr_emin))
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:43:51.801257430 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:46:49.115316335 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p2";
++  return "4.1.0-p3";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tset_z_exp.c mpfr-4.1.0-b/tests/tset_z_exp.c
+--- mpfr-4.1.0-a/tests/tset_z_exp.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tset_z_exp.c	2021-02-11 12:46:49.103316466 +0000
+@@ -97,49 +97,149 @@
+    mpfr_get_si is a rather indirect test of a low level routine.  */
+ 
+ static void
+-check (long i, mpfr_rnd_t rnd)
++check (long i, mpfr_rnd_t rnd, int reduced)
+ {
+-  mpfr_t f;
++  mpfr_t f1, f2, f3;
+   mpz_t z;
+-  mpfr_exp_t e;
++  mpfr_exp_t e, old_emin, old_emax;
+   int inex;
++  mpfr_flags_t flags;
++
++  old_emin = mpfr_get_emin ();
++  old_emax = mpfr_get_emax ();
+ 
+   /* using CHAR_BIT * sizeof(long) bits of precision ensures that
+      mpfr_set_z_2exp is exact below */
+-  mpfr_init2 (f, CHAR_BIT * sizeof(long));
++  mpfr_inits2 (CHAR_BIT * sizeof(long), f1, f2, f3, (mpfr_ptr) 0);
+   mpz_init (z);
+   mpz_set_ui (z, i);
+   /* the following loop ensures that no overflow occurs */
+   do
+     e = randexp ();
+   while (e > mpfr_get_emax () - CHAR_BIT * sizeof(long));
+-  inex = mpfr_set_z_2exp (f, z, e, rnd);
+-  if (inex != 0)
++
++  mpfr_clear_flags ();
++  inex = mpfr_set_z_2exp (f1, z, e, rnd);
++  flags = __gmpfr_flags;
++
++  if (inex != 0 || flags != 0 ||
++      (mpfr_div_2si (f2, f1, e, rnd), mpfr_get_si (f2, MPFR_RNDZ) != i))
+     {
+-      printf ("Error in mpfr_set_z_2exp for i=%ld, e=%ld,"
+-              " wrong ternary value\n", i, (long) e);
+-      printf ("expected 0, got %d\n", inex);
++      printf ("Error in mpfr_set_z_2exp for i=%ld e=%" MPFR_EXP_FSPEC
++              "d rnd_mode=%d\n", i, (mpfr_eexp_t) e, rnd);
++      mpfr_set_si_2exp (f2, i, e, MPFR_RNDN);
++      printf ("expected "); mpfr_dump (f2);
++      printf ("with inex = %d and flags =", 0);
++      flags_out (0);
++      printf ("got      "); mpfr_dump (f1);
++      printf ("with inex = %d and flags =", inex);
++      flags_out (flags);
+       exit (1);
+     }
+-  mpfr_div_2si (f, f, e, rnd);
+-  if (mpfr_get_si (f, MPFR_RNDZ) != i)
++
++  if (reduced)
+     {
+-      printf ("Error in mpfr_set_z_2exp for i=%ld e=", i);
+-      if (e < LONG_MIN)
+-        printf ("(<LONG_MIN)");
+-      else if (e > LONG_MAX)
+-        printf ("(>LONG_MAX)");
+-      else
+-        printf ("%ld", (long) e);
+-      printf (" rnd_mode=%d\n", rnd);
+-      printf ("expected %ld\n", i);
+-      printf ("got      "); mpfr_dump (f);
+-      exit (1);
++      mpfr_exp_t ef, emin, emax;
++      int inex2, inex3;
++      mpfr_flags_t flags2, flags3;
++
++      ef = i == 0 ? 0 : mpfr_get_exp (f1);
++      for (emin = ef - 2; emin <= ef + 2; emin++)
++        for (emax = emin; emax <= ef + 2; emax++)
++          {
++            inex3 = mpfr_set (f3, f1, rnd);
++            MPFR_ASSERTN (inex3 == 0);
++            mpfr_set_emin (emin);
++            mpfr_set_emax (emax);
++            mpfr_clear_flags ();
++            inex2 = mpfr_set_z_2exp (f2, z, e, rnd);
++            flags2 = __gmpfr_flags;
++            mpfr_clear_flags ();
++            inex3 = mpfr_check_range (f3, 0, rnd);
++            flags3 = __gmpfr_flags;
++            if (!(mpfr_equal_p (f2, f3) &&
++                  SAME_SIGN (inex2, inex3) &&
++                  flags2 == flags3))
++              {
++                printf ("Error in mpfr_set_z_2exp for i=%ld e=%"
++                        MPFR_EXP_FSPEC "d rnd_mode=%d\nand emin=%"
++                        MPFR_EXP_FSPEC "d emax=%" MPFR_EXP_FSPEC
++                        "d\n", i, (mpfr_eexp_t) e, rnd,
++                        (mpfr_eexp_t) emin, (mpfr_eexp_t) emax);
++                printf ("expected "); mpfr_dump (f3);
++                printf ("with inex = %d and flags =", inex3);
++                flags_out (flags3);
++                printf ("got      "); mpfr_dump (f2);
++                printf ("with inex = %d and flags =", inex2);
++                flags_out (flags2);
++                exit (1);
++              }
++          }
++      mpfr_set_emin (old_emin);
++      mpfr_set_emax (old_emax);
+     }
+-  mpfr_clear (f);
++
++  mpfr_clears (f1, f2, f3, (mpfr_ptr) 0);
+   mpz_clear (z);
+ }
+ 
++static void
++check_huge (void)
++{
++  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
++    {
++      mpfr_t x;
++      mpz_t z;
++      long e;
++
++      /* Increase tests_memory_limit to the maximum in order to avoid
++         an obvious failure due to insufficient memory. */
++      tests_memory_limit = (size_t) -1;  /* no memory limit */
++
++      mpfr_init2 (x, 32);
++
++      /* In r14140, with a 32-bit ABI (GCC's -m32):
++         - With UBsan (-fsanitize=undefined -fno-sanitize-recover),
++           this fails with:
++             set_z_2exp.c:71:26: runtime error: signed integer overflow:
++             67108864 * 32 cannot be represented in type 'long int'
++         - With -D_MPFR_EXP_FORMAT=4, this fails with:
++             Expected 0.10001000000000000000000000000000E5
++             Got      0
++      */
++      mpz_init_set_ui (z, 17);
++      e = 0x7ffffff0;
++      mpz_mul_2exp (z, z, e);
++      mpz_add_ui (z, z, 1);
++      mpfr_set_z_2exp (x, z, -e, MPFR_RNDN);
++      if (mpfr_cmp_ui0 (x, 17) != 0)
++        {
++          printf ("Error 1 in check_huge\n");
++          printf ("Expected 0.10001000000000000000000000000000E5\n");
++          printf ("Got      ");
++          mpfr_dump (x);
++          exit (1);
++        }
++      mpz_clear (z);
++
++      mpz_init_set_ui (z, 17);
++      mpz_mul_2exp (z, z, 0xffffffb0);
++      mpz_add_ui (z, z, 1);
++      mpfr_set_z_2exp (x, z, -1, MPFR_RNDN);
++      if (! MPFR_IS_INF (x) || MPFR_IS_NEG (x))
++        {
++          printf ("Error 2 in check_huge\n");
++          printf ("Expected @Inf@\n");
++          printf ("Got      ");
++          mpfr_dump (x);
++          exit (1);
++        }
++      mpz_clear (z);
++
++      mpfr_clear (x);
++    }
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -147,11 +247,13 @@
+ 
+   tests_start_mpfr ();
+ 
+-  check (0, MPFR_RNDN);
++  check (0, MPFR_RNDN, 0);
+   for (j = 0; j < 200000; j++)
+-    check (randlimb () & LONG_MAX, RND_RAND ());
++    check (randlimb () & LONG_MAX, RND_RAND (), j < 200);
+   check0 ();
+ 
++  check_huge ();
++
+   tests_end_mpfr ();
+ 
+   return 0;
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:48:27.322243271 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:48:27.370242746 +0000
+@@ -0,0 +1 @@
++prototypes
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:46:49.115316335 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:48:27.370242746 +0000
+@@ -1 +1 @@
+-4.1.0-p3
++4.1.0-p4
+diff -Naurd mpfr-4.1.0-a/src/atan.c mpfr-4.1.0-b/src/atan.c
+--- mpfr-4.1.0-a/src/atan.c	2020-04-22 15:27:07.000000000 +0000
++++ mpfr-4.1.0-b/src/atan.c	2021-02-11 12:48:27.354242922 +0000
+@@ -56,7 +56,7 @@
+   };
+ 
+ static void
+-set_table (mpfr_t y, const mp_limb_t x[3])
++set_table (mpfr_ptr y, const mp_limb_t x[3])
+ {
+   mpfr_prec_t p = MPFR_PREC(y);
+   mp_size_t n = MPFR_PREC2LIMBS(p);
+diff -Naurd mpfr-4.1.0-a/src/const_euler.c mpfr-4.1.0-b/src/const_euler.c
+--- mpfr-4.1.0-a/src/const_euler.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/const_euler.c	2021-02-11 12:48:27.354242922 +0000
+@@ -181,7 +181,7 @@
+ }
+ 
+ int
+-mpfr_const_euler_internal (mpfr_t x, mpfr_rnd_t rnd)
++mpfr_const_euler_internal (mpfr_ptr x, mpfr_rnd_t rnd)
+ {
+   mpfr_const_euler_bs_t sum;
+   mpz_t t, u, v;
+diff -Naurd mpfr-4.1.0-a/src/eint.c mpfr-4.1.0-b/src/eint.c
+--- mpfr-4.1.0-a/src/eint.c	2020-03-09 15:31:45.000000000 +0000
++++ mpfr-4.1.0-b/src/eint.c	2021-02-11 12:48:27.354242922 +0000
+@@ -36,7 +36,7 @@
+    Return PREC(y) when the truncated series does not converge.
+ */
+ static mpfr_exp_t
+-mpfr_eint_aux (mpfr_t y, mpfr_srcptr x)
++mpfr_eint_aux (mpfr_ptr y, mpfr_srcptr x)
+ {
+   mpfr_t eps; /* dynamic (absolute) error bound on t */
+   mpfr_t erru, errs;
+diff -Naurd mpfr-4.1.0-a/src/erandom.c mpfr-4.1.0-b/src/erandom.c
+--- mpfr-4.1.0-a/src/erandom.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/erandom.c	2021-02-11 12:48:27.354242922 +0000
+@@ -80,7 +80,7 @@
+ 
+ /* return an exponential random deviate with mean 1 as a MPFR  */
+ int
+-mpfr_erandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
++mpfr_erandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
+ {
+   mpfr_random_deviate_t x, p, q;
+   int inex;
+diff -Naurd mpfr-4.1.0-a/src/fpif.c mpfr-4.1.0-b/src/fpif.c
+--- mpfr-4.1.0-a/src/fpif.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/fpif.c	2021-02-11 12:48:27.354242922 +0000
+@@ -291,7 +291,8 @@
+  *   until one has integer types larger than 128 bits).
+  */
+ static unsigned char*
+-mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
++mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size,
++                          mpfr_ptr x)
+ {
+   unsigned char *result;
+   mpfr_uexp_t uexp;
+@@ -372,7 +373,7 @@
+  *   than 128 bits).
+  */
+ static int
+-mpfr_fpif_read_exponent_from_file (mpfr_t x, FILE * fh)
++mpfr_fpif_read_exponent_from_file (mpfr_ptr x, FILE * fh)
+ {
+   mpfr_exp_t exponent;
+   mpfr_uexp_t uexp;
+@@ -456,7 +457,7 @@
+  *        format
+  */
+ static unsigned char*
+-mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
++mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_ptr x)
+ {
+   unsigned char *result;
+   mpfr_prec_t precision;
+@@ -492,7 +493,7 @@
+  * Assume buffer is not NULL.
+  */
+ static void
+-mpfr_fpif_read_limbs (mpfr_t x, unsigned char *buffer, size_t nb_byte)
++mpfr_fpif_read_limbs (mpfr_ptr x, unsigned char *buffer, size_t nb_byte)
+ {
+   size_t mp_bytes_per_limb;
+   size_t nb_partial_byte;
+@@ -522,7 +523,7 @@
+  * return 0 if successful
+  */
+ int
+-mpfr_fpif_export (FILE *fh, mpfr_t x)
++mpfr_fpif_export (FILE *fh, mpfr_ptr x)
+ {
+   int status;
+   unsigned char *buf;
+@@ -582,7 +583,7 @@
+  * Return 0 if the import was successful.
+  */
+ int
+-mpfr_fpif_import (mpfr_t x, FILE *fh)
++mpfr_fpif_import (mpfr_ptr x, FILE *fh)
+ {
+   int status;
+   mpfr_prec_t precision;
+diff -Naurd mpfr-4.1.0-a/src/li2.c mpfr-4.1.0-b/src/li2.c
+--- mpfr-4.1.0-a/src/li2.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/li2.c	2021-02-11 12:48:27.354242922 +0000
+@@ -31,7 +31,7 @@
+    for determinating the relative error.
+ */
+ static int
+-li2_series (mpfr_t sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
++li2_series (mpfr_ptr sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
+ {
+   int i;
+   mpfr_t s, u, v, w;
+diff -Naurd mpfr-4.1.0-a/src/lngamma.c mpfr-4.1.0-b/src/lngamma.c
+--- mpfr-4.1.0-a/src/lngamma.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/lngamma.c	2021-02-11 12:48:27.354242922 +0000
+@@ -31,7 +31,7 @@
+    precision should be >= 4.
+ */
+ static void
+-mpfr_gamma_alpha (mpfr_t s, mpfr_prec_t p)
++mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p)
+ {
+   MPFR_LOG_FUNC
+     (("p=%Pu", p),
+diff -Naurd mpfr-4.1.0-a/src/mpfr-impl.h mpfr-4.1.0-b/src/mpfr-impl.h
+--- mpfr-4.1.0-a/src/mpfr-impl.h	2020-06-10 21:50:12.000000000 +0000
++++ mpfr-4.1.0-b/src/mpfr-impl.h	2021-02-11 12:48:27.354242922 +0000
+@@ -2474,7 +2474,8 @@
+ __MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long);
+ __MPFR_DECLSPEC void mpfr_bernoulli_freecache (void);
+ 
+-__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t);
++__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_ptr, mpfr_ptr, mpfr_srcptr,
++                                      mpfr_rnd_t);
+ 
+ __MPFR_DECLSPEC double mpfr_scale2 (double, int);
+ 
+@@ -2485,7 +2486,7 @@
+                                                    mpfr_prec_t);
+ 
+ __MPFR_DECLSPEC void mpfr_mpz_init (mpz_ptr);
+-__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_t, mp_bitcnt_t);
++__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_ptr, mp_bitcnt_t);
+ __MPFR_DECLSPEC void mpfr_mpz_clear (mpz_ptr);
+ 
+ __MPFR_DECLSPEC int mpfr_odd_p (mpfr_srcptr);
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:46:49.115316335 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:48:27.366242791 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p3"
++#define MPFR_VERSION_STRING "4.1.0-p4"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+@@ -781,8 +781,8 @@
+ __MPFR_DECLSPEC int mpfr_strtofr (mpfr_ptr, const char *, char **, int,
+                                   mpfr_rnd_t);
+ 
+-__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_t);
+-__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_t, int);
++__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_ptr);
++__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_ptr, int);
+ 
+ __MPFR_DECLSPEC size_t mpfr_custom_get_size (mpfr_prec_t);
+ __MPFR_DECLSPEC void mpfr_custom_init (void *, mpfr_prec_t);
+@@ -1080,10 +1080,12 @@
+ #define mpfr_set_uj_2exp __gmpfr_set_uj_2exp
+ #define mpfr_get_sj __gmpfr_mpfr_get_sj
+ #define mpfr_get_uj __gmpfr_mpfr_get_uj
+-__MPFR_DECLSPEC int mpfr_set_sj (mpfr_t, intmax_t, mpfr_rnd_t);
+-__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_t, intmax_t, intmax_t, mpfr_rnd_t);
+-__MPFR_DECLSPEC int mpfr_set_uj (mpfr_t, uintmax_t, mpfr_rnd_t);
+-__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_t, uintmax_t, intmax_t, mpfr_rnd_t);
++__MPFR_DECLSPEC int mpfr_set_sj (mpfr_ptr, intmax_t, mpfr_rnd_t);
++__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_ptr, intmax_t, intmax_t,
++                                      mpfr_rnd_t);
++__MPFR_DECLSPEC int mpfr_set_uj (mpfr_ptr, uintmax_t, mpfr_rnd_t);
++__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_ptr, uintmax_t, intmax_t,
++                                      mpfr_rnd_t);
+ __MPFR_DECLSPEC intmax_t mpfr_get_sj (mpfr_srcptr, mpfr_rnd_t);
+ __MPFR_DECLSPEC uintmax_t mpfr_get_uj (mpfr_srcptr, mpfr_rnd_t);
+ 
+diff -Naurd mpfr-4.1.0-a/src/nrandom.c mpfr-4.1.0-b/src/nrandom.c
+--- mpfr-4.1.0-a/src/nrandom.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/nrandom.c	2021-02-11 12:48:27.354242922 +0000
+@@ -155,7 +155,7 @@
+ 
+ /* return a normal random deviate with mean 0 and variance 1 as a MPFR  */
+ int
+-mpfr_nrandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
++mpfr_nrandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
+ {
+   mpfr_random_deviate_t x, p, q;
+   int inex;
+diff -Naurd mpfr-4.1.0-a/src/pool.c mpfr-4.1.0-b/src/pool.c
+--- mpfr-4.1.0-a/src/pool.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/pool.c	2021-02-11 12:48:27.354242922 +0000
+@@ -35,7 +35,7 @@
+ static MPFR_THREAD_ATTR __mpz_struct mpz_tab[MPFR_POOL_NENTRIES];
+ 
+ MPFR_HOT_FUNCTION_ATTR void
+-mpfr_mpz_init (mpz_t z)
++mpfr_mpz_init (mpz_ptr z)
+ {
+   if (MPFR_LIKELY (n_alloc > 0))
+     {
+@@ -54,7 +54,7 @@
+ }
+ 
+ MPFR_HOT_FUNCTION_ATTR void
+-mpfr_mpz_init2 (mpz_t z, mp_bitcnt_t n)
++mpfr_mpz_init2 (mpz_ptr z, mp_bitcnt_t n)
+ {
+   /* The condition on n is used below as the argument n will be ignored if
+      the mpz_t is obtained from the MPFR stack of previously used mpz_t.
+@@ -82,7 +82,7 @@
+ 
+ 
+ MPFR_HOT_FUNCTION_ATTR void
+-mpfr_mpz_clear (mpz_t z)
++mpfr_mpz_clear (mpz_ptr z)
+ {
+   /* We only put objects with at most MPFR_POOL_MAX_SIZE in the mpz_t pool,
+      to avoid it takes too much memory (and anyway the speedup is mainly
+diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
+--- mpfr-4.1.0-a/src/random_deviate.c	2021-02-11 12:43:51.789257562 +0000
++++ mpfr-4.1.0-b/src/random_deviate.c	2021-02-11 12:48:27.354242922 +0000
+@@ -64,7 +64,7 @@
+ 
+ /* allocate and set to (0,1) */
+ void
+-mpfr_random_deviate_init (mpfr_random_deviate_t x)
++mpfr_random_deviate_init (mpfr_random_deviate_ptr x)
+ {
+   mpz_init (x->f);
+   x->e = 0;
+@@ -72,21 +72,22 @@
+ 
+ /* reset to (0,1) */
+ void
+-mpfr_random_deviate_reset (mpfr_random_deviate_t x)
++mpfr_random_deviate_reset (mpfr_random_deviate_ptr x)
+ {
+   x->e = 0;
+ }
+ 
+ /* deallocate */
+ void
+-mpfr_random_deviate_clear (mpfr_random_deviate_t x)
++mpfr_random_deviate_clear (mpfr_random_deviate_ptr x)
+ {
+   mpz_clear (x->f);
+ }
+ 
+ /* swap two random deviates */
+ void
+-mpfr_random_deviate_swap (mpfr_random_deviate_t x, mpfr_random_deviate_t y)
++mpfr_random_deviate_swap (mpfr_random_deviate_ptr x,
++                          mpfr_random_deviate_ptr y)
+ {
+   mpfr_random_size_t s;
+   unsigned long t;
+@@ -107,7 +108,7 @@
+ 
+ /* ensure x has at least k bits */
+ static void
+-random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k,
++random_deviate_generate (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
+                          gmp_randstate_t r, mpz_t t)
+ {
+   /* Various compile time checks on mpfr_random_deviate_t */
+@@ -223,7 +224,7 @@
+ 
+ /* return position of leading bit, counting from 1 */
+ static mpfr_random_size_t
+-random_deviate_leading_bit (mpfr_random_deviate_t x, gmp_randstate_t r)
++random_deviate_leading_bit (mpfr_random_deviate_ptr x, gmp_randstate_t r)
+ {
+   mpfr_random_size_t l;
+   random_deviate_generate (x, W, r, 0);
+@@ -243,7 +244,7 @@
+ 
+ /* return kth bit of fraction, representing 2^-k */
+ int
+-mpfr_random_deviate_tstbit (mpfr_random_deviate_t x, mpfr_random_size_t k,
++mpfr_random_deviate_tstbit (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
+                             gmp_randstate_t r)
+ {
+   if (k == 0)
+@@ -256,7 +257,8 @@
+ 
+ /* compare two random deviates, x < y */
+ int
+-mpfr_random_deviate_less (mpfr_random_deviate_t x, mpfr_random_deviate_t y,
++mpfr_random_deviate_less (mpfr_random_deviate_ptr x,
++                          mpfr_random_deviate_ptr y,
+                           gmp_randstate_t r)
+ {
+   mpfr_random_size_t k = 1;
+@@ -280,7 +282,7 @@
+ /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
+ int
+ mpfr_random_deviate_value (int neg, unsigned long n,
+-                           mpfr_random_deviate_t x, mpfr_t z,
++                           mpfr_random_deviate_ptr x, mpfr_ptr z,
+                            gmp_randstate_t r, mpfr_rnd_t rnd)
+ {
+   /* r is used to add as many bits as necessary to match the precision of z */
+diff -Naurd mpfr-4.1.0-a/src/random_deviate.h mpfr-4.1.0-b/src/random_deviate.h
+--- mpfr-4.1.0-a/src/random_deviate.h	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/random_deviate.h	2021-02-11 12:48:27.354242922 +0000
+@@ -76,7 +76,7 @@
+ /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
+ __MPFR_DECLSPEC int
+   mpfr_random_deviate_value (int, unsigned long,
+-                             mpfr_random_deviate_ptr, mpfr_t,
++                             mpfr_random_deviate_ptr, mpfr_ptr,
+                              gmp_randstate_t, mpfr_rnd_t);
+ 
+ #if defined(__cplusplus)
+diff -Naurd mpfr-4.1.0-a/src/rndna.c mpfr-4.1.0-b/src/rndna.c
+--- mpfr-4.1.0-a/src/rndna.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/rndna.c	2021-02-11 12:48:27.354242922 +0000
+@@ -61,7 +61,7 @@
+    and prepares rop to give it one more bit of precision
+    and to save its old value within it. */
+ void
+-mpfr_round_nearest_away_begin (mpfr_t rop)
++mpfr_round_nearest_away_begin (mpfr_ptr rop)
+ {
+   mpfr_t tmp;
+   mp_size_t xsize;
+@@ -129,7 +129,7 @@
+    copying it back the result of the applied function
+    and performing additional roundings. */
+ int
+-mpfr_round_nearest_away_end (mpfr_t rop, int inex)
++mpfr_round_nearest_away_end (mpfr_ptr rop, int inex)
+ {
+   mpfr_t    tmp;
+   mp_size_t xsize;
+diff -Naurd mpfr-4.1.0-a/src/set_sj.c mpfr-4.1.0-b/src/set_sj.c
+--- mpfr-4.1.0-a/src/set_sj.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/src/set_sj.c	2021-02-11 12:48:27.354242922 +0000
+@@ -26,13 +26,13 @@
+ #ifdef _MPFR_H_HAVE_INTMAX_T
+ 
+ int
+-mpfr_set_sj (mpfr_t x, intmax_t j, mpfr_rnd_t rnd)
++mpfr_set_sj (mpfr_ptr x, intmax_t j, mpfr_rnd_t rnd)
+ {
+   return mpfr_set_sj_2exp (x, j, 0, rnd);
+ }
+ 
+ int
+-mpfr_set_sj_2exp (mpfr_t x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
++mpfr_set_sj_2exp (mpfr_ptr x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
+ {
+   if (j >= 0)
+     return mpfr_set_uj_2exp (x, j, e, rnd);
+diff -Naurd mpfr-4.1.0-a/src/set_str.c mpfr-4.1.0-b/src/set_str.c
+--- mpfr-4.1.0-a/src/set_str.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/set_str.c	2021-02-11 12:48:27.354242922 +0000
+@@ -23,7 +23,7 @@
+ #include "mpfr-impl.h"
+ 
+ int
+-mpfr_set_str (mpfr_t x, const char *str, int base, mpfr_rnd_t rnd)
++mpfr_set_str (mpfr_ptr x, const char *str, int base, mpfr_rnd_t rnd)
+ {
+   char *p;
+ 
+diff -Naurd mpfr-4.1.0-a/src/set_uj.c mpfr-4.1.0-b/src/set_uj.c
+--- mpfr-4.1.0-a/src/set_uj.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/src/set_uj.c	2021-02-11 12:48:27.354242922 +0000
+@@ -29,13 +29,13 @@
+ #define uintmaxpml (sizeof(uintmax_t) / sizeof(mp_limb_t))
+ 
+ int
+-mpfr_set_uj (mpfr_t x, uintmax_t j, mpfr_rnd_t rnd)
++mpfr_set_uj (mpfr_ptr x, uintmax_t j, mpfr_rnd_t rnd)
+ {
+   return mpfr_set_uj_2exp (x, j, 0, rnd);
+ }
+ 
+ int
+-mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
++mpfr_set_uj_2exp (mpfr_ptr x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
+ {
+   int cnt, inex;
+   mp_size_t i, k;
+diff -Naurd mpfr-4.1.0-a/src/sin_cos.c mpfr-4.1.0-b/src/sin_cos.c
+--- mpfr-4.1.0-a/src/sin_cos.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/sin_cos.c	2021-02-11 12:48:27.354242922 +0000
+@@ -463,7 +463,7 @@
+    Return err such that the relative error is bounded by 2^err ulps.
+ */
+ static int
+-sincos_aux (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
++sincos_aux (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
+ {
+   mpfr_prec_t prec_s, sh;
+   mpz_t Q, S, C, Q2, S2, C2, y;
+@@ -577,7 +577,7 @@
+    Assumes s differs from c.
+  */
+ int
+-mpfr_sincos_fast (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd)
++mpfr_sincos_fast (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+   int inexs, inexc;
+   mpfr_t x_red, ts, tc;
+diff -Naurd mpfr-4.1.0-a/src/strtofr.c mpfr-4.1.0-b/src/strtofr.c
+--- mpfr-4.1.0-a/src/strtofr.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/strtofr.c	2021-02-11 12:48:27.354242922 +0000
+@@ -226,7 +226,7 @@
+    BUT if it returns 0 (NAN or INF), the ternary value is also '0'
+    (ie NAN and INF are exact) */
+ static int
+-parse_string (mpfr_t x, struct parsed_string *pstr,
++parse_string (mpfr_ptr x, struct parsed_string *pstr,
+               const char **string, int base)
+ {
+   const char *str = *string;
+@@ -451,7 +451,7 @@
+    and the precision of x.
+    Returns the ternary value. */
+ static int
+-parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
++parsed_string_to_mpfr (mpfr_ptr x, struct parsed_string *pstr, mpfr_rnd_t rnd)
+ {
+   mpfr_prec_t precx, prec, ysize_bits, pstr_size;
+   mpfr_exp_t exp;
+@@ -934,7 +934,7 @@
+ }
+ 
+ int
+-mpfr_strtofr (mpfr_t x, const char *string, char **end, int base,
++mpfr_strtofr (mpfr_ptr x, const char *string, char **end, int base,
+               mpfr_rnd_t rnd)
+ {
+   int res;
+diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c
+--- mpfr-4.1.0-a/src/vasprintf.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/src/vasprintf.c	2021-02-11 12:48:27.354242922 +0000
+@@ -963,7 +963,7 @@
+ #define NDIGITS 8
+ 
+ MPFR_RETURNS_NONNULL static char *
+-mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, const mpfr_t op,
++mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, mpfr_srcptr op,
+                       const struct printf_spec spec)
+ {
+   size_t ndigits;
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:46:49.115316335 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:48:27.370242746 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p3";
++  return "4.1.0-p4";
+ }
+diff -Naurd mpfr-4.1.0-a/src/zeta.c mpfr-4.1.0-b/src/zeta.c
+--- mpfr-4.1.0-a/src/zeta.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/src/zeta.c	2021-02-11 12:48:27.354242922 +0000
+@@ -35,7 +35,7 @@
+    sum(tc[i]*product((s+2j)*(s+2j-1)/n^2,j=1..i-1), i=1..p)*s*n^(-s-1)
+ */
+ static void
+-mpfr_zeta_part_b (mpfr_t b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
++mpfr_zeta_part_b (mpfr_ptr b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
+ {
+   mpfr_t s1, d, u;
+   unsigned long n2;
+@@ -130,7 +130,7 @@
+           n - an integer
+    Output: sum - a floating-point number approximating sum(1/i^s, i=1..n-1) */
+ static void
+-mpfr_zeta_part_a (mpfr_t sum, mpfr_srcptr s, int n)
++mpfr_zeta_part_a (mpfr_ptr sum, mpfr_srcptr s, int n)
+ {
+   mpfr_t u, s1;
+   int i;
+@@ -158,7 +158,7 @@
+    Output: z - Zeta(s) rounded to the precision of z with direction rnd_mode
+ */
+ static int
+-mpfr_zeta_pos (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
++mpfr_zeta_pos (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
+ {
+   mpfr_t b, c, z_pre, f, s1;
+   double beta, sd, dnep;
+@@ -356,8 +356,8 @@
+    At input, p is Pi rounded down.
+    The comments in the code are for rnd = RNDD. */
+ static void
+-mpfr_reflection_overflow (mpfr_t z, mpfr_t s1, const mpfr_t s, mpfr_t y,
+-                          mpfr_t p, mpfr_rnd_t rnd)
++mpfr_reflection_overflow (mpfr_ptr z, mpfr_ptr s1, mpfr_srcptr s, mpfr_ptr y,
++                          mpfr_ptr p, mpfr_rnd_t rnd)
+ {
+   mpz_t sint;
+ 
+@@ -432,7 +432,7 @@
+ }
+ 
+ int
+-mpfr_zeta (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
++mpfr_zeta (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
+ {
+   mpfr_t z_pre, s1, y, p;
+   long add;
+diff -Naurd mpfr-4.1.0-a/tests/tcmp2.c mpfr-4.1.0-b/tests/tcmp2.c
+--- mpfr-4.1.0-a/tests/tcmp2.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tcmp2.c	2021-02-11 12:48:27.350242965 +0000
+@@ -24,7 +24,7 @@
+ 
+ /* set bit n of x to b, where bit 0 is the most significant one */
+ static void
+-set_bit (mpfr_t x, unsigned int n, int b)
++set_bit (mpfr_ptr x, unsigned int n, int b)
+ {
+   unsigned l;
+   mp_size_t xn;
+diff -Naurd mpfr-4.1.0-a/tests/tdiv.c mpfr-4.1.0-b/tests/tdiv.c
+--- mpfr-4.1.0-a/tests/tdiv.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tdiv.c	2021-02-11 12:48:27.350242965 +0000
+@@ -369,7 +369,7 @@
+ /* given y = o(x/u), x, u, find the inexact flag by
+    multiplying y by u */
+ static int
+-get_inexact (mpfr_t y, mpfr_t x, mpfr_t u)
++get_inexact (mpfr_ptr y, mpfr_ptr x, mpfr_ptr u)
+ {
+   mpfr_t xx;
+   int inex;
+diff -Naurd mpfr-4.1.0-a/tests/teq.c mpfr-4.1.0-b/tests/teq.c
+--- mpfr-4.1.0-a/tests/teq.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/teq.c	2021-02-11 12:48:27.350242965 +0000
+@@ -23,7 +23,7 @@
+ #include "mpfr-test.h"
+ 
+ static void
+-teq (mpfr_t x)
++teq (mpfr_ptr x)
+ {
+   mpfr_t y;
+   unsigned long k, px, mx;
+diff -Naurd mpfr-4.1.0-a/tests/terandom_chisq.c mpfr-4.1.0-b/tests/terandom_chisq.c
+--- mpfr-4.1.0-a/tests/terandom_chisq.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/terandom_chisq.c	2021-02-11 12:48:27.350242965 +0000
+@@ -26,7 +26,7 @@
+  * exponential distribution.  We only take differences of this function so the
+  * offset doesn't matter; here Phi(0) = 0. */
+ static void
+-exponential_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd)
++exponential_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd)
+ {
+   mpfr_neg (z, x, rnd);
+   mpfr_expm1 (z, z, rnd);
+@@ -43,7 +43,7 @@
+  * TAOCP, Vol 2, 3.3.1, Table 1.  It more accurate than the similar formula,
+  * DLMF 8.11.10. */
+ static void
+-chisq_prob (mpfr_t q, long nu, mpfr_t chisqp)
++chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp)
+ {
+   mpfr_t t;
+   mpfr_rnd_t rnd;
+@@ -170,7 +170,7 @@
+  * this function.  low precision means prec = 2, 3, or 4.  High values of
+  * precision will result in integer overflow. */
+ static long
+-sequential (mpfr_t x)
++sequential (mpfr_ptr x)
+ {
+   long expt, prec;
+ 
+diff -Naurd mpfr-4.1.0-a/tests/tfmma.c mpfr-4.1.0-b/tests/tfmma.c
+--- mpfr-4.1.0-a/tests/tfmma.c	2020-03-24 13:47:38.000000000 +0000
++++ mpfr-4.1.0-b/tests/tfmma.c	2021-02-11 12:48:27.350242965 +0000
+@@ -24,7 +24,7 @@
+ 
+ /* check both mpfr_fmma and mpfr_fmms */
+ static void
+-random_test (mpfr_t a, mpfr_t b, mpfr_t c, mpfr_t d, mpfr_rnd_t rnd)
++random_test (mpfr_ptr a, mpfr_ptr b, mpfr_ptr c, mpfr_ptr d, mpfr_rnd_t rnd)
+ {
+   mpfr_t ref, res, ab, cd;
+   int inex_ref, inex_res;
+diff -Naurd mpfr-4.1.0-a/tests/tfmod.c mpfr-4.1.0-b/tests/tfmod.c
+--- mpfr-4.1.0-a/tests/tfmod.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tfmod.c	2021-02-11 12:48:27.350242965 +0000
+@@ -62,8 +62,8 @@
+ }
+ 
+ static void
+-test_failed (mpfr_t erem, mpfr_t grem, int eret, int gret, mpfr_t x, mpfr_t y,
+-             mpfr_rnd_t rnd)
++test_failed (mpfr_ptr erem, mpfr_ptr grem, int eret, int gret,
++             mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd)
+ {
+   printf ("error: mpfr_fmod (r, x, y, rnd)\n  x = ");
+   mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD);
+@@ -83,7 +83,7 @@
+ }
+ 
+ static void
+-check (mpfr_t r0, mpfr_t x, mpfr_t y, mpfr_rnd_t rnd)
++check (mpfr_ptr r0, mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd)
+ {
+   int inex0, inex1;
+   mpfr_t r1;
+diff -Naurd mpfr-4.1.0-a/tests/tfprintf.c mpfr-4.1.0-b/tests/tfprintf.c
+--- mpfr-4.1.0-a/tests/tfprintf.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/tests/tfprintf.c	2021-02-11 12:48:27.350242965 +0000
+@@ -65,7 +65,7 @@
+ const int prec_max_printf = 5000;
+ 
+ static void
+-check (FILE *fout, const char *fmt, mpfr_t x)
++check (FILE *fout, const char *fmt, mpfr_ptr x)
+ {
+   if (mpfr_fprintf (fout, fmt, x) == -1)
+     {
+diff -Naurd mpfr-4.1.0-a/tests/tgamma.c mpfr-4.1.0-b/tests/tgamma.c
+--- mpfr-4.1.0-a/tests/tgamma.c	2020-06-01 00:15:37.000000000 +0000
++++ mpfr-4.1.0-b/tests/tgamma.c	2021-02-11 12:48:27.350242965 +0000
+@@ -890,7 +890,7 @@
+    computing with a working precision p2. Assume that x is not an
+    integer <= 2. */
+ static void
+-exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
++exp_lgamma (mpfr_ptr x, mpfr_prec_t p1, mpfr_prec_t p2)
+ {
+   mpfr_t yd, yu, zd, zu;
+   int inexd, inexu, sign;
+diff -Naurd mpfr-4.1.0-a/tests/tnrandom_chisq.c mpfr-4.1.0-b/tests/tnrandom_chisq.c
+--- mpfr-4.1.0-a/tests/tnrandom_chisq.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tnrandom_chisq.c	2021-02-11 12:48:27.350242965 +0000
+@@ -26,7 +26,7 @@
+  * for the normal distribution.  We only take differences of this function so
+  * the offset doesn't matter; here Phi(0) = 0. */
+ static void
+-normal_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd)
++normal_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd)
+ {
+   mpfr_sqrt_ui (z, 2, rnd);
+   mpfr_div (z, x, z, rnd);
+@@ -44,7 +44,7 @@
+  * TAOCP, Vol 2, 3.3.1, Table 1.  It more accurate than the similar formula,
+  * DLMF 8.11.10. */
+ static void
+-chisq_prob (mpfr_t q, long nu, mpfr_t chisqp)
++chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp)
+ {
+   mpfr_t t;
+   mpfr_rnd_t rnd;
+@@ -166,7 +166,7 @@
+  * this function.  low precision means prec = 2, 3, or 4.  High values of
+  * precision will result in integer overflow. */
+ static long
+-sequential (mpfr_t x)
++sequential (mpfr_ptr x)
+ {
+   long expt, prec;
+ 
+diff -Naurd mpfr-4.1.0-a/tests/tprintf.c mpfr-4.1.0-b/tests/tprintf.c
+--- mpfr-4.1.0-a/tests/tprintf.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/tests/tprintf.c	2021-02-11 12:48:27.350242965 +0000
+@@ -74,7 +74,7 @@
+ int stdout_redirect;
+ 
+ static void
+-check (const char *fmt, mpfr_t x)
++check (const char *fmt, mpfr_ptr x)
+ {
+   if (mpfr_printf (fmt, x) == -1)
+     {
+diff -Naurd mpfr-4.1.0-a/tests/trint.c mpfr-4.1.0-b/tests/trint.c
+--- mpfr-4.1.0-a/tests/trint.c	2020-02-12 13:04:50.000000000 +0000
++++ mpfr-4.1.0-b/tests/trint.c	2021-02-11 12:48:27.350242965 +0000
+@@ -367,7 +367,7 @@
+ #endif
+ 
+ static void
+-err (const char *str, mp_size_t s, mpfr_t x, mpfr_t y, mpfr_prec_t p,
++err (const char *str, mp_size_t s, mpfr_ptr x, mpfr_ptr y, mpfr_prec_t p,
+      mpfr_rnd_t r, int trint, int inexact)
+ {
+   printf ("Error: %s\ns = %u, p = %u, r = %s, trint = %d, inexact = %d\nx = ",
+diff -Naurd mpfr-4.1.0-a/tests/tsinh_cosh.c mpfr-4.1.0-b/tests/tsinh_cosh.c
+--- mpfr-4.1.0-a/tests/tsinh_cosh.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tsinh_cosh.c	2021-02-11 12:48:27.350242965 +0000
+@@ -23,7 +23,7 @@
+ #include "mpfr-test.h"
+ 
+ static void
+-failed (mpfr_t x, mpfr_t esh, mpfr_t gsh, mpfr_t ech, mpfr_t gch)
++failed (mpfr_ptr x, mpfr_ptr esh, mpfr_ptr gsh, mpfr_ptr ech, mpfr_ptr gch)
+ {
+   printf ("error : mpfr_sinh_cosh (x) x = ");
+   mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD);
+@@ -43,7 +43,7 @@
+ 
+ /* check against sinh, cosh */
+ static void
+-check (mpfr_t x, mpfr_rnd_t rnd)
++check (mpfr_ptr x, mpfr_rnd_t rnd)
+ {
+   mpfr_t s, c, sx, cx;
+   int isc, is, ic;
+diff -Naurd mpfr-4.1.0-a/tests/tsqr.c mpfr-4.1.0-b/tests/tsqr.c
+--- mpfr-4.1.0-a/tests/tsqr.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tsqr.c	2021-02-11 12:48:27.350242965 +0000
+@@ -33,7 +33,7 @@
+ 
+ static void
+ error1 (mpfr_rnd_t rnd, mpfr_prec_t prec,
+-        mpfr_t in, mpfr_t outmul, mpfr_t outsqr)
++        mpfr_t in, mpfr_ptr outmul, mpfr_ptr outsqr)
+ {
+   printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd),
+          (unsigned long) prec);
+@@ -44,7 +44,7 @@
+ }
+ 
+ static void
+-error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_t in, mpfr_t out,
++error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_ptr in, mpfr_ptr out,
+         int inexactmul, int inexactsqr)
+ {
+   printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd),
+diff -Naurd mpfr-4.1.0-a/tests/tsum.c mpfr-4.1.0-b/tests/tsum.c
+--- mpfr-4.1.0-a/tests/tsum.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tsum.c	2021-02-11 12:48:27.350242965 +0000
+@@ -59,7 +59,7 @@
+ }
+ 
+ static void
+-get_exact_sum (mpfr_t sum, mpfr_t *tab, int n)
++get_exact_sum (mpfr_ptr sum, mpfr_t *tab, int n)
+ {
+   int i;
+ 
+@@ -1198,7 +1198,7 @@
+ }
+ 
+ static int
+-mpfr_sum_naive (mpfr_t s, mpfr_t *x, int n, mpfr_rnd_t rnd)
++mpfr_sum_naive (mpfr_ptr s, mpfr_t *x, int n, mpfr_rnd_t rnd)
+ {
+   int ret, i;
+   switch (n)
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:50:22.384987438 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:50:22.424987002 +0000
+@@ -0,0 +1 @@
++digamma-hugemem
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:48:27.370242746 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:50:22.424987002 +0000
+@@ -1 +1 @@
+-4.1.0-p4
++4.1.0-p5
+diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
+--- mpfr-4.1.0-a/src/digamma.c	2020-06-18 17:17:18.000000000 +0000
++++ mpfr-4.1.0-b/src/digamma.c	2021-02-11 12:50:22.412987133 +0000
+@@ -214,19 +214,27 @@
+     (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
+      ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
+ 
+-  /* compute a precision q such that x+1 is exact */
+-  if (MPFR_PREC(x) < MPFR_GET_EXP(x))
+-    q = MPFR_EXP(x);
+-  else
+-    q = MPFR_PREC(x) + 1;
+-
+-  /* for very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)) */
+-  if (MPFR_PREC(y) + 10 < MPFR_EXP(x))
++  /* For very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)).
++     However, for a fixed value of GUARD, MPFR_CAN_ROUND() might fail
++     with probability 1/2^GUARD, in which case the default code will
++     fail since it requires x+1 to be exact, thus a huge precision if
++     x is huge. There are two workarounds:
++     * either perform a Ziv's loop, by increasing GUARD at each step.
++       However, this might fail if x is moderately large, in which case
++       more terms of the asymptotic expansion would be needed.
++     * implement a full asymptotic expansion (with Ziv's loop). */
++#define GUARD 30
++  if (MPFR_PREC(y) + GUARD < MPFR_EXP(x))
+     {
+       /* this ensures EXP(x) >= 3, thus x >= 4, thus log(x) > 1 */
+-      mpfr_init2 (t, MPFR_PREC(y) + 10);
+-      mpfr_log (t, x, MPFR_RNDZ);
+-      if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + 10, MPFR_PREC(y), rnd_mode))
++      mpfr_init2 (t, MPFR_PREC(y) + GUARD);
++      mpfr_log (t, x, MPFR_RNDN);
++      /* |t - digamma(x)| <= 1/2*ulp(t) + |digamma(x) - log(x)|
++                          <= 1/2*ulp(t) + 2^(1-EXP(x))
++                          <= 1/2*ulp(t) + 2^(-PREC(y)-GUARD)
++                          <= ulp(t)
++         since |t| >= 1 thus ulp(t) >= 2^(1-PREC(y)-GUARD) */
++      if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + GUARD, MPFR_PREC(y), rnd_mode))
+         {
+           inex = mpfr_set (y, t, rnd_mode);
+           mpfr_clear (t);
+@@ -235,6 +243,21 @@
+       mpfr_clear (t);
+     }
+ 
++  /* compute a precision q such that x+1 is exact */
++  if (MPFR_PREC(x) < MPFR_GET_EXP(x))
++    {
++      /* The goal of the first assertion is to let the compiler ignore
++         the second one when MPFR_EMAX_MAX <= MPFR_PREC_MAX. */
++      MPFR_ASSERTD (MPFR_EXP(x) <= MPFR_EMAX_MAX);
++      MPFR_ASSERTN (MPFR_EXP(x) <= MPFR_PREC_MAX);
++      q = MPFR_EXP(x);
++    }
++  else
++    q = MPFR_PREC(x) + 1;
++
++  /* FIXME: q can be much too large, e.g. equal to the maximum exponent! */
++  MPFR_LOG_MSG (("q=%Pu\n", q));
++
+   mpfr_init2 (x_plus_j, q);
+ 
+   mpfr_init2 (t, p);
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:48:27.366242791 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:50:22.424987002 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p4"
++#define MPFR_VERSION_STRING "4.1.0-p5"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:48:27.370242746 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:50:22.424987002 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p4";
++  return "4.1.0-p5";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
+--- mpfr-4.1.0-a/tests/tdigamma.c	2020-06-18 17:17:18.000000000 +0000
++++ mpfr-4.1.0-b/tests/tdigamma.c	2021-02-11 12:50:22.412987133 +0000
+@@ -49,12 +49,54 @@
+   mpfr_clear (y);
+ }
+ 
++/* With some GMP_CHECK_RANDOMIZE values, test_generic triggers an error
++     tests_addsize(): too much memory (576460752303432776 bytes)
++  Each time on prec = 200, n = 3, xprec = 140.
++  The following test is a more general testcase.
++*/
++static void
++bug20210206 (void)
++{
++#define NPREC 4
++  mpfr_t x, y[NPREC], z;
++  mpfr_exp_t emin, emax;
++  int i, precx, precy[NPREC] = { 200, 400, 520, 1416 };
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  for (i = 0; i < NPREC; i++)
++    mpfr_init2 (y[i], precy[i]);
++  mpfr_init2 (z, precy[0]);
++
++  for (precx = MPFR_PREC_MIN; precx < 150; precx++)
++    {
++      mpfr_init2 (x, precx);
++      mpfr_setmax (x, __gmpfr_emax);
++      for (i = 0; i < NPREC; i++)
++        mpfr_digamma (y[i], x, MPFR_RNDA);
++      mpfr_set (z, y[1], MPFR_RNDA);
++      MPFR_ASSERTN (mpfr_equal_p (y[0], z));
++      mpfr_clear (x);
++    }
++
++  for (i = 0; i < NPREC; i++)
++    mpfr_clear (y[i]);
++  mpfr_clear (z);
++
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+   tests_start_mpfr ();
+ 
+   special ();
++  bug20210206 ();
+ 
+   test_generic (MPFR_PREC_MIN, 200, 20);
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:52:52.519350662 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:52:52.563350183 +0000
+@@ -0,0 +1 @@
++digamma-interm-zero
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:50:22.424987002 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:52:52.563350183 +0000
+@@ -1 +1 @@
+-4.1.0-p5
++4.1.0-p6
+diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
+--- mpfr-4.1.0-a/src/digamma.c	2021-02-11 12:50:22.412987133 +0000
++++ mpfr-4.1.0-b/src/digamma.c	2021-02-11 12:52:52.547350357 +0000
+@@ -296,21 +296,26 @@
+       errt = mpfr_digamma_approx (t, x_plus_j);
+       expt = MPFR_GET_EXP (t);
+       mpfr_sub (t, t, u, MPFR_RNDN);
+-      if (MPFR_GET_EXP (t) < expt)
+-        errt += expt - MPFR_EXP(t);
+-      /* Warning: if u is zero (which happens when x_plus_j >= min at the
+-         beginning of the while loop above), EXP(u) is not defined.
+-         In this case we have no error from u. */
+-      if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u))
+-        erru += MPFR_EXP(u) - MPFR_EXP(t);
+-      if (errt > erru)
+-        errt = errt + 1;
+-      else if (errt == erru)
+-        errt = errt + 2;
+-      else
+-        errt = erru + 1;
+-      if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode))
+-        break;
++      /* Warning! t may be zero (more likely in small precision). Note
++         that in this case, this is an exact zero, not an underflow. */
++      if (MPFR_NOTZERO(t))
++        {
++          if (MPFR_GET_EXP (t) < expt)
++            errt += expt - MPFR_EXP(t);
++          /* Warning: if u is zero (which happens when x_plus_j >= min at the
++             beginning of the while loop above), EXP(u) is not defined.
++             In this case we have no error from u. */
++          if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u))
++            erru += MPFR_EXP(u) - MPFR_EXP(t);
++          if (errt > erru)
++            errt = errt + 1;
++          else if (errt == erru)
++            errt = errt + 2;
++          else
++            errt = erru + 1;
++          if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode))
++            break;
++        }
+       MPFR_ZIV_NEXT (loop, p);
+       mpfr_set_prec (t, p);
+       mpfr_set_prec (u, p);
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:50:22.424987002 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:52:52.559350226 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p5"
++#define MPFR_VERSION_STRING "4.1.0-p6"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:50:22.424987002 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:52:52.559350226 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p5";
++  return "4.1.0-p6";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
+--- mpfr-4.1.0-a/tests/tdigamma.c	2021-02-11 12:50:22.412987133 +0000
++++ mpfr-4.1.0-b/tests/tdigamma.c	2021-02-11 12:52:52.547350357 +0000
+@@ -90,6 +90,26 @@
+   set_emax (emax);
+ }
+ 
++/* another test that fails with GMP_CHECK_RANDOMIZE=1612741376857003
++   on revision 14398 */
++static void
++bug20210208 (void)
++{
++  mpfr_t x, y;
++  int inex;
++
++  mpfr_init2 (x, 73);
++  mpfr_init2 (y, 1);
++  mpfr_set_str (x, "1.4613470547060071827450", 10, MPFR_RNDN);
++  mpfr_clear_flags ();
++  inex = mpfr_digamma (y, x, MPFR_RNDU);
++  MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -12) == 0);
++  MPFR_ASSERTN (inex > 0);
++  MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
++  mpfr_clear (x);
++  mpfr_clear (y);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -97,6 +117,7 @@
+ 
+   special ();
+   bug20210206 ();
++  bug20210208 ();
+ 
+   test_generic (MPFR_PREC_MIN, 200, 20);
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-11 12:53:38.382850990 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-11 12:53:38.426850512 +0000
+@@ -0,0 +1 @@
++jn-interm-zero
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:52:52.563350183 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-11 12:53:38.426850512 +0000
+@@ -1 +1 @@
+-4.1.0-p6
++4.1.0-p7
+diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c
+--- mpfr-4.1.0-a/src/jyn_asympt.c	2020-07-10 10:33:32.000000000 +0000
++++ mpfr-4.1.0-b/src/jyn_asympt.c	2021-02-11 12:53:38.410850685 +0000
+@@ -69,6 +69,8 @@
+   MPFR_ZIV_INIT (loop, w);
+   for (;;)
+     {
++      int ok = 1;
++
+       mpfr_set_prec (c, w);
+       mpfr_init2 (s, w);
+       mpfr_init2 (P, w);
+@@ -92,6 +94,13 @@
+       /* now s approximates sin(z)+cos(z), and c approximates sin(z)-cos(z),
+          with total absolute error bounded by 2^(1-w). */
+ 
++      /* if s or c is zero, MPFR_GET_EXP will fail below */
++      if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c))
++        {
++          ok = 0;
++          goto clear;
++        }
++
+       /* precompute 1/(8|z|) */
+       mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN);   /* err <= 1 */
+       mpfr_div_2ui (iz, iz, 3, MPFR_RNDN);
+@@ -257,6 +266,9 @@
+       err = (err >= err2) ? err + 1 : err2 + 1;
+       /* the absolute error on c is bounded by 2^(err - w) */
+ 
++      err -= MPFR_GET_EXP (c);
++
++    clear:
+       mpfr_clear (s);
+       mpfr_clear (P);
+       mpfr_clear (Q);
+@@ -266,8 +278,7 @@
+       mpfr_clear (err_s);
+       mpfr_clear (err_u);
+ 
+-      err -= MPFR_GET_EXP (c);
+-      if (MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r)))
++      if (ok && MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r)))
+         break;
+       if (diverge != 0)
+         {
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:52:52.559350226 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-11 12:53:38.422850555 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p6"
++#define MPFR_VERSION_STRING "4.1.0-p7"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:52:52.559350226 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-11 12:53:38.426850512 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p6";
++  return "4.1.0-p7";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tj0.c mpfr-4.1.0-b/tests/tj0.c
+--- mpfr-4.1.0-a/tests/tj0.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tj0.c	2021-02-11 12:53:38.410850685 +0000
+@@ -27,6 +27,25 @@
+ #define REDUCE_EMAX 262143 /* otherwise arg. reduction is too expensive */
+ #include "tgeneric.c"
+ 
++/* bug found in revision 14399 with GMP_CHECK_RANDOMIZE=1612721106588971 */
++static void
++bug20210208 (void)
++{
++  mpfr_t x, y;
++  int inex;
++
++  mpfr_init2 (x, 79);
++  mpfr_init2 (y, 1);
++  mpfr_set_str (x, "2.552495117262005805960565e+02", 10, MPFR_RNDN);
++  mpfr_clear_flags ();
++  inex = mpfr_j0 (y, x, MPFR_RNDZ);
++  MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -5) == 0);
++  MPFR_ASSERTN (inex > 0);
++  MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
++  mpfr_clear (x);
++  mpfr_clear (y);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -35,6 +54,8 @@
+ 
+   tests_start_mpfr ();
+ 
++  bug20210208 ();
++
+   mpfr_init (x);
+   mpfr_init (y);
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-17 17:22:34.594973310 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-17 17:22:34.702972090 +0000
+@@ -0,0 +1 @@
++digamma-interm-zero2
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-11 12:53:38.426850512 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-17 17:22:34.702972090 +0000
+@@ -1 +1 @@
+-4.1.0-p7
++4.1.0-p8
+diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c
+--- mpfr-4.1.0-a/src/digamma.c	2021-02-11 12:52:52.547350357 +0000
++++ mpfr-4.1.0-b/src/digamma.c	2021-02-17 17:22:34.690972226 +0000
+@@ -173,16 +173,19 @@
+       mpfr_digamma (v, u, MPFR_RNDN);   /* error <= 1/2 ulp */
+       expv = MPFR_GET_EXP (v);
+       mpfr_sub (v, v, t, MPFR_RNDN);
+-      if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t))
+-        e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */
+-      /* now take into account the 1/2 ulp error for v */
+-      if (expv - MPFR_EXP(v) - 1 > e1)
+-        e1 = expv - MPFR_EXP(v) - 1;
+-      else
+-        e1 ++;
+-      e1 ++; /* rounding error for mpfr_sub */
+-      if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode))
+-        break;
++      if (MPFR_NOTZERO(v))
++        {
++          if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t))
++            e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */
++          /* now take into account the 1/2 ulp error for v */
++          if (expv - MPFR_EXP(v) - 1 > e1)
++            e1 = expv - MPFR_EXP(v) - 1;
++          else
++            e1 ++;
++          e1 ++; /* rounding error for mpfr_sub */
++          if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode))
++            break;
++        }
+       MPFR_ZIV_NEXT (loop, p);
+       mpfr_set_prec (t, p);
+       mpfr_set_prec (v, p);
+@@ -416,10 +419,8 @@
+         }
+     }
+ 
+-  if (MPFR_IS_NEG(x))
+-    inex = mpfr_digamma_reflection (y, x, rnd_mode);
+   /* if x < 1/2 we use the reflection formula */
+-  else if (MPFR_EXP(x) < 0)
++  if (MPFR_IS_NEG(x) || MPFR_EXP(x) < 0)
+     inex = mpfr_digamma_reflection (y, x, rnd_mode);
+   else
+     inex = mpfr_digamma_positive (y, x, rnd_mode);
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-11 12:53:38.422850555 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-17 17:22:34.702972090 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p7"
++#define MPFR_VERSION_STRING "4.1.0-p8"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-11 12:53:38.426850512 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-17 17:22:34.702972090 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p7";
++  return "4.1.0-p8";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c
+--- mpfr-4.1.0-a/tests/tdigamma.c	2021-02-11 12:52:52.547350357 +0000
++++ mpfr-4.1.0-b/tests/tdigamma.c	2021-02-17 17:22:34.690972226 +0000
+@@ -110,6 +110,26 @@
+   mpfr_clear (y);
+ }
+ 
++/* another test that fails with GMP_CHECK_RANDOMIZE=1613197421465830
++   on revision 14429 */
++static void
++bug20210215 (void)
++{
++  mpfr_t x, y;
++  int inex;
++
++  mpfr_init2 (x, 510);
++  mpfr_init2 (y, 4);
++  mpfr_set_str (x, "-8.2923051438433494998166335341807999322052669984208422481227138906096000469898717007386115912802685588348601663465077353194268894939972221117314512518182580e+35", 10, MPFR_RNDN);
++  mpfr_clear_flags ();
++  inex = mpfr_digamma (y, x, MPFR_RNDU);
++  MPFR_ASSERTN (mpfr_cmp_ui0 (y, 88) == 0);
++  MPFR_ASSERTN (inex > 0);
++  MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
++  mpfr_clear (x);
++  mpfr_clear (y);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -118,6 +138,7 @@
+   special ();
+   bug20210206 ();
+   bug20210208 ();
++  bug20210215 ();
+ 
+   test_generic (MPFR_PREC_MIN, 200, 20);
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-02-17 17:25:46.396981483 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-02-17 17:25:46.440981068 +0000
+@@ -0,0 +1 @@
++jyn_asympt-interm-zero
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-17 17:22:34.702972090 +0000
++++ mpfr-4.1.0-b/VERSION	2021-02-17 17:25:46.440981068 +0000
+@@ -1 +1 @@
+-4.1.0-p8
++4.1.0-p9
+diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c
+--- mpfr-4.1.0-a/src/jyn_asympt.c	2021-02-11 12:53:38.410850685 +0000
++++ mpfr-4.1.0-b/src/jyn_asympt.c	2021-02-17 17:25:46.424981219 +0000
+@@ -69,7 +69,7 @@
+   MPFR_ZIV_INIT (loop, w);
+   for (;;)
+     {
+-      int ok = 1;
++      int ok = 0;
+ 
+       mpfr_set_prec (c, w);
+       mpfr_init2 (s, w);
+@@ -96,10 +96,7 @@
+ 
+       /* if s or c is zero, MPFR_GET_EXP will fail below */
+       if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c))
+-        {
+-          ok = 0;
+-          goto clear;
+-        }
++        goto clear; /* with ok=0 */
+ 
+       /* precompute 1/(8|z|) */
+       mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN);   /* err <= 1 */
+@@ -227,6 +224,9 @@
+           mpfr_sub (s, c, s, MPFR_RNDN);
+ #endif
+         }
++      if (MPFR_IS_ZERO(s))
++        goto clear; /* with ok=0 */
++      ok = 1;
+       if ((n & 2) != 0)
+         mpfr_neg (s, s, MPFR_RNDN);
+       if (MPFR_GET_EXP (s) > err)
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-17 17:22:34.702972090 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-02-17 17:25:46.436981105 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p8"
++#define MPFR_VERSION_STRING "4.1.0-p9"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-17 17:22:34.702972090 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-02-17 17:25:46.440981068 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p8";
++  return "4.1.0-p9";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h
+--- mpfr-4.1.0-a/tests/mpfr-test.h	2020-06-29 13:57:32.000000000 +0000
++++ mpfr-4.1.0-b/tests/mpfr-test.h	2021-02-17 17:25:46.424981219 +0000
+@@ -191,6 +191,8 @@
+ 
+ #define mpfr_cmp0(x,y) (MPFR_ASSERTN (!MPFR_IS_NAN (x) && !MPFR_IS_NAN (y)), mpfr_cmp (x,y))
+ #define mpfr_cmp_ui0(x,i) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), mpfr_cmp_ui (x,i))
++#define mpfr_cmp_si_2exp0(x,i,e) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), \
++                                  mpfr_cmp_si_2exp (x,i,e))
+ 
+ /* define CHECK_EXTERNAL if you want to check mpfr against another library
+    with correct rounding. You'll probably have to modify mpfr_print_raw()
+diff -Naurd mpfr-4.1.0-a/tests/tj1.c mpfr-4.1.0-b/tests/tj1.c
+--- mpfr-4.1.0-a/tests/tj1.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tj1.c	2021-02-17 17:25:46.424981219 +0000
+@@ -55,14 +55,14 @@
+               /* since |x| is just above 2^e, |j1(x)| is just above 2^(e-1),
+                  thus y should be 2^(e-1) and the inexact flag should be
+                  of opposite sign of x */
+-              MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e - 1) == 0);
++              MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e - 1) == 0);
+               MPFR_ASSERTN(VSIGN (inex) * sign < 0);
+             }
+           else
+             {
+               /* here |y| should be 0.5*2^emin and the inexact flag should
+                  have the sign of x */
+-              MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e) == 0);
++              MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e) == 0);
+               MPFR_ASSERTN(VSIGN (inex) * sign > 0);
+             }
+         }
+@@ -72,6 +72,26 @@
+   mpfr_clear (y);
+ }
+ 
++/* a test that fails with GMP_CHECK_RANDOMIZE=1613146232984428
++   on revision 14429 */
++static void
++bug20210215 (void)
++{
++  mpfr_t x, y;
++  int inex;
++
++  mpfr_init2 (x, 221);
++  mpfr_init2 (y, 1);
++  mpfr_set_str (x, "1.6484611511696130037307738844228498447763863563070374544054791168614e+01", 10, MPFR_RNDN);
++  mpfr_clear_flags ();
++  inex = mpfr_j1 (y, x, MPFR_RNDZ);
++  MPFR_ASSERTN (mpfr_cmp_si_2exp0 (y, -1, -9) == 0);
++  MPFR_ASSERTN (inex > 0);
++  MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT);
++  mpfr_clear (x);
++  mpfr_clear (y);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -79,6 +99,8 @@
+ 
+   tests_start_mpfr ();
+ 
++  bug20210215 ();
++
+   test_small ();
+ 
+   mpfr_init (x);
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-03-09 13:55:43.183158946 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-03-09 13:55:43.223158508 +0000
+@@ -0,0 +1 @@
++macros
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-02-17 17:25:46.440981068 +0000
++++ mpfr-4.1.0-b/VERSION	2021-03-09 13:55:43.223158508 +0000
+@@ -1 +1 @@
+-4.1.0-p9
++4.1.0-p10
+diff -Naurd mpfr-4.1.0-a/doc/mpfr.info mpfr-4.1.0-b/doc/mpfr.info
+--- mpfr-4.1.0-a/doc/mpfr.info	2020-07-10 11:59:13.000000000 +0000
++++ mpfr-4.1.0-b/doc/mpfr.info	2021-03-09 13:55:51.167071327 +0000
+@@ -3217,7 +3217,11 @@
+ 
+    Each function in this interface is also implemented as a macro for
+ efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the
+-macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.
++macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.  Note that
++the macro may evaluate arguments multiple times (or none).  Moreover,
++macros implementing functions with the ‘void’ return type may not be
++used in contexts where an expression is expected, e.g., inside
++‘for(...)’ or before a comma operator.
+ 
+    Note 1: MPFR functions may still initialize temporary floating-point
+ numbers using ‘mpfr_init’ and similar functions.  See Custom Allocation
+@@ -4579,13 +4583,13 @@
+                                                               (line 115)
+ * mpfr_csch:                             Transcendental Functions.
+                                                               (line 180)
+-* mpfr_custom_get_exp:                   Custom Interface.    (line  76)
+-* mpfr_custom_get_kind:                  Custom Interface.    (line  66)
+-* mpfr_custom_get_significand:           Custom Interface.    (line  71)
+-* mpfr_custom_get_size:                  Custom Interface.    (line  37)
+-* mpfr_custom_init:                      Custom Interface.    (line  41)
+-* mpfr_custom_init_set:                  Custom Interface.    (line  48)
+-* mpfr_custom_move:                      Custom Interface.    (line  85)
++* mpfr_custom_get_exp:                   Custom Interface.    (line  80)
++* mpfr_custom_get_kind:                  Custom Interface.    (line  70)
++* mpfr_custom_get_significand:           Custom Interface.    (line  75)
++* mpfr_custom_get_size:                  Custom Interface.    (line  41)
++* mpfr_custom_init:                      Custom Interface.    (line  45)
++* mpfr_custom_init_set:                  Custom Interface.    (line  52)
++* mpfr_custom_move:                      Custom Interface.    (line  89)
+ * MPFR_DECL_INIT:                        Initialization Functions.
+                                                               (line  77)
+ * mpfr_digamma:                          Transcendental Functions.
+@@ -5165,19 +5169,19 @@
+ Node: Memory Handling Functions155904
+ Node: Compatibility with MPF157792
+ Node: Custom Interface160961
+-Node: Internals165592
+-Node: API Compatibility167136
+-Node: Type and Macro Changes169084
+-Node: Added Functions172267
+-Node: Changed Functions177074
+-Node: Removed Functions184433
+-Node: Other Changes185163
+-Node: MPFR and the IEEE 754 Standard186864
+-Node: Contributors189481
+-Node: References192620
+-Node: GNU Free Documentation License194501
+-Node: Concept Index217095
+-Node: Function and Type Index223168
++Node: Internals165852
++Node: API Compatibility167396
++Node: Type and Macro Changes169344
++Node: Added Functions172527
++Node: Changed Functions177334
++Node: Removed Functions184693
++Node: Other Changes185423
++Node: MPFR and the IEEE 754 Standard187124
++Node: Contributors189741
++Node: References192880
++Node: GNU Free Documentation License194761
++Node: Concept Index217355
++Node: Function and Type Index223428
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-4.1.0-a/doc/mpfr.texi mpfr-4.1.0-b/doc/mpfr.texi
+--- mpfr-4.1.0-a/doc/mpfr.texi	2020-07-10 11:52:33.000000000 +0000
++++ mpfr-4.1.0-b/doc/mpfr.texi	2021-03-09 13:55:43.211158639 +0000
+@@ -3817,6 +3817,12 @@
+ Each function in this interface is also implemented as a macro for
+ efficiency reasons: for example @code{mpfr_custom_init (s, p)}
+ uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function.
++Note that the macro may evaluate arguments multiple times (or none).
++Moreover, macros implementing functions with the @code{void} return type
++may not be used in contexts where an expression is expected, e.g., inside
++@code{for(...)} or before a comma operator.
++@c These limitations with macros cannot be avoided in a C90 compatible way.
++@c In the future, inline functions could be used.
+ 
+ Note 1: MPFR functions may still initialize temporary floating-point numbers
+ using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@.
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-02-17 17:25:46.436981105 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-03-09 13:55:43.223158508 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p9"
++#define MPFR_VERSION_STRING "4.1.0-p10"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+@@ -833,23 +833,39 @@
+    even if it produces faster and smaller code. */
+ #ifndef MPFR_USE_NO_MACRO
+ 
+-/* Inlining these functions is both faster and smaller */
+-#define mpfr_nan_p(_x)      ((_x)->_mpfr_exp == __MPFR_EXP_NAN)
+-#define mpfr_inf_p(_x)      ((_x)->_mpfr_exp == __MPFR_EXP_INF)
+-#define mpfr_zero_p(_x)     ((_x)->_mpfr_exp == __MPFR_EXP_ZERO)
+-#define mpfr_regular_p(_x)  ((_x)->_mpfr_exp >  __MPFR_EXP_INF)
++/* In the implementation of these macros, we need to make sure that the
++   arguments are evaluated one time exactly and that type conversion is
++   done as it would be with a function. Tests should be added to ensure
++   that.
++   Note that the macros for the custom interface are not concerned; the
++   MPFR manual has been clarified. */
++
++/* Prevent x from being used as an lvalue.
++   Thanks to Wojtek Lerch and Tim Rentsch for the idea. */
++#define MPFR_VALUE_OF(x)  (0 ? (x) : (x))
++
++/* The following macro converts the argument to mpfr_srcptr, as in type
++   conversion for function parameters. But it will detect disallowed
++   implicit conversions, e.g. when the argument has an integer type. */
++#define MPFR_SRCPTR(x) ((mpfr_srcptr) (0 ? (x) : (mpfr_srcptr) (x)))
++#define MPFR_GET_SIGN(_x) MPFR_VALUE_OF(MPFR_SIGN(MPFR_SRCPTR(_x)))
++
++#define mpfr_nan_p(_x)      (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_NAN)
++#define mpfr_inf_p(_x)      (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_INF)
++#define mpfr_zero_p(_x)     (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_ZERO)
++#define mpfr_regular_p(_x)  (MPFR_SRCPTR(_x)->_mpfr_exp >  __MPFR_EXP_INF)
++
++/* mpfr_sgn is documented as a macro, thus the following code is fine.
++   But it would be safer to regard it as a function in some future
++   MPFR version. */
+ #define mpfr_sgn(_x)                                               \
+   ((_x)->_mpfr_exp < __MPFR_EXP_INF ?                              \
+    (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \
+    MPFR_SIGN (_x))
+ 
+-/* Prevent them from using as lvalues */
+-#define MPFR_VALUE_OF(x)  (0 ? (x) : (x))
+-#define mpfr_get_prec(_x) MPFR_VALUE_OF((_x)->_mpfr_prec)
+-#define mpfr_get_exp(_x)  MPFR_VALUE_OF((_x)->_mpfr_exp)
+-/* Note 1: If need be, the MPFR_VALUE_OF can be used for other expressions
+-   (of any type). Thanks to Wojtek Lerch and Tim Rentsch for the idea.
+-   Note 2: Defining mpfr_get_exp() as a macro has the effect to disable
++#define mpfr_get_prec(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_prec)
++#define mpfr_get_exp(_x)  MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_exp)
++/* Note: Defining mpfr_get_exp() as a macro has the effect to disable
+    the check that the argument is a pure FP number (done in the function);
+    this increases the risk of undetected error and makes debugging more
+    complex. Is it really worth in practice? (Potential FIXME) */
+@@ -861,11 +877,17 @@
+ 
+ #define mpfr_cmp_ui(b,i) mpfr_cmp_ui_2exp((b),(i),0)
+ #define mpfr_cmp_si(b,i) mpfr_cmp_si_2exp((b),(i),0)
+-#define mpfr_set(a,b,r)  mpfr_set4(a,b,r,MPFR_SIGN(b))
++#if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
++#define mpfr_set(a,b,r)                         \
++  __extension__ ({                              \
++      mpfr_srcptr _p = (b);                     \
++      mpfr_set4(a,_p,r,MPFR_SIGN(_p));          \
++    })
++#endif
+ #define mpfr_abs(a,b,r)  mpfr_set4(a,b,r,1)
+-#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_SIGN(c))
++#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_GET_SIGN(c))
+ #define mpfr_setsign(a,b,s,r) mpfr_set4(a,b,r,(s) ? -1 : 1)
+-#define mpfr_signbit(x)  (MPFR_SIGN(x) < 0)
++#define mpfr_signbit(x)  (MPFR_GET_SIGN(x) < 0)
+ #define mpfr_cmp(b, c)   mpfr_cmp3(b, c, 1)
+ #define mpfr_mul_2exp(y,x,n,r) mpfr_mul_2ui((y),(x),(n),(r))
+ #define mpfr_div_2exp(y,x,n,r) mpfr_div_2ui((y),(x),(n),(r))
+diff -Naurd mpfr-4.1.0-a/src/ubf.c mpfr-4.1.0-b/src/ubf.c
+--- mpfr-4.1.0-a/src/ubf.c	2020-02-12 01:38:57.000000000 +0000
++++ mpfr-4.1.0-b/src/ubf.c	2021-03-09 13:55:43.211158639 +0000
+@@ -78,7 +78,7 @@
+       mpfr_get_prec (b), mpfr_log_prec, b,
+       mpfr_get_prec (c), mpfr_log_prec, c),
+      ("a[%Pu]=%.*Rg",
+-      mpfr_get_prec (a), mpfr_log_prec, a));
++      mpfr_get_prec ((mpfr_ptr) a), mpfr_log_prec, a));
+ 
+   MPFR_ASSERTD ((mpfr_ptr) a != b);
+   MPFR_ASSERTD ((mpfr_ptr) a != c);
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-02-17 17:25:46.440981068 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-03-09 13:55:43.223158508 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p9";
++  return "4.1.0-p10";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h
+--- mpfr-4.1.0-a/tests/mpfr-test.h	2021-02-17 17:25:46.424981219 +0000
++++ mpfr-4.1.0-b/tests/mpfr-test.h	2021-03-09 13:55:43.211158639 +0000
+@@ -92,6 +92,32 @@
+ #define STRINGIZE(S) #S
+ #define MAKE_STR(S) STRINGIZE(S)
+ 
++/* In C (but not C++), mpfr_ptr and mpfr_srcptr arguments can be provided
++   in a different pointer type, such as void *. For functions implemented
++   as macros, the type conversion for the function parameters will not be
++   done by the compiler, which means potential bugs in these implementations
++   if we forget to take these unusual cases into account. So we need to test
++   such arguments, in order to make sure that the arguments are converted to
++   the expected type when needed.
++
++   However, at least when the function is not implemented as a macro (which
++   is the case when MPFR_USE_NO_MACRO is defined), such tests with void *
++   arguments are not valid in C++; therefore, we will not do the cast to
++   void * if the __cplusplus macro is defined. And with GCC compilers (and
++   compatible), we will ignore the -Wc++-compat option around these tests.
++
++   Note: in the future, inline functions could be used instead of macros,
++   and such tests would become useless (except to detect compiler bugs).
++*/
++#if defined (__cplusplus)
++#define VOIDP_CAST(X) (X)
++#else
++#define VOIDP_CAST(X) ((void *) (X))
++#if defined (__GNUC__)
++#define IGNORE_CPP_COMPAT
++#endif
++#endif
++
+ #if defined (__cplusplus)
+ extern "C" {
+ #endif
+diff -Naurd mpfr-4.1.0-a/tests/tcopysign.c mpfr-4.1.0-b/tests/tcopysign.c
+--- mpfr-4.1.0-a/tests/tcopysign.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tcopysign.c	2021-03-09 13:55:43.211158639 +0000
+@@ -26,26 +26,72 @@
+ copysign_variant (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y,
+                   mpfr_rnd_t rnd_mode, int k)
+ {
++  mpfr_srcptr p;
++  int a = 0, b = 0, c = 0;
++
++  /* invalid sign, to test that the sign is always correctly set */
++  MPFR_SIGN (z) = 0;
++
++  if (k >= 8)
++    {
++      MPFR_ASSERTN (MPFR_PREC (z) >= MPFR_PREC (x));
++      mpfr_set (z, x, MPFR_RNDN);
++      p = z;
++      k -= 8;
++    }
++  else
++    p = x;
++
+   mpfr_clear_flags ();
+   switch (k)
+     {
+     case 0:
+-      mpfr_copysign (z, x, y, MPFR_RNDN);
++      mpfr_copysign (z, p, y, rnd_mode);
+       return;
+     case 1:
+-      (mpfr_copysign) (z, x, y, MPFR_RNDN);
++      (mpfr_copysign) (z, p, y, rnd_mode);
+       return;
+     case 2:
+-      mpfr_setsign (z, x, mpfr_signbit (y), MPFR_RNDN);
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++      mpfr_copysign ((a++, VOIDP_CAST(z)),
++                     (b++, VOIDP_CAST(p)),
++                     (c++, VOIDP_CAST(y)), rnd_mode);
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
++      MPFR_ASSERTN (a == 1);
++      MPFR_ASSERTN (b == 1);
++      MPFR_ASSERTN (c == 1);
+       return;
+     case 3:
+-      mpfr_setsign (z, x, (mpfr_signbit) (y), MPFR_RNDN);
++      mpfr_setsign (z, p, mpfr_signbit (y), rnd_mode);
+       return;
+     case 4:
+-      (mpfr_setsign) (z, x, mpfr_signbit (y), MPFR_RNDN);
++      mpfr_setsign (z, p, (mpfr_signbit) (y), rnd_mode);
+       return;
+     case 5:
+-      (mpfr_setsign) (z, x, (mpfr_signbit) (y), MPFR_RNDN);
++      (mpfr_setsign) (z, p, mpfr_signbit (y), rnd_mode);
++      return;
++    case 6:
++      (mpfr_setsign) (z, p, (mpfr_signbit) (y), rnd_mode);
++      return;
++    case 7:
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++      mpfr_setsign ((a++, VOIDP_CAST(z)),
++                    (b++, VOIDP_CAST(p)),
++                    mpfr_signbit ((c++, VOIDP_CAST(y))), rnd_mode);
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
++      MPFR_ASSERTN (a == 1);
++      MPFR_ASSERTN (b == 1);
++      MPFR_ASSERTN (c == 1);
+       return;
+     }
+ }
+@@ -64,7 +110,7 @@
+ 
+   for (i = 0; i <= 1; i++)
+     for (j = 0; j <= 1; j++)
+-      for (k = 0; k <= 5; k++)
++      for (k = 0; k < 16; k++)
+         {
+           mpfr_set_nan (x);
+           i ? MPFR_SET_NEG (x) : MPFR_SET_POS (x);
+diff -Naurd mpfr-4.1.0-a/tests/texceptions.c mpfr-4.1.0-b/tests/texceptions.c
+--- mpfr-4.1.0-a/tests/texceptions.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/texceptions.c	2021-03-09 13:55:43.211158639 +0000
+@@ -103,10 +103,26 @@
+ check_get_prec (void)
+ {
+   mpfr_t x;
++  int i = 0;
+ 
+   mpfr_init2 (x, 17);
+-  if (mpfr_get_prec (x) != 17 || (mpfr_get_prec)(x) != 17)
++
++  if (mpfr_get_prec (x) != 17 || (mpfr_get_prec) (x) != 17)
+     PRINT_ERROR ("mpfr_get_prec");
++
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++
++  if (mpfr_get_prec ((i++, VOIDP_CAST(x))) != 17)
++    PRINT_ERROR ("mpfr_get_prec (2)");
++
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
++
++  MPFR_ASSERTN (i == 1);
+   mpfr_clear (x);
+ }
+ 
+diff -Naurd mpfr-4.1.0-a/tests/tisnan.c mpfr-4.1.0-b/tests/tisnan.c
+--- mpfr-4.1.0-a/tests/tisnan.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tisnan.c	2021-03-09 13:55:43.211158639 +0000
+@@ -27,180 +27,235 @@
+ main (void)
+ {
+   mpfr_t  x;
++  int i = 0, j = 0;
++
++  /* We need to check that when the function is implemented by a macro,
++     it behaves correctly. */
++#define ARG     (i++, VOIDP_CAST(x))
++#define CHECK   MPFR_ASSERTN (i == ++j)
+ 
+   tests_start_mpfr ();
+ 
+   mpfr_init (x);
+ 
++#if 0
++  /* The following should yield a compilation error when the functions
++     are implemented as macros. Change 0 to 1 above in order to test. */
++  (void) (mpfr_nan_p (1L));
++  (void) (mpfr_inf_p (1L));
++  (void) (mpfr_number_p (1L));
++  (void) (mpfr_zero_p (1L));
++  (void) (mpfr_regular_p (1L));
++#endif
++
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++
+   /* check +infinity gives non-zero for mpfr_inf_p only */
+   mpfr_set_ui (x, 1L, MPFR_RNDZ);
+   mpfr_div_ui (x, x, 0L, MPFR_RNDZ);
+-  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) )
++  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(+Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) == 0)
++  CHECK;
++  if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(+Inf) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) || (mpfr_number_p) (x) )
++  CHECK;
++  if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(+Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) )
++  CHECK;
++  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_zero_p(+Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
++  CHECK;
++  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(+Inf) gives non-zero\n");
+       exit (1);
+     }
++  CHECK;
+ 
+   /* same for -Inf */
+   mpfr_neg (x, x, MPFR_RNDN);
+-  if (mpfr_nan_p (x) || (mpfr_nan_p(x)))
++  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(-Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) == 0)
++  CHECK;
++  if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(-Inf) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) || (mpfr_number_p)(x) )
++  CHECK;
++  if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(-Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) || (mpfr_zero_p)(x) )
++  CHECK;
++  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_zero_p(-Inf) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
++  CHECK;
++  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(-Inf) gives non-zero\n");
+       exit (1);
+     }
++  CHECK;
+ 
+   /* same for NaN */
+   mpfr_sub (x, x, x, MPFR_RNDN);
+-  if (mpfr_nan_p (x) == 0)
++  if (!mpfr_nan_p (x) || !(mpfr_nan_p) (x) || !mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(NaN) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
++  CHECK;
++  if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(NaN) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) || (mpfr_number_p) (x) )
++  CHECK;
++  if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(NaN) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) || (mpfr_zero_p)(x) )
++  CHECK;
++  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(NaN) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
++  CHECK;
++  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(NaN) gives non-zero\n");
+       exit (1);
+     }
++  CHECK;
+ 
+   /* same for a regular number */
+   mpfr_set_ui (x, 1, MPFR_RNDN);
+-  if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
++  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(1) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
++  CHECK;
++  if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(1) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) == 0)
++  CHECK;
++  if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(1) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) )
++  CHECK;
++  if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_zero_p(1) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) == 0 || (mpfr_regular_p) (x) == 0)
++  CHECK;
++  if (!mpfr_regular_p (x) || !(mpfr_regular_p) (x) || !mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(1) gives zero\n");
+       exit (1);
+     }
++  CHECK;
+ 
+   /* Same for +0 */
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+-  if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
++  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(+0) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
++  CHECK;
++  if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(+0) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) == 0)
++  CHECK;
++  if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(+0) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) == 0 )
++  CHECK;
++  if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_zero_p(+0) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
++  CHECK;
++  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(+0) gives non-zero\n");
+       exit (1);
+     }
++  CHECK;
+ 
+   /* Same for -0 */
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+   mpfr_neg (x, x, MPFR_RNDN);
+-  if (mpfr_nan_p (x) || (mpfr_nan_p)(x))
++  if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG))
+     {
+       printf ("Error: mpfr_nan_p(-0) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_inf_p (x) || (mpfr_inf_p)(x) )
++  CHECK;
++  if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG))
+     {
+       printf ("Error: mpfr_inf_p(-0) gives non-zero\n");
+       exit (1);
+     }
+-  if (mpfr_number_p (x) == 0)
++  CHECK;
++  if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG))
+     {
+       printf ("Error: mpfr_number_p(-0) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_zero_p (x) == 0 )
++  CHECK;
++  if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG))
+     {
+       printf ("Error: mpfr_zero_p(-0) gives zero\n");
+       exit (1);
+     }
+-  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) )
++  CHECK;
++  if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG))
+     {
+       printf ("Error: mpfr_regular_p(-0) gives non-zero\n");
+       exit (1);
+     }
++  CHECK;
++
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
+ 
+   mpfr_clear (x);
+ 
+diff -Naurd mpfr-4.1.0-a/tests/tset.c mpfr-4.1.0-b/tests/tset.c
+--- mpfr-4.1.0-a/tests/tset.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tset.c	2021-03-09 13:55:43.207158683 +0000
+@@ -207,7 +207,7 @@
+ static void
+ check_ternary_value (void)
+ {
+-  int p, q, rnd;
++  int k, p, q, rnd;
+   int inexact, cmp;
+   mpfr_t x, y;
+ 
+@@ -226,28 +226,45 @@
+             {
+               if (rnd == MPFR_RNDF) /* the test below makes no sense */
+                 continue;
+-              inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd);
+-              cmp = mpfr_cmp (y, x);
+-              if (((inexact == 0) && (cmp != 0)) ||
+-                  ((inexact > 0) && (cmp <= 0)) ||
+-                  ((inexact < 0) && (cmp >= 0)))
+-                {
+-                  printf ("Wrong ternary value in mpfr_set for %s: expected"
+-                          " %d, got %d\n",
+-                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), cmp,
+-                          inexact);
+-                  exit (1);
+-                }
+-              /* Test mpfr_set function too */
+-              inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd);
+-              cmp = mpfr_cmp (y, x);
+-              if (((inexact == 0) && (cmp != 0)) ||
+-                  ((inexact > 0) && (cmp <= 0)) ||
+-                  ((inexact < 0) && (cmp >= 0)))
++              for (k = 0; k < 3; k++)
+                 {
+-                  printf ("Wrong ternary value in mpfr_set(2): expected %d,"
+-                          " got %d\n", cmp, inexact);
+-                  exit (1);
++                  int a = 0, b = 0, c = 0;
++
++                  switch (k)
++                    {
++                    case 0:
++                      inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd);
++                      break;
++                    case 1:
++                      inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd);
++                      break;
++                    case 2:
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++                      inexact = mpfr_set ((a++, VOIDP_CAST(y)),
++                                          (b++, VOIDP_CAST(x)),
++                                          (c++, (mpfr_rnd_t) rnd));
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
++                      MPFR_ASSERTN (a == 1);
++                      MPFR_ASSERTN (b == 1);
++                      MPFR_ASSERTN (c == 1);
++                      break;
++                    }
++                  cmp = mpfr_cmp (y, x);
++                  if (((inexact == 0) && (cmp != 0)) ||
++                      ((inexact > 0) && (cmp <= 0)) ||
++                      ((inexact < 0) && (cmp >= 0)))
++                    {
++                      printf ("Wrong ternary value in mpfr_set for %s (%d):"
++                              " expected %d, got %d\n",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd),
++                              k, cmp, inexact);
++                      exit (1);
++                    }
+                 }
+             }
+         }
+diff -Naurd mpfr-4.1.0-a/tests/tset_exp.c mpfr-4.1.0-b/tests/tset_exp.c
+--- mpfr-4.1.0-a/tests/tset_exp.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tset_exp.c	2021-03-09 13:55:43.211158639 +0000
+@@ -28,6 +28,7 @@
+   mpfr_t x;
+   int ret;
+   mpfr_exp_t emin, emax, e;
++  int i = 0;
+ 
+   tests_start_mpfr ();
+ 
+@@ -63,6 +64,17 @@
+   e = (mpfr_get_exp) (x);
+   MPFR_ASSERTN (e == emin);
+ 
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wc++-compat"
++#endif
++  e = mpfr_get_exp ((i++, VOIDP_CAST(x)));
++#ifdef IGNORE_CPP_COMPAT
++#pragma GCC diagnostic pop
++#endif
++  MPFR_ASSERTN (e == emin);
++  MPFR_ASSERTN (i == 1);
++
+   ret = mpfr_set_exp (x, -1);
+   MPFR_ASSERTN (ret == 0 && mpfr_cmp_ui_2exp (x, 1, -2) == 0);
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-03-09 13:58:00.889650773 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-03-09 13:58:00.937650249 +0000
+@@ -0,0 +1 @@
++tset_sij
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-03-09 13:55:43.223158508 +0000
++++ mpfr-4.1.0-b/VERSION	2021-03-09 13:58:00.937650249 +0000
+@@ -1 +1 @@
+-4.1.0-p10
++4.1.0-p11
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-03-09 13:55:43.223158508 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-03-09 13:58:00.933650293 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p10"
++#define MPFR_VERSION_STRING "4.1.0-p11"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-03-09 13:55:43.223158508 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-03-09 13:58:00.933650293 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p10";
++  return "4.1.0-p11";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tset_si.c mpfr-4.1.0-b/tests/tset_si.c
+--- mpfr-4.1.0-a/tests/tset_si.c	2020-03-26 11:51:33.000000000 +0000
++++ mpfr-4.1.0-b/tests/tset_si.c	2021-03-09 13:58:00.917650467 +0000
+@@ -127,27 +127,29 @@
+              power of 2 is exact, unless underflow/overflow occurs.
+              The tests on the exponent below avoid integer overflows
+              (ep[i] may take extreme values). */
+-          e = mpfr_get_exp (x1);
+           mpfr_clear_flags ();
+-          if (j != 0 && ep[i] < __gmpfr_emin - e)  /* underflow */
++          if (j == 0)
++            goto zero;
++          e = MPFR_GET_EXP (x1);
++          if (ep[i] < __gmpfr_emin - e)  /* underflow */
+             {
+               mpfr_rnd_t r =
+                 (rnd == MPFR_RNDN &&
+-                 (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 ||
++                 (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 ||
+                   IS_POW2 (sign * j))) ?
+                 MPFR_RNDZ : (mpfr_rnd_t) rnd;
+               inex1 = mpfr_underflow (x1, r, sign);
+               flags1 = __gmpfr_flags;
+             }
+-          else if (j != 0 && ep[i] > __gmpfr_emax - e)  /* overflow */
++          else if (ep[i] > __gmpfr_emax - e)  /* overflow */
+             {
+               inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign);
+               flags1 = __gmpfr_flags;
+             }
+           else
+             {
+-              if (j != 0)
+-                mpfr_set_exp (x1, ep[i] + e);
++              mpfr_set_exp (x1, ep[i] + e);
++            zero:
+               flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
+             }
+ 
+diff -Naurd mpfr-4.1.0-a/tests/tset_sj.c mpfr-4.1.0-b/tests/tset_sj.c
+--- mpfr-4.1.0-a/tests/tset_sj.c	2020-06-01 10:39:52.000000000 +0000
++++ mpfr-4.1.0-b/tests/tset_sj.c	2021-03-09 13:58:00.917650467 +0000
+@@ -225,27 +225,29 @@
+                  power of 2 is exact, unless underflow/overflow occurs.
+                  The tests on the exponent below avoid integer overflows
+                  (ep[i] may take extreme values). */
+-              e = mpfr_get_exp (x1);
+               mpfr_clear_flags ();
+-              if (j != 0 && ep[i] < __gmpfr_emin - e)  /* underflow */
++              if (j == 0)
++                goto zero;
++              e = MPFR_GET_EXP (x1);
++              if (ep[i] < __gmpfr_emin - e)  /* underflow */
+                 {
+                   mpfr_rnd_t r =
+                     (rnd == MPFR_RNDN &&
+-                     (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 ||
++                     (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 ||
+                       IS_POW2 (sign * j))) ?
+                     MPFR_RNDZ : (mpfr_rnd_t) rnd;
+                   inex1 = mpfr_underflow (x1, r, sign);
+                   flags1 = __gmpfr_flags;
+                 }
+-              else if (j != 0 && ep[i] > __gmpfr_emax - e)  /* overflow */
++              else if (ep[i] > __gmpfr_emax - e)  /* overflow */
+                 {
+                   inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign);
+                   flags1 = __gmpfr_flags;
+                 }
+               else
+                 {
+-                  if (j != 0)
+-                    mpfr_set_exp (x1, ep[i] + e);
++                  mpfr_set_exp (x1, ep[i] + e);
++                zero:
+                   flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
+                 }
+             }
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-04-23 09:49:34.648281897 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-04-23 09:49:34.696281616 +0000
+@@ -0,0 +1 @@
++get_str_ndigits
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-03-09 13:58:00.937650249 +0000
++++ mpfr-4.1.0-b/VERSION	2021-04-23 09:49:34.696281616 +0000
+@@ -1 +1 @@
+-4.1.0-p11
++4.1.0-p12
+diff -Naurd mpfr-4.1.0-a/src/get_str.c mpfr-4.1.0-b/src/get_str.c
+--- mpfr-4.1.0-a/src/get_str.c	2020-06-18 17:17:18.000000000 +0000
++++ mpfr-4.1.0-b/src/get_str.c	2021-04-23 09:49:34.680281710 +0000
+@@ -2484,6 +2484,8 @@
+ size_t
+ mpfr_get_str_ndigits (int b, mpfr_prec_t p)
+ {
++  MPFR_SAVE_EXPO_DECL (expo);
++
+   MPFR_ASSERTN (2 <= b && b <= 62);
+ 
+   /* deal first with power of two bases, since even for those, mpfr_ceil_mul
+@@ -2497,17 +2499,26 @@
+       return 1 + (p + k - 2) / k;
+     }
+ 
++  MPFR_SAVE_EXPO_MARK (expo);
++
+   /* the value returned by mpfr_ceil_mul is guaranteed to be
+      1 + ceil(p*log(2)/log(b)) for p < 186564318007 (it returns one more
+      for p=186564318007 and b=7 or 49) */
+   MPFR_STAT_STATIC_ASSERT (MPFR_PREC_BITS >= 64 || MPFR_PREC_BITS <= 32);
++  if
+ #if MPFR_PREC_BITS >= 64
+   /* 64-bit numbers are supported by the C implementation, so that we can
+      use the large constant below. If MPFR_PREC_BITS <= 32, the condition
+      is always satisfied, so that we do not need any test. */
+-  if (MPFR_LIKELY (p < 186564318007))
++    (MPFR_LIKELY (p < 186564318007))
++#else
++    (1)
+ #endif
+-    return 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1);
++  {
++    size_t ret = 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1);
++    MPFR_SAVE_EXPO_FREE (expo);
++    return ret;
++  }
+ 
+   /* Now p is large and b is not a power of two. The code below works for any
+      value of p and b, as long as b is not a power of two. Indeed, in such a
+@@ -2541,6 +2552,8 @@
+         mpfr_clear (d);
+         mpfr_clear (u);
+       }
++
++    MPFR_SAVE_EXPO_FREE (expo);
+     return 1 + ret;
+   }
+ }
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-03-09 13:58:00.933650293 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-04-23 09:49:34.692281639 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p11"
++#define MPFR_VERSION_STRING "4.1.0-p12"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-03-09 13:58:00.933650293 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-04-23 09:49:34.696281616 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p11";
++  return "4.1.0-p12";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tget_str.c mpfr-4.1.0-b/tests/tget_str.c
+--- mpfr-4.1.0-a/tests/tget_str.c	2020-01-08 18:11:13.000000000 +0000
++++ mpfr-4.1.0-b/tests/tget_str.c	2021-04-23 09:49:34.680281710 +0000
+@@ -1311,6 +1311,33 @@
+   mpfr_clear (x);
+ }
+ 
++static void
++test_ndigits_aux (int b, mpfr_prec_t p, size_t expected_m)
++{
++  size_t m;
++  mpfr_exp_t old_emin, old_emax, e[] = { MPFR_EMIN_MIN, 0, MPFR_EMAX_MAX };
++  mpfr_flags_t flags;
++  int i;
++
++  old_emin = mpfr_get_emin ();
++  old_emax = mpfr_get_emax ();
++
++  i = randlimb () % (numberof (e) + 1);
++  if (i < numberof (e))
++    {
++      set_emin (e[i]);
++      set_emax (e[i]);
++    }
++
++  __gmpfr_flags = flags = randlimb () & MPFR_FLAGS_ALL;
++  m = mpfr_get_str_ndigits (b, p);
++  MPFR_ASSERTN (m == expected_m);
++  MPFR_ASSERTN (__gmpfr_flags == flags);
++
++  set_emin (old_emin);
++  set_emax (old_emax);
++}
++
+ /* test of mpfr_get_str_ndigits */
+ static void
+ test_ndigits (void)
+@@ -1319,61 +1346,61 @@
+ 
+   /* for b=2, we have 1 + ceil((p-1)*log(2)/log(b)) = p */
+   for (p = MPFR_PREC_MIN; p <= 1024; p++)
+-    MPFR_ASSERTN(mpfr_get_str_ndigits (2, p) == p);
++    test_ndigits_aux (2, p, p);
+ 
+   /* for b=4, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/2)
+      = 1 + floor(p/2) */
+   for (p = MPFR_PREC_MIN; p <= 1024; p++)
+-    MPFR_ASSERTN(mpfr_get_str_ndigits (4, p) == 1 + (p / 2));
++    test_ndigits_aux (4, p, 1 + (p / 2));
+ 
+   /* for b=8, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/3)
+      = 1 + floor((p+1)/3) */
+   for (p = MPFR_PREC_MIN; p <= 1024; p++)
+-    MPFR_ASSERTN(mpfr_get_str_ndigits (8, p) == 1 + ((p + 1) / 3));
++    test_ndigits_aux (8, p, 1 + ((p + 1) / 3));
+ 
+   /* for b=16, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/4)
+      = 1 + floor((p+2)/4) */
+   for (p = MPFR_PREC_MIN; p <= 1024; p++)
+-    MPFR_ASSERTN(mpfr_get_str_ndigits (16, p) == 1 + ((p + 2) / 4));
++    test_ndigits_aux (16, p, 1 + ((p + 2) / 4));
+ 
+   /* for b=32, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/5)
+      = 1 + floor((p+3)/5) */
+   for (p = MPFR_PREC_MIN; p <= 1024; p++)
+-    MPFR_ASSERTN(mpfr_get_str_ndigits (32, p) == 1 + ((p + 3) / 5));
++    test_ndigits_aux (32, p, 1 + ((p + 3) / 5));
+ 
+   /* error < 1e-3 */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (57, 35) == 8);
++  test_ndigits_aux (57, 35, 8);
+ 
+   /* error < 1e-4 */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (31, 649) == 133);
++  test_ndigits_aux (31, 649, 133);
+ 
+   /* error < 1e-5 */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (43, 5041) == 931);
++  test_ndigits_aux (43, 5041, 931);
+ 
+   /* error < 1e-6 */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (41, 17771) == 3319);
++  test_ndigits_aux (41, 17771, 3319);
+ 
+   /* 20th convergent of log(2)/log(3) */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 630138897) == 397573381);
++  test_ndigits_aux (3, 630138897, 397573381);
+ 
+ #if MPFR_PREC_BITS >= 64
+   /* 21st convergent of log(2)/log(3) */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 9809721694) == 6189245292);
++  test_ndigits_aux (3, 9809721694, 6189245292);
+ 
+   /* 22nd convergent of log(2)/log(3) */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 10439860591) == 6586818672);
++  test_ndigits_aux (3, 10439860591, 6586818672);
+ 
+   /* 23rd convergent of log(2)/log(3) */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 103768467013) == 65470613322);
++  test_ndigits_aux (3, 103768467013, 65470613322);
+ 
+   /* 24th convergent of log(2)/log(3) */
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 217976794617) == 137528045314);
++  test_ndigits_aux (3, 217976794617, 137528045314);
+ 
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 1193652440098) == 753110839882);
++  test_ndigits_aux (3, 1193652440098, 753110839882);
+ 
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (3, 683381996816440) == 431166034846569);
++  test_ndigits_aux (3, 683381996816440, 431166034846569);
+ 
+-  MPFR_ASSERTN(mpfr_get_str_ndigits (7, 186564318007) == 66455550933);
++  test_ndigits_aux (7, 186564318007, 66455550933);
+ #endif
+ }
+ 
+diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
+--- mpfr-4.1.0-a/PATCHES	2021-05-17 16:09:00.574477185 +0000
++++ mpfr-4.1.0-b/PATCHES	2021-05-17 16:09:00.754476587 +0000
+@@ -0,0 +1 @@
++vasprintf-prec-zero
+diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
+--- mpfr-4.1.0-a/VERSION	2021-04-23 09:49:34.696281616 +0000
++++ mpfr-4.1.0-b/VERSION	2021-05-17 16:09:00.754476587 +0000
+@@ -1 +1 @@
+-4.1.0-p12
++4.1.0-p13
+diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
+--- mpfr-4.1.0-a/src/mpfr.h	2021-04-23 09:49:34.692281639 +0000
++++ mpfr-4.1.0-b/src/mpfr.h	2021-05-17 16:09:00.754476587 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "4.1.0-p12"
++#define MPFR_VERSION_STRING "4.1.0-p13"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c
+--- mpfr-4.1.0-a/src/vasprintf.c	2021-02-11 12:48:27.354242922 +0000
++++ mpfr-4.1.0-b/src/vasprintf.c	2021-05-17 16:09:00.598477107 +0000
+@@ -635,7 +635,13 @@
+ static int
+ buffer_cat (struct string_buffer *b, const char *s, size_t len)
+ {
+-  MPFR_ASSERTD (len > 0);
++  /* If len == 0, which is possible when outputting an integer 0
++     (either a native one or mpfr_prec_t) with precision field = 0,
++     do nothing. This test is not necessary since the code below is
++     valid for len == 0, but this is safer, just in case. */
++  if (len == 0)
++    return 0;
++
+   MPFR_ASSERTD (len <= strlen (s));
+ 
+   if (buffer_incr_len (b, len))
+diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
+--- mpfr-4.1.0-a/src/version.c	2021-04-23 09:49:34.696281616 +0000
++++ mpfr-4.1.0-b/src/version.c	2021-05-17 16:09:00.754476587 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.0-p12";
++  return "4.1.0-p13";
+ }
+diff -Naurd mpfr-4.1.0-a/tests/tsprintf.c mpfr-4.1.0-b/tests/tsprintf.c
+--- mpfr-4.1.0-a/tests/tsprintf.c	2020-04-08 22:39:35.000000000 +0000
++++ mpfr-4.1.0-b/tests/tsprintf.c	2021-05-17 16:09:00.598477107 +0000
+@@ -193,6 +193,10 @@
+   sprintf (buf, "%d", i);
+   check_vsprintf (buf, "%d", i);
+ 
++  check_vsprintf ("0", "%d", 0);
++  check_vsprintf ("", "%.d", 0);
++  check_vsprintf ("", "%.0d", 0);
++
+   sprintf (buf, "%e", d);
+   check_vsprintf (buf, "%e", d);
+ 
+@@ -227,9 +231,6 @@
+   mpfr_prec_t p = 128;
+   mpfr_t x, y, z;
+ 
+-  mpfr_init (z);
+-  mpfr_init2 (x, p);
+-
+   /* specifier 'P' for precision */
+   check_vsprintf ("128", "%Pu", p);
+   check_vsprintf ("00128", "%.5Pu", p);
+@@ -247,9 +248,19 @@
+   check_vsprintf ("0200:", "%0#+ -Po:", p);
+   check_vsprintf ("+0000128 :", "%0+ *.*Pd:", -9, 7, p);
+   check_vsprintf ("+12345   :", "%0+ -*.*Pd:", -9, -3, (mpfr_prec_t) 12345);
++  check_vsprintf ("0", "%Pu", (mpfr_prec_t) 0);
+   /* Do not add a test like "%05.1Pd" as MS Windows is buggy: when
+      a precision is given, the '0' flag must be ignored. */
+ 
++  /* specifier 'P' with precision field 0 */
++  check_vsprintf ("128", "%.Pu", p);
++  check_vsprintf ("128", "%.0Pd", p);
++  /* check_vsprintf ("", "%.Pu", (mpfr_prec_t) 0); */
++  check_vsprintf ("", "%.0Pd", (mpfr_prec_t) 0);
++
++  mpfr_init (z);
++  mpfr_init2 (x, 128);
++
+   /* special numbers */
+   mpfr_set_inf (x, 1);
+   check_sprintf (pinf_str, "%Re", x);
diff --git a/src/patches/oinkmaster-2.0-add_community_rules.patch b/src/patches/oinkmaster-2.0-add_community_rules.patch
deleted file mode 100644
index 720efd67c..000000000
--- a/src/patches/oinkmaster-2.0-add_community_rules.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur oinkmaster-2.0.org/oinkmaster.pl oinkmaster-2.0/oinkmaster.pl
---- oinkmaster-2.0.org/oinkmaster.pl	2007-04-20 05:20:32.000000000 +0200
-+++ oinkmaster-2.0/oinkmaster.pl	2013-07-15 16:46:40.000000000 +0200
-@@ -1159,6 +1159,10 @@
-         }
-     }
- 
-+  # hack for community-ruleset.
-+  if (-d "$dir/community-rules") {
-+	move("$dir/community-rules","$dir/$rules_dir");
-+  }
-   # Make sure that non-empty rules directory existed in archive.
-   # We permit empty rules directory if min_files is set to 0 though.
-     clean_exit("$url: no "$rules_dir" directory found in tar file.")
diff --git a/src/patches/oinkmaster-tmp.patch b/src/patches/oinkmaster-tmp.patch
deleted file mode 100644
index 8b2a1b89a..000000000
--- a/src/patches/oinkmaster-tmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur org/oinkmaster.conf new/oinkmaster.conf
---- org/oinkmaster.conf	2008-10-25 18:53:30.000000000 +0200
-+++ new/oinkmaster.conf	2009-12-07 20:21:15.000000000 +0100
-@@ -117,7 +117,7 @@
- # TMPDIR or TEMPDIR, or otherwise use "/tmp" if none of them was set.
- 
- # Example for UNIX.
--# tmpdir = /home/oinkmaster/tmp/
-+tmpdir = /var/tmp/
- 
- # Example if running native Win32 or Cygwin.
- # tmpdir = c:\tmp
diff --git a/src/patches/openldap-2.4.49-consolidated-1.patch b/src/patches/openldap-2.4.49-consolidated-1.patch
deleted file mode 100644
index 8cd2656e3..000000000
--- a/src/patches/openldap-2.4.49-consolidated-1.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-Submitted by:            Bruce Dubbs <bdubbs at linuxfromscratch.org>
-Date:                    2012-03-26 
-Initial Package Version: 2.4.40
-Upstream Status:         BLFS Specific
-Origin:                  Armin K. <krejzi at email dot com> and Debian 
-Comment:                 Rediffed by Fernando de Oliveira <famobr at yahoo dot
-                         com dot br> for version 2.4.44 - 2016.02.06
-                         Rediffed by Pierre Labastie <pierre dot labastie at
-                         neuf dot fr> to add mdb backend and slapd.ldif. See
-                         ticket #7394 - 2016.02.24
-Description:             Consolidate earlier patches to:
- 1. Update various installation options, such as ldap database path, 
-    configuration file options, slapd install location, etc.
- 2. Remove reference to bdb module
- 3. Enables symbol versioning in ldap libraries. Without these changes
-    some applications might generate a warning about missing symbol versions.
-
-diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4
---- openldap-2.4.40.orig/build/openldap.m4	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/build/openldap.m4	2015-03-26 15:37:39.801077750 -0500
-@@ -1142,3 +1142,54 @@
- #endif
- 	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
- ])
-+
-+dnl ====================================================================
-+dnl check for symbol versioning support
-+AC_DEFUN([OL_SYMBOL_VERSIONING],
-+[AC_CACHE_CHECK([for .symver assembler directive],
-+	[ol_cv_asm_symver_directive],[
-+cat > conftest.s <<EOF
-+${libc_cv_dot_text}
-+_sym:
-+.symver _sym,sym@VERS
-+EOF
-+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-+  ol_cv_asm_symver_directive=yes
-+else
-+  ol_cv_asm_symver_directive=no
-+fi
-+rm -f conftest*])
-+AC_CACHE_CHECK([for ld --version-script],
-+	[ol_cv_ld_version_script_option],[
-+if test $ol_cv_asm_symver_directive = yes; then
-+  cat > conftest.s <<EOF
-+${libc_cv_dot_text}
-+_sym:
-+.symver _sym,sym@VERS
-+EOF
-+  cat > conftest.map <<EOF
-+VERS_1 {
-+	global: sym;
-+};
-+
-+VERS_2 {
-+	global: sym;
-+} VERS_1;
-+EOF
-+  if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-+    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
-+                                                 -o conftest.so conftest.o
-+                                                 -Wl,--version-script,conftest.map
-+                       1>&AS_MESSAGE_LOG_FD]);
-+    then
-+      ol_cv_ld_version_script_option=yes
-+    else
-+      ol_cv_ld_version_script_option=no
-+    fi
-+  else
-+    ol_cv_ld_version_script_option=no
-+  fi
-+else
-+  ol_cv_ld_version_script_option=no
-+fi
-+rm -f conftest*])])
-diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk
---- openldap-2.4.40.orig/build/top.mk	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/build/top.mk	2015-03-26 15:37:39.801077750 -0500
-@@ -104,6 +104,9 @@
- # LINK_LIBS referenced in library and module link commands.
- LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
- 
-+# option to pass to $(CC) to support library symbol versioning, if any
-+VERSION_OPTION = @VERSION_OPTION@
-+
- LTSTATIC = @LTSTATIC@
- 
- LTLINK   = $(LIBTOOL) --mode=link \
-@@ -113,7 +116,7 @@
- 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
- 
- LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
--	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
-+	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
- 
- LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
- 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
-diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
---- openldap-2.4.40.orig/configure.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/configure.in	2015-03-26 15:37:39.801077750 -0500
-@@ -1916,6 +1916,13 @@
- fi
- AC_SUBST(LTSTATIC)dnl
- 
-+VERSION_OPTION=""
-+OL_SYMBOL_VERSIONING
-+if test $ol_cv_ld_version_script_option = yes ; then
-+  VERSION_OPTION="-Wl,--version-script="
-+fi
-+AC_SUBST(VERSION_OPTION)
-+
- dnl ----------------------------------------------------------------
- if test $ol_enable_wrappers != no ; then
- 	AC_CHECK_HEADERS(tcpd.h,[
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5
---- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/doc/man/man5/slapd-bdb.5	2015-03-26 15:36:59.637464038 -0500
-@@ -135,7 +135,7 @@
- associated indexes live.
- A separate directory must be specified for each database.
- The default is
--.BR LOCALSTATEDIR/openldap-data .
-+.BR LOCALSTATEDIR/lib/openldap .
- .TP
- .B dirtyread
- Allow reads of modified but not yet committed data.
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5
---- openldap-2.4.40.orig/doc/man/man5/slapd-config.5	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/doc/man/man5/slapd-config.5	2015-03-26 15:36:59.638464004 -0500
-@@ -2051,7 +2051,7 @@
- # The database directory MUST exist prior to
- # running slapd AND should only be accessible
- # by the slapd/tools. Mode 0700 recommended.
--olcDbDirectory: LOCALSTATEDIR/openldap-data
-+olcDbDirectory: LOCALSTATEDIR/lib/openldap
- # Indices to maintain
- olcDbIndex:     objectClass  eq
- olcDbIndex:     cn,sn,mail   pres,eq,approx,sub
-diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5
---- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/doc/man/man5/slapd.conf.5	2015-03-26 15:36:59.638464004 -0500
-@@ -2021,7 +2021,7 @@
- # The database directory MUST exist prior to
- # running slapd AND should only be accessible
- # by the slapd/tools. Mode 0700 recommended.
--directory LOCALSTATEDIR/openldap-data
-+directory LOCALSTATEDIR/lib/openldap
- # Indices to maintain
- index     objectClass  eq
- index     cn,sn,mail   pres,eq,approx,sub
-diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h
---- openldap-2.4.40.orig/include/ldap_defaults.h	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/include/ldap_defaults.h	2015-03-26 15:36:59.638464004 -0500
-@@ -39,7 +39,7 @@
- #define LDAP_ENV_PREFIX "LDAP"
- 
- /* default ldapi:// socket */
--#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
-+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
- 
- /*
-  * SLAPD DEFINITIONS
-@@ -47,7 +47,7 @@
- 	/* location of the default slapd config file */
- #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
- #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
--#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
-+#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
- #define SLAPD_DEFAULT_DB_MODE		0600
- #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
- 	/* default max deref depth for aliases */
-diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in
---- openldap-2.4.40.orig/libraries/liblber/Makefile.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/libraries/liblber/Makefile.in	2015-03-26 15:37:39.801077750 -0500
-@@ -38,6 +38,9 @@
- XXLIBS = 
- NT_LINK_LIBS = $(AC_LIBS)
- UNIX_LINK_LIBS = $(AC_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
-+endif
- 
- dtest:    $(XLIBS) dtest.o
- 	$(LTLINK) -o $@ dtest.o $(LIBS)
-@@ -48,6 +51,6 @@
- 
- install-local: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 
-diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map
---- openldap-2.4.40.orig/libraries/liblber/liblber.map	1969-12-31 18:00:00.000000000 -0600
-+++ openldap-2.4.40/libraries/liblber/liblber.map	2015-03-26 15:37:39.801077750 -0500
-@@ -0,0 +1,8 @@
-+OPENLDAP_2.4_2 {
-+  global:
-+    ber_*;
-+    der_alloc;
-+    lutil_*;
-+  local:
-+    *;
-+};
-diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in
---- openldap-2.4.40.orig/libraries/libldap/Makefile.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/libraries/libldap/Makefile.in	2015-03-26 15:37:39.802077716 -0500
-@@ -52,6 +52,9 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
-+endif
- 
- apitest:	$(XLIBS) apitest.o
- 	$(LTLINK) -o $@ apitest.o $(LIBS)
-@@ -68,7 +71,7 @@
- 
- install-local: $(CFFILES) FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
- 	@for i in $(CFFILES); do \
-diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map
---- openldap-2.4.40.orig/libraries/libldap/libldap.map	1969-12-31 18:00:00.000000000 -0600
-+++ openldap-2.4.40/libraries/libldap/libldap.map	2015-03-26 15:37:39.802077716 -0500
-@@ -0,0 +1,7 @@
-+OPENLDAP_2.4_2 {
-+  global:
-+    ldap_*;
-+    ldif_*;
-+  local:
-+    *;
-+};
-diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in
---- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/libraries/libldap_r/Makefile.in	2015-03-26 15:37:39.802077716 -0500
-@@ -61,6 +61,9 @@
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
- UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
-+ifneq (,$(VERSION_OPTION))
-+  VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
-+endif
- 
- .links : Makefile
- 	@for i in $(XXSRCS); do \
-@@ -83,6 +86,6 @@
- 
- install-local: $(CFFILES) FORCE
- 	-$(MKDIR) $(DESTDIR)$(libdir)
--	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
- 	$(LTFINISH) $(DESTDIR)$(libdir)
- 
-diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in
---- openldap-2.4.40.orig/servers/slapd/Makefile.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/servers/slapd/Makefile.in	2015-03-26 15:36:59.639463969 -0500
-@@ -376,10 +376,10 @@
- 	install-conf install-dbc-maybe install-schema install-tools
- 
- install-slapd: FORCE
--	-$(MKDIR) $(DESTDIR)$(libexecdir)
-+	-$(MKDIR) $(DESTDIR)$(sbindir)
- 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
--		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-+		slapd$(EXEEXT) $(DESTDIR)$(sbindir)
- 	@for i in $(SUBDIRS); do \
- 	    if test -d $$i && test -f $$i/Makefile ; then \
- 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
-@@ -445,9 +445,9 @@
- 
- install-db-config: FORCE
- 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
--	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
-+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
- 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
--		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
-+		$(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
- 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
- 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
- 
-@@ -455,6 +455,6 @@
- 	-$(MKDIR) $(DESTDIR)$(sbindir)
- 	for i in $(SLAPTOOLS); do \
- 		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
--		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
-+		$(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
- 	done
- 
-diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf
---- openldap-2.4.44.orig/servers/slapd/slapd.conf	2016-02-06 00:57:45.000000000 +0100
-+++ openldap-2.4.44/servers/slapd/slapd.conf	2016-02-22 23:01:47.681372594 +0100
-@@ -10,12 +10,12 @@
- # service AND an understanding of referrals.
- #referral	ldap://root.openldap.org
- 
--pidfile		%LOCALSTATEDIR%/run/slapd.pid
--argsfile	%LOCALSTATEDIR%/run/slapd.args
-+pidfile		%LOCALSTATEDIR%/run/openldap/slapd.pid
-+argsfile	%LOCALSTATEDIR%/run/openldap/slapd.args
- 
- # Load dynamic backend modules:
--# modulepath	%MODULEDIR%
--# moduleload	back_mdb.la
-+modulepath	%MODULEDIR%
-+moduleload	back_mdb.la
- # moduleload	back_ldap.la
- 
- # Sample security restrictions
-@@ -60,6 +60,6 @@
- # The database directory MUST exist prior to running slapd AND 
- # should only be accessible by the slapd and slap tools.
- # Mode 700 recommended.
--directory	%LOCALSTATEDIR%/openldap-data
-+directory	%LOCALSTATEDIR%/lib/openldap
- # Indices to maintain
- index	objectClass	eq
-diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif
---- openldap-2.4.44.orig/servers/slapd/slapd.ldif	2016-02-06 00:57:45.000000000 +0100
-+++ openldap-2.4.44/servers/slapd/slapd.ldif	2016-02-22 22:59:57.824364446 +0100
-@@ -9,8 +9,8 @@
- #
- # Define global ACLs to disable default read access.
- #
--olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
--olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
-+olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args
-+olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid
- #
- # Do not enable referrals until AFTER you have a working directory
- # service AND an understanding of referrals.
-@@ -26,10 +26,11 @@
- #
- # Load dynamic backend modules:
- #
--#dn: cn=module,cn=config
--#objectClass: olcModuleList
--#cn: module
--#olcModulepath:	%MODULEDIR%
-+dn: cn=module,cn=config
-+objectClass: olcModuleList
-+cn: module
-+olcModulepath:	%MODULEDIR%
-+olcModuleload: back_mdb.la
- #olcModuleload:	back_bdb.la
- #olcModuleload:	back_hdb.la
- #olcModuleload:	back_ldap.la
-@@ -90,6 +91,6 @@
- # The database directory MUST exist prior to running slapd AND 
- # should only be accessible by the slapd and slap tools.
- # Mode 700 recommended.
--olcDbDirectory:	%LOCALSTATEDIR%/openldap-data
-+olcDbDirectory:	%LOCALSTATEDIR%/lib/openldap
- # Indices to maintain
- olcDbIndex: objectClass eq
-diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in
---- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in	2014-09-18 20:48:49.000000000 -0500
-+++ openldap-2.4.40/servers/slapd/slapi/Makefile.in	2015-03-26 15:36:59.639463969 -0500
-@@ -46,6 +46,6 @@
- install-local: FORCE
- 	if test "$(BUILD_MOD)" = "yes"; then \
- 		$(MKDIR) $(DESTDIR)$(libdir); \
--		$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
-+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
- 	fi
- 
diff --git a/src/patches/openldap-2.6.1-consolidated-2.patch b/src/patches/openldap-2.6.1-consolidated-2.patch
new file mode 100644
index 000000000..eb7396ad6
--- /dev/null
+++ b/src/patches/openldap-2.6.1-consolidated-2.patch
@@ -0,0 +1,4689 @@
+Submitted by:            Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Date:                    2012-03-26
+Initial Package Version: 2.4.40
+Upstream Status:         BLFS Specific
+Origin:                  Armin K. <krejzi at email dot com> and Debian
+Comment:                 Rediffed by Fernando de Oliveira <famobr at yahoo dot
+                         com dot br> for version 2.4.44 - 2016.02.06
+                         Rediffed by Pierre Labastie <pierre dot labastie at
+                         neuf dot fr> to add mdb backend and slapd.ldif. See
+                         ticket #7394 - 2016.02.24
+                         Rediffed by Douglas R. Reno <renodr at linuxfromscratch
+                         dot org> to function on 2.4.51. - 2020-08-13
+                         Fixed the rediff to use a .c file instead of a .s, fixing
+                         the test by Douglas R. Reno - 2020-08-13
+                         Rediffed by Tim Tassonis <stuff at decentral.ch> to
+                         remove now integrated symbol versioning stuff and
+                         remove changes to now non-existent slapd-bdb.5 file - 2021-05-03
+                         Rediffed by Douglas R. Reno - 2022-02-13 - updated man
+                         pages for lloadd.8 and slapd.8 to use the proper path.
+Description:             Consolidate earlier patches to:
+ 1. Update various installation options, such as ldap database path,
+    configuration file options, slapd install location, etc.
+ 2. Remove reference to bdb module
+
+
+diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5 openldap-2.6.1/doc/man/man5/slapd.conf.5
+--- openldap-2.6.1.orig/doc/man/man5/slapd.conf.5	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/doc/man/man5/slapd.conf.5	2022-02-13 15:54:13.654979570 -0600
+@@ -2123,7 +2123,7 @@ suffix    "dc=our-domain,dc=com"
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-directory LOCALSTATEDIR/openldap-data
++directory LOCALSTATEDIR/lib/openldap
+ # Indices to maintain
+ index     objectClass  eq
+ index     cn,sn,mail   pres,eq,approx,sub
+diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig openldap-2.6.1/doc/man/man5/slapd.conf.5.orig
+--- openldap-2.6.1.orig/doc/man/man5/slapd.conf.5.orig	1969-12-31 18:00:00.000000000 -0600
++++ openldap-2.6.1/doc/man/man5/slapd.conf.5.orig	2022-01-19 12:32:34.000000000 -0600
+@@ -0,0 +1,2168 @@
++.TH SLAPD.CONF 5 "RELEASEDATE" "OpenLDAP LDVERSION"
++." Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved.
++." Copying restrictions apply.  See COPYRIGHT/LICENSE.
++." $OpenLDAP$
++.SH NAME
++slapd.conf - configuration file for slapd, the stand-alone LDAP daemon
++.SH SYNOPSIS
++ETCDIR/slapd.conf
++.SH DESCRIPTION
++The file
++.B ETCDIR/slapd.conf
++contains configuration information for the
++.BR slapd (8)
++daemon.  This configuration file is also used by the SLAPD tools
++.BR slapacl (8),
++.BR slapadd (8),
++.BR slapauth (8),
++.BR slapcat (8),
++.BR slapdn (8),
++.BR slapindex (8),
++.BR slapmodify (8),
++and
++.BR slaptest (8).
++.LP
++The
++.B slapd.conf
++file consists of a series of global configuration options that apply to
++.B slapd
++as a whole (including all backends), followed by zero or more database
++backend definitions that contain information specific to a backend
++instance.
++The configuration options are case-insensitive;
++their value, on a case by case basis, may be case-sensitive.
++.LP
++The general format of
++.B slapd.conf
++is as follows:
++.LP
++.nf
++    # comment - these options apply to every database
++    <global configuration options>
++    # first database definition & configuration options
++    database <backend 1 type>
++    <configuration options specific to backend 1>
++    # subsequent database definitions & configuration options
++    ...
++.fi
++.LP
++As many backend-specific sections as desired may be included.  Global
++options can be overridden in a backend (for options that appear more
++than once, the last appearance in the
++.B slapd.conf
++file is used).
++.LP
++If a line begins with white space, it is considered a continuation
++of the previous line.  No physical line should be over 2000 bytes
++long.
++.LP
++Blank lines and comment lines beginning with
++a `#' character are ignored.  Note: continuation lines are unwrapped
++before comment processing is applied.
++.LP
++Arguments on configuration lines are separated by white space. If an
++argument contains white space, the argument should be enclosed in
++double quotes.  If an argument contains a double quote (`"') or a
++backslash character (`\'), the character should be preceded by a
++backslash character.
++.LP
++The specific configuration options available are discussed below in the
++Global Configuration Options, General Backend Options, and General Database
++Options.  Backend-specific options are discussed in the
++.B slapd-<backend>(5)
++manual pages.  Refer to the "OpenLDAP Administrator's Guide" for more
++details on the slapd configuration file.
++.SH GLOBAL CONFIGURATION OPTIONS
++Options described in this section apply to all backends, unless specifically 
++overridden in a backend definition. Arguments that should be replaced by 
++actual text are shown in brackets <>.
++.TP
++.B access to <what> "[ by <who> <access> <control> ]+"
++Grant access (specified by <access>) to a set of entries and/or
++attributes (specified by <what>) by one or more requestors (specified
++by <who>).
++If no access controls are present, the default policy
++allows anyone and everyone to read anything but restricts
++updates to rootdn.  (e.g., "access to * by * read").
++The rootdn can always read and write EVERYTHING!
++See
++.BR slapd.access (5)
++and the "OpenLDAP's Administrator's Guide" for details.
++.TP
++.B allow <features>
++Specify a set of features (separated by white space) to
++allow (default none).
++.B bind_v2
++allows acceptance of LDAPv2 bind requests.  Note that
++.BR slapd (8)
++does not truly implement LDAPv2 (RFC 1777), now Historic (RFC 3494).
++.B bind_anon_cred
++allows anonymous bind when credentials are not empty (e.g.
++when DN is empty).
++.B bind_anon_dn
++allows unauthenticated (anonymous) bind when DN is not empty.
++.B update_anon
++allows unauthenticated (anonymous) update operations to be processed
++(subject to access controls and other administrative limits).
++.B proxy_authz_anon
++allows unauthenticated (anonymous) proxy authorization control to be processed
++(subject to access controls, authorization and other administrative limits).
++.TP
++.B argsfile <filename>
++The (absolute) name of a file that will hold the 
++.B slapd
++server's command line (program name and options).
++.TP
++.B attributeoptions [option-name]...
++Define tagging attribute options or option tag/range prefixes.
++Options must not end with `-', prefixes must end with `-'.
++The `lang-' prefix is predefined.
++If you use the
++.B attributeoptions
++directive, `lang-' will no longer be defined and you must specify it
++explicitly if you want it defined.
++
++An attribute description with a tagging option is a subtype of that
++attribute description without the option.
++Except for that, options defined this way have no special semantics.
++Prefixes defined this way work like the `lang-' options:
++They define a prefix for tagging options starting with the prefix.
++That is, if you define the prefix `x-foo-', you can use the option
++`x-foo-bar'.
++Furthermore, in a search or compare, a prefix or range name (with
++a trailing `-') matches all options starting with that name, as well
++as the option with the range name sans the trailing `-'.
++That is, `x-foo-bar-' matches `x-foo-bar' and `x-foo-bar-baz'.
++
++RFC 4520 reserves options beginning with `x-' for private experiments.
++Other options should be registered with IANA, see RFC 4520 section 3.5.
++OpenLDAP also has the `binary' option built in, but this is a transfer
++option, not a tagging option.
++.HP
++.hy 0
++.B attributetype "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [SUP\ <oid>]\
++ [EQUALITY\ <oid>]\
++ [ORDERING\ <oid>]\
++ [SUBSTR\ <oid>]\
++ [SYNTAX\ <oidlen>]\
++ [SINGLE-VALUE]\
++ [COLLECTIVE]\
++ [NO-USER-MODIFICATION]\
++ [USAGE\ <attributeUsage>]\ )"
++.RS
++Specify an attribute type using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the attribute OID and
++attribute syntax OID.
++(See the
++.B objectidentifier
++description.) 
++.RE
++.TP
++.B authid-rewrite<cmd> <args>
++Used by the authentication framework to convert simple user names
++to an LDAP DN used for authorization purposes.
++Its purpose is analogous to that of
++.BR authz-regexp
++(see below).
++The prefix \fIauthid-\fP is followed by a set of rules analogous
++to those described in
++.BR slapo-rwm (5)
++for data rewriting (replace the \fIrwm-\fP prefix with \fIauthid-\fP).
++.B authid-rewrite<cmd>
++and
++.B authz-regexp
++rules should not be intermixed.
++.TP
++.B authz-policy <policy>
++Used to specify which rules to use for Proxy Authorization.  Proxy
++authorization allows a client to authenticate to the server using one
++user's credentials, but specify a different identity to use for authorization
++and access control purposes. It essentially allows user A to login as user
++B, using user A's password.
++The
++.B none
++flag disables proxy authorization. This is the default setting.
++The
++.B from
++flag will use rules in the
++.I authzFrom
++attribute of the authorization DN.
++The
++.B to
++flag will use rules in the
++.I authzTo
++attribute of the authentication DN.
++The
++.B any
++flag, an alias for the deprecated value of
++.BR both ,
++will allow any of the above, whatever succeeds first (checked in
++.BR to ,
++.B from
++sequence.
++The
++.B all
++flag requires both authorizations to succeed.
++.LP
++.RS
++The rules are mechanisms to specify which identities are allowed 
++to perform proxy authorization.
++The
++.I authzFrom
++attribute in an entry specifies which other users
++are allowed to proxy login to this entry. The
++.I authzTo
++attribute in
++an entry specifies which other users this user can authorize as.  Use of
++.I authzTo
++rules can be easily
++abused if users are allowed to write arbitrary values to this attribute.
++In general the
++.I authzTo
++attribute must be protected with ACLs such that
++only privileged users can modify it.
++The value of
++.I authzFrom
++and
++.I authzTo
++describes an 
++.B identity 
++or a set of identities; it can take five forms:
++.RS
++.TP
++.B ldap:///<base>??[<scope>]?<filter>
++.RE
++.RS
++.B dn[.<dnstyle>]:<pattern>
++.RE
++.RS
++.B u[.<mech>[/<realm>]]:<pattern>
++.RE
++.RS
++.B group[/objectClass[/attributeType]]:<pattern>
++.RE
++.RS
++.B <pattern>
++.RE
++.RS
++
++.B <dnstyle>:={exact|onelevel|children|subtree|regex}
++
++.RE
++The first form is a valid LDAP
++.B URI
++where the 
++.IR <host>:<port> ,
++the
++.I <attrs>
++and the
++.I <extensions>
++portions must be absent, so that the search occurs locally on either
++.I authzFrom
++or 
++.IR authzTo .
++
++.LP
++The second form is a 
++.BR DN .
++The optional
++.B dnstyle
++modifiers
++.IR exact ,
++.IR onelevel ,
++.IR children ,
++and
++.I subtree
++provide exact, onelevel, children and subtree matches, which cause 
++.I <pattern>
++to be normalized according to the DN normalization rules.
++The special
++.B dnstyle
++modifier
++.I regex
++causes the
++.I <pattern>
++to be treated as a POSIX (''extended'') regular expression, as
++discussed in
++.BR regex (7)
++and/or
++.BR re_format (7).
++A pattern of
++.I *
++means any non-anonymous DN.
++
++.LP
++The third form is a SASL
++.BR id .
++The optional fields
++.I <mech>
++and
++.I <realm>
++allow specification of a SASL
++.BR mechanism ,
++and eventually a SASL
++.BR realm ,
++for those mechanisms that support one.
++The need to allow the specification of a mechanism is still debated, 
++and users are strongly discouraged to rely on this possibility.
++
++.LP
++The fourth form is a group specification.
++It consists of the keyword
++.BR group ,
++optionally followed by the specification of the group
++.B objectClass
++and
++.BR attributeType .
++The
++.B objectClass
++defaults to
++.IR groupOfNames .
++The
++.B attributeType
++defaults to
++.IR member .
++The group with DN
++.B <pattern>
++is searched with base scope, filtered on the specified
++.BR objectClass .
++The values of the resulting
++.B attributeType
++are searched for the asserted DN.
++
++.LP
++The fifth form is provided for backwards compatibility.  If no identity
++type is provided, i.e. only
++.B <pattern>
++is present, an
++.I exact DN
++is assumed; as a consequence, 
++.B <pattern>
++is subjected to DN normalization.
++
++.LP
++Since the interpretation of
++.I authzFrom
++and
++.I authzTo
++can impact security, users are strongly encouraged 
++to explicitly set the type of identity specification that is being used.
++A subset of these rules can be used as third arg in the 
++.B authz-regexp
++statement (see below); significantly, the 
++.IR URI ,
++provided it results in exactly one entry,
++and the
++.I dn.exact:<dn> 
++forms.
++.RE
++.TP
++.B authz-regexp <match> <replace>
++Used by the authentication framework to convert simple user names,
++such as provided by SASL subsystem, or extracted from certificates
++in case of cert-based SASL EXTERNAL, or provided within the RFC 4370
++"proxied authorization" control, to an LDAP DN used for
++authorization purposes.  Note that the resulting DN need not refer
++to an existing entry to be considered valid.  When an authorization
++request is received from the SASL subsystem, the SASL 
++.BR USERNAME ,
++.BR REALM , 
++and
++.B MECHANISM
++are taken, when available, and combined into a name of the form
++.RS
++.RS
++.TP
++.B UID=<username>[[,CN=<realm>],CN=<mechanism>],CN=auth
++
++.RE
++This name is then compared against the
++.B match
++POSIX (''extended'') regular expression, and if the match is successful,
++the name is replaced with the
++.B replace
++string.  If there are wildcard strings in the 
++.B match
++regular expression that are enclosed in parenthesis, e.g. 
++.RS
++.TP
++.B UID=([^,]*),CN=.*
++
++.RE
++then the portion of the name that matched the wildcard will be stored
++in the numbered placeholder variable $1. If there are other wildcard strings
++in parenthesis, the matching strings will be in $2, $3, etc. up to $9. The 
++placeholders can then be used in the 
++.B replace
++string, e.g. 
++.RS
++.TP
++.B UID=$1,OU=Accounts,DC=example,DC=com 
++
++.RE
++The replaced name can be either a DN, i.e. a string prefixed by "dn:",
++or an LDAP URI.
++If the latter, the server will use the URI to search its own database(s)
++and, if the search returns exactly one entry, the name is
++replaced by the DN of that entry.   The LDAP URI must have no
++hostport, attrs, or extensions components, but the filter is mandatory,
++e.g.
++.RS
++.TP
++.B ldap:///OU=Accounts,DC=example,DC=com??one?(UID=$1)
++
++.RE
++The protocol portion of the URI must be strictly
++.BR ldap .
++Note that this search is subject to access controls.  Specifically,
++the authentication identity must have "auth" access in the subject.
++
++Multiple 
++.B authz-regexp 
++options can be given in the configuration file to allow for multiple matching 
++and replacement patterns. The matching patterns are checked in the order they 
++appear in the file, stopping at the first successful match.
++
++.".B Caution:
++."Because the plus sign + is a character recognized by the regular expression engine,
++."and it will appear in names that include a REALM, be careful to escape the
++."plus sign with a backslash \+ to remove the character's special meaning.
++.RE
++.TP
++.B concurrency <integer>
++Specify a desired level of concurrency.  Provided to the underlying
++thread system as a hint.  The default is not to provide any hint. This setting
++is only meaningful on some platforms where there is not a one to one
++correspondence between user threads and kernel threads.
++.TP
++.B conn_max_pending <integer>
++Specify the maximum number of pending requests for an anonymous session.
++If requests are submitted faster than the server can process them, they
++will be queued up to this limit. If the limit is exceeded, the session
++is closed. The default is 100.
++.TP
++.B conn_max_pending_auth <integer>
++Specify the maximum number of pending requests for an authenticated session.
++The default is 1000.
++.TP
++.B defaultsearchbase <dn>
++Specify a default search base to use when client submits a
++non-base search request with an empty base DN.
++Base scoped search requests with an empty base DN are not affected.
++.TP
++.B disallow <features>
++Specify a set of features (separated by white space) to
++disallow (default none).
++.B bind_anon
++disables acceptance of anonymous bind requests.  Note that this setting
++does not prohibit anonymous directory access (See "require authc").
++.B bind_simple
++disables simple (bind) authentication.
++.B tls_2_anon
++disables forcing session to anonymous status (see also
++.BR tls_authc )
++upon StartTLS operation receipt.
++.B tls_authc
++disallows the StartTLS operation if authenticated (see also
++.BR tls_2_anon ).
++.B proxy_authz_non_critical
++disables acceptance of the proxied authorization control (RFC4370)
++with criticality set to FALSE.
++.B dontusecopy_non_critical
++disables acceptance of the dontUseCopy control (a work in progress)
++with criticality set to FALSE.
++.HP
++.hy 0
++.B ditcontentrule "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [AUX\ <oids>]\
++ [MUST\ <oids>]\
++ [MAY\ <oids>]\
++ [NOT\ <oids>]\ )"
++.RS
++Specify an DIT Content Rule using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the attribute OID and
++attribute syntax OID.
++(See the
++.B objectidentifier
++description.) 
++.RE
++.TP
++.B gentlehup { on | off }
++A SIGHUP signal will only cause a 'gentle' shutdown-attempt:
++.B Slapd
++will stop listening for new connections, but will not close the
++connections to the current clients.  Future write operations return
++unwilling-to-perform, though.  Slapd terminates when all clients
++have closed their connections (if they ever do), or - as before -
++if it receives a SIGTERM signal.  This can be useful if you wish to
++terminate the server and start a new
++.B slapd
++server
++.B with another database,
++without disrupting the currently active clients.
++The default is off.  You may wish to use
++.B idletimeout
++along with this option.
++.TP
++.B idletimeout <integer>
++Specify the number of seconds to wait before forcibly closing
++an idle client connection.  A setting of 0 disables this
++feature.  The default is 0. You may also want to set the
++.B writetimeout
++option.
++.TP
++.B include <filename>
++Read additional configuration information from the given file before
++continuing with the next line of the current file.
++.TP
++.B index_hash64 { on | off }
++Use a 64 bit hash for indexing. The default is to use 32 bit hashes.
++These hashes are used for equality and substring indexing. The 64 bit
++version may be needed to avoid index collisions when the number of
++indexed values exceeds ~64 million. (Note that substring indexing
++generates multiple index values per actual attribute value.)
++Indices generated with 32 bit hashes are incompatible with the 64 bit
++version, and vice versa. Any existing databases must be fully reloaded
++when changing this setting. This directive is only supported on 64 bit CPUs.
++.TP
++.B index_intlen <integer>
++Specify the key length for ordered integer indices. The most significant
++bytes of the binary integer will be used for index keys. The default
++value is 4, which provides exact indexing for 31 bit values.
++A floating point representation is used to index too large values.
++.TP
++.B index_substr_if_maxlen <integer>
++Specify the maximum length for subinitial and subfinal indices. Only
++this many characters of an attribute value will be processed by the
++indexing functions; any excess characters are ignored. The default is 4.
++.TP
++.B index_substr_if_minlen <integer>
++Specify the minimum length for subinitial and subfinal indices. An
++attribute value must have at least this many characters in order to be
++processed by the indexing functions. The default is 2.
++.TP
++.B index_substr_any_len <integer>
++Specify the length used for subany indices. An attribute value must have
++at least this many characters in order to be processed. Attribute values
++longer than this length will be processed in segments of this length. The
++default is 4. The subany index will also be used in subinitial and
++subfinal index lookups when the filter string is longer than the
++.I index_substr_if_maxlen
++value.
++.TP
++.B index_substr_any_step <integer>
++Specify the steps used in subany index lookups. This value sets the offset
++for the segments of a filter string that are processed for a subany index
++lookup. The default is 2. For example, with the default values, a search
++using this filter "cn=*abcdefgh*" would generate index lookups for
++"abcd", "cdef", and "efgh".
++
++.LP
++Note: Indexing support depends on the particular backend in use. Also,
++changing these settings will generally require deleting any indices that
++depend on these parameters and recreating them with
++.BR slapindex (8).
++
++.HP
++.hy 0
++.B ldapsyntax "(\ <oid>\
++ [DESC\ <description>]\
++ [X-SUBST <substitute-syntax>]\ )"
++.RS
++Specify an LDAP syntax using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the syntax OID.
++(See the
++.B objectidentifier
++description.) 
++The slapd parser also honors the
++.B X-SUBST
++extension (an OpenLDAP-specific extension), which allows one to use the
++.B ldapsyntax
++statement to define a non-implemented syntax along with another syntax,
++the extension value
++.IR substitute-syntax ,
++as its temporary replacement.
++The
++.I substitute-syntax
++must be defined.
++This allows one to define attribute types that make use of non-implemented syntaxes
++using the correct syntax OID.
++Unless 
++.B X-SUBST
++is used, this configuration statement would result in an error,
++since no handlers would be associated to the resulting syntax structure.
++.RE
++
++.TP
++.B listener-threads <integer>
++Specify the number of threads to use for the connection manager.
++The default is 1 and this is typically adequate for up to 16 CPU cores.
++The value should be set to a power of 2.
++.TP
++.B localSSF <SSF>
++Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,
++such as those to the ldapi:// listener.  For a description of SSF values,
++see 
++.BR sasl-secprops 's
++.B minssf
++option description.  The default is 71.
++.TP
++.B logfile <filename>
++Specify a file for recording slapd debug messages. By default these messages
++only go to stderr, are not recorded anywhere else, and are unrelated to
++messages exposed by the
++.B loglevel
++configuration parameter. Specifying a logfile copies messages to both stderr
++and the logfile.
++.TP
++.B logfile-format debug | syslog-utc | syslog-localtime
++Specify the prefix format for messages written to the logfile. The debug
++format is the normal format used for slapd debug messages, with a timestamp
++in hexadecimal, followed by a thread ID.  The other options are to
++use syslog(3) style prefixes, with timestamps either in UTC or in the
++local timezone. The default is debug format.
++.TP
++.B logfile-only on | off
++Specify that debug messages should only go to the configured logfile, and
++not to stderr.
++.TP
++.B logfile-rotate <max> <Mbytes> <hours>
++Specify automatic rotation for the configured logfile as the maximum
++number of old logfiles to retain, a maximum size in megabytes to allow a
++logfile to grow before rotation, and a maximum age in hours for a logfile
++to be used before rotation. The maximum number must be in the range 1-99.
++Setting Mbytes or hours to zero disables the size or age check, respectively.
++At least one of Mbytes or hours must be non-zero. By default no automatic
++rotation will be performed.
++.TP
++.B loglevel <integer> [...]
++Specify the level at which debugging statements and operation 
++statistics should be syslogged (currently logged to the
++.BR syslogd (8) 
++LOG_LOCAL4 facility).
++They must be considered subsystems rather than increasingly verbose 
++log levels.
++Some messages with higher priority are logged regardless 
++of the configured loglevel as soon as any logging is configured.
++Log levels are additive, and available levels are:
++.RS
++.RS
++.PD 0
++.TP
++.B 1
++.B (0x1 trace)
++trace function calls
++.TP
++.B 2
++.B (0x2 packets)
++debug packet handling
++.TP
++.B 4
++.B (0x4 args)
++heavy trace debugging (function args)
++.TP
++.B 8
++.B (0x8 conns)
++connection management
++.TP
++.B 16
++.B (0x10 BER)
++print out packets sent and received
++.TP
++.B 32
++.B (0x20 filter)
++search filter processing
++.TP
++.B 64
++.B (0x40 config)
++configuration file processing
++.TP
++.B 128
++.B (0x80 ACL)
++access control list processing
++.TP
++.B 256
++.B (0x100 stats)
++connections, LDAP operations, results (recommended)
++.TP
++.B 512
++.B (0x200 stats2)
++stats2 log entries sent
++.TP
++.B 1024
++.B (0x400 shell)
++print communication with shell backends
++.TP
++.B 2048
++.B (0x800 parse)
++entry parsing
++".TP
++".B 4096
++".B (0x1000 cache)
++"caching (unused)
++".TP
++".B 8192
++".B (0x2000 index)
++"data indexing (unused)
++.TP
++.B 16384
++.B (0x4000 sync)
++LDAPSync replication
++.TP
++.B 32768
++.B (0x8000 none)
++only messages that get logged whatever log level is set
++.PD
++.RE
++The desired log level can be input as a single integer that combines 
++the (ORed) desired levels, both in decimal or in hexadecimal notation,
++as a list of integers (that are ORed internally),
++or as a list of the names that are shown between parentheses, such that
++.LP
++.nf
++    loglevel 129
++    loglevel 0x81
++    loglevel 128 1
++    loglevel 0x80 0x1
++    loglevel acl trace
++.fi
++.LP
++are equivalent.
++The keyword 
++.B any
++can be used as a shortcut to enable logging at all levels (equivalent to -1).
++The keyword
++.BR none ,
++or the equivalent integer representation, causes those messages
++that are logged regardless of the configured loglevel to be logged.
++In fact, if loglevel is set to 0, no logging occurs, 
++so at least the 
++.B none
++level is required to have high priority messages logged.
++
++Note that the
++.BR packets ,
++.BR BER ,
++and
++.B parse
++levels are only available as debug output on stderr, and are not
++sent to syslog.
++
++The loglevel defaults to \fBstats\fP.
++This level should usually also be included when using other loglevels, to
++help analyze the logs.
++.RE
++.TP
++.B maxfilterdepth <integer>
++Specify the maximum depth of nested filters in search requests.
++The default is 1000.
++.TP
++.B moduleload <filename> [<arguments>...]
++Specify the name of a dynamically loadable module to load and any
++additional arguments if supported by the module. The filename
++may be an absolute path name or a simple filename. Non-absolute names
++are searched for in the directories specified by the
++.B modulepath
++option. This option and the
++.B modulepath
++option are only usable if slapd was compiled with --enable-modules.
++.TP
++.B modulepath <pathspec>
++Specify a list of directories to search for loadable modules. Typically
++the path is colon-separated but this depends on the operating system.
++The default is MODULEDIR, which is where the standard OpenLDAP install
++will place its modules.
++.HP
++.hy 0
++.B objectclass "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [SUP\ <oids>]\
++ [{ ABSTRACT | STRUCTURAL | AUXILIARY }]\
++ [MUST\ <oids>] [MAY\ <oids>] )"
++.RS
++Specify an objectclass using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the object class OID.
++(See the
++.B
++objectidentifier
++description.)  Object classes are "STRUCTURAL" by default.
++.RE
++.TP
++.B objectidentifier <name> "{ <oid> | <name>[:<suffix>] }"
++Define a string name that equates to the given OID. The string can be used
++in place of the numeric OID in objectclass and attribute definitions. The
++name can also be used with a suffix of the form ":xx" in which case the
++value "oid.xx" will be used.
++.TP
++.B password-hash <hash> [<hash>...]
++This option configures one or more hashes to be used in generation of user
++passwords stored in the userPassword attribute during processing of
++LDAP Password Modify Extended Operations (RFC 3062).
++The <hash> must be one of
++.BR {SSHA} ,
++.BR {SHA} ,
++.BR {SMD5} ,
++.BR {MD5} ,
++.BR {CRYPT} ,
++and
++.BR {CLEARTEXT} .
++The default is
++.BR {SSHA} .
++
++.B {SHA}
++and
++.B {SSHA}
++use the SHA-1 algorithm (FIPS 160-1), the latter with a seed.
++
++.B {MD5}
++and
++.B {SMD5}
++use the MD5 algorithm (RFC 1321), the latter with a seed.
++
++.B {CRYPT}
++uses the
++.BR crypt (3).
++
++.B {CLEARTEXT}
++indicates that the new password should be
++added to userPassword as clear text.
++
++Note that this option does not alter the normal user applications
++handling of userPassword during LDAP Add, Modify, or other LDAP operations.
++.TP
++.B password-crypt-salt-format <format>
++Specify the format of the salt passed to
++.BR crypt (3)
++when generating {CRYPT} passwords (see
++.BR password-hash )
++during processing of LDAP Password Modify Extended Operations (RFC 3062).
++
++This string needs to be in
++.BR sprintf (3)
++format and may include one (and only one) %s conversion.
++This conversion will be substituted with a string of random
++characters from [A-Za-z0-9./].  For example, "%.2s"
++provides a two character salt and "$1$%.8s" tells some
++versions of crypt(3) to use an MD5 algorithm and provides
++8 random characters of salt.  The default is "%s", which
++provides 31 characters of salt.
++.TP
++.B pidfile <filename>
++The (absolute) name of a file that will hold the 
++.B slapd
++server's process ID (see
++.BR getpid (2)).
++.TP
++.B pluginlog: <filename>
++The ( absolute ) name of a file that will contain log
++messages from
++.B SLAPI
++plugins. See
++.BR slapd.plugin (5)
++for details.
++.TP
++.B referral <url>
++Specify the referral to pass back when
++.BR slapd (8)
++cannot find a local database to handle a request.
++If specified multiple times, each url is provided.
++.TP
++.B require <conditions>
++Specify a set of conditions (separated by white space) to
++require (default none).
++The directive may be specified globally and/or per-database;
++databases inherit global conditions, so per-database specifications
++are additive.
++.B bind
++requires bind operation prior to directory operations.
++.B LDAPv3
++requires session to be using LDAP version 3.
++.B authc
++requires authentication prior to directory operations.
++.B SASL
++requires SASL authentication prior to directory operations.
++.B strong
++requires strong authentication prior to directory operations.
++The strong keyword allows protected "simple" authentication
++as well as SASL authentication.
++.B none
++may be used to require no conditions (useful to clear out globally
++set conditions within a particular database); it must occur first
++in the list of conditions.
++.TP
++.B reverse-lookup on | off
++Enable/disable client name unverified reverse lookup (default is 
++.BR off 
++if compiled with --enable-rlookups).
++.TP
++.B rootDSE <file>
++Specify the name of an LDIF(5) file containing user defined attributes
++for the root DSE.  These attributes are returned in addition to the
++attributes normally produced by slapd.
++
++The root DSE is an entry with information about the server and its
++capabilities, in operational attributes.
++It has the empty DN, and can be read with e.g.:
++.ti +4
++ldapsearch -x -b "" -s base "+"
++.br
++See RFC 4512 section 5.1 for details.
++.TP
++.B sasl-auxprops <plugin> [...]
++Specify which auxprop plugins to use for authentication lookups. The
++default is empty, which just uses slapd's internal support. Usually
++no other auxprop plugins are needed.
++.TP
++.B sasl-auxprops-dontusecopy <attr> [...]
++Specify which attribute(s) should be subject to the don't use copy control. This
++is necessary for some SASL mechanisms such as OTP to work in a replicated
++environment. The attribute "cmusaslsecretOTP" is the default value.
++.TP
++.B sasl-auxprops-dontusecopy-ignore on | off
++Used to disable replication of the attribute(s) defined by
++sasl-auxprops-dontusecopy and instead use a local value for the attribute. This
++allows the SASL mechanism to continue to work if the provider is offline. This can
++cause replication inconsistency. Defaults to off.
++.TP
++.B sasl-host <fqdn>
++Used to specify the fully qualified domain name used for SASL processing.
++.TP
++.B sasl-realm <realm>
++Specify SASL realm.  Default is empty.
++.TP
++.B sasl-cbinding none | tls-unique | tls-endpoint
++Specify the channel-binding type, see also LDAP_OPT_X_SASL_CBINDING.
++Default is none.
++.TP
++.B sasl-secprops <properties>
++Used to specify Cyrus SASL security properties.
++The
++.B none
++flag (without any other properties) causes the flag properties
++default, "noanonymous,noplain", to be cleared.
++The
++.B noplain
++flag disables mechanisms susceptible to simple passive attacks.
++The
++.B noactive
++flag disables mechanisms susceptible to active attacks.
++The
++.B nodict
++flag disables mechanisms susceptible to passive dictionary attacks.
++The
++.B noanonymous
++flag disables mechanisms which support anonymous login.
++The
++.B forwardsec
++flag require forward secrecy between sessions.
++The
++.B passcred
++require mechanisms which pass client credentials (and allow
++mechanisms which can pass credentials to do so).
++The
++.B minssf=<factor> 
++property specifies the minimum acceptable
++.I security strength factor
++as an integer approximate to effective key length used for
++encryption.  0 (zero) implies no protection, 1 implies integrity
++protection only, 128 allows RC4, Blowfish and other similar ciphers,
++256 will require modern ciphers.  The default is 0.
++The
++.B maxssf=<factor> 
++property specifies the maximum acceptable
++.I security strength factor
++as an integer (see minssf description).  The default is INT_MAX.
++The
++.B maxbufsize=<size> 
++property specifies the maximum security layer receive buffer
++size allowed.  0 disables security layers.  The default is 65536.
++.TP
++.B schemadn <dn>
++Specify the distinguished name for the subschema subentry that
++controls the entries on this server.  The default is "cn=Subschema".
++.TP
++.B security <factors>
++Specify a set of security strength factors (separated by white space)
++to require (see
++.BR sasl-secprops 's
++.B minssf
++option for a description of security strength factors).
++The directive may be specified globally and/or per-database.
++.B ssf=<n>
++specifies the overall security strength factor.
++.B transport=<n>
++specifies the transport security strength factor.
++.B tls=<n>
++specifies the TLS security strength factor.
++.B sasl=<n>
++specifies the SASL security strength factor.
++.B update_ssf=<n>
++specifies the overall security strength factor to require for
++directory updates.
++.B update_transport=<n>
++specifies the transport security strength factor to require for
++directory updates.
++.B update_tls=<n>
++specifies the TLS security strength factor to require for
++directory updates.
++.B update_sasl=<n>
++specifies the SASL security strength factor to require for
++directory updates.
++.B simple_bind=<n>
++specifies the security strength factor required for
++.I simple
++username/password authentication.
++Note that the
++.B transport
++factor is measure of security provided by the underlying transport,
++e.g. ldapi:// (and eventually IPSEC).  It is not normally used.
++.TP
++.B serverID <integer> [<URL>]
++Specify an integer ID from 0 to 4095 for this server. The ID may also be
++specified as a hexadecimal ID by prefixing the value with "0x".
++Non-zero IDs are required when using multi-provider replication and each
++provider must have a unique non-zero ID. Note that this requirement also
++applies to separate providers contributing to a glued set of databases.
++If the URL is provided, this directive may be specified
++multiple times, providing a complete list of participating servers
++and their IDs. The fully qualified hostname of each server should be
++used in the supplied URLs. The IDs are used in the "replica id" field
++of all CSNs generated by the specified server. The default value is zero, which
++is only valid for single provider replication.
++Example:
++.LP
++.nf
++	serverID 1 ldap://ldap1.example.com
++	serverID 2 ldap://ldap2.example.com
++.fi
++.TP
++.B sizelimit {<integer>|unlimited}
++.TP
++.B sizelimit size[.{soft|hard}]=<integer> [...]
++Specify the maximum number of entries to return from a search operation.
++The default size limit is 500.
++Use
++.B unlimited
++to specify no limits.
++The second format allows a fine grain setting of the size limits.
++If no special qualifiers are specified, both soft and hard limits are set.
++Extra args can be added on the same line.
++Additional qualifiers are available; see
++.BR limits
++for an explanation of all of the different flags.
++.TP
++.B sockbuf_max_incoming <integer>
++Specify the maximum incoming LDAP PDU size for anonymous sessions.
++The default is 262143.
++.TP
++.B sockbuf_max_incoming_auth <integer>
++Specify the maximum incoming LDAP PDU size for authenticated sessions.
++The default is 4194303.
++.TP
++.B sortvals <attr> [...]
++Specify a list of multi-valued attributes whose values will always
++be maintained in sorted order. Using this option will allow Modify,
++Compare, and filter evaluations on these attributes to be performed
++more efficiently. The resulting sort order depends on the
++attributes' syntax and matching rules and may not correspond to
++lexical order or any other recognizable order.
++.TP
++.B tcp-buffer [listener=<URL>] [{read|write}=]<size>
++Specify the size of the TCP buffer.
++A global value for both read and write TCP buffers related to any listener
++is defined, unless the listener is explicitly specified,
++or either the read or write qualifiers are used.
++See
++.BR tcp (7)
++for details.
++Note that some OS-es implement automatic TCP buffer tuning.
++.TP
++.B threads <integer>
++Specify the maximum size of the primary thread pool.
++The default is 16; the minimum value is 2.
++.TP
++.B threadqueues <integer>
++Specify the number of work queues to use for the primary thread pool.
++The default is 1 and this is typically adequate for up to 8 CPU cores.
++The value should not exceed the number of CPUs in the system.
++.TP
++.B timelimit {<integer>|unlimited}
++.TP
++.B timelimit time[.{soft|hard}]=<integer> [...]
++Specify the maximum number of seconds (in real time)
++.B slapd
++will spend answering a search request.  The default time limit is 3600.
++Use
++.B unlimited
++to specify no limits.
++The second format allows a fine grain setting of the time limits.
++Extra args can be added on the same line.  See
++.BR limits
++for an explanation of the different flags.
++.TP
++.B tool-threads <integer>
++Specify the maximum number of threads to use in tool mode.
++This should not be greater than the number of CPUs in the system.
++The default is 1.
++.TP
++.B writetimeout <integer>
++Specify the number of seconds to wait before forcibly closing
++a connection with an outstanding write. This allows recovery from
++various network hang conditions.  A writetimeout of 0 disables this
++feature.  The default is 0.
++.SH TLS OPTIONS
++If
++.B slapd
++is built with support for Transport Layer Security, there are more options
++you can specify.
++.TP
++.B TLSCipherSuite <cipher-suite-spec>
++Permits configuring what ciphers will be accepted and the preference order.
++<cipher-suite-spec> should be a cipher specification for the TLS library
++in use (OpenSSL or GnuTLS).
++Example:
++.RS
++.RS
++.TP
++.I OpenSSL:
++TLSCipherSuite HIGH:MEDIUM:+SSLv2
++.TP
++.I GnuTLS:
++TLSCiphersuite SECURE256:!AES-128-CBC
++.RE
++
++To check what ciphers a given spec selects in OpenSSL, use:
++
++.nf
++	openssl ciphers -v <cipher-suite-spec>
++.fi
++
++With GnuTLS the available specs can be found in the manual page of 
++.BR gnutls-cli (1)
++(see the description of the 
++option
++.BR --priority ).
++
++In older versions of GnuTLS, where gnutls-cli does not support the option
++--priority, you can obtain the (em more limited (em list of ciphers by calling:
++
++.nf
++	gnutls-cli -l
++.fi
++.RE
++.TP
++.B TLSCACertificateFile <filename>
++Specifies the file that contains certificates for all of the Certificate
++Authorities that
++.B slapd
++will recognize.  The certificate for
++the CA that signed the server certificate must(GnuTLS)/may(OpenSSL) be included among
++these certificates. If the signing CA was not a top-level (root) CA,
++certificates for the entire sequence of CA's from the signing CA to
++the top-level CA should be present. Multiple certificates are simply
++appended to the file; the order is not significant.
++.TP
++.B TLSCACertificatePath <path>
++Specifies the path of directories that contain Certificate Authority
++certificates in separate individual files. Usually only one of this
++or the TLSCACertificateFile is used. If both are specified, both
++locations will be used. Multiple directories may be specified,
++separated by a semi-colon.
++.TP
++.B TLSCertificateFile <filename>
++Specifies the file that contains the
++.B slapd
++server certificate.
++
++When using OpenSSL that file may also contain any number of intermediate
++certificates after the server certificate.
++.TP
++.B TLSCertificateKeyFile <filename>
++Specifies the file that contains the
++.B slapd
++server private key that matches the certificate stored in the
++.B TLSCertificateFile
++file.  Currently, the private key must not be protected with a password, so
++it is of critical importance that it is protected carefully. 
++.TP
++.B TLSDHParamFile <filename>
++This directive specifies the file that contains parameters for Diffie-Hellman
++ephemeral key exchange.  This is required in order to use a DSA certificate on
++the server, or an RSA certificate missing the "key encipherment" key usage.
++Note that setting this option may also enable
++Anonymous Diffie-Hellman key exchanges in certain non-default cipher suites.
++Anonymous key exchanges should generally be avoided since they provide no
++actual client or server authentication and provide no protection against
++man-in-the-middle attacks.
++You should append "!ADH" to your cipher suites to ensure that these suites
++are not used.
++.TP
++.B TLSECName <name>
++Specify the name of the curve(s) to use for Elliptic curve Diffie-Hellman
++ephemeral key exchange.  This option is only used for OpenSSL.
++This option is not used with GnuTLS; the curves may be
++chosen in the GnuTLS ciphersuite specification.
++.TP
++.B TLSProtocolMin <major>[.<minor>]
++Specifies minimum SSL/TLS protocol version that will be negotiated.
++If the server doesn't support at least that version,
++the SSL handshake will fail.
++To require TLS 1.x or higher, set this option to 3.(x+1),
++e.g.,
++
++.nf
++	TLSProtocolMin 3.2
++.fi
++
++would require TLS 1.1.
++Specifying a minimum that is higher than that supported by the
++OpenLDAP implementation will result in it requiring the
++highest level that it does support.
++This directive is ignored with GnuTLS.
++.TP
++.B TLSRandFile <filename>
++Specifies the file to obtain random bits from when /dev/[u]random
++is not available.  Generally set to the name of the EGD/PRNGD socket.
++The environment variable RANDFILE can also be used to specify the filename.
++This directive is ignored with GnuTLS.
++.TP
++.B TLSVerifyClient <level>
++Specifies what checks to perform on client certificates in an
++incoming TLS session, if any.
++The
++.B <level>
++can be specified as one of the following keywords:
++.RS
++.TP
++.B never
++This is the default.
++.B slapd
++will not ask the client for a certificate.
++.TP
++.B allow
++The client certificate is requested.  If no certificate is provided,
++the session proceeds normally.  If a bad certificate is provided,
++it will be ignored and the session proceeds normally.
++.TP
++.B try
++The client certificate is requested.  If no certificate is provided,
++the session proceeds normally.  If a bad certificate is provided,
++the session is immediately terminated.
++.TP
++.B demand | hard | true
++These keywords are all equivalent, for compatibility reasons.
++The client certificate is requested.  If no certificate is provided,
++or a bad certificate is provided, the session is immediately terminated.
++
++Note that a valid client certificate is required in order to use the
++SASL EXTERNAL authentication mechanism with a TLS session.  As such,
++a non-default
++.B TLSVerifyClient
++setting must be chosen to enable SASL EXTERNAL authentication.
++.RE
++.TP
++.B TLSCRLCheck <level>
++Specifies if the Certificate Revocation List (CRL) of the CA should be 
++used to verify if the client certificates have not been revoked. This
++requires
++.B TLSCACertificatePath
++parameter to be set. This directive is ignored with GnuTLS.
++.B <level>
++can be specified as one of the following keywords:
++.RS
++.TP
++.B none
++No CRL checks are performed
++.TP
++.B peer
++Check the CRL of the peer certificate
++.TP
++.B all
++Check the CRL for a whole certificate chain
++.RE
++.TP
++.B TLSCRLFile <filename>
++Specifies a file containing a Certificate Revocation List to be used
++for verifying that certificates have not been revoked. This directive is
++only valid when using GnuTLS.
++.SH GENERAL BACKEND OPTIONS
++Options in this section only apply to the configuration file section
++of all instances of the specified backend.  All backends may support
++this class of options, but currently only back-mdb does.
++.TP
++.B backend <databasetype>
++Mark the beginning of a backend definition. <databasetype>
++should be one of
++.BR asyncmeta ,
++.BR config ,
++.BR dnssrv ,
++.BR ldap ,
++.BR ldif ,
++.BR mdb ,
++.BR meta ,
++.BR monitor ,
++.BR null ,
++.BR passwd ,
++.BR perl ,
++.BR relay ,
++.BR sock ,
++.BR sql ,
++or
++.BR wt .
++At present, only back-mdb implements any options of this type, so this
++setting is not needed for any other backends.
++
++.SH GENERAL DATABASE OPTIONS
++Options in this section only apply to the configuration file section
++for the database in which they are defined.  They are supported by every
++type of backend.  Note that the
++.B database
++and at least one
++.B suffix
++option are mandatory for each database.
++.TP
++.B database <databasetype>
++Mark the beginning of a new database instance definition. <databasetype>
++should be one of
++.BR asyncmeta ,
++.BR config ,
++.BR dnssrv ,
++.BR ldap ,
++.BR ldif ,
++.BR mdb ,
++.BR meta ,
++.BR monitor ,
++.BR null ,
++.BR passwd ,
++.BR perl ,
++.BR relay ,
++.BR sock ,
++.BR sql ,
++or
++.BR wt ,
++depending on which backend will serve the database.
++
++LDAP operations, even subtree searches, normally access only one
++database.
++That can be changed by gluing databases together with the
++.B subordinate
++keyword.
++Access controls and some overlays can also involve multiple databases.
++.TP
++.B add_content_acl on | off
++Controls whether Add operations will perform ACL checks on
++the content of the entry being added. This check is off
++by default. See the
++.BR slapd.access (5)
++manual page for more details on ACL requirements for
++Add operations.
++.TP
++.B extra_attrs <attrlist>
++Lists what attributes need to be added to search requests.
++Local storage backends return the entire entry to the frontend.
++The frontend takes care of only returning the requested attributes
++that are allowed by ACLs.
++However, features like access checking and so may need specific
++attributes that are not automatically returned by remote storage
++backends, like proxy backends and so on.
++.B <attrlist>
++is a list of attributes that are needed for internal purposes
++and thus always need to be collected, even when not explicitly
++requested by clients.
++.TP
++.B hidden on | off
++Controls whether the database will be used to answer
++queries. A database that is hidden will never be
++selected to answer any queries, and any suffix configured
++on the database will be ignored in checks for conflicts
++with other databases. By default, hidden is off.
++.TP
++.B lastmod on | off
++Controls whether
++.B slapd
++will automatically maintain the 
++modifiersName, modifyTimestamp, creatorsName, and 
++createTimestamp attributes for entries. It also controls
++the entryCSN and entryUUID attributes, which are needed
++by the syncrepl provider. By default, lastmod is on.
++.TP
++.B lastbind on | off
++Controls whether
++.B slapd
++will automatically maintain the pwdLastSuccess attribute for
++entries. By default, lastbind is off.
++.TP
++.B lastbind-precision <integer>
++If lastbind is enabled, specifies how frequently pwdLastSuccess
++will be updated. More than
++.B integer
++seconds must have passed since the last successful bind. In a
++replicated environment with frequent bind activity it may be
++useful to set this to a large value.
++.TP
++.B limits <selector> <limit> [<limit> [...]]
++Specify time and size limits based on the operation's initiator or
++base DN.
++The argument
++.B <selector>
++can be any of
++.RS
++.RS
++.TP
++anonymous | users | [<dnspec>=]<pattern> | group[/oc[/at]]=<pattern>
++
++.RE
++with
++.RS
++.TP
++<dnspec> ::= dn[.<type>][.<style>]
++.TP
++<type>  ::= self | this
++.TP
++<style> ::= exact | base | onelevel | subtree | children | regex | anonymous
++
++.RE
++DN type
++.B self
++is the default and means the bound user, while
++.B this
++means the base DN of the operation.
++The term
++.B anonymous
++matches all unauthenticated clients.
++The term
++.B users
++matches all authenticated clients;
++otherwise an
++.B exact
++dn pattern is assumed unless otherwise specified by qualifying 
++the (optional) key string
++.B dn
++with 
++.B exact
++or
++.B base
++(which are synonyms), to require an exact match; with
++.BR onelevel , 
++to require exactly one level of depth match; with
++.BR subtree ,
++to allow any level of depth match, including the exact match; with
++.BR children ,
++to allow any level of depth match, not including the exact match;
++.BR regex
++explicitly requires the (default) match based on POSIX (''extended'')
++regular expression pattern.
++Finally,
++.B anonymous
++matches unbound operations; the 
++.B pattern
++field is ignored.
++The same behavior is obtained by using the 
++.B anonymous
++form of the
++.B <selector>
++clause.
++The term
++.BR group ,
++with the optional objectClass
++.B oc
++and attributeType
++.B at
++fields, followed by
++.BR pattern ,
++sets the limits for any DN listed in the values of the
++.B at
++attribute (default
++.BR member )
++of the 
++.B oc
++group objectClass (default
++.BR groupOfNames )
++whose DN exactly matches
++.BR pattern .
++
++The currently supported limits are 
++.B size
++and 
++.BR time .
++
++The syntax for time limits is 
++.BR time[.{soft|hard}]=<integer> ,
++where 
++.I integer
++is the number of seconds slapd will spend answering a search request.
++If no time limit is explicitly requested by the client, the 
++.BR soft
++limit is used; if the requested time limit exceeds the
++.BR hard
++."limit, an
++.".I "Administrative limit exceeded"
++."error is returned.
++limit, the value of the limit is used instead.
++If the
++.BR hard
++limit is set to the keyword 
++.IR soft ,
++the soft limit is used in either case; if it is set to the keyword 
++.IR unlimited , 
++no hard limit is enforced.
++Explicit requests for time limits smaller or equal to the
++.BR hard 
++limit are honored.
++If no limit specifier is set, the value is assigned to the 
++.BR soft 
++limit, and the
++.BR hard
++limit is set to
++.IR soft ,
++to preserve the original behavior.
++
++The syntax for size limits is
++.BR size[.{soft|hard|unchecked}]=<integer> ,
++where
++.I integer
++is the maximum number of entries slapd will return answering a search 
++request.
++If no size limit is explicitly requested by the client, the
++.BR soft
++limit is used; if the requested size limit exceeds the
++.BR hard
++."limit, an 
++.".I "Administrative limit exceeded"
++."error is returned.
++limit, the value of the limit is used instead.
++If the 
++.BR hard
++limit is set to the keyword 
++.IR soft , 
++the soft limit is used in either case; if it is set to the keyword
++.IR unlimited , 
++no hard limit is enforced.
++Explicit requests for size limits smaller or equal to the
++.BR hard
++limit are honored.
++The
++.BR unchecked
++specifier sets a limit on the number of candidates a search request is allowed
++to examine.
++The rationale behind it is that searches for non-properly indexed
++attributes may result in large sets of candidates, which must be 
++examined by
++.BR slapd (8)
++to determine whether they match the search filter or not.
++The
++.B unchecked
++limit provides a means to drop such operations before they are even 
++started.
++If the selected candidates exceed the 
++.BR unchecked
++limit, the search will abort with 
++.IR "Unwilling to perform" .
++If it is set to the keyword 
++.IR unlimited , 
++no limit is applied (the default).
++If it is set to
++.IR disabled ,
++the search is not even performed; this can be used to disallow searches
++for a specific set of users.
++If no limit specifier is set, the value is assigned to the
++.BR soft 
++limit, and the
++.BR hard
++limit is set to
++.IR soft ,
++to preserve the original behavior.
++
++In case of no match, the global limits are used.
++The default values are the same as for
++.B sizelimit
++and
++.BR timelimit ;
++no limit is set on 
++.BR unchecked .
++
++If 
++.B pagedResults
++control is requested, the 
++.B hard
++size limit is used by default, because the request of a specific page size
++is considered an explicit request for a limitation on the number
++of entries to be returned.
++However, the size limit applies to the total count of entries returned within
++the search, and not to a single page.
++Additional size limits may be enforced; the syntax is
++.BR size.pr={<integer>|noEstimate|unlimited} ,
++where
++.I integer
++is the max page size if no explicit limit is set; the keyword
++.I noEstimate
++inhibits the server from returning an estimate of the total number
++of entries that might be returned
++(note: the current implementation does not return any estimate).
++The keyword
++.I unlimited
++indicates that no limit is applied to the pagedResults control page size.
++The syntax
++.B size.prtotal={<integer>|hard|unlimited|disabled}
++allows one to set a limit on the total number of entries that the pagedResults
++control will return.
++By default it is set to the 
++.B hard
++limit which will use the size.hard value.
++When set, 
++.I integer
++is the max number of entries that the whole search with pagedResults control
++can return.
++Use 
++.I unlimited
++to allow unlimited number of entries to be returned, e.g. to allow
++the use of the pagedResults control as a means to circumvent size 
++limitations on regular searches; the keyword
++.I disabled
++disables the control, i.e. no paged results can be returned.
++Note that the total number of entries returned when the pagedResults control
++is requested cannot exceed the 
++.B hard 
++size limit of regular searches unless extended by the
++.B prtotal
++switch.
++
++The \fBlimits\fP statement is typically used to let an unlimited
++number of entries be returned by searches performed
++with the identity used by the consumer for synchronization purposes
++by means of the RFC 4533 LDAP Content Synchronization protocol
++(see \fBsyncrepl\fP for details).
++
++When using subordinate databases, it is necessary for any limits that
++are to be applied across the parent and its subordinates to be defined in
++both the parent and its subordinates. Otherwise the settings on the
++subordinate databases are not honored.
++.RE
++.TP
++.B maxderefdepth <depth>
++Specifies the maximum number of aliases to dereference when trying to
++resolve an entry, used to avoid infinite alias loops. The default is 15.
++.TP
++.B multiprovider on | off
++This option puts a consumer database into Multi-Provider mode.  Update
++operations will be accepted from any user, not just the updatedn.  The
++database must already be configured as a syncrepl consumer
++before this keyword may be set. This mode also requires a
++.B serverID
++(see above) to be configured.
++By default, multiprovider is off.
++.TP
++.B monitoring on | off
++This option enables database-specific monitoring in the entry related
++to the current database in the "cn=Databases,cn=Monitor" subtree 
++of the monitor database, if the monitor database is enabled.
++Currently, only the MDB database provides database-specific monitoring.
++If monitoring is supported by the backend it defaults to on, otherwise
++off.
++.TP
++.B overlay <overlay-name>
++Add the specified overlay to this database. An overlay is a piece of
++code that intercepts database operations in order to extend or change
++them. Overlays are pushed onto
++a stack over the database, and so they will execute in the reverse
++of the order in which they were configured and the database itself
++will receive control last of all. See the
++.BR slapd.overlays (5)
++manual page for an overview of the available overlays.
++Note that all of the database's
++regular settings should be configured before any overlay settings.
++.TP
++.B readonly on | off
++This option puts the database into "read-only" mode.  Any attempts to 
++modify the database will return an "unwilling to perform" error.  By
++default, readonly is off.
++.TP
++.B restrict <oplist>
++Specify a whitespace separated list of operations that are restricted.
++If defined inside a database specification, restrictions apply only
++to that database, otherwise they are global.
++Operations can be any of 
++.BR add ,
++.BR bind ,
++.BR compare ,
++.BR delete ,
++.BR extended[=<OID>] ,
++.BR modify ,
++.BR rename ,
++.BR search ,
++or the special pseudo-operations
++.B read
++and
++.BR write ,
++which respectively summarize read and write operations.
++The use of 
++.I restrict write
++is equivalent to 
++.I readonly on
++(see above).
++The 
++.B extended
++keyword allows one to indicate the OID of the specific operation
++to be restricted.
++.TP
++.B rootdn <dn>
++Specify the distinguished name that is not subject to access control 
++or administrative limit restrictions for operations on this database.
++This DN may or may not be associated with an entry.  An empty root
++DN (the default) specifies no root access is to be granted.  It is
++recommended that the rootdn only be specified when needed (such as
++when initially populating a database).  If the rootdn is within
++a namingContext (suffix) of the database, a simple bind password
++may also be provided using the
++.B rootpw
++directive. Many optional features, including syncrepl, require the
++rootdn to be defined for the database.
++.TP
++.B rootpw <password>
++Specify a password (or hash of the password) for the rootdn.  The
++password can only be set if the rootdn is within the namingContext
++(suffix) of the database.
++This option accepts all RFC 2307 userPassword formats known to
++the server (see 
++.B password-hash
++description) as well as cleartext.
++.BR slappasswd (8) 
++may be used to generate a hash of a password.  Cleartext
++and \fB{CRYPT}\fP passwords are not recommended.  If empty
++(the default), authentication of the root DN is by other means
++(e.g. SASL).  Use of SASL is encouraged.
++.TP
++.B suffix <dn suffix>
++Specify the DN suffix of queries that will be passed to this 
++backend database.  Multiple suffix lines can be given and at least one is 
++required for each database definition.
++
++If the suffix of one database is "inside" that of another, the database
++with the inner suffix must come first in the configuration file.
++You may also want to glue such databases together with the
++.B subordinate
++keyword.
++.TP
++.B subordinate [advertise]
++Specify that the current backend database is a subordinate of another
++backend database. A subordinate  database may have only one suffix. This
++option may be used to glue multiple databases into a single namingContext.
++If the suffix of the current database is within the namingContext of a
++superior database, searches against the superior database will be
++propagated to the subordinate as well. All of the databases
++associated with a single namingContext should have identical rootdns.
++Behavior of other LDAP operations is unaffected by this setting. In
++particular, it is not possible to use moddn to move an entry from
++one subordinate to another subordinate within the namingContext.
++
++If the optional \fBadvertise\fP flag is supplied, the naming context of
++this database is advertised in the root DSE. The default is to hide this
++database context, so that only the superior context is visible.
++
++If the slap tools
++.BR slapcat (8),
++.BR slapadd (8),
++.BR slapmodify (8),
++or
++.BR slapindex (8)
++are used on the superior database, any glued subordinates that support
++these tools are opened as well.
++
++Databases that are glued together should usually be configured with the
++same indices (assuming they support indexing), even for attributes that
++only exist in some of these databases. In general, all of the glued
++databases should be configured as similarly as possible, since the intent
++is to provide the appearance of a single directory.
++
++Note that the \fIsubordinate\fP functionality is implemented internally
++by the \fIglue\fP overlay and as such its behavior will interact with other
++overlays in use. By default, the glue overlay is automatically configured as
++the last overlay on the superior backend. Its position on the backend
++can be explicitly configured by setting an \fBoverlay glue\fP directive
++at the desired position. This explicit configuration is necessary e.g.
++when using the \fIsyncprov\fP overlay, which needs to follow \fIglue\fP
++in order to work over all of the glued databases. E.g.
++.RS
++.nf
++	database mdb
++	suffix dc=example,dc=com
++	...
++	overlay glue
++	overlay syncprov
++.fi
++.RE
++.TP
++.B sync_use_subentry 
++Store the syncrepl contextCSN in a subentry instead of the context entry
++of the database. The subentry's RDN will be "cn=ldapsync". By default
++the contextCSN is stored in the context entry.
++.HP
++.hy 0
++.B syncrepl rid=<replica ID>
++.B provider=ldap[s]://<hostname>[:port]
++.B searchbase=<base DN>
++.B [type=refreshOnly|refreshAndPersist]
++.B [interval=dd:hh:mm:ss]
++.B [retry=[<retry interval> <# of retries>]+]
++.B [filter=<filter str>]
++.B [scope=sub|one|base|subord]
++.B [attrs=<attr list>]
++.B [exattrs=<attr list>]
++.B [attrsonly]
++.B [sizelimit=<limit>]
++.B [timelimit=<limit>]
++.B [schemachecking=on|off]
++.B [network-timeout=<seconds>]
++.B [timeout=<seconds>]
++.B [tcp-user-timeout=<milliseconds>]
++.B [bindmethod=simple|sasl]
++.B [binddn=<dn>]
++.B [saslmech=<mech>]
++.B [authcid=<identity>]
++.B [authzid=<identity>]
++.B [credentials=<passwd>]
++.B [realm=<realm>]
++.B [secprops=<properties>]
++.B [keepalive=<idle>:<probes>:<interval>]
++.B [starttls=yes|critical]
++.B [tls_cert=<file>]
++.B [tls_key=<file>]
++.B [tls_cacert=<file>]
++.B [tls_cacertdir=<path>]
++.B [tls_reqcert=never|allow|try|demand]
++.B [tls_reqsan=never|allow|try|demand]
++.B [tls_cipher_suite=<ciphers>]
++.B [tls_ecname=<names>]
++.B [tls_crlcheck=none|peer|all]
++.B [tls_protocol_min=<major>[.<minor>]]
++.B [suffixmassage=<real DN>]
++.B [logbase=<base DN>]
++.B [logfilter=<filter str>]
++.B [syncdata=default|accesslog|changelog]
++.B [lazycommit]
++.RS
++Specify the current database as a consumer which is kept up-to-date with the 
++provider content by establishing the current
++.BR slapd (8)
++as a replication consumer site running a
++.B syncrepl
++replication engine.
++The consumer content is kept synchronized to the provider content using
++the LDAP Content Synchronization protocol. Refer to the
++"OpenLDAP Administrator's Guide" for detailed information on
++setting up a replicated
++.B slapd
++directory service using the 
++.B syncrepl
++replication engine.
++
++.B rid
++identifies the current
++.B syncrepl
++directive within the replication consumer site.
++It is a non-negative integer not greater than 999 (limited
++to three decimal digits).
++
++.B provider
++specifies the replication provider site containing the provider content
++as an LDAP URI. If <port> is not given, the standard LDAP port number
++(389 or 636) is used.
++
++The content of the
++.B syncrepl
++consumer is defined using a search
++specification as its result set. The consumer
++.B slapd
++will send search requests to the provider
++.B slapd
++according to the search specification. The search specification includes
++.BR searchbase ", " scope ", " filter ", " attrs ", " attrsonly ", " sizelimit ", "
++and
++.B timelimit
++parameters as in the normal search specification. The
++.B exattrs
++option may also be used to specify attributes that should be omitted
++from incoming entries.
++The \fBscope\fP defaults to \fBsub\fP, the \fBfilter\fP defaults to
++\fB(objectclass=*)\fP, and there is no default \fBsearchbase\fP. The
++\fBattrs\fP list defaults to \fB"*,+"\fP to return all user and operational
++attributes, and \fBattrsonly\fP and \fBexattrs\fP are unset by default.
++The \fBsizelimit\fP and \fBtimelimit\fP only
++accept "unlimited" and positive integers, and both default to "unlimited".
++The \fBsizelimit\fP and \fBtimelimit\fP parameters define
++a consumer requested limitation on the number of entries that can be returned
++by the LDAP Content Synchronization operation; as such, it is intended
++to implement partial replication based on the size of the replicated database
++and on the time required by the synchronization.
++Note, however, that any provider-side limits for the replication identity
++will be enforced by the provider regardless of the limits requested
++by the LDAP Content Synchronization operation, much like for any other
++search operation.
++
++The LDAP Content Synchronization protocol has two operation types.
++In the
++.B refreshOnly
++operation, the next synchronization search operation
++is periodically rescheduled at an interval time (specified by 
++.B interval
++parameter; 1 day by default)
++after each synchronization operation finishes.
++In the
++.B refreshAndPersist
++operation, a synchronization search remains persistent in the provider slapd.
++Further updates to the provider will generate
++.B searchResultEntry
++to the consumer slapd as the search responses to the persistent
++synchronization search. If the initial search fails due to an error, the
++next synchronization search operation is periodically rescheduled at an
++interval time (specified by
++.B interval
++parameter; 1 day by default)
++
++If an error occurs during replication, the consumer will attempt to
++reconnect according to the
++.B retry
++parameter which is a list of the <retry interval> and <# of retries> pairs.
++For example, retry="60 10 300 3" lets the consumer retry every 60 seconds
++for the first 10 times and then retry every 300 seconds for the next 3
++times before stop retrying. The `+' in <# of retries> means indefinite
++number of retries until success.
++If no 
++.B retry
++is specified, by default syncrepl retries every hour forever.
++
++The schema checking can be enforced at the LDAP Sync
++consumer site by turning on the
++.B schemachecking
++parameter. The default is \fBoff\fP.
++Schema checking \fBon\fP means that replicated entries must have
++a structural objectClass, must obey to objectClass requirements
++in terms of required/allowed attributes, and that naming attributes
++and distinguished values must be present.
++As a consequence, schema checking should be \fBoff\fP when partial
++replication is used.
++
++The
++.B network-timeout
++parameter sets how long the consumer will wait to establish a
++network connection to the provider. Once a connection is
++established, the
++.B timeout
++parameter determines how long the consumer will wait for the initial
++Bind request to complete. The defaults for these parameters come
++from 
++.BR ldap.conf (5).
++The
++.B tcp-user-timeout
++parameter, if non-zero, corresponds to the
++.B TCP_USER_TIMEOUT
++set on the target connections, overriding the operating system setting.
++Only some systems support the customization of this parameter, it is
++ignored otherwise and system-wide settings are used.
++
++A
++.B bindmethod
++of 
++.B simple
++requires the options 
++.B binddn
++and 
++.B credentials
++and should only be used when adequate security services
++(e.g. TLS or IPSEC) are in place.
++.B REMEMBER: simple bind credentials must be in cleartext!
++A
++.B bindmethod
++of
++.B sasl
++requires the option
++.B saslmech.
++Depending on the mechanism, an authentication identity and/or
++credentials can be specified using
++.B authcid
++and
++.B credentials.
++The
++.B authzid
++parameter may be used to specify an authorization identity.
++Specific security properties (as with the
++.B sasl-secprops
++keyword above) for a SASL bind can be set with the
++.B secprops
++option. A non default SASL realm can be set with the
++.B realm 
++option.
++The identity used for synchronization by the consumer should be allowed
++to receive an unlimited number of entries in response to a search request.
++The provider, other than allowing authentication of the syncrepl identity,
++should grant that identity appropriate access privileges to the data 
++that is being replicated (\fBaccess\fP directive), and appropriate time 
++and size limits.
++This can be accomplished by either allowing unlimited \fBsizelimit\fP
++and \fBtimelimit\fP, or by setting an appropriate \fBlimits\fP statement
++in the consumer's configuration (see \fBsizelimit\fP and \fBlimits\fP
++for details).
++
++The
++.B keepalive
++parameter sets the values of \fIidle\fP, \fIprobes\fP, and \fIinterval\fP
++used to check whether a socket is alive;
++.I idle
++is the number of seconds a connection needs to remain idle before TCP 
++starts sending keepalive probes;
++.I probes
++is the maximum number of keepalive probes TCP should send before dropping
++the connection;
++.I interval
++is interval in seconds between individual keepalive probes.
++Only some systems support the customization of these values;
++the
++.B keepalive
++parameter is ignored otherwise, and system-wide settings are used.
++
++The
++.B starttls
++parameter specifies use of the StartTLS extended operation
++to establish a TLS session before Binding to the provider. If the
++.B critical
++argument is supplied, the session will be aborted if the StartTLS request
++fails. Otherwise the syncrepl session continues without TLS. The
++.B tls_reqcert
++setting defaults to "demand", the
++.B tls_reqsan
++setting defaults to "allow", and the other TLS settings
++default to the same as the main slapd TLS settings.
++
++The
++.B suffixmassage
++parameter allows the consumer to pull entries from a remote directory
++whose DN suffix differs from the local directory. The portion of the
++remote entries' DNs that matches the \fIsearchbase\fP will be replaced
++with the suffixmassage DN.
++
++Rather than replicating whole entries, the consumer can query logs of
++data modifications. This mode of operation is referred to as \fIdelta
++syncrepl\fP. In addition to the above parameters, the
++.B logbase
++and
++.B logfilter
++parameters must be set appropriately for the log that will be used. The
++.B syncdata
++parameter must be set to either "accesslog" if the log conforms to the
++.BR slapo-accesslog (5)
++log format, or "changelog" if the log conforms
++to the obsolete \fIchangelog\fP format. If the
++.B syncdata
++parameter is omitted or set to "default" then the log parameters are
++ignored.
++
++The
++.B lazycommit
++parameter tells the underlying database that it can store changes without
++performing a full flush after each change. This may improve performance
++for the consumer, while sacrificing safety or durability.
++.RE
++.TP
++.B updatedn <dn>
++This option is only applicable in a replica
++database.
++It specifies the DN permitted to update (subject to access controls)
++the replica.  It is only needed in certain push-mode
++replication scenarios.  Generally, this DN
++.I should not
++be the same as the
++.B rootdn 
++used at the provider.
++.TP
++.B updateref <url>
++Specify the referral to pass back when
++.BR slapd (8)
++is asked to modify a replicated local database.
++If specified multiple times, each url is provided.
++
++.SH DATABASE-SPECIFIC OPTIONS
++Each database may allow specific configuration options; they are
++documented separately in the backends' manual pages. See the
++.BR slapd.backends (5)
++manual page for an overview of available backends.
++.SH EXAMPLES
++.LP
++Here is a short example of a configuration file:
++.LP
++.RS
++.nf
++include   SYSCONFDIR/schema/core.schema
++pidfile   LOCALSTATEDIR/run/slapd.pid
++
++# Subtypes of "name" (e.g. "cn" and "ou") with the
++# option ";x-hidden" can be searched for/compared,
++# but are not shown.  See \fBslapd.access\fP(5).
++attributeoptions x-hidden lang-
++access to attrs=name;x-hidden by * =cs
++
++# Protect passwords.  See \fBslapd.access\fP(5).
++access    to attrs=userPassword  by * auth
++# Read access to other attributes and entries.
++access    to *  by * read
++
++database  mdb
++suffix    "dc=our-domain,dc=com"
++# The database directory MUST exist prior to
++# running slapd AND should only be accessible
++# by the slapd/tools. Mode 0700 recommended.
++directory LOCALSTATEDIR/openldap-data
++# Indices to maintain
++index     objectClass  eq
++index     cn,sn,mail   pres,eq,approx,sub
++
++# We serve small clients that do not handle referrals,
++# so handle remote lookups on their behalf.
++database  ldap
++suffix    ""
++uri       ldap://ldap.some-server.com/
++lastmod   off
++.fi
++.RE
++.LP
++"OpenLDAP Administrator's Guide" contains a longer annotated
++example of a configuration file.
++The original ETCDIR/slapd.conf is another example.
++.SH FILES
++.TP
++ETCDIR/slapd.conf
++default slapd configuration file
++.SH SEE ALSO
++.BR ldap (3),
++.BR gnutls-cli (1),
++.BR slapd-config (5),
++.BR slapd.access (5),
++.BR slapd.backends (5),
++.BR slapd.overlays (5),
++.BR slapd.plugin (5),
++.BR slapd (8),
++.BR slapacl (8),
++.BR slapadd (8),
++.BR slapauth (8),
++.BR slapcat (8),
++.BR slapdn (8),
++.BR slapindex (8),
++.BR slapmodify (8),
++.BR slappasswd (8),
++.BR slaptest (8).
++.LP
++"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
++.SH ACKNOWLEDGEMENTS
++.so ../Project
+diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5 openldap-2.6.1/doc/man/man5/slapd-config.5
+--- openldap-2.6.1.orig/doc/man/man5/slapd-config.5	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/doc/man/man5/slapd-config.5	2022-02-13 15:54:13.654979570 -0600
+@@ -2234,7 +2234,7 @@ olcSuffix: "dc=our-domain,dc=com"
+ # The database directory MUST exist prior to
+ # running slapd AND should only be accessible
+ # by the slapd/tools. Mode 0700 recommended.
+-olcDbDirectory: LOCALSTATEDIR/openldap-data
++olcDbDirectory: LOCALSTATEDIR/lib/openldap
+ # Indices to maintain
+ olcDbIndex:     objectClass  eq
+ olcDbIndex:     cn,sn,mail   pres,eq,approx,sub
+diff -Naurp openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig openldap-2.6.1/doc/man/man5/slapd-config.5.orig
+--- openldap-2.6.1.orig/doc/man/man5/slapd-config.5.orig	1969-12-31 18:00:00.000000000 -0600
++++ openldap-2.6.1/doc/man/man5/slapd-config.5.orig	2022-01-19 12:32:34.000000000 -0600
+@@ -0,0 +1,2303 @@
++.TH SLAPD-CONFIG 5 "RELEASEDATE" "OpenLDAP LDVERSION"
++." Copyright 1998-2022 The OpenLDAP Foundation All Rights Reserved.
++." Copying restrictions apply.  See COPYRIGHT/LICENSE.
++." $OpenLDAP$
++.SH NAME
++slapd-config - configuration backend to slapd
++.SH SYNOPSIS
++ETCDIR/slapd.d
++.SH DESCRIPTION
++The
++.B config
++backend manages all of the configuration information for the
++.BR slapd (8)
++daemon.  This configuration information is also used by the SLAPD tools
++.BR slapacl (8),
++.BR slapadd (8),
++.BR slapauth (8),
++.BR slapcat (8),
++.BR slapdn (8),
++.BR slapindex (8),
++.BR slapmodify (8),
++and
++.BR slaptest (8).
++.LP
++The
++.B config
++backend is backward compatible with the older
++.BR slapd.conf (5)
++file but provides the ability to change the configuration dynamically
++at runtime. If slapd is run with only a
++.B slapd.conf
++file dynamic changes will be allowed but they will not persist across
++a server restart. Dynamic changes are only saved when slapd is running
++from a
++.B slapd.d
++configuration directory.
++.LP
++
++Unlike other backends, there can only be one instance of the
++.B config
++backend, and most of its structure is predefined. The root of the
++database is hardcoded to
++.B "cn=config"
++and this root entry contains
++global settings for slapd. Multiple child entries underneath the
++root entry are used to carry various other settings:
++.RS
++.TP
++.B cn=Module
++dynamically loaded modules
++.TP
++.B cn=Schema
++schema definitions
++.TP
++.B olcBackend=xxx
++backend-specific settings
++.TP
++.B olcDatabase=xxx
++database-specific settings
++.RE
++
++The
++.B cn=Module
++entries will only appear in configurations where slapd
++was built with support for dynamically loaded modules. There can be
++multiple entries, one for each configured module path. Within each
++entry there will be values recorded for each module loaded on a
++given path. These entries have no children.
++
++The
++.B cn=Schema
++entry contains all of the hardcoded schema elements.
++The children of this entry contain all user-defined schema elements.
++In schema that were loaded from include files, the child entry will
++be named after the include file from which the schema was loaded.
++Typically the first child in this subtree will be
++.BR cn=core,cn=schema,cn=config .
++
++.B olcBackend
++entries are for storing settings specific to a single
++backend type (and thus global to all database instances of that type).
++At present, only back-mdb implements any options of this type, so this
++setting is not needed for any other backends.
++
++.B olcDatabase
++entries store settings specific to a single database
++instance. These entries may have
++.B olcOverlay
++child entries corresponding
++to any overlays configured on the database. The olcDatabase and
++olcOverlay entries may also have miscellaneous child entries for
++other settings as needed. There are two special database entries
++that are predefined - one is an entry for the config database itself,
++and the other is for the "frontend" database. Settings in the
++frontend database are inherited by the other databases, unless
++they are explicitly overridden in a specific database.
++.LP
++The specific configuration options available are discussed below in the
++Global Configuration Options, General Backend Options, and General Database
++Options. Options are set by defining LDAP attributes with specific values.
++In general the names of the LDAP attributes are the same as the corresponding
++.B slapd.conf
++keyword, with an "olc" prefix added on.
++
++The parser for many of these attributes is the same as used for parsing
++the slapd.conf keywords. As such, slapd.conf keywords that allow multiple
++items to be specified on one line, separated by whitespace, will allow
++multiple items to be specified in one attribute value. However, when
++reading the attribute via LDAP, the items will be returned as individual
++attribute values.
++
++Backend-specific options are discussed in the
++.B slapd-<backend>(5)
++manual pages.  Refer to the "OpenLDAP Administrator's Guide" for more
++details on configuring slapd.
++.SH GLOBAL CONFIGURATION OPTIONS
++Options described in this section apply to the server as a whole.
++Arguments that should be replaced by 
++actual text are shown in brackets <>.
++
++These options may only be specified in the
++.B cn=config
++entry. This entry must have an objectClass of
++.BR olcGlobal .
++
++.TP
++.B olcAllows: <features>
++Specify a set of features to allow (default none).
++.B bind_v2
++allows acceptance of LDAPv2 bind requests.  Note that
++.BR slapd (8)
++does not truly implement LDAPv2 (RFC 1777), now Historic (RFC 3494).
++.B bind_anon_cred
++allows anonymous bind when credentials are not empty (e.g.
++when DN is empty).
++.B bind_anon_dn
++allows unauthenticated (anonymous) bind when DN is not empty.
++.B update_anon
++allows unauthenticated (anonymous) update operations to be processed
++(subject to access controls and other administrative limits).
++.B proxy_authz_anon
++allows unauthenticated (anonymous) proxy authorization control to be processed
++(subject to access controls, authorization and other administrative limits).
++.TP
++.B olcArgsFile: <filename>
++The (absolute) name of a file that will hold the 
++.B slapd
++server's command line (program name and options).
++.TP
++.B olcAttributeOptions: <option-name>...
++Define tagging attribute options or option tag/range prefixes.
++Options must not end with `-', prefixes must end with `-'.
++The `lang-' prefix is predefined.
++If you use the
++.B olcAttributeOptions
++directive, `lang-' will no longer be defined and you must specify it
++explicitly if you want it defined.
++
++An attribute description with a tagging option is a subtype of that
++attribute description without the option.
++Except for that, options defined this way have no special semantics.
++Prefixes defined this way work like the `lang-' options:
++They define a prefix for tagging options starting with the prefix.
++That is, if you define the prefix `x-foo-', you can use the option
++`x-foo-bar'.
++Furthermore, in a search or compare, a prefix or range name (with
++a trailing `-') matches all options starting with that name, as well
++as the option with the range name sans the trailing `-'.
++That is, `x-foo-bar-' matches `x-foo-bar' and `x-foo-bar-baz'.
++
++RFC 4520 reserves options beginning with `x-' for private experiments.
++Other options should be registered with IANA, see RFC 4520 section 3.5.
++OpenLDAP also has the `binary' option built in, but this is a transfer
++option, not a tagging option.
++.TP
++.B olcAuthIDRewrite: <rewrite-rule>
++Used by the authentication framework to convert simple user names
++to an LDAP DN used for authorization purposes.
++Its purpose is analogous to that of
++.BR olcAuthzRegexp
++(see below).
++The
++.B rewrite-rule
++is a set of rules analogous to those described in
++.BR slapo-rwm (5)
++for data rewriting (after stripping the \fIrwm-\fP prefix).
++.B olcAuthIDRewrite
++and
++.B olcAuthzRegexp
++should not be intermixed.
++.TP
++.B olcAuthzPolicy: <policy>
++Used to specify which rules to use for Proxy Authorization.  Proxy
++authorization allows a client to authenticate to the server using one
++user's credentials, but specify a different identity to use for authorization
++and access control purposes. It essentially allows user A to login as user
++B, using user A's password.
++The
++.B none
++flag disables proxy authorization. This is the default setting.
++The
++.B from
++flag will use rules in the
++.I authzFrom
++attribute of the authorization DN.
++The
++.B to
++flag will use rules in the
++.I authzTo
++attribute of the authentication DN.
++The
++.B any
++flag, an alias for the deprecated value of
++.BR both ,
++will allow any of the above, whatever succeeds first (checked in
++.BR to ,
++.B from
++sequence.
++The
++.B all
++flag requires both authorizations to succeed.
++.LP
++.RS
++The rules are mechanisms to specify which identities are allowed 
++to perform proxy authorization.
++The
++.I authzFrom
++attribute in an entry specifies which other users
++are allowed to proxy login to this entry. The
++.I authzTo
++attribute in
++an entry specifies which other users this user can authorize as.  Use of
++.I authzTo
++rules can be easily
++abused if users are allowed to write arbitrary values to this attribute.
++In general the
++.I authzTo
++attribute must be protected with ACLs such that
++only privileged users can modify it.
++The value of
++.I authzFrom
++and
++.I authzTo
++describes an 
++.B identity 
++or a set of identities; it can take five forms:
++.RS
++.TP
++.B ldap:///<base>??[<scope>]?<filter>
++.RE
++.RS
++.B dn[.<dnstyle>]:<pattern>
++.RE
++.RS
++.B u[.<mech>[<realm>]]:<pattern>
++.RE
++.RS
++.B group[/objectClass[/attributeType]]:<pattern>
++.RE
++.RS
++.B <pattern>
++.RE
++.RS
++
++.B <dnstyle>:={exact|onelevel|children|subtree|regex}
++
++.RE
++The first form is a valid LDAP
++.B URI
++where the 
++.IR <host>:<port> ,
++the
++.I <attrs>
++and the
++.I <extensions>
++portions must be absent, so that the search occurs locally on either
++.I authzFrom
++or 
++.IR authzTo .
++
++.LP
++The second form is a 
++.BR DN ,
++with the optional style modifiers
++.IR exact ,
++.IR onelevel ,
++.IR children ,
++and
++.I subtree
++for exact, onelevel, children and subtree matches, which cause 
++.I <pattern>
++to be normalized according to the DN normalization rules, or the special
++.I regex
++style, which causes the
++.I <pattern>
++to be treated as a POSIX (''extended'') regular expression, as
++discussed in
++.BR regex (7)
++and/or
++.BR re_format (7).
++A pattern of
++.I *
++means any non-anonymous DN.
++
++.LP
++The third form is a SASL
++.BR id ,
++with the optional fields
++.I <mech>
++and
++.I <realm>
++that allow to specify a SASL
++.BR mechanism ,
++and eventually a SASL
++.BR realm ,
++for those mechanisms that support one.
++The need to allow the specification of a mechanism is still debated, 
++and users are strongly discouraged to rely on this possibility.
++
++.LP
++The fourth form is a group specification.
++It consists of the keyword
++.BR group ,
++optionally followed by the specification of the group
++.B objectClass
++and
++.BR attributeType .
++The
++.B objectClass
++defaults to
++.IR groupOfNames .
++The
++.B attributeType
++defaults to
++.IR member .
++The group with DN
++.B <pattern>
++is searched with base scope, filtered on the specified
++.BR objectClass .
++The values of the resulting
++.B attributeType
++are searched for the asserted DN.
++
++.LP
++The fifth form is provided for backwards compatibility.  If no identity
++type is provided, i.e. only
++.B <pattern>
++is present, an
++.I exact DN
++is assumed; as a consequence, 
++.B <pattern>
++is subjected to DN normalization.
++
++.LP
++Since the interpretation of
++.I authzFrom
++and
++.I authzTo
++can impact security, users are strongly encouraged 
++to explicitly set the type of identity specification that is being used.
++A subset of these rules can be used as third arg in the 
++.B olcAuthzRegexp
++statement (see below); significantly, the 
++.IR URI ,
++provided it results in exactly one entry,
++and the
++.I dn.exact:<dn> 
++forms.
++.RE
++.TP
++.B olcAuthzRegexp: <match> <replace>
++Used by the authentication framework to convert simple user names,
++such as provided by SASL subsystem, or extracted from certificates
++in case of cert-based SASL EXTERNAL, or provided within the RFC 4370
++"proxied authorization" control, to an LDAP DN used for
++authorization purposes.  Note that the resulting DN need not refer
++to an existing entry to be considered valid.  When an authorization
++request is received from the SASL subsystem, the SASL 
++.BR USERNAME ,
++.BR REALM , 
++and
++.B MECHANISM
++are taken, when available, and combined into a name of the form
++.RS
++.RS
++.TP
++.B UID=<username>[[,CN=<realm>],CN=<mechanism>],CN=auth
++
++.RE
++This name is then compared against the
++.B match
++POSIX (''extended'') regular expression, and if the match is successful,
++the name is replaced with the
++.B replace
++string.  If there are wildcard strings in the 
++.B match
++regular expression that are enclosed in parenthesis, e.g. 
++.RS
++.TP
++.B UID=([^,]*),CN=.*
++
++.RE
++then the portion of the name that matched the wildcard will be stored
++in the numbered placeholder variable $1. If there are other wildcard strings
++in parenthesis, the matching strings will be in $2, $3, etc. up to $9. The 
++placeholders can then be used in the 
++.B replace
++string, e.g. 
++.RS
++.TP
++.B UID=$1,OU=Accounts,DC=example,DC=com 
++
++.RE
++The replaced name can be either a DN, i.e. a string prefixed by "dn:",
++or an LDAP URI.
++If the latter, the server will use the URI to search its own database(s)
++and, if the search returns exactly one entry, the name is
++replaced by the DN of that entry.   The LDAP URI must have no
++hostport, attrs, or extensions components, but the filter is mandatory,
++e.g.
++.RS
++.TP
++.B ldap:///OU=Accounts,DC=example,DC=com??one?(UID=$1)
++
++.RE
++The protocol portion of the URI must be strictly
++.BR ldap .
++Note that this search is subject to access controls.  Specifically,
++the authentication identity must have "auth" access in the subject.
++
++Multiple 
++.B olcAuthzRegexp 
++values can be specified to allow for multiple matching 
++and replacement patterns. The matching patterns are checked in the order they 
++appear in the attribute, stopping at the first successful match.
++
++.".B Caution:
++."Because the plus sign + is a character recognized by the regular expression engine,
++."and it will appear in names that include a REALM, be careful to escape the
++."plus sign with a backslash \+ to remove the character's special meaning.
++.RE
++.TP
++.B olcConcurrency: <integer>
++Specify a desired level of concurrency.  Provided to the underlying
++thread system as a hint.  The default is not to provide any hint. This setting
++is only meaningful on some platforms where there is not a one to one
++correspondence between user threads and kernel threads.
++.TP
++.B olcConnMaxPending: <integer>
++Specify the maximum number of pending requests for an anonymous session.
++If requests are submitted faster than the server can process them, they
++will be queued up to this limit. If the limit is exceeded, the session
++is closed. The default is 100.
++.TP
++.B olcConnMaxPendingAuth: <integer>
++Specify the maximum number of pending requests for an authenticated session.
++The default is 1000.
++.TP
++.B olcDisallows: <features>
++Specify a set of features to disallow (default none).
++.B bind_anon
++disables acceptance of anonymous bind requests.  Note that this setting
++does not prohibit anonymous directory access (See "require authc").
++.B bind_simple
++disables simple (bind) authentication.
++.B tls_2_anon
++disables forcing session to anonymous status (see also
++.BR tls_authc )
++upon StartTLS operation receipt.
++.B tls_authc
++disallows the StartTLS operation if authenticated (see also
++.BR tls_2_anon ).
++.B proxy_authz_non_critical
++disables acceptance of the proxied authorization control (RFC4370)
++with criticality set to FALSE.
++.B dontusecopy_non_critical
++disables acceptance of the dontUseCopy control (a work in progress)
++with criticality set to FALSE.
++.TP
++.B olcGentleHUP: { TRUE | FALSE }
++A SIGHUP signal will only cause a 'gentle' shutdown-attempt:
++.B Slapd
++will stop listening for new connections, but will not close the
++connections to the current clients.  Future write operations return
++unwilling-to-perform, though.  Slapd terminates when all clients
++have closed their connections (if they ever do), or - as before -
++if it receives a SIGTERM signal.  This can be useful if you wish to
++terminate the server and start a new
++.B slapd
++server
++.B with another database,
++without disrupting the currently active clients.
++The default is FALSE.  You may wish to use
++.B olcIdleTimeout
++along with this option.
++.TP
++.B olcIdleTimeout: <integer>
++Specify the number of seconds to wait before forcibly closing
++an idle client connection.  A setting of 0 disables this
++feature.  The default is 0. You may also want to set the
++.B olcWriteTimeout
++option.
++.TP
++.B olcIndexHash64: { on | off }
++Use a 64 bit hash for indexing. The default is to use 32 bit hashes.
++These hashes are used for equality and substring indexing. The 64 bit
++version may be needed to avoid index collisions when the number of
++indexed values exceeds ~64 million. (Note that substring indexing
++generates multiple index values per actual attribute value.)
++Indices generated with 32 bit hashes are incompatible with the 64 bit
++version, and vice versa. Any existing databases must be fully reloaded
++when changing this setting. This directive is only supported on 64 bit CPUs.
++.TP
++.B olcIndexIntLen: <integer>
++Specify the key length for ordered integer indices. The most significant
++bytes of the binary integer will be used for index keys. The default
++value is 4, which provides exact indexing for 31 bit values.
++A floating point representation is used to index too large values.
++.TP
++.B olcIndexSubstrIfMaxlen: <integer>
++Specify the maximum length for subinitial and subfinal indices. Only
++this many characters of an attribute value will be processed by the
++indexing functions; any excess characters are ignored. The default is 4.
++.TP
++.B olcIndexSubstrIfMinlen: <integer>
++Specify the minimum length for subinitial and subfinal indices. An
++attribute value must have at least this many characters in order to be
++processed by the indexing functions. The default is 2.
++.TP
++.B olcIndexSubstrAnyLen: <integer>
++Specify the length used for subany indices. An attribute value must have
++at least this many characters in order to be processed. Attribute values
++longer than this length will be processed in segments of this length. The
++default is 4. The subany index will also be used in subinitial and
++subfinal index lookups when the filter string is longer than the
++.I olcIndexSubstrIfMaxlen
++value.
++.TP
++.B olcIndexSubstrAnyStep: <integer>
++Specify the steps used in subany index lookups. This value sets the offset
++for the segments of a filter string that are processed for a subany index
++lookup. The default is 2. For example, with the default values, a search
++using this filter "cn=*abcdefgh*" would generate index lookups for
++"abcd", "cdef", and "efgh".
++
++.LP
++Note: Indexing support depends on the particular backend in use. Also,
++changing these settings will generally require deleting any indices that
++depend on these parameters and recreating them with
++.BR slapindex (8).
++
++.TP
++.B olcListenerThreads: <integer>
++Specify the number of threads to use for the connection manager.
++The default is 1 and this is typically adequate for up to 16 CPU cores.
++The value should be set to a power of 2.
++.TP
++.B olcLocalSSF: <SSF>
++Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,
++such as those to the ldapi:// listener.  For a description of SSF values,
++see 
++.BR olcSaslSecProps 's
++.B minssf
++option description.  The default is 71.
++.TP
++.B olcLogFile: <filename>
++Specify a file for recording slapd debug messages. By default these messages
++only go to stderr, are not recorded anywhere else, and are unrelated to
++messages exposed by the
++.B olcLogLevel
++configuration parameter. Specifying a logfile copies messages to both stderr
++and the logfile.
++.TP
++.B olcLogFileFormat: debug | syslog-utc | syslog-localtime
++Specify the prefix format for messages written to the logfile. The debug
++format is the normal format used for slapd debug messages, with a timestamp
++in hexadecimal, followed by a thread ID.  The other options are to
++use syslog(3) style prefixes, with timestamps either in UTC or in the
++local timezone. The default is debug format.
++.TP
++.B olcLogFileOnly: TRUE | FALSE
++Specify that debug messages should only go to the configured logfile, and
++not to stderr.
++.TP
++.B olcLogFileRotate: <max> <Mbytes> <hours>
++Specify automatic rotation for the configured logfile as the maximum
++number of old logfiles to retain, a maximum size in megabytes to allow a
++logfile to grow before rotation, and a maximum age in hours for a logfile
++to be used before rotation. The maximum number must be in the range 1-99.
++Setting Mbytes or hours to zero disables the size or age check, respectively.
++At least one of Mbytes or hours must be non-zero. By default no automatic
++rotation will be performed.
++.TP
++.B olcLogLevel: <integer> [...]
++Specify the level at which debugging statements and operation 
++statistics should be syslogged (currently logged to the
++.BR syslogd (8) 
++LOG_LOCAL4 facility).
++They must be considered subsystems rather than increasingly verbose 
++log levels.
++Some messages with higher priority are logged regardless 
++of the configured loglevel as soon as any logging is configured.
++Log levels are additive, and available levels are:
++.RS
++.RS
++.PD 0
++.TP
++.B 1
++.B (0x1 trace)
++trace function calls
++.TP
++.B 2
++.B (0x2 packets)
++debug packet handling
++.TP
++.B 4
++.B (0x4 args)
++heavy trace debugging (function args)
++.TP
++.B 8
++.B (0x8 conns)
++connection management
++.TP
++.B 16
++.B (0x10 BER)
++print out packets sent and received
++.TP
++.B 32
++.B (0x20 filter)
++search filter processing
++.TP
++.B 64
++.B (0x40 config)
++configuration file processing
++.TP
++.B 128
++.B (0x80 ACL)
++access control list processing
++.TP
++.B 256
++.B (0x100 stats)
++connections, LDAP operations, results (recommended)
++.TP
++.B 512
++.B (0x200 stats2)
++stats2 log entries sent
++.TP
++.B 1024
++.B (0x400 shell)
++print communication with shell backends
++.TP
++.B 2048
++.B (0x800 parse)
++entry parsing
++".TP
++".B 4096
++".B (0x1000 cache)
++"caching (unused)
++".TP
++".B 8192
++".B (0x2000 index)
++"data indexing (unused)
++.TP
++.B 16384
++.B (0x4000 sync)
++LDAPSync replication
++.TP
++.B 32768
++.B (0x8000 none)
++only messages that get logged whatever log level is set
++.PD
++.RE
++The desired log level can be input as a single integer that combines 
++the (ORed) desired levels, both in decimal or in hexadecimal notation,
++as a list of integers (that are ORed internally),
++or as a list of the names that are shown between parenthesis, such that
++.LP
++.nf
++    olcLogLevel: 129
++    olcLogLevel: 0x81
++    olcLogLevel: 128 1
++    olcLogLevel: 0x80 0x1
++    olcLogLevel: acl trace
++.fi
++.LP
++are equivalent.
++The keyword 
++.B any
++can be used as a shortcut to enable logging at all levels (equivalent to -1).
++The keyword
++.BR none ,
++or the equivalent integer representation, causes those messages
++that are logged regardless of the configured olcLogLevel to be logged.
++In fact, if no olcLogLevel (or a 0 level) is defined, no logging occurs, 
++so at least the 
++.B none
++level is required to have high priority messages logged.
++
++Note that the
++.BR packets ,
++.BR BER ,
++and
++.B parse
++levels are only available as debug output on stderr, and are not
++sent to syslog.
++
++This setting defaults to \fBstats\fP.
++This level should usually also be included when using other loglevels, to
++help analyze the logs.
++.RE
++.TP
++.B olcMaxFilterDepth: <integer>
++Specify the maximum depth of nested filters in search requests.
++The default is 1000.
++.TP
++.B olcPasswordCryptSaltFormat: <format>
++Specify the format of the salt passed to
++.BR crypt (3)
++when generating {CRYPT} passwords (see
++.BR olcPasswordHash )
++during processing of LDAP Password Modify Extended Operations (RFC 3062).
++
++This string needs to be in
++.BR sprintf (3)
++format and may include one (and only one) %s conversion.
++This conversion will be substituted with a string of random
++characters from [A-Za-z0-9./].  For example, "%.2s"
++provides a two character salt and "$1$%.8s" tells some
++versions of crypt(3) to use an MD5 algorithm and provides
++8 random characters of salt.  The default is "%s", which
++provides 31 characters of salt.
++.TP
++.B olcPidFile: <filename>
++The (absolute) name of a file that will hold the 
++.B slapd
++server's process ID (see
++.BR getpid (2)).
++.TP
++.B olcPluginLogFile: <filename>
++The ( absolute ) name of a file that will contain log
++messages from
++.B SLAPI
++plugins. See
++.BR slapd.plugin (5)
++for details.
++.TP
++.B olcReferral: <url>
++Specify the referral to pass back when
++.BR slapd (8)
++cannot find a local database to handle a request.
++If multiple values are specified, each url is provided.
++.TP
++.B olcReverseLookup: TRUE | FALSE
++Enable/disable client name unverified reverse lookup (default is 
++.BR FALSE 
++if compiled with --enable-rlookups).
++.TP
++.B olcRootDSE: <file>
++Specify the name of an LDIF(5) file containing user defined attributes
++for the root DSE.  These attributes are returned in addition to the
++attributes normally produced by slapd.
++
++The root DSE is an entry with information about the server and its
++capabilities, in operational attributes.
++It has the empty DN, and can be read with e.g.:
++.ti +4
++ldapsearch -x -b "" -s base "+"
++.br
++See RFC 4512 section 5.1 for details.
++.TP
++.B olcSaslAuxprops: <plugin> [...]
++Specify which auxprop plugins to use for authentication lookups. The
++default is empty, which just uses slapd's internal support. Usually
++no other auxprop plugins are needed.
++.TP
++.B olcSaslAuxpropsDontUseCopy: <attr> [...]
++Specify which attribute(s) should be subject to the don't use copy control. This
++is necessary for some SASL mechanisms such as OTP to work in a replicated
++environment. The attribute "cmusaslsecretOTP" is the default value.
++.TP
++.B olcSaslAuxpropsDontUseCopyIgnore TRUE | FALSE
++Used to disable replication of the attribute(s) defined by
++olcSaslAuxpropsDontUseCopy and instead use a local value for the attribute. This
++allows the SASL mechanism to continue to work if the provider is offline. This can
++cause replication inconsistency. Defaults to FALSE.
++.TP
++.B olcSaslHost: <fqdn>
++Used to specify the fully qualified domain name used for SASL processing.
++.TP
++.B olcSaslRealm: <realm>
++Specify SASL realm.  Default is empty.
++.TP
++.B olcSaslCbinding: none | tls-unique | tls-endpoint
++Specify the channel-binding type, see also LDAP_OPT_X_SASL_CBINDING.
++Default is none.
++.TP
++.B olcSaslSecProps: <properties>
++Used to specify Cyrus SASL security properties.
++The
++.B none
++flag (without any other properties) causes the flag properties
++default, "noanonymous,noplain", to be cleared.
++The
++.B noplain
++flag disables mechanisms susceptible to simple passive attacks.
++The
++.B noactive
++flag disables mechanisms susceptible to active attacks.
++The
++.B nodict
++flag disables mechanisms susceptible to passive dictionary attacks.
++The
++.B noanonymous
++flag disables mechanisms which support anonymous login.
++The
++.B forwardsec
++flag require forward secrecy between sessions.
++The
++.B passcred
++require mechanisms which pass client credentials (and allow
++mechanisms which can pass credentials to do so).
++The
++.B minssf=<factor> 
++property specifies the minimum acceptable
++.I security strength factor
++as an integer approximate to effective key length used for
++encryption.  0 (zero) implies no protection, 1 implies integrity
++protection only, 128 allows RC4, Blowfish and other similar ciphers,
++256 will require modern ciphers.  The default is 0.
++The
++.B maxssf=<factor> 
++property specifies the maximum acceptable
++.I security strength factor
++as an integer (see minssf description).  The default is INT_MAX.
++The
++.B maxbufsize=<size> 
++property specifies the maximum security layer receive buffer
++size allowed.  0 disables security layers.  The default is 65536.
++.TP
++.B olcServerID: <integer> [<URL>]
++Specify an integer ID from 0 to 4095 for this server. The ID may also be
++specified as a hexadecimal ID by prefixing the value with "0x".
++Non-zero IDs are required when using multi-provider replication and each
++provider must have a unique non-zero ID. Note that this requirement also
++applies to separate providers contributing to a glued set of databases.
++If the URL is provided, this directive may be specified
++multiple times, providing a complete list of participating servers
++and their IDs. The fully qualified hostname of each server should be
++used in the supplied URLs. The IDs are used in the "replica id" field
++of all CSNs generated by the specified server. The default value is zero, which
++is only valid for single provider replication.
++Example:
++.LP
++.nf
++	olcServerID: 1 ldap://ldap1.example.com
++	olcServerID: 2 ldap://ldap2.example.com
++.fi
++.TP
++.B olcSockbufMaxIncoming: <integer>
++Specify the maximum incoming LDAP PDU size for anonymous sessions.
++The default is 262143.
++.TP
++.B olcSockbufMaxIncomingAuth: <integer>
++Specify the maximum incoming LDAP PDU size for authenticated sessions.
++The default is 4194303.
++.TP
++.B olcTCPBuffer [listener=<URL>] [{read|write}=]<size>
++Specify the size of the TCP buffer.
++A global value for both read and write TCP buffers related to any listener
++is defined, unless the listener is explicitly specified,
++or either the read or write qualifiers are used.
++See
++.BR tcp (7)
++for details.
++Note that some OS-es implement automatic TCP buffer tuning.
++.TP
++.B olcThreads: <integer>
++Specify the maximum size of the primary thread pool.
++The default is 16; the minimum value is 2.
++.TP
++.B olcThreadQueues: <integer>
++Specify the number of work queues to use for the primary thread pool.
++The default is 1 and this is typically adequate for up to 8 CPU cores.
++The value should not exceed the number of CPUs in the system.
++.TP
++.B olcToolThreads: <integer>
++Specify the maximum number of threads to use in tool mode.
++This should not be greater than the number of CPUs in the system.
++The default is 1.
++.TP
++.B olcWriteTimeout: <integer>
++Specify the number of seconds to wait before forcibly closing
++a connection with an outstanding write.  This allows recovery from
++various network hang conditions.  A setting of 0 disables this
++feature.  The default is 0.
++.SH TLS OPTIONS
++If
++.B slapd
++is built with support for Transport Layer Security, there are more options
++you can specify.
++.TP
++.B olcTLSCipherSuite: <cipher-suite-spec>
++Permits configuring what ciphers will be accepted and the preference order.
++<cipher-suite-spec> should be a cipher specification for the TLS library
++in use (OpenSSL or GnuTLS).
++Example:
++.RS
++.RS
++.TP
++.I OpenSSL:
++olcTLSCipherSuite: HIGH:MEDIUM:+SSLv2
++.TP
++.I GnuTLS:
++olcTLSCiphersuite: SECURE256:!AES-128-CBC
++.RE
++
++To check what ciphers a given spec selects in OpenSSL, use:
++
++.nf
++	openssl ciphers -v <cipher-suite-spec>
++.fi
++
++With GnuTLS the available specs can be found in the manual page of
++.BR gnutls-cli (1)
++(see the description of the
++option
++.BR --priority ).
++
++In older versions of GnuTLS, where gnutls-cli does not support the option
++--priority, you can obtain the (em more limited (em list of ciphers by calling:
++
++.nf
++	gnutls-cli -l
++.fi
++.RE
++.TP
++.B olcTLSCACertificateFile: <filename>
++Specifies the file that contains certificates for all of the Certificate
++Authorities that
++.B slapd
++will recognize.  The certificate for
++the CA that signed the server certificate must be included among
++these certificates. If the signing CA was not a top-level (root) CA,
++certificates for the entire sequence of CA's from the signing CA to
++the top-level CA should be present. Multiple certificates are simply
++appended to the file; the order is not significant.
++.TP
++.B olcTLSCACertificatePath: <path>
++Specifies the path of directories that contain Certificate Authority
++certificates in separate individual files. Usually only one of this
++or the olcTLSCACertificateFile is defined. If both are specified, both
++locations will be used. Multiple directories may be specified,
++separated by a semi-colon.
++.TP
++.B olcTLSCertificateFile: <filename>
++Specifies the file that contains the
++.B slapd
++server certificate.
++
++When using OpenSSL that file may also contain any number of intermediate
++certificates after the server certificate.
++.TP
++.B olcTLSCertificateKeyFile: <filename>
++Specifies the file that contains the
++.B slapd
++server private key that matches the certificate stored in the
++.B olcTLSCertificateFile
++file. If the private key is protected with a password, the password must
++be manually typed in when slapd starts.  Usually the private key is not
++protected with a password, to allow slapd to start without manual
++intervention, so
++it is of critical importance that the file is protected carefully. 
++.TP
++.B olcTLSDHParamFile: <filename>
++This directive specifies the file that contains parameters for Diffie-Hellman
++ephemeral key exchange.  This is required in order to use a DSA certificate on
++the server, or an RSA certificate missing the "key encipherment" key usage.
++Note that setting this option may also enable
++Anonymous Diffie-Hellman key exchanges in certain non-default cipher suites.
++Anonymous key exchanges should generally be avoided since they provide no
++actual client or server authentication and provide no protection against
++man-in-the-middle attacks.
++You should append "!ADH" to your cipher suites to ensure that these suites
++are not used.
++.TP
++.B olcTLSECName: <name>
++Specify the name of the curve(s) to use for Elliptic curve Diffie-Hellman
++ephemeral key exchange.  This option is only used for OpenSSL.
++This option is not used with GnuTLS; the curves may be
++chosen in the GnuTLS ciphersuite specification.
++.TP
++.B olcTLSProtocolMin: <major>[.<minor>]
++Specifies minimum SSL/TLS protocol version that will be negotiated.
++If the server doesn't support at least that version,
++the SSL handshake will fail.
++To require TLS 1.x or higher, set this option to 3.(x+1),
++e.g.,
++
++.nf
++	olcTLSProtocolMin: 3.2
++.fi
++
++would require TLS 1.1.
++Specifying a minimum that is higher than that supported by the
++OpenLDAP implementation will result in it requiring the
++highest level that it does support.
++This directive is ignored with GnuTLS.
++.TP
++.B olcTLSRandFile: <filename>
++Specifies the file to obtain random bits from when /dev/[u]random
++is not available.  Generally set to the name of the EGD/PRNGD socket.
++The environment variable RANDFILE can also be used to specify the filename.
++This directive is ignored with GnuTLS.
++.TP
++.B olcTLSVerifyClient: <level>
++Specifies what checks to perform on client certificates in an
++incoming TLS session, if any.
++The
++.B <level>
++can be specified as one of the following keywords:
++.RS
++.TP
++.B never
++This is the default.
++.B slapd
++will not ask the client for a certificate.
++.TP
++.B allow
++The client certificate is requested.  If no certificate is provided,
++the session proceeds normally.  If a bad certificate is provided,
++it will be ignored and the session proceeds normally.
++.TP
++.B try
++The client certificate is requested.  If no certificate is provided,
++the session proceeds normally.  If a bad certificate is provided,
++the session is immediately terminated.
++.TP
++.B demand | hard | true
++These keywords are all equivalent, for compatibility reasons.
++The client certificate is requested.  If no certificate is provided,
++or a bad certificate is provided, the session is immediately terminated.
++
++Note that a valid client certificate is required in order to use the
++SASL EXTERNAL authentication mechanism with a TLS session.  As such,
++a non-default
++.B olcTLSVerifyClient
++setting must be chosen to enable SASL EXTERNAL authentication.
++.RE
++.TP
++.B olcTLSCRLCheck: <level>
++Specifies if the Certificate Revocation List (CRL) of the CA should be 
++used to verify if the client certificates have not been revoked. This
++requires
++.B olcTLSCACertificatePath
++parameter to be set. This parameter is ignored with GnuTLS.
++.B <level>
++can be specified as one of the following keywords:
++.RS
++.TP
++.B none
++No CRL checks are performed
++.TP
++.B peer
++Check the CRL of the peer certificate
++.TP
++.B all
++Check the CRL for a whole certificate chain
++.RE
++.TP
++.B olcTLSCRLFile: <filename>
++Specifies a file containing a Certificate Revocation List to be used
++for verifying that certificates have not been revoked. This parameter is
++only valid when using GnuTLS.
++.SH DYNAMIC MODULE OPTIONS
++If
++.B slapd
++is compiled with --enable-modules then the module-related entries will
++be available. These entries are named
++.B cn=module{x},cn=config
++and
++must have the olcModuleList objectClass. One entry should be created
++per
++.B olcModulePath.
++Normally the config engine generates the "{x}" index in the RDN
++automatically, so it can be omitted when initially loading these entries.
++.TP
++.B olcModuleLoad: <filename> [<arguments>...]
++Specify the name of a dynamically loadable module to load and any
++additional arguments if supported by the module. The filename
++may be an absolute path name or a simple filename. Non-absolute names
++are searched for in the directories specified by the
++.B olcModulePath
++option.
++.TP
++.B olcModulePath: <pathspec>
++Specify a list of directories to search for loadable modules. Typically
++the path is colon-separated but this depends on the operating system.
++The default is MODULEDIR, which is where the standard OpenLDAP install
++will place its modules. 
++.SH SCHEMA OPTIONS
++Schema definitions are created as entries in the
++.B cn=schema,cn=config
++subtree. These entries must have the olcSchemaConfig objectClass.
++As noted above, the actual
++.B cn=schema,cn=config
++entry is predefined and any values specified for it are ignored.
++
++.HP
++.hy 0
++.B olcAttributetypes: "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [SUP\ <oid>]\
++ [EQUALITY\ <oid>]\
++ [ORDERING\ <oid>]\
++ [SUBSTR\ <oid>]\
++ [SYNTAX\ <oidlen>]\
++ [SINGLE-VALUE]\
++ [COLLECTIVE]\
++ [NO-USER-MODIFICATION]\
++ [USAGE\ <attributeUsage>]\ )"
++.RS
++Specify an attribute type using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the attribute OID and
++attribute syntax OID.
++(See the
++.B olcObjectIdentifier
++description.) 
++.RE
++
++.HP
++.hy 0
++.B olcDitContentRules: "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [AUX\ <oids>]\
++ [MUST\ <oids>]\
++ [MAY\ <oids>]\
++ [NOT\ <oids>]\ )"
++.RS
++Specify an DIT Content Rule using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the attribute OID and
++attribute syntax OID.
++(See the
++.B olcObjectIdentifier
++description.) 
++.RE
++
++.HP
++.hy 0
++.B olcLdapSyntaxes "(\ <oid>\
++ [DESC\ <description>]\
++ [X-SUBST <substitute-syntax>]\ )"
++.RS
++Specify an LDAP syntax using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the syntax OID.
++(See the
++.B objectidentifier
++description.)
++The slapd parser also honors the
++.B X-SUBST
++extension (an OpenLDAP-specific extension), which allows one to use the
++.B olcLdapSyntaxes
++attribute to define a non-implemented syntax along with another syntax,
++the extension value
++.IR substitute-syntax ,
++as its temporary replacement.
++The
++.I substitute-syntax
++must be defined.
++This allows one to define attribute types that make use of non-implemented syntaxes
++using the correct syntax OID.
++Unless
++.B X-SUBST
++is used, this configuration statement would result in an error,
++since no handlers would be associated to the resulting syntax structure.
++.RE
++
++.HP
++.hy 0
++.B olcObjectClasses: "(\ <oid>\
++ [NAME\ <name>]\
++ [DESC\ <description>]\
++ [OBSOLETE]\
++ [SUP\ <oids>]\
++ [{ ABSTRACT | STRUCTURAL | AUXILIARY }]\
++ [MUST\ <oids>] [MAY\ <oids>] )"
++.RS
++Specify an objectclass using the LDAPv3 syntax defined in RFC 4512.
++The slapd parser extends the RFC 4512 definition by allowing string
++forms as well as numeric OIDs to be used for the object class OID.
++(See the
++.B
++olcObjectIdentifier
++description.)  Object classes are "STRUCTURAL" by default.
++.RE
++.TP
++.B olcObjectIdentifier: <name> "{ <oid> | <name>[:<suffix>] }"
++Define a string name that equates to the given OID. The string can be used
++in place of the numeric OID in objectclass and attribute definitions. The
++name can also be used with a suffix of the form ":xx" in which case the
++value "oid.xx" will be used.
++
++.SH GENERAL BACKEND OPTIONS
++Options in these entries only apply to the configuration of a single
++type of backend. All backends may support this class of options, but
++currently only back-mdb does.
++The entry must be named
++.B olcBackend=<databasetype>,cn=config
++and must have the olcBackendConfig objectClass.
++<databasetype>
++should be one of
++.BR asyncmeta ,
++.BR config ,
++.BR dnssrv ,
++.BR ldap ,
++.BR ldif ,
++.BR mdb ,
++.BR meta ,
++.BR monitor ,
++.BR null ,
++.BR passwd ,
++.BR perl ,
++.BR relay ,
++.BR sock ,
++.BR sql ,
++or
++.BR wt .
++At present, only back-mdb implements any options of this type, so this
++entry should not be used for any other backends.
++
++.SH DATABASE OPTIONS
++Database options are set in entries named
++.B olcDatabase={x}<databasetype>,cn=config
++and must have the olcDatabaseConfig objectClass. Normally the config
++engine generates the "{x}" index in the RDN automatically, so it
++can be omitted when initially loading these entries.
++
++The special frontend database is always numbered "{-1}" and the config
++database is always numbered "{0}".
++
++.SH GLOBAL DATABASE OPTIONS
++Options in this section may be set in the special "frontend" database
++and inherited in all the other databases. These options may be altered
++by further settings in each specific database. The frontend entry must
++be named
++.B olcDatabase=frontend,cn=config
++and must have the olcFrontendConfig objectClass.
++.TP
++.B olcAccess: to <what> "[ by <who> <access> <control> ]+"
++Grant access (specified by <access>) to a set of entries and/or
++attributes (specified by <what>) by one or more requestors (specified
++by <who>).
++If no access controls are present, the default policy
++allows anyone and everyone to read anything but restricts
++updates to rootdn.  (e.g., "olcAccess: to * by * read").
++See
++.BR slapd.access (5)
++and the "OpenLDAP Administrator's Guide" for details.
++
++Access controls set in the frontend are appended to any access
++controls set on the specific databases.
++The rootdn of a database can always read and write EVERYTHING
++in that database.
++
++Extra special care must be taken with the access controls on the
++config database. Unlike other databases, the default policy for the
++config database is to only allow access to the rootdn. Regular users
++should not have read access, and write access should be granted very
++carefully to privileged administrators.
++
++.TP
++.B olcDefaultSearchBase: <dn>
++Specify a default search base to use when client submits a
++non-base search request with an empty base DN.
++Base scoped search requests with an empty base DN are not affected.
++This setting is only allowed in the frontend entry.
++.TP
++.B olcExtraAttrs: <attr>
++Lists what attributes need to be added to search requests.
++Local storage backends return the entire entry to the frontend.
++The frontend takes care of only returning the requested attributes
++that are allowed by ACLs.
++However, features like access checking and so may need specific
++attributes that are not automatically returned by remote storage
++backends, like proxy backends and so on.
++.B <attr>
++is an attribute that is needed for internal purposes
++and thus always needs to be collected, even when not explicitly
++requested by clients.
++This attribute is multi-valued.
++.TP
++.B olcPasswordHash: <hash> [<hash>...]
++This option configures one or more hashes to be used in generation of user
++passwords stored in the userPassword attribute during processing of
++LDAP Password Modify Extended Operations (RFC 3062).
++The <hash> must be one of
++.BR {SSHA} ,
++.BR {SHA} ,
++.BR {SMD5} ,
++.BR {MD5} ,
++.BR {CRYPT} ,
++and
++.BR {CLEARTEXT} .
++The default is
++.BR {SSHA} .
++
++.B {SHA}
++and
++.B {SSHA}
++use the SHA-1 algorithm (FIPS 160-1), the latter with a seed.
++
++.B {MD5}
++and
++.B {SMD5}
++use the MD5 algorithm (RFC 1321), the latter with a seed.
++
++.B {CRYPT}
++uses the
++.BR crypt (3).
++
++.B {CLEARTEXT}
++indicates that the new password should be
++added to userPassword as clear text.
++
++Note that this option does not alter the normal user applications
++handling of userPassword during LDAP Add, Modify, or other LDAP operations.
++This setting is only allowed in the frontend entry.
++.TP
++.B olcReadOnly: TRUE | FALSE
++This option puts the database into "read-only" mode.  Any attempts to 
++modify the database will return an "unwilling to perform" error.  By
++default, olcReadOnly is FALSE. Note that when this option is set
++TRUE on the frontend, it cannot be reset without restarting the
++server, since further writes to the config database will be rejected.
++.TP
++.B olcRequires: <conditions>
++Specify a set of conditions to require (default none).
++The directive may be specified globally and/or per-database;
++databases inherit global conditions, so per-database specifications
++are additive.
++.B bind
++requires bind operation prior to directory operations.
++.B LDAPv3
++requires session to be using LDAP version 3.
++.B authc
++requires authentication prior to directory operations.
++.B SASL
++requires SASL authentication prior to directory operations.
++.B strong
++requires strong authentication prior to directory operations.
++The strong keyword allows protected "simple" authentication
++as well as SASL authentication.
++.B none
++may be used to require no conditions (useful to clear out globally
++set conditions within a particular database); it must occur first
++in the list of conditions.
++.TP
++.B olcRestrict: <oplist>
++Specify a list of operations that are restricted.
++Restrictions on a specific database override any frontend setting.
++Operations can be any of 
++.BR add ,
++.BR bind ,
++.BR compare ,
++.BR delete ,
++.BR extended[=<OID>] ,
++.BR modify ,
++.BR rename ,
++.BR search ,
++or the special pseudo-operations
++.B read
++and
++.BR write ,
++which respectively summarize read and write operations.
++The use of 
++.I restrict write
++is equivalent to 
++.I olcReadOnly: TRUE
++(see above).
++The 
++.B extended
++keyword allows one to indicate the OID of the specific operation
++to be restricted.
++.TP
++.B olcSchemaDN: <dn>
++Specify the distinguished name for the subschema subentry that
++controls the entries on this server.  The default is "cn=Subschema".
++.TP
++.B olcSecurity: <factors>
++Specify a set of security strength factors (separated by white space)
++to require (see
++.BR olcSaslSecprops 's
++.B minssf
++option for a description of security strength factors).
++The directive may be specified globally and/or per-database.
++.B ssf=<n>
++specifies the overall security strength factor.
++.B transport=<n>
++specifies the transport security strength factor.
++.B tls=<n>
++specifies the TLS security strength factor.
++.B sasl=<n>
++specifies the SASL security strength factor.
++.B update_ssf=<n>
++specifies the overall security strength factor to require for
++directory updates.
++.B update_transport=<n>
++specifies the transport security strength factor to require for
++directory updates.
++.B update_tls=<n>
++specifies the TLS security strength factor to require for
++directory updates.
++.B update_sasl=<n>
++specifies the SASL security strength factor to require for
++directory updates.
++.B simple_bind=<n>
++specifies the security strength factor required for
++.I simple
++username/password authentication.
++Note that the
++.B transport
++factor is measure of security provided by the underlying transport,
++e.g. ldapi:// (and eventually IPSEC).  It is not normally used.
++.TP
++.B olcSizeLimit: {<integer>|unlimited}
++.TP
++.B olcSizeLimit: size[.{soft|hard}]=<integer> [...]
++Specify the maximum number of entries to return from a search operation.
++The default size limit is 500.
++Use
++.B unlimited
++to specify no limits.
++The second format allows a fine grain setting of the size limits.
++If no special qualifiers are specified, both soft and hard limits are set.
++Extra args can be added in the same value.
++Additional qualifiers are available; see
++.BR olcLimits
++for an explanation of all of the different flags.
++.TP
++.B olcSortVals: <attr> [...]
++Specify a list of multi-valued attributes whose values will always
++be maintained in sorted order. Using this option will allow Modify,
++Compare, and filter evaluations on these attributes to be performed
++more efficiently. The resulting sort order depends on the
++attributes' syntax and matching rules and may not correspond to
++lexical order or any other recognizable order.
++This setting is only allowed in the frontend entry.
++.TP
++.B olcTimeLimit: {<integer>|unlimited}
++.TP
++.B olcTimeLimit: time[.{soft|hard}]=<integer> [...]
++Specify the maximum number of seconds (in real time)
++.B slapd
++will spend answering a search request.  The default time limit is 3600.
++Use
++.B unlimited
++to specify no limits.
++The second format allows a fine grain setting of the time limits.
++Extra args can be added in the same value. See
++.BR olcLimits
++for an explanation of the different flags.
++
++.SH GENERAL DATABASE OPTIONS
++Options in this section only apply to the specific database for
++which they are defined.  They are supported by every
++type of backend. All of the Global Database Options may also be
++used here.
++.TP
++.B olcAddContentAcl: TRUE | FALSE
++Controls whether Add operations will perform ACL checks on
++the content of the entry being added. This check is off
++by default. See the
++.BR slapd.access (5)
++manual page for more details on ACL requirements for
++Add operations.
++.TP
++.B olcHidden: TRUE | FALSE
++Controls whether the database will be used to answer
++queries. A database that is hidden will never be
++selected to answer any queries, and any suffix configured
++on the database will be ignored in checks for conflicts
++with other databases. By default, olcHidden is FALSE.
++.TP
++.B olcLastMod: TRUE | FALSE
++Controls whether
++.B slapd
++will automatically maintain the 
++modifiersName, modifyTimestamp, creatorsName, and 
++createTimestamp attributes for entries. It also controls
++the entryCSN and entryUUID attributes, which are needed
++by the syncrepl provider. By default, olcLastMod is TRUE.
++.TP
++.B olcLastBind: TRUE | FALSE
++Controls whether
++.B slapd
++will automatically maintain the pwdLastSuccess attribute for
++entries. By default, olcLastBind is FALSE.
++.TP
++.B olcLastBindPrecision: <integer>
++If olcLastBind is enabled, specifies how frequently pwdLastSuccess
++will be updated. More than
++.B integer
++seconds must have passed since the last successful bind. In a
++replicated environment with frequent bind activity it may be
++useful to set this to a large value.
++.TP
++.B olcLimits: <selector> <limit> [<limit> [...]]
++Specify time and size limits based on the operation's initiator or
++base DN.
++The argument
++.B <selector>
++can be any of
++.RS
++.RS
++.TP
++anonymous | users | [<dnspec>=]<pattern> | group[/oc[/at]]=<pattern>
++
++.RE
++with
++.RS
++.TP
++<dnspec> ::= dn[.<type>][.<style>]
++.TP
++<type>  ::= self | this
++.TP
++<style> ::= exact | base | onelevel | subtree | children | regex | anonymous
++
++.RE
++DN type
++.B self
++is the default and means the bound user, while
++.B this
++means the base DN of the operation.
++The term
++.B anonymous
++matches all unauthenticated clients.
++The term
++.B users
++matches all authenticated clients;
++otherwise an
++.B exact
++dn pattern is assumed unless otherwise specified by qualifying 
++the (optional) key string
++.B dn
++with 
++.B exact
++or
++.B base
++(which are synonyms), to require an exact match; with
++.BR onelevel , 
++to require exactly one level of depth match; with
++.BR subtree ,
++to allow any level of depth match, including the exact match; with
++.BR children ,
++to allow any level of depth match, not including the exact match;
++.BR regex
++explicitly requires the (default) match based on POSIX (''extended'')
++regular expression pattern.
++Finally,
++.B anonymous
++matches unbound operations; the 
++.B pattern
++field is ignored.
++The same behavior is obtained by using the 
++.B anonymous
++form of the
++.B <selector>
++clause.
++The term
++.BR group ,
++with the optional objectClass
++.B oc
++and attributeType
++.B at
++fields, followed by
++.BR pattern ,
++sets the limits for any DN listed in the values of the
++.B at
++attribute (default
++.BR member )
++of the 
++.B oc
++group objectClass (default
++.BR groupOfNames )
++whose DN exactly matches
++.BR pattern .
++
++The currently supported limits are 
++.B size
++and 
++.BR time .
++
++The syntax for time limits is 
++.BR time[.{soft|hard}]=<integer> ,
++where 
++.I integer
++is the number of seconds slapd will spend answering a search request.
++If no time limit is explicitly requested by the client, the 
++.BR soft
++limit is used; if the requested time limit exceeds the
++.BR hard
++."limit, an
++.".I "Administrative limit exceeded"
++."error is returned.
++limit, the value of the limit is used instead.
++If the
++.BR hard
++limit is set to the keyword 
++.IR soft ,
++the soft limit is used in either case; if it is set to the keyword 
++.IR unlimited , 
++no hard limit is enforced.
++Explicit requests for time limits smaller or equal to the
++.BR hard 
++limit are honored.
++If no limit specifier is set, the value is assigned to the 
++.BR soft 
++limit, and the
++.BR hard
++limit is set to
++.IR soft ,
++to preserve the original behavior.
++
++The syntax for size limits is
++.BR size[.{soft|hard|unchecked}]=<integer> ,
++where
++.I integer
++is the maximum number of entries slapd will return answering a search 
++request.
++If no size limit is explicitly requested by the client, the
++.BR soft
++limit is used; if the requested size limit exceeds the
++.BR hard
++."limit, an 
++.".I "Administrative limit exceeded"
++."error is returned.
++limit, the value of the limit is used instead.
++If the 
++.BR hard
++limit is set to the keyword 
++.IR soft , 
++the soft limit is used in either case; if it is set to the keyword
++.IR unlimited , 
++no hard limit is enforced.
++Explicit requests for size limits smaller or equal to the
++.BR hard
++limit are honored.
++The
++.BR unchecked
++specifier sets a limit on the number of candidates a search request is allowed
++to examine.
++The rationale behind it is that searches for non-properly indexed
++attributes may result in large sets of candidates, which must be 
++examined by
++.BR slapd (8)
++to determine whether they match the search filter or not.
++The
++.B unchecked
++limit provides a means to drop such operations before they are even 
++started.
++If the selected candidates exceed the 
++.BR unchecked
++limit, the search will abort with 
++.IR "Unwilling to perform" .
++If it is set to the keyword 
++.IR unlimited , 
++no limit is applied (the default).
++If it is set to
++.IR disabled ,
++the search is not even performed; this can be used to disallow searches
++for a specific set of users.
++If no limit specifier is set, the value is assigned to the
++.BR soft 
++limit, and the
++.BR hard
++limit is set to
++.IR soft ,
++to preserve the original behavior.
++
++In case of no match, the global limits are used.
++The default values are the same as for
++.B olcSizeLimit
++and
++.BR olcTimeLimit ;
++no limit is set on 
++.BR unchecked .
++
++If 
++.B pagedResults
++control is requested, the 
++.B hard
++size limit is used by default, because the request of a specific page size
++is considered an explicit request for a limitation on the number
++of entries to be returned.
++However, the size limit applies to the total count of entries returned within
++the search, and not to a single page.
++Additional size limits may be enforced; the syntax is
++.BR size.pr={<integer>|noEstimate|unlimited} ,
++where
++.I integer
++is the max page size if no explicit limit is set; the keyword
++.I noEstimate
++inhibits the server from returning an estimate of the total number
++of entries that might be returned
++(note: the current implementation does not return any estimate).
++The keyword
++.I unlimited
++indicates that no limit is applied to the pagedResults control page size.
++The syntax
++.B size.prtotal={<integer>|hard|unlimited|disabled}
++allows one to set a limit on the total number of entries that the pagedResults
++control will return.
++By default it is set to the 
++.B hard
++limit which will use the size.hard value.
++When set, 
++.I integer
++is the max number of entries that the whole search with pagedResults control
++can return.
++Use 
++.I unlimited
++to allow unlimited number of entries to be returned, e.g. to allow
++the use of the pagedResults control as a means to circumvent size 
++limitations on regular searches; the keyword
++.I disabled
++disables the control, i.e. no paged results can be returned.
++Note that the total number of entries returned when the pagedResults control 
++is requested cannot exceed the 
++.B hard 
++size limit of regular searches unless extended by the
++.B prtotal
++switch.
++
++The \fBolcLimits\fP statement is typically used to let an unlimited
++number of entries be returned by searches performed
++with the identity used by the consumer for synchronization purposes
++by means of the RFC 4533 LDAP Content Synchronization protocol
++(see \fBolcSyncrepl\fP for details).
++
++When using subordinate databases, it is necessary for any limits that
++are to be applied across the parent and its subordinates to be defined in
++both the parent and its subordinates. Otherwise the settings on the
++subordinate databases are not honored.
++.RE
++.TP
++.B olcMaxDerefDepth: <depth>
++Specifies the maximum number of aliases to dereference when trying to
++resolve an entry, used to avoid infinite alias loops. The default is 15.
++.TP
++.B olcMultiProvider: TRUE | FALSE
++This option puts a consumer database into Multi-Provider mode.  Update
++operations will be accepted from any user, not just the updatedn.  The
++database must already be configured as a syncrepl consumer
++before this keyword may be set. This mode also requires a
++.B olcServerID
++(see above) to be configured.
++By default, this setting is FALSE.
++.TP
++.B olcMonitoring: TRUE | FALSE
++This option enables database-specific monitoring in the entry related
++to the current database in the "cn=Databases,cn=Monitor" subtree
++of the monitor database, if the monitor database is enabled.
++Currently, only the MDB database provides database-specific monitoring.
++If monitoring is supported by the backend it defaults to TRUE, otherwise
++FALSE.
++.TP
++.B olcPlugin: <plugin_type> <lib_path> <init_function> [<arguments>]
++Configure a SLAPI plugin. See the
++.BR slapd.plugin (5)
++manpage for more details.
++.TP
++.B olcRootDN: <dn>
++Specify the distinguished name that is not subject to access control 
++or administrative limit restrictions for operations on this database.
++This DN may or may not be associated with an entry.  An empty root
++DN (the default) specifies no root access is to be granted.  It is
++recommended that the rootdn only be specified when needed (such as
++when initially populating a database).  If the rootdn is within
++a namingContext (suffix) of the database, a simple bind password
++may also be provided using the
++.B olcRootPW
++directive. Many optional features, including syncrepl, require the
++rootdn to be defined for the database.
++The
++.B olcRootDN
++of the
++.B cn=config
++database defaults to
++.B cn=config
++itself.
++.TP
++.B olcRootPW: <password>
++Specify a password (or hash of the password) for the rootdn.  The
++password can only be set if the rootdn is within the namingContext
++(suffix) of the database.
++This option accepts all RFC 2307 userPassword formats known to
++the server (see 
++.B olcPasswordHash
++description) as well as cleartext.
++.BR slappasswd (8) 
++may be used to generate a hash of a password.  Cleartext
++and \fB{CRYPT}\fP passwords are not recommended.  If empty
++(the default), authentication of the root DN is by other means
++(e.g. SASL).  Use of SASL is encouraged.
++.TP
++.B olcSubordinate: [TRUE | FALSE | advertise]
++Specify that the current backend database is a subordinate of another
++backend database. A subordinate  database may have only one suffix. This
++option may be used to glue multiple databases into a single namingContext.
++If the suffix of the current database is within the namingContext of a
++superior database, searches against the superior database will be
++propagated to the subordinate as well. All of the databases
++associated with a single namingContext should have identical rootdns.
++Behavior of other LDAP operations is unaffected by this setting. In
++particular, it is not possible to use moddn to move an entry from
++one subordinate to another subordinate within the namingContext.
++
++If the optional \fBadvertise\fP flag is supplied, the naming context of
++this database is advertised in the root DSE. The default is to hide this
++database context, so that only the superior context is visible.
++
++If the slap tools
++.BR slapcat (8),
++.BR slapadd (8),
++.BR slapmodify (8),
++or
++.BR slapindex (8)
++are used on the superior database, any glued subordinates that support
++these tools are opened as well.
++
++Databases that are glued together should usually be configured with the
++same indices (assuming they support indexing), even for attributes that
++only exist in some of these databases. In general, all of the glued
++databases should be configured as similarly as possible, since the intent
++is to provide the appearance of a single directory.
++
++Note that the subordinate functionality is implemented internally
++by the \fIglue\fP overlay and as such its behavior will interact with other
++overlays in use. By default, the glue overlay is automatically configured as
++the last overlay on the superior database. Its position on the database
++can be explicitly configured by setting an \fBoverlay glue\fP directive
++at the desired position. This explicit configuration is necessary e.g.
++when using the \fIsyncprov\fP overlay, which needs to follow \fIglue\fP
++in order to work over all of the glued databases. E.g.
++.RS
++.nf
++	dn: olcDatabase={1}mdb,cn=config
++	olcSuffix: dc=example,dc=com
++	...
++
++	dn: olcOverlay={0}glue,olcDatabase={1}mdb,cn=config
++	...
++
++	dn: olcOverlay={1}syncprov,olcDatabase={1}mdb,cn=config
++	...
++.fi
++.RE
++See the Overlays section below for more details.
++.TP
++.B olcSuffix: <dn suffix>
++Specify the DN suffix of queries that will be passed to this 
++backend database.  Multiple suffix lines can be given and at least one is 
++required for each database definition.
++
++If the suffix of one database is "inside" that of another, the database
++with the inner suffix must come first in the configuration file.
++You may also want to glue such databases together with the
++.B olcSubordinate
++attribute.
++.TP
++.B olcSyncUseSubentry: TRUE | FALSE
++Store the syncrepl contextCSN in a subentry instead of the context entry
++of the database. The subentry's RDN will be "cn=ldapsync". The default is
++FALSE, meaning the contextCSN is stored in the context entry.
++.HP
++.hy 0
++.B olcSyncrepl: rid=<replica ID>
++.B provider=ldap[s]://<hostname>[:port]
++.B searchbase=<base DN>
++.B [type=refreshOnly|refreshAndPersist]
++.B [interval=dd:hh:mm:ss]
++.B [retry=[<retry interval> <# of retries>]+]
++.B [filter=<filter str>]
++.B [scope=sub|one|base|subord]
++.B [attrs=<attr list>]
++.B [exattrs=<attr list>]
++.B [attrsonly]
++.B [sizelimit=<limit>]
++.B [timelimit=<limit>]
++.B [schemachecking=on|off]
++.B [network-timeout=<seconds>]
++.B [timeout=<seconds>]
++.B [tcp-user-timeout=<milliseconds>]
++.B [bindmethod=simple|sasl]
++.B [binddn=<dn>]
++.B [saslmech=<mech>]
++.B [authcid=<identity>]
++.B [authzid=<identity>]
++.B [credentials=<passwd>]
++.B [realm=<realm>]
++.B [secprops=<properties>]
++.B [keepalive=<idle>:<probes>:<interval>]
++.B [starttls=yes|critical]
++.B [tls_cert=<file>]
++.B [tls_key=<file>]
++.B [tls_cacert=<file>]
++.B [tls_cacertdir=<path>]
++.B [tls_reqcert=never|allow|try|demand]
++.B [tls_reqsan=never|allow|try|demand]
++.B [tls_cipher_suite=<ciphers>]
++.B [tls_ecname=<names>]
++.B [tls_crlcheck=none|peer|all]
++.B [tls_protocol_min=<major>[.<minor>]]
++.B [suffixmassage=<real DN>]
++.B [logbase=<base DN>]
++.B [logfilter=<filter str>]
++.B [syncdata=default|accesslog|changelog]
++.B [lazycommit]
++.RS
++Specify the current database as a consumer which is kept up-to-date with the 
++provider content by establishing the current
++.BR slapd (8)
++as a replication consumer site running a
++.B syncrepl
++replication engine.
++The consumer content is kept synchronized to the provider content using
++the LDAP Content Synchronization protocol. Refer to the
++"OpenLDAP Administrator's Guide" for detailed information on
++setting up a replicated
++.B slapd
++directory service using the 
++.B syncrepl
++replication engine.
++
++.B rid
++identifies the current
++.B syncrepl
++directive within the replication consumer site.
++It is a non-negative integer not greater than 999 (limited
++to three decimal digits).
++
++.B provider
++specifies the replication provider site containing the provider content
++as an LDAP URI. If <port> is not given, the standard LDAP port number
++(389 or 636) is used.
++
++The content of the
++.B syncrepl
++consumer is defined using a search
++specification as its result set. The consumer
++.B slapd
++will send search requests to the provider
++.B slapd
++according to the search specification. The search specification includes
++.BR searchbase ", " scope ", " filter ", " attrs ", " attrsonly ", " sizelimit ", "
++and
++.B timelimit
++parameters as in the normal search specification. The
++.B exattrs
++option may also be used to specify attributes that should be omitted
++from incoming entries.
++The \fBscope\fP defaults to \fBsub\fP, the \fBfilter\fP defaults to
++\fB(objectclass=*)\fP, and there is no default \fBsearchbase\fP. The
++\fBattrs\fP list defaults to \fB"*,+"\fP to return all user and operational
++attributes, and \fBattrsonly\fP and \fBexattrs\fP are unset by default.
++The \fBsizelimit\fP and \fBtimelimit\fP only
++accept "unlimited" and positive integers, and both default to "unlimited".
++The \fBsizelimit\fP and \fBtimelimit\fP parameters define
++a consumer requested limitation on the number of entries that can be returned
++by the LDAP Content Synchronization operation; as such, it is intended
++to implement partial replication based on the size of the replicated database
++and on the time required by the synchronization.
++Note, however, that any provider-side limits for the replication identity
++will be enforced by the provider regardless of the limits requested
++by the LDAP Content Synchronization operation, much like for any other
++search operation.
++
++The LDAP Content Synchronization protocol has two operation types.
++In the
++.B refreshOnly
++operation, the next synchronization search operation
++is periodically rescheduled at an interval time (specified by 
++.B interval
++parameter; 1 day by default)
++after each synchronization operation finishes.
++In the
++.B refreshAndPersist
++operation, a synchronization search remains persistent in the provider slapd.
++Further updates to the provider will generate
++.B searchResultEntry
++to the consumer slapd as the search responses to the persistent
++synchronization search. If the initial search fails due to an error, the
++next synchronization search operation is periodically rescheduled at an
++interval time (specified by
++.B interval
++parameter; 1 day by default)
++
++If an error occurs during replication, the consumer will attempt to
++reconnect according to the
++.B retry
++parameter which is a list of the <retry interval> and <# of retries> pairs.
++For example, retry="60 10 300 3" lets the consumer retry every 60 seconds
++for the first 10 times and then retry every 300 seconds for the next 3
++times before stop retrying. The `+' in <# of retries> means indefinite
++number of retries until success.
++If no
++.B retry
++is specified, by default syncrepl retries every hour forever.
++
++The schema checking can be enforced at the LDAP Sync
++consumer site by turning on the
++.B schemachecking
++parameter. The default is \fBoff\fP.
++Schema checking \fBon\fP means that replicated entries must have
++a structural objectClass, must obey to objectClass requirements
++in terms of required/allowed attributes, and that naming attributes
++and distinguished values must be present.
++As a consequence, schema checking should be \fBoff\fP when partial
++replication is used.
++
++The
++.B network-timeout
++parameter sets how long the consumer will wait to establish a
++network connection to the provider. Once a connection is
++established, the
++.B timeout
++parameter determines how long the consumer will wait for the initial
++Bind request to complete. The defaults for these parameters come
++from 
++.BR ldap.conf (5).
++The
++.B tcp-user-timeout
++parameter, if non-zero, corresponds to the
++.B TCP_USER_TIMEOUT
++set on the target connections, overriding the operating system setting.
++Only some systems support the customization of this parameter, it is
++ignored otherwise and system-wide settings are used.
++
++A
++.B bindmethod
++of 
++.B simple
++requires the options 
++.B binddn
++and 
++.B credentials
++and should only be used when adequate security services
++(e.g. TLS or IPSEC) are in place.
++.B REMEMBER: simple bind credentials must be in cleartext!
++A
++.B bindmethod
++of
++.B sasl
++requires the option
++.B saslmech.
++Depending on the mechanism, an authentication identity and/or
++credentials can be specified using
++.B authcid
++and
++.B credentials.
++The
++.B authzid
++parameter may be used to specify an authorization identity.
++Specific security properties (as with the
++.B sasl-secprops
++keyword above) for a SASL bind can be set with the
++.B secprops
++option. A non default SASL realm can be set with the
++.B realm 
++option.
++The identity used for synchronization by the consumer should be allowed
++to receive an unlimited number of entries in response to a search request.
++The provider, other than allowing authentication of the syncrepl identity,
++should grant that identity appropriate access privileges to the data
++that is being replicated (\fBaccess\fP directive), and appropriate time
++and size limits.
++This can be accomplished by either allowing unlimited \fBsizelimit\fP
++and \fBtimelimit\fP, or by setting an appropriate \fBlimits\fP statement
++in the consumer's configuration (see \fBsizelimit\fP and \fBlimits\fP
++for details).
++
++The
++.B keepalive
++parameter sets the values of \fIidle\fP, \fIprobes\fP, and \fIinterval\fP
++used to check whether a socket is alive;
++.I idle
++is the number of seconds a connection needs to remain idle before TCP 
++starts sending keepalive probes;
++.I probes
++is the maximum number of keepalive probes TCP should send before dropping
++the connection;
++.I interval
++is interval in seconds between individual keepalive probes.
++Only some systems support the customization of these values;
++the
++.B keepalive
++parameter is ignored otherwise, and system-wide settings are used.
++
++The
++.B starttls
++parameter specifies use of the StartTLS extended operation
++to establish a TLS session before Binding to the provider. If the
++.B critical
++argument is supplied, the session will be aborted if the StartTLS request
++fails. Otherwise the syncrepl session continues without TLS. The
++.B tls_reqcert
++setting defaults to "demand", the
++.B tls_reqsan
++setting defaults to "allow", and the other TLS settings
++default to the same as the main slapd TLS settings.
++
++The
++.B suffixmassage
++parameter allows the consumer to pull entries from a remote directory
++whose DN suffix differs from the local directory. The portion of the
++remote entries' DNs that matches the \fIsearchbase\fP will be replaced
++with the suffixmassage DN.
++
++Rather than replicating whole entries, the consumer can query logs of
++data modifications. This mode of operation is referred to as \fIdelta
++syncrepl\fP. In addition to the above parameters, the
++.B logbase
++and
++.B logfilter
++parameters must be set appropriately for the log that will be used. The
++.B syncdata
++parameter must be set to either "accesslog" if the log conforms to the
++.BR slapo-accesslog (5)
++log format, or "changelog" if the log conforms
++to the obsolete \fIchangelog\fP format. If the
++.B syncdata
++parameter is omitted or set to "default" then the log parameters are
++ignored.
++
++The
++.B lazycommit
++parameter tells the underlying database that it can store changes without
++performing a full flush after each change. This may improve performance
++for the consumer, while sacrificing safety or durability.
++.RE
++.TP
++.B olcUpdateDN: <dn>
++This option is only applicable in a replica
++database.
++It specifies the DN permitted to update (subject to access controls)
++the replica.  It is only needed in certain push-mode
++replication scenarios.  Generally, this DN
++.I should not
++be the same as the
++.B rootdn 
++used at the provider.
++.TP
++.B olcUpdateRef: <url>
++Specify the referral to pass back when
++.BR slapd (8)
++is asked to modify a replicated local database.
++If multiple values are specified, each url is provided.
++
++.SH DATABASE-SPECIFIC OPTIONS
++Each database may allow specific configuration options; they are
++documented separately in the backends' manual pages. See the
++.BR slapd.backends (5)
++manual page for an overview of available backends.
++.SH OVERLAYS
++An overlay is a piece of
++code that intercepts database operations in order to extend or change
++them. Overlays are pushed onto
++a stack over the database, and so they will execute in the reverse
++of the order in which they were configured and the database itself
++will receive control last of all.
++
++Overlays must be configured as child entries of a specific database. The
++entry's RDN must be of the form
++.B olcOverlay={x}<overlaytype>
++and the entry must have the olcOverlayConfig objectClass. Normally the
++config engine generates the "{x}" index in the RDN automatically, so
++it can be omitted when initially loading these entries.
++
++See the
++.BR slapd.overlays (5)
++manual page for an overview of available overlays.
++.SH EXAMPLES
++.LP
++Here is a short example of a configuration in LDIF suitable for use with
++.BR slapadd (8)
++:
++.LP
++.RS
++.nf
++dn: cn=config
++objectClass: olcGlobal
++cn: config
++olcPidFile: LOCALSTATEDIR/run/slapd.pid
++olcAttributeOptions: x-hidden lang-
++
++dn: cn=schema,cn=config
++objectClass: olcSchemaConfig
++cn: schema
++
++include: file://SYSCONFDIR/schema/core.ldif
++
++dn: olcDatabase=frontend,cn=config
++objectClass: olcDatabaseConfig
++objectClass: olcFrontendConfig
++olcDatabase: frontend
++# Subtypes of "name" (e.g. "cn" and "ou") with the
++# option ";x-hidden" can be searched for/compared,
++# but are not shown.  See \fBslapd.access\fP(5).
++olcAccess: to attrs=name;x-hidden by * =cs
++# Protect passwords.  See \fBslapd.access\fP(5).
++olcAccess: to attrs=userPassword  by * auth
++# Read access to other attributes and entries.
++olcAccess: to * by * read
++
++# set a rootpw for the config database so we can bind.
++# deny access to everyone else.
++dn: olcDatabase=config,cn=config
++objectClass: olcDatabaseConfig
++olcDatabase: config
++olcRootPW: {SSHA}XKYnrjvGT3wZFQrDD5040US592LxsdLy
++olcAccess: to * by * none
++
++dn: olcDatabase=mdb,cn=config
++objectClass: olcDatabaseConfig
++objectClass: olcMdbConfig
++olcDatabase: mdb
++olcSuffix: "dc=our-domain,dc=com"
++# The database directory MUST exist prior to
++# running slapd AND should only be accessible
++# by the slapd/tools. Mode 0700 recommended.
++olcDbDirectory: LOCALSTATEDIR/openldap-data
++# Indices to maintain
++olcDbIndex:     objectClass  eq
++olcDbIndex:     cn,sn,mail   pres,eq,approx,sub
++
++# We serve small clients that do not handle referrals,
++# so handle remote lookups on their behalf.
++dn: olcDatabase=ldap,cn=config
++objectClass: olcDatabaseConfig
++objectClass: olcLdapConfig
++olcDatabase: ldap
++olcSuffix: ""
++olcDbUri: ldap://ldap.some-server.com/
++.fi
++.RE
++.LP
++Assuming the above data was saved in a file named "config.ldif" and the
++ETCDIR/slapd.d directory has been created, this command will initialize
++the configuration:
++.RS
++.nf
++slapadd -F ETCDIR/slapd.d -n 0 -l config.ldif
++.fi
++.RE
++
++.LP
++"OpenLDAP Administrator's Guide" contains a longer annotated
++example of a slapd configuration.
++
++Alternatively, an existing slapd.conf file can be converted to the new
++format using slapd or any of the slap tools:
++.RS
++.nf
++slaptest -f ETCDIR/slapd.conf -F ETCDIR/slapd.d
++.fi
++.RE
++
++.SH FILES
++.TP
++ETCDIR/slapd.conf
++default slapd configuration file
++.TP
++ETCDIR/slapd.d
++default slapd configuration directory
++.SH SEE ALSO
++.BR ldap (3),
++.BR ldif (5),
++.BR gnutls-cli (1),
++.BR slapd.access (5),
++.BR slapd.backends (5),
++.BR slapd.conf (5),
++.BR slapd.overlays (5),
++.BR slapd.plugin (5),
++.BR slapd (8),
++.BR slapacl (8),
++.BR slapadd (8),
++.BR slapauth (8),
++.BR slapcat (8),
++.BR slapdn (8),
++.BR slapindex (8),
++.BR slapmodify (8),
++.BR slappasswd (8),
++.BR slaptest (8).
++.LP
++"OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
++.SH ACKNOWLEDGEMENTS
++.so ../Project
+diff -Naurp openldap-2.6.1.orig/doc/man/man8/lloadd.8 openldap-2.6.1/doc/man/man8/lloadd.8
+--- openldap-2.6.1.orig/doc/man/man8/lloadd.8	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/doc/man/man8/lloadd.8	2022-02-13 15:55:12.222721830 -0600
+@@ -5,7 +5,7 @@
+ .SH NAME
+ lloadd - LDAP Load Balancer Daemon
+ .SH SYNOPSIS
+-.B LIBEXECDIR/lloadd
++.B SBINDIR/lloadd
+ [\c
+ .BR -4 | -6 ]
+ [\c
+diff -Naurp openldap-2.6.1.orig/doc/man/man8/slapd.8 openldap-2.6.1/doc/man/man8/slapd.8
+--- openldap-2.6.1.orig/doc/man/man8/slapd.8	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/doc/man/man8/slapd.8	2022-02-13 15:55:00.466773546 -0600
+@@ -5,7 +5,7 @@
+ .SH NAME
+ slapd - Stand-alone LDAP Daemon
+ .SH SYNOPSIS
+-.B LIBEXECDIR/slapd 
++.B SBINDIR/slapd 
+ [\c
+ .BR -V [ V [ V ]]
+ [\c
+diff -Naurp openldap-2.6.1.orig/include/ldap_defaults.h openldap-2.6.1/include/ldap_defaults.h
+--- openldap-2.6.1.orig/include/ldap_defaults.h	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/include/ldap_defaults.h	2022-02-13 15:54:13.654979570 -0600
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+ 
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+ 
+ /*
+  * SLAPD DEFINITIONS
+@@ -47,7 +47,7 @@
+ 	/* location of the default slapd config file */
+ #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+ #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
+-#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
++#define SLAPD_DEFAULT_DB_DIR        LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
+ #define SLAPD_DEFAULT_DB_MODE		0600
+ #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
+ 	/* default max deref depth for aliases */
+diff -Naurp openldap-2.6.1.orig/libraries/liblber/Makefile.in openldap-2.6.1/libraries/liblber/Makefile.in
+--- openldap-2.6.1.orig/libraries/liblber/Makefile.in	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/libraries/liblber/Makefile.in	2022-02-13 15:54:13.654979570 -0600
+@@ -51,6 +51,6 @@ idtest:  $(XLIBS) idtest.o
+ 
+ install-local: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 
+diff -Naurp openldap-2.6.1.orig/libraries/libldap/Makefile.in openldap-2.6.1/libraries/libldap/Makefile.in
+--- openldap-2.6.1.orig/libraries/libldap/Makefile.in	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/libraries/libldap/Makefile.in	2022-02-13 15:54:13.654979570 -0600
+@@ -82,7 +82,7 @@ CFFILES=ldap.conf
+ 
+ install-local: $(CFFILES) FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
+ 	@for i in $(CFFILES); do \
+diff -Naurp openldap-2.6.1.orig/servers/slapd/Makefile.in openldap-2.6.1/servers/slapd/Makefile.in
+--- openldap-2.6.1.orig/servers/slapd/Makefile.in	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/servers/slapd/Makefile.in	2022-02-13 15:54:13.655979565 -0600
+@@ -374,9 +374,10 @@ install-local-srv: install-slapd install
+ 
+ install-slapd: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libexecdir)
++	-$(MKDIR) $(DESTDIR)$(sbindir)
+ 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
+ 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
+-		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
++		slapd$(EXEEXT) $(DESTDIR)$(sbindir)
+ 	@for i in $(SUBDIRS); do \
+ 	    if test -d $$i && test -f $$i/Makefile ; then \
+ 		echo; echo "  cd $$i && $(MAKE) $(MFLAGS) install"; \
+@@ -452,9 +453,9 @@ install-conf: FORCE
+ 
+ install-db-config: FORCE
+ 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
++	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
++		$(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+ 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+ 
+@@ -462,6 +463,6 @@ install-tools: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(sbindir)
+ 	for i in $(SLAPTOOLS); do \
+ 		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+-		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
++		$(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+ 	done
+ 
+diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.conf openldap-2.6.1/servers/slapd/slapd.conf
+--- openldap-2.6.1.orig/servers/slapd/slapd.conf	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/servers/slapd/slapd.conf	2022-02-13 15:54:13.655979565 -0600
+@@ -10,8 +10,9 @@ include		%SYSCONFDIR%/schema/core.schema
+ # service AND an understanding of referrals.
+ #referral	ldap://root.openldap.org
+ 
+-pidfile		%LOCALSTATEDIR%/run/slapd.pid
+-argsfile	%LOCALSTATEDIR%/run/slapd.args
++pidfile		%LOCALSTATEDIR%/run/openldap/slapd.pid
++argsfile	%LOCALSTATEDIR%/run/openldap/slapd.args
++
+ 
+ # Load dynamic backend modules:
+ modulepath	%MODULEDIR%
+@@ -69,7 +70,7 @@ rootpw		secret
+ # The database directory MUST exist prior to running slapd AND 
+ # should only be accessible by the slapd and slap tools.
+ # Mode 700 recommended.
+-directory	%LOCALSTATEDIR%/openldap-data
++directory	%LOCALSTATEDIR%/lib/openldap
+ # Indices to maintain
+ index	objectClass	eq
+ 
+diff -Naurp openldap-2.6.1.orig/servers/slapd/slapd.ldif openldap-2.6.1/servers/slapd/slapd.ldif
+--- openldap-2.6.1.orig/servers/slapd/slapd.ldif	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/servers/slapd/slapd.ldif	2022-02-13 15:54:13.655979565 -0600
+@@ -9,8 +9,8 @@ cn: config
+ #
+ # Define global ACLs to disable default read access.
+ #
+-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
+-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
++olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args
++olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid
+ #
+ # Do not enable referrals until AFTER you have a working directory
+ # service AND an understanding of referrals.
+@@ -88,7 +88,7 @@ olcRootPW: secret
+ # The database directory MUST exist prior to running slapd AND 
+ # should only be accessible by the slapd and slap tools.
+ # Mode 700 recommended.
+-olcDbDirectory:	%LOCALSTATEDIR%/openldap-data
++olcDbDirectory:	%LOCALSTATEDIR%/lib/openldap
+ # Indices to maintain
+ olcDbIndex: objectClass eq
+ 
+diff -Naurp openldap-2.6.1.orig/servers/slapd/slapi/Makefile.in openldap-2.6.1/servers/slapd/slapi/Makefile.in
+--- openldap-2.6.1.orig/servers/slapd/slapi/Makefile.in	2022-01-19 12:32:34.000000000 -0600
++++ openldap-2.6.1/servers/slapd/slapi/Makefile.in	2022-02-13 15:54:13.655979565 -0600
+@@ -46,6 +46,6 @@ BUILD_MOD = @BUILD_SLAPI@
+ install-local: FORCE
+ 	if test "$(BUILD_MOD)" = "yes"; then \
+ 		$(MKDIR) $(DESTDIR)$(libdir); \
+-		$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
++		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
+ 	fi
+ 
diff --git a/src/patches/openldap-gcc44-fixes.patch b/src/patches/openldap-gcc44-fixes.patch
deleted file mode 100644
index 53b8ea047..000000000
--- a/src/patches/openldap-gcc44-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- include/ldap_pvt_thread.h~	2008-11-12 07:37:16.000000000 +0000
-+++ include/ldap_pvt_thread.h	2008-11-12 08:01:45.000000000 +0000
-@@ -59,12 +59,12 @@
- 
- #ifndef LDAP_PVT_THREAD_H_DONE
- #define	LDAP_PVT_THREAD_SET_STACK_SIZE
--#ifndef LDAP_PVT_THREAD_STACK_SIZE
--	/* LARGE stack. Will be twice as large on 64 bit machine. */
--#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
- /* May be explicitly defined to zero to disable it */
--#elif LDAP_PVT_THREAD_STACK_SIZE == 0
-+#if LDAP_PVT_THREAD_STACK_SIZE == 0
- #undef LDAP_PVT_THREAD_SET_STACK_SIZE
-+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
-+	/* LARGE stack. Will be twice as large on 64 bit machine. */
-+#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
- #endif
- #endif /* !LDAP_PVT_THREAD_H_DONE */
- 
---- libraries/libldap/os-ip.c~	2008-11-12 07:33:10.000000000 +0000
-+++ libraries/libldap/os-ip.c	2008-11-12 07:33:31.000000000 +0000
-@@ -690,7 +690,7 @@
- 		char *herr;
- #ifdef NI_MAXHOST
- 		char hbuf[NI_MAXHOST];
--#elif defined( MAXHOSTNAMELEN
-+#elif defined( MAXHOSTNAMELEN )
- 		char hbuf[MAXHOSTNAMELEN];
- #else
- 		char hbuf[256];
-
diff --git a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
similarity index 97%
rename from src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
rename to src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
index fcea77cfa..6bc745a0f 100644
--- a/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
+++ b/src/patches/suricata/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch
@@ -26,7 +26,7 @@ diff --git a/src/stream-tcp.c b/src/stream-tcp.c
 index 1cff19fa5..af681760b 100644
 --- a/src/stream-tcp.c
 +++ b/src/stream-tcp.c
-@@ -1643,6 +1643,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p,
+@@ -1641,6 +1641,23 @@ static int StreamTcpPacketStateSynSent(ThreadVars *tv, Packet *p,
                      "ssn->client.last_ack %"PRIu32"", ssn,
                      ssn->client.isn, ssn->client.next_seq,
                      ssn->client.last_ack);
diff --git a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
similarity index 95%
rename from src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
rename to src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
index a6747a2a7..68a21f1e9 100644
--- a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
+++ b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
 index d56d3a550..81abf8f00 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2313,7 +2313,7 @@ fi
+@@ -2318,7 +2318,7 @@ fi
      AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no")
      if test "$HAVE_GETCONF_CMD" != "no"; then
          CLS=$(getconf LEVEL1_DCACHE_LINESIZE)
diff --git a/src/patches/suricata-disable-sid-2210059.patch b/src/patches/suricata/suricata-disable-sid-2210059.patch
similarity index 100%
rename from src/patches/suricata-disable-sid-2210059.patch
rename to src/patches/suricata/suricata-disable-sid-2210059.patch
diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset
index 8c5fd37a1..e9a082e62 100644
--- a/src/scripts/update-ids-ruleset
+++ b/src/scripts/update-ids-ruleset
@@ -26,9 +26,18 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/ids-functions.pl";
 require "${General::swroot}/lang.pl";
+# Import ruleset providers file.
+require "$IDS::rulesetsourcesfile";
+
+# Load perl module to talk to the kernel syslog.
+use Sys::Syslog qw(:DEFAULT setlogsock);
+
 # Variable to store if the process has written a lockfile.
 my $locked;
+# Array to store the updated providers.
+my @updated_providers = ();
+
 # Hash to store the configured providers.
 my %providers = ();
@@ -45,12 +54,15 @@ if ( $> == 0 ) {
    POSIX::setuid( $uid );
 }
+# Establish the connection to the syslog service.
+openlog('oinkmaster', 'cons,pid', 'user');
+
 # Check if the IDS lock file exists.
 # In this case the WUI or another instance currently is altering the
 # ruleset.
 if (-f "$IDS::ids_page_lock_file") {
    # Store notice to the syslog.
-	&IDS::_log_to_syslog("Another process currently is altering the IDS ruleset.");
+	&_log_to_syslog("<INFO> Autoupdate skipped - Another process was altering the IDS ruleset.");
# Exit.
    exit 0;
@@ -59,19 +71,19 @@ if (-f "$IDS::ids_page_lock_file") {
 # Check if the red device is active.
 unless (-e "${General::swroot}/red/active") {
    # Store notice in the syslog.
-	&IDS::_log_to_syslog("The system is offline.");
-
-	# Store error message for displaying in the WUI.
-	&IDS::_store_error_message("$Lang::tr{'could not download latest updates'} - $Lang::tr{'system is offline'}");
+	&_log_to_syslog("<ERROR> Could not update any ruleset - The system is offline.");
# Exit.
    exit 0;
 }
# Check if enought free disk space is availabe.
-if(&IDS::checkdiskspace()) {
-	# Store the error message for displaying in the WUI.
-	&IDS::_store_error_message("$Lang::tr{'not enough disk space'}");
+my $return = &IDS::checkdiskspace();
+
+# Handle error.
+if ($return) {
+	# Store error in syslog.
+	&_log_to_syslog("<ERROR> Not enough free disk space, only $return of 300MB are available.");
# Exit.
    exit 0;
@@ -90,45 +102,87 @@ $locked = "1";
 foreach my $id (keys %providers) {
    # Assign some nice variabled.
    my $provider = $providers{$id}[0];
+	my $enabled_status = $providers{$id}[2];
    my $autoupdate_status = $providers{$id}[3];
+	# Skip unsupported providers.
+	next unless($IDS::Ruleset::Providers{$provider});
+
+	# Skip the provider if it is not enabled.
+	next unless($enabled_status eq "enabled");
+
    # Skip the provider if autoupdate is not enabled.
    next unless($autoupdate_status eq "enabled");
-	# Call the download function and gather the new ruleset for the current processed provider.
-	if(&IDS::downloadruleset($provider)) {
-		# Store error message for displaying in the WUI.
-		&IDS::_store_error_message("$provider: $Lang::tr{'could not download latest updates'}");
+	# Log notice about update.
+	&_log_to_syslog("<INFO> Performing update for $provider.");
-		# Unlock the IDS page.
-		&IDS::unlock_ids_page();
-
-		# Exit.
-		exit 0;
+	# Call the download function and gather the new ruleset for the current processed provider.
+	my $return = &IDS::downloadruleset($provider);
+
+	# Check if we got a return code.
+	if ($return) {
+		# Handle different return codes.
+		if ($return eq "not modified") {
+			# Log notice to syslog.
+			&_log_to_syslog("<INFO> Skipping $provider - The ruleset is up-to-date");
+
+		} elsif ($return eq "no url") {
+			# Log error to the syslog.
+			&_log_to_syslog("<ERROR> Could not determine a download URL for $provider.");
+
+		} else {
+			# Log error to syslog.
+			&_log_to_syslog("<ERROR> $return");
+		}
+	} else {
+		# Log successfull update.
+		&_log_to_syslog("<INFO> Successfully updated ruleset for $provider.");
+
+		# Get path and name of the stored rules file or archive.
+		my $stored_file = &IDS::_get_dl_rulesfile($provider);
+
+		# Set correct ownership for the downloaded tarball.
+		&IDS::set_ownership("$stored_file");
+
+		# Add the provider handle to the array of updated providers.
+		push(@updated_providers, $provider);
    }
+}
+
+# Check if at least one provider has been updated successfully.
+if (@updated_providers) {
+	# Call oinkmaster to alter the ruleset.
+	&IDS::oinkmaster();
-	# Get path and name of the stored rules file or archive.
-	my $stored_file = &IDS::_get_dl_rulesfile($provider);
+	# Set correct ownership for the rulesdir and files.
+	&IDS::set_ownership("$IDS::rulespath");
-	# Set correct ownership for the downloaded tarball.
-	&IDS::set_ownership("$stored_file");
+	# Check if the IDS is running.
+	if(&IDS::ids_is_running()) {
+		# Call suricatactrl to perform a reload.
+		&IDS::call_suricatactrl("reload");
+	}
 }
-# Call oinkmaster to alter the ruleset.
-&IDS::oinkmaster();
+#
+# Tiny function to sent the error message to the syslog.
+#
+sub _log_to_syslog($) {
+	my ($message) = @_;
-# Set correct ownership for the rulesdir and files.
-&IDS::set_ownership("$IDS::rulespath");
+	# The syslog function works best with an array based input,
+	# so generate one before passing the message details to syslog.
+	my @syslog = ("ERR", "$message");
-# Check if the IDS is running.
-if(&IDS::ids_is_running()) {
-	# Call suricatactrl to perform a reload.
-	&IDS::call_suricatactrl("reload");
+	# Send the log message.
+	syslog(@syslog);
 }
-# Custom END declaration to release a IDS page lock
-# when the script has created one.
 END {
+	# Close connection to syslog.
+	closelog();
+
    # Check if a lock has been requested.
    if ($locked) {
    	# Unlock the IDS page.
diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl
index 91c6c1494..78c91eeb9 100644
--- a/src/wio/main/wio.pl
+++ b/src/wio/main/wio.pl
@@ -98,9 +98,6 @@ my ( $ping_i, $ping_t, $ping_ib, $ping_tb, $ping_iv, $ping_tv, $pingmode ) = '';
 my ( @tmp, @arptmp, @myarray, @status, @arpclients ) = '';
 my @ifaces = ('GREEN','BLUE','ORANGE');
-if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) {
-	push (@ifaces, "RED");
-}
if ( $mailsettings{'USEMAIL'} eq 'on' ) { $mailen = 'on'; }
 else { $mailen = 'off'; }
diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
index 1dcec52fe..a61102894 100644
--- a/src/wio/wio.cgi
+++ b/src/wio/wio.cgi
@@ -128,9 +128,6 @@ my @devs_alt   = ('green','blue','orange','red');
my %ifacecolor = ( GREEN => 'wio_run_green', BLUE => 'wio_run_blue', ORANGE => 'wio_run_orange');
-#if ( $netsettings{'RED_TYPE'} eq 'STATIC' || $netsettings{'RED_TYPE'} eq 'DHCP' ) {
-#	%ifacecolor = ( %ifacecolor, RED => 'wio_run_red' );
-#}
&loadips();
diff --git a/tools/download-rust-crate b/tools/download-rust-crate
index bae6b60be..f6a0fe035 100755
--- a/tools/download-rust-crate
+++ b/tools/download-rust-crate
@@ -50,8 +50,8 @@ main() {
    fi
# Hash the downloaded file
-	local md5sum="$(md5sum "${download}" | awk '{ print $1 }')"
-	if [ -z "${md5sum}" ]; then
+	local b2sum="$(b2sum "${download}" | awk '{ print $1 }')"
+	if [ -z "${b2sum}" ]; then
    	echo "${0}: Could not hash download" >&2
    	unlink "${download}"
    	return 1
@@ -73,7 +73,7 @@ main() {
    sed < "${RUST_TEMPLATE}" > "lfs/rust-${name}" \
    	-e "s/^VER.*/VER        = ${version}/" \
    	-e "s/^THISAPP.*/THISAPP    = ${name}-$(VER)/" \
-		-e "s/^$(DL_FILE)_MD5.*/$(DL_FILE)_MD5 = ${md5sum}/"
+		-e "s/^$(DL_FILE)_BLAKE2.*/$(DL_FILE)_BLAKE2 = ${b2sum}/"
echo "Done"
    return 0
hooks/post-receive
--
IPFire 2.x development tree

    