IPFire-SCM September 2018

ipfire-scm@lists.ipfire.org

1 participants
40 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0f2186725ef5cd62d1482b4482e20a6295ebf2ad
by Arne Fitzenreiter 21 Sep '18

21 Sep '18

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 0f2186725ef5cd62d1482b4482e20a6295ebf2ad (commit) via e2a3147fe5b43f89084cbea25ae174ffe6c6232c (commit) via 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d (commit) via bdf9df742caf803272f7a34cadc9d7dc4ea17a78 (commit) via 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2 (commit) via b1bfe61711ac678632118180c06a34deeab96a24 (commit) via 37d7f3801877b3330465b1a20cfba2fc4987e610 (commit) via 74189c1d5519c077c43fe123e6e3a3d39176e1fb (commit) via 1d2fe90cc8952879835c3694a6cb8c45b097013c (commit) via bd0686f441cf09a2041e1647de6e0dffda590409 (commit) via 07da1af688135710960e6deb9049a3fab6cb6e81 (commit) via 38485efafba2936ca3856e1324cca2044a13e85b (commit) via a6c190818a15342db5d91f4219587aa08f692173 (commit) via 06131f41e4a186ed7a70e8ef4f002d63cc16707a (commit) via 362ac1ed61edb4ab8ddd510be13402b00d979d90 (commit) via a834285d1ba8cd4314cb9fd8218b0bc2bcfe68d4 (commit) via 276692f3783c865cb5049d19b306fe56bdc43e60 (commit) via 088b7f4f3f6be2ccc082d26214bbc9daf86879bc (commit) via 76e26c7f69dab295682452ff260e0e17335957de (commit) via 0023f8a92b000d8714cc2dc8a9379f0fd0b965af (commit) via b8fdc7398ce7ae1852e019e2f8773f95125619ed (commit) via 614764e58af6dd710658fd072ed9b3a1b51f805a (commit) via 7f6257e0a475681ff243ead159cafee2e03f6265 (commit) via 924b48c7890ef573c1400474ef92951fb9cf3ded (commit) via eee037b8902c3163850069f302479e7733966bd0 (commit) via 063de1600bbad5566764f6bc88f15260e2fe1288 (commit) via 05a89532d79d031895dd8dab0193b951f8072934 (commit) via cc3e41cb8b0b7d713ce15a7177d1bbda7778b2ca (commit) via edea6ec5a4ee9a75afcf69c65178089f6a928105 (commit) via 0762dcc4e86937ae2f00d09d449563eb12563b9c (commit) via 8a0585837c4f743676a27ad16212a68b8fb4172b (commit) via 4e4128faacab7a25e5845faffefa2b2b2128eff7 (commit) via ffba3c98bac2675f19f32541f5e1ebe61419e7bd (commit) via 4ca0cb33543e780f02142cd70b18bb341d2eabad (commit) via b67e79a4f15bcb8f2e9d525169d9c51611fe6c7e (commit) via a0d612be7ac96cff5dc988f89054db49420c14b8 (commit) via 505b886d0d8cbe5448a9998ff88c6636b8e50245 (commit) via d5fe33228311d47490536bee370297a7c735f9d6 (commit) via 65ae069c213a7fcd36d7857b15d863804984948d (commit) via fd0a0384f07b399e9cb4cf46b4c5722b809ffe6a (commit) via 3da2a66193ce8e3f92d3c29be95a4076a4fa0274 (commit) via fd313a1ae690ce95d91802fea0d94d85da084fd8 (commit) via aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 (commit) via 06d55142e51b270d3f7f4e8ee69cc6260e87b3f7 (commit) via e32591e7bfa07c5d72688cf37d86df0bea6740f6 (commit) via 973ffc2987afd070c95974bbebfd5c3973ca3db0 (commit) via db5360ee9a6d10483666c8ea6fd12b665b40f93d (commit) via b31d55a79d4c2771b36a209227da7cf99c8606a7 (commit) via 2754623fa9842d80cdd8341f06536b0940f4aeea (commit) via aec1925bea763d7dff55ed43d26bdb06acd2e07c (commit) via 366b40c740bd61e412be23dcc987619b243b9c7b (commit) via 95b87f39ac309eb352dca6adbccfcff631bfe914 (commit) via 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 (commit) via d303638793c2ad21e296289eadc4ec3584bd215d (commit) via 7141cb1ee4fab26771319fc5cf61f454f321bcaf (commit) via 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c (commit) via 84cd9b91627e3b70240c944e4424905c46b9e72c (commit) via f3d59d2c94f3757bd10b74577c85740cd094ccee (commit) via c5465a94533beee243d447e92bc31ee8d4a40ca5 (commit) via caf5dcb1e741d93c686c2db0df6f2615bdc68c19 (commit) via 0ff9099443994b167e4ddc4a4912328e6c40e241 (commit) via f868ccb7632e56fa9038b72d9adb3fe4a4c88cea (commit) via 9b0618c09f634358415e963cfa618b3fafdcce0e (commit) via 7486e30eebc5f7d6f456274ac82191987135f2e1 (commit) via 3b81e38a08c7433c1462d01b26754913752d6c4e (commit) via 943cfcc311aa64e0aab62ff3e42c15e9b2e3fc65 (commit) via c6b97a06812abf52e5db9a5355f402062c9825cc (commit) via 70e4a5b2769370975a9261f4bbfc27b118503a6f (commit) via c708276290e2be0818aba0c6d7ae558d703c56dd (commit) via 5ed6cdd9200ef1f4e59ed14ee5d0a9845473a8a1 (commit) via f0d62e2f53569832d8ea742d6342cd111a5ef572 (commit) via 8098a76b5267f316464cbf3febd1f22a109c4c6a (commit) via d8106d993d2f3d518dd543958aa9dd73a587a50b (commit) via 1233d81f21dfa68749051358c74d200ec161e549 (commit) via 4c01f489f60f7b4b1fb8ad8784efddf378036338 (commit) via de0566323f35d5384f08fc04c1aae3a481295b88 (commit) via 046ef135e667e8727d0826891004870d980a2feb (commit) via d5461580a5c54e689c260fb90347ba6be8bc38a3 (commit) via 264f34546f2196c7a2459fa8fadb1fd4dbb1f948 (commit) via 242cfc339509245763fcb7eb4657870689146ad3 (commit) via 5b9f387d5929a3e14e159f7d008d0eba0a586059 (commit) via 87589bce0019b92911fab529b3a010a50cbdaa04 (commit) via de7c8df83e23e82a4b757b6283ae06d2cd8eb14f (commit) via 0efda7ac67d7e16c555bc6d07d1808a8480fa94b (commit) via 5d657243cf2c0e68412003ac9e8cb76a1c967a5f (commit) via 5dd9140a4477ea6f295936ee723ae3097f11810c (commit) via 948d660c10d8f384484bc0cc4a9391a55a5c570c (commit) via 9023689d739e040b3e881886a19a6502b24c237f (commit) via a570226765f6774c3eece1006b462d20d0b991f9 (commit) via 12034118dd0cf631efef85edc5d0944055a7ef5f (commit) via 6cf5a533f50256e961023bed8300eef178ac398f (commit) via 43829df3bbc85e0bbdddbafeb91fd2fe6bccb6de (commit) via befc0404976287adfd52f76dd9c3a4ab6afe2ab9 (commit) via eadde44b05294152f88eeeb2401622dac6fd0f00 (commit) via c1397b7ab39e6ddeed64e3c63ff7012f5659df84 (commit) via 46a4581db662d70e781d59782d2e24a4c2968968 (commit) via f8f4ef0795753b7cfbb7ef18def75e147ee7303d (commit) via 3deac294f5760a00e42eec0265ded0b10e9291ee (commit) via 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 (commit) via 37dc79434ad752c7115c01aa26264c933e9de647 (commit) via a5c92f50bfcecb8496216c82b41d4dd4b7d78635 (commit) via 092bc105e4ccde0743fabb18f4891aebd5747c5a (commit) via a1eb7761991af6515bd3b08f598454c7720119f8 (commit) via 4790db5f9509befbaa2d379a854bddd49d09f497 (commit) via 0ce1e4906e0f9db3c5ef4c1e9dd53449cc1d63d9 (commit) via b7407ccad54e5d5d5b4a83073fb1ccdbcfa5b85e (commit) via 701c891b40dc7e115f7359b26babab86ba36602c (commit) via 7c80f8c5cc517e4c39824f038cd3867518e4f262 (commit) via e3a3af3c5d1e49d8f86e82500ad7df5f5b2a3b33 (commit) via 7dc7880ddacc97f9e2393d2155f12384c6a3ad11 (commit) via 8fbadfc7a31a224c6b339e45ffe2f0041c8f7ec8 (commit) via f096a2ea9871ab087e36cd0044a3875d03b98799 (commit) via 2c49856ead5c553dde1e8888b6de0937b3f3d00a (commit) via b62f71f7f21752d3f919aaed9378826c36e5731c (commit) via 3755e358098f303df3f5f7effe47f6e354c8b733 (commit) via 8a06ff80c4e2daf597ec4ea6542854183351880d (commit) via 92e782332c88a3adc375f39d8183f031ccfe272a (commit) via 4c2343931cc01bf1594d9e9ef194a7ab87c7298a (commit) via b89c7379f9891a35845a2c1402c86392c4c5800d (commit) via 89e79c50c7e497dd7fa8eb5f451fbafa8abb72e6 (commit) via 8662e981738a22b780f6062900489dfe42c403a3 (commit) via 7d456c39710018b92ad7668e407f058924ff13b1 (commit) via 2f329aab2700e7a36afcc32a047c44057b4f334a (commit) via dfb0084e355885908d80b6544bd86fe5c0c1aba2 (commit) via 24e811b03acb228b71227430c98d48bd1e3ad9ab (commit) via fd80e500dfff0f8d5f6ec4a417b7c9fe423779b0 (commit) via b6a0fd583981787fb50a2eae43d34393215eeb95 (commit) via 5fb499f13b3eb8b25c55f113851f25bc9ac91e17 (commit) via 6b44fee76f2f086b8ac5378e1fdcf1fc000b70e6 (commit) via 5765b49bff0c3bcd60d1624c1bb159ce47085183 (commit) via 582aba05344e161a2ecbed81eef19005a80289ed (commit) via 5f387a1b8630c73cd0d573961356f579fd5520e4 (commit) via f4330e19b18589a75422d4d1bb34db4b95d02375 (commit) via b661333e3a4359c4dcf7cf68a7537fe84ecdee34 (commit) via 78dd680dfa04b6197488d18c3badbe4fe15c711c (commit) via 308af080f665e7a43d6ad5aeae8383a7dc34bb0e (commit) via ba3cbb0cfbf41c05185caa1f42b985738ff218bc (commit) via 7b4323c66ee5e639c841cced6503544c520374e9 (commit) via 5f52a95646b6e2f9aa13cd8b38ed1b22484470f7 (commit) via 72d40cfddde09c4db8249ab7dec74e12c0664a6c (commit) via df261337933e0532cd7c88658f11070771fa18f7 (commit) via 8a9605840cbfc095b94320d21f14b211e81c3af9 (commit) via 0268380764dc5cc33541643e603b32ce513ab963 (commit) via 7fbbd2aebc014bdd86e527b94418e8201c82ce42 (commit) via 784cd5cbd7f4b7ad3d0cda1411b8eb1e038ffc7e (commit) from 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f (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 0f2186725ef5cd62d1482b4482e20a6295ebf2ad Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 21 15:26:52 2018 +0200 core124: finish updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e2a3147fe5b43f89084cbea25ae174ffe6c6232c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 21 15:18:24 2018 +0200 arm: boot.scr: add setting to edit fdt via uEnv.txt Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 20 20:03:26 2018 +0200 rebuild-initrd: update for grub2 this was was not used for years because we usually ship a prebuild ramdisk so this incompatiblity was not noticed long time... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bdf9df742caf803272f7a34cadc9d7dc4ea17a78 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 20 19:51:43 2018 +0200 kernel: update to 4.14.71 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:54:02 2018 +0100 core124: Ship updated iproute2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1bfe61711ac678632118180c06a34deeab96a24 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Sep 18 19:35:10 2018 +0200 iproute2: Update to 4.18.0 Triggered by https://bugzilla.ipfire.org/show_bug.cgi?id=11866 ;-) For details see: https://lwn.net/Articles/762515/ Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37d7f3801877b3330465b1a20cfba2fc4987e610 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:52:17 2018 +0100 core124: Ship updated openssh package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74189c1d5519c077c43fe123e6e3a3d39176e1fb Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Sep 10 19:38:17 2018 +0200 openssh: Update to 7.8p1 For details see: http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ChangeLog I didn't find an official lfs-patch for openssl-1.1-compatibility, so I used the patch from here: https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.p… Building ran without any errors. I tested with both machines (test on Core 120 - and productive - on Core 122) and found no errors so far: ... [root@ipfiretest ~]# ssh -V OpenSSH_7.8p1, OpenSSL 1.1.0h 27 Mar 2018 ... ... root@ipfire: / # ssh -V OpenSSH_7.8p1, OpenSSL 1.1.0h 27 Mar 2018 ... All ssh-connections ran fine but I'm not REALLY sure if this is sufficient for anyone else. Could someone please check and confirm!? Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Tested-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1d2fe90cc8952879835c3694a6cb8c45b097013c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:51:13 2018 +0100 core124: Ship updated OpenSSH configuration Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bd0686f441cf09a2041e1647de6e0dffda590409 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:50:25 2018 +0100 ssh: Remove AuthenticationMethods directive This is only setting something that is default anyways and prevents sshd from starting if one of the listed methods is not activated. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 07da1af688135710960e6deb9049a3fab6cb6e81 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 17:52:23 2018 +0200 use custom SSH server configuration in LFS file Include OpenSSH server configuration file during build. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 38485efafba2936ca3856e1324cca2044a13e85b Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 17:52:22 2018 +0200 add hardened SSH server configuration In order to harden OpenSSH server in IPFire, using the upstream default configuration and edit it via sed commands in LFS file is error-prone and does not scale. Thereof we ship a custom and more secure OpenSSH server configuration which is copied into the image during build time. The fourth version of this patch disables password authentication by default, since this is required by some cloud hosters in order to apply the image. Further, this method is less secure than pubkey authentication. Non-AEAD ciphers have been re-added to provide compatibility to older RHEL systems. Fixes #11750 Fixes #11751 Partially fixes #11538 Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Cc: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Cc: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a6c190818a15342db5d91f4219587aa08f692173 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:21:41 2018 +0100 backup: Fix deleting backup files Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 06131f41e4a186ed7a70e8ef4f002d63cc16707a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 17 07:44:55 2018 +0200 kernel: arm32-bit: update rootfiles Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 362ac1ed61edb4ab8ddd510be13402b00d979d90 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 16 14:28:47 2018 +0200 kernel: update to 4.14.70 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a834285d1ba8cd4314cb9fd8218b0bc2bcfe68d4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 15 15:58:13 2018 +0200 kernel: arm: enable chacha poly fixes: #11855 todo: add rootfiles for arm 32-bit Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 276692f3783c865cb5049d19b306fe56bdc43e60 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 15 15:49:10 2018 +0200 core124: add kernel files to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 088b7f4f3f6be2ccc082d26214bbc9daf86879bc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 13 14:45:05 2018 +0100 core124: Ship updated unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 76e26c7f69dab295682452ff260e0e17335957de Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Sep 11 20:07:14 2018 +0200 unbound: Update to 1.8.0 For details see: https://nlnetlabs.nl/svn/unbound/tags/release-1.8.0/doc/Changelog and https://nlnetlabs.nl/projects/unbound/download/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0023f8a92b000d8714cc2dc8a9379f0fd0b965af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 13 14:41:21 2018 +0100 core124: Ship updated backup.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8fdc7398ce7ae1852e019e2f8773f95125619ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 13 14:37:51 2018 +0100 static-routes: Make it clear that we are reloading routes When RED is brought down, we will reload all static routes. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 614764e58af6dd710658fd072ed9b3a1b51f805a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 30 10:28:45 2018 +0100 backup: Sanitise content of ADDON variable References: #11830 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7f6257e0a475681ff243ead159cafee2e03f6265 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 30 10:20:06 2018 +0100 backup: Sanitise FILE parameter This parameter was passed to some shell commands without any sanitisation which allowed an attacker who was authenticated to the web UI to download arbitrary files from some directories and delete any file from the filesystem. References: #11830 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 924b48c7890ef573c1400474ef92951fb9cf3ded Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 12 21:04:07 2018 +0200 kernel: update to 4.14.69 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eee037b8902c3163850069f302479e7733966bd0 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 19:52:21 2018 +0200 update disclaimer in LFS files Most of these files still used old dates and/or domain names for contact mail addresses. This is now replaced by an up-to-date copyright line. Just some housekeeping... :-) Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 063de1600bbad5566764f6bc88f15260e2fe1288 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 10 18:23:27 2018 +0100 core124: Ship CA certificates Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 05a89532d79d031895dd8dab0193b951f8072934 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 18:25:40 2018 +0200 update ca-certificates CA bundle Update the CA certificates list to what Mozilla NSS ships currently. The original file can be retrieved from: https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b… Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc3e41cb8b0b7d713ce15a7177d1bbda7778b2ca Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:29:09 2018 +0200 use custom SSH client configuration in LFS file Include OpenSSH client configuration file during build. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit edea6ec5a4ee9a75afcf69c65178089f6a928105 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:29:08 2018 +0200 add hardened SSH client configuration Introduce a custom OpenSSH client configuration file for IPFire. Some people use it as a jumping host, so applying hardening options system-wide improves security. Cryptography setup is the same as for OpenSSH server configuration. The second version of this patch re-adds some non-AEAD cipher suites which are needed for connecting to older RHEL systems. Partially fixes #11751 Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0762dcc4e86937ae2f00d09d449563eb12563b9c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 10 16:35:25 2018 +0100 core124: Ship updated unbound configuration and restart daemon Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a0585837c4f743676a27ad16212a68b8fb4172b Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:21:26 2018 +0200 Unbound: Use aggressive NSEC This avoids some needless lookups to destination domains with a very high NXDOMAIN rate and reduces load on upstream servers. See https://nlnetlabs.nl/documentation/unbound/unbound.conf/ for further details. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e4128faacab7a25e5845faffefa2b2b2128eff7 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:21:25 2018 +0200 Unbound: Use caps for IDs Attempt to detect DNS spoofing attacks by inserting 0x20-encoded random bits into upstream queries. Upstream documentation claims it to be an experimental implementation, it did not cause any trouble on productive systems here. See https://nlnetlabs.nl/documentation/unbound/unbound.conf/ for further details. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ffba3c98bac2675f19f32541f5e1ebe61419e7bd Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:21:24 2018 +0200 Unbound: Enable DNS cache poisoning mitigation By default, Unbound neither keeps track of the number of unwanted replies nor initiates countermeasures if they become too large (DNS cache poisoning). This sets the maximum number of tolerated unwanted replies to 1M, causing the cache to be flushed afterwards. (Upstream documentation recommends 10M as a threshold, but this turned out to be ineffective against attacks in the wild.) See https://nlnetlabs.nl/documentation/unbound/unbound.conf/ for details. This version of the patch uses 1M as threshold instead of 5M and supersedes the first and second version. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4ca0cb33543e780f02142cd70b18bb341d2eabad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 10 16:30:52 2018 +0100 core124: Ship updated redirect page template Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b67e79a4f15bcb8f2e9d525169d9c51611fe6c7e Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Mon Sep 10 16:15:44 2018 +0200 embed background image in redirect template Embed the IPFire background image into the redirect template directly via CSS instead of loading it from somewhere else. This is necessary because of Content Security Policy (CSP). This patch inserts the base64 encoded image during build so nothing needs to be updated twice in case background image changes. It supersedes first to fourth version of this patch and has been successfully tested during a clean build. Fixes #11650 Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a0d612be7ac96cff5dc988f89054db49420c14b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 9 18:27:56 2018 +0100 core124: Rebuild initrd This script was missing in the last update and therefore no microcodes were included. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 505b886d0d8cbe5448a9998ff88c6636b8e50245 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 9 17:48:14 2018 +0100 core124: Apply changed sysctl.conf Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d5fe33228311d47490536bee370297a7c735f9d6 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Thu Aug 16 17:29:58 2018 +0200 do not expose kernel address spaces even to privileged users Change this setting from 1 to 2 so kernel addresses are not displayed even if a user has CAPS_SYSLOG privileges. See also: - https://lwn.net/Articles/420403/ - https://tails.boum.org/contribute/design/kernel_hardening/ Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 65ae069c213a7fcd36d7857b15d863804984948d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 9 17:43:53 2018 +0100 core124: Ship updated rng-tools Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fd0a0384f07b399e9cb4cf46b4c5722b809ffe6a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 9 17:42:17 2018 +0100 rng-tools: Update to 6.4 Also add a patch that keeps RDRAND enabled on i586 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Fixes: #11853 commit 3da2a66193ce8e3f92d3c29be95a4076a4fa0274 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 31 11:08:53 2018 +0100 aws: Don't update the system on first boot This will violate AWS policy and therefore had to be removed. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fd313a1ae690ce95d91802fea0d94d85da084fd8 Merge: aa61d769b 574a71177 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 29 07:43:06 2018 +0200 Merge branch 'master' into next commit aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:34:28 2018 +0100 core124: Ship latest pakfire changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 06d55142e51b270d3f7f4e8ee69cc6260e87b3f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:29:19 2018 +0100 pakfire: Remove any reference to counter.py The concept has been retired a very log time ago and the web service only responds with 200 what ever it is being sent. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e32591e7bfa07c5d72688cf37d86df0bea6740f6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 27 07:23:03 2018 +0100 pakfire: Remove mirror health check This is not really necessary because pakfire will automatically failover to the next mirror anyways and that a mirror responds to an ICMP echo request doesn't necessarily mean that it can deliver the requested file. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 973ffc2987afd070c95974bbebfd5c3973ca3db0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 12:25:59 2018 +0100 core124: Ship updated ntp package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit db5360ee9a6d10483666c8ea6fd12b665b40f93d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Aug 23 21:07:04 2018 +0200 ntp: Update to 4.2.8p12 For details see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b31d55a79d4c2771b36a209227da7cf99c8606a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 11:45:44 2018 +0100 core124: Ship updated fwhosts.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2754623fa9842d80cdd8341f06536b0940f4aeea Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Fri Aug 24 10:06:30 2018 +0200 BUG11825: firewall: Renaming a network/host group doesn't update rules Code only changed field 6 of hash (target group) and not field 4 (source group). Also if using geoip it was only field 4 of hash (source group) and not field 6 of hash (target group) Added new code that changes both fields to reflect the change in the firewallrules immediately. fixes: #11825 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aec1925bea763d7dff55ed43d26bdb06acd2e07c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 23 17:34:50 2018 +0100 IPsec: Show connected status for waiting connections that are active Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 366b40c740bd61e412be23dcc987619b243b9c7b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 23 11:17:23 2018 +0100 setup: Don't write any mount errors over the GUI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 95b87f39ac309eb352dca6adbccfcff631bfe914 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 13:36:23 2018 +0100 localnet: Set FQDN without using domainname command Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:46:53 2018 +0100 core124: Ship updated firewall.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d303638793c2ad21e296289eadc4ec3584bd215d Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Aug 22 11:23:16 2018 +0200 BUG11805: Firewall rule with source orange and target firewall-interface-orange not possible Now its possible to create a rule with orange source and target orange interface of the firewall. Fixes: #11805 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7141cb1ee4fab26771319fc5cf61f454f321bcaf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:17:15 2018 +0100 core124: Fix typo in rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:06:53 2018 +0100 core124: Ship updated AWS setup scripts Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84cd9b91627e3b70240c944e4424905c46b9e72c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:05:43 2018 +0100 Drop the network-trigger script This is done at boot time and doesn't normally need to be done again. On AWS or in the setup, renaming any network interfaces is being handled automatically. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f3d59d2c94f3757bd10b74577c85740cd094ccee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:02:43 2018 +0100 firstsetup: There is no need to restart udev here All network interfaces are renamed accordingly in setup Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c5465a94533beee243d447e92bc31ee8d4a40ca5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:00:39 2018 +0100 aws: Let udev rename all network interfaces Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit caf5dcb1e741d93c686c2db0df6f2615bdc68c19 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Aug 21 18:27:02 2018 +0200 nano: Update to 2.9.8 For details see: https://www.nano-editor.org/news.php Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0ff9099443994b167e4ddc4a4912328e6c40e241 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:06:22 2018 +0100 core124: Ship updated backup include/exclude files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f868ccb7632e56fa9038b72d9adb3fe4a4c88cea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:05:40 2018 +0100 backup: Add root's SSH keys and settings Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b0618c09f634358415e963cfa618b3fafdcce0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:05:13 2018 +0100 backup: Add custom squid configuration files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7486e30eebc5f7d6f456274ac82191987135f2e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 11:32:04 2018 +0100 backup: Order incldue/exclude alphabetically Nothing has been added or removed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3b81e38a08c7433c1462d01b26754913752d6c4e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:22:20 2018 +0200 gcc: x86_64 add libspp to rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 943cfcc311aa64e0aab62ff3e42c15e9b2e3fc65 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Aug 16 20:56:03 2018 +0200 bind: Update to 9.11.4-P1 Fixes CVE-2018-5740 and CVE-2018-5738. For details see: http://ftp.isc.org/isc/bind9/9.11.4-P1/RELEASE-NOTES-bind-9.11.4-P1.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c6b97a06812abf52e5db9a5355f402062c9825cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 18:55:49 2018 +0100 core124: Ship updated pciutils Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 70e4a5b2769370975a9261f4bbfc27b118503a6f Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Thu Aug 16 17:10:58 2018 +0200 pciutils: update to 3.5.6 The third version of this patch superseds the first and second one which were broken due to bugs in the MUAs GPG implementation. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c708276290e2be0818aba0c6d7ae558d703c56dd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 18:54:41 2018 +0100 core124: Ship updated ids.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5ed6cdd9200ef1f4e59ed14ee5d0a9845473a8a1 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Thu Aug 16 17:09:41 2018 +0200 download ET IDS rules via HTTPS The Emerging Threats ruleset server supports HTTPS. It should be used for downloading the ruleset in IPFire, too. This also needs to be applied on the upcoming ids.cgi file for Suricata which I will do in a second patch. The third version of this patch superseds the first and second one which were broken due to bugs in the MUAs GPG implementation. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f0d62e2f53569832d8ea742d6342cd111a5ef572 Author: Peter MÃŒller <peter.mueller(a)link38.eu> Date: Thu Aug 16 17:08:04 2018 +0200 Postfix: update to 3.3.1 This updates Postfix to recent 3.3.x series, which contains some new features. Release announcement available at http://www.postfix.org/announcements/postfix-3.3.1.html The third version of this patch superseds the first and second one which were broken due to bugs in the MUAs GPG implementation. Signed-off-by: Peter MÃŒller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8098a76b5267f316464cbf3febd1f22a109c4c6a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 13:05:47 2018 +0100 core124: Ship updated bind Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d8106d993d2f3d518dd543958aa9dd73a587a50b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Jul 22 17:11:53 2018 +0200 bind: Update to 9.11.4 For details see: http://ftp.isc.org/isc/bind9/9.11.4/RELEASE-NOTES-bind-9.11.4.html Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1233d81f21dfa68749051358c74d200ec161e549 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 13:02:56 2018 +0100 core124: Don't re-generate the initrd Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4c01f489f60f7b4b1fb8ad8784efddf378036338 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 13:02:37 2018 +0100 core124: Re-install bootloader during update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit de0566323f35d5384f08fc04c1aae3a481295b88 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 13:01:01 2018 +0100 core124: Ship EFI changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 046ef135e667e8727d0826891004870d980a2feb Merge: d5461580a 87589bce0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 12:49:13 2018 +0100 Merge remote-tracking branch 'origin/efi' into next commit d5461580a5c54e689c260fb90347ba6be8bc38a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 12:47:55 2018 +0100 core124: Ship update localnet init script Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 264f34546f2196c7a2459fa8fadb1fd4dbb1f948 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 12:47:06 2018 +0100 Start Core Update 124 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 242cfc339509245763fcb7eb4657870689146ad3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 12:42:25 2018 +0100 localnet: Properly format and quote variables Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b9f387d5929a3e14e159f7d008d0eba0a586059 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 16 12:41:52 2018 +0100 localnet: Correctly set domain name Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 87589bce0019b92911fab529b3a010a50cbdaa04 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 31 16:36:09 2018 +0100 backup: Make backup ISO bootable on EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit de7c8df83e23e82a4b757b6283ae06d2cd8eb14f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 25 10:54:35 2018 +0100 cdrom: Move list of EFI modules to lfs/cdrom Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0efda7ac67d7e16c555bc6d07d1808a8480fa94b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 23 23:10:36 2018 +0100 cdrom: Re-order arguments again Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d657243cf2c0e68412003ac9e8cb76a1c967a5f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 22 22:31:30 2018 +0100 cdrom: The order of arguments for mkisofs seems to be relevant Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5dd9140a4477ea6f295936ee723ae3097f11810c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 22 13:41:38 2018 +0200 grub: apply vga fallback disable patch again on some systems (e.g. J1900 based) grub detects a too low resolution and use it. This is no problem in grub itself but the kernel not render the consoles in this mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 948d660c10d8f384484bc0cc4a9391a55a5c570c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 21 16:39:46 2018 +0200 syslinux: update i586 rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9023689d739e040b3e881886a19a6502b24c237f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 21 16:33:29 2018 +0200 flash-images: fix partition layout on i586 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a570226765f6774c3eece1006b462d20d0b991f9 Merge: 12034118d 011204d96 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 12:47:20 2018 +0000 Merge branch 'next' into efi commit 12034118dd0cf631efef85edc5d0944055a7ef5f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:59:00 2018 +0000 installer: Run install-bootloader script instead of own code This allows us to keep the GRUB installation routine in one place only. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6cf5a533f50256e961023bed8300eef178ac398f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:53:55 2018 +0000 partresize: Remove debugging line Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 43829df3bbc85e0bbdddbafeb91fd2fe6bccb6de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:53:24 2018 +0000 partresize: Only regenerate configuration instead of re-installing GRUB This should not be necessary Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit befc0404976287adfd52f76dd9c3a4ab6afe2ab9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:51:50 2018 +0000 Move update-bootloader script into installer Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eadde44b05294152f88eeeb2401622dac6fd0f00 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:47:35 2018 +0000 update-bootloader: Allow passing device to install GRUB on Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c1397b7ab39e6ddeed64e3c63ff7012f5659df84 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 20 11:34:55 2018 +0000 update-bootloader: Extend script to support EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 46a4581db662d70e781d59782d2e24a4c2968968 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 20 12:24:49 2018 +0100 flash-image: use FAT for /boot partition on aarch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f8f4ef0795753b7cfbb7ef18def75e147ee7303d Merge: 3deac294f 413149f80 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 19 18:15:50 2018 +0100 Merge branch 'next' into efi Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Conflicts: config/kernel/kernel.config.aarch64-ipfire commit 3deac294f5760a00e42eec0265ded0b10e9291ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 16 22:35:21 2018 +0100 cdrom: mkisofs seems to not like the order of the arguments Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 16 22:31:11 2018 +0100 Rootfile update We don't have EFI on i586 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37dc79434ad752c7115c01aa26264c933e9de647 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 14 14:05:09 2018 +0100 kernel: Enable EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a5c92f50bfcecb8496216c82b41d4dd4b7d78635 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 13:59:07 2018 +0100 flash-images: Only install grub for EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 092bc105e4ccde0743fabb18f4891aebd5747c5a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 12 10:39:57 2018 +0100 cdrom: Run isohybrid only when we have syslinux Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1eb7761991af6515bd3b08f598454c7720119f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 18:10:14 2018 +0100 cdrom: Fix building GRUB image for aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4790db5f9509befbaa2d379a854bddd49d09f497 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 15:34:30 2018 +0100 cdrom: Install ISOLINUX only on some architectures Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0ce1e4906e0f9db3c5ef4c1e9dd53449cc1d63d9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 10 14:38:21 2018 +0100 cdrom: Install iPXE only on x86 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b7407ccad54e5d5d5b4a83073fb1ccdbcfa5b85e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 5 23:29:20 2018 +0100 cdrom: Install memtest only on x86 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 701c891b40dc7e115f7359b26babab86ba36602c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 21 15:53:38 2018 +0100 Build efibootmgr and efivars only for x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c80f8c5cc517e4c39824f038cd3867518e4f262 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 22:49:14 2018 +0100 syslinux: Update to 6.04-pre1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e3a3af3c5d1e49d8f86e82500ad7df5f5b2a3b33 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:18:25 2018 +0100 installer: Install GRUB in removable mode as well This allows that a system will boot IPFire even when no boot entry is configured in the EFI BIOS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7dc7880ddacc97f9e2393d2155f12384c6a3ad11 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:16:26 2018 +0100 installer: Always install EFI bootloader on x86_64 and aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8fbadfc7a31a224c6b339e45ffe2f0041c8f7ec8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 17 18:15:08 2018 +0100 installer: Create a flag that marks if EFI support is available Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f096a2ea9871ab087e36cd0044a3875d03b98799 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:21:58 2018 +0100 flash-image+cdrom: Execute ARMv5-specific code on ARMv5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2c49856ead5c553dde1e8888b6de0937b3f3d00a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 23:05:44 2018 +0100 Rootfile update for parted Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b62f71f7f21752d3f919aaed9378826c36e5731c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 18:32:42 2018 +0100 Build GRUB on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3755e358098f303df3f5f7effe47f6e354c8b733 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 17:13:40 2018 +0100 make.sh: Build popt earlier efivars depends on it and since it is a very common library without any dependencies, we can build it very early Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a06ff80c4e2daf597ec4ea6542854183351880d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:32:28 2018 +0100 grub: Don't explicitely set the font Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92e782332c88a3adc375f39d8183f031ccfe272a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:31:29 2018 +0100 installer: Add support to install on EFI systems Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4c2343931cc01bf1594d9e9ef194a7ab87c7298a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 11 10:17:54 2018 +0100 parted: Update to 3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b89c7379f9891a35845a2c1402c86392c4c5800d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:31:13 2018 +0100 flash-images: Make EFI partition 32MB Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89e79c50c7e497dd7fa8eb5f451fbafa8abb72e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 23:18:08 2018 +0100 flash-images: Cleanup partitioning code No functional changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8662e981738a22b780f6062900489dfe42c403a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:22:02 2018 +0100 flash-images: Mark the /boot partition as bootable Before, the ESP was marked as bootable which isn't necessary Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d456c39710018b92ad7668e407f058924ff13b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:18:32 2018 +0100 flash-image: Use grub-install to install GRUB in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2f329aab2700e7a36afcc32a047c44057b4f334a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:34 2018 +0100 flash-image: Mark the EFI system partition as such Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dfb0084e355885908d80b6544bd86fe5c0c1aba2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:17:05 2018 +0100 flash-image: Remove any other GRUB configuration files in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 24e811b03acb228b71227430c98d48bd1e3ad9ab Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 22:15:58 2018 +0100 grub: Don't install an empty EFI configuration file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fd80e500dfff0f8d5f6ec4a417b7c9fe423779b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 7 15:33:48 2018 +0100 Add efibootmgr and efivar These packages are required to manage EFI boot options Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6a0fd583981787fb50a2eae43d34393215eeb95 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:51 2018 +0100 cdrom: Select installation as default Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fb499f13b3eb8b25c55f113851f25bc9ac91e17 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:24:39 2018 +0100 installer: Detect if we are running in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6b44fee76f2f086b8ac5378e1fdcf1fc000b70e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 15:08:53 2018 +0100 cdrom: Keep the EFI image on the ISO9660 file system as well This allows systems to boot the EFI bootloader from the CDROM file system instead of using the FAT filesystem which is for USB keys. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5765b49bff0c3bcd60d1624c1bb159ce47085183 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 14:57:12 2018 +0100 cdrom: Add grub.cfg that allows to install IPFire Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 582aba05344e161a2ecbed81eef19005a80289ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:47:47 2018 +0100 Enable EFI on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f387a1b8630c73cd0d573961356f579fd5520e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 13:46:56 2018 +0100 cdrom: Install GRUB into EFI image This will start GRUB on EFI systems when booting from CD Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f4330e19b18589a75422d4d1bb34db4b95d02375 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 12:46:01 2018 +0100 Fix syntax error in lfs/cdrom Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b661333e3a4359c4dcf7cf68a7537fe84ecdee34 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:01:08 2018 +0100 syslinux: FTBFS with newer ld Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 78dd680dfa04b6197488d18c3badbe4fe15c711c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 31 11:00:43 2018 +0100 make.sh: cdrkit required cmake to build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 308af080f665e7a43d6ad5aeae8383a7dc34bb0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:43:30 2018 +0100 grub: Build new version in EFI mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ba3cbb0cfbf41c05185caa1f42b985738ff218bc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 30 15:23:57 2018 +0100 Adjust variables that have been renamed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7b4323c66ee5e639c841cced6503544c520374e9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 29 20:14:59 2018 +0100 cdrom: Simplify commands that author the ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f52a95646b6e2f9aa13cd8b38ed1b22484470f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:57:18 2015 +0200 cdrom: Build EFI-enabled ISO image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 72d40cfddde09c4db8249ab7dec74e12c0664a6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:56:45 2015 +0200 Config: Have a simple configuration variable that enables EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df261337933e0532cd7c88658f11070771fa18f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 23:52:09 2015 +0200 syslinux: Update to 6.03 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a9605840cbfc095b94320d21f14b211e81c3af9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 21:32:12 2015 +0200 Remove dvdrtools for cdrkit Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0268380764dc5cc33541643e603b32ce513ab963 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 20:25:34 2015 +0200 ipfire-netboot: Ship EFI image Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7fbbd2aebc014bdd86e527b94418e8201c82ce42 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 19 23:17:02 2015 +0200 Enable EFI on x86_64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 784cd5cbd7f4b7ad3d0cda1411b8eb1e038ffc7e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 22 21:18:18 2015 +0100 Enhance the flash image to support EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 7 +- config/backup/exclude | 2 +- config/backup/include | 49 +- config/ca-certificates/certdata.txt | 422 +++-- config/cdrom/grub-efi.cfg | 2 + config/cdrom/grub.cfg | 34 + config/etc/sysctl.conf | 2 +- config/grub2/default | 1 - config/kernel/kernel.config.aarch64-ipfire | 54 +- .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 15 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 16 +- config/kernel/kernel.config.i586-ipfire | 12 +- config/kernel/kernel.config.i586-ipfire-pae | 12 +- config/kernel/kernel.config.x86_64-ipfire | 12 +- config/rootfiles/common/aarch64/efibootmgr | 4 + config/rootfiles/common/aarch64/efivar | 46 + config/rootfiles/common/aarch64/grub | 536 +++++++ config/rootfiles/common/aarch64/initscripts | 2 - config/rootfiles/common/aarch64/linux | 17 +- config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv5tel/initscripts | 2 - config/rootfiles/common/armv5tel/linux-kirkwood | 5 +- config/rootfiles/common/armv5tel/linux-multi | 4 +- config/rootfiles/common/cdrkit | 46 + config/rootfiles/common/dvdrtools | 15 - config/rootfiles/common/i586/grub | 13 +- config/rootfiles/common/i586/initscripts | 2 - config/rootfiles/common/i586/linux | 2 - config/rootfiles/common/i586/syslinux | 80 +- config/rootfiles/common/installer | 1 + config/rootfiles/common/iproute2 | 3 + config/rootfiles/common/parted | 4 +- config/rootfiles/common/pciutils | 2 +- config/rootfiles/common/stage2 | 1 - config/rootfiles/common/unbound | 4 +- config/rootfiles/common/x86_64/efibootmgr | 4 + config/rootfiles/common/x86_64/efivar | 46 + config/rootfiles/common/x86_64/grub | 1648 +++++++++++++------- config/rootfiles/common/x86_64/initscripts | 2 - config/rootfiles/common/x86_64/ipfire-netboot | 1 + config/rootfiles/common/x86_64/linux | 2 - config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/common/x86_64/syslinux | 126 +- config/rootfiles/core/{123 => 124}/exclude | 2 - .../core/124/filelists/aarch64/efibootmgr | 1 + config/rootfiles/core/124/filelists/aarch64/efivar | 1 + config/rootfiles/core/124/filelists/aarch64/files | 2 + config/rootfiles/core/124/filelists/aarch64/grub | 1 + config/rootfiles/core/124/filelists/aarch64/linux | 1 + .../core/124/filelists/aarch64/linux-initrd | 1 + config/rootfiles/core/124/filelists/armv5tel/files | 2 + .../124}/filelists/armv5tel/linux-initrd-kirkwood | 0 .../124}/filelists/armv5tel/linux-initrd-multi | 0 .../124}/filelists/armv5tel/linux-kirkwood | 0 .../124}/filelists/armv5tel/linux-multi | 0 .../{oldcore/100 => core/124}/filelists/bind | 0 .../121 => core/124}/filelists/ca-certificates | 0 config/rootfiles/core/124/filelists/cdrkit | 1 + config/rootfiles/core/124/filelists/files | 29 + .../{oldcore/100 => core/124}/filelists/i586/grub | 0 .../{oldcore/100 => core/124}/filelists/i586/linux | 0 .../100 => core/124}/filelists/i586/linux-initrd | 0 .../{oldcore/106 => core/124}/filelists/iproute2 | 0 .../{oldcore/100 => core/124}/filelists/ntp | 0 .../{oldcore/100 => core/124}/filelists/openssh | 0 .../{oldcore/87 => core/124}/filelists/parted | 0 .../{oldcore/101 => core/124}/filelists/pciutils | 0 .../{oldcore/121 => core/124}/filelists/rng-tools | 0 .../rootfiles/core/{123 => 124}/filelists/unbound | 0 .../rootfiles/core/124/filelists/x86_64/efibootmgr | 1 + config/rootfiles/core/124/filelists/x86_64/efivar | 1 + .../100 => core/124}/filelists/x86_64/grub | 0 .../100 => core/124}/filelists/x86_64/linux | 0 .../100 => core/124}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/124/update.sh | 166 ++ config/rootfiles/{core => oldcore}/123/exclude | 0 .../{core => oldcore}/123/filelists/apache2 | 0 .../123/filelists/conntrack-tools | 0 .../{core => oldcore}/123/filelists/coreutils | 0 .../{core => oldcore}/123/filelists/files | 0 .../{core => oldcore}/123/filelists/gnupg | 0 .../123/filelists/i586/intel-microcode | 0 .../123/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/123/filelists/iana-etc | 0 .../{core => oldcore}/123/filelists/ipset | 0 .../{core => oldcore}/123/filelists/iptables | 0 .../{core => oldcore}/123/filelists/libgcrypt | 0 .../123/filelists/linux-firmware-updates | 0 .../{core => oldcore}/123/filelists/nss-myhostname | 0 .../{core => oldcore}/123/filelists/openssl | 0 .../{core => oldcore}/123/filelists/openssl-compat | 0 .../{core => oldcore}/123/filelists/squid | 0 .../{core => oldcore}/123/filelists/strongswan | 0 .../{core => oldcore}/123/filelists/tzdata | 0 .../{core => oldcore}/123/filelists/unbound | 0 .../123/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/123/filelists/xtables-addons | 0 config/rootfiles/{core => oldcore}/123/update.sh | 0 config/rootfiles/packages/linux-pae | 2 - config/ssh/ssh_config | 33 + config/ssh/sshd_config | 78 + config/u-boot/boot.cmd | 8 + config/u-boot/boot.scr | Bin 2373 -> 2463 bytes config/unbound/unbound.conf | 6 +- html/cgi-bin/backup.cgi | 111 +- html/cgi-bin/firewall.cgi | 4 - html/cgi-bin/fwhosts.cgi | 2 + html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/index.cgi | 7 +- html/cgi-bin/pakfire.cgi | 11 - html/cgi-bin/vpnmain.cgi | 8 +- html/html/redirect-templates/legacy/template.html | 7 +- lfs/7zip | 2 +- lfs/Archive-Tar | 2 +- lfs/Archive-Zip | 2 +- lfs/BerkeleyDB | 2 +- lfs/Compress-Zlib | 2 +- lfs/Config | 13 + lfs/Convert-TNEF | 2 +- lfs/Convert-UUlib | 2 +- lfs/Crypt-PasswdMD5 | 2 +- lfs/Digest | 2 +- lfs/Digest-HMAC | 2 +- lfs/Digest-SHA1 | 2 +- lfs/GD-Graph | 2 +- lfs/GD-TextUtil | 2 +- lfs/GeoIP | 2 +- lfs/HTML-Parser | 2 +- lfs/HTML-Tagset | 2 +- lfs/HTML-Template | 2 +- lfs/IO-Socket-SSL | 4 +- lfs/IO-Stringy | 2 +- lfs/Locale-Country | 2 +- lfs/MIME-Tools | 2 +- lfs/Mail-Tools | 2 +- lfs/Net-DNS | 2 +- lfs/Net-IPv4Addr | 2 +- lfs/Net-Server | 2 +- lfs/Net-Telnet | 2 +- lfs/Net_SSLeay | 2 +- lfs/Text-Tabs+Wrap | 2 +- lfs/URI | 2 +- lfs/Unix-Syslog | 2 +- lfs/XML-Parser | 2 +- lfs/acl | 2 +- lfs/acpid | 2 +- lfs/alsa | 2 +- lfs/amavisd | 2 +- lfs/apache2 | 2 +- lfs/apcupsd | 2 +- lfs/apr | 2 +- lfs/aprutil | 2 +- lfs/arm | 2 +- lfs/arping | 2 +- lfs/asterisk | 2 +- lfs/attr | 2 +- lfs/autoconf | 2 +- lfs/automake | 2 +- lfs/avahi | 2 +- lfs/aws-cli | 2 +- lfs/backports | 2 +- lfs/backup | 2 +- lfs/bacula | 2 +- lfs/bash | 2 +- lfs/batctl | 2 +- lfs/bc | 2 +- lfs/berkeley | 2 +- lfs/bind | 4 +- lfs/bird | 2 +- lfs/bison | 2 +- lfs/bitstream | 2 +- lfs/bluetooth | 2 +- lfs/boost | 2 +- lfs/bootstrap | 2 +- lfs/br2684ctl | 2 +- lfs/bridge-utils | 2 +- lfs/bzip2 | 2 +- lfs/ca-certificates | 4 +- lfs/cairo | 2 +- lfs/calamaris | 2 +- lfs/ccache | 2 +- lfs/{e2fsprogs => cdrkit} | 51 +- lfs/cdrom | 171 +- lfs/check_mk_agent | 2 +- lfs/chkconfig | 2 +- lfs/cifs-utils | 2 +- lfs/cleanup-toolchain | 2 +- lfs/client175 | 2 +- lfs/cmake | 2 +- lfs/collectd | 2 +- lfs/configroot | 2 +- lfs/conntrack-tools | 2 +- lfs/core-updates | 2 +- lfs/coreutils | 2 +- lfs/cpio | 2 +- lfs/cups | 2 +- lfs/cups-filters | 2 +- lfs/curl | 2 +- lfs/cyrus-imapd | 2 +- lfs/cyrus-sasl | 2 +- lfs/daq | 2 +- lfs/dbus | 2 +- lfs/ddns | 2 +- lfs/ddrescue | 2 +- lfs/dejagnu | 2 +- lfs/dejavu-fonts-ttf | 2 +- lfs/dhcpcd | 2 +- lfs/diffutils | 2 +- lfs/directfb | 2 +- lfs/dma | 2 +- lfs/dmidecode | 2 +- lfs/dnsdist | 2 +- lfs/dosfstools | 2 +- lfs/dpfhack | 2 +- lfs/dracut | 2 +- lfs/dvb-firmwares | 2 +- lfs/dvdrtools | 79 - lfs/e1000e | 2 +- lfs/e2fsprogs | 2 +- lfs/ebtables | 2 +- lfs/ed | 2 +- lfs/{rng-tools => efibootmgr} | 18 +- lfs/{libnetfilter_conntrack => efivar} | 14 +- lfs/elfutils | 2 +- lfs/elinks | 2 +- lfs/epson-inkjet-printer-escpr | 2 +- lfs/etherwake | 2 +- lfs/ethtool | 2 +- lfs/expat | 2 +- lfs/expect | 2 +- lfs/ez-ipupdate | 2 +- lfs/faad2 | 2 +- lfs/fake-environ | 2 +- lfs/fbset | 2 +- lfs/fcron | 2 +- lfs/fetchmail | 2 +- lfs/ffmpeg | 2 +- lfs/file | 2 +- lfs/findutils | 2 +- lfs/fireinfo | 2 +- lfs/flac | 2 +- lfs/flag-icons | 2 +- lfs/flash-images | 53 +- lfs/flex | 2 +- lfs/fontconfig | 2 +- lfs/foomatic | 2 +- lfs/fping | 2 +- lfs/freefont | 2 +- lfs/freeradius | 2 +- lfs/freetype | 2 +- lfs/fuse | 2 +- lfs/gawk | 2 +- lfs/gd | 2 +- lfs/gdbm | 2 +- lfs/gettext | 2 +- lfs/ghostscript | 2 +- lfs/git | 2 +- lfs/glib | 2 +- lfs/gmp | 2 +- lfs/gmp-compat | 2 +- lfs/gnu-netcat | 2 +- lfs/gnump3d | 2 +- lfs/gnupg | 2 +- lfs/gnutls | 2 +- lfs/gperf | 2 +- lfs/gpgme | 2 +- lfs/grep | 2 +- lfs/groff | 2 +- lfs/grub | 74 +- lfs/guardian | 2 +- lfs/gutenprint | 2 +- lfs/gzip | 2 +- lfs/haproxy | 2 +- lfs/hostapd | 2 +- lfs/hostname | 2 +- lfs/hplip | 2 +- lfs/hwdata | 2 +- lfs/i2c-tools | 2 +- lfs/iana-etc | 2 +- lfs/icecast | 2 +- lfs/icegenerator | 2 +- lfs/icinga | 2 +- lfs/iftop | 2 +- lfs/igb | 2 +- lfs/igmpproxy | 2 +- lfs/initscripts | 1 - lfs/installer | 2 +- lfs/intltool | 2 +- lfs/iotop | 2 +- lfs/ipaddr | 2 +- lfs/iperf | 2 +- lfs/iperf3 | 2 +- lfs/ipfire-netboot | 9 +- lfs/iproute2 | 6 +- lfs/ipset | 2 +- lfs/iptables | 2 +- lfs/iptraf-ng | 2 +- lfs/iputils | 2 +- lfs/ipvsadm | 2 +- lfs/iw | 2 +- lfs/ixgbe | 2 +- lfs/jansson | 2 +- lfs/joe | 2 +- lfs/jquery | 2 +- lfs/jwhois | 2 +- lfs/kbd | 2 +- lfs/keepalived | 2 +- lfs/kmod | 2 +- lfs/krb5 | 2 +- lfs/l7-protocols | 2 +- lfs/lame | 2 +- lfs/lcd4linux | 2 +- lfs/lcdproc | 2 +- lfs/lcms2 | 2 +- lfs/less | 2 +- lfs/libarchive | 2 +- lfs/libart | 2 +- lfs/libassuan | 2 +- lfs/libcap | 2 +- lfs/libdaemon | 2 +- lfs/libdnet | 2 +- lfs/libdvbpsi | 2 +- lfs/libevent | 2 +- lfs/libevent2 | 2 +- lfs/libexif | 2 +- lfs/libffi | 2 +- lfs/libgcrypt | 2 +- lfs/libgpg-error | 2 +- lfs/libid3tag | 2 +- lfs/libjpeg | 2 +- lfs/libjpeg-compat | 2 +- lfs/libmad | 2 +- lfs/libmnl | 2 +- lfs/libmpc | 2 +- lfs/libmpdclient | 2 +- lfs/libmpeg2 | 2 +- lfs/libnet | 2 +- lfs/libnetfilter_conntrack | 2 +- lfs/libnetfilter_cthelper | 2 +- lfs/libnetfilter_cttimeout | 2 +- lfs/libnetfilter_queue | 2 +- lfs/libnfnetlink | 2 +- lfs/libnl | 2 +- lfs/libnl-3 | 2 +- lfs/libogg | 2 +- lfs/liboping | 2 +- lfs/libpcap | 2 +- lfs/libpciaccess | 2 +- lfs/libpng | 2 +- lfs/libpri | 2 +- lfs/libshout | 2 +- lfs/libsmooth | 2 +- lfs/libsolv | 2 +- lfs/libsrtp | 2 +- lfs/libstatgrab | 2 +- lfs/libtiff | 2 +- lfs/libtirpc | 2 +- lfs/libtool | 2 +- lfs/libupnp | 2 +- lfs/libusb | 2 +- lfs/libusb-compat | 2 +- lfs/libusbredir | 2 +- lfs/libvirt | 2 +- lfs/libvorbis | 2 +- lfs/libwww-perl | 2 +- lfs/libxml2 | 2 +- lfs/libxslt | 2 +- lfs/libyajl | 2 +- lfs/linux | 13 +- lfs/linux-atm | 2 +- lfs/linux-firmware | 2 +- lfs/linux-initrd | 2 +- lfs/linux-pae | 2 +- lfs/lm_sensors | 2 +- lfs/logwatch | 2 +- lfs/lsof | 2 +- lfs/ltrace | 2 +- lfs/lua | 2 +- lfs/lvm2 | 2 +- lfs/lynis | 2 +- lfs/lz4 | 2 +- lfs/lzo | 2 +- lfs/m4 | 2 +- lfs/make | 2 +- lfs/man | 2 +- lfs/man-pages | 2 +- lfs/mc | 2 +- lfs/mcelog | 2 +- lfs/mdns-repeater | 2 +- lfs/memtest | 2 +- lfs/miau | 2 +- lfs/minicom | 2 +- lfs/minidlna | 2 +- lfs/miniupnpd | 2 +- lfs/misc-progs | 2 +- lfs/module-init-tools | 2 +- lfs/monit | 2 +- lfs/motion | 2 +- lfs/mpage | 2 +- lfs/mpc | 2 +- lfs/mpd | 2 +- lfs/mpfire | 2 +- lfs/mpfr | 2 +- lfs/mtools | 2 +- lfs/mtr | 2 +- lfs/multicat | 2 +- lfs/multipath-tools | 2 +- lfs/nagios-plugins | 2 +- lfs/nagios_nrpe | 2 +- lfs/nano | 6 +- lfs/nasm | 2 +- lfs/ncat | 2 +- lfs/ncurses | 2 +- lfs/ncurses-compat | 2 +- lfs/net-tools | 2 +- lfs/netpbm | 2 +- lfs/netsnmpd | 2 +- lfs/nettle | 2 +- lfs/newt | 2 +- lfs/nfs | 2 +- lfs/nginx | 2 +- lfs/nmap | 2 +- lfs/nss-myhostname | 2 +- lfs/ntfs-3g | 2 +- lfs/ntp | 4 +- lfs/nut | 2 +- lfs/oinkmaster | 2 +- lfs/openldap | 2 +- lfs/openssh | 31 +- lfs/openssl-compat | 2 +- lfs/openvmtools | 2 +- lfs/openvpn | 2 +- lfs/opus | 2 +- lfs/pakfire | 2 +- lfs/pakfire3 | 2 +- lfs/pam | 2 +- lfs/pango | 2 +- lfs/parted | 9 +- lfs/patch | 2 +- lfs/paxctl | 2 +- lfs/pciutils | 8 +- lfs/pcmciautils | 2 +- lfs/pcre-compat | 2 +- lfs/perl | 2 +- lfs/perl-Apache-Htpasswd | 2 +- lfs/perl-Authen-SASL | 2 +- lfs/perl-Carp-Clan | 2 +- lfs/perl-DBD-SQLite | 2 +- lfs/perl-DBI | 2 +- lfs/perl-Date-Calc | 2 +- lfs/perl-Date-Manip | 2 +- lfs/perl-Device-Modem | 2 +- lfs/perl-Device-SerialPort | 2 +- lfs/perl-Email-Date-Format | 2 +- lfs/perl-File-ReadBackwards | 2 +- lfs/perl-File-Tail | 2 +- lfs/perl-Font-TTF | 2 +- lfs/perl-GD | 2 +- lfs/perl-IO-String | 2 +- lfs/perl-MIME-Base64 | 2 +- lfs/perl-MIME-Lite | 2 +- lfs/perl-Net-IP | 2 +- lfs/perl-Net-SMTP-SSL | 2 +- lfs/perl-PDF-API2 | 2 +- lfs/perl-Sort-Naturally | 2 +- lfs/perl-Text-CSV_XS | 2 +- lfs/perl-TimeDate | 2 +- lfs/perl-common-sense | 2 +- lfs/perl-gettext | 2 +- lfs/perl-inotify2 | 2 +- lfs/pigz | 2 +- lfs/pixman | 2 +- lfs/pkg-config | 2 +- lfs/poppler | 2 +- lfs/popt | 2 +- lfs/postfix | 8 +- lfs/ppp | 2 +- lfs/pptp | 2 +- lfs/procps | 2 +- lfs/psmisc | 2 +- lfs/pycurl | 2 +- lfs/pygpgme | 2 +- lfs/python | 2 +- lfs/python-clientform | 2 +- lfs/python-daemon | 2 +- lfs/python-distutils | 2 +- lfs/python-distutils-extra | 2 +- lfs/python-docutils | 2 +- lfs/python-feedparser | 2 +- lfs/python-inotify | 2 +- lfs/python-ipaddress | 2 +- lfs/python-lzma | 2 +- lfs/python-m2crypto | 2 +- lfs/python-mechanize | 2 +- lfs/python-optional-src | 2 +- lfs/python-progressbar | 2 +- lfs/python-pyparsing | 2 +- lfs/python-rssdler | 2 +- lfs/python-setuptools | 2 +- lfs/python-six | 2 +- lfs/python-typing | 2 +- lfs/python-xattr | 2 +- lfs/python3 | 2 +- lfs/python3-botocore | 2 +- lfs/python3-colorama | 2 +- lfs/python3-dateutil | 2 +- lfs/python3-docutils | 2 +- lfs/python3-jmespath | 2 +- lfs/python3-pyasn1 | 2 +- lfs/python3-rsa | 2 +- lfs/python3-s3transfer | 2 +- lfs/python3-six | 2 +- lfs/python3-yaml | 2 +- lfs/qemu | 2 +- lfs/qpdf | 2 +- lfs/readline | 2 +- lfs/readline-compat | 2 +- lfs/reiserfsprogs | 2 +- lfs/rng-tools | 5 +- lfs/rpcbind | 2 +- lfs/rrdtool | 2 +- lfs/rtpproxy | 2 +- lfs/samba | 2 +- lfs/sane | 2 +- lfs/screen | 2 +- lfs/sdl | 2 +- lfs/sdparm | 2 +- lfs/sendEmail | 2 +- lfs/setserial | 2 +- lfs/setup | 2 +- lfs/shadow | 2 +- lfs/slang | 2 +- lfs/smartmontools | 2 +- lfs/snort | 2 +- lfs/sox | 2 +- lfs/spamassassin | 2 +- lfs/spandsp | 2 +- lfs/spice | 2 +- lfs/spice-protocol | 2 +- lfs/sqlite | 2 +- lfs/squid-accounting | 2 +- lfs/squidclamav | 2 +- lfs/squidguard | 2 +- lfs/sshfs | 2 +- lfs/sslh | 2 +- lfs/stage1 | 2 +- lfs/stage2 | 2 +- lfs/strace | 2 +- lfs/streamripper | 2 +- lfs/stress | 2 +- lfs/strip | 2 +- lfs/strongswan | 2 +- lfs/stunnel | 2 +- lfs/sudo | 2 +- lfs/swatch | 2 +- lfs/swig | 2 +- lfs/sysbench | 2 +- lfs/sysfsutils | 2 +- lfs/sysklogd | 2 +- lfs/syslinux | 23 +- lfs/sysstat | 2 +- lfs/sysvinit | 2 +- lfs/taglib | 2 +- lfs/tar | 2 +- lfs/tcl | 2 +- lfs/tcpdump | 2 +- lfs/telnet | 2 +- lfs/texinfo | 2 +- lfs/tftpd | 2 +- lfs/tmux | 2 +- lfs/tor | 2 +- lfs/traceroute | 2 +- lfs/transmission | 2 +- lfs/tzdata | 2 +- lfs/ubuntu-font-family | 2 +- lfs/udev | 2 +- lfs/unbound | 4 +- lfs/unzip | 2 +- lfs/urlgrabber | 2 +- lfs/usb_modeswitch | 2 +- lfs/usb_modeswitch_data | 2 +- lfs/usbutils | 2 +- lfs/util-linux | 2 +- lfs/util-macros | 2 +- lfs/vdr_dvbapi | 2 +- lfs/vdr_eepg | 2 +- lfs/vdr_epgsearch | 2 +- lfs/vdr_streamdev | 2 +- lfs/vdradmin | 2 +- lfs/vim | 2 +- lfs/vlan | 2 +- lfs/w_scan | 2 +- lfs/watchdog | 2 +- lfs/wavemon | 2 +- lfs/web-user-interface | 7 +- lfs/whatmask | 2 +- lfs/which | 2 +- lfs/wio | 2 +- lfs/wireless | 2 +- lfs/wireless-regdb | 2 +- lfs/wpa_supplicant | 2 +- lfs/xen-image | 2 +- lfs/xfsprogs | 2 +- lfs/xinetd | 2 +- lfs/xtables-addons | 2 +- lfs/xvid | 2 +- lfs/zd1211-firmware | 2 +- lfs/zerofree | 2 +- lfs/zlib | 2 +- make.sh | 14 +- src/initscripts/helper/aws-setup | 41 +- .../networking/red.down/10-static-routes | 4 +- src/initscripts/system/aws | 3 + src/initscripts/system/firstsetup | 6 - src/initscripts/system/localnet | 10 +- src/initscripts/system/network-trigger | 22 - src/initscripts/system/partresize | 6 +- src/initscripts/system/static-routes | 4 +- src/installer/Makefile.am | 1 + src/installer/dracut-module/module-setup.sh | 2 +- src/installer/hw.c | 122 +- src/installer/hw.h | 13 +- .../install-bootloader} | 88 +- src/installer/main.c | 10 +- src/pakfire/lib/functions.pl | 122 +- src/pakfire/pakfire | 1 - src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch | 11 + src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch | 9 + src/patches/cdrkit/cdrkit-1.1.11-devname.patch | 30 + src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch | 70 + src/patches/cdrkit/cdrkit-1.1.11-format.patch | 129 ++ src/patches/cdrkit/cdrkit-1.1.11-handler.patch | 12 + src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch | 191 +++ src/patches/cdrkit/cdrkit-1.1.11-memset.patch | 37 + .../cdrkit/cdrkit-1.1.11-paranoiacdda.patch | 556 +++++++ .../cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch | 13 + .../cdrkit/cdrkit-1.1.11-readsegfault.patch | 12 + src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch | 31 + src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch | 33 + src/patches/cdrkit/cdrkit-1.1.11-utf8.patch | 104 ++ src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch | 22 + src/patches/cdrkit/cdrkit-1.1.8-werror.patch | 206 +++ .../cdrkit/cdrkit-1.1.9-buffer_overflow.patch | 66 + src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch | 204 +++ src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch | 50 + ...1.patch => openssh-7.8p1-openssl-1.1.0-1.patch} | 210 ++- src/patches/parted-3.2-device-mapper.patch | 44 + .../rng-tools-6-Enable-RDRAND-for-i586-too.patch | 35 + src/scripts/backupiso | 31 +- src/scripts/rebuild-initrd | 6 +- 650 files changed, 5931 insertions(+), 1961 deletions(-) create mode 100644 config/cdrom/grub-efi.cfg create mode 100644 config/cdrom/grub.cfg create mode 100644 config/rootfiles/common/aarch64/efibootmgr create mode 100644 config/rootfiles/common/aarch64/efivar create mode 100644 config/rootfiles/common/aarch64/grub create mode 100644 config/rootfiles/common/cdrkit delete mode 100644 config/rootfiles/common/dvdrtools create mode 100644 config/rootfiles/common/x86_64/efibootmgr create mode 100644 config/rootfiles/common/x86_64/efivar copy config/rootfiles/core/{123 => 124}/exclude (93%) create mode 120000 config/rootfiles/core/124/filelists/aarch64/efibootmgr create mode 120000 config/rootfiles/core/124/filelists/aarch64/efivar create mode 100644 config/rootfiles/core/124/filelists/aarch64/files create mode 120000 config/rootfiles/core/124/filelists/aarch64/grub create mode 120000 config/rootfiles/core/124/filelists/aarch64/linux create mode 120000 config/rootfiles/core/124/filelists/aarch64/linux-initrd create mode 100644 config/rootfiles/core/124/filelists/armv5tel/files copy config/rootfiles/{oldcore/121 => core/124}/filelists/armv5tel/linux-initrd-kirkwood (100%) copy config/rootfiles/{oldcore/121 => core/124}/filelists/armv5tel/linux-initrd-multi (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/bind (100%) copy config/rootfiles/{oldcore/121 => core/124}/filelists/ca-certificates (100%) create mode 120000 config/rootfiles/core/124/filelists/cdrkit create mode 100644 config/rootfiles/core/124/filelists/files copy config/rootfiles/{oldcore/100 => core/124}/filelists/i586/grub (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/106 => core/124}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/ntp (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/124}/filelists/parted (100%) copy config/rootfiles/{oldcore/101 => core/124}/filelists/pciutils (100%) copy config/rootfiles/{oldcore/121 => core/124}/filelists/rng-tools (100%) copy config/rootfiles/core/{123 => 124}/filelists/unbound (100%) create mode 120000 config/rootfiles/core/124/filelists/x86_64/efibootmgr create mode 120000 config/rootfiles/core/124/filelists/x86_64/efivar copy config/rootfiles/{oldcore/100 => core/124}/filelists/x86_64/grub (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/x86_64/linux-initrd (100%) create mode 100644 config/rootfiles/core/124/update.sh rename config/rootfiles/{core => oldcore}/123/exclude (100%) rename config/rootfiles/{core => oldcore}/123/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/123/filelists/conntrack-tools (100%) rename config/rootfiles/{core => oldcore}/123/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/123/filelists/files (100%) rename config/rootfiles/{core => oldcore}/123/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/123/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/123/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/123/filelists/iana-etc (100%) rename config/rootfiles/{core => oldcore}/123/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/123/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/123/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/123/filelists/linux-firmware-updates (100%) rename config/rootfiles/{core => oldcore}/123/filelists/nss-myhostname (100%) rename config/rootfiles/{core => oldcore}/123/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/123/filelists/openssl-compat (100%) rename config/rootfiles/{core => oldcore}/123/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/123/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/123/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/123/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/123/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/123/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/123/update.sh (100%) create mode 100644 config/ssh/ssh_config create mode 100644 config/ssh/sshd_config copy lfs/{e2fsprogs => cdrkit} (56%) delete mode 100644 lfs/dvdrtools copy lfs/{rng-tools => efibootmgr} (90%) copy lfs/{libnetfilter_conntrack => efivar} (91%) delete mode 100644 src/initscripts/system/network-trigger rename src/{scripts/update-bootloader => installer/install-bootloader} (67%) create mode 100644 src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-devname.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-format.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-handler.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-memset.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-paranoiacdda.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-readsegfault.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-utf8.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.8-werror.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.9-buffer_overflow.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch create mode 100644 src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch rename src/patches/{openssh-7.7p1-openssl-1.1.0-1.patch => openssh-7.8p1-openssl-1.1.0-1.patch} (90%) create mode 100644 src/patches/parted-3.2-device-mapper.patch create mode 100644 src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index ce16e7f42..ce8911635 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -138,11 +138,8 @@ elsif ($ARGV[0] eq 'cli') { elsif ($ARGV[0] eq 'addonbackup') { system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'"); } -elsif ($ARGV[0] =~ /ipf$/ ) { - system("rm /var/ipfire/backup/$ARGV[0]"); -} -elsif ($ARGV[0] =~ /iso$/ ) { - system("rm /var/tmp/backupiso/$ARGV[0]"); +elsif ($ARGV[0] =~ /\.(iso|ipf)$/ ) { + unlink("$ARGV[0]"); } elsif ($ARGV[0] eq '') { printf "No argument given, please use <include><exclude><cli>\n" diff --git a/config/backup/exclude b/config/backup/exclude index 7ca9d10b2..0d3de04d2 100644 --- a/config/backup/exclude +++ b/config/backup/exclude @@ -1,5 +1,5 @@ -*.tmp /etc/sysconfig/lm_sensors +*.tmp /var/ipfire/ethernet/settings /var/ipfire/firewall/bin/* /var/ipfire/ovpn/openssl/* diff --git a/config/backup/include b/config/backup/include index 59430c576..6982b1c92 100644 --- a/config/backup/include +++ b/config/backup/include @@ -1,38 +1,48 @@ -/var/ipfire/*/settings -/var/ipfire/*/*.conf -/var/ipfire/*/*.pem -/var/ipfire/*/config -/var/ipfire/*/enable -/var/ipfire/*/*enable* -/var/ipfire/ovpn/collectd.vpn -/etc/unbound -/etc/passwd -/etc/shadow /etc/group -/etc/ipsec.user.* -/etc/ipsec.user-post.conf -/etc/sysconfig/* /etc/hosts* /etc/httpd/server.crt /etc/httpd/server.csr -/etc/httpd/server.key /etc/httpd/server-ecdsa.crt /etc/httpd/server-ecdsa.csr /etc/httpd/server-ecdsa.key -/etc/ssh/ssh_host* -/etc/ssh/sshd_config +/etc/httpd/server.key +/etc/ipsec.user.* +/etc/ipsec.user-post.conf /etc/logrotate.d +/etc/passwd +/etc/shadow +/etc/ssh/sshd_config +/etc/ssh/ssh_host* +/etc/squid/squid.conf.local +/etc/squid/squid.conf.pre.local +/etc/sysconfig/* +/etc/sysconfig/firewall.local +/etc/sysconfig/rc.local +/etc/unbound +/root/.bash_history +/root/.gitconfig +/root/.ssh /var/ipfire/auth/users +/var/ipfire/captive/* +/var/ipfire/*/*.conf +/var/ipfire/*/config /var/ipfire/dhcp/* /var/ipfire/dnsforward/* +/var/ipfire/*/enable +/var/ipfire/*/*enable* +/var/ipfire/ethernet/aliases +/var/ipfire/ethernet/wireless /var/ipfire/firewall /var/ipfire/fwhosts /var/ipfire/main/* /var/ipfire/ovpn +/var/ipfire/ovpn/collectd.vpn +/var/ipfire/*/*.pem /var/ipfire/ppp /var/ipfire/proxy /var/ipfire/qos/* /var/ipfire/qos/bin/qos.sh +/var/ipfire/*/settings /var/ipfire/time/ /var/ipfire/urlfilter /var/ipfire/vpn @@ -40,10 +50,3 @@ /var/log/rrd/* /var/log/rrd/collectd /var/log/vnstat -/etc/sysconfig/firewall.local -/etc/sysconfig/rc.local -/root/.gitconfig -/root/.bash_history -/var/ipfire/ethernet/aliases -/var/ipfire/ethernet/wireless -/var/ipfire/captive/* diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt index d291f28a5..193cef38f 100644 --- a/config/ca-certificates/certdata.txt +++ b/config/ca-certificates/certdata.txt @@ -7381,136 +7381,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "ComSign CA" -# -# Issuer: C=IL,O=ComSign,CN=ComSign CA -# Serial Number:14:13:96:83:14:55:8c:ea:7b:63:e5:fc:34:87:77:44 -# Subject: C=IL,O=ComSign,CN=ComSign CA -# Not Valid Before: Wed Mar 24 11:32:18 2004 -# Not Valid After : Mon Mar 19 15:02:18 2029 -# Fingerprint (MD5): CD:F4:39:F3:B5:18:50:D7:3E:A4:C5:91:A0:3E:21:4B -# Fingerprint (SHA1): E1:A4:5B:14:1A:21:DA:1A:79:F4:1A:42:A9:61:D6:69:CD:06:34:C1 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ComSign CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155 -\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012 -\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125 -\004\006\023\002\111\114 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155 -\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012 -\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125 -\004\006\023\002\111\114 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207 -\167\104 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\223\060\202\002\173\240\003\002\001\002\002\020\024 -\023\226\203\024\125\214\352\173\143\345\374\064\207\167\104\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\064 -\061\023\060\021\006\003\125\004\003\023\012\103\157\155\123\151 -\147\156\040\103\101\061\020\060\016\006\003\125\004\012\023\007 -\103\157\155\123\151\147\156\061\013\060\011\006\003\125\004\006 -\023\002\111\114\060\036\027\015\060\064\060\063\062\064\061\061 -\063\062\061\070\132\027\015\062\071\060\063\061\071\061\065\060 -\062\061\070\132\060\064\061\023\060\021\006\003\125\004\003\023 -\012\103\157\155\123\151\147\156\040\103\101\061\020\060\016\006 -\003\125\004\012\023\007\103\157\155\123\151\147\156\061\013\060 -\011\006\003\125\004\006\023\002\111\114\060\202\001\042\060\015 -\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 -\017\000\060\202\001\012\002\202\001\001\000\360\344\124\151\053 -\323\307\217\152\104\344\176\130\047\370\013\320\344\224\022\212 -\361\033\070\070\057\037\061\234\006\324\054\247\336\013\052\256 -\032\240\343\236\152\277\237\074\307\156\242\371\213\144\154\072 -\255\205\125\121\124\245\070\125\270\253\203\004\362\077\144\066 -\367\300\215\103\103\152\146\321\367\027\052\325\357\066\372\060 -\020\102\327\123\315\371\372\063\163\114\263\351\204\040\212\326 -\101\047\065\344\070\372\224\233\270\172\344\171\037\063\373\033 -\330\041\011\050\174\115\030\151\136\144\212\172\031\223\312\176 -\354\363\162\347\067\007\130\131\050\254\102\371\305\377\315\077 -\347\245\372\070\261\320\014\307\331\122\032\123\326\201\314\102 -\172\065\133\355\113\072\172\366\265\216\314\377\017\174\344\140 -\066\207\057\255\360\241\045\175\377\322\113\021\210\160\124\246 -\101\250\147\123\122\102\136\344\064\236\344\276\243\354\252\142 -\135\335\303\114\246\202\101\344\063\013\254\311\063\017\144\202 -\127\052\375\014\255\066\341\014\256\113\305\357\073\231\331\043 -\263\133\135\264\127\354\164\160\014\052\117\002\003\001\000\001 -\243\201\240\060\201\235\060\014\006\003\125\035\023\004\005\060 -\003\001\001\377\060\075\006\003\125\035\037\004\066\060\064\060 -\062\240\060\240\056\206\054\150\164\164\160\072\057\057\146\145 -\144\151\162\056\143\157\155\163\151\147\156\056\143\157\056\151 -\154\057\143\162\154\057\103\157\155\123\151\147\156\103\101\056 -\143\162\154\060\016\006\003\125\035\017\001\001\377\004\004\003 -\002\001\206\060\037\006\003\125\035\043\004\030\060\026\200\024 -\113\001\233\076\126\032\145\066\166\313\173\227\252\222\005\356 -\062\347\050\061\060\035\006\003\125\035\016\004\026\004\024\113 -\001\233\076\126\032\145\066\166\313\173\227\252\222\005\356\062 -\347\050\061\060\015\006\011\052\206\110\206\367\015\001\001\005 -\005\000\003\202\001\001\000\320\331\245\176\376\051\140\105\235 -\176\203\317\156\274\107\156\365\032\236\124\166\102\161\264\074 -\130\077\055\100\045\102\366\201\234\361\211\020\310\016\252\170 -\117\070\011\127\260\074\300\010\374\065\216\361\110\121\215\014 -\161\164\272\204\304\327\162\233\204\174\070\116\144\006\047\052 -\341\247\265\354\010\231\264\012\015\324\205\163\310\022\341\065 -\355\361\005\061\035\163\231\014\353\226\312\335\323\346\205\252 -\360\212\373\165\301\362\011\074\145\145\144\363\114\330\255\313 -\210\151\363\344\203\267\014\275\027\132\226\027\312\133\377\255 -\273\034\351\055\204\200\330\041\276\205\122\331\324\164\271\151 -\205\272\115\355\050\062\353\371\141\112\344\304\066\036\031\334 -\157\204\021\037\225\365\203\050\030\250\063\222\103\047\335\135 -\023\004\105\117\207\325\106\315\075\250\272\360\363\270\126\044 -\105\353\067\307\341\166\117\162\071\030\337\176\164\162\307\163 -\055\071\352\140\346\255\021\242\126\207\173\303\150\232\376\370 -\214\160\250\337\145\062\364\244\100\214\241\302\104\003\016\224 -\000\147\240\161\000\202\110 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE - -# Trust for Certificate "ComSign CA" -# Issuer: C=IL,O=ComSign,CN=ComSign CA -# Serial Number:14:13:96:83:14:55:8c:ea:7b:63:e5:fc:34:87:77:44 -# Subject: C=IL,O=ComSign,CN=ComSign CA -# Not Valid Before: Wed Mar 24 11:32:18 2004 -# Not Valid After : Mon Mar 19 15:02:18 2029 -# Fingerprint (MD5): CD:F4:39:F3:B5:18:50:D7:3E:A4:C5:91:A0:3E:21:4B -# Fingerprint (SHA1): E1:A4:5B:14:1A:21:DA:1A:79:F4:1A:42:A9:61:D6:69:CD:06:34:C1 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "ComSign CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\341\244\133\024\032\041\332\032\171\364\032\102\251\141\326\151 -\315\006\064\301 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\315\364\071\363\265\030\120\327\076\244\305\221\240\076\041\113 -END -CKA_ISSUER MULTILINE_OCTAL -\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155 -\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012 -\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125 -\004\006\023\002\111\114 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207 -\167\104 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "Cybertrust Global Root" # @@ -19302,7 +19172,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\022\021\040\125\203\344\055\076\124\126\205\055\203\067\267 \054\334\106\021 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -19408,7 +19278,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\022\021\040\331\221\316\256\243\350\305\347\377\351\002\257 \317\163\274\125 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -19571,7 +19441,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\022\021\040\263\220\125\071\175\177\066\155\144\302\247\237 \153\143\216\147 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -19734,7 +19604,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\022\021\040\241\151\033\277\275\271\275\122\226\217\043\350 \110\277\046\021 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -19844,7 +19714,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \002\022\021\040\346\370\114\374\044\260\276\005\100\254\332\203 \033\064\140\077 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -22993,3 +22863,285 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "GlobalSign Root CA - R6" +# +# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 +# Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51 +# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 +# Not Valid Before: Wed Dec 10 00:00:00 2014 +# Not Valid After : Sun Dec 10 00:00:00 2034 +# Fingerprint (SHA-256): 2C:AB:EA:FE:37:D0:6C:A2:2A:BA:73:91:C0:03:3D:25:98:29:52:C4:53:64:73:49:76:3A:3A:B5:AD:6C:CF:69 +# Fingerprint (SHA1): 80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R6" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\016\105\346\273\003\203\063\303\205\145\110\346\377\105\121 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\203\060\202\003\153\240\003\002\001\002\002\016\105 +\346\273\003\203\063\303\205\145\110\346\377\105\121\060\015\006 +\011\052\206\110\206\367\015\001\001\014\005\000\060\114\061\040 +\060\036\006\003\125\004\013\023\027\107\154\157\142\141\154\123 +\151\147\156\040\122\157\157\164\040\103\101\040\055\040\122\066 +\061\023\060\021\006\003\125\004\012\023\012\107\154\157\142\141 +\154\123\151\147\156\061\023\060\021\006\003\125\004\003\023\012 +\107\154\157\142\141\154\123\151\147\156\060\036\027\015\061\064 +\061\062\061\060\060\060\060\060\060\060\132\027\015\063\064\061 +\062\061\060\060\060\060\060\060\060\132\060\114\061\040\060\036 +\006\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147 +\156\040\122\157\157\164\040\103\101\040\055\040\122\066\061\023 +\060\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123 +\151\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154 +\157\142\141\154\123\151\147\156\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\225\007\350\163\312\146\371 +\354\024\312\173\074\367\015\010\361\264\105\013\054\202\264\110 +\306\353\133\074\256\203\270\101\222\063\024\244\157\177\351\052 +\314\306\260\210\153\305\266\211\321\306\262\377\024\316\121\024 +\041\354\112\335\033\132\306\326\207\356\115\072\025\006\355\144 +\146\013\222\200\312\104\336\163\224\116\363\247\211\177\117\170 +\143\010\310\022\120\155\102\146\057\115\271\171\050\115\122\032 +\212\032\200\267\031\201\016\176\304\212\274\144\114\041\034\103 +\150\327\075\074\212\305\262\146\325\220\232\267\061\006\305\276 +\342\155\062\006\246\036\371\271\353\252\243\270\277\276\202\143 +\120\320\360\030\211\337\344\017\171\365\352\242\037\052\322\160 +\056\173\347\274\223\273\155\123\342\110\174\214\020\007\070\377 +\146\262\167\141\176\340\352\214\074\252\264\244\366\363\225\112 +\022\007\155\375\214\262\211\317\320\240\141\167\310\130\164\260 +\324\043\072\367\135\072\312\242\333\235\011\336\135\104\055\220 +\361\201\315\127\222\372\176\274\120\004\143\064\337\153\223\030 +\276\153\066\262\071\344\254\044\066\267\360\357\266\034\023\127 +\223\266\336\262\370\342\205\267\163\242\270\065\252\105\362\340 +\235\066\241\157\124\212\361\162\126\156\056\210\305\121\102\104 +\025\224\356\243\305\070\226\233\116\116\132\013\107\363\006\066 +\111\167\060\274\161\067\345\246\354\041\010\165\374\346\141\026 +\077\167\325\331\221\227\204\012\154\324\002\115\164\300\024\355 +\375\071\373\203\362\136\024\241\004\260\013\351\376\356\217\341 +\156\013\262\010\263\141\146\011\152\261\006\072\145\226\131\300 +\360\065\375\311\332\050\215\032\021\207\160\201\012\250\232\165 +\035\236\072\206\005\000\236\333\200\326\045\371\334\005\236\047 +\131\114\166\071\133\352\371\245\241\330\203\017\321\377\337\060 +\021\371\205\317\063\110\365\312\155\144\024\054\172\130\117\323 +\113\010\111\305\225\144\032\143\016\171\075\365\263\214\312\130 +\255\234\102\105\171\156\016\207\031\134\124\261\145\266\277\214 +\233\334\023\351\015\157\270\056\334\147\156\311\213\021\265\204 +\024\212\000\031\160\203\171\221\227\221\324\032\047\277\067\036 +\062\007\330\024\143\074\050\114\257\002\003\001\000\001\243\143 +\060\141\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\035\006\003\125\035\016\004\026\004\024\256\154 +\005\243\223\023\342\242\347\342\327\034\326\307\360\177\310\147 +\123\240\060\037\006\003\125\035\043\004\030\060\026\200\024\256 +\154\005\243\223\023\342\242\347\342\327\034\326\307\360\177\310 +\147\123\240\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\003\202\002\001\000\203\045\355\350\321\375\225\122\315 +\236\300\004\240\221\151\346\134\320\204\336\334\255\242\117\350 +\107\170\326\145\230\251\133\250\074\207\174\002\212\321\156\267 +\026\163\346\137\300\124\230\325\164\276\301\315\342\021\221\255 +\043\030\075\335\341\162\104\226\264\225\136\300\173\216\231\170 +\026\103\023\126\127\263\242\263\073\265\167\334\100\162\254\243 +\353\233\065\076\261\010\041\241\347\304\103\067\171\062\276\265 +\347\234\054\114\274\103\051\231\216\060\323\254\041\340\343\035 +\372\330\007\063\166\124\000\042\052\271\115\040\056\160\150\332 +\345\123\374\203\134\323\235\362\377\104\014\104\146\362\322\343 +\275\106\000\032\155\002\272\045\135\215\241\061\121\335\124\106 +\034\115\333\231\226\357\032\034\004\134\246\025\357\170\340\171 +\376\135\333\076\252\114\125\375\232\025\251\157\341\246\373\337 +\160\060\351\303\356\102\106\355\302\223\005\211\372\175\143\173 +\077\320\161\201\174\000\350\230\256\016\170\064\303\045\373\257 +\012\237\040\153\335\073\023\217\022\214\342\101\032\110\172\163 +\240\167\151\307\266\134\177\202\310\036\376\130\033\050\053\250 +\154\255\136\155\300\005\322\173\267\353\200\376\045\067\376\002 +\233\150\254\102\135\303\356\365\314\334\360\120\165\322\066\151 +\234\346\173\004\337\156\006\151\266\336\012\011\110\131\207\353 +\173\024\140\172\144\252\151\103\357\221\307\114\354\030\335\154 +\357\123\055\214\231\341\136\362\162\076\317\124\310\275\147\354 +\244\017\114\105\377\323\271\060\043\007\114\217\020\277\206\226 +\331\231\132\264\231\127\034\244\314\273\025\211\123\272\054\005 +\017\344\304\236\031\261\030\064\325\114\235\272\355\367\037\257 +\044\225\004\170\250\003\273\356\201\345\332\137\174\213\112\241 +\220\164\045\247\263\076\113\310\054\126\275\307\310\357\070\342 +\134\222\360\171\367\234\204\272\164\055\141\001\040\176\176\321 +\362\117\007\131\137\213\055\103\122\353\106\014\224\341\365\146 +\107\171\167\325\124\133\037\255\044\067\313\105\132\116\240\104 +\110\310\330\260\231\305\025\204\011\366\326\111\111\300\145\270 +\346\032\161\156\240\250\361\202\350\105\076\154\326\002\327\012 +\147\203\005\132\311\244\020 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "GlobalSign Root CA - R6" +# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 +# Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51 +# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6 +# Not Valid Before: Wed Dec 10 00:00:00 2014 +# Not Valid After : Sun Dec 10 00:00:00 2034 +# Fingerprint (SHA-256): 2C:AB:EA:FE:37:D0:6C:A2:2A:BA:73:91:C0:03:3D:25:98:29:52:C4:53:64:73:49:76:3A:3A:B5:AD:6C:CF:69 +# Fingerprint (SHA1): 80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R6" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\200\224\144\016\265\247\241\312\021\234\037\335\325\237\201\002 +\143\247\373\321 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\117\335\007\344\324\042\144\071\036\014\067\102\352\321\306\256 +END +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\016\105\346\273\003\203\063\303\205\145\110\346\377\105\121 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "OISTE WISeKey Global Root GC CA" +# +# Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH +# Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea +# Subject: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH +# Not Valid Before: Tue May 09 09:48:34 2017 +# Not Valid After : Fri May 09 09:58:33 2042 +# Fingerprint (SHA-256): 85:60:F9:1C:36:24:DA:BA:95:70:B5:FE:A0:DB:E3:6F:F1:1A:83:23:BE:94:86:85:4F:B3:F3:4A:55:71:19:8D +# Fingerprint (SHA1): E0:11:84:5E:34:DE:BE:88:81:B9:9C:F6:16:26:D1:96:1F:C3:B9:31 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145 +\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124 +\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144 +\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037 +\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154 +\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145 +\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124 +\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144 +\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037 +\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154 +\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\041\052\126\014\256\332\014\253\100\105\277\053\242\055 +\072\352 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\151\060\202\001\357\240\003\002\001\002\002\020\041 +\052\126\014\256\332\014\253\100\105\277\053\242\055\072\352\060 +\012\006\010\052\206\110\316\075\004\003\003\060\155\061\013\060 +\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006\003 +\125\004\012\023\007\127\111\123\145\113\145\171\061\042\060\040 +\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157\165 +\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145\144 +\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124\105 +\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154\040 +\122\157\157\164\040\107\103\040\103\101\060\036\027\015\061\067 +\060\065\060\071\060\071\064\070\063\064\132\027\015\064\062\060 +\065\060\071\060\071\065\070\063\063\132\060\155\061\013\060\011 +\006\003\125\004\006\023\002\103\110\061\020\060\016\006\003\125 +\004\012\023\007\127\111\123\145\113\145\171\061\042\060\040\006 +\003\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156 +\144\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061 +\050\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040 +\127\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122 +\157\157\164\040\107\103\040\103\101\060\166\060\020\006\007\052 +\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000 +\004\114\351\120\300\306\017\162\030\274\330\361\272\263\211\342 +\171\112\243\026\247\153\124\044\333\121\377\352\364\011\044\303 +\013\042\237\313\152\047\202\201\015\322\300\257\061\344\164\202 +\156\312\045\331\214\165\235\361\333\320\232\242\113\041\176\026 +\247\143\220\322\071\324\261\207\170\137\030\226\017\120\033\065 +\067\017\152\306\334\331\023\115\244\216\220\067\346\275\133\061 +\221\243\124\060\122\060\016\006\003\125\035\017\001\001\377\004 +\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377\004 +\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004 +\024\110\207\024\254\343\303\236\220\140\072\327\312\211\356\323 +\255\214\264\120\146\060\020\006\011\053\006\001\004\001\202\067 +\025\001\004\003\002\001\000\060\012\006\010\052\206\110\316\075 +\004\003\003\003\150\000\060\145\002\060\046\307\151\133\334\325 +\347\262\347\310\014\214\214\303\335\171\214\033\143\325\311\122 +\224\116\115\202\112\163\036\262\200\204\251\045\300\114\132\155 +\111\051\140\170\023\342\176\110\353\144\002\061\000\333\064\040 +\062\010\377\232\111\002\266\210\336\024\257\135\154\231\161\215 +\032\077\213\327\340\242\066\206\034\007\202\072\166\123\375\302 +\242\355\357\173\260\200\117\130\017\113\123\071\275 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "OISTE WISeKey Global Root GC CA" +# Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH +# Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea +# Subject: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH +# Not Valid Before: Tue May 09 09:48:34 2017 +# Not Valid After : Fri May 09 09:58:33 2042 +# Fingerprint (SHA-256): 85:60:F9:1C:36:24:DA:BA:95:70:B5:FE:A0:DB:E3:6F:F1:1A:83:23:BE:94:86:85:4F:B3:F3:4A:55:71:19:8D +# Fingerprint (SHA1): E0:11:84:5E:34:DE:BE:88:81:B9:9C:F6:16:26:D1:96:1F:C3:B9:31 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\340\021\204\136\064\336\276\210\201\271\234\366\026\046\321\226 +\037\303\271\061 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\251\326\271\055\057\223\144\370\245\151\312\221\351\150\007\043 +END +CKA_ISSUER MULTILINE_OCTAL +\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145 +\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124 +\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144 +\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037 +\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154 +\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\041\052\126\014\256\332\014\253\100\105\277\053\242\055 +\072\352 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/config/cdrom/grub-efi.cfg b/config/cdrom/grub-efi.cfg new file mode 100644 index 000000000..8ce7150f9 --- /dev/null +++ b/config/cdrom/grub-efi.cfg @@ -0,0 +1,2 @@ +search.fs_label "NAME VERSION ARCH" root +set prefix=($root)/EFI/BOOT diff --git a/config/cdrom/grub.cfg b/config/cdrom/grub.cfg new file mode 100644 index 000000000..421c0e662 --- /dev/null +++ b/config/cdrom/grub.cfg @@ -0,0 +1,34 @@ +set default="0" + +function load_video { + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus + insmod all_video +} + +load_video +set gfxpayload=keep +insmod gzio +insmod part_gpt +insmod ext2 + +set timeout=60 + +menuentry 'Install NAME VERSION ARCH' --class ipfire --class gnu-linux --class gnu --class os { + linux /boot/isolinux/vmlinuz + initrd /boot/isolinux/instroot +} + +submenu 'Other Installation Options -->' { + menuentry 'Install NAME VERSION (Text Mode)' --class ipfire --class gnu-linux --class gnu --class os { + linux /boot/isolinux/vmlinuz novga + initrd /boot/isolinux/instroot + } + + menuentry 'Unattended installation' --class ipfire --class gnu-linux --class gnu --class os { + linux /boot/isolinux/vmlinuz installer.unattended + initrd /boot/isolinux/instroot + } +} diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 011c4287e..345f8f52a 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -44,7 +44,7 @@ net.bridge.bridge-nf-call-iptables = 0 net.bridge.bridge-nf-call-arptables = 0 # Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc). -kernel.kptr_restrict = 1 +kernel.kptr_restrict = 2 # Avoid kernel memory address exposures via dmesg. kernel.dmesg_restrict = 1 diff --git a/config/grub2/default b/config/grub2/default index 39eed0fb5..c1b78237e 100644 --- a/config/grub2/default +++ b/config/grub2/default @@ -4,4 +4,3 @@ GRUB_DEFAULT=saved GRUB_CMDLINE_LINUX="panic=10" GRUB_DISABLE_RECOVERY="true" GRUB_BACKGROUND="/boot/grub/splash.png" -GRUB_FONT="/boot/grub/unifont.pf2" diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index c3b97ea92..73a931c51 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.50-ipfire-multi Kernel Configuration +# Linux/arm64 4.14.71 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -442,6 +442,7 @@ CONFIG_PCI_ECAM=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y # CONFIG_HOTPLUG_PCI is not set # @@ -508,6 +509,7 @@ CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y # CONFIG_NUMA is not set +CONFIG_HOLES_IN_ZONE=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -573,6 +575,7 @@ CONFIG_CRASH_DUMP=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -600,7 +603,9 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y # CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" # CONFIG_CMDLINE_FORCE is not set -# CONFIG_EFI is not set +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y # # Userspace binary formats @@ -1084,6 +1089,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1091,10 +1099,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1350,7 +1355,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -2872,6 +2876,7 @@ CONFIG_HVC_DRIVER=y # CONFIG_HVC_DCC is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m @@ -3592,7 +3597,7 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set -CONFIG_REGULATOR_SY8106A=y +# CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -3603,7 +3608,6 @@ CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_CEC_CORE=m CONFIG_CEC_NOTIFIER=y -CONFIG_CEC_PIN=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -4246,12 +4250,7 @@ CONFIG_DRM_UDL=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_CIRRUS_QEMU is not set CONFIG_DRM_RCAR_DW_HDMI=m -CONFIG_DRM_SUN4I=m -CONFIG_DRM_SUN4I_HDMI=m -CONFIG_DRM_SUN4I_HDMI_CEC=y -CONFIG_DRM_SUN4I_BACKEND=m -CONFIG_DRM_SUN8I_DW_HDMI=m -CONFIG_DRM_SUN8I_MIXER=m +# CONFIG_DRM_SUN4I is not set # CONFIG_DRM_QXL is not set # CONFIG_DRM_BOCHS is not set CONFIG_DRM_VIRTIO_GPU=m @@ -4342,6 +4341,7 @@ CONFIG_FB_ARMCLCD=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_UVESA is not set +CONFIG_FB_EFI=y CONFIG_FB_OPENCORES=m # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -5328,6 +5328,7 @@ CONFIG_RTC_DRV_DS1553=m # CONFIG_RTC_DRV_DS1685_FAMILY is not set CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m +# CONFIG_RTC_DRV_EFI is not set CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_M48T35=m @@ -6066,10 +6067,27 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +# CONFIG_DMI_SYSFS is not set CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y # CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_ARMSTUB=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_MESON_SM=y # @@ -6191,6 +6209,7 @@ CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set @@ -6622,7 +6641,7 @@ CONFIG_CRYPTO_ENGINE=m # CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -6653,7 +6672,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -6685,7 +6704,7 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -# CONFIG_CRYPTO_CHACHA20 is not set +CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TEA=m @@ -6810,6 +6829,7 @@ CONFIG_DDR=y CONFIG_IRQ_POLL=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 93dd593bf..b101b343a 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.71 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1075,6 +1075,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1082,10 +1085,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1334,7 +1334,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -6058,7 +6057,7 @@ CONFIG_CRYPTO_TEST=m # CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -6089,7 +6088,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -6121,7 +6120,7 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -# CONFIG_CRYPTO_CHACHA20 is not set +CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TEA=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 002302c70..1f663f433 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.71 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1344,6 +1344,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1351,10 +1354,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1609,7 +1609,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -5879,7 +5878,6 @@ CONFIG_DMA_ENGINE_RAID=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_AUXDISPLAY is not set -CONFIG_ARM_CHARLCD=y # CONFIG_PANEL is not set CONFIG_UIO=m # CONFIG_UIO_CIF is not set @@ -7128,7 +7126,7 @@ CONFIG_CRYPTO_ENGINE=m # CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m @@ -7159,7 +7157,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -7191,7 +7189,7 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -# CONFIG_CRYPTO_CHACHA20 is not set +CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TEA=m diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index f5eeff526..eb600d6dd 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y +CONFIG_HOTPLUG_SMT=y CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set @@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -1281,6 +1283,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1288,10 +1293,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1547,7 +1549,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -6869,7 +6870,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index ffe1beb06..5a6391594 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y +CONFIG_HOTPLUG_SMT=y CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set @@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -1299,6 +1301,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1306,10 +1311,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1565,7 +1567,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -6875,7 +6876,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 579a0284c..bb4c321c6 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.43 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -245,6 +245,7 @@ CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y +CONFIG_HOTPLUG_SMT=y CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_KPROBES is not set @@ -279,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -1273,6 +1275,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1280,10 +1285,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1540,7 +1542,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -6749,7 +6750,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=m CONFIG_CRYPTO_SEED=m diff --git a/config/rootfiles/common/aarch64/efibootmgr b/config/rootfiles/common/aarch64/efibootmgr new file mode 100644 index 000000000..56a0eb149 --- /dev/null +++ b/config/rootfiles/common/aarch64/efibootmgr @@ -0,0 +1,4 @@ +usr/sbin/efibootdump +usr/sbin/efibootmgr +#usr/share/man/man8/efibootdump.8 +#usr/share/man/man8/efibootmgr.8 diff --git a/config/rootfiles/common/aarch64/efivar b/config/rootfiles/common/aarch64/efivar new file mode 100644 index 000000000..4018e4c08 --- /dev/null +++ b/config/rootfiles/common/aarch64/efivar @@ -0,0 +1,46 @@ +usr/bin/efivar +#usr/include/efivar +#usr/include/efivar/efiboot-creator.h +#usr/include/efivar/efiboot-loadopt.h +#usr/include/efivar/efiboot.h +#usr/include/efivar/efivar-dp.h +#usr/include/efivar/efivar-guids.h +#usr/include/efivar/efivar.h +#usr/lib/libefiboot.so +usr/lib/libefiboot.so.1 +usr/lib/libefiboot.so.1.35 +#usr/lib/libefivar.so +usr/lib/libefivar.so.1 +usr/lib/libefivar.so.1.35 +#usr/lib/pkgconfig/efiboot.pc +#usr/lib/pkgconfig/efivar.pc +#usr/share/man/man1/efivar.1 +#usr/share/man/man3/efi_append_variable.3 +#usr/share/man/man3/efi_del_variable.3 +#usr/share/man/man3/efi_get_next_variable_name.3 +#usr/share/man/man3/efi_get_variable.3 +#usr/share/man/man3/efi_get_variable_attributes.3 +#usr/share/man/man3/efi_get_variable_size.3 +#usr/share/man/man3/efi_guid_to_id_guid.3 +#usr/share/man/man3/efi_guid_to_name.3 +#usr/share/man/man3/efi_guid_to_str.3 +#usr/share/man/man3/efi_guid_to_symbol.3 +#usr/share/man/man3/efi_name_to_guid.3 +#usr/share/man/man3/efi_set_variable.3 +#usr/share/man/man3/efi_str_to_guid.3 +#usr/share/man/man3/efi_symbol_to_guid.3 +#usr/share/man/man3/efi_variable_alloc.3 +#usr/share/man/man3/efi_variable_export.3 +#usr/share/man/man3/efi_variable_free.3 +#usr/share/man/man3/efi_variable_get_attributes.3 +#usr/share/man/man3/efi_variable_get_data.3 +#usr/share/man/man3/efi_variable_get_guid.3 +#usr/share/man/man3/efi_variable_get_name.3 +#usr/share/man/man3/efi_variable_import.3 +#usr/share/man/man3/efi_variable_realize.3 +#usr/share/man/man3/efi_variable_set_attributes.3 +#usr/share/man/man3/efi_variable_set_data.3 +#usr/share/man/man3/efi_variable_set_guid.3 +#usr/share/man/man3/efi_variable_set_name.3 +#usr/share/man/man3/efi_variable_t.3 +#usr/share/man/man3/efi_variables_supported.3 diff --git a/config/rootfiles/common/aarch64/grub b/config/rootfiles/common/aarch64/grub new file mode 100644 index 000000000..6de37dd35 --- /dev/null +++ b/config/rootfiles/common/aarch64/grub @@ -0,0 +1,536 @@ +#boot/grub +boot/grub/splash.png +#etc/bash_completion.d +#etc/bash_completion.d/grub +etc/default/grub +#etc/grub.d +etc/grub.d/00_header +etc/grub.d/10_linux +etc/grub.d/20_linux_xen +etc/grub.d/30_os-prober +etc/grub.d/40_custom +etc/grub.d/41_custom +etc/grub.d/README +usr/bin/grub-editenv +usr/bin/grub-file +usr/bin/grub-fstest +usr/bin/grub-glue-efi +usr/bin/grub-kbdcomp +usr/bin/grub-menulst2cfg +usr/bin/grub-mkfont +usr/bin/grub-mkimage +usr/bin/grub-mklayout +usr/bin/grub-mknetdir +usr/bin/grub-mkpasswd-pbkdf2 +usr/bin/grub-mkrelpath +usr/bin/grub-mkrescue +usr/bin/grub-mkstandalone +usr/bin/grub-render-label +usr/bin/grub-script-check +usr/bin/grub-syslinux2cfg +#usr/lib/grub +#usr/lib/grub/arm64-efi +usr/lib/grub/arm64-efi/acpi.mod +usr/lib/grub/arm64-efi/acpi.module +usr/lib/grub/arm64-efi/adler32.mod +usr/lib/grub/arm64-efi/adler32.module +usr/lib/grub/arm64-efi/affs.mod +usr/lib/grub/arm64-efi/affs.module +usr/lib/grub/arm64-efi/afs.mod +usr/lib/grub/arm64-efi/afs.module +usr/lib/grub/arm64-efi/all_video.mod +usr/lib/grub/arm64-efi/all_video.module +usr/lib/grub/arm64-efi/archelp.mod +usr/lib/grub/arm64-efi/archelp.module +usr/lib/grub/arm64-efi/bfs.mod +usr/lib/grub/arm64-efi/bfs.module +usr/lib/grub/arm64-efi/bitmap.mod +usr/lib/grub/arm64-efi/bitmap.module +usr/lib/grub/arm64-efi/bitmap_scale.mod +usr/lib/grub/arm64-efi/bitmap_scale.module +usr/lib/grub/arm64-efi/blocklist.mod +usr/lib/grub/arm64-efi/blocklist.module +usr/lib/grub/arm64-efi/boot.mod +usr/lib/grub/arm64-efi/boot.module +usr/lib/grub/arm64-efi/bswap_test.mod +usr/lib/grub/arm64-efi/bswap_test.module +usr/lib/grub/arm64-efi/btrfs.mod +usr/lib/grub/arm64-efi/btrfs.module +usr/lib/grub/arm64-efi/bufio.mod +usr/lib/grub/arm64-efi/bufio.module +usr/lib/grub/arm64-efi/cat.mod +usr/lib/grub/arm64-efi/cat.module +usr/lib/grub/arm64-efi/cbfs.mod +usr/lib/grub/arm64-efi/cbfs.module +usr/lib/grub/arm64-efi/chain.mod +usr/lib/grub/arm64-efi/chain.module +usr/lib/grub/arm64-efi/cmdline_cat_test.mod +usr/lib/grub/arm64-efi/cmdline_cat_test.module +usr/lib/grub/arm64-efi/cmp.mod +usr/lib/grub/arm64-efi/cmp.module +usr/lib/grub/arm64-efi/cmp_test.mod +usr/lib/grub/arm64-efi/cmp_test.module +usr/lib/grub/arm64-efi/command.lst +usr/lib/grub/arm64-efi/config.h +usr/lib/grub/arm64-efi/configfile.mod +usr/lib/grub/arm64-efi/configfile.module +usr/lib/grub/arm64-efi/cpio.mod +usr/lib/grub/arm64-efi/cpio.module +usr/lib/grub/arm64-efi/cpio_be.mod +usr/lib/grub/arm64-efi/cpio_be.module +usr/lib/grub/arm64-efi/crc64.mod +usr/lib/grub/arm64-efi/crc64.module +usr/lib/grub/arm64-efi/crypto.lst +usr/lib/grub/arm64-efi/crypto.mod +usr/lib/grub/arm64-efi/crypto.module +usr/lib/grub/arm64-efi/cryptodisk.mod +usr/lib/grub/arm64-efi/cryptodisk.module +usr/lib/grub/arm64-efi/ctz_test.mod +usr/lib/grub/arm64-efi/ctz_test.module +usr/lib/grub/arm64-efi/date.mod +usr/lib/grub/arm64-efi/date.module +usr/lib/grub/arm64-efi/datehook.mod +usr/lib/grub/arm64-efi/datehook.module +usr/lib/grub/arm64-efi/datetime.mod +usr/lib/grub/arm64-efi/datetime.module +usr/lib/grub/arm64-efi/disk.mod +usr/lib/grub/arm64-efi/disk.module +usr/lib/grub/arm64-efi/diskfilter.mod +usr/lib/grub/arm64-efi/diskfilter.module +usr/lib/grub/arm64-efi/div.mod +usr/lib/grub/arm64-efi/div.module +usr/lib/grub/arm64-efi/div_test.mod +usr/lib/grub/arm64-efi/div_test.module +usr/lib/grub/arm64-efi/dm_nv.mod +usr/lib/grub/arm64-efi/dm_nv.module +usr/lib/grub/arm64-efi/echo.mod +usr/lib/grub/arm64-efi/echo.module +usr/lib/grub/arm64-efi/efi_gop.mod +usr/lib/grub/arm64-efi/efi_gop.module +usr/lib/grub/arm64-efi/efifwsetup.mod +usr/lib/grub/arm64-efi/efifwsetup.module +usr/lib/grub/arm64-efi/efinet.mod +usr/lib/grub/arm64-efi/efinet.module +usr/lib/grub/arm64-efi/elf.mod +usr/lib/grub/arm64-efi/elf.module +usr/lib/grub/arm64-efi/eval.mod +usr/lib/grub/arm64-efi/eval.module +usr/lib/grub/arm64-efi/exfat.mod +usr/lib/grub/arm64-efi/exfat.module +usr/lib/grub/arm64-efi/exfctest.mod +usr/lib/grub/arm64-efi/exfctest.module +usr/lib/grub/arm64-efi/ext2.mod +usr/lib/grub/arm64-efi/ext2.module +usr/lib/grub/arm64-efi/extcmd.mod +usr/lib/grub/arm64-efi/extcmd.module +usr/lib/grub/arm64-efi/fat.mod +usr/lib/grub/arm64-efi/fat.module +usr/lib/grub/arm64-efi/fdt.mod +usr/lib/grub/arm64-efi/fdt.module +usr/lib/grub/arm64-efi/file.mod +usr/lib/grub/arm64-efi/file.module +usr/lib/grub/arm64-efi/font.mod +usr/lib/grub/arm64-efi/font.module +usr/lib/grub/arm64-efi/fs.lst +usr/lib/grub/arm64-efi/fshelp.mod +usr/lib/grub/arm64-efi/fshelp.module +usr/lib/grub/arm64-efi/functional_test.mod +usr/lib/grub/arm64-efi/functional_test.module +usr/lib/grub/arm64-efi/gcry_arcfour.mod +usr/lib/grub/arm64-efi/gcry_arcfour.module +usr/lib/grub/arm64-efi/gcry_blowfish.mod +usr/lib/grub/arm64-efi/gcry_blowfish.module +usr/lib/grub/arm64-efi/gcry_camellia.mod +usr/lib/grub/arm64-efi/gcry_camellia.module +usr/lib/grub/arm64-efi/gcry_cast5.mod +usr/lib/grub/arm64-efi/gcry_cast5.module +usr/lib/grub/arm64-efi/gcry_crc.mod +usr/lib/grub/arm64-efi/gcry_crc.module +usr/lib/grub/arm64-efi/gcry_des.mod +usr/lib/grub/arm64-efi/gcry_des.module +usr/lib/grub/arm64-efi/gcry_dsa.mod +usr/lib/grub/arm64-efi/gcry_dsa.module +usr/lib/grub/arm64-efi/gcry_idea.mod +usr/lib/grub/arm64-efi/gcry_idea.module +usr/lib/grub/arm64-efi/gcry_md4.mod +usr/lib/grub/arm64-efi/gcry_md4.module +usr/lib/grub/arm64-efi/gcry_md5.mod +usr/lib/grub/arm64-efi/gcry_md5.module +usr/lib/grub/arm64-efi/gcry_rfc2268.mod +usr/lib/grub/arm64-efi/gcry_rfc2268.module +usr/lib/grub/arm64-efi/gcry_rijndael.mod +usr/lib/grub/arm64-efi/gcry_rijndael.module +usr/lib/grub/arm64-efi/gcry_rmd160.mod +usr/lib/grub/arm64-efi/gcry_rmd160.module +usr/lib/grub/arm64-efi/gcry_rsa.mod +usr/lib/grub/arm64-efi/gcry_rsa.module +usr/lib/grub/arm64-efi/gcry_seed.mod +usr/lib/grub/arm64-efi/gcry_seed.module +usr/lib/grub/arm64-efi/gcry_serpent.mod +usr/lib/grub/arm64-efi/gcry_serpent.module +usr/lib/grub/arm64-efi/gcry_sha1.mod +usr/lib/grub/arm64-efi/gcry_sha1.module +usr/lib/grub/arm64-efi/gcry_sha256.mod +usr/lib/grub/arm64-efi/gcry_sha256.module +usr/lib/grub/arm64-efi/gcry_sha512.mod +usr/lib/grub/arm64-efi/gcry_sha512.module +usr/lib/grub/arm64-efi/gcry_tiger.mod +usr/lib/grub/arm64-efi/gcry_tiger.module +usr/lib/grub/arm64-efi/gcry_twofish.mod +usr/lib/grub/arm64-efi/gcry_twofish.module +usr/lib/grub/arm64-efi/gcry_whirlpool.mod +usr/lib/grub/arm64-efi/gcry_whirlpool.module +usr/lib/grub/arm64-efi/gdb_grub +usr/lib/grub/arm64-efi/geli.mod +usr/lib/grub/arm64-efi/geli.module +usr/lib/grub/arm64-efi/gettext.mod +usr/lib/grub/arm64-efi/gettext.module +usr/lib/grub/arm64-efi/gfxmenu.mod +usr/lib/grub/arm64-efi/gfxmenu.module +usr/lib/grub/arm64-efi/gfxterm.mod +usr/lib/grub/arm64-efi/gfxterm.module +usr/lib/grub/arm64-efi/gfxterm_background.mod +usr/lib/grub/arm64-efi/gfxterm_background.module +usr/lib/grub/arm64-efi/gfxterm_menu.mod +usr/lib/grub/arm64-efi/gfxterm_menu.module +usr/lib/grub/arm64-efi/gmodule.pl +usr/lib/grub/arm64-efi/gptsync.mod +usr/lib/grub/arm64-efi/gptsync.module +usr/lib/grub/arm64-efi/gzio.mod +usr/lib/grub/arm64-efi/gzio.module +usr/lib/grub/arm64-efi/halt.mod +usr/lib/grub/arm64-efi/halt.module +usr/lib/grub/arm64-efi/hashsum.mod +usr/lib/grub/arm64-efi/hashsum.module +usr/lib/grub/arm64-efi/hello.mod +usr/lib/grub/arm64-efi/hello.module +usr/lib/grub/arm64-efi/help.mod +usr/lib/grub/arm64-efi/help.module +usr/lib/grub/arm64-efi/hexdump.mod +usr/lib/grub/arm64-efi/hexdump.module +usr/lib/grub/arm64-efi/hfs.mod +usr/lib/grub/arm64-efi/hfs.module +usr/lib/grub/arm64-efi/hfsplus.mod +usr/lib/grub/arm64-efi/hfsplus.module +usr/lib/grub/arm64-efi/hfspluscomp.mod +usr/lib/grub/arm64-efi/hfspluscomp.module +usr/lib/grub/arm64-efi/http.mod +usr/lib/grub/arm64-efi/http.module +usr/lib/grub/arm64-efi/iso9660.mod +usr/lib/grub/arm64-efi/iso9660.module +usr/lib/grub/arm64-efi/jfs.mod +usr/lib/grub/arm64-efi/jfs.module +usr/lib/grub/arm64-efi/jpeg.mod +usr/lib/grub/arm64-efi/jpeg.module +usr/lib/grub/arm64-efi/kernel.exec +usr/lib/grub/arm64-efi/kernel.img +usr/lib/grub/arm64-efi/keystatus.mod +usr/lib/grub/arm64-efi/keystatus.module +usr/lib/grub/arm64-efi/ldm.mod +usr/lib/grub/arm64-efi/ldm.module +usr/lib/grub/arm64-efi/linux.mod +usr/lib/grub/arm64-efi/linux.module +usr/lib/grub/arm64-efi/loadenv.mod +usr/lib/grub/arm64-efi/loadenv.module +usr/lib/grub/arm64-efi/loopback.mod +usr/lib/grub/arm64-efi/loopback.module +usr/lib/grub/arm64-efi/ls.mod +usr/lib/grub/arm64-efi/ls.module +usr/lib/grub/arm64-efi/lsacpi.mod +usr/lib/grub/arm64-efi/lsacpi.module +usr/lib/grub/arm64-efi/lsefi.mod +usr/lib/grub/arm64-efi/lsefi.module +usr/lib/grub/arm64-efi/lsefimmap.mod +usr/lib/grub/arm64-efi/lsefimmap.module +usr/lib/grub/arm64-efi/lsefisystab.mod +usr/lib/grub/arm64-efi/lsefisystab.module +usr/lib/grub/arm64-efi/lsmmap.mod +usr/lib/grub/arm64-efi/lsmmap.module +usr/lib/grub/arm64-efi/lssal.mod +usr/lib/grub/arm64-efi/lssal.module +usr/lib/grub/arm64-efi/luks.mod +usr/lib/grub/arm64-efi/luks.module +usr/lib/grub/arm64-efi/lvm.mod +usr/lib/grub/arm64-efi/lvm.module +usr/lib/grub/arm64-efi/lzopio.mod +usr/lib/grub/arm64-efi/lzopio.module +usr/lib/grub/arm64-efi/macbless.mod +usr/lib/grub/arm64-efi/macbless.module +usr/lib/grub/arm64-efi/macho.mod +usr/lib/grub/arm64-efi/macho.module +usr/lib/grub/arm64-efi/mdraid09.mod +usr/lib/grub/arm64-efi/mdraid09.module +usr/lib/grub/arm64-efi/mdraid09_be.mod +usr/lib/grub/arm64-efi/mdraid09_be.module +usr/lib/grub/arm64-efi/mdraid1x.mod +usr/lib/grub/arm64-efi/mdraid1x.module +usr/lib/grub/arm64-efi/memdisk.mod +usr/lib/grub/arm64-efi/memdisk.module +usr/lib/grub/arm64-efi/memrw.mod +usr/lib/grub/arm64-efi/memrw.module +usr/lib/grub/arm64-efi/minicmd.mod +usr/lib/grub/arm64-efi/minicmd.module +usr/lib/grub/arm64-efi/minix.mod +usr/lib/grub/arm64-efi/minix.module +usr/lib/grub/arm64-efi/minix2.mod +usr/lib/grub/arm64-efi/minix2.module +usr/lib/grub/arm64-efi/minix2_be.mod +usr/lib/grub/arm64-efi/minix2_be.module +usr/lib/grub/arm64-efi/minix3.mod +usr/lib/grub/arm64-efi/minix3.module +usr/lib/grub/arm64-efi/minix3_be.mod +usr/lib/grub/arm64-efi/minix3_be.module +usr/lib/grub/arm64-efi/minix_be.mod +usr/lib/grub/arm64-efi/minix_be.module +usr/lib/grub/arm64-efi/mmap.mod +usr/lib/grub/arm64-efi/mmap.module +usr/lib/grub/arm64-efi/moddep.lst +usr/lib/grub/arm64-efi/modinfo.sh +usr/lib/grub/arm64-efi/mpi.mod +usr/lib/grub/arm64-efi/mpi.module +usr/lib/grub/arm64-efi/msdospart.mod +usr/lib/grub/arm64-efi/msdospart.module +usr/lib/grub/arm64-efi/mul_test.mod +usr/lib/grub/arm64-efi/mul_test.module +usr/lib/grub/arm64-efi/net.mod +usr/lib/grub/arm64-efi/net.module +usr/lib/grub/arm64-efi/newc.mod +usr/lib/grub/arm64-efi/newc.module +usr/lib/grub/arm64-efi/nilfs2.mod +usr/lib/grub/arm64-efi/nilfs2.module +usr/lib/grub/arm64-efi/normal.mod +usr/lib/grub/arm64-efi/normal.module +usr/lib/grub/arm64-efi/ntfs.mod +usr/lib/grub/arm64-efi/ntfs.module +usr/lib/grub/arm64-efi/ntfscomp.mod +usr/lib/grub/arm64-efi/ntfscomp.module +usr/lib/grub/arm64-efi/odc.mod +usr/lib/grub/arm64-efi/odc.module +usr/lib/grub/arm64-efi/offsetio.mod +usr/lib/grub/arm64-efi/offsetio.module +usr/lib/grub/arm64-efi/part_acorn.mod +usr/lib/grub/arm64-efi/part_acorn.module +usr/lib/grub/arm64-efi/part_amiga.mod +usr/lib/grub/arm64-efi/part_amiga.module +usr/lib/grub/arm64-efi/part_apple.mod +usr/lib/grub/arm64-efi/part_apple.module +usr/lib/grub/arm64-efi/part_bsd.mod +usr/lib/grub/arm64-efi/part_bsd.module +usr/lib/grub/arm64-efi/part_dfly.mod +usr/lib/grub/arm64-efi/part_dfly.module +usr/lib/grub/arm64-efi/part_dvh.mod +usr/lib/grub/arm64-efi/part_dvh.module +usr/lib/grub/arm64-efi/part_gpt.mod +usr/lib/grub/arm64-efi/part_gpt.module +usr/lib/grub/arm64-efi/part_msdos.mod +usr/lib/grub/arm64-efi/part_msdos.module +usr/lib/grub/arm64-efi/part_plan.mod +usr/lib/grub/arm64-efi/part_plan.module +usr/lib/grub/arm64-efi/part_sun.mod +usr/lib/grub/arm64-efi/part_sun.module +usr/lib/grub/arm64-efi/part_sunpc.mod +usr/lib/grub/arm64-efi/part_sunpc.module +usr/lib/grub/arm64-efi/partmap.lst +usr/lib/grub/arm64-efi/parttool.lst +usr/lib/grub/arm64-efi/parttool.mod +usr/lib/grub/arm64-efi/parttool.module +usr/lib/grub/arm64-efi/password.mod +usr/lib/grub/arm64-efi/password.module +usr/lib/grub/arm64-efi/password_pbkdf2.mod +usr/lib/grub/arm64-efi/password_pbkdf2.module +usr/lib/grub/arm64-efi/pbkdf2.mod +usr/lib/grub/arm64-efi/pbkdf2.module +usr/lib/grub/arm64-efi/pbkdf2_test.mod +usr/lib/grub/arm64-efi/pbkdf2_test.module +usr/lib/grub/arm64-efi/png.mod +usr/lib/grub/arm64-efi/png.module +usr/lib/grub/arm64-efi/priority_queue.mod +usr/lib/grub/arm64-efi/priority_queue.module +usr/lib/grub/arm64-efi/probe.mod +usr/lib/grub/arm64-efi/probe.module +usr/lib/grub/arm64-efi/procfs.mod +usr/lib/grub/arm64-efi/procfs.module +usr/lib/grub/arm64-efi/progress.mod +usr/lib/grub/arm64-efi/progress.module +usr/lib/grub/arm64-efi/raid5rec.mod +usr/lib/grub/arm64-efi/raid5rec.module +usr/lib/grub/arm64-efi/raid6rec.mod +usr/lib/grub/arm64-efi/raid6rec.module +usr/lib/grub/arm64-efi/read.mod +usr/lib/grub/arm64-efi/read.module +usr/lib/grub/arm64-efi/reboot.mod +usr/lib/grub/arm64-efi/reboot.module +usr/lib/grub/arm64-efi/regexp.mod +usr/lib/grub/arm64-efi/regexp.module +usr/lib/grub/arm64-efi/reiserfs.mod +usr/lib/grub/arm64-efi/reiserfs.module +usr/lib/grub/arm64-efi/romfs.mod +usr/lib/grub/arm64-efi/romfs.module +usr/lib/grub/arm64-efi/scsi.mod +usr/lib/grub/arm64-efi/scsi.module +usr/lib/grub/arm64-efi/search.mod +usr/lib/grub/arm64-efi/search.module +usr/lib/grub/arm64-efi/search_fs_file.mod +usr/lib/grub/arm64-efi/search_fs_file.module +usr/lib/grub/arm64-efi/search_fs_uuid.mod +usr/lib/grub/arm64-efi/search_fs_uuid.module +usr/lib/grub/arm64-efi/search_label.mod +usr/lib/grub/arm64-efi/search_label.module +usr/lib/grub/arm64-efi/serial.mod +usr/lib/grub/arm64-efi/serial.module +usr/lib/grub/arm64-efi/setjmp.mod +usr/lib/grub/arm64-efi/setjmp.module +usr/lib/grub/arm64-efi/setjmp_test.mod +usr/lib/grub/arm64-efi/setjmp_test.module +usr/lib/grub/arm64-efi/sfs.mod +usr/lib/grub/arm64-efi/sfs.module +usr/lib/grub/arm64-efi/shift_test.mod +usr/lib/grub/arm64-efi/shift_test.module +usr/lib/grub/arm64-efi/signature_test.mod +usr/lib/grub/arm64-efi/signature_test.module +usr/lib/grub/arm64-efi/sleep.mod +usr/lib/grub/arm64-efi/sleep.module +usr/lib/grub/arm64-efi/sleep_test.mod +usr/lib/grub/arm64-efi/sleep_test.module +usr/lib/grub/arm64-efi/squash4.mod +usr/lib/grub/arm64-efi/squash4.module +usr/lib/grub/arm64-efi/syslinuxcfg.mod +usr/lib/grub/arm64-efi/syslinuxcfg.module +usr/lib/grub/arm64-efi/tar.mod +usr/lib/grub/arm64-efi/tar.module +usr/lib/grub/arm64-efi/terminal.lst +usr/lib/grub/arm64-efi/terminal.mod +usr/lib/grub/arm64-efi/terminal.module +usr/lib/grub/arm64-efi/terminfo.mod +usr/lib/grub/arm64-efi/terminfo.module +usr/lib/grub/arm64-efi/test.mod +usr/lib/grub/arm64-efi/test.module +usr/lib/grub/arm64-efi/test_blockarg.mod +usr/lib/grub/arm64-efi/test_blockarg.module +usr/lib/grub/arm64-efi/testload.mod +usr/lib/grub/arm64-efi/testload.module +usr/lib/grub/arm64-efi/testspeed.mod +usr/lib/grub/arm64-efi/testspeed.module +usr/lib/grub/arm64-efi/tftp.mod +usr/lib/grub/arm64-efi/tftp.module +usr/lib/grub/arm64-efi/tga.mod +usr/lib/grub/arm64-efi/tga.module +usr/lib/grub/arm64-efi/time.mod +usr/lib/grub/arm64-efi/time.module +usr/lib/grub/arm64-efi/tr.mod +usr/lib/grub/arm64-efi/tr.module +usr/lib/grub/arm64-efi/trig.mod +usr/lib/grub/arm64-efi/trig.module +usr/lib/grub/arm64-efi/true.mod +usr/lib/grub/arm64-efi/true.module +usr/lib/grub/arm64-efi/udf.mod +usr/lib/grub/arm64-efi/udf.module +usr/lib/grub/arm64-efi/ufs1.mod +usr/lib/grub/arm64-efi/ufs1.module +usr/lib/grub/arm64-efi/ufs1_be.mod +usr/lib/grub/arm64-efi/ufs1_be.module +usr/lib/grub/arm64-efi/ufs2.mod +usr/lib/grub/arm64-efi/ufs2.module +usr/lib/grub/arm64-efi/verify.mod +usr/lib/grub/arm64-efi/verify.module +usr/lib/grub/arm64-efi/video.lst +usr/lib/grub/arm64-efi/video.mod +usr/lib/grub/arm64-efi/video.module +usr/lib/grub/arm64-efi/video_colors.mod +usr/lib/grub/arm64-efi/video_colors.module +usr/lib/grub/arm64-efi/video_fb.mod +usr/lib/grub/arm64-efi/video_fb.module +usr/lib/grub/arm64-efi/videoinfo.mod +usr/lib/grub/arm64-efi/videoinfo.module +usr/lib/grub/arm64-efi/videotest.mod +usr/lib/grub/arm64-efi/videotest.module +usr/lib/grub/arm64-efi/videotest_checksum.mod +usr/lib/grub/arm64-efi/videotest_checksum.module +usr/lib/grub/arm64-efi/xen_boot.mod +usr/lib/grub/arm64-efi/xen_boot.module +usr/lib/grub/arm64-efi/xfs.mod +usr/lib/grub/arm64-efi/xfs.module +usr/lib/grub/arm64-efi/xnu_uuid.mod +usr/lib/grub/arm64-efi/xnu_uuid.module +usr/lib/grub/arm64-efi/xnu_uuid_test.mod +usr/lib/grub/arm64-efi/xnu_uuid_test.module +usr/lib/grub/arm64-efi/xzio.mod +usr/lib/grub/arm64-efi/xzio.module +usr/lib/grub/arm64-efi/zfs.mod +usr/lib/grub/arm64-efi/zfs.module +usr/lib/grub/arm64-efi/zfscrypt.mod +usr/lib/grub/arm64-efi/zfscrypt.module +usr/lib/grub/arm64-efi/zfsinfo.mod +usr/lib/grub/arm64-efi/zfsinfo.module +usr/sbin/grub-bios-setup +usr/sbin/grub-install +usr/sbin/grub-macbless +usr/sbin/grub-mkconfig +usr/sbin/grub-ofpathname +usr/sbin/grub-probe +usr/sbin/grub-reboot +usr/sbin/grub-set-default +usr/sbin/grub-sparc64-setup +#usr/share/grub +#usr/share/grub/ascii.h +usr/share/grub/ascii.pf2 +usr/share/grub/euro.pf2 +usr/share/grub/grub-mkconfig_lib +usr/share/grub/unicode.pf2 +#usr/share/grub/widthspec.h +#usr/share/info/grub-dev.info +#usr/share/info/grub.info +#usr/share/locale/ast/LC_MESSAGES/grub.mo +#usr/share/locale/ca/LC_MESSAGES/grub.mo +#usr/share/locale/da/LC_MESSAGES/grub.mo +#usr/share/locale/de/LC_MESSAGES/grub.mo +#usr/share/locale/de@hebrew +#usr/share/locale/de@hebrew/LC_MESSAGES +#usr/share/locale/de(a)hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/de_CH +#usr/share/locale/de_CH/LC_MESSAGES +#usr/share/locale/de_CH/LC_MESSAGES/grub.mo +#usr/share/locale/en@arabic +#usr/share/locale/en@arabic/LC_MESSAGES +#usr/share/locale/en(a)arabic/LC_MESSAGES/grub.mo +#usr/share/locale/en@cyrillic +#usr/share/locale/en@cyrillic/LC_MESSAGES +#usr/share/locale/en(a)cyrillic/LC_MESSAGES/grub.mo +#usr/share/locale/en@greek +#usr/share/locale/en@greek/LC_MESSAGES +#usr/share/locale/en(a)greek/LC_MESSAGES/grub.mo +#usr/share/locale/en@hebrew +#usr/share/locale/en@hebrew/LC_MESSAGES +#usr/share/locale/en(a)hebrew/LC_MESSAGES/grub.mo +#usr/share/locale/en@piglatin +#usr/share/locale/en@piglatin/LC_MESSAGES +#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo +#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo +#usr/share/locale/eo/LC_MESSAGES/grub.mo +#usr/share/locale/es/LC_MESSAGES/grub.mo +#usr/share/locale/fi/LC_MESSAGES/grub.mo +#usr/share/locale/fr/LC_MESSAGES/grub.mo +#usr/share/locale/gl/LC_MESSAGES/grub.mo +#usr/share/locale/hr/LC_MESSAGES/grub.mo +#usr/share/locale/hu/LC_MESSAGES/grub.mo +#usr/share/locale/id/LC_MESSAGES/grub.mo +#usr/share/locale/it/LC_MESSAGES/grub.mo +#usr/share/locale/ja/LC_MESSAGES/grub.mo +#usr/share/locale/ko/LC_MESSAGES/grub.mo +#usr/share/locale/lt/LC_MESSAGES/grub.mo +#usr/share/locale/nb/LC_MESSAGES/grub.mo +#usr/share/locale/nl/LC_MESSAGES/grub.mo +#usr/share/locale/pa +#usr/share/locale/pa/LC_MESSAGES +#usr/share/locale/pa/LC_MESSAGES/grub.mo +#usr/share/locale/pl/LC_MESSAGES/grub.mo +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo +#usr/share/locale/ru/LC_MESSAGES/grub.mo +#usr/share/locale/sl/LC_MESSAGES/grub.mo +#usr/share/locale/sr/LC_MESSAGES/grub.mo +#usr/share/locale/sv/LC_MESSAGES/grub.mo +#usr/share/locale/tr/LC_MESSAGES/grub.mo +#usr/share/locale/uk/LC_MESSAGES/grub.mo +#usr/share/locale/vi/LC_MESSAGES/grub.mo +#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo +#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 66a7be55b..bce6d0fb6 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 34ef44080..1db558c81 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -99,6 +99,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/crypto/cast6_generic.ko #lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko +#lib/modules/KVER-ipfire/kernel/crypto/chacha20_generic.ko +#lib/modules/KVER-ipfire/kernel/crypto/chacha20poly1305.ko #lib/modules/KVER-ipfire/kernel/crypto/cmac.ko #lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko #lib/modules/KVER-ipfire/kernel/crypto/cts.ko @@ -118,6 +120,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/crypto/michael_mic.ko #lib/modules/KVER-ipfire/kernel/crypto/pcbc.ko #lib/modules/KVER-ipfire/kernel/crypto/pcrypt.ko +#lib/modules/KVER-ipfire/kernel/crypto/poly1305_generic.ko #lib/modules/KVER-ipfire/kernel/crypto/rmd128.ko #lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko #lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko @@ -209,6 +212,9 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-core.ko #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-ohci.ko #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-sbp2.ko +#lib/modules/KVER-ipfire/kernel/drivers/firmware +#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi +#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi/efibc.ko #lib/modules/KVER-ipfire/kernel/drivers/gpio #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-adnp.ko #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-viperboard.ko @@ -260,15 +266,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/panel/panel-simple.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111/pl111_drm.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-backend.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm-hdmi.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-tcon.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i_tv.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun6i_drc.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i-mixer.ko -#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.ko #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core/tinydrm.ko @@ -1951,6 +1948,8 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko #lib/modules/KVER-ipfire/kernel/fs/dlm #lib/modules/KVER-ipfire/kernel/fs/dlm/dlm.ko +#lib/modules/KVER-ipfire/kernel/fs/efivarfs +#lib/modules/KVER-ipfire/kernel/fs/efivarfs/efivarfs.ko #lib/modules/KVER-ipfire/kernel/fs/fat #lib/modules/KVER-ipfire/kernel/fs/fat/fat.ko #lib/modules/KVER-ipfire/kernel/fs/fat/msdos.ko diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 70a33d659..110114c47 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 66a7be55b..bce6d0fb6 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 161ecb4c3..00025a3bc 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -117,6 +117,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6_generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ccm.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20_generic.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20poly1305.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cmac.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cts.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/deflate.ko @@ -134,6 +136,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md4.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/michael_mic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/pcbc.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/poly1305_generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd128.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd160.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd256.ko @@ -1063,7 +1066,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/b53/b53_mdio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/bcm-sf2.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_mdio.ko @@ -2003,7 +2005,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_bitmap.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_hash.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_rbtree.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_AUDIT.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CHECKSUM.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CLASSIFY.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CONNSECMARK.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 94838e119..9c1f76248 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -521,6 +521,8 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/crypto/cast6_generic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/ccm.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20_generic.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20poly1305.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cmac.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/crypto_engine.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cts.ko @@ -540,6 +542,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/crypto/michael_mic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/pcbc.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/pcrypt.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/poly1305_generic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd128.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd160.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd256.ko @@ -1614,7 +1617,6 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/b53/b53_mdio.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/bcm-sf2.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/rootfiles/common/cdrkit b/config/rootfiles/common/cdrkit new file mode 100644 index 000000000..299753cd0 --- /dev/null +++ b/config/rootfiles/common/cdrkit @@ -0,0 +1,46 @@ +#usr/bin/cdda2wav +#usr/bin/cdrecord +#usr/bin/devdump +#usr/bin/dirsplit +#usr/bin/dvdrecord +usr/bin/genisoimage +#usr/bin/isodebug +#usr/bin/isodump +#usr/bin/isoinfo +#usr/bin/isovfy +usr/bin/mkhybrid +usr/bin/mkisofs +#usr/bin/readom +#usr/bin/wodim +#usr/include/usal +#usr/include/usal/aspi-dos.h +#usr/include/usal/aspi-win32.h +#usr/include/usal/pg.h +#usr/include/usal/scsicdb.h +#usr/include/usal/scsidefs.h +#usr/include/usal/scsireg.h +#usr/include/usal/scsisense.h +#usr/include/usal/scsitransp.h +#usr/include/usal/spti-wnt.h +#usr/include/usal/srb_os2.h +#usr/include/usal/usalcmd.h +#usr/include/usal/usalio.h +#usr/include/usal/usalops.h +#usr/include/usal/usaltimes.h +#usr/lib/librols.so +usr/lib/librols.so.0 +usr/lib/librols.so.0.0.1 +#usr/lib/libusal.so +usr/lib/libusal.so.0 +usr/lib/libusal.so.0.0.1 +#usr/sbin/netscsid +#usr/share/man/man1/devdump.1 +#usr/share/man/man1/dirsplit.1 +#usr/share/man/man1/genisoimage.1 +#usr/share/man/man1/isodebug.1 +#usr/share/man/man1/isodump.1 +#usr/share/man/man1/isoinfo.1 +#usr/share/man/man1/isovfy.1 +#usr/share/man/man1/readom.1 +#usr/share/man/man1/wodim.1 +#usr/share/man/man5/genisoimagerc.5 diff --git a/config/rootfiles/common/dvdrtools b/config/rootfiles/common/dvdrtools deleted file mode 100644 index 61fb046d7..000000000 --- a/config/rootfiles/common/dvdrtools +++ /dev/null @@ -1,15 +0,0 @@ -#usr/bin/cdda2mp3 -#usr/bin/cdda2ogg -#usr/bin/cdda2wav -#usr/bin/devdump -#usr/bin/dvdrecord -usr/bin/isodump -usr/bin/isoinfo -usr/bin/isovfy -usr/bin/mkisofs -#usr/bin/readcd -#usr/share/man/man1/cdda2wav.1 -#usr/share/man/man1/dvdrecord.1 -#usr/share/man/man1/readcd.1 -#usr/share/man/man8/isoinfo.8 -#usr/share/man/man8/mkisofs.8 diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 6cd8a4dca..bc28d4593 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -1,7 +1,6 @@ #boot/grub boot/grub/grub.cfg boot/grub/splash.png -boot/grub/unifont.pf2 #etc/bash_completion.d #etc/bash_completion.d/grub etc/default/grub @@ -12,8 +11,7 @@ etc/grub.d/20_linux_xen etc/grub.d/30_os-prober etc/grub.d/40_custom etc/grub.d/41_custom -etc/grub.d/README -etc/grub2.cfg +#etc/grub.d/README usr/bin/grub-editenv usr/bin/grub-file usr/bin/grub-fstest @@ -150,8 +148,6 @@ usr/lib/grub/i386-pc #usr/lib/grub/i386-pc/echo.module #usr/lib/grub/i386-pc/efiemu.mod #usr/lib/grub/i386-pc/efiemu.module -#usr/lib/grub/i386-pc/efiemu32.o -#usr/lib/grub/i386-pc/efiemu64.o #usr/lib/grub/i386-pc/ehci.mod #usr/lib/grub/i386-pc/ehci.module #usr/lib/grub/i386-pc/elf.mod @@ -598,8 +594,13 @@ usr/sbin/grub-probe usr/sbin/grub-reboot usr/sbin/grub-set-default usr/sbin/grub-sparc64-setup -usr/share/grub +#usr/share/grub +#usr/share/grub/ascii.h +usr/share/grub/ascii.pf2 +usr/share/grub/euro.pf2 usr/share/grub/grub-mkconfig_lib +usr/share/grub/unicode.pf2 +#usr/share/grub/widthspec.h #usr/share/info/grub-dev.info #usr/share/info/grub.info #usr/share/locale/ast/LC_MESSAGES/grub.mo diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 8f3d41476..f79395227 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index c25283385..832b64134 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -11,7 +11,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32-pclmul.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/glue_helper.ko -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-i586.ko #lib/modules/KVER-ipfire/kernel/arch/x86/events @@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/rootfiles/common/i586/syslinux b/config/rootfiles/common/i586/syslinux index 89cf5c844..0322239d0 100644 --- a/config/rootfiles/common/i586/syslinux +++ b/config/rootfiles/common/i586/syslinux @@ -14,7 +14,9 @@ usr/bin/isohybrid #usr/bin/syslinux2ansi #usr/man/man1/extlinux.1 #usr/man/man1/gethostip.1 +#usr/man/man1/isohybrid.1 #usr/man/man1/lss16toppm.1 +#usr/man/man1/memdiskfind.1 #usr/man/man1/ppmtolss16.1 #usr/man/man1/syslinux.1 #usr/man/man1/syslinux2ansi.1 @@ -25,6 +27,7 @@ usr/bin/isohybrid #usr/share/syslinux/cat.c32 #usr/share/syslinux/chain.c32 #usr/share/syslinux/cmd.c32 +#usr/share/syslinux/cmenu.c32 #usr/share/syslinux/com32 #usr/share/syslinux/com32/com32.ld #usr/share/syslinux/com32/include @@ -36,11 +39,26 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/bitsize/stdint.h #usr/share/syslinux/com32/include/bitsize/stdintconst.h #usr/share/syslinux/com32/include/bitsize/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize32 +#usr/share/syslinux/com32/include/bitsize32/limits.h +#usr/share/syslinux/com32/include/bitsize32/stddef.h +#usr/share/syslinux/com32/include/bitsize32/stdint.h +#usr/share/syslinux/com32/include/bitsize32/stdintconst.h +#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize64 +#usr/share/syslinux/com32/include/bitsize64/limits.h +#usr/share/syslinux/com32/include/bitsize64/stddef.h +#usr/share/syslinux/com32/include/bitsize64/stdint.h +#usr/share/syslinux/com32/include/bitsize64/stdintconst.h +#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h #usr/share/syslinux/com32/include/bufprintf.h +#usr/share/syslinux/com32/include/byteswap.h +#usr/share/syslinux/com32/include/cli.h #usr/share/syslinux/com32/include/colortbl.h #usr/share/syslinux/com32/include/com32.h #usr/share/syslinux/com32/include/console.h #usr/share/syslinux/com32/include/cpufeature.h +#usr/share/syslinux/com32/include/ctime.h #usr/share/syslinux/com32/include/ctype.h #usr/share/syslinux/com32/include/dev.h #usr/share/syslinux/com32/include/dhcp.h @@ -101,6 +119,8 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h #usr/share/syslinux/com32/include/gplinclude/zzjson #usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h +#usr/share/syslinux/com32/include/hw +#usr/share/syslinux/com32/include/hw/vga.h #usr/share/syslinux/com32/include/ilog2.h #usr/share/syslinux/com32/include/inttypes.h #usr/share/syslinux/com32/include/klibc @@ -109,16 +129,27 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/klibc/diverr.h #usr/share/syslinux/com32/include/klibc/endian.h #usr/share/syslinux/com32/include/klibc/extern.h +#usr/share/syslinux/com32/include/klibc/i386 +#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h #usr/share/syslinux/com32/include/klibc/sysconfig.h +#usr/share/syslinux/com32/include/klibc/x86_64 +#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h #usr/share/syslinux/com32/include/libansi.h #usr/share/syslinux/com32/include/limits.h +#usr/share/syslinux/com32/include/linux +#usr/share/syslinux/com32/include/linux/list.h #usr/share/syslinux/com32/include/math.h +#usr/share/syslinux/com32/include/menu.h #usr/share/syslinux/com32/include/minmax.h #usr/share/syslinux/com32/include/netinet #usr/share/syslinux/com32/include/netinet/in.h #usr/share/syslinux/com32/include/png.h #usr/share/syslinux/com32/include/pngconf.h +#usr/share/syslinux/com32/include/refstr.h +#usr/share/syslinux/com32/include/serial.h #usr/share/syslinux/com32/include/setjmp.h +#usr/share/syslinux/com32/include/sort.h +#usr/share/syslinux/com32/include/srecsend.h #usr/share/syslinux/com32/include/stdarg.h #usr/share/syslinux/com32/include/stdbool.h #usr/share/syslinux/com32/include/stddef.h @@ -134,14 +165,24 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/sys/elf32.h #usr/share/syslinux/com32/include/sys/elf64.h #usr/share/syslinux/com32/include/sys/elfcommon.h +#usr/share/syslinux/com32/include/sys/exec.h #usr/share/syslinux/com32/include/sys/fpu.h #usr/share/syslinux/com32/include/sys/gpxe.h +#usr/share/syslinux/com32/include/sys/i386 +#usr/share/syslinux/com32/include/sys/i386/bitops.h +#usr/share/syslinux/com32/include/sys/i386/cpu.h +#usr/share/syslinux/com32/include/sys/i386/module.h #usr/share/syslinux/com32/include/sys/io.h +#usr/share/syslinux/com32/include/sys/module.h #usr/share/syslinux/com32/include/sys/pci.h #usr/share/syslinux/com32/include/sys/stat.h #usr/share/syslinux/com32/include/sys/time.h #usr/share/syslinux/com32/include/sys/times.h #usr/share/syslinux/com32/include/sys/types.h +#usr/share/syslinux/com32/include/sys/x86_64 +#usr/share/syslinux/com32/include/sys/x86_64/bitops.h +#usr/share/syslinux/com32/include/sys/x86_64/cpu.h +#usr/share/syslinux/com32/include/sys/x86_64/module.h #usr/share/syslinux/com32/include/syslinux #usr/share/syslinux/com32/include/syslinux/adv.h #usr/share/syslinux/com32/include/syslinux/advconst.h @@ -150,8 +191,9 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/bootpm.h #usr/share/syslinux/com32/include/syslinux/bootrm.h #usr/share/syslinux/com32/include/syslinux/config.h +#usr/share/syslinux/com32/include/syslinux/debug.h #usr/share/syslinux/com32/include/syslinux/disk.h -#usr/share/syslinux/com32/include/syslinux/features.h +#usr/share/syslinux/com32/include/syslinux/firmware.h #usr/share/syslinux/com32/include/syslinux/idle.h #usr/share/syslinux/com32/include/syslinux/io.h #usr/share/syslinux/com32/include/syslinux/keyboard.h @@ -164,27 +206,35 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/pxe_api.h #usr/share/syslinux/com32/include/syslinux/reboot.h #usr/share/syslinux/com32/include/syslinux/resolve.h +#usr/share/syslinux/com32/include/syslinux/sysappend.h +#usr/share/syslinux/com32/include/syslinux/version.h #usr/share/syslinux/com32/include/syslinux/vesacon.h #usr/share/syslinux/com32/include/syslinux/video.h #usr/share/syslinux/com32/include/syslinux/zio.h +#usr/share/syslinux/com32/include/tftp.h #usr/share/syslinux/com32/include/time.h #usr/share/syslinux/com32/include/tinyjpeg.h #usr/share/syslinux/com32/include/unistd.h +#usr/share/syslinux/com32/include/upload_backend.h #usr/share/syslinux/com32/include/zconf.h #usr/share/syslinux/com32/include/zlib.h -#usr/share/syslinux/com32/libcom32.a -#usr/share/syslinux/com32/libcom32gpl.a #usr/share/syslinux/com32/libcom32upload.a -#usr/share/syslinux/com32/libutil_com.a +#usr/share/syslinux/com32/libgpl.c32 #usr/share/syslinux/com32/libutil_lnx.a #usr/share/syslinux/config.c32 +#usr/share/syslinux/cptime.c32 +#usr/share/syslinux/cpu.c32 #usr/share/syslinux/cpuid.c32 #usr/share/syslinux/cpuidtest.c32 +#usr/share/syslinux/debug.c32 +#usr/share/syslinux/dhcp.c32 #usr/share/syslinux/diag #usr/share/syslinux/diag/geodsp1s.img.xz #usr/share/syslinux/diag/geodspms.img.xz #usr/share/syslinux/diag/handoff.bin +#usr/share/syslinux/dir.c32 #usr/share/syslinux/disk.c32 +#usr/share/syslinux/dmi.c32 #usr/share/syslinux/dmitest.c32 #usr/share/syslinux/dosutil #usr/share/syslinux/dosutil/copybs.com @@ -197,15 +247,13 @@ usr/bin/isohybrid #usr/share/syslinux/gptmbr_c.bin #usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxecmd.c32 -#usr/share/syslinux/gpxelinux.0 -#usr/share/syslinux/gpxelinuxk.0 #usr/share/syslinux/hdt.c32 +#usr/share/syslinux/hexdump.c32 #usr/share/syslinux/host.c32 #usr/share/syslinux/ifcpu.c32 #usr/share/syslinux/ifcpu64.c32 #usr/share/syslinux/ifmemdsk.c32 #usr/share/syslinux/ifplop.c32 -#usr/share/syslinux/int18.com #usr/share/syslinux/isohdpfx.bin #usr/share/syslinux/isohdpfx_c.bin #usr/share/syslinux/isohdpfx_f.bin @@ -216,7 +264,15 @@ usr/bin/isohybrid #usr/share/syslinux/isolinux.bin #usr/share/syslinux/kbdmap.c32 #usr/share/syslinux/kontron_wdt.c32 +#usr/share/syslinux/ldlinux.c32 +#usr/share/syslinux/lfs.c32 +#usr/share/syslinux/libcom32.c32 +#usr/share/syslinux/libgpl.c32 +#usr/share/syslinux/liblua.c32 +#usr/share/syslinux/libmenu.c32 +#usr/share/syslinux/libutil.c32 #usr/share/syslinux/linux.c32 +#usr/share/syslinux/lpxelinux.0 #usr/share/syslinux/ls.c32 #usr/share/syslinux/lua.c32 #usr/share/syslinux/mboot.c32 @@ -224,15 +280,14 @@ usr/bin/isohybrid #usr/share/syslinux/mbr_c.bin #usr/share/syslinux/mbr_f.bin #usr/share/syslinux/memdisk -#usr/share/syslinux/memdump.com #usr/share/syslinux/meminfo.c32 #usr/share/syslinux/menu.c32 +#usr/share/syslinux/pci.c32 #usr/share/syslinux/pcitest.c32 #usr/share/syslinux/pmload.c32 -#usr/share/syslinux/poweroff.com +#usr/share/syslinux/poweroff.c32 #usr/share/syslinux/prdhcp.c32 #usr/share/syslinux/pwd.c32 -#usr/share/syslinux/pxechain.com #usr/share/syslinux/pxechn.c32 #usr/share/syslinux/pxelinux.0 #usr/share/syslinux/reboot.c32 @@ -240,10 +295,9 @@ usr/bin/isohybrid #usr/share/syslinux/sanboot.c32 #usr/share/syslinux/sdi.c32 #usr/share/syslinux/sysdump.c32 +#usr/share/syslinux/syslinux.c32 #usr/share/syslinux/syslinux.com -#usr/share/syslinux/syslinux.exe -#usr/share/syslinux/syslinux64.exe -#usr/share/syslinux/ver.com +#usr/share/syslinux/vesa.c32 #usr/share/syslinux/vesainfo.c32 #usr/share/syslinux/vesamenu.c32 #usr/share/syslinux/vpdtest.c32 diff --git a/config/rootfiles/common/installer b/config/rootfiles/common/installer index ff8cda598..d4abb97aa 100644 --- a/config/rootfiles/common/installer +++ b/config/rootfiles/common/installer @@ -1,5 +1,6 @@ #usr/bin/downloadsource.sh #usr/bin/execute-postinstall.sh +usr/bin/install-bootloader #usr/bin/installer #usr/bin/start-networking.sh #usr/lib/dracut/modules.d/99installer diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index afa30467f..cf9a5c456 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -65,6 +65,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/devlink-dev.8 #usr/share/man/man8/devlink-monitor.8 #usr/share/man/man8/devlink-port.8 +#usr/share/man/man8/devlink-resource.8 #usr/share/man/man8/devlink-sb.8 #usr/share/man/man8/devlink.8 #usr/share/man/man8/genl.8 @@ -97,6 +98,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/nstat.8 #usr/share/man/man8/rdma-dev.8 #usr/share/man/man8/rdma-link.8 +#usr/share/man/man8/rdma-resource.8 #usr/share/man/man8/rdma.8 #usr/share/man/man8/routef.8 #usr/share/man/man8/routel.8 @@ -111,6 +113,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tc-bpf.8 #usr/share/man/man8/tc-cbq-details.8 #usr/share/man/man8/tc-cbq.8 +#usr/share/man/man8/tc-cbs.8 #usr/share/man/man8/tc-cgroup.8 #usr/share/man/man8/tc-choke.8 #usr/share/man/man8/tc-codel.8 diff --git a/config/rootfiles/common/parted b/config/rootfiles/common/parted index 223a580cb..6e43eeb3a 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.0 +usr/lib/libparted-fs-resize.so.0.0.1 #usr/lib/libparted.a #usr/lib/libparted.la #usr/lib/libparted.so usr/lib/libparted.so.2 -usr/lib/libparted.so.2.0.0 +usr/lib/libparted.so.2.0.1 #usr/lib/pkgconfig/libparted.pc usr/sbin/parted usr/sbin/partprobe diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils index 5bb11a259..da35ef6a1 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.4.1 +lib/libpci.so.3.5.6 sbin/update-pciids #usr/include/pci #usr/include/pci/config.h diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a5ba6ae26..5665f2301 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -101,7 +101,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index f3172f028..9f7c512db 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -10,8 +10,8 @@ etc/unbound/unbound.conf #usr/include/unbound.h #usr/lib/libunbound.la #usr/lib/libunbound.so -usr/lib/libunbound.so.2 -usr/lib/libunbound.so.2.5.11 +usr/lib/libunbound.so.8 +usr/lib/libunbound.so.8.0.0 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/common/x86_64/efibootmgr b/config/rootfiles/common/x86_64/efibootmgr new file mode 100644 index 000000000..56a0eb149 --- /dev/null +++ b/config/rootfiles/common/x86_64/efibootmgr @@ -0,0 +1,4 @@ +usr/sbin/efibootdump +usr/sbin/efibootmgr +#usr/share/man/man8/efibootdump.8 +#usr/share/man/man8/efibootmgr.8 diff --git a/config/rootfiles/common/x86_64/efivar b/config/rootfiles/common/x86_64/efivar new file mode 100644 index 000000000..4018e4c08 --- /dev/null +++ b/config/rootfiles/common/x86_64/efivar @@ -0,0 +1,46 @@ +usr/bin/efivar +#usr/include/efivar +#usr/include/efivar/efiboot-creator.h +#usr/include/efivar/efiboot-loadopt.h +#usr/include/efivar/efiboot.h +#usr/include/efivar/efivar-dp.h +#usr/include/efivar/efivar-guids.h +#usr/include/efivar/efivar.h +#usr/lib/libefiboot.so +usr/lib/libefiboot.so.1 +usr/lib/libefiboot.so.1.35 +#usr/lib/libefivar.so +usr/lib/libefivar.so.1 +usr/lib/libefivar.so.1.35 +#usr/lib/pkgconfig/efiboot.pc +#usr/lib/pkgconfig/efivar.pc +#usr/share/man/man1/efivar.1 +#usr/share/man/man3/efi_append_variable.3 +#usr/share/man/man3/efi_del_variable.3 +#usr/share/man/man3/efi_get_next_variable_name.3 +#usr/share/man/man3/efi_get_variable.3 +#usr/share/man/man3/efi_get_variable_attributes.3 +#usr/share/man/man3/efi_get_variable_size.3 +#usr/share/man/man3/efi_guid_to_id_guid.3 +#usr/share/man/man3/efi_guid_to_name.3 +#usr/share/man/man3/efi_guid_to_str.3 +#usr/share/man/man3/efi_guid_to_symbol.3 +#usr/share/man/man3/efi_name_to_guid.3 +#usr/share/man/man3/efi_set_variable.3 +#usr/share/man/man3/efi_str_to_guid.3 +#usr/share/man/man3/efi_symbol_to_guid.3 +#usr/share/man/man3/efi_variable_alloc.3 +#usr/share/man/man3/efi_variable_export.3 +#usr/share/man/man3/efi_variable_free.3 +#usr/share/man/man3/efi_variable_get_attributes.3 +#usr/share/man/man3/efi_variable_get_data.3 +#usr/share/man/man3/efi_variable_get_guid.3 +#usr/share/man/man3/efi_variable_get_name.3 +#usr/share/man/man3/efi_variable_import.3 +#usr/share/man/man3/efi_variable_realize.3 +#usr/share/man/man3/efi_variable_set_attributes.3 +#usr/share/man/man3/efi_variable_set_data.3 +#usr/share/man/man3/efi_variable_set_guid.3 +#usr/share/man/man3/efi_variable_set_name.3 +#usr/share/man/man3/efi_variable_t.3 +#usr/share/man/man3/efi_variables_supported.3 diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 6cd8a4dca..d64a98819 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -1,7 +1,6 @@ #boot/grub boot/grub/grub.cfg boot/grub/splash.png -boot/grub/unifont.pf2 #etc/bash_completion.d #etc/bash_completion.d/grub etc/default/grub @@ -12,8 +11,7 @@ etc/grub.d/20_linux_xen etc/grub.d/30_os-prober etc/grub.d/40_custom etc/grub.d/41_custom -etc/grub.d/README -etc/grub2.cfg +#etc/grub.d/README usr/bin/grub-editenv usr/bin/grub-file usr/bin/grub-fstest @@ -33,562 +31,1087 @@ usr/bin/grub-script-check usr/bin/grub-syslinux2cfg #usr/lib/grub usr/lib/grub/i386-pc -#usr/lib/grub/i386-pc/acpi.mod -#usr/lib/grub/i386-pc/acpi.module -#usr/lib/grub/i386-pc/adler32.mod -#usr/lib/grub/i386-pc/adler32.module -#usr/lib/grub/i386-pc/affs.mod -#usr/lib/grub/i386-pc/affs.module -#usr/lib/grub/i386-pc/afs.mod -#usr/lib/grub/i386-pc/afs.module -#usr/lib/grub/i386-pc/ahci.mod -#usr/lib/grub/i386-pc/ahci.module -#usr/lib/grub/i386-pc/all_video.mod -#usr/lib/grub/i386-pc/all_video.module -#usr/lib/grub/i386-pc/aout.mod -#usr/lib/grub/i386-pc/aout.module -#usr/lib/grub/i386-pc/archelp.mod -#usr/lib/grub/i386-pc/archelp.module -#usr/lib/grub/i386-pc/at_keyboard.mod -#usr/lib/grub/i386-pc/at_keyboard.module -#usr/lib/grub/i386-pc/ata.mod -#usr/lib/grub/i386-pc/ata.module -#usr/lib/grub/i386-pc/backtrace.mod -#usr/lib/grub/i386-pc/backtrace.module -#usr/lib/grub/i386-pc/bfs.mod -#usr/lib/grub/i386-pc/bfs.module -#usr/lib/grub/i386-pc/biosdisk.mod -#usr/lib/grub/i386-pc/biosdisk.module -#usr/lib/grub/i386-pc/bitmap.mod -#usr/lib/grub/i386-pc/bitmap.module -#usr/lib/grub/i386-pc/bitmap_scale.mod -#usr/lib/grub/i386-pc/bitmap_scale.module -#usr/lib/grub/i386-pc/blocklist.mod -#usr/lib/grub/i386-pc/blocklist.module -#usr/lib/grub/i386-pc/boot.image -#usr/lib/grub/i386-pc/boot.img -#usr/lib/grub/i386-pc/boot.mod -#usr/lib/grub/i386-pc/boot.module -#usr/lib/grub/i386-pc/boot_hybrid.image -#usr/lib/grub/i386-pc/boot_hybrid.img -#usr/lib/grub/i386-pc/bsd.mod -#usr/lib/grub/i386-pc/bsd.module -#usr/lib/grub/i386-pc/bswap_test.mod -#usr/lib/grub/i386-pc/bswap_test.module -#usr/lib/grub/i386-pc/btrfs.mod -#usr/lib/grub/i386-pc/btrfs.module -#usr/lib/grub/i386-pc/bufio.mod -#usr/lib/grub/i386-pc/bufio.module -#usr/lib/grub/i386-pc/cat.mod -#usr/lib/grub/i386-pc/cat.module -#usr/lib/grub/i386-pc/cbfs.mod -#usr/lib/grub/i386-pc/cbfs.module -#usr/lib/grub/i386-pc/cbls.mod -#usr/lib/grub/i386-pc/cbls.module -#usr/lib/grub/i386-pc/cbmemc.mod -#usr/lib/grub/i386-pc/cbmemc.module -#usr/lib/grub/i386-pc/cbtable.mod -#usr/lib/grub/i386-pc/cbtable.module -#usr/lib/grub/i386-pc/cbtime.mod -#usr/lib/grub/i386-pc/cbtime.module -#usr/lib/grub/i386-pc/cdboot.image -#usr/lib/grub/i386-pc/cdboot.img -#usr/lib/grub/i386-pc/chain.mod -#usr/lib/grub/i386-pc/chain.module -#usr/lib/grub/i386-pc/cmdline_cat_test.mod -#usr/lib/grub/i386-pc/cmdline_cat_test.module -#usr/lib/grub/i386-pc/cmosdump.mod -#usr/lib/grub/i386-pc/cmosdump.module -#usr/lib/grub/i386-pc/cmostest.mod -#usr/lib/grub/i386-pc/cmostest.module -#usr/lib/grub/i386-pc/cmp.mod -#usr/lib/grub/i386-pc/cmp.module -#usr/lib/grub/i386-pc/cmp_test.mod -#usr/lib/grub/i386-pc/cmp_test.module -#usr/lib/grub/i386-pc/command.lst -#usr/lib/grub/i386-pc/config.h -#usr/lib/grub/i386-pc/configfile.mod -#usr/lib/grub/i386-pc/configfile.module -#usr/lib/grub/i386-pc/cpio.mod -#usr/lib/grub/i386-pc/cpio.module -#usr/lib/grub/i386-pc/cpio_be.mod -#usr/lib/grub/i386-pc/cpio_be.module -#usr/lib/grub/i386-pc/cpuid.mod -#usr/lib/grub/i386-pc/cpuid.module -#usr/lib/grub/i386-pc/crc64.mod -#usr/lib/grub/i386-pc/crc64.module -#usr/lib/grub/i386-pc/crypto.lst -#usr/lib/grub/i386-pc/crypto.mod -#usr/lib/grub/i386-pc/crypto.module -#usr/lib/grub/i386-pc/cryptodisk.mod -#usr/lib/grub/i386-pc/cryptodisk.module -#usr/lib/grub/i386-pc/cs5536.mod -#usr/lib/grub/i386-pc/cs5536.module -#usr/lib/grub/i386-pc/ctz_test.mod -#usr/lib/grub/i386-pc/ctz_test.module -#usr/lib/grub/i386-pc/date.mod -#usr/lib/grub/i386-pc/date.module -#usr/lib/grub/i386-pc/datehook.mod -#usr/lib/grub/i386-pc/datehook.module -#usr/lib/grub/i386-pc/datetime.mod -#usr/lib/grub/i386-pc/datetime.module -#usr/lib/grub/i386-pc/disk.mod -#usr/lib/grub/i386-pc/disk.module -#usr/lib/grub/i386-pc/diskboot.image -#usr/lib/grub/i386-pc/diskboot.img -#usr/lib/grub/i386-pc/diskfilter.mod -#usr/lib/grub/i386-pc/diskfilter.module -#usr/lib/grub/i386-pc/div.mod -#usr/lib/grub/i386-pc/div.module -#usr/lib/grub/i386-pc/div_test.mod -#usr/lib/grub/i386-pc/div_test.module -#usr/lib/grub/i386-pc/dm_nv.mod -#usr/lib/grub/i386-pc/dm_nv.module -#usr/lib/grub/i386-pc/drivemap.mod -#usr/lib/grub/i386-pc/drivemap.module -#usr/lib/grub/i386-pc/echo.mod -#usr/lib/grub/i386-pc/echo.module -#usr/lib/grub/i386-pc/efiemu.mod -#usr/lib/grub/i386-pc/efiemu.module -#usr/lib/grub/i386-pc/efiemu32.o -#usr/lib/grub/i386-pc/efiemu64.o -#usr/lib/grub/i386-pc/ehci.mod -#usr/lib/grub/i386-pc/ehci.module -#usr/lib/grub/i386-pc/elf.mod -#usr/lib/grub/i386-pc/elf.module -#usr/lib/grub/i386-pc/eval.mod -#usr/lib/grub/i386-pc/eval.module -#usr/lib/grub/i386-pc/exfat.mod -#usr/lib/grub/i386-pc/exfat.module -#usr/lib/grub/i386-pc/exfctest.mod -#usr/lib/grub/i386-pc/exfctest.module -#usr/lib/grub/i386-pc/ext2.mod -#usr/lib/grub/i386-pc/ext2.module -#usr/lib/grub/i386-pc/extcmd.mod -#usr/lib/grub/i386-pc/extcmd.module -#usr/lib/grub/i386-pc/fat.mod -#usr/lib/grub/i386-pc/fat.module -#usr/lib/grub/i386-pc/file.mod -#usr/lib/grub/i386-pc/file.module -#usr/lib/grub/i386-pc/font.mod -#usr/lib/grub/i386-pc/font.module -#usr/lib/grub/i386-pc/freedos.mod -#usr/lib/grub/i386-pc/freedos.module -#usr/lib/grub/i386-pc/fs.lst -#usr/lib/grub/i386-pc/fshelp.mod -#usr/lib/grub/i386-pc/fshelp.module -#usr/lib/grub/i386-pc/functional_test.mod -#usr/lib/grub/i386-pc/functional_test.module -#usr/lib/grub/i386-pc/gcry_arcfour.mod -#usr/lib/grub/i386-pc/gcry_arcfour.module -#usr/lib/grub/i386-pc/gcry_blowfish.mod -#usr/lib/grub/i386-pc/gcry_blowfish.module -#usr/lib/grub/i386-pc/gcry_camellia.mod -#usr/lib/grub/i386-pc/gcry_camellia.module -#usr/lib/grub/i386-pc/gcry_cast5.mod -#usr/lib/grub/i386-pc/gcry_cast5.module -#usr/lib/grub/i386-pc/gcry_crc.mod -#usr/lib/grub/i386-pc/gcry_crc.module -#usr/lib/grub/i386-pc/gcry_des.mod -#usr/lib/grub/i386-pc/gcry_des.module -#usr/lib/grub/i386-pc/gcry_dsa.mod -#usr/lib/grub/i386-pc/gcry_dsa.module -#usr/lib/grub/i386-pc/gcry_idea.mod -#usr/lib/grub/i386-pc/gcry_idea.module -#usr/lib/grub/i386-pc/gcry_md4.mod -#usr/lib/grub/i386-pc/gcry_md4.module -#usr/lib/grub/i386-pc/gcry_md5.mod -#usr/lib/grub/i386-pc/gcry_md5.module -#usr/lib/grub/i386-pc/gcry_rfc2268.mod -#usr/lib/grub/i386-pc/gcry_rfc2268.module -#usr/lib/grub/i386-pc/gcry_rijndael.mod -#usr/lib/grub/i386-pc/gcry_rijndael.module -#usr/lib/grub/i386-pc/gcry_rmd160.mod -#usr/lib/grub/i386-pc/gcry_rmd160.module -#usr/lib/grub/i386-pc/gcry_rsa.mod -#usr/lib/grub/i386-pc/gcry_rsa.module -#usr/lib/grub/i386-pc/gcry_seed.mod -#usr/lib/grub/i386-pc/gcry_seed.module -#usr/lib/grub/i386-pc/gcry_serpent.mod -#usr/lib/grub/i386-pc/gcry_serpent.module -#usr/lib/grub/i386-pc/gcry_sha1.mod -#usr/lib/grub/i386-pc/gcry_sha1.module -#usr/lib/grub/i386-pc/gcry_sha256.mod -#usr/lib/grub/i386-pc/gcry_sha256.module -#usr/lib/grub/i386-pc/gcry_sha512.mod -#usr/lib/grub/i386-pc/gcry_sha512.module -#usr/lib/grub/i386-pc/gcry_tiger.mod -#usr/lib/grub/i386-pc/gcry_tiger.module -#usr/lib/grub/i386-pc/gcry_twofish.mod -#usr/lib/grub/i386-pc/gcry_twofish.module -#usr/lib/grub/i386-pc/gcry_whirlpool.mod -#usr/lib/grub/i386-pc/gcry_whirlpool.module -#usr/lib/grub/i386-pc/gdb.mod -#usr/lib/grub/i386-pc/gdb.module -#usr/lib/grub/i386-pc/gdb_grub -#usr/lib/grub/i386-pc/geli.mod -#usr/lib/grub/i386-pc/geli.module -#usr/lib/grub/i386-pc/gettext.mod -#usr/lib/grub/i386-pc/gettext.module -#usr/lib/grub/i386-pc/gfxmenu.mod -#usr/lib/grub/i386-pc/gfxmenu.module -#usr/lib/grub/i386-pc/gfxterm.mod -#usr/lib/grub/i386-pc/gfxterm.module -#usr/lib/grub/i386-pc/gfxterm_background.mod -#usr/lib/grub/i386-pc/gfxterm_background.module -#usr/lib/grub/i386-pc/gfxterm_menu.mod -#usr/lib/grub/i386-pc/gfxterm_menu.module -#usr/lib/grub/i386-pc/gmodule.pl -#usr/lib/grub/i386-pc/gptsync.mod -#usr/lib/grub/i386-pc/gptsync.module -#usr/lib/grub/i386-pc/gzio.mod -#usr/lib/grub/i386-pc/gzio.module -#usr/lib/grub/i386-pc/halt.mod -#usr/lib/grub/i386-pc/halt.module -#usr/lib/grub/i386-pc/hashsum.mod -#usr/lib/grub/i386-pc/hashsum.module -#usr/lib/grub/i386-pc/hdparm.mod -#usr/lib/grub/i386-pc/hdparm.module -#usr/lib/grub/i386-pc/hello.mod -#usr/lib/grub/i386-pc/hello.module -#usr/lib/grub/i386-pc/help.mod -#usr/lib/grub/i386-pc/help.module -#usr/lib/grub/i386-pc/hexdump.mod -#usr/lib/grub/i386-pc/hexdump.module -#usr/lib/grub/i386-pc/hfs.mod -#usr/lib/grub/i386-pc/hfs.module -#usr/lib/grub/i386-pc/hfsplus.mod -#usr/lib/grub/i386-pc/hfsplus.module -#usr/lib/grub/i386-pc/hfspluscomp.mod -#usr/lib/grub/i386-pc/hfspluscomp.module -#usr/lib/grub/i386-pc/http.mod -#usr/lib/grub/i386-pc/http.module -#usr/lib/grub/i386-pc/iorw.mod -#usr/lib/grub/i386-pc/iorw.module -#usr/lib/grub/i386-pc/iso9660.mod -#usr/lib/grub/i386-pc/iso9660.module -#usr/lib/grub/i386-pc/jfs.mod -#usr/lib/grub/i386-pc/jfs.module -#usr/lib/grub/i386-pc/jpeg.mod -#usr/lib/grub/i386-pc/jpeg.module -#usr/lib/grub/i386-pc/kernel.exec -#usr/lib/grub/i386-pc/kernel.img -#usr/lib/grub/i386-pc/keylayouts.mod -#usr/lib/grub/i386-pc/keylayouts.module -#usr/lib/grub/i386-pc/keystatus.mod -#usr/lib/grub/i386-pc/keystatus.module -#usr/lib/grub/i386-pc/ldm.mod -#usr/lib/grub/i386-pc/ldm.module -#usr/lib/grub/i386-pc/legacy_password_test.mod -#usr/lib/grub/i386-pc/legacy_password_test.module -#usr/lib/grub/i386-pc/legacycfg.mod -#usr/lib/grub/i386-pc/legacycfg.module -#usr/lib/grub/i386-pc/linux.mod -#usr/lib/grub/i386-pc/linux.module -#usr/lib/grub/i386-pc/linux16.mod -#usr/lib/grub/i386-pc/linux16.module -#usr/lib/grub/i386-pc/lnxboot.image -#usr/lib/grub/i386-pc/lnxboot.img -#usr/lib/grub/i386-pc/loadenv.mod -#usr/lib/grub/i386-pc/loadenv.module -#usr/lib/grub/i386-pc/loopback.mod -#usr/lib/grub/i386-pc/loopback.module -#usr/lib/grub/i386-pc/ls.mod -#usr/lib/grub/i386-pc/ls.module -#usr/lib/grub/i386-pc/lsacpi.mod -#usr/lib/grub/i386-pc/lsacpi.module -#usr/lib/grub/i386-pc/lsapm.mod -#usr/lib/grub/i386-pc/lsapm.module -#usr/lib/grub/i386-pc/lsmmap.mod -#usr/lib/grub/i386-pc/lsmmap.module -#usr/lib/grub/i386-pc/lspci.mod -#usr/lib/grub/i386-pc/lspci.module -#usr/lib/grub/i386-pc/luks.mod -#usr/lib/grub/i386-pc/luks.module -#usr/lib/grub/i386-pc/lvm.mod -#usr/lib/grub/i386-pc/lvm.module -#usr/lib/grub/i386-pc/lzma_decompress.image -#usr/lib/grub/i386-pc/lzma_decompress.img -#usr/lib/grub/i386-pc/lzopio.mod -#usr/lib/grub/i386-pc/lzopio.module -#usr/lib/grub/i386-pc/macbless.mod -#usr/lib/grub/i386-pc/macbless.module -#usr/lib/grub/i386-pc/macho.mod -#usr/lib/grub/i386-pc/macho.module -#usr/lib/grub/i386-pc/mda_text.mod -#usr/lib/grub/i386-pc/mda_text.module -#usr/lib/grub/i386-pc/mdraid09.mod -#usr/lib/grub/i386-pc/mdraid09.module -#usr/lib/grub/i386-pc/mdraid09_be.mod -#usr/lib/grub/i386-pc/mdraid09_be.module -#usr/lib/grub/i386-pc/mdraid1x.mod -#usr/lib/grub/i386-pc/mdraid1x.module -#usr/lib/grub/i386-pc/memdisk.mod -#usr/lib/grub/i386-pc/memdisk.module -#usr/lib/grub/i386-pc/memrw.mod -#usr/lib/grub/i386-pc/memrw.module -#usr/lib/grub/i386-pc/minicmd.mod -#usr/lib/grub/i386-pc/minicmd.module -#usr/lib/grub/i386-pc/minix.mod -#usr/lib/grub/i386-pc/minix.module -#usr/lib/grub/i386-pc/minix2.mod -#usr/lib/grub/i386-pc/minix2.module -#usr/lib/grub/i386-pc/minix2_be.mod -#usr/lib/grub/i386-pc/minix2_be.module -#usr/lib/grub/i386-pc/minix3.mod -#usr/lib/grub/i386-pc/minix3.module -#usr/lib/grub/i386-pc/minix3_be.mod -#usr/lib/grub/i386-pc/minix3_be.module -#usr/lib/grub/i386-pc/minix_be.mod -#usr/lib/grub/i386-pc/minix_be.module -#usr/lib/grub/i386-pc/mmap.mod -#usr/lib/grub/i386-pc/mmap.module -#usr/lib/grub/i386-pc/moddep.lst -#usr/lib/grub/i386-pc/modinfo.sh -#usr/lib/grub/i386-pc/morse.mod -#usr/lib/grub/i386-pc/morse.module -#usr/lib/grub/i386-pc/mpi.mod -#usr/lib/grub/i386-pc/mpi.module -#usr/lib/grub/i386-pc/msdospart.mod -#usr/lib/grub/i386-pc/msdospart.module -#usr/lib/grub/i386-pc/mul_test.mod -#usr/lib/grub/i386-pc/mul_test.module -#usr/lib/grub/i386-pc/multiboot.mod -#usr/lib/grub/i386-pc/multiboot.module -#usr/lib/grub/i386-pc/multiboot2.mod -#usr/lib/grub/i386-pc/multiboot2.module -#usr/lib/grub/i386-pc/nativedisk.mod -#usr/lib/grub/i386-pc/nativedisk.module -#usr/lib/grub/i386-pc/net.mod -#usr/lib/grub/i386-pc/net.module -#usr/lib/grub/i386-pc/newc.mod -#usr/lib/grub/i386-pc/newc.module -#usr/lib/grub/i386-pc/nilfs2.mod -#usr/lib/grub/i386-pc/nilfs2.module -#usr/lib/grub/i386-pc/normal.mod -#usr/lib/grub/i386-pc/normal.module -#usr/lib/grub/i386-pc/ntfs.mod -#usr/lib/grub/i386-pc/ntfs.module -#usr/lib/grub/i386-pc/ntfscomp.mod -#usr/lib/grub/i386-pc/ntfscomp.module -#usr/lib/grub/i386-pc/ntldr.mod -#usr/lib/grub/i386-pc/ntldr.module -#usr/lib/grub/i386-pc/odc.mod -#usr/lib/grub/i386-pc/odc.module -#usr/lib/grub/i386-pc/offsetio.mod -#usr/lib/grub/i386-pc/offsetio.module -#usr/lib/grub/i386-pc/ohci.mod -#usr/lib/grub/i386-pc/ohci.module -#usr/lib/grub/i386-pc/part_acorn.mod -#usr/lib/grub/i386-pc/part_acorn.module -#usr/lib/grub/i386-pc/part_amiga.mod -#usr/lib/grub/i386-pc/part_amiga.module -#usr/lib/grub/i386-pc/part_apple.mod -#usr/lib/grub/i386-pc/part_apple.module -#usr/lib/grub/i386-pc/part_bsd.mod -#usr/lib/grub/i386-pc/part_bsd.module -#usr/lib/grub/i386-pc/part_dfly.mod -#usr/lib/grub/i386-pc/part_dfly.module -#usr/lib/grub/i386-pc/part_dvh.mod -#usr/lib/grub/i386-pc/part_dvh.module -#usr/lib/grub/i386-pc/part_gpt.mod -#usr/lib/grub/i386-pc/part_gpt.module -#usr/lib/grub/i386-pc/part_msdos.mod -#usr/lib/grub/i386-pc/part_msdos.module -#usr/lib/grub/i386-pc/part_plan.mod -#usr/lib/grub/i386-pc/part_plan.module -#usr/lib/grub/i386-pc/part_sun.mod -#usr/lib/grub/i386-pc/part_sun.module -#usr/lib/grub/i386-pc/part_sunpc.mod -#usr/lib/grub/i386-pc/part_sunpc.module -#usr/lib/grub/i386-pc/partmap.lst -#usr/lib/grub/i386-pc/parttool.lst -#usr/lib/grub/i386-pc/parttool.mod -#usr/lib/grub/i386-pc/parttool.module -#usr/lib/grub/i386-pc/password.mod -#usr/lib/grub/i386-pc/password.module -#usr/lib/grub/i386-pc/password_pbkdf2.mod -#usr/lib/grub/i386-pc/password_pbkdf2.module -#usr/lib/grub/i386-pc/pata.mod -#usr/lib/grub/i386-pc/pata.module -#usr/lib/grub/i386-pc/pbkdf2.mod -#usr/lib/grub/i386-pc/pbkdf2.module -#usr/lib/grub/i386-pc/pbkdf2_test.mod -#usr/lib/grub/i386-pc/pbkdf2_test.module -#usr/lib/grub/i386-pc/pci.mod -#usr/lib/grub/i386-pc/pci.module -#usr/lib/grub/i386-pc/pcidump.mod -#usr/lib/grub/i386-pc/pcidump.module -#usr/lib/grub/i386-pc/plan9.mod -#usr/lib/grub/i386-pc/plan9.module -#usr/lib/grub/i386-pc/play.mod -#usr/lib/grub/i386-pc/play.module -#usr/lib/grub/i386-pc/png.mod -#usr/lib/grub/i386-pc/png.module -#usr/lib/grub/i386-pc/priority_queue.mod -#usr/lib/grub/i386-pc/priority_queue.module -#usr/lib/grub/i386-pc/probe.mod -#usr/lib/grub/i386-pc/probe.module -#usr/lib/grub/i386-pc/procfs.mod -#usr/lib/grub/i386-pc/procfs.module -#usr/lib/grub/i386-pc/progress.mod -#usr/lib/grub/i386-pc/progress.module -#usr/lib/grub/i386-pc/pxe.mod -#usr/lib/grub/i386-pc/pxe.module -#usr/lib/grub/i386-pc/pxeboot.image -#usr/lib/grub/i386-pc/pxeboot.img -#usr/lib/grub/i386-pc/pxechain.mod -#usr/lib/grub/i386-pc/pxechain.module -#usr/lib/grub/i386-pc/raid5rec.mod -#usr/lib/grub/i386-pc/raid5rec.module -#usr/lib/grub/i386-pc/raid6rec.mod -#usr/lib/grub/i386-pc/raid6rec.module -#usr/lib/grub/i386-pc/random.mod -#usr/lib/grub/i386-pc/random.module -#usr/lib/grub/i386-pc/read.mod -#usr/lib/grub/i386-pc/read.module -#usr/lib/grub/i386-pc/reboot.mod -#usr/lib/grub/i386-pc/reboot.module -#usr/lib/grub/i386-pc/regexp.mod -#usr/lib/grub/i386-pc/regexp.module -#usr/lib/grub/i386-pc/reiserfs.mod -#usr/lib/grub/i386-pc/reiserfs.module -#usr/lib/grub/i386-pc/relocator.mod -#usr/lib/grub/i386-pc/relocator.module -#usr/lib/grub/i386-pc/romfs.mod -#usr/lib/grub/i386-pc/romfs.module -#usr/lib/grub/i386-pc/scsi.mod -#usr/lib/grub/i386-pc/scsi.module -#usr/lib/grub/i386-pc/search.mod -#usr/lib/grub/i386-pc/search.module -#usr/lib/grub/i386-pc/search_fs_file.mod -#usr/lib/grub/i386-pc/search_fs_file.module -#usr/lib/grub/i386-pc/search_fs_uuid.mod -#usr/lib/grub/i386-pc/search_fs_uuid.module -#usr/lib/grub/i386-pc/search_label.mod -#usr/lib/grub/i386-pc/search_label.module -#usr/lib/grub/i386-pc/sendkey.mod -#usr/lib/grub/i386-pc/sendkey.module -#usr/lib/grub/i386-pc/serial.mod -#usr/lib/grub/i386-pc/serial.module -#usr/lib/grub/i386-pc/setjmp.mod -#usr/lib/grub/i386-pc/setjmp.module -#usr/lib/grub/i386-pc/setjmp_test.mod -#usr/lib/grub/i386-pc/setjmp_test.module -#usr/lib/grub/i386-pc/setpci.mod -#usr/lib/grub/i386-pc/setpci.module -#usr/lib/grub/i386-pc/sfs.mod -#usr/lib/grub/i386-pc/sfs.module -#usr/lib/grub/i386-pc/shift_test.mod -#usr/lib/grub/i386-pc/shift_test.module -#usr/lib/grub/i386-pc/signature_test.mod -#usr/lib/grub/i386-pc/signature_test.module -#usr/lib/grub/i386-pc/sleep.mod -#usr/lib/grub/i386-pc/sleep.module -#usr/lib/grub/i386-pc/sleep_test.mod -#usr/lib/grub/i386-pc/sleep_test.module -#usr/lib/grub/i386-pc/spkmodem.mod -#usr/lib/grub/i386-pc/spkmodem.module -#usr/lib/grub/i386-pc/squash4.mod -#usr/lib/grub/i386-pc/squash4.module -#usr/lib/grub/i386-pc/syslinuxcfg.mod -#usr/lib/grub/i386-pc/syslinuxcfg.module -#usr/lib/grub/i386-pc/tar.mod -#usr/lib/grub/i386-pc/tar.module -#usr/lib/grub/i386-pc/terminal.lst -#usr/lib/grub/i386-pc/terminal.mod -#usr/lib/grub/i386-pc/terminal.module -#usr/lib/grub/i386-pc/terminfo.mod -#usr/lib/grub/i386-pc/terminfo.module -#usr/lib/grub/i386-pc/test.mod -#usr/lib/grub/i386-pc/test.module -#usr/lib/grub/i386-pc/test_blockarg.mod -#usr/lib/grub/i386-pc/test_blockarg.module -#usr/lib/grub/i386-pc/testload.mod -#usr/lib/grub/i386-pc/testload.module -#usr/lib/grub/i386-pc/testspeed.mod -#usr/lib/grub/i386-pc/testspeed.module -#usr/lib/grub/i386-pc/tftp.mod -#usr/lib/grub/i386-pc/tftp.module -#usr/lib/grub/i386-pc/tga.mod -#usr/lib/grub/i386-pc/tga.module -#usr/lib/grub/i386-pc/time.mod -#usr/lib/grub/i386-pc/time.module -#usr/lib/grub/i386-pc/tr.mod -#usr/lib/grub/i386-pc/tr.module -#usr/lib/grub/i386-pc/trig.mod -#usr/lib/grub/i386-pc/trig.module -#usr/lib/grub/i386-pc/true.mod -#usr/lib/grub/i386-pc/true.module -#usr/lib/grub/i386-pc/truecrypt.mod -#usr/lib/grub/i386-pc/truecrypt.module -#usr/lib/grub/i386-pc/udf.mod -#usr/lib/grub/i386-pc/udf.module -#usr/lib/grub/i386-pc/ufs1.mod -#usr/lib/grub/i386-pc/ufs1.module -#usr/lib/grub/i386-pc/ufs1_be.mod -#usr/lib/grub/i386-pc/ufs1_be.module -#usr/lib/grub/i386-pc/ufs2.mod -#usr/lib/grub/i386-pc/ufs2.module -#usr/lib/grub/i386-pc/uhci.mod -#usr/lib/grub/i386-pc/uhci.module -#usr/lib/grub/i386-pc/usb.mod -#usr/lib/grub/i386-pc/usb.module -#usr/lib/grub/i386-pc/usb_keyboard.mod -#usr/lib/grub/i386-pc/usb_keyboard.module -#usr/lib/grub/i386-pc/usbms.mod -#usr/lib/grub/i386-pc/usbms.module -#usr/lib/grub/i386-pc/usbserial_common.mod -#usr/lib/grub/i386-pc/usbserial_common.module -#usr/lib/grub/i386-pc/usbserial_ftdi.mod -#usr/lib/grub/i386-pc/usbserial_ftdi.module -#usr/lib/grub/i386-pc/usbserial_pl2303.mod -#usr/lib/grub/i386-pc/usbserial_pl2303.module -#usr/lib/grub/i386-pc/usbserial_usbdebug.mod -#usr/lib/grub/i386-pc/usbserial_usbdebug.module -#usr/lib/grub/i386-pc/usbtest.mod -#usr/lib/grub/i386-pc/usbtest.module -#usr/lib/grub/i386-pc/vbe.mod -#usr/lib/grub/i386-pc/vbe.module -#usr/lib/grub/i386-pc/verify.mod -#usr/lib/grub/i386-pc/verify.module -#usr/lib/grub/i386-pc/vga.mod -#usr/lib/grub/i386-pc/vga.module -#usr/lib/grub/i386-pc/vga_text.mod -#usr/lib/grub/i386-pc/vga_text.module -#usr/lib/grub/i386-pc/video.lst -#usr/lib/grub/i386-pc/video.mod -#usr/lib/grub/i386-pc/video.module -#usr/lib/grub/i386-pc/video_bochs.mod -#usr/lib/grub/i386-pc/video_bochs.module -#usr/lib/grub/i386-pc/video_cirrus.mod -#usr/lib/grub/i386-pc/video_cirrus.module -#usr/lib/grub/i386-pc/video_colors.mod -#usr/lib/grub/i386-pc/video_colors.module -#usr/lib/grub/i386-pc/video_fb.mod -#usr/lib/grub/i386-pc/video_fb.module -#usr/lib/grub/i386-pc/videoinfo.mod -#usr/lib/grub/i386-pc/videoinfo.module -#usr/lib/grub/i386-pc/videotest.mod -#usr/lib/grub/i386-pc/videotest.module -#usr/lib/grub/i386-pc/videotest_checksum.mod -#usr/lib/grub/i386-pc/videotest_checksum.module -#usr/lib/grub/i386-pc/xfs.mod -#usr/lib/grub/i386-pc/xfs.module -#usr/lib/grub/i386-pc/xnu.mod -#usr/lib/grub/i386-pc/xnu.module -#usr/lib/grub/i386-pc/xnu_uuid.mod -#usr/lib/grub/i386-pc/xnu_uuid.module -#usr/lib/grub/i386-pc/xnu_uuid_test.mod -#usr/lib/grub/i386-pc/xnu_uuid_test.module -#usr/lib/grub/i386-pc/xzio.mod -#usr/lib/grub/i386-pc/xzio.module -#usr/lib/grub/i386-pc/zfs.mod -#usr/lib/grub/i386-pc/zfs.module -#usr/lib/grub/i386-pc/zfscrypt.mod -#usr/lib/grub/i386-pc/zfscrypt.module -#usr/lib/grub/i386-pc/zfsinfo.mod -#usr/lib/grub/i386-pc/zfsinfo.module +usr/lib/grub/i386-pc/acpi.mod +usr/lib/grub/i386-pc/acpi.module +usr/lib/grub/i386-pc/adler32.mod +usr/lib/grub/i386-pc/adler32.module +usr/lib/grub/i386-pc/affs.mod +usr/lib/grub/i386-pc/affs.module +usr/lib/grub/i386-pc/afs.mod +usr/lib/grub/i386-pc/afs.module +usr/lib/grub/i386-pc/ahci.mod +usr/lib/grub/i386-pc/ahci.module +usr/lib/grub/i386-pc/all_video.mod +usr/lib/grub/i386-pc/all_video.module +usr/lib/grub/i386-pc/aout.mod +usr/lib/grub/i386-pc/aout.module +usr/lib/grub/i386-pc/archelp.mod +usr/lib/grub/i386-pc/archelp.module +usr/lib/grub/i386-pc/at_keyboard.mod +usr/lib/grub/i386-pc/at_keyboard.module +usr/lib/grub/i386-pc/ata.mod +usr/lib/grub/i386-pc/ata.module +usr/lib/grub/i386-pc/backtrace.mod +usr/lib/grub/i386-pc/backtrace.module +usr/lib/grub/i386-pc/bfs.mod +usr/lib/grub/i386-pc/bfs.module +usr/lib/grub/i386-pc/biosdisk.mod +usr/lib/grub/i386-pc/biosdisk.module +usr/lib/grub/i386-pc/bitmap.mod +usr/lib/grub/i386-pc/bitmap.module +usr/lib/grub/i386-pc/bitmap_scale.mod +usr/lib/grub/i386-pc/bitmap_scale.module +usr/lib/grub/i386-pc/blocklist.mod +usr/lib/grub/i386-pc/blocklist.module +usr/lib/grub/i386-pc/boot.image +usr/lib/grub/i386-pc/boot.img +usr/lib/grub/i386-pc/boot.mod +usr/lib/grub/i386-pc/boot.module +usr/lib/grub/i386-pc/boot_hybrid.image +usr/lib/grub/i386-pc/boot_hybrid.img +usr/lib/grub/i386-pc/bsd.mod +usr/lib/grub/i386-pc/bsd.module +usr/lib/grub/i386-pc/bswap_test.mod +usr/lib/grub/i386-pc/bswap_test.module +usr/lib/grub/i386-pc/btrfs.mod +usr/lib/grub/i386-pc/btrfs.module +usr/lib/grub/i386-pc/bufio.mod +usr/lib/grub/i386-pc/bufio.module +usr/lib/grub/i386-pc/cat.mod +usr/lib/grub/i386-pc/cat.module +usr/lib/grub/i386-pc/cbfs.mod +usr/lib/grub/i386-pc/cbfs.module +usr/lib/grub/i386-pc/cbls.mod +usr/lib/grub/i386-pc/cbls.module +usr/lib/grub/i386-pc/cbmemc.mod +usr/lib/grub/i386-pc/cbmemc.module +usr/lib/grub/i386-pc/cbtable.mod +usr/lib/grub/i386-pc/cbtable.module +usr/lib/grub/i386-pc/cbtime.mod +usr/lib/grub/i386-pc/cbtime.module +usr/lib/grub/i386-pc/cdboot.image +usr/lib/grub/i386-pc/cdboot.img +usr/lib/grub/i386-pc/chain.mod +usr/lib/grub/i386-pc/chain.module +usr/lib/grub/i386-pc/cmdline_cat_test.mod +usr/lib/grub/i386-pc/cmdline_cat_test.module +usr/lib/grub/i386-pc/cmosdump.mod +usr/lib/grub/i386-pc/cmosdump.module +usr/lib/grub/i386-pc/cmostest.mod +usr/lib/grub/i386-pc/cmostest.module +usr/lib/grub/i386-pc/cmp.mod +usr/lib/grub/i386-pc/cmp.module +usr/lib/grub/i386-pc/cmp_test.mod +usr/lib/grub/i386-pc/cmp_test.module +usr/lib/grub/i386-pc/command.lst +usr/lib/grub/i386-pc/config.h +usr/lib/grub/i386-pc/configfile.mod +usr/lib/grub/i386-pc/configfile.module +usr/lib/grub/i386-pc/cpio.mod +usr/lib/grub/i386-pc/cpio.module +usr/lib/grub/i386-pc/cpio_be.mod +usr/lib/grub/i386-pc/cpio_be.module +usr/lib/grub/i386-pc/cpuid.mod +usr/lib/grub/i386-pc/cpuid.module +usr/lib/grub/i386-pc/crc64.mod +usr/lib/grub/i386-pc/crc64.module +usr/lib/grub/i386-pc/crypto.lst +usr/lib/grub/i386-pc/crypto.mod +usr/lib/grub/i386-pc/crypto.module +usr/lib/grub/i386-pc/cryptodisk.mod +usr/lib/grub/i386-pc/cryptodisk.module +usr/lib/grub/i386-pc/cs5536.mod +usr/lib/grub/i386-pc/cs5536.module +usr/lib/grub/i386-pc/ctz_test.mod +usr/lib/grub/i386-pc/ctz_test.module +usr/lib/grub/i386-pc/date.mod +usr/lib/grub/i386-pc/date.module +usr/lib/grub/i386-pc/datehook.mod +usr/lib/grub/i386-pc/datehook.module +usr/lib/grub/i386-pc/datetime.mod +usr/lib/grub/i386-pc/datetime.module +usr/lib/grub/i386-pc/disk.mod +usr/lib/grub/i386-pc/disk.module +usr/lib/grub/i386-pc/diskboot.image +usr/lib/grub/i386-pc/diskboot.img +usr/lib/grub/i386-pc/diskfilter.mod +usr/lib/grub/i386-pc/diskfilter.module +usr/lib/grub/i386-pc/div.mod +usr/lib/grub/i386-pc/div.module +usr/lib/grub/i386-pc/div_test.mod +usr/lib/grub/i386-pc/div_test.module +usr/lib/grub/i386-pc/dm_nv.mod +usr/lib/grub/i386-pc/dm_nv.module +usr/lib/grub/i386-pc/drivemap.mod +usr/lib/grub/i386-pc/drivemap.module +usr/lib/grub/i386-pc/echo.mod +usr/lib/grub/i386-pc/echo.module +usr/lib/grub/i386-pc/efiemu.mod +usr/lib/grub/i386-pc/efiemu.module +usr/lib/grub/i386-pc/efiemu32.o +usr/lib/grub/i386-pc/efiemu64.o +usr/lib/grub/i386-pc/ehci.mod +usr/lib/grub/i386-pc/ehci.module +usr/lib/grub/i386-pc/elf.mod +usr/lib/grub/i386-pc/elf.module +usr/lib/grub/i386-pc/eval.mod +usr/lib/grub/i386-pc/eval.module +usr/lib/grub/i386-pc/exfat.mod +usr/lib/grub/i386-pc/exfat.module +usr/lib/grub/i386-pc/exfctest.mod +usr/lib/grub/i386-pc/exfctest.module +usr/lib/grub/i386-pc/ext2.mod +usr/lib/grub/i386-pc/ext2.module +usr/lib/grub/i386-pc/extcmd.mod +usr/lib/grub/i386-pc/extcmd.module +usr/lib/grub/i386-pc/fat.mod +usr/lib/grub/i386-pc/fat.module +usr/lib/grub/i386-pc/file.mod +usr/lib/grub/i386-pc/file.module +usr/lib/grub/i386-pc/font.mod +usr/lib/grub/i386-pc/font.module +usr/lib/grub/i386-pc/freedos.mod +usr/lib/grub/i386-pc/freedos.module +usr/lib/grub/i386-pc/fs.lst +usr/lib/grub/i386-pc/fshelp.mod +usr/lib/grub/i386-pc/fshelp.module +usr/lib/grub/i386-pc/functional_test.mod +usr/lib/grub/i386-pc/functional_test.module +usr/lib/grub/i386-pc/gcry_arcfour.mod +usr/lib/grub/i386-pc/gcry_arcfour.module +usr/lib/grub/i386-pc/gcry_blowfish.mod +usr/lib/grub/i386-pc/gcry_blowfish.module +usr/lib/grub/i386-pc/gcry_camellia.mod +usr/lib/grub/i386-pc/gcry_camellia.module +usr/lib/grub/i386-pc/gcry_cast5.mod +usr/lib/grub/i386-pc/gcry_cast5.module +usr/lib/grub/i386-pc/gcry_crc.mod +usr/lib/grub/i386-pc/gcry_crc.module +usr/lib/grub/i386-pc/gcry_des.mod +usr/lib/grub/i386-pc/gcry_des.module +usr/lib/grub/i386-pc/gcry_dsa.mod +usr/lib/grub/i386-pc/gcry_dsa.module +usr/lib/grub/i386-pc/gcry_idea.mod +usr/lib/grub/i386-pc/gcry_idea.module +usr/lib/grub/i386-pc/gcry_md4.mod +usr/lib/grub/i386-pc/gcry_md4.module +usr/lib/grub/i386-pc/gcry_md5.mod +usr/lib/grub/i386-pc/gcry_md5.module +usr/lib/grub/i386-pc/gcry_rfc2268.mod +usr/lib/grub/i386-pc/gcry_rfc2268.module +usr/lib/grub/i386-pc/gcry_rijndael.mod +usr/lib/grub/i386-pc/gcry_rijndael.module +usr/lib/grub/i386-pc/gcry_rmd160.mod +usr/lib/grub/i386-pc/gcry_rmd160.module +usr/lib/grub/i386-pc/gcry_rsa.mod +usr/lib/grub/i386-pc/gcry_rsa.module +usr/lib/grub/i386-pc/gcry_seed.mod +usr/lib/grub/i386-pc/gcry_seed.module +usr/lib/grub/i386-pc/gcry_serpent.mod +usr/lib/grub/i386-pc/gcry_serpent.module +usr/lib/grub/i386-pc/gcry_sha1.mod +usr/lib/grub/i386-pc/gcry_sha1.module +usr/lib/grub/i386-pc/gcry_sha256.mod +usr/lib/grub/i386-pc/gcry_sha256.module +usr/lib/grub/i386-pc/gcry_sha512.mod +usr/lib/grub/i386-pc/gcry_sha512.module +usr/lib/grub/i386-pc/gcry_tiger.mod +usr/lib/grub/i386-pc/gcry_tiger.module +usr/lib/grub/i386-pc/gcry_twofish.mod +usr/lib/grub/i386-pc/gcry_twofish.module +usr/lib/grub/i386-pc/gcry_whirlpool.mod +usr/lib/grub/i386-pc/gcry_whirlpool.module +usr/lib/grub/i386-pc/gdb.mod +usr/lib/grub/i386-pc/gdb.module +usr/lib/grub/i386-pc/gdb_grub +usr/lib/grub/i386-pc/geli.mod +usr/lib/grub/i386-pc/geli.module +usr/lib/grub/i386-pc/gettext.mod +usr/lib/grub/i386-pc/gettext.module +usr/lib/grub/i386-pc/gfxmenu.mod +usr/lib/grub/i386-pc/gfxmenu.module +usr/lib/grub/i386-pc/gfxterm.mod +usr/lib/grub/i386-pc/gfxterm.module +usr/lib/grub/i386-pc/gfxterm_background.mod +usr/lib/grub/i386-pc/gfxterm_background.module +usr/lib/grub/i386-pc/gfxterm_menu.mod +usr/lib/grub/i386-pc/gfxterm_menu.module +usr/lib/grub/i386-pc/gmodule.pl +usr/lib/grub/i386-pc/gptsync.mod +usr/lib/grub/i386-pc/gptsync.module +usr/lib/grub/i386-pc/gzio.mod +usr/lib/grub/i386-pc/gzio.module +usr/lib/grub/i386-pc/halt.mod +usr/lib/grub/i386-pc/halt.module +usr/lib/grub/i386-pc/hashsum.mod +usr/lib/grub/i386-pc/hashsum.module +usr/lib/grub/i386-pc/hdparm.mod +usr/lib/grub/i386-pc/hdparm.module +usr/lib/grub/i386-pc/hello.mod +usr/lib/grub/i386-pc/hello.module +usr/lib/grub/i386-pc/help.mod +usr/lib/grub/i386-pc/help.module +usr/lib/grub/i386-pc/hexdump.mod +usr/lib/grub/i386-pc/hexdump.module +usr/lib/grub/i386-pc/hfs.mod +usr/lib/grub/i386-pc/hfs.module +usr/lib/grub/i386-pc/hfsplus.mod +usr/lib/grub/i386-pc/hfsplus.module +usr/lib/grub/i386-pc/hfspluscomp.mod +usr/lib/grub/i386-pc/hfspluscomp.module +usr/lib/grub/i386-pc/http.mod +usr/lib/grub/i386-pc/http.module +usr/lib/grub/i386-pc/iorw.mod +usr/lib/grub/i386-pc/iorw.module +usr/lib/grub/i386-pc/iso9660.mod +usr/lib/grub/i386-pc/iso9660.module +usr/lib/grub/i386-pc/jfs.mod +usr/lib/grub/i386-pc/jfs.module +usr/lib/grub/i386-pc/jpeg.mod +usr/lib/grub/i386-pc/jpeg.module +usr/lib/grub/i386-pc/kernel.exec +usr/lib/grub/i386-pc/kernel.img +usr/lib/grub/i386-pc/keylayouts.mod +usr/lib/grub/i386-pc/keylayouts.module +usr/lib/grub/i386-pc/keystatus.mod +usr/lib/grub/i386-pc/keystatus.module +usr/lib/grub/i386-pc/ldm.mod +usr/lib/grub/i386-pc/ldm.module +usr/lib/grub/i386-pc/legacy_password_test.mod +usr/lib/grub/i386-pc/legacy_password_test.module +usr/lib/grub/i386-pc/legacycfg.mod +usr/lib/grub/i386-pc/legacycfg.module +usr/lib/grub/i386-pc/linux.mod +usr/lib/grub/i386-pc/linux.module +usr/lib/grub/i386-pc/linux16.mod +usr/lib/grub/i386-pc/linux16.module +usr/lib/grub/i386-pc/lnxboot.image +usr/lib/grub/i386-pc/lnxboot.img +usr/lib/grub/i386-pc/loadenv.mod +usr/lib/grub/i386-pc/loadenv.module +usr/lib/grub/i386-pc/loopback.mod +usr/lib/grub/i386-pc/loopback.module +usr/lib/grub/i386-pc/ls.mod +usr/lib/grub/i386-pc/ls.module +usr/lib/grub/i386-pc/lsacpi.mod +usr/lib/grub/i386-pc/lsacpi.module +usr/lib/grub/i386-pc/lsapm.mod +usr/lib/grub/i386-pc/lsapm.module +usr/lib/grub/i386-pc/lsmmap.mod +usr/lib/grub/i386-pc/lsmmap.module +usr/lib/grub/i386-pc/lspci.mod +usr/lib/grub/i386-pc/lspci.module +usr/lib/grub/i386-pc/luks.mod +usr/lib/grub/i386-pc/luks.module +usr/lib/grub/i386-pc/lvm.mod +usr/lib/grub/i386-pc/lvm.module +usr/lib/grub/i386-pc/lzma_decompress.image +usr/lib/grub/i386-pc/lzma_decompress.img +usr/lib/grub/i386-pc/lzopio.mod +usr/lib/grub/i386-pc/lzopio.module +usr/lib/grub/i386-pc/macbless.mod +usr/lib/grub/i386-pc/macbless.module +usr/lib/grub/i386-pc/macho.mod +usr/lib/grub/i386-pc/macho.module +usr/lib/grub/i386-pc/mda_text.mod +usr/lib/grub/i386-pc/mda_text.module +usr/lib/grub/i386-pc/mdraid09.mod +usr/lib/grub/i386-pc/mdraid09.module +usr/lib/grub/i386-pc/mdraid09_be.mod +usr/lib/grub/i386-pc/mdraid09_be.module +usr/lib/grub/i386-pc/mdraid1x.mod +usr/lib/grub/i386-pc/mdraid1x.module +usr/lib/grub/i386-pc/memdisk.mod +usr/lib/grub/i386-pc/memdisk.module +usr/lib/grub/i386-pc/memrw.mod +usr/lib/grub/i386-pc/memrw.module +usr/lib/grub/i386-pc/minicmd.mod +usr/lib/grub/i386-pc/minicmd.module +usr/lib/grub/i386-pc/minix.mod +usr/lib/grub/i386-pc/minix.module +usr/lib/grub/i386-pc/minix2.mod +usr/lib/grub/i386-pc/minix2.module +usr/lib/grub/i386-pc/minix2_be.mod +usr/lib/grub/i386-pc/minix2_be.module +usr/lib/grub/i386-pc/minix3.mod +usr/lib/grub/i386-pc/minix3.module +usr/lib/grub/i386-pc/minix3_be.mod +usr/lib/grub/i386-pc/minix3_be.module +usr/lib/grub/i386-pc/minix_be.mod +usr/lib/grub/i386-pc/minix_be.module +usr/lib/grub/i386-pc/mmap.mod +usr/lib/grub/i386-pc/mmap.module +usr/lib/grub/i386-pc/moddep.lst +usr/lib/grub/i386-pc/modinfo.sh +usr/lib/grub/i386-pc/morse.mod +usr/lib/grub/i386-pc/morse.module +usr/lib/grub/i386-pc/mpi.mod +usr/lib/grub/i386-pc/mpi.module +usr/lib/grub/i386-pc/msdospart.mod +usr/lib/grub/i386-pc/msdospart.module +usr/lib/grub/i386-pc/mul_test.mod +usr/lib/grub/i386-pc/mul_test.module +usr/lib/grub/i386-pc/multiboot.mod +usr/lib/grub/i386-pc/multiboot.module +usr/lib/grub/i386-pc/multiboot2.mod +usr/lib/grub/i386-pc/multiboot2.module +usr/lib/grub/i386-pc/nativedisk.mod +usr/lib/grub/i386-pc/nativedisk.module +usr/lib/grub/i386-pc/net.mod +usr/lib/grub/i386-pc/net.module +usr/lib/grub/i386-pc/newc.mod +usr/lib/grub/i386-pc/newc.module +usr/lib/grub/i386-pc/nilfs2.mod +usr/lib/grub/i386-pc/nilfs2.module +usr/lib/grub/i386-pc/normal.mod +usr/lib/grub/i386-pc/normal.module +usr/lib/grub/i386-pc/ntfs.mod +usr/lib/grub/i386-pc/ntfs.module +usr/lib/grub/i386-pc/ntfscomp.mod +usr/lib/grub/i386-pc/ntfscomp.module +usr/lib/grub/i386-pc/ntldr.mod +usr/lib/grub/i386-pc/ntldr.module +usr/lib/grub/i386-pc/odc.mod +usr/lib/grub/i386-pc/odc.module +usr/lib/grub/i386-pc/offsetio.mod +usr/lib/grub/i386-pc/offsetio.module +usr/lib/grub/i386-pc/ohci.mod +usr/lib/grub/i386-pc/ohci.module +usr/lib/grub/i386-pc/part_acorn.mod +usr/lib/grub/i386-pc/part_acorn.module +usr/lib/grub/i386-pc/part_amiga.mod +usr/lib/grub/i386-pc/part_amiga.module +usr/lib/grub/i386-pc/part_apple.mod +usr/lib/grub/i386-pc/part_apple.module +usr/lib/grub/i386-pc/part_bsd.mod +usr/lib/grub/i386-pc/part_bsd.module +usr/lib/grub/i386-pc/part_dfly.mod +usr/lib/grub/i386-pc/part_dfly.module +usr/lib/grub/i386-pc/part_dvh.mod +usr/lib/grub/i386-pc/part_dvh.module +usr/lib/grub/i386-pc/part_gpt.mod +usr/lib/grub/i386-pc/part_gpt.module +usr/lib/grub/i386-pc/part_msdos.mod +usr/lib/grub/i386-pc/part_msdos.module +usr/lib/grub/i386-pc/part_plan.mod +usr/lib/grub/i386-pc/part_plan.module +usr/lib/grub/i386-pc/part_sun.mod +usr/lib/grub/i386-pc/part_sun.module +usr/lib/grub/i386-pc/part_sunpc.mod +usr/lib/grub/i386-pc/part_sunpc.module +usr/lib/grub/i386-pc/partmap.lst +usr/lib/grub/i386-pc/parttool.lst +usr/lib/grub/i386-pc/parttool.mod +usr/lib/grub/i386-pc/parttool.module +usr/lib/grub/i386-pc/password.mod +usr/lib/grub/i386-pc/password.module +usr/lib/grub/i386-pc/password_pbkdf2.mod +usr/lib/grub/i386-pc/password_pbkdf2.module +usr/lib/grub/i386-pc/pata.mod +usr/lib/grub/i386-pc/pata.module +usr/lib/grub/i386-pc/pbkdf2.mod +usr/lib/grub/i386-pc/pbkdf2.module +usr/lib/grub/i386-pc/pbkdf2_test.mod +usr/lib/grub/i386-pc/pbkdf2_test.module +usr/lib/grub/i386-pc/pci.mod +usr/lib/grub/i386-pc/pci.module +usr/lib/grub/i386-pc/pcidump.mod +usr/lib/grub/i386-pc/pcidump.module +usr/lib/grub/i386-pc/plan9.mod +usr/lib/grub/i386-pc/plan9.module +usr/lib/grub/i386-pc/play.mod +usr/lib/grub/i386-pc/play.module +usr/lib/grub/i386-pc/png.mod +usr/lib/grub/i386-pc/png.module +usr/lib/grub/i386-pc/priority_queue.mod +usr/lib/grub/i386-pc/priority_queue.module +usr/lib/grub/i386-pc/probe.mod +usr/lib/grub/i386-pc/probe.module +usr/lib/grub/i386-pc/procfs.mod +usr/lib/grub/i386-pc/procfs.module +usr/lib/grub/i386-pc/progress.mod +usr/lib/grub/i386-pc/progress.module +usr/lib/grub/i386-pc/pxe.mod +usr/lib/grub/i386-pc/pxe.module +usr/lib/grub/i386-pc/pxeboot.image +usr/lib/grub/i386-pc/pxeboot.img +usr/lib/grub/i386-pc/pxechain.mod +usr/lib/grub/i386-pc/pxechain.module +usr/lib/grub/i386-pc/raid5rec.mod +usr/lib/grub/i386-pc/raid5rec.module +usr/lib/grub/i386-pc/raid6rec.mod +usr/lib/grub/i386-pc/raid6rec.module +usr/lib/grub/i386-pc/random.mod +usr/lib/grub/i386-pc/random.module +usr/lib/grub/i386-pc/read.mod +usr/lib/grub/i386-pc/read.module +usr/lib/grub/i386-pc/reboot.mod +usr/lib/grub/i386-pc/reboot.module +usr/lib/grub/i386-pc/regexp.mod +usr/lib/grub/i386-pc/regexp.module +usr/lib/grub/i386-pc/reiserfs.mod +usr/lib/grub/i386-pc/reiserfs.module +usr/lib/grub/i386-pc/relocator.mod +usr/lib/grub/i386-pc/relocator.module +usr/lib/grub/i386-pc/romfs.mod +usr/lib/grub/i386-pc/romfs.module +usr/lib/grub/i386-pc/scsi.mod +usr/lib/grub/i386-pc/scsi.module +usr/lib/grub/i386-pc/search.mod +usr/lib/grub/i386-pc/search.module +usr/lib/grub/i386-pc/search_fs_file.mod +usr/lib/grub/i386-pc/search_fs_file.module +usr/lib/grub/i386-pc/search_fs_uuid.mod +usr/lib/grub/i386-pc/search_fs_uuid.module +usr/lib/grub/i386-pc/search_label.mod +usr/lib/grub/i386-pc/search_label.module +usr/lib/grub/i386-pc/sendkey.mod +usr/lib/grub/i386-pc/sendkey.module +usr/lib/grub/i386-pc/serial.mod +usr/lib/grub/i386-pc/serial.module +usr/lib/grub/i386-pc/setjmp.mod +usr/lib/grub/i386-pc/setjmp.module +usr/lib/grub/i386-pc/setjmp_test.mod +usr/lib/grub/i386-pc/setjmp_test.module +usr/lib/grub/i386-pc/setpci.mod +usr/lib/grub/i386-pc/setpci.module +usr/lib/grub/i386-pc/sfs.mod +usr/lib/grub/i386-pc/sfs.module +usr/lib/grub/i386-pc/shift_test.mod +usr/lib/grub/i386-pc/shift_test.module +usr/lib/grub/i386-pc/signature_test.mod +usr/lib/grub/i386-pc/signature_test.module +usr/lib/grub/i386-pc/sleep.mod +usr/lib/grub/i386-pc/sleep.module +usr/lib/grub/i386-pc/sleep_test.mod +usr/lib/grub/i386-pc/sleep_test.module +usr/lib/grub/i386-pc/spkmodem.mod +usr/lib/grub/i386-pc/spkmodem.module +usr/lib/grub/i386-pc/squash4.mod +usr/lib/grub/i386-pc/squash4.module +usr/lib/grub/i386-pc/syslinuxcfg.mod +usr/lib/grub/i386-pc/syslinuxcfg.module +usr/lib/grub/i386-pc/tar.mod +usr/lib/grub/i386-pc/tar.module +usr/lib/grub/i386-pc/terminal.lst +usr/lib/grub/i386-pc/terminal.mod +usr/lib/grub/i386-pc/terminal.module +usr/lib/grub/i386-pc/terminfo.mod +usr/lib/grub/i386-pc/terminfo.module +usr/lib/grub/i386-pc/test.mod +usr/lib/grub/i386-pc/test.module +usr/lib/grub/i386-pc/test_blockarg.mod +usr/lib/grub/i386-pc/test_blockarg.module +usr/lib/grub/i386-pc/testload.mod +usr/lib/grub/i386-pc/testload.module +usr/lib/grub/i386-pc/testspeed.mod +usr/lib/grub/i386-pc/testspeed.module +usr/lib/grub/i386-pc/tftp.mod +usr/lib/grub/i386-pc/tftp.module +usr/lib/grub/i386-pc/tga.mod +usr/lib/grub/i386-pc/tga.module +usr/lib/grub/i386-pc/time.mod +usr/lib/grub/i386-pc/time.module +usr/lib/grub/i386-pc/tr.mod +usr/lib/grub/i386-pc/tr.module +usr/lib/grub/i386-pc/trig.mod +usr/lib/grub/i386-pc/trig.module +usr/lib/grub/i386-pc/true.mod +usr/lib/grub/i386-pc/true.module +usr/lib/grub/i386-pc/truecrypt.mod +usr/lib/grub/i386-pc/truecrypt.module +usr/lib/grub/i386-pc/udf.mod +usr/lib/grub/i386-pc/udf.module +usr/lib/grub/i386-pc/ufs1.mod +usr/lib/grub/i386-pc/ufs1.module +usr/lib/grub/i386-pc/ufs1_be.mod +usr/lib/grub/i386-pc/ufs1_be.module +usr/lib/grub/i386-pc/ufs2.mod +usr/lib/grub/i386-pc/ufs2.module +usr/lib/grub/i386-pc/uhci.mod +usr/lib/grub/i386-pc/uhci.module +usr/lib/grub/i386-pc/usb.mod +usr/lib/grub/i386-pc/usb.module +usr/lib/grub/i386-pc/usb_keyboard.mod +usr/lib/grub/i386-pc/usb_keyboard.module +usr/lib/grub/i386-pc/usbms.mod +usr/lib/grub/i386-pc/usbms.module +usr/lib/grub/i386-pc/usbserial_common.mod +usr/lib/grub/i386-pc/usbserial_common.module +usr/lib/grub/i386-pc/usbserial_ftdi.mod +usr/lib/grub/i386-pc/usbserial_ftdi.module +usr/lib/grub/i386-pc/usbserial_pl2303.mod +usr/lib/grub/i386-pc/usbserial_pl2303.module +usr/lib/grub/i386-pc/usbserial_usbdebug.mod +usr/lib/grub/i386-pc/usbserial_usbdebug.module +usr/lib/grub/i386-pc/usbtest.mod +usr/lib/grub/i386-pc/usbtest.module +usr/lib/grub/i386-pc/vbe.mod +usr/lib/grub/i386-pc/vbe.module +usr/lib/grub/i386-pc/verify.mod +usr/lib/grub/i386-pc/verify.module +usr/lib/grub/i386-pc/vga.mod +usr/lib/grub/i386-pc/vga.module +usr/lib/grub/i386-pc/vga_text.mod +usr/lib/grub/i386-pc/vga_text.module +usr/lib/grub/i386-pc/video.lst +usr/lib/grub/i386-pc/video.mod +usr/lib/grub/i386-pc/video.module +usr/lib/grub/i386-pc/video_bochs.mod +usr/lib/grub/i386-pc/video_bochs.module +usr/lib/grub/i386-pc/video_cirrus.mod +usr/lib/grub/i386-pc/video_cirrus.module +usr/lib/grub/i386-pc/video_colors.mod +usr/lib/grub/i386-pc/video_colors.module +usr/lib/grub/i386-pc/video_fb.mod +usr/lib/grub/i386-pc/video_fb.module +usr/lib/grub/i386-pc/videoinfo.mod +usr/lib/grub/i386-pc/videoinfo.module +usr/lib/grub/i386-pc/videotest.mod +usr/lib/grub/i386-pc/videotest.module +usr/lib/grub/i386-pc/videotest_checksum.mod +usr/lib/grub/i386-pc/videotest_checksum.module +usr/lib/grub/i386-pc/xfs.mod +usr/lib/grub/i386-pc/xfs.module +usr/lib/grub/i386-pc/xnu.mod +usr/lib/grub/i386-pc/xnu.module +usr/lib/grub/i386-pc/xnu_uuid.mod +usr/lib/grub/i386-pc/xnu_uuid.module +usr/lib/grub/i386-pc/xnu_uuid_test.mod +usr/lib/grub/i386-pc/xnu_uuid_test.module +usr/lib/grub/i386-pc/xzio.mod +usr/lib/grub/i386-pc/xzio.module +usr/lib/grub/i386-pc/zfs.mod +usr/lib/grub/i386-pc/zfs.module +usr/lib/grub/i386-pc/zfscrypt.mod +usr/lib/grub/i386-pc/zfscrypt.module +usr/lib/grub/i386-pc/zfsinfo.mod +usr/lib/grub/i386-pc/zfsinfo.module +usr/lib/grub/x86_64-efi +usr/lib/grub/x86_64-efi/acpi.mod +usr/lib/grub/x86_64-efi/acpi.module +usr/lib/grub/x86_64-efi/adler32.mod +usr/lib/grub/x86_64-efi/adler32.module +usr/lib/grub/x86_64-efi/affs.mod +usr/lib/grub/x86_64-efi/affs.module +usr/lib/grub/x86_64-efi/afs.mod +usr/lib/grub/x86_64-efi/afs.module +usr/lib/grub/x86_64-efi/ahci.mod +usr/lib/grub/x86_64-efi/ahci.module +usr/lib/grub/x86_64-efi/all_video.mod +usr/lib/grub/x86_64-efi/all_video.module +usr/lib/grub/x86_64-efi/aout.mod +usr/lib/grub/x86_64-efi/aout.module +usr/lib/grub/x86_64-efi/appleldr.mod +usr/lib/grub/x86_64-efi/appleldr.module +usr/lib/grub/x86_64-efi/archelp.mod +usr/lib/grub/x86_64-efi/archelp.module +usr/lib/grub/x86_64-efi/at_keyboard.mod +usr/lib/grub/x86_64-efi/at_keyboard.module +usr/lib/grub/x86_64-efi/ata.mod +usr/lib/grub/x86_64-efi/ata.module +usr/lib/grub/x86_64-efi/backtrace.mod +usr/lib/grub/x86_64-efi/backtrace.module +usr/lib/grub/x86_64-efi/bfs.mod +usr/lib/grub/x86_64-efi/bfs.module +usr/lib/grub/x86_64-efi/bitmap.mod +usr/lib/grub/x86_64-efi/bitmap.module +usr/lib/grub/x86_64-efi/bitmap_scale.mod +usr/lib/grub/x86_64-efi/bitmap_scale.module +usr/lib/grub/x86_64-efi/blocklist.mod +usr/lib/grub/x86_64-efi/blocklist.module +usr/lib/grub/x86_64-efi/boot.mod +usr/lib/grub/x86_64-efi/boot.module +usr/lib/grub/x86_64-efi/bsd.mod +usr/lib/grub/x86_64-efi/bsd.module +usr/lib/grub/x86_64-efi/bswap_test.mod +usr/lib/grub/x86_64-efi/bswap_test.module +usr/lib/grub/x86_64-efi/btrfs.mod +usr/lib/grub/x86_64-efi/btrfs.module +usr/lib/grub/x86_64-efi/bufio.mod +usr/lib/grub/x86_64-efi/bufio.module +usr/lib/grub/x86_64-efi/cat.mod +usr/lib/grub/x86_64-efi/cat.module +usr/lib/grub/x86_64-efi/cbfs.mod +usr/lib/grub/x86_64-efi/cbfs.module +usr/lib/grub/x86_64-efi/cbls.mod +usr/lib/grub/x86_64-efi/cbls.module +usr/lib/grub/x86_64-efi/cbmemc.mod +usr/lib/grub/x86_64-efi/cbmemc.module +usr/lib/grub/x86_64-efi/cbtable.mod +usr/lib/grub/x86_64-efi/cbtable.module +usr/lib/grub/x86_64-efi/cbtime.mod +usr/lib/grub/x86_64-efi/cbtime.module +usr/lib/grub/x86_64-efi/chain.mod +usr/lib/grub/x86_64-efi/chain.module +usr/lib/grub/x86_64-efi/cmdline_cat_test.mod +usr/lib/grub/x86_64-efi/cmdline_cat_test.module +usr/lib/grub/x86_64-efi/cmp.mod +usr/lib/grub/x86_64-efi/cmp.module +usr/lib/grub/x86_64-efi/cmp_test.mod +usr/lib/grub/x86_64-efi/cmp_test.module +usr/lib/grub/x86_64-efi/command.lst +usr/lib/grub/x86_64-efi/config.h +usr/lib/grub/x86_64-efi/configfile.mod +usr/lib/grub/x86_64-efi/configfile.module +usr/lib/grub/x86_64-efi/cpio.mod +usr/lib/grub/x86_64-efi/cpio.module +usr/lib/grub/x86_64-efi/cpio_be.mod +usr/lib/grub/x86_64-efi/cpio_be.module +usr/lib/grub/x86_64-efi/cpuid.mod +usr/lib/grub/x86_64-efi/cpuid.module +usr/lib/grub/x86_64-efi/crc64.mod +usr/lib/grub/x86_64-efi/crc64.module +usr/lib/grub/x86_64-efi/crypto.lst +usr/lib/grub/x86_64-efi/crypto.mod +usr/lib/grub/x86_64-efi/crypto.module +usr/lib/grub/x86_64-efi/cryptodisk.mod +usr/lib/grub/x86_64-efi/cryptodisk.module +usr/lib/grub/x86_64-efi/cs5536.mod +usr/lib/grub/x86_64-efi/cs5536.module +usr/lib/grub/x86_64-efi/ctz_test.mod +usr/lib/grub/x86_64-efi/ctz_test.module +usr/lib/grub/x86_64-efi/date.mod +usr/lib/grub/x86_64-efi/date.module +usr/lib/grub/x86_64-efi/datehook.mod +usr/lib/grub/x86_64-efi/datehook.module +usr/lib/grub/x86_64-efi/datetime.mod +usr/lib/grub/x86_64-efi/datetime.module +usr/lib/grub/x86_64-efi/disk.mod +usr/lib/grub/x86_64-efi/disk.module +usr/lib/grub/x86_64-efi/diskfilter.mod +usr/lib/grub/x86_64-efi/diskfilter.module +usr/lib/grub/x86_64-efi/div.mod +usr/lib/grub/x86_64-efi/div.module +usr/lib/grub/x86_64-efi/div_test.mod +usr/lib/grub/x86_64-efi/div_test.module +usr/lib/grub/x86_64-efi/dm_nv.mod +usr/lib/grub/x86_64-efi/dm_nv.module +usr/lib/grub/x86_64-efi/echo.mod +usr/lib/grub/x86_64-efi/echo.module +usr/lib/grub/x86_64-efi/efi_gop.mod +usr/lib/grub/x86_64-efi/efi_gop.module +usr/lib/grub/x86_64-efi/efi_uga.mod +usr/lib/grub/x86_64-efi/efi_uga.module +usr/lib/grub/x86_64-efi/efifwsetup.mod +usr/lib/grub/x86_64-efi/efifwsetup.module +usr/lib/grub/x86_64-efi/efinet.mod +usr/lib/grub/x86_64-efi/efinet.module +usr/lib/grub/x86_64-efi/ehci.mod +usr/lib/grub/x86_64-efi/ehci.module +usr/lib/grub/x86_64-efi/elf.mod +usr/lib/grub/x86_64-efi/elf.module +usr/lib/grub/x86_64-efi/eval.mod +usr/lib/grub/x86_64-efi/eval.module +usr/lib/grub/x86_64-efi/exfat.mod +usr/lib/grub/x86_64-efi/exfat.module +usr/lib/grub/x86_64-efi/exfctest.mod +usr/lib/grub/x86_64-efi/exfctest.module +usr/lib/grub/x86_64-efi/ext2.mod +usr/lib/grub/x86_64-efi/ext2.module +usr/lib/grub/x86_64-efi/extcmd.mod +usr/lib/grub/x86_64-efi/extcmd.module +usr/lib/grub/x86_64-efi/fat.mod +usr/lib/grub/x86_64-efi/fat.module +usr/lib/grub/x86_64-efi/file.mod +usr/lib/grub/x86_64-efi/file.module +usr/lib/grub/x86_64-efi/fixvideo.mod +usr/lib/grub/x86_64-efi/fixvideo.module +usr/lib/grub/x86_64-efi/font.mod +usr/lib/grub/x86_64-efi/font.module +usr/lib/grub/x86_64-efi/fs.lst +usr/lib/grub/x86_64-efi/fshelp.mod +usr/lib/grub/x86_64-efi/fshelp.module +usr/lib/grub/x86_64-efi/functional_test.mod +usr/lib/grub/x86_64-efi/functional_test.module +usr/lib/grub/x86_64-efi/gcry_arcfour.mod +usr/lib/grub/x86_64-efi/gcry_arcfour.module +usr/lib/grub/x86_64-efi/gcry_blowfish.mod +usr/lib/grub/x86_64-efi/gcry_blowfish.module +usr/lib/grub/x86_64-efi/gcry_camellia.mod +usr/lib/grub/x86_64-efi/gcry_camellia.module +usr/lib/grub/x86_64-efi/gcry_cast5.mod +usr/lib/grub/x86_64-efi/gcry_cast5.module +usr/lib/grub/x86_64-efi/gcry_crc.mod +usr/lib/grub/x86_64-efi/gcry_crc.module +usr/lib/grub/x86_64-efi/gcry_des.mod +usr/lib/grub/x86_64-efi/gcry_des.module +usr/lib/grub/x86_64-efi/gcry_dsa.mod +usr/lib/grub/x86_64-efi/gcry_dsa.module +usr/lib/grub/x86_64-efi/gcry_idea.mod +usr/lib/grub/x86_64-efi/gcry_idea.module +usr/lib/grub/x86_64-efi/gcry_md4.mod +usr/lib/grub/x86_64-efi/gcry_md4.module +usr/lib/grub/x86_64-efi/gcry_md5.mod +usr/lib/grub/x86_64-efi/gcry_md5.module +usr/lib/grub/x86_64-efi/gcry_rfc2268.mod +usr/lib/grub/x86_64-efi/gcry_rfc2268.module +usr/lib/grub/x86_64-efi/gcry_rijndael.mod +usr/lib/grub/x86_64-efi/gcry_rijndael.module +usr/lib/grub/x86_64-efi/gcry_rmd160.mod +usr/lib/grub/x86_64-efi/gcry_rmd160.module +usr/lib/grub/x86_64-efi/gcry_rsa.mod +usr/lib/grub/x86_64-efi/gcry_rsa.module +usr/lib/grub/x86_64-efi/gcry_seed.mod +usr/lib/grub/x86_64-efi/gcry_seed.module +usr/lib/grub/x86_64-efi/gcry_serpent.mod +usr/lib/grub/x86_64-efi/gcry_serpent.module +usr/lib/grub/x86_64-efi/gcry_sha1.mod +usr/lib/grub/x86_64-efi/gcry_sha1.module +usr/lib/grub/x86_64-efi/gcry_sha256.mod +usr/lib/grub/x86_64-efi/gcry_sha256.module +usr/lib/grub/x86_64-efi/gcry_sha512.mod +usr/lib/grub/x86_64-efi/gcry_sha512.module +usr/lib/grub/x86_64-efi/gcry_tiger.mod +usr/lib/grub/x86_64-efi/gcry_tiger.module +usr/lib/grub/x86_64-efi/gcry_twofish.mod +usr/lib/grub/x86_64-efi/gcry_twofish.module +usr/lib/grub/x86_64-efi/gcry_whirlpool.mod +usr/lib/grub/x86_64-efi/gcry_whirlpool.module +usr/lib/grub/x86_64-efi/gdb_grub +usr/lib/grub/x86_64-efi/geli.mod +usr/lib/grub/x86_64-efi/geli.module +usr/lib/grub/x86_64-efi/gettext.mod +usr/lib/grub/x86_64-efi/gettext.module +usr/lib/grub/x86_64-efi/gfxmenu.mod +usr/lib/grub/x86_64-efi/gfxmenu.module +usr/lib/grub/x86_64-efi/gfxterm.mod +usr/lib/grub/x86_64-efi/gfxterm.module +usr/lib/grub/x86_64-efi/gfxterm_background.mod +usr/lib/grub/x86_64-efi/gfxterm_background.module +usr/lib/grub/x86_64-efi/gfxterm_menu.mod +usr/lib/grub/x86_64-efi/gfxterm_menu.module +usr/lib/grub/x86_64-efi/gmodule.pl +usr/lib/grub/x86_64-efi/gptsync.mod +usr/lib/grub/x86_64-efi/gptsync.module +usr/lib/grub/x86_64-efi/gzio.mod +usr/lib/grub/x86_64-efi/gzio.module +usr/lib/grub/x86_64-efi/halt.mod +usr/lib/grub/x86_64-efi/halt.module +usr/lib/grub/x86_64-efi/hashsum.mod +usr/lib/grub/x86_64-efi/hashsum.module +usr/lib/grub/x86_64-efi/hdparm.mod +usr/lib/grub/x86_64-efi/hdparm.module +usr/lib/grub/x86_64-efi/hello.mod +usr/lib/grub/x86_64-efi/hello.module +usr/lib/grub/x86_64-efi/help.mod +usr/lib/grub/x86_64-efi/help.module +usr/lib/grub/x86_64-efi/hexdump.mod +usr/lib/grub/x86_64-efi/hexdump.module +usr/lib/grub/x86_64-efi/hfs.mod +usr/lib/grub/x86_64-efi/hfs.module +usr/lib/grub/x86_64-efi/hfsplus.mod +usr/lib/grub/x86_64-efi/hfsplus.module +usr/lib/grub/x86_64-efi/hfspluscomp.mod +usr/lib/grub/x86_64-efi/hfspluscomp.module +usr/lib/grub/x86_64-efi/http.mod +usr/lib/grub/x86_64-efi/http.module +usr/lib/grub/x86_64-efi/iorw.mod +usr/lib/grub/x86_64-efi/iorw.module +usr/lib/grub/x86_64-efi/iso9660.mod +usr/lib/grub/x86_64-efi/iso9660.module +usr/lib/grub/x86_64-efi/jfs.mod +usr/lib/grub/x86_64-efi/jfs.module +usr/lib/grub/x86_64-efi/jpeg.mod +usr/lib/grub/x86_64-efi/jpeg.module +usr/lib/grub/x86_64-efi/kernel.exec +usr/lib/grub/x86_64-efi/kernel.img +usr/lib/grub/x86_64-efi/keylayouts.mod +usr/lib/grub/x86_64-efi/keylayouts.module +usr/lib/grub/x86_64-efi/keystatus.mod +usr/lib/grub/x86_64-efi/keystatus.module +usr/lib/grub/x86_64-efi/ldm.mod +usr/lib/grub/x86_64-efi/ldm.module +usr/lib/grub/x86_64-efi/legacy_password_test.mod +usr/lib/grub/x86_64-efi/legacy_password_test.module +usr/lib/grub/x86_64-efi/legacycfg.mod +usr/lib/grub/x86_64-efi/legacycfg.module +usr/lib/grub/x86_64-efi/linux.mod +usr/lib/grub/x86_64-efi/linux.module +usr/lib/grub/x86_64-efi/linux16.mod +usr/lib/grub/x86_64-efi/linux16.module +usr/lib/grub/x86_64-efi/loadbios.mod +usr/lib/grub/x86_64-efi/loadbios.module +usr/lib/grub/x86_64-efi/loadenv.mod +usr/lib/grub/x86_64-efi/loadenv.module +usr/lib/grub/x86_64-efi/loopback.mod +usr/lib/grub/x86_64-efi/loopback.module +usr/lib/grub/x86_64-efi/ls.mod +usr/lib/grub/x86_64-efi/ls.module +usr/lib/grub/x86_64-efi/lsacpi.mod +usr/lib/grub/x86_64-efi/lsacpi.module +usr/lib/grub/x86_64-efi/lsefi.mod +usr/lib/grub/x86_64-efi/lsefi.module +usr/lib/grub/x86_64-efi/lsefimmap.mod +usr/lib/grub/x86_64-efi/lsefimmap.module +usr/lib/grub/x86_64-efi/lsefisystab.mod +usr/lib/grub/x86_64-efi/lsefisystab.module +usr/lib/grub/x86_64-efi/lsmmap.mod +usr/lib/grub/x86_64-efi/lsmmap.module +usr/lib/grub/x86_64-efi/lspci.mod +usr/lib/grub/x86_64-efi/lspci.module +usr/lib/grub/x86_64-efi/lssal.mod +usr/lib/grub/x86_64-efi/lssal.module +usr/lib/grub/x86_64-efi/luks.mod +usr/lib/grub/x86_64-efi/luks.module +usr/lib/grub/x86_64-efi/lvm.mod +usr/lib/grub/x86_64-efi/lvm.module +usr/lib/grub/x86_64-efi/lzopio.mod +usr/lib/grub/x86_64-efi/lzopio.module +usr/lib/grub/x86_64-efi/macbless.mod +usr/lib/grub/x86_64-efi/macbless.module +usr/lib/grub/x86_64-efi/macho.mod +usr/lib/grub/x86_64-efi/macho.module +usr/lib/grub/x86_64-efi/mdraid09.mod +usr/lib/grub/x86_64-efi/mdraid09.module +usr/lib/grub/x86_64-efi/mdraid09_be.mod +usr/lib/grub/x86_64-efi/mdraid09_be.module +usr/lib/grub/x86_64-efi/mdraid1x.mod +usr/lib/grub/x86_64-efi/mdraid1x.module +usr/lib/grub/x86_64-efi/memdisk.mod +usr/lib/grub/x86_64-efi/memdisk.module +usr/lib/grub/x86_64-efi/memrw.mod +usr/lib/grub/x86_64-efi/memrw.module +usr/lib/grub/x86_64-efi/minicmd.mod +usr/lib/grub/x86_64-efi/minicmd.module +usr/lib/grub/x86_64-efi/minix.mod +usr/lib/grub/x86_64-efi/minix.module +usr/lib/grub/x86_64-efi/minix2.mod +usr/lib/grub/x86_64-efi/minix2.module +usr/lib/grub/x86_64-efi/minix2_be.mod +usr/lib/grub/x86_64-efi/minix2_be.module +usr/lib/grub/x86_64-efi/minix3.mod +usr/lib/grub/x86_64-efi/minix3.module +usr/lib/grub/x86_64-efi/minix3_be.mod +usr/lib/grub/x86_64-efi/minix3_be.module +usr/lib/grub/x86_64-efi/minix_be.mod +usr/lib/grub/x86_64-efi/minix_be.module +usr/lib/grub/x86_64-efi/mmap.mod +usr/lib/grub/x86_64-efi/mmap.module +usr/lib/grub/x86_64-efi/moddep.lst +usr/lib/grub/x86_64-efi/modinfo.sh +usr/lib/grub/x86_64-efi/morse.mod +usr/lib/grub/x86_64-efi/morse.module +usr/lib/grub/x86_64-efi/mpi.mod +usr/lib/grub/x86_64-efi/mpi.module +usr/lib/grub/x86_64-efi/msdospart.mod +usr/lib/grub/x86_64-efi/msdospart.module +usr/lib/grub/x86_64-efi/mul_test.mod +usr/lib/grub/x86_64-efi/mul_test.module +usr/lib/grub/x86_64-efi/multiboot.mod +usr/lib/grub/x86_64-efi/multiboot.module +usr/lib/grub/x86_64-efi/multiboot2.mod +usr/lib/grub/x86_64-efi/multiboot2.module +usr/lib/grub/x86_64-efi/nativedisk.mod +usr/lib/grub/x86_64-efi/nativedisk.module +usr/lib/grub/x86_64-efi/net.mod +usr/lib/grub/x86_64-efi/net.module +usr/lib/grub/x86_64-efi/newc.mod +usr/lib/grub/x86_64-efi/newc.module +usr/lib/grub/x86_64-efi/nilfs2.mod +usr/lib/grub/x86_64-efi/nilfs2.module +usr/lib/grub/x86_64-efi/normal.mod +usr/lib/grub/x86_64-efi/normal.module +usr/lib/grub/x86_64-efi/ntfs.mod +usr/lib/grub/x86_64-efi/ntfs.module +usr/lib/grub/x86_64-efi/ntfscomp.mod +usr/lib/grub/x86_64-efi/ntfscomp.module +usr/lib/grub/x86_64-efi/odc.mod +usr/lib/grub/x86_64-efi/odc.module +usr/lib/grub/x86_64-efi/offsetio.mod +usr/lib/grub/x86_64-efi/offsetio.module +usr/lib/grub/x86_64-efi/ohci.mod +usr/lib/grub/x86_64-efi/ohci.module +usr/lib/grub/x86_64-efi/part_acorn.mod +usr/lib/grub/x86_64-efi/part_acorn.module +usr/lib/grub/x86_64-efi/part_amiga.mod +usr/lib/grub/x86_64-efi/part_amiga.module +usr/lib/grub/x86_64-efi/part_apple.mod +usr/lib/grub/x86_64-efi/part_apple.module +usr/lib/grub/x86_64-efi/part_bsd.mod +usr/lib/grub/x86_64-efi/part_bsd.module +usr/lib/grub/x86_64-efi/part_dfly.mod +usr/lib/grub/x86_64-efi/part_dfly.module +usr/lib/grub/x86_64-efi/part_dvh.mod +usr/lib/grub/x86_64-efi/part_dvh.module +usr/lib/grub/x86_64-efi/part_gpt.mod +usr/lib/grub/x86_64-efi/part_gpt.module +usr/lib/grub/x86_64-efi/part_msdos.mod +usr/lib/grub/x86_64-efi/part_msdos.module +usr/lib/grub/x86_64-efi/part_plan.mod +usr/lib/grub/x86_64-efi/part_plan.module +usr/lib/grub/x86_64-efi/part_sun.mod +usr/lib/grub/x86_64-efi/part_sun.module +usr/lib/grub/x86_64-efi/part_sunpc.mod +usr/lib/grub/x86_64-efi/part_sunpc.module +usr/lib/grub/x86_64-efi/partmap.lst +usr/lib/grub/x86_64-efi/parttool.lst +usr/lib/grub/x86_64-efi/parttool.mod +usr/lib/grub/x86_64-efi/parttool.module +usr/lib/grub/x86_64-efi/password.mod +usr/lib/grub/x86_64-efi/password.module +usr/lib/grub/x86_64-efi/password_pbkdf2.mod +usr/lib/grub/x86_64-efi/password_pbkdf2.module +usr/lib/grub/x86_64-efi/pata.mod +usr/lib/grub/x86_64-efi/pata.module +usr/lib/grub/x86_64-efi/pbkdf2.mod +usr/lib/grub/x86_64-efi/pbkdf2.module +usr/lib/grub/x86_64-efi/pbkdf2_test.mod +usr/lib/grub/x86_64-efi/pbkdf2_test.module +usr/lib/grub/x86_64-efi/pcidump.mod +usr/lib/grub/x86_64-efi/pcidump.module +usr/lib/grub/x86_64-efi/play.mod +usr/lib/grub/x86_64-efi/play.module +usr/lib/grub/x86_64-efi/png.mod +usr/lib/grub/x86_64-efi/png.module +usr/lib/grub/x86_64-efi/priority_queue.mod +usr/lib/grub/x86_64-efi/priority_queue.module +usr/lib/grub/x86_64-efi/probe.mod +usr/lib/grub/x86_64-efi/probe.module +usr/lib/grub/x86_64-efi/procfs.mod +usr/lib/grub/x86_64-efi/procfs.module +usr/lib/grub/x86_64-efi/progress.mod +usr/lib/grub/x86_64-efi/progress.module +usr/lib/grub/x86_64-efi/raid5rec.mod +usr/lib/grub/x86_64-efi/raid5rec.module +usr/lib/grub/x86_64-efi/raid6rec.mod +usr/lib/grub/x86_64-efi/raid6rec.module +usr/lib/grub/x86_64-efi/random.mod +usr/lib/grub/x86_64-efi/random.module +usr/lib/grub/x86_64-efi/read.mod +usr/lib/grub/x86_64-efi/read.module +usr/lib/grub/x86_64-efi/reboot.mod +usr/lib/grub/x86_64-efi/reboot.module +usr/lib/grub/x86_64-efi/regexp.mod +usr/lib/grub/x86_64-efi/regexp.module +usr/lib/grub/x86_64-efi/reiserfs.mod +usr/lib/grub/x86_64-efi/reiserfs.module +usr/lib/grub/x86_64-efi/relocator.mod +usr/lib/grub/x86_64-efi/relocator.module +usr/lib/grub/x86_64-efi/romfs.mod +usr/lib/grub/x86_64-efi/romfs.module +usr/lib/grub/x86_64-efi/scsi.mod +usr/lib/grub/x86_64-efi/scsi.module +usr/lib/grub/x86_64-efi/search.mod +usr/lib/grub/x86_64-efi/search.module +usr/lib/grub/x86_64-efi/search_fs_file.mod +usr/lib/grub/x86_64-efi/search_fs_file.module +usr/lib/grub/x86_64-efi/search_fs_uuid.mod +usr/lib/grub/x86_64-efi/search_fs_uuid.module +usr/lib/grub/x86_64-efi/search_label.mod +usr/lib/grub/x86_64-efi/search_label.module +usr/lib/grub/x86_64-efi/serial.mod +usr/lib/grub/x86_64-efi/serial.module +usr/lib/grub/x86_64-efi/setjmp.mod +usr/lib/grub/x86_64-efi/setjmp.module +usr/lib/grub/x86_64-efi/setjmp_test.mod +usr/lib/grub/x86_64-efi/setjmp_test.module +usr/lib/grub/x86_64-efi/setpci.mod +usr/lib/grub/x86_64-efi/setpci.module +usr/lib/grub/x86_64-efi/sfs.mod +usr/lib/grub/x86_64-efi/sfs.module +usr/lib/grub/x86_64-efi/shift_test.mod +usr/lib/grub/x86_64-efi/shift_test.module +usr/lib/grub/x86_64-efi/signature_test.mod +usr/lib/grub/x86_64-efi/signature_test.module +usr/lib/grub/x86_64-efi/sleep.mod +usr/lib/grub/x86_64-efi/sleep.module +usr/lib/grub/x86_64-efi/sleep_test.mod +usr/lib/grub/x86_64-efi/sleep_test.module +usr/lib/grub/x86_64-efi/spkmodem.mod +usr/lib/grub/x86_64-efi/spkmodem.module +usr/lib/grub/x86_64-efi/squash4.mod +usr/lib/grub/x86_64-efi/squash4.module +usr/lib/grub/x86_64-efi/syslinuxcfg.mod +usr/lib/grub/x86_64-efi/syslinuxcfg.module +usr/lib/grub/x86_64-efi/tar.mod +usr/lib/grub/x86_64-efi/tar.module +usr/lib/grub/x86_64-efi/terminal.lst +usr/lib/grub/x86_64-efi/terminal.mod +usr/lib/grub/x86_64-efi/terminal.module +usr/lib/grub/x86_64-efi/terminfo.mod +usr/lib/grub/x86_64-efi/terminfo.module +usr/lib/grub/x86_64-efi/test.mod +usr/lib/grub/x86_64-efi/test.module +usr/lib/grub/x86_64-efi/test_blockarg.mod +usr/lib/grub/x86_64-efi/test_blockarg.module +usr/lib/grub/x86_64-efi/testload.mod +usr/lib/grub/x86_64-efi/testload.module +usr/lib/grub/x86_64-efi/testspeed.mod +usr/lib/grub/x86_64-efi/testspeed.module +usr/lib/grub/x86_64-efi/tftp.mod +usr/lib/grub/x86_64-efi/tftp.module +usr/lib/grub/x86_64-efi/tga.mod +usr/lib/grub/x86_64-efi/tga.module +usr/lib/grub/x86_64-efi/time.mod +usr/lib/grub/x86_64-efi/time.module +usr/lib/grub/x86_64-efi/tr.mod +usr/lib/grub/x86_64-efi/tr.module +usr/lib/grub/x86_64-efi/trig.mod +usr/lib/grub/x86_64-efi/trig.module +usr/lib/grub/x86_64-efi/true.mod +usr/lib/grub/x86_64-efi/true.module +usr/lib/grub/x86_64-efi/udf.mod +usr/lib/grub/x86_64-efi/udf.module +usr/lib/grub/x86_64-efi/ufs1.mod +usr/lib/grub/x86_64-efi/ufs1.module +usr/lib/grub/x86_64-efi/ufs1_be.mod +usr/lib/grub/x86_64-efi/ufs1_be.module +usr/lib/grub/x86_64-efi/ufs2.mod +usr/lib/grub/x86_64-efi/ufs2.module +usr/lib/grub/x86_64-efi/uhci.mod +usr/lib/grub/x86_64-efi/uhci.module +usr/lib/grub/x86_64-efi/usb.mod +usr/lib/grub/x86_64-efi/usb.module +usr/lib/grub/x86_64-efi/usb_keyboard.mod +usr/lib/grub/x86_64-efi/usb_keyboard.module +usr/lib/grub/x86_64-efi/usbms.mod +usr/lib/grub/x86_64-efi/usbms.module +usr/lib/grub/x86_64-efi/usbserial_common.mod +usr/lib/grub/x86_64-efi/usbserial_common.module +usr/lib/grub/x86_64-efi/usbserial_ftdi.mod +usr/lib/grub/x86_64-efi/usbserial_ftdi.module +usr/lib/grub/x86_64-efi/usbserial_pl2303.mod +usr/lib/grub/x86_64-efi/usbserial_pl2303.module +usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod +usr/lib/grub/x86_64-efi/usbserial_usbdebug.module +usr/lib/grub/x86_64-efi/usbtest.mod +usr/lib/grub/x86_64-efi/usbtest.module +usr/lib/grub/x86_64-efi/verify.mod +usr/lib/grub/x86_64-efi/verify.module +usr/lib/grub/x86_64-efi/video.lst +usr/lib/grub/x86_64-efi/video.mod +usr/lib/grub/x86_64-efi/video.module +usr/lib/grub/x86_64-efi/video_bochs.mod +usr/lib/grub/x86_64-efi/video_bochs.module +usr/lib/grub/x86_64-efi/video_cirrus.mod +usr/lib/grub/x86_64-efi/video_cirrus.module +usr/lib/grub/x86_64-efi/video_colors.mod +usr/lib/grub/x86_64-efi/video_colors.module +usr/lib/grub/x86_64-efi/video_fb.mod +usr/lib/grub/x86_64-efi/video_fb.module +usr/lib/grub/x86_64-efi/videoinfo.mod +usr/lib/grub/x86_64-efi/videoinfo.module +usr/lib/grub/x86_64-efi/videotest.mod +usr/lib/grub/x86_64-efi/videotest.module +usr/lib/grub/x86_64-efi/videotest_checksum.mod +usr/lib/grub/x86_64-efi/videotest_checksum.module +usr/lib/grub/x86_64-efi/xfs.mod +usr/lib/grub/x86_64-efi/xfs.module +usr/lib/grub/x86_64-efi/xnu.mod +usr/lib/grub/x86_64-efi/xnu.module +usr/lib/grub/x86_64-efi/xnu_uuid.mod +usr/lib/grub/x86_64-efi/xnu_uuid.module +usr/lib/grub/x86_64-efi/xnu_uuid_test.mod +usr/lib/grub/x86_64-efi/xnu_uuid_test.module +usr/lib/grub/x86_64-efi/xzio.mod +usr/lib/grub/x86_64-efi/xzio.module +usr/lib/grub/x86_64-efi/zfs.mod +usr/lib/grub/x86_64-efi/zfs.module +usr/lib/grub/x86_64-efi/zfscrypt.mod +usr/lib/grub/x86_64-efi/zfscrypt.module +usr/lib/grub/x86_64-efi/zfsinfo.mod +usr/lib/grub/x86_64-efi/zfsinfo.module usr/sbin/grub-bios-setup usr/sbin/grub-install usr/sbin/grub-macbless @@ -598,8 +1121,13 @@ usr/sbin/grub-probe usr/sbin/grub-reboot usr/sbin/grub-set-default usr/sbin/grub-sparc64-setup -usr/share/grub +#usr/share/grub +#usr/share/grub/ascii.h +usr/share/grub/ascii.pf2 +usr/share/grub/euro.pf2 usr/share/grub/grub-mkconfig_lib +usr/share/grub/unicode.pf2 +#usr/share/grub/widthspec.h #usr/share/info/grub-dev.info #usr/share/info/grub.info #usr/share/locale/ast/LC_MESSAGES/grub.mo diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 8f3d41476..f79395227 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/x86_64/ipfire-netboot b/config/rootfiles/common/x86_64/ipfire-netboot index b73261feb..33ec55504 100644 --- a/config/rootfiles/common/x86_64/ipfire-netboot +++ b/config/rootfiles/common/x86_64/ipfire-netboot @@ -1,2 +1,3 @@ #usr/share/ipfire-netboot +#usr/share/ipfire-netboot/ipxe.efi #usr/share/ipfire-netboot/ipxe.lkrn diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index d7d070862..697d54ce5 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -22,7 +22,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/des3_ede-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/ghash-clmulni-intel.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/poly1305-x86_64.ko -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx-x86_64.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx2.ko #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-x86_64.ko @@ -1474,7 +1473,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 70a33d659..110114c47 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -103,7 +103,6 @@ usr/local/bin/scanhd usr/local/bin/settime usr/local/bin/timecheck usr/local/bin/timezone-transition -usr/local/bin/update-bootloader usr/local/bin/update-lang-cache usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update diff --git a/config/rootfiles/common/x86_64/syslinux b/config/rootfiles/common/x86_64/syslinux index 89cf5c844..8bab25a02 100644 --- a/config/rootfiles/common/x86_64/syslinux +++ b/config/rootfiles/common/x86_64/syslinux @@ -14,7 +14,9 @@ usr/bin/isohybrid #usr/bin/syslinux2ansi #usr/man/man1/extlinux.1 #usr/man/man1/gethostip.1 +#usr/man/man1/isohybrid.1 #usr/man/man1/lss16toppm.1 +#usr/man/man1/memdiskfind.1 #usr/man/man1/ppmtolss16.1 #usr/man/man1/syslinux.1 #usr/man/man1/syslinux2ansi.1 @@ -25,6 +27,7 @@ usr/bin/isohybrid #usr/share/syslinux/cat.c32 #usr/share/syslinux/chain.c32 #usr/share/syslinux/cmd.c32 +#usr/share/syslinux/cmenu.c32 #usr/share/syslinux/com32 #usr/share/syslinux/com32/com32.ld #usr/share/syslinux/com32/include @@ -36,11 +39,26 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/bitsize/stdint.h #usr/share/syslinux/com32/include/bitsize/stdintconst.h #usr/share/syslinux/com32/include/bitsize/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize32 +#usr/share/syslinux/com32/include/bitsize32/limits.h +#usr/share/syslinux/com32/include/bitsize32/stddef.h +#usr/share/syslinux/com32/include/bitsize32/stdint.h +#usr/share/syslinux/com32/include/bitsize32/stdintconst.h +#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize64 +#usr/share/syslinux/com32/include/bitsize64/limits.h +#usr/share/syslinux/com32/include/bitsize64/stddef.h +#usr/share/syslinux/com32/include/bitsize64/stdint.h +#usr/share/syslinux/com32/include/bitsize64/stdintconst.h +#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h #usr/share/syslinux/com32/include/bufprintf.h +#usr/share/syslinux/com32/include/byteswap.h +#usr/share/syslinux/com32/include/cli.h #usr/share/syslinux/com32/include/colortbl.h #usr/share/syslinux/com32/include/com32.h #usr/share/syslinux/com32/include/console.h #usr/share/syslinux/com32/include/cpufeature.h +#usr/share/syslinux/com32/include/ctime.h #usr/share/syslinux/com32/include/ctype.h #usr/share/syslinux/com32/include/dev.h #usr/share/syslinux/com32/include/dhcp.h @@ -101,6 +119,8 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h #usr/share/syslinux/com32/include/gplinclude/zzjson #usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h +#usr/share/syslinux/com32/include/hw +#usr/share/syslinux/com32/include/hw/vga.h #usr/share/syslinux/com32/include/ilog2.h #usr/share/syslinux/com32/include/inttypes.h #usr/share/syslinux/com32/include/klibc @@ -109,16 +129,27 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/klibc/diverr.h #usr/share/syslinux/com32/include/klibc/endian.h #usr/share/syslinux/com32/include/klibc/extern.h +#usr/share/syslinux/com32/include/klibc/i386 +#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h #usr/share/syslinux/com32/include/klibc/sysconfig.h +#usr/share/syslinux/com32/include/klibc/x86_64 +#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h #usr/share/syslinux/com32/include/libansi.h #usr/share/syslinux/com32/include/limits.h +#usr/share/syslinux/com32/include/linux +#usr/share/syslinux/com32/include/linux/list.h #usr/share/syslinux/com32/include/math.h +#usr/share/syslinux/com32/include/menu.h #usr/share/syslinux/com32/include/minmax.h #usr/share/syslinux/com32/include/netinet #usr/share/syslinux/com32/include/netinet/in.h #usr/share/syslinux/com32/include/png.h #usr/share/syslinux/com32/include/pngconf.h +#usr/share/syslinux/com32/include/refstr.h +#usr/share/syslinux/com32/include/serial.h #usr/share/syslinux/com32/include/setjmp.h +#usr/share/syslinux/com32/include/sort.h +#usr/share/syslinux/com32/include/srecsend.h #usr/share/syslinux/com32/include/stdarg.h #usr/share/syslinux/com32/include/stdbool.h #usr/share/syslinux/com32/include/stddef.h @@ -134,14 +165,24 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/sys/elf32.h #usr/share/syslinux/com32/include/sys/elf64.h #usr/share/syslinux/com32/include/sys/elfcommon.h +#usr/share/syslinux/com32/include/sys/exec.h #usr/share/syslinux/com32/include/sys/fpu.h #usr/share/syslinux/com32/include/sys/gpxe.h +#usr/share/syslinux/com32/include/sys/i386 +#usr/share/syslinux/com32/include/sys/i386/bitops.h +#usr/share/syslinux/com32/include/sys/i386/cpu.h +#usr/share/syslinux/com32/include/sys/i386/module.h #usr/share/syslinux/com32/include/sys/io.h +#usr/share/syslinux/com32/include/sys/module.h #usr/share/syslinux/com32/include/sys/pci.h #usr/share/syslinux/com32/include/sys/stat.h #usr/share/syslinux/com32/include/sys/time.h #usr/share/syslinux/com32/include/sys/times.h #usr/share/syslinux/com32/include/sys/types.h +#usr/share/syslinux/com32/include/sys/x86_64 +#usr/share/syslinux/com32/include/sys/x86_64/bitops.h +#usr/share/syslinux/com32/include/sys/x86_64/cpu.h +#usr/share/syslinux/com32/include/sys/x86_64/module.h #usr/share/syslinux/com32/include/syslinux #usr/share/syslinux/com32/include/syslinux/adv.h #usr/share/syslinux/com32/include/syslinux/advconst.h @@ -150,8 +191,9 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/bootpm.h #usr/share/syslinux/com32/include/syslinux/bootrm.h #usr/share/syslinux/com32/include/syslinux/config.h +#usr/share/syslinux/com32/include/syslinux/debug.h #usr/share/syslinux/com32/include/syslinux/disk.h -#usr/share/syslinux/com32/include/syslinux/features.h +#usr/share/syslinux/com32/include/syslinux/firmware.h #usr/share/syslinux/com32/include/syslinux/idle.h #usr/share/syslinux/com32/include/syslinux/io.h #usr/share/syslinux/com32/include/syslinux/keyboard.h @@ -164,32 +206,86 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/pxe_api.h #usr/share/syslinux/com32/include/syslinux/reboot.h #usr/share/syslinux/com32/include/syslinux/resolve.h +#usr/share/syslinux/com32/include/syslinux/sysappend.h +#usr/share/syslinux/com32/include/syslinux/version.h #usr/share/syslinux/com32/include/syslinux/vesacon.h #usr/share/syslinux/com32/include/syslinux/video.h #usr/share/syslinux/com32/include/syslinux/zio.h +#usr/share/syslinux/com32/include/tftp.h #usr/share/syslinux/com32/include/time.h #usr/share/syslinux/com32/include/tinyjpeg.h #usr/share/syslinux/com32/include/unistd.h +#usr/share/syslinux/com32/include/upload_backend.h #usr/share/syslinux/com32/include/zconf.h #usr/share/syslinux/com32/include/zlib.h -#usr/share/syslinux/com32/libcom32.a -#usr/share/syslinux/com32/libcom32gpl.a #usr/share/syslinux/com32/libcom32upload.a -#usr/share/syslinux/com32/libutil_com.a +#usr/share/syslinux/com32/libgpl.c32 #usr/share/syslinux/com32/libutil_lnx.a #usr/share/syslinux/config.c32 +#usr/share/syslinux/cptime.c32 +#usr/share/syslinux/cpu.c32 #usr/share/syslinux/cpuid.c32 #usr/share/syslinux/cpuidtest.c32 +#usr/share/syslinux/debug.c32 +#usr/share/syslinux/dhcp.c32 #usr/share/syslinux/diag #usr/share/syslinux/diag/geodsp1s.img.xz #usr/share/syslinux/diag/geodspms.img.xz #usr/share/syslinux/diag/handoff.bin +#usr/share/syslinux/dir.c32 #usr/share/syslinux/disk.c32 +#usr/share/syslinux/dmi.c32 #usr/share/syslinux/dmitest.c32 #usr/share/syslinux/dosutil #usr/share/syslinux/dosutil/copybs.com #usr/share/syslinux/dosutil/eltorito.sys #usr/share/syslinux/dosutil/mdiskchk.com +#usr/share/syslinux/efi64 +#usr/share/syslinux/efi64/cat.c32 +#usr/share/syslinux/efi64/chain.c32 +#usr/share/syslinux/efi64/cmd.c32 +#usr/share/syslinux/efi64/cmenu.c32 +#usr/share/syslinux/efi64/config.c32 +#usr/share/syslinux/efi64/cptime.c32 +#usr/share/syslinux/efi64/cpu.c32 +#usr/share/syslinux/efi64/cpuid.c32 +#usr/share/syslinux/efi64/cpuidtest.c32 +#usr/share/syslinux/efi64/debug.c32 +#usr/share/syslinux/efi64/dhcp.c32 +#usr/share/syslinux/efi64/dir.c32 +#usr/share/syslinux/efi64/dmi.c32 +#usr/share/syslinux/efi64/dmitest.c32 +#usr/share/syslinux/efi64/gfxboot.c32 +#usr/share/syslinux/efi64/hdt.c32 +#usr/share/syslinux/efi64/hexdump.c32 +#usr/share/syslinux/efi64/host.c32 +#usr/share/syslinux/efi64/ifcpu.c32 +#usr/share/syslinux/efi64/ifcpu64.c32 +#usr/share/syslinux/efi64/ldlinux.e64 +#usr/share/syslinux/efi64/lfs.c32 +#usr/share/syslinux/efi64/libcom32.c32 +#usr/share/syslinux/efi64/libgpl.c32 +#usr/share/syslinux/efi64/liblua.c32 +#usr/share/syslinux/efi64/libmenu.c32 +#usr/share/syslinux/efi64/libutil.c32 +#usr/share/syslinux/efi64/linux.c32 +#usr/share/syslinux/efi64/ls.c32 +#usr/share/syslinux/efi64/lua.c32 +#usr/share/syslinux/efi64/mboot.c32 +#usr/share/syslinux/efi64/meminfo.c32 +#usr/share/syslinux/efi64/menu.c32 +#usr/share/syslinux/efi64/pci.c32 +#usr/share/syslinux/efi64/pwd.c32 +#usr/share/syslinux/efi64/reboot.c32 +#usr/share/syslinux/efi64/rosh.c32 +#usr/share/syslinux/efi64/sysdump.c32 +#usr/share/syslinux/efi64/syslinux.c32 +#usr/share/syslinux/efi64/syslinux.efi +#usr/share/syslinux/efi64/vesa.c32 +#usr/share/syslinux/efi64/vesamenu.c32 +#usr/share/syslinux/efi64/vpdtest.c32 +#usr/share/syslinux/efi64/whichsys.c32 +#usr/share/syslinux/efi64/zzjson.c32 #usr/share/syslinux/elf.c32 #usr/share/syslinux/ethersel.c32 #usr/share/syslinux/gfxboot.c32 @@ -197,15 +293,13 @@ usr/bin/isohybrid #usr/share/syslinux/gptmbr_c.bin #usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxecmd.c32 -#usr/share/syslinux/gpxelinux.0 -#usr/share/syslinux/gpxelinuxk.0 #usr/share/syslinux/hdt.c32 +#usr/share/syslinux/hexdump.c32 #usr/share/syslinux/host.c32 #usr/share/syslinux/ifcpu.c32 #usr/share/syslinux/ifcpu64.c32 #usr/share/syslinux/ifmemdsk.c32 #usr/share/syslinux/ifplop.c32 -#usr/share/syslinux/int18.com #usr/share/syslinux/isohdpfx.bin #usr/share/syslinux/isohdpfx_c.bin #usr/share/syslinux/isohdpfx_f.bin @@ -216,7 +310,15 @@ usr/bin/isohybrid #usr/share/syslinux/isolinux.bin #usr/share/syslinux/kbdmap.c32 #usr/share/syslinux/kontron_wdt.c32 +#usr/share/syslinux/ldlinux.c32 +#usr/share/syslinux/lfs.c32 +#usr/share/syslinux/libcom32.c32 +#usr/share/syslinux/libgpl.c32 +#usr/share/syslinux/liblua.c32 +#usr/share/syslinux/libmenu.c32 +#usr/share/syslinux/libutil.c32 #usr/share/syslinux/linux.c32 +#usr/share/syslinux/lpxelinux.0 #usr/share/syslinux/ls.c32 #usr/share/syslinux/lua.c32 #usr/share/syslinux/mboot.c32 @@ -224,15 +326,14 @@ usr/bin/isohybrid #usr/share/syslinux/mbr_c.bin #usr/share/syslinux/mbr_f.bin #usr/share/syslinux/memdisk -#usr/share/syslinux/memdump.com #usr/share/syslinux/meminfo.c32 #usr/share/syslinux/menu.c32 +#usr/share/syslinux/pci.c32 #usr/share/syslinux/pcitest.c32 #usr/share/syslinux/pmload.c32 -#usr/share/syslinux/poweroff.com +#usr/share/syslinux/poweroff.c32 #usr/share/syslinux/prdhcp.c32 #usr/share/syslinux/pwd.c32 -#usr/share/syslinux/pxechain.com #usr/share/syslinux/pxechn.c32 #usr/share/syslinux/pxelinux.0 #usr/share/syslinux/reboot.c32 @@ -240,10 +341,9 @@ usr/bin/isohybrid #usr/share/syslinux/sanboot.c32 #usr/share/syslinux/sdi.c32 #usr/share/syslinux/sysdump.c32 +#usr/share/syslinux/syslinux.c32 #usr/share/syslinux/syslinux.com -#usr/share/syslinux/syslinux.exe -#usr/share/syslinux/syslinux64.exe -#usr/share/syslinux/ver.com +#usr/share/syslinux/vesa.c32 #usr/share/syslinux/vesainfo.c32 #usr/share/syslinux/vesamenu.c32 #usr/share/syslinux/vpdtest.c32 diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/124/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/core/124/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/124/filelists/aarch64/efibootmgr b/config/rootfiles/core/124/filelists/aarch64/efibootmgr new file mode 120000 index 000000000..55970e1dd --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/efibootmgr @@ -0,0 +1 @@ +../../../../common/aarch64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/efivar b/config/rootfiles/core/124/filelists/aarch64/efivar new file mode 120000 index 000000000..8a3b708b9 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/efivar @@ -0,0 +1 @@ +../../../../common/aarch64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/files @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/core/124/filelists/aarch64/grub b/config/rootfiles/core/124/filelists/aarch64/grub new file mode 120000 index 000000000..40ae85fb6 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/linux b/config/rootfiles/core/124/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/linux-initrd b/config/rootfiles/core/124/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/124/filelists/armv5tel/files @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood new file mode 120000 index 000000000..39c5591b7 --- /dev/null +++ b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-multi b/config/rootfiles/core/124/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/124/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/bind b/config/rootfiles/core/124/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/124/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/ca-certificates b/config/rootfiles/core/124/filelists/ca-certificates new file mode 120000 index 000000000..320fea8f4 --- /dev/null +++ b/config/rootfiles/core/124/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/cdrkit b/config/rootfiles/core/124/filelists/cdrkit new file mode 120000 index 000000000..89c6f6ca1 --- /dev/null +++ b/config/rootfiles/core/124/filelists/cdrkit @@ -0,0 +1 @@ +../../../common/cdrkit \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files new file mode 100644 index 000000000..25e812593 --- /dev/null +++ b/config/rootfiles/core/124/filelists/files @@ -0,0 +1,29 @@ +etc/system-release +etc/issue +etc/rc.d/helper/aws-setup +etc/rc.d/init.d/aws +etc/rc.d/init.d/localnet +etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/partresize +etc/rc.d/init.d/static-routes +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/sysctl.conf +etc/unbound/unbound.conf +opt/pakfire/lib/functions.pl +opt/pakfire/pakfire +srv/web/ipfire/cgi-bin/backup.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/redirect-templates/legacy/template.html +usr/bin/install-bootloader +usr/local/bin/backupiso +usr/local/bin/rebuild-initrd +var/ipfire/backup/bin/backup.pl +var/ipfire/backup/exclude +var/ipfire/backup/include +var/ipfire/langs diff --git a/config/rootfiles/core/124/filelists/i586/grub b/config/rootfiles/core/124/filelists/i586/grub new file mode 120000 index 000000000..feb236a22 --- /dev/null +++ b/config/rootfiles/core/124/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/i586/linux b/config/rootfiles/core/124/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/124/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/i586/linux-initrd b/config/rootfiles/core/124/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/124/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/iproute2 b/config/rootfiles/core/124/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/124/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/ntp b/config/rootfiles/core/124/filelists/ntp new file mode 120000 index 000000000..7542d86cb --- /dev/null +++ b/config/rootfiles/core/124/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/openssh b/config/rootfiles/core/124/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/124/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/parted b/config/rootfiles/core/124/filelists/parted new file mode 120000 index 000000000..89195d8e8 --- /dev/null +++ b/config/rootfiles/core/124/filelists/parted @@ -0,0 +1 @@ +../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/pciutils b/config/rootfiles/core/124/filelists/pciutils new file mode 120000 index 000000000..aeb45e7b3 --- /dev/null +++ b/config/rootfiles/core/124/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/rng-tools b/config/rootfiles/core/124/filelists/rng-tools new file mode 120000 index 000000000..a7853e41b --- /dev/null +++ b/config/rootfiles/core/124/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/unbound b/config/rootfiles/core/124/filelists/unbound similarity index 100% rename from config/rootfiles/core/123/filelists/unbound rename to config/rootfiles/core/124/filelists/unbound diff --git a/config/rootfiles/core/124/filelists/x86_64/efibootmgr b/config/rootfiles/core/124/filelists/x86_64/efibootmgr new file mode 120000 index 000000000..d6964dba9 --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/efibootmgr @@ -0,0 +1 @@ +../../../../common/x86_64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/efivar b/config/rootfiles/core/124/filelists/x86_64/efivar new file mode 120000 index 000000000..994ea5e1b --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/efivar @@ -0,0 +1 @@ +../../../../common/x86_64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/grub b/config/rootfiles/core/124/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/linux b/config/rootfiles/core/124/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/linux-initrd b/config/rootfiles/core/124/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh new file mode 100644 index 000000000..b65bc52b8 --- /dev/null +++ b/config/rootfiles/core/124/update.sh @@ -0,0 +1,166 @@ +#!/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) 2018 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=124 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 80000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors + +# Stop services + +# Remove files +rm -f \ + /etc/rc.d/rcsysinit.d/S90network-trigger \ + /etc/rc.d/init.d/network-trigger + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + +# Start services +/etc/init.d/rngd restart +/etc/init.d/ntp restart +/etc/init.d/unbound restart + +# Reload sysctl.conf +sysctl -p + +# rebuild initrd to add early microcode updates +rebuild-initrd + +# Remove deprecated GRUB configuration option +if [ -e "/etc/default/grub" ]; then + sed -e "/^GRUB_FONT/d" -i /etc/default/grub +fi + +# Update bootloader +/usr/bin/install-bootloader + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac + +# This update needs a reboot... +if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then + touch /var/run/need_reboot +fi + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/123/exclude b/config/rootfiles/oldcore/123/exclude similarity index 100% rename from config/rootfiles/core/123/exclude rename to config/rootfiles/oldcore/123/exclude diff --git a/config/rootfiles/core/123/filelists/apache2 b/config/rootfiles/oldcore/123/filelists/apache2 similarity index 100% rename from config/rootfiles/core/123/filelists/apache2 rename to config/rootfiles/oldcore/123/filelists/apache2 diff --git a/config/rootfiles/core/123/filelists/conntrack-tools b/config/rootfiles/oldcore/123/filelists/conntrack-tools similarity index 100% rename from config/rootfiles/core/123/filelists/conntrack-tools rename to config/rootfiles/oldcore/123/filelists/conntrack-tools diff --git a/config/rootfiles/core/123/filelists/coreutils b/config/rootfiles/oldcore/123/filelists/coreutils similarity index 100% rename from config/rootfiles/core/123/filelists/coreutils rename to config/rootfiles/oldcore/123/filelists/coreutils diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/oldcore/123/filelists/files similarity index 100% rename from config/rootfiles/core/123/filelists/files rename to config/rootfiles/oldcore/123/filelists/files diff --git a/config/rootfiles/core/123/filelists/gnupg b/config/rootfiles/oldcore/123/filelists/gnupg similarity index 100% rename from config/rootfiles/core/123/filelists/gnupg rename to config/rootfiles/oldcore/123/filelists/gnupg diff --git a/config/rootfiles/core/123/filelists/i586/intel-microcode b/config/rootfiles/oldcore/123/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/123/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/123/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/123/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/123/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/123/filelists/iana-etc b/config/rootfiles/oldcore/123/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/123/filelists/iana-etc rename to config/rootfiles/oldcore/123/filelists/iana-etc diff --git a/config/rootfiles/core/123/filelists/ipset b/config/rootfiles/oldcore/123/filelists/ipset similarity index 100% rename from config/rootfiles/core/123/filelists/ipset rename to config/rootfiles/oldcore/123/filelists/ipset diff --git a/config/rootfiles/core/123/filelists/iptables b/config/rootfiles/oldcore/123/filelists/iptables similarity index 100% rename from config/rootfiles/core/123/filelists/iptables rename to config/rootfiles/oldcore/123/filelists/iptables diff --git a/config/rootfiles/core/123/filelists/libgcrypt b/config/rootfiles/oldcore/123/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/123/filelists/libgcrypt rename to config/rootfiles/oldcore/123/filelists/libgcrypt diff --git a/config/rootfiles/core/123/filelists/linux-firmware-updates b/config/rootfiles/oldcore/123/filelists/linux-firmware-updates similarity index 100% rename from config/rootfiles/core/123/filelists/linux-firmware-updates rename to config/rootfiles/oldcore/123/filelists/linux-firmware-updates diff --git a/config/rootfiles/core/123/filelists/nss-myhostname b/config/rootfiles/oldcore/123/filelists/nss-myhostname similarity index 100% rename from config/rootfiles/core/123/filelists/nss-myhostname rename to config/rootfiles/oldcore/123/filelists/nss-myhostname diff --git a/config/rootfiles/core/123/filelists/openssl b/config/rootfiles/oldcore/123/filelists/openssl similarity index 100% rename from config/rootfiles/core/123/filelists/openssl rename to config/rootfiles/oldcore/123/filelists/openssl diff --git a/config/rootfiles/core/123/filelists/openssl-compat b/config/rootfiles/oldcore/123/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/123/filelists/openssl-compat rename to config/rootfiles/oldcore/123/filelists/openssl-compat diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/oldcore/123/filelists/squid similarity index 100% rename from config/rootfiles/core/123/filelists/squid rename to config/rootfiles/oldcore/123/filelists/squid diff --git a/config/rootfiles/core/123/filelists/strongswan b/config/rootfiles/oldcore/123/filelists/strongswan similarity index 100% rename from config/rootfiles/core/123/filelists/strongswan rename to config/rootfiles/oldcore/123/filelists/strongswan diff --git a/config/rootfiles/core/123/filelists/tzdata b/config/rootfiles/oldcore/123/filelists/tzdata similarity index 100% rename from config/rootfiles/core/123/filelists/tzdata rename to config/rootfiles/oldcore/123/filelists/tzdata diff --git a/config/rootfiles/oldcore/123/filelists/unbound b/config/rootfiles/oldcore/123/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/oldcore/123/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/123/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/123/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/123/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/123/filelists/xtables-addons b/config/rootfiles/oldcore/123/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/123/filelists/xtables-addons rename to config/rootfiles/oldcore/123/filelists/xtables-addons diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/oldcore/123/update.sh similarity index 100% rename from config/rootfiles/core/123/update.sh rename to config/rootfiles/oldcore/123/update.sh diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index bcdd85a71..12473cd18 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -10,7 +10,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/crc32-pclmul.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/glue_helper.ko -#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/salsa20-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/serpent-sse2-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/twofish-i586.ko #lib/modules/KVER-ipfire-pae/kernel/arch/x86/events @@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_mmap.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_srab.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_mdio.ko diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config new file mode 100644 index 000000000..2abfae6d1 --- /dev/null +++ b/config/ssh/ssh_config @@ -0,0 +1,33 @@ +# OpenSSH client configuration +# +# set some basic hardening options for all connections +Host * + # disable Roaming as it is known to be vulnerable + UseRoaming no + + # only use secure crypto algorithm + KexAlgorithms curve25519-sha256(a)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 (has no technical + # effect, but 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 + ServerAliveInterval 10 + ServerAliveCountMax 6 + + # disable X11 forwarding (security risk) + ForwardX11 no + + # always check server IP address + CheckHostIP yes + + # ensure only allowed authentication methods are used + PreferredAuthentications publickey,keyboard-interactive,password + +# EOF diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config new file mode 100644 index 000000000..4a25e8383 --- /dev/null +++ b/config/ssh/sshd_config @@ -0,0 +1,78 @@ +# ultra-secure OpenSSH server configuration + +# only allow version 2 of SSH protocol +Protocol 2 + +# listen on port 22 by default +Port 22 + +# listen on these interfaces and protocols +AddressFamily any +ListenAddress 0.0.0.0 + +# limit authentication thresholds +LoginGraceTime 30s +MaxAuthTries 3 + +# limit maximum instanctes to prevent DoS +MaxStartups 5 + +# ensure proper logging +SyslogFacility AUTH +LogLevel INFO + +# enforce permission checks before a login is accepted +# (prevents damage because of hacked systems with world-writeable +# home directories or similar) +StrictModes yes + +# 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(a)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 + +# enable data compression after successful login only +Compression delayed + +# only allow cryptographically safe SSH host keys (adjust paths if needed) +HostKey /etc/ssh/ssh_host_ed25519_key +HostKey /etc/ssh/ssh_host_ecdsa_key +HostKey /etc/ssh/ssh_host_rsa_key + +# only allow login via public key by default +PubkeyAuthentication yes +PasswordAuthentication no +ChallengeResponseAuthentication no +PermitEmptyPasswords no + +# permit root login as there is no other user in IPFire 2.x +PermitRootLogin yes + +# ignore user ~/.rhost* files +IgnoreRhosts yes + +# ignore user known hosts file +IgnoreUserKnownHosts yes + +# ignore user environments +PermitUserEnvironment no + +# do not allow any kind of forwarding (provides only low security) +# some of them might need to be re-enabled if SSH server is a jump platform +X11Forwarding no +AllowTcpForwarding no +AllowAgentForwarding no +PermitTunnel no +GatewayPorts no +PermitOpen none + +# detect broken sessions by sending keep-alive messages to +# clients (both via TCP and SSH) +TCPKeepAlive yes +ClientAliveInterval 10 + +# close unresponsive SSH sessions which fail to answer keep-alive +ClientAliveCountMax 6 + +# EOF diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 1d3017ba9..5184e6f87 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -73,6 +73,14 @@ fi; setenv fdt_high ffffffff; fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; + +if test "${FDTCMDS}" = ""; then + echo ; +else + fdt addr ${fdt_addr_r}; + run FDTCMDS; +fi; + setenv ramdisk_addr ${ramdisk_addr_r} if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then echo Ramdisk loaded...; diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 0d9e67b96..d9395c0ae 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf index 3f724d8f7..cda591dab 100644 --- a/config/unbound/unbound.conf +++ b/config/unbound/unbound.conf @@ -59,7 +59,11 @@ server: harden-below-nxdomain: yes harden-referral-path: yes harden-algo-downgrade: no - use-caps-for-id: no + use-caps-for-id: yes + aggressive-nsec: yes + + # Harden against DNS cache poisoning + unwanted-reply-threshold: 1000000 # Listen on all interfaces interface-automatic: yes diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 86e21cf34..cac4146ab 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -24,6 +24,7 @@ use strict; #use warnings; #use CGI::Carp 'fatalsToBrowser'; use File::Copy; +use File::Basename; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -58,44 +59,25 @@ system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ ############################################################################################################################ ############################################## System calls ohne Http Header ############################################### -# Replace slashes from filename -$cgiparams{'FILE'} =~ s/\///; - -if ( $cgiparams{'ACTION'} eq "download" ) -{ - open(DLFILE, "</var/ipfire/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!"; - my @fileholder = <DLFILE>; - print "Content-Type:application/x-download\n"; - my @fileinfo = stat("/var/ipfire/backup/$cgiparams{'FILE'}"); - print "Content-Length:$fileinfo[7]\n"; - print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; - print @fileholder; - exit (0); -} -if ( $cgiparams{'ACTION'} eq "downloadiso" ) -{ - open(DLFILE, "</var/tmp/backupiso/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!"; - my @fileholder = <DLFILE>; - print "Content-Type:application/x-download\n"; - my @fileinfo = stat("/var/tmp/backupiso/$cgiparams{'FILE'}"); - print "Content-Length:$fileinfo[7]\n"; - print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; - print @fileholder; - exit (0); -} -if ( $cgiparams{'ACTION'} eq "downloadaddon" ) -{ - open(DLFILE, "</var/ipfire/backup/addons/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!"; - my @fileholder = <DLFILE>; - print "Content-Type:application/x-download\n"; - my @fileinfo = stat("/var/ipfire/backup/addons/backup/$cgiparams{'FILE'}"); - print "Content-Length:$fileinfo[7]\n"; - print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; - print @fileholder; - exit (0); -} -elsif ( $cgiparams{'ACTION'} eq "restore" ) -{ +if ($cgiparams{'ACTION'} eq "download") { + my $file = &sanitise_file($cgiparams{'FILE'}); + exit(1) unless defined($file); + + &deliver_file($file); + exit(0); +} elsif ($cgiparams{'ACTION'} eq "downloadiso") { + my $file = &sanitise_file($cgiparams{'FILE'}); + exit(1) unless defined($file); + + &deliver_file($file); + exit(0); +} elsif ($cgiparams{'ACTION'} eq "downloadaddon") { + my $file = &sanitise_file($cgiparams{'FILE'}); + exit(1) unless defined($file); + + &deliver_file($file); + exit(0); +} elsif ( $cgiparams{'ACTION'} eq "restore") { my $upload = $a->param("UPLOAD"); open UPLOADFILE, ">/tmp/restore.ipf"; binmode $upload; @@ -142,11 +124,20 @@ if ( $cgiparams{'ACTION'} eq "backup" ) } if ( $cgiparams{'ACTION'} eq "addonbackup" ) { + # Exit if there is any dots or slashes in the addon name + exit(1) if ($cgiparams{'ADDON'} =~ /(\.|\/)/); + + # Check if the addon exists + exit(1) unless (-e "/var/ipfire/backup/addons/includes/$cgiparams{'ADDON'}"); + system("/usr/local/bin/backupctrl addonbackup $cgiparams{'ADDON'} >/dev/null 2>&1"); } elsif ( $cgiparams{'ACTION'} eq "delete" ) { - system("/usr/local/bin/backupctrl $cgiparams{'FILE'} >/dev/null 2>&1"); + my $file = &sanitise_file($cgiparams{'FILE'}); + exit(1) unless defined($file); + + system("/usr/local/bin/backupctrl $file >/dev/null 2>&1"); } ############################################################################################################################ @@ -273,7 +264,7 @@ print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='delete' /> - <input type='hidden' name='FILE' value='addons//backup/$_.ipf' /> + <input type='hidden' name='FILE' value='$_.ipf' /> <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> </form> </td> @@ -312,7 +303,7 @@ print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='delete' /> - <input type='hidden' name='FILE' value='addons//backup/$_.ipf' /> + <input type='hidden' name='FILE' value='$_.ipf' /> <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> </form> </td> @@ -340,3 +331,41 @@ END &Header::closebox(); &Header::closebigbox(); &Header::closepage(); + +sub sanitise_file() { + my $file = shift; + + # Filenames cannot contain any slashes + return undef if ($file =~ /\//); + + # File must end with .ipf or .iso + return undef unless ($file =~ /\.(ipf|iso)$/); + + # Convert to absolute path + if (-e "/var/ipfire/backup/$file") { + return "/var/ipfire/backup/$file"; + } elsif (-e "/var/ipfire/backup/addons/backup/$file") { + return "/var/ipfire/backup/addons/backup/$file"; + } elsif (-e "/var/tmp/backupiso/$file") { + return "/var/tmp/backupiso/$file"; + } + + # File does not seem to exist + return undef; +} + +sub deliver_file() { + my $file = shift; + my @stat = stat($file); + + # Print headers + print "Content-Disposition: attachment; filename=" . &File::Basename::basename($file) . "\n"; + print "Content-Type: application/octet-stream\n"; + print "Content-Length: $stat[7]\n"; + print "\n"; + + # Deliver content + open(FILE, "<$file") or die "Unable to open $file: $!"; + print <FILE>; + close(FILE); +} diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 499f279d1..fb1c25dfd 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -241,10 +241,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') $checkorange='on'; } } - #check useless rules - if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){ - $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>"; - } #check if we try to break rules if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ $errormessage=$Lang::tr{'fwdfw err same'}; diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 576701ac6..7315e79b6 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1258,6 +1258,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname') } &General::writehasharray("$configgrp", \%customgrp ); #change name in FW Rules + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4); &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6); } } @@ -1282,6 +1283,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname') &General::writehasharray("$configgeoipgrp", \%customgeoipgrp ); #change name in FW Rules &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip"); + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6,"geoip"); } } &addgeoipgrp; diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 9863251e2..d9d697deb 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -265,7 +265,7 @@ if (!$errormessage) { } elsif ($snortsettings{'RULES'} eq 'community') { $url=" https://www.snort.org/rules/community"; } else { - $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; + $url="https://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) { diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index ef9da2389..03dc3574d 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -465,6 +465,10 @@ END my $activecolor = $Header::colourred; my $activestatus = $Lang::tr{'capsclosed'}; + if ($vpnconfig{$key}[33] eq "add") { + $activecolor = ${Header::colourorange}; + $activestatus = $Lang::tr{'vpn wait'}; + } if ($vpnconfig{$key}[0] eq 'off') { $activecolor = $Header::colourblue; $activestatus = $Lang::tr{'capsclosed'}; @@ -479,9 +483,6 @@ END } elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) { $activecolor = $Header::colourorange; $activestatus = $Lang::tr{'vpn on-demand'}; - } elsif ($vpnconfig{$key}[33] eq "add") { - $activecolor = ${Header::colourorange}; - $activestatus = $Lang::tr{'vpn wait'}; } } } diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 143f123b7..79ff636c8 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -43,7 +43,6 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; $pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'HEALTHCHECK'} = 'on'; $pakfiresettings{'UUID'} = 'on'; sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();} @@ -163,9 +162,6 @@ my %checked=(); $checked{'AUTOUPDATE'}{'off'} = ''; $checked{'AUTOUPDATE'}{'on'} = ''; $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'"; -$checked{'HEALTHCHECK'}{'off'} = ''; -$checked{'HEALTHCHECK'}{'on'} = ''; -$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'"; $checked{'UUID'}{'off'} = ''; $checked{'UUID'}{'on'} = ''; $checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'"; @@ -292,13 +288,6 @@ print <<END; <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left"> on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> | <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr> - <tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left"> - on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> | - <input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr> - <tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left"> - on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> | - <input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr> - <tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr> </table> </form> END diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index e557122df..21fd1f4cd 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2844,8 +2844,11 @@ END } print "<td align='center' $col>$confighash{$key}[25]</td>"; my $col1="bgcolor='${Header::colourred}'"; - # get real state my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; + if ($confighash{$key}[33] eq "add") { + $col1="bgcolor='${Header::colourorange}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>"; + } foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { @@ -2857,9 +2860,6 @@ END } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) { $col1="bgcolor='${Header::colourorange}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>"; - } elsif ($confighash{$key}[33] eq "add") { - $col1="bgcolor='${Header::colourorange}'"; - $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>"; } } # move to blue if really down diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html index b5fb61ebe..297561e3a 100644 --- a/html/html/redirect-templates/legacy/template.html +++ b/html/html/redirect-templates/legacy/template.html @@ -3,11 +3,16 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ACCESS MESSAGE</title> + <style content="text/css"> + td.image { + background-image: url(data:image/gif;base64,IMAGEDATAPLACEHOLDER); + } + </style> </head> <body> <table width="100%" height='100%' border="0"> <tr> - <td colspan='3' width='100%' height='130' align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif"> + <td colspan='3' width='100%' height='152px' align="center" class="image"> </td> <tr> <td width='10%'> <td align='center' bgcolor='#CC000000' width='80%'> diff --git a/lfs/7zip b/lfs/7zip index fbf63b353..0c16a6f6f 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Archive-Tar b/lfs/Archive-Tar index eea96992e..6b14079d4 100644 --- a/lfs/Archive-Tar +++ b/lfs/Archive-Tar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Archive-Zip b/lfs/Archive-Zip index 350a13fef..442682967 100644 --- a/lfs/Archive-Zip +++ b/lfs/Archive-Zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/BerkeleyDB b/lfs/BerkeleyDB index 48d535fca..f79b29ec0 100644 --- a/lfs/BerkeleyDB +++ b/lfs/BerkeleyDB @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Compress-Zlib b/lfs/Compress-Zlib index 93eef1ad3..769f90660 100644 --- a/lfs/Compress-Zlib +++ b/lfs/Compress-Zlib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Config b/lfs/Config index 82bdde066..516fb1cab 100644 --- a/lfs/Config +++ b/lfs/Config @@ -79,6 +79,19 @@ DIR_TMP = /tmp # Add the compiler location and version and specs to the ccache hash CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1) +# We support EFI on x86_64 and aarch64 +ifeq "$(BUILD_ARCH)" "x86_64" + EFI = 1 + EFI_ARCH = x64 + GRUB_ARCH = $(BUILD_ARCH) +endif + +ifeq "$(BUILD_ARCH)" "aarch64" + EFI = 1 + EFI_ARCH = aa64 + GRUB_ARCH = arm64 +endif + ############################################################################### # Common Macro Definitions ############################################################################### diff --git a/lfs/Convert-TNEF b/lfs/Convert-TNEF index 2a91578be..ad21047f9 100644 --- a/lfs/Convert-TNEF +++ b/lfs/Convert-TNEF @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Convert-UUlib b/lfs/Convert-UUlib index 84af6c0cb..f2e22429c 100644 --- a/lfs/Convert-UUlib +++ b/lfs/Convert-UUlib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Crypt-PasswdMD5 b/lfs/Crypt-PasswdMD5 index 57c88fca7..e337b2343 100644 --- a/lfs/Crypt-PasswdMD5 +++ b/lfs/Crypt-PasswdMD5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Digest b/lfs/Digest index 568e620cc..3c66fc1cf 100644 --- a/lfs/Digest +++ b/lfs/Digest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Digest-HMAC b/lfs/Digest-HMAC index 73f376430..3c11f438e 100644 --- a/lfs/Digest-HMAC +++ b/lfs/Digest-HMAC @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Digest-SHA1 b/lfs/Digest-SHA1 index 1cbb71ced..c1dfd7258 100644 --- a/lfs/Digest-SHA1 +++ b/lfs/Digest-SHA1 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/GD-Graph b/lfs/GD-Graph index 2565a074d..044344df1 100644 --- a/lfs/GD-Graph +++ b/lfs/GD-Graph @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/GD-TextUtil b/lfs/GD-TextUtil index 91e3d0624..cde74b631 100644 --- a/lfs/GD-TextUtil +++ b/lfs/GD-TextUtil @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/GeoIP b/lfs/GeoIP index 013da0e52..ce758d8a5 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/HTML-Parser b/lfs/HTML-Parser index 184c234d2..973dfc12b 100644 --- a/lfs/HTML-Parser +++ b/lfs/HTML-Parser @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/HTML-Tagset b/lfs/HTML-Tagset index ae6ac5a3e..b3873e762 100644 --- a/lfs/HTML-Tagset +++ b/lfs/HTML-Tagset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/HTML-Template b/lfs/HTML-Template index fb837ba52..75af91ffe 100644 --- a/lfs/HTML-Template +++ b/lfs/HTML-Template @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/IO-Socket-SSL b/lfs/IO-Socket-SSL index fef8097e0..f328fd811 100644 --- a/lfs/IO-Socket-SSL +++ b/lfs/IO-Socket-SSL @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### @@ -59,4 +59,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make cd $(DIR_APP) && make install @rm -rf $(DIR_APP) - @$(POSTBUILD) \ No newline at end of file + @$(POSTBUILD) diff --git a/lfs/IO-Stringy b/lfs/IO-Stringy index e280398a4..be877eb13 100644 --- a/lfs/IO-Stringy +++ b/lfs/IO-Stringy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Locale-Country b/lfs/Locale-Country index 02bf7a026..55482a980 100644 --- a/lfs/Locale-Country +++ b/lfs/Locale-Country @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools index 6e2e2ef99..150a1a6d1 100644 --- a/lfs/MIME-Tools +++ b/lfs/MIME-Tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Mail-Tools b/lfs/Mail-Tools index 4e4b8faab..da352f51b 100644 --- a/lfs/Mail-Tools +++ b/lfs/Mail-Tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Net-DNS b/lfs/Net-DNS index 71bae29fd..65e13d17d 100644 --- a/lfs/Net-DNS +++ b/lfs/Net-DNS @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Net-IPv4Addr b/lfs/Net-IPv4Addr index d7ab97f31..31082bd76 100644 --- a/lfs/Net-IPv4Addr +++ b/lfs/Net-IPv4Addr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Net-Server b/lfs/Net-Server index ce65f9183..554d9e8d6 100644 --- a/lfs/Net-Server +++ b/lfs/Net-Server @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Net-Telnet b/lfs/Net-Telnet index 8d911f80b..6d1a185ac 100644 --- a/lfs/Net-Telnet +++ b/lfs/Net-Telnet @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Net_SSLeay b/lfs/Net_SSLeay index 613c3d9e9..90c0a310a 100644 --- a/lfs/Net_SSLeay +++ b/lfs/Net_SSLeay @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Text-Tabs+Wrap b/lfs/Text-Tabs+Wrap index 31097ca4b..68f8662b0 100644 --- a/lfs/Text-Tabs+Wrap +++ b/lfs/Text-Tabs+Wrap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/URI b/lfs/URI index 1642c8286..b00d4bc21 100644 --- a/lfs/URI +++ b/lfs/URI @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/Unix-Syslog b/lfs/Unix-Syslog index bc6367d8e..089584b6e 100644 --- a/lfs/Unix-Syslog +++ b/lfs/Unix-Syslog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/XML-Parser b/lfs/XML-Parser index bbdf3e00d..98df1d0ec 100644 --- a/lfs/XML-Parser +++ b/lfs/XML-Parser @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/acl b/lfs/acl index de3ac4935..2bfa818d2 100644 --- a/lfs/acl +++ b/lfs/acl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/acpid b/lfs/acpid index c70d130d9..986109d93 100644 --- a/lfs/acpid +++ b/lfs/acpid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/alsa b/lfs/alsa index 72ea70d20..80293ce49 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/amavisd b/lfs/amavisd index 7230c0c0e..a46866236 100644 --- a/lfs/amavisd +++ b/lfs/amavisd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/apache2 b/lfs/apache2 index 0e526a575..1ef6bdec0 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/apcupsd b/lfs/apcupsd index ce36c3c6f..e9766bb57 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/apr b/lfs/apr index 47c21a325..e384ab3c0 100644 --- a/lfs/apr +++ b/lfs/apr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/aprutil b/lfs/aprutil index 29ec5df43..3bd0861dc 100644 --- a/lfs/aprutil +++ b/lfs/aprutil @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/arm b/lfs/arm index 2fbf65eac..a8fae41df 100644 --- a/lfs/arm +++ b/lfs/arm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/arping b/lfs/arping index 86f7279a2..26ee1c5fb 100644 --- a/lfs/arping +++ b/lfs/arping @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/asterisk b/lfs/asterisk index 8bedb4f28..08e2edb30 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/attr b/lfs/attr index f3b6b1fb8..bdae19a11 100644 --- a/lfs/attr +++ b/lfs/attr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/autoconf b/lfs/autoconf index 7e622da86..4abc8353a 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/automake b/lfs/automake index d18439443..26d17f540 100644 --- a/lfs/automake +++ b/lfs/automake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/avahi b/lfs/avahi index cc1d5c336..26508adbe 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/aws-cli b/lfs/aws-cli index f5d2e36be..10f1c7232 100644 --- a/lfs/aws-cli +++ b/lfs/aws-cli @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/backports b/lfs/backports index 5f43ff4d6..0ad9b0c5d 100644 --- a/lfs/backports +++ b/lfs/backports @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/backup b/lfs/backup index d0038724c..b8b841bcb 100644 --- a/lfs/backup +++ b/lfs/backup @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bacula b/lfs/bacula index 591476b9f..bef221b6a 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bash b/lfs/bash index bb2a38b34..09b4e71e6 100644 --- a/lfs/bash +++ b/lfs/bash @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/batctl b/lfs/batctl index 6a6698284..36401609c 100644 --- a/lfs/batctl +++ b/lfs/batctl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bc b/lfs/bc index 51dd08419..21ff32f02 100644 --- a/lfs/bc +++ b/lfs/bc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/berkeley b/lfs/berkeley index d15eba198..602532182 100644 --- a/lfs/berkeley +++ b/lfs/berkeley @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bind b/lfs/bind index 35f76443e..8b04037b7 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.3 +VER = 9.11.4-P1 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4ed2a3f235595eadbd763b7ecb687ca0 +$(DL_FILE)_MD5 = b2c54d6c2003b693388041fd109e8b6b install : $(TARGET) diff --git a/lfs/bird b/lfs/bird index e7b89bdd0..ae54ad2d6 100644 --- a/lfs/bird +++ b/lfs/bird @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bison b/lfs/bison index 65746f59e..e961a4956 100644 --- a/lfs/bison +++ b/lfs/bison @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bitstream b/lfs/bitstream index 2985f55ca..f0ff34b09 100644 --- a/lfs/bitstream +++ b/lfs/bitstream @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bluetooth b/lfs/bluetooth index b52f0444e..2a0130085 100644 --- a/lfs/bluetooth +++ b/lfs/bluetooth @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/boost b/lfs/boost index 29c7bad90..bed2b0cdb 100644 --- a/lfs/boost +++ b/lfs/boost @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bootstrap b/lfs/bootstrap index 15e882e8a..28e89ffd9 100644 --- a/lfs/bootstrap +++ b/lfs/bootstrap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/br2684ctl b/lfs/br2684ctl index c0cfcc544..149aa4076 100644 --- a/lfs/br2684ctl +++ b/lfs/br2684ctl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bridge-utils b/lfs/bridge-utils index c7bc8a8eb..12ce10beb 100644 --- a/lfs/bridge-utils +++ b/lfs/bridge-utils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/bzip2 b/lfs/bzip2 index 89f0ca7ad..da20ce68c 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ca-certificates b/lfs/ca-certificates index 8b6f71fef..e063b6439 100644 --- a/lfs/ca-certificates +++ b/lfs/ca-certificates @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.de> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20180429 +VER = 20180910 THISAPP = ca-certificates DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cairo b/lfs/cairo index a5772af72..0d28b5405 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/calamaris b/lfs/calamaris index 3b6e29766..2022f84f8 100644 --- a/lfs/calamaris +++ b/lfs/calamaris @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ccache b/lfs/ccache index 9ed6c311a..22e71a12d 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cdrkit b/lfs/cdrkit new file mode 100644 index 000000000..9b1887a48 --- /dev/null +++ b/lfs/cdrkit @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.1.11 + +THISAPP = cdrkit-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = efe08e2f3ca478486037b053acd512e9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.8-werror.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.9-buffer_overflow.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-devname.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-format.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-handler.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-memset.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-paranoiacdda.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-readsegfault.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-utf8.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch + + cd $(DIR_APP) && sed -i CMakeLists.txt -e "s/icedax//g" + + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DBUILD_SHARED_LIBS:BOOL=ON + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + + ln -svf genisoimage /usr/bin/mkisofs + ln -svf genisoimage /usr/bin/mkhybrid + ln -svf icedax /usr/bin/cdda2wav + ln -svf wodim /usr/bin/cdrecord + ln -svf wodim /usr/bin/dvdrecord + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/cdrom b/lfs/cdrom index 08bd609c4..56d1fa8fe 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -29,6 +29,103 @@ VER = ipfire THISAPP = cdrom TARGET = $(DIR_INFO)/$(THISAPP) +ifeq "$(BUILD_PLATFORM)" "arm" + TAR_OPTIONS = +else + TAR_OPTIONS = --lzma +endif + +HAS_MEMTEST = 0 +HAS_IPXE = 0 +HAS_ISOLINUX = 0 +HAS_KERNEL = 1 + +ifeq "$(BUILD_PLATFORM)" "x86" + HAS_MEMTEST = 1 + HAS_IPXE = 1 + HAS_ISOLINUX = 1 +endif + +ifeq "$(BUILD_ARCH)" "armv5tel" + HAS_KERNEL = 0 +endif + +ISO_ARGS = -J -r -v \ + -A "$(NAME) $(VERSION) $(BUILD_ARCH)" \ + -V "$(NAME) $(VERSION) $(BUILD_ARCH)" + +ISOHYBRID_ARGS = + +ifeq "$(HAS_ISOLINUX)" "1" + ISO_ARGS += \ + -no-emul-boot \ + -boot-load-size 4 \ + -boot-info-table \ + -b boot/isolinux/isolinux.bin \ + -c boot/isolinux/boot.catalog +endif + +ifeq "$(EFI)" "1" + ISO_ARGS += \ + -eltorito-alt-boot \ + -e boot/isolinux/efiboot.img \ + -no-emul-boot + + ISOHYBRID_ARGS += --uefi +endif + +GRUB_EFI_MODULES = \ + all_video \ + at_keyboard \ + boot \ + bitmap_scale \ + cat \ + chain \ + configfile \ + disk \ + echo \ + efi_gop \ + efi_uga \ + ext2 \ + extcmd \ + fat \ + file \ + font \ + fxterm_menu \ + gfxterm \ + gfxmenu \ + gfxterm_background \ + gzio \ + halt \ + help \ + iso9660 \ + jpeg \ + loadbios \ + loadenv \ + loopback \ + linux \ + ls \ + memdisk \ + minicmd \ + nativedisk \ + normal \ + ntfs \ + part_gpt \ + part_msdos \ + png \ + probe \ + reboot \ + regexp \ + search \ + search_fs_file \ + search_fs_uuid \ + search_label \ + tar \ + test \ + tga \ + true \ + usb_keyboard + ############################################################################### # Top-level Rules ############################################################################### @@ -79,15 +176,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/doc/COPYING /install/cdrom/ cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc - # Make the ISO mkdir -p /install/cdrom/boot/isolinux - dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog -ifneq "$(BUILD_PLATFORM)" "arm" + +ifeq "$(HAS_KERNEL)" "1" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire +endif + +ifeq "$(HAS_ISOLINUX)" "1" + dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png - cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest - cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin cp /usr/share/hwdata/pci.ids /install/cdrom/boot/isolinux/pci.ids cp -vf /usr/share/syslinux/*.c32 /install/cdrom/boot/isolinux/ @@ -95,16 +193,61 @@ ifneq "$(BUILD_PLATFORM)" "arm" $(DIR_SRC)/config/syslinux/syslinux.cfg \ > /install/cdrom/boot/isolinux/isolinux.cfg endif + +ifeq "$(HAS_MEMTEST)" "1" + # Install memtest + cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest +endif + +ifeq "$(HAS_IPXE)" "1" + cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot +endif + +ifeq "$(EFI)" "1" + # Generate embedded GRUB configuration + sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \ + $(DIR_SRC)/config/cdrom/grub-efi.cfg > /tmp/grub-efi.cfg + + # Build a GRUB EFI image + mkdir -pv /install/cdrom/EFI/BOOT + grub-mkimage \ + --format=$(GRUB_ARCH)-efi \ + --output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \ + --config=/tmp/grub-efi.cfg \ + --compression=xz \ + --prefix=/EFI/BOOT \ + $$(for mod in $(GRUB_EFI_MODULES); do [ -f "/usr/lib/grub/$(GRUB_ARCH)-efi/$${mod}.mod" ] && echo "$${mod}"; done) + + # Install GRUB configuration + mkdir -pv /install/cdrom/EFI/BOOT + sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \ + < $(DIR_SRC)/config/cdrom/grub.cfg > /install/cdrom/EFI/BOOT/grub.cfg + + # Create the EFI Eltorito image + dd if=/dev/zero of=/install/cdrom/boot/isolinux/efiboot.img bs=1k count=1440 + mkdosfs -F 12 -n "IPFIRE_EFI" /install/cdrom/boot/isolinux/efiboot.img + + # Mount the EFI image + mkdir -pv /install/efiboot.img + mount -o loop /install/cdrom/boot/isolinux/efiboot.img /install/efiboot.img + + # Copy the bootloader into the image + mkdir -pv /install/efiboot.img/EFI/BOOT + cp -a /install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \ + /install/efiboot.img/EFI/BOOT/boot$(EFI_ARCH).efi + + # Cleanup + umount /install/efiboot.img + rm -rf /install/efiboot.img /tmp/grub-efi.cfg +endif + cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \ xargs md5sum > md5sum.txt mkdir -p /install/images -ifeq "$(BUILD_PLATFORM)" "arm" - cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ - . > /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso -else - cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ - -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ - -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso - isohybrid /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso + cd /install/cdrom && mkisofs $(ISO_ARGS) \ + -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso . + +ifeq "$(HAS_ISOLINUX)" "1" + isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso endif diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent index 532647111..ab7f1da95 100644 --- a/lfs/check_mk_agent +++ b/lfs/check_mk_agent @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/chkconfig b/lfs/chkconfig index afec4542c..b18db6a9d 100644 --- a/lfs/chkconfig +++ b/lfs/chkconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cifs-utils b/lfs/cifs-utils index f3b75f59f..7462edb53 100644 --- a/lfs/cifs-utils +++ b/lfs/cifs-utils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index 436c7dd52..f2e08d1e3 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/client175 b/lfs/client175 index cc462d0aa..05c8fc5dd 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cmake b/lfs/cmake index dd0f626a9..a6b87a94c 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/collectd b/lfs/collectd index 2ef712ce3..fd5dd946a 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/configroot b/lfs/configroot index c2833fd4a..c33eefc96 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools index f5c1dea66..20e2978b3 100644 --- a/lfs/conntrack-tools +++ b/lfs/conntrack-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/core-updates b/lfs/core-updates index 19b57a5a2..3cd8c0785 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/coreutils b/lfs/coreutils index 66a63a9c8..567298450 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cpio b/lfs/cpio index 4d9a752d1..f2e12952d 100644 --- a/lfs/cpio +++ b/lfs/cpio @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cups b/lfs/cups index ae0c603b7..16da970ea 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cups-filters b/lfs/cups-filters index 109db07d7..859983367 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/curl b/lfs/curl index 5a6fdc664..baf298e18 100644 --- a/lfs/curl +++ b/lfs/curl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 2947e3c9a..1800a08ec 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index bcf4b511c..ce1941e4a 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/daq b/lfs/daq index 35f8241aa..4e9e1c935 100644 --- a/lfs/daq +++ b/lfs/daq @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dbus b/lfs/dbus index a1e68f2d1..9936c875a 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ddns b/lfs/ddns index 14890cbba..80dd9bbef 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ddrescue b/lfs/ddrescue index c61e2d7f7..5d08085fa 100644 --- a/lfs/ddrescue +++ b/lfs/ddrescue @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dejagnu b/lfs/dejagnu index 3623c9b99..a54cd28b8 100644 --- a/lfs/dejagnu +++ b/lfs/dejagnu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dejavu-fonts-ttf b/lfs/dejavu-fonts-ttf index cd31a2def..e42a50217 100644 --- a/lfs/dejavu-fonts-ttf +++ b/lfs/dejavu-fonts-ttf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 8a554f3dc..212fd467b 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/diffutils b/lfs/diffutils index d37dff7b2..aee8f36f1 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/directfb b/lfs/directfb index 593154b85..14916e403 100644 --- a/lfs/directfb +++ b/lfs/directfb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dma b/lfs/dma index 085c9c2ee..2b89bcc6e 100644 --- a/lfs/dma +++ b/lfs/dma @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dmidecode b/lfs/dmidecode index fa0101594..03a702c07 100644 --- a/lfs/dmidecode +++ b/lfs/dmidecode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dnsdist b/lfs/dnsdist index aeb11c87a..85a841fa5 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dosfstools b/lfs/dosfstools index 01d72b917..8a74661e9 100644 --- a/lfs/dosfstools +++ b/lfs/dosfstools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dpfhack b/lfs/dpfhack index 00d654521..e95db8588 100644 --- a/lfs/dpfhack +++ b/lfs/dpfhack @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dracut b/lfs/dracut index 97d12f3f5..a6a6f1f23 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/dvb-firmwares b/lfs/dvb-firmwares index a3833da93..f13ce6e03 100644 --- a/lfs/dvb-firmwares +++ b/lfs/dvb-firmwares @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/e1000e b/lfs/e1000e index 37b0c41e9..80a3c35d4 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 8e265c1e2..9e7988b9b 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ebtables b/lfs/ebtables index 0fe9731bb..250a04fdf 100644 --- a/lfs/ebtables +++ b/lfs/ebtables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ed b/lfs/ed index cfea86a92..d628a029b 100644 --- a/lfs/ed +++ b/lfs/ed @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/efibootmgr b/lfs/efibootmgr new file mode 100644 index 000000000..9a2a91779 --- /dev/null +++ b/lfs/efibootmgr @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 16 + +THISAPP = efibootmgr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = aarch64 x86_64 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ab7cf46774fda951a0e8a40beb65a90e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + EFIDIR=$(SNAME) $(MAKETUNING) + cd $(DIR_APP) && make install EFIDIR=$(SNAME) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/dvdrtools b/lfs/efivar similarity index 87% rename from lfs/dvdrtools rename to lfs/efivar index a093172eb..90d4c57e7 100644 --- a/lfs/dvdrtools +++ b/lfs/efivar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,13 +24,14 @@ include Config -VER = 0.2.1 +VER = 35 -THISAPP = dvdrtools-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = efivar-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = aarch64 x86_64 ############################################################################### # Top-level Rules @@ -40,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e82d359137e716e8c0b04d5c73bd3e79 +$(DL_FILE)_MD5 = 53da18ea0cf7bba1fd9edf3098037edf install : $(TARGET) @@ -69,11 +70,10 @@ $(subst %,%_MD5,$(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 --mandir=/usr/share/man \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKETUNING) cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/elfutils b/lfs/elfutils index 69c0083c4..de11fb570 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/elinks b/lfs/elinks index 07f7fb252..77b45be71 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr index d6cdf8c90..9bce8abc8 100644 --- a/lfs/epson-inkjet-printer-escpr +++ b/lfs/epson-inkjet-printer-escpr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/etherwake b/lfs/etherwake index 17ec9ca5d..c133ed12a 100644 --- a/lfs/etherwake +++ b/lfs/etherwake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ethtool b/lfs/ethtool index 16527b6e3..9fb0d8973 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/expat b/lfs/expat index 5bb22ec27..9b1b8f3b7 100644 --- a/lfs/expat +++ b/lfs/expat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/expect b/lfs/expect index 2ebd6a8f5..ac4752be9 100644 --- a/lfs/expect +++ b/lfs/expect @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate index bf5765ce5..bd2523607 100644 --- a/lfs/ez-ipupdate +++ b/lfs/ez-ipupdate @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/faad2 b/lfs/faad2 index 5489aa51b..ecf7f8a62 100644 --- a/lfs/faad2 +++ b/lfs/faad2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fake-environ b/lfs/fake-environ index 7c8dd0664..38b36aa95 100644 --- a/lfs/fake-environ +++ b/lfs/fake-environ @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fbset b/lfs/fbset index d4522590e..ec3c2a63c 100644 --- a/lfs/fbset +++ b/lfs/fbset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fcron b/lfs/fcron index b548c1310..8e39dc6be 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fetchmail b/lfs/fetchmail index 7386e8fee..a26baece7 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ffmpeg b/lfs/ffmpeg index c324cbd0b..b8b0df4ef 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/file b/lfs/file index 886e50d1d..8be0b632c 100644 --- a/lfs/file +++ b/lfs/file @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/findutils b/lfs/findutils index ebffc2e58..970ace3c2 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fireinfo b/lfs/fireinfo index 784685029..df736e0f3 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/flac b/lfs/flac index 4331af8b9..f54326be7 100644 --- a/lfs/flac +++ b/lfs/flac @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/flag-icons b/lfs/flag-icons index 8f3364cdc..41cc9e399 100644 --- a/lfs/flag-icons +++ b/lfs/flag-icons @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/flash-images b/lfs/flash-images index 40aca5377..b78691e08 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -31,6 +31,9 @@ TARGET = $(DIR_INFO)/$(THISAPP) DEVICE = $(shell losetup -f) PART_BOOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1 +ifeq "$(EFI)" "1" + PART_EFI = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p2 +endif PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3 IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz @@ -62,11 +65,14 @@ ifeq "$(BUILD_PLATFORM)" "arm" # FAT32 PART_TYPE = c +ifeq "$(BUILD_ARCH)" "aarch64" + BOOTLOADER = grub +endif else BOOTLOADER = grub S_OFFSET = 8192 - # Logical + # Linux PART_TYPE = L endif @@ -75,8 +81,24 @@ endif S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) ))) S_ROOT := 2477600 +ifeq "$(EFI)" "1" + S_EFI = 65536 # 32 MB +else + S_EFI = 0 +endif + PADDING = 100 # MB +ifeq "$(EFI)" "1" + SFDISK = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT) +else + SFDISK = $(SFDISK_BOOT),0,0\n$(SFDISK_ROOT) +endif + +SFDISK_BOOT = $(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n +SFDISK_EFI = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) ))),$(S_EFI),U\n +SFDISK_ROOT = $(shell echo $$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) ))),$(S_ROOT),L\n + $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Stop if $(MNThdd) is still mounted mountpoint $(MNThdd) && exit 1 || exit 0 @@ -84,13 +106,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -rf $(IMG) $(MNThdd) && mkdir -p $(MNThdd) # Allocate image on disk - dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_ROOT) )) + dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) + $(S_ROOT) )) losetup $(DEVICE) $(IMG) # Write Partition table - echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \ - | sfdisk -uS $(DEVICE) - -echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE) + echo -e "$(SFDISK)" | sfdisk -uS $(DEVICE) kpartx -v -a $(DEVICE) @@ -99,6 +119,9 @@ ifeq "$(PART_TYPE)" "c" mkfs.vfat $(PART_BOOT) else mkfs.ext2 -F $(PART_BOOT) +endif +ifeq "$(EFI)" "1" + mkfs.vfat $(PART_EFI) endif mkfs.ext4 -O ^has_journal,extent -F $(PART_ROOT) @@ -113,6 +136,11 @@ endif mkdir -pv $(MNThdd)/boot mount $(PART_BOOT) $(MNThdd)/boot +ifeq "$(EFI)" "1" + mkdir -pv $(MNThdd)/boot/efi + mount $(PART_EFI) $(MNThdd)/boot/efi +endif + # Install Pandaboard MLO and uboot first ifeq "$(BUILD_ARCH)" "armv5tel" cp -v /boot/MLO $(MNThdd)/boot/ @@ -139,6 +167,10 @@ endif # Create /etc/fstab printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_BOOT))" "/boot" \ "auto" "defaults" 1 2 > $(MNThdd)/etc/fstab +ifeq "$(EFI)" "1" + printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_EFI))" "/boot/efi" \ + "auto" "defaults" 1 2 >> $(MNThdd)/etc/fstab +endif printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_ROOT))" "/" \ "auto" "defaults" 1 1 >> $(MNThdd)/etc/fstab @@ -166,9 +198,17 @@ ifeq "$(BOOTLOADER)" "grub" sed -i $(MNThdd)/boot/grub/grub.cfg \ -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" +ifeq "$(BUILD_PLATFORM)" "x86" # Install GRUB grub-install --force --recheck --no-floppy --target=i386-pc \ --root-directory=$(MNThdd) $(DEVICE) +endif + +ifeq "$(EFI)" "1" + # Install GRUB for EFI + grub-install --target=$(GRUB_ARCH)-efi --removable --no-nvram \ + --boot-directory=$(MNThdd)/boot --efi-directory=$(MNThdd)/boot/efi +endif # restore orginal defaults mv -f $(MNThdd)/etc/default/grub.backup $(MNThdd)/etc/default/grub @@ -185,6 +225,9 @@ endif umount $(MNThdd)/proc umount $(MNThdd)/sys umount $(MNThdd)/dev +ifeq "$(EFI)" "1" + umount $(MNThdd)/boot/efi +endif umount $(MNThdd)/boot umount $(MNThdd) diff --git a/lfs/flex b/lfs/flex index ff3efccfe..65247f308 100644 --- a/lfs/flex +++ b/lfs/flex @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fontconfig b/lfs/fontconfig index fbf7b44f6..01ac3bb69 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/foomatic b/lfs/foomatic index 68c19df56..b20f7ad03 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fping b/lfs/fping index e3767f97d..f82c28b67 100644 --- a/lfs/fping +++ b/lfs/fping @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/freefont b/lfs/freefont index 3e27a977d..d70273626 100644 --- a/lfs/freefont +++ b/lfs/freefont @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/freeradius b/lfs/freeradius index b232bc030..8435684df 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/freetype b/lfs/freetype index ba80297dc..795ba8378 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/fuse b/lfs/fuse index 275647252..db649a880 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gawk b/lfs/gawk index cfa106d83..793b358e2 100644 --- a/lfs/gawk +++ b/lfs/gawk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gd b/lfs/gd index 12cff6123..134d2fccd 100644 --- a/lfs/gd +++ b/lfs/gd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gdbm b/lfs/gdbm index 3fd68d335..23d17dad1 100644 --- a/lfs/gdbm +++ b/lfs/gdbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gettext b/lfs/gettext index b1bc96306..632ecac43 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ghostscript b/lfs/ghostscript index 6d297dabc..6de18f4d3 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/git b/lfs/git index fd76b1248..42884f6d1 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/glib b/lfs/glib index f0c30995d..eb284dd56 100644 --- a/lfs/glib +++ b/lfs/glib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gmp b/lfs/gmp index 4d55e4f76..98671b594 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gmp-compat b/lfs/gmp-compat index 1e483f6c0..ef2d56b0a 100644 --- a/lfs/gmp-compat +++ b/lfs/gmp-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gnu-netcat b/lfs/gnu-netcat index 357db34d8..de758d063 100644 --- a/lfs/gnu-netcat +++ b/lfs/gnu-netcat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gnump3d b/lfs/gnump3d index 0022b4e6d..fbde7ca05 100644 --- a/lfs/gnump3d +++ b/lfs/gnump3d @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gnupg b/lfs/gnupg index fc6583110..532a291d8 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gnutls b/lfs/gnutls index 360594fe6..5484d9821 100644 --- a/lfs/gnutls +++ b/lfs/gnutls @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gperf b/lfs/gperf index ac33857f1..6a8cd38ee 100644 --- a/lfs/gperf +++ b/lfs/gperf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Development Team # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gpgme b/lfs/gpgme index cdaf5a69e..6a8a84da3 100644 --- a/lfs/gpgme +++ b/lfs/gpgme @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/grep b/lfs/grep index 703e2f7c5..a19aba6dc 100644 --- a/lfs/grep +++ b/lfs/grep @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/groff b/lfs/groff index e4c293bb7..4d5bf6373 100644 --- a/lfs/groff +++ b/lfs/groff @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/grub b/lfs/grub index 514829613..b51566df3 100644 --- a/lfs/grub +++ b/lfs/grub @@ -31,10 +31,30 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = x86_64 i586 +SUP_ARCH = aarch64 x86_64 i586 -CFLAGS = -CXXFLAGS = +# Build for which platforms? +ifeq "$(BUILD_ARCH)" "i586" + BUILD_PC = 1 +endif + +ifeq "$(BUILD_ARCH)" "x86_64" + BUILD_PC = 1 +endif + +BUILD_EFI = $(EFI) + +DIR_APP_PC = $(DIR_APP)-pc +DIR_APP_EFI = $(DIR_APP)-efi + +# Don't use our CFLAGS for boot code +export HOST_CFLAGS = $(CFLAGS) +export HOST_LDFLAGS = $(LDFLAGS) + +CONFIGURE_ARGS = \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-werror ############################################################################### # Top-level Rules @@ -76,27 +96,38 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-platform=pc \ - --with-grubdir=grub \ - --program-transform-name=s,grub,grub, \ - --disable-grub-mount \ - --disable-werror - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - + # Install unifont + cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz + +ifeq "$(BUILD_EFI)" "1" + cp -r $(DIR_APP) $(DIR_APP_EFI) + cd $(DIR_APP_EFI) && ./configure $(CONFIGURE_ARGS) \ + --with-platform=efi CFLAGS= LDFLAGS= + cd $(DIR_APP_EFI) && make $(MAKETUNING) + cd $(DIR_APP_EFI) && make install +endif + +ifeq "$(BUILD_PC)" "1" + cp -r $(DIR_APP) $(DIR_APP_PC) + cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \ + --with-platform=pc CFLAGS= LDFLAGS= + cd $(DIR_APP_PC) && make $(MAKETUNING) + cd $(DIR_APP_PC) && make install + + # Install empty configuration file -mkdir -pv /boot/grub touch /boot/grub/grub.cfg - ln -svf ../boot/grub/grub.cfg /etc/grub2.cfg +endif + + # Install background image + -mkdir -pv /boot/grub install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png + # Install default configuration -mkdir -pv /etc/default install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub @@ -104,12 +135,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe paxctl -Cmpexs /usr/bin/grub-script-check - # We don't need to install unifont just to generate a grub2 compatible - # font archive for the graphical boot menu. The following command only - # converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters. - /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \ - --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \ - $(DIR_DL)/unifont-7.0.03.pcf.gz - - @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI) @$(POSTBUILD) diff --git a/lfs/guardian b/lfs/guardian index 45c571d05..2eaf77212 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gutenprint b/lfs/gutenprint index b5428ec6a..7286b78a2 100644 --- a/lfs/gutenprint +++ b/lfs/gutenprint @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/gzip b/lfs/gzip index 2318338cf..a10abdd0a 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/haproxy b/lfs/haproxy index 7fc639a41..9a54095a8 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/hostapd b/lfs/hostapd index 349a3d940..46f7e91b5 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/hostname b/lfs/hostname index 02b065651..ea22f4d8a 100644 --- a/lfs/hostname +++ b/lfs/hostname @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/hplip b/lfs/hplip index 0afadc459..b9d4e696f 100644 --- a/lfs/hplip +++ b/lfs/hplip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/hwdata b/lfs/hwdata index 9d8e99ce5..2e22053a9 100644 --- a/lfs/hwdata +++ b/lfs/hwdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/i2c-tools b/lfs/i2c-tools index ef60ebd46..d16e4aaae 100644 --- a/lfs/i2c-tools +++ b/lfs/i2c-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iana-etc b/lfs/iana-etc index 2708b1b0d..8b7156f12 100644 --- a/lfs/iana-etc +++ b/lfs/iana-etc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/icecast b/lfs/icecast index 1db2643a8..c59fba8f3 100644 --- a/lfs/icecast +++ b/lfs/icecast @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/icegenerator b/lfs/icegenerator index 613482e86..84cede07a 100644 --- a/lfs/icegenerator +++ b/lfs/icegenerator @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/icinga b/lfs/icinga index f710b2e0f..08f607af4 100644 --- a/lfs/icinga +++ b/lfs/icinga @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iftop b/lfs/iftop index 4353b403b..18ba5caae 100644 --- a/lfs/iftop +++ b/lfs/iftop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/igb b/lfs/igb index d00a1e1c9..8f0256ceb 100644 --- a/lfs/igb +++ b/lfs/igb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/igmpproxy b/lfs/igmpproxy index db9538064..53e4a8f96 100644 --- a/lfs/igmpproxy +++ b/lfs/igmpproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/initscripts b/lfs/initscripts index 1058779f1..7da018a6c 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -177,7 +177,6 @@ $(TARGET) : ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S81pakfire ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall - ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat ln -sf ../init.d/vnstat /etc/rc.d/rc0.d/K51vnstat diff --git a/lfs/installer b/lfs/installer index 790ac06df..e3937624e 100644 --- a/lfs/installer +++ b/lfs/installer @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/intltool b/lfs/intltool index 8fb42aca1..32386900d 100644 --- a/lfs/intltool +++ b/lfs/intltool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iotop b/lfs/iotop index fd0002bbf..325b766d3 100644 --- a/lfs/iotop +++ b/lfs/iotop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ipaddr b/lfs/ipaddr index 186141c31..d5d28229b 100644 --- a/lfs/ipaddr +++ b/lfs/ipaddr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iperf b/lfs/iperf index 07e437d3e..23a8b7abe 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iperf3 b/lfs/iperf3 index 9eb1e8abe..fc84f6468 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot index a2607cdef..9536c9514 100644 --- a/lfs/ipfire-netboot +++ b/lfs/ipfire-netboot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -79,10 +79,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe cd $(DIR_APP) && make bin/ipxe.lkrn +ifeq "$(BUILD_ARCH)" "x86_64" + cd $(DIR_APP) && make bin-x86_64-efi/ipxe.efi +endif # Installation -mkdir -pv /usr/share/ipfire-netboot cd $(DIR_APP) && install -m 644 bin/ipxe.lkrn /usr/share/ipfire-netboot +ifeq "$(BUILD_ARCH)" "x86_64" + cd $(DIR_APP) && install -m 644 bin-x86_64-efi/ipxe.efi \ + /usr/share/ipfire-netboot +endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/iproute2 b/lfs/iproute2 index e93988d32..4d2a6f4d7 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.14.1 +VER = 4.18.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1075423d7029e02a8f23ed4f42b7e372 +$(DL_FILE)_MD5 = 8b8680e91390c57cab788fbf8e929479 install : $(TARGET) diff --git a/lfs/ipset b/lfs/ipset index 62d683d99..d33e9327f 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iptables b/lfs/iptables index 35bb259ca..b4a2834b8 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index f76ff9f33..afb82ea67 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/iputils b/lfs/iputils index 56ef07c5f..b1e2e2216 100644 --- a/lfs/iputils +++ b/lfs/iputils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ipvsadm b/lfs/ipvsadm index de9c52dfa..db245b997 100644 --- a/lfs/ipvsadm +++ b/lfs/ipvsadm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/iw b/lfs/iw index 87ce28e21..279457f53 100644 --- a/lfs/iw +++ b/lfs/iw @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ixgbe b/lfs/ixgbe index 00dd32080..479f4f421 100644 --- a/lfs/ixgbe +++ b/lfs/ixgbe @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/jansson b/lfs/jansson index 21f0171bc..14c6a3ee3 100644 --- a/lfs/jansson +++ b/lfs/jansson @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/joe b/lfs/joe index cc2d2d655..3c577ac47 100644 --- a/lfs/joe +++ b/lfs/joe @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/jquery b/lfs/jquery index 7856ce01e..6b054cbd4 100644 --- a/lfs/jquery +++ b/lfs/jquery @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/jwhois b/lfs/jwhois index 86d3928a8..ed12681c7 100644 --- a/lfs/jwhois +++ b/lfs/jwhois @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/kbd b/lfs/kbd index bb9d261a7..b126f27a7 100644 --- a/lfs/kbd +++ b/lfs/kbd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/keepalived b/lfs/keepalived index 020b9d784..6bdd9d3de 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/kmod b/lfs/kmod index 8e0bb0d53..38d5de963 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/krb5 b/lfs/krb5 index 9cf3c2bec..b1ea0f76d 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/l7-protocols b/lfs/l7-protocols index 1ca910c52..ff57df06c 100644 --- a/lfs/l7-protocols +++ b/lfs/l7-protocols @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lame b/lfs/lame index 70aa47828..a8c3101ad 100644 --- a/lfs/lame +++ b/lfs/lame @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lcd4linux b/lfs/lcd4linux index 1baf399b0..81f994621 100644 --- a/lfs/lcd4linux +++ b/lfs/lcd4linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lcdproc b/lfs/lcdproc index e408294dc..855cb16a4 100644 --- a/lfs/lcdproc +++ b/lfs/lcdproc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lcms2 b/lfs/lcms2 index 72090220c..eea9d537e 100644 --- a/lfs/lcms2 +++ b/lfs/lcms2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/less b/lfs/less index 10528d866..531293a8a 100644 --- a/lfs/less +++ b/lfs/less @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libarchive b/lfs/libarchive index 2c34225aa..0f8b3956a 100644 --- a/lfs/libarchive +++ b/lfs/libarchive @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libart b/lfs/libart index 50c796a04..44c7a4a45 100644 --- a/lfs/libart +++ b/lfs/libart @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libassuan b/lfs/libassuan index 29f799a07..3a2439f43 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libcap b/lfs/libcap index 836f9c7c7..51dd7f436 100644 --- a/lfs/libcap +++ b/lfs/libcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libdaemon b/lfs/libdaemon index df2b595af..276d17e5a 100644 --- a/lfs/libdaemon +++ b/lfs/libdaemon @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libdnet b/lfs/libdnet index b02ae66b8..285701368 100644 --- a/lfs/libdnet +++ b/lfs/libdnet @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libdvbpsi b/lfs/libdvbpsi index 01abb4358..c7f5ac717 100644 --- a/lfs/libdvbpsi +++ b/lfs/libdvbpsi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libevent b/lfs/libevent index 668c447f2..efe190573 100644 --- a/lfs/libevent +++ b/lfs/libevent @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libevent2 b/lfs/libevent2 index 014086403..08bba486e 100644 --- a/lfs/libevent2 +++ b/lfs/libevent2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.de> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libexif b/lfs/libexif index 74cf886bd..5861e2f47 100644 --- a/lfs/libexif +++ b/lfs/libexif @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libffi b/lfs/libffi index 6f9a86812..1d96e25a9 100644 --- a/lfs/libffi +++ b/lfs/libffi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libgcrypt b/lfs/libgcrypt index e7c387ceb..ec99d936b 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libgpg-error b/lfs/libgpg-error index ac618dcca..6445c8d10 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libid3tag b/lfs/libid3tag index e62619fec..ccfecc71c 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libjpeg b/lfs/libjpeg index 64b227a8b..6251fc85b 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat index c2cf8f24b..26e32f1d8 100644 --- a/lfs/libjpeg-compat +++ b/lfs/libjpeg-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libmad b/lfs/libmad index 868631e51..f197d37d4 100644 --- a/lfs/libmad +++ b/lfs/libmad @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libmnl b/lfs/libmnl index 66d198ba7..0ae35adeb 100644 --- a/lfs/libmnl +++ b/lfs/libmnl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libmpc b/lfs/libmpc index 5aa43d9dd..b0111b862 100644 --- a/lfs/libmpc +++ b/lfs/libmpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libmpdclient b/lfs/libmpdclient index fd79810a4..7a4ce2955 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libmpeg2 b/lfs/libmpeg2 index 6396da92f..ada8864a1 100644 --- a/lfs/libmpeg2 +++ b/lfs/libmpeg2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnet b/lfs/libnet index 2b206adbd..3615dd245 100644 --- a/lfs/libnet +++ b/lfs/libnet @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index 2095863ca..4309fd285 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnetfilter_cthelper b/lfs/libnetfilter_cthelper index 3b469e6ae..a0496a38d 100644 --- a/lfs/libnetfilter_cthelper +++ b/lfs/libnetfilter_cthelper @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnetfilter_cttimeout b/lfs/libnetfilter_cttimeout index a2184b29b..eb17e2563 100644 --- a/lfs/libnetfilter_cttimeout +++ b/lfs/libnetfilter_cttimeout @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue index 19fe6a2c6..688f5702d 100644 --- a/lfs/libnetfilter_queue +++ b/lfs/libnetfilter_queue @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 62350ea07..892d61975 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnl b/lfs/libnl index a35793514..4944a4b2a 100644 --- a/lfs/libnl +++ b/lfs/libnl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libnl-3 b/lfs/libnl-3 index 3bb7f52f0..70ae0069f 100644 --- a/lfs/libnl-3 +++ b/lfs/libnl-3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libogg b/lfs/libogg index 9dc49df3b..dee758d53 100644 --- a/lfs/libogg +++ b/lfs/libogg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/liboping b/lfs/liboping index 9ace3d138..a1fb93ada 100644 --- a/lfs/liboping +++ b/lfs/liboping @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libpcap b/lfs/libpcap index 0fb62dc92..b6cbd502d 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libpciaccess b/lfs/libpciaccess index 0df4f453e..571a71d6f 100644 --- a/lfs/libpciaccess +++ b/lfs/libpciaccess @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libpng b/lfs/libpng index af2db684e..8f935dfd4 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libpri b/lfs/libpri index 60c9498be..cc09c1b43 100644 --- a/lfs/libpri +++ b/lfs/libpri @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libshout b/lfs/libshout index 8ddde1667..bfba34235 100644 --- a/lfs/libshout +++ b/lfs/libshout @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libsmooth b/lfs/libsmooth index 0f7a13537..70bc70373 100644 --- a/lfs/libsmooth +++ b/lfs/libsmooth @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libsolv b/lfs/libsolv index 7651be750..3cad11da7 100644 --- a/lfs/libsolv +++ b/lfs/libsolv @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libsrtp b/lfs/libsrtp index d72a240ec..a13dcb09d 100644 --- a/lfs/libsrtp +++ b/lfs/libsrtp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libstatgrab b/lfs/libstatgrab index 8e62b4149..471ba3ab6 100644 --- a/lfs/libstatgrab +++ b/lfs/libstatgrab @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libtiff b/lfs/libtiff index 60e7283b0..3025c45e4 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libtirpc b/lfs/libtirpc index e7662c67a..fbe35491b 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libtool b/lfs/libtool index d7e9a1555..90dae11e8 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libupnp b/lfs/libupnp index f140cb4b4..683a887ad 100644 --- a/lfs/libupnp +++ b/lfs/libupnp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libusb b/lfs/libusb index f7fc12420..a32e11a8b 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libusb-compat b/lfs/libusb-compat index 6d63843eb..c6b4fa9cd 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libusbredir b/lfs/libusbredir index 652a60dc9..6df051a8f 100644 --- a/lfs/libusbredir +++ b/lfs/libusbredir @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libvirt b/lfs/libvirt index 2d8eef061..fe2fcecfe 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libvorbis b/lfs/libvorbis index 2b47be629..c61cbffe7 100644 --- a/lfs/libvorbis +++ b/lfs/libvorbis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libwww-perl b/lfs/libwww-perl index 6bee1ddd8..536a49769 100644 --- a/lfs/libwww-perl +++ b/lfs/libwww-perl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libxml2 b/lfs/libxml2 index bb7e8491d..9d0f1b9b3 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libxslt b/lfs/libxslt index e0ea79542..86ebee30e 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/libyajl b/lfs/libyajl index 87483860f..703f7f21d 100644 --- a/lfs/libyajl +++ b/lfs/libyajl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/linux b/lfs/linux index 003c477f6..ad10bc8e5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,8 +24,8 @@ include Config -VER = 4.14.50 -ARM_PATCHES = 4.14.50-ipfire0 +VER = 4.14.71 +ARM_PATCHES = 4.14.71-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 76 +PAK_VER = 77 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,9 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 0d397a2e14669a97d54c1b82ab2b1994 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = c38181f9fd416f10352e3dd3a01bb1d1 +$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb + install : $(TARGET) diff --git a/lfs/linux-atm b/lfs/linux-atm index 4e033f5d3..a3e23dafb 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/linux-firmware b/lfs/linux-firmware index c732ace9d..ec6c5e4c4 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/linux-initrd b/lfs/linux-initrd index 93f21078e..3f0a80739 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/linux-pae b/lfs/linux-pae index bb62c46f1..3cd7e868c 100644 --- a/lfs/linux-pae +++ b/lfs/linux-pae @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 2c4d2efc1..8403be6e0 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/logwatch b/lfs/logwatch index 9f9a0db55..917a13ad6 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lsof b/lfs/lsof index c44516f90..8b429fb60 100644 --- a/lfs/lsof +++ b/lfs/lsof @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ltrace b/lfs/ltrace index b8ee5afd7..d479910de 100644 --- a/lfs/ltrace +++ b/lfs/ltrace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lua b/lfs/lua index 6a6a9593b..9217e8bac 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lvm2 b/lfs/lvm2 index dc41834f7..3e613e80b 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lynis b/lfs/lynis index 8003a298e..f1e4f7211 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPfire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lz4 b/lfs/lz4 index 06d192e3c..aff8f25bb 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/lzo b/lfs/lzo index 2afc89f5d..58f25577d 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/m4 b/lfs/m4 index 7d624d985..22610e887 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/make b/lfs/make index bee734ba4..d93da3d98 100644 --- a/lfs/make +++ b/lfs/make @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/man b/lfs/man index a3814bef3..a51c6fee3 100644 --- a/lfs/man +++ b/lfs/man @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/man-pages b/lfs/man-pages index 2ea81b30f..73c259ffd 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mc b/lfs/mc index 741d41b13..1aa07c133 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mcelog b/lfs/mcelog index 6821c738f..871c0d76b 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mdns-repeater b/lfs/mdns-repeater index 4b3d3a784..2166df1ed 100644 --- a/lfs/mdns-repeater +++ b/lfs/mdns-repeater @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/memtest b/lfs/memtest index a1d6e2c5f..38e352e26 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/miau b/lfs/miau index 8106587db..03ad4789b 100644 --- a/lfs/miau +++ b/lfs/miau @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/minicom b/lfs/minicom index ea8f6ece0..6a92881a4 100644 --- a/lfs/minicom +++ b/lfs/minicom @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/minidlna b/lfs/minidlna index 3302cdd5c..6368004ed 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/miniupnpd b/lfs/miniupnpd index ee9d8efa9..c09ecab31 100644 --- a/lfs/miniupnpd +++ b/lfs/miniupnpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/misc-progs b/lfs/misc-progs index c0e3919f5..420b61439 100644 --- a/lfs/misc-progs +++ b/lfs/misc-progs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/module-init-tools b/lfs/module-init-tools index 318843b40..9a97ac8e5 100644 --- a/lfs/module-init-tools +++ b/lfs/module-init-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/monit b/lfs/monit index 96fe6b1a6..66c415f9f 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/motion b/lfs/motion index d226c1c58..1e1665426 100644 --- a/lfs/motion +++ b/lfs/motion @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mpage b/lfs/mpage index b93fb0634..55a1eac65 100644 --- a/lfs/mpage +++ b/lfs/mpage @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mpc b/lfs/mpc index 01872bfec..ac0dce6b4 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mpd b/lfs/mpd index 0e57a2846..b8c48f2fa 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mpfire b/lfs/mpfire index facb1798c..8363ccee2 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mpfr b/lfs/mpfr index cb5a29b10..2c6a5a6d9 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mtools b/lfs/mtools index d9b98921e..655204e5a 100644 --- a/lfs/mtools +++ b/lfs/mtools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/mtr b/lfs/mtr index 3f00b8506..4e951a0f4 100644 --- a/lfs/mtr +++ b/lfs/mtr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/multicat b/lfs/multicat index ac2959819..827ff8efc 100644 --- a/lfs/multicat +++ b/lfs/multicat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/multipath-tools b/lfs/multipath-tools index 4da9484dc..1ce0e1ce5 100644 --- a/lfs/multipath-tools +++ b/lfs/multipath-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins index 25ac5df5a..217563554 100644 --- a/lfs/nagios-plugins +++ b/lfs/nagios-plugins @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 6a12c364b..133a9738e 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nano b/lfs/nano index 98dec8897..9783c2917 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.9.7 +VER = 2.9.8 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 22 +PAK_VER = 23 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 804a0e91cb11f2e8884aee7bfac2d18d +$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a install : $(TARGET) diff --git a/lfs/nasm b/lfs/nasm index 5968dce72..e17561684 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ncat b/lfs/ncat index a51698872..e8d13f605 100644 --- a/lfs/ncat +++ b/lfs/ncat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ncurses b/lfs/ncurses index 09efd733e..ba5afcefd 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat index b9f487f96..d723b99c4 100644 --- a/lfs/ncurses-compat +++ b/lfs/ncurses-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/net-tools b/lfs/net-tools index f3ba8ecb3..3fde55e2d 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/netpbm b/lfs/netpbm index d6065d4ca..e22e0fbc8 100644 --- a/lfs/netpbm +++ b/lfs/netpbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 9e6751812..06233f3e9 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nettle b/lfs/nettle index 96f0e32ab..2d3f4864e 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/newt b/lfs/newt index ed535620c..735df459b 100644 --- a/lfs/newt +++ b/lfs/newt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nfs b/lfs/nfs index e2e6ff9b1..2b4fe601b 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nginx b/lfs/nginx index ecbe16221..f6496196c 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-18 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nmap b/lfs/nmap index 1d9b33f21..7242cd812 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/nss-myhostname b/lfs/nss-myhostname index 36b071fb2..0b8e88aff 100644 --- a/lfs/nss-myhostname +++ b/lfs/nss-myhostname @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 5191d5086..9199c2bc6 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ntp b/lfs/ntp index 9c5e772ac..8f845409c 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -24,7 +24,7 @@ include Config -VER = 4.2.8p11 +VER = 4.2.8p12 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 00950ca2855579541896513e78295361 +$(DL_FILE)_MD5 = 1522d66574bae14abb2622746dad2bdc install : $(TARGET) diff --git a/lfs/nut b/lfs/nut index 33a4bb1bc..10e146c63 100644 --- a/lfs/nut +++ b/lfs/nut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/oinkmaster b/lfs/oinkmaster index 6cc075fa4..3403eb837 100644 --- a/lfs/oinkmaster +++ b/lfs/oinkmaster @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/openldap b/lfs/openldap index 715c40158..320b1abd4 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/openssh b/lfs/openssh index a88b2d126..c67f135e8 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 7.7p1 +VER = 7.8p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 68ba883aff6958297432e5877e9a0fe2 +$(DL_FILE)_MD5 = ce1d090fa6239fd38eb989d5e983b074 install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure \ --prefix=/usr \ @@ -82,23 +82,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - sed -i -e 's/^#\?Port .*$$/Port 22/' \ - -e 's/^#\?Protocol .*$$/Protocol 2/' \ - -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ - -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ - -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication no/' \ - -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ - -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ - -e 's/^#\?UsePAM .*$$//' \ - -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \ - -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \ - -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ - -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ - -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ + + # install custom OpenSSH server configuration + install -v -m 644 $(DIR_SRC)/config/ssh/sshd_config \ /etc/ssh/sshd_config + + # install custom OpenSSH client configuration + install -v -m 644 $(DIR_SRC)/config/ssh/ssh_config \ + /etc/ssh/ssh_config + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/openssl-compat b/lfs/openssl-compat index d784903ba..1dcb829e5 100644 --- a/lfs/openssl-compat +++ b/lfs/openssl-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/openvmtools b/lfs/openvmtools index 6ca27e618..2246dfd4e 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/openvpn b/lfs/openvpn index 819ff05c5..2503654f1 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/opus b/lfs/opus index f91f7ac01..8faa7d00a 100644 --- a/lfs/opus +++ b/lfs/opus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pakfire b/lfs/pakfire index b584cc561..48e84145c 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pakfire3 b/lfs/pakfire3 index e51452824..3f0e6c320 100644 --- a/lfs/pakfire3 +++ b/lfs/pakfire3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pam b/lfs/pam index f379c22d6..2d7b319e3 100644 --- a/lfs/pam +++ b/lfs/pam @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pango b/lfs/pango index bd5d5f8a8..cf3ced008 100644 --- a/lfs/pango +++ b/lfs/pango @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/parted b/lfs/parted index 5dee653a4..bbaeff1a3 100644 --- a/lfs/parted +++ b/lfs/parted @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.1 +VER = 3.2 THISAPP = parted-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = parted -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5d89d64d94bcfefa9ce8f59f4b81bdcb +$(DL_FILE)_MD5 = 0247b6a7b314f8edeb618159fa95f9cb install : $(TARGET) @@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-device-mapper.patch cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/patch b/lfs/patch index 10b03d43b..64576c350 100644 --- a/lfs/patch +++ b/lfs/patch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/paxctl b/lfs/paxctl index 387f3842e..85e54a5ac 100644 --- a/lfs/paxctl +++ b/lfs/paxctl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pciutils b/lfs/pciutils index 7c313ba3e..2068c5a0c 100644 --- a/lfs/pciutils +++ b/lfs/pciutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 3.4.1 +VER = 3.5.6 THISAPP = pciutils-$(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)_MD5 = 35763bb1eab7bc9bf6eb6efb72cbc8a1 +$(DL_FILE)_MD5 = 63b347d2bb5719b7769c03a1bb72a5b7 install : $(TARGET) diff --git a/lfs/pcmciautils b/lfs/pcmciautils index c80208e70..1074969f4 100644 --- a/lfs/pcmciautils +++ b/lfs/pcmciautils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pcre-compat b/lfs/pcre-compat index 034ac8314..5709a477b 100644 --- a/lfs/pcre-compat +++ b/lfs/pcre-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl b/lfs/perl index 0c239318c..4eee16b80 100644 --- a/lfs/perl +++ b/lfs/perl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Apache-Htpasswd b/lfs/perl-Apache-Htpasswd index 9d9ed9035..5e99bdd21 100644 --- a/lfs/perl-Apache-Htpasswd +++ b/lfs/perl-Apache-Htpasswd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL index 4052c44ae..fd20072a3 100644 --- a/lfs/perl-Authen-SASL +++ b/lfs/perl-Authen-SASL @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Carp-Clan b/lfs/perl-Carp-Clan index 4afc2d662..5fbb297ca 100644 --- a/lfs/perl-Carp-Clan +++ b/lfs/perl-Carp-Clan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-DBD-SQLite b/lfs/perl-DBD-SQLite index aaee2841c..ea14f7e40 100644 --- a/lfs/perl-DBD-SQLite +++ b/lfs/perl-DBD-SQLite @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-DBI b/lfs/perl-DBI index 76e8a2534..2106b288d 100644 --- a/lfs/perl-DBI +++ b/lfs/perl-DBI @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Date-Calc b/lfs/perl-Date-Calc index eb4f2fa8e..427220148 100644 --- a/lfs/perl-Date-Calc +++ b/lfs/perl-Date-Calc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Date-Manip b/lfs/perl-Date-Manip index 39d271acd..9954f24e4 100644 --- a/lfs/perl-Date-Manip +++ b/lfs/perl-Date-Manip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Device-Modem b/lfs/perl-Device-Modem index f0609b928..224d55fb8 100644 --- a/lfs/perl-Device-Modem +++ b/lfs/perl-Device-Modem @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Device-SerialPort b/lfs/perl-Device-SerialPort index 3eebc07d7..7edc357f0 100644 --- a/lfs/perl-Device-SerialPort +++ b/lfs/perl-Device-SerialPort @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Email-Date-Format b/lfs/perl-Email-Date-Format index ce55d1414..e97da7d13 100644 --- a/lfs/perl-Email-Date-Format +++ b/lfs/perl-Email-Date-Format @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-File-ReadBackwards b/lfs/perl-File-ReadBackwards index bafd5573d..38f85f0c7 100644 --- a/lfs/perl-File-ReadBackwards +++ b/lfs/perl-File-ReadBackwards @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-File-Tail b/lfs/perl-File-Tail index 2054bc661..29c78344c 100644 --- a/lfs/perl-File-Tail +++ b/lfs/perl-File-Tail @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Font-TTF b/lfs/perl-Font-TTF index ea60a5e69..3d2c51f81 100644 --- a/lfs/perl-Font-TTF +++ b/lfs/perl-Font-TTF @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-GD b/lfs/perl-GD index efeec57a1..0a97c18fa 100644 --- a/lfs/perl-GD +++ b/lfs/perl-GD @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-IO-String b/lfs/perl-IO-String index 6bacfe2c6..f7745d087 100644 --- a/lfs/perl-IO-String +++ b/lfs/perl-IO-String @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64 index f406ae9e7..2976975b7 100644 --- a/lfs/perl-MIME-Base64 +++ b/lfs/perl-MIME-Base64 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-MIME-Lite b/lfs/perl-MIME-Lite index c6f53e627..186a95c4b 100644 --- a/lfs/perl-MIME-Lite +++ b/lfs/perl-MIME-Lite @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Net-IP b/lfs/perl-Net-IP index e509be34d..c69a91f46 100644 --- a/lfs/perl-Net-IP +++ b/lfs/perl-Net-IP @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL index 2e2ec578f..1c2074803 100644 --- a/lfs/perl-Net-SMTP-SSL +++ b/lfs/perl-Net-SMTP-SSL @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-PDF-API2 b/lfs/perl-PDF-API2 index a47a07681..f3ea7bd87 100644 --- a/lfs/perl-PDF-API2 +++ b/lfs/perl-PDF-API2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Sort-Naturally b/lfs/perl-Sort-Naturally index 30ea076ca..8ab80d22c 100644 --- a/lfs/perl-Sort-Naturally +++ b/lfs/perl-Sort-Naturally @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-Text-CSV_XS b/lfs/perl-Text-CSV_XS index f94593f98..b55ef99e0 100644 --- a/lfs/perl-Text-CSV_XS +++ b/lfs/perl-Text-CSV_XS @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate index ca4b7f295..721a4b80b 100644 --- a/lfs/perl-TimeDate +++ b/lfs/perl-TimeDate @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-common-sense b/lfs/perl-common-sense index a2fb1faa0..4774d2739 100644 --- a/lfs/perl-common-sense +++ b/lfs/perl-common-sense @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-gettext b/lfs/perl-gettext index 2880ac9fc..0bfe15577 100644 --- a/lfs/perl-gettext +++ b/lfs/perl-gettext @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/perl-inotify2 b/lfs/perl-inotify2 index bcb923659..76f8f1e1d 100644 --- a/lfs/perl-inotify2 +++ b/lfs/perl-inotify2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pigz b/lfs/pigz index 51c3b85df..1599a9002 100644 --- a/lfs/pigz +++ b/lfs/pigz @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pixman b/lfs/pixman index e06e0c473..18a422783 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pkg-config b/lfs/pkg-config index 3d039ddf2..368da3b53 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/poppler b/lfs/poppler index 3207e5da2..c8fdd65e7 100644 --- a/lfs/poppler +++ b/lfs/poppler @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/popt b/lfs/popt index 806ec7fa2..7b5d3f962 100644 --- a/lfs/popt +++ b/lfs/popt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/postfix b/lfs/postfix index 0fe4dfe08..2054c68cf 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.2.6 +VER = 3.3.1 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 15 +PAK_VER = 16 DEPS = "" @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d10f1fb551be86f6e48c2908dd8a12ff +$(DL_FILE)_MD5 = 4381c6492f415e4a69cf5099d4acea76 install : $(TARGET) diff --git a/lfs/ppp b/lfs/ppp index 86f3f7ce7..45fc2caab 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pptp b/lfs/pptp index 8edb89b6c..850573810 100644 --- a/lfs/pptp +++ b/lfs/pptp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/procps b/lfs/procps index 183a95cdd..4807f5210 100644 --- a/lfs/procps +++ b/lfs/procps @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/psmisc b/lfs/psmisc index 347ef8e4f..1f0c7d893 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pycurl b/lfs/pycurl index cf8bd71fc..91fe3be16 100644 --- a/lfs/pycurl +++ b/lfs/pycurl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/pygpgme b/lfs/pygpgme index 4adf25a30..3078232ff 100644 --- a/lfs/pygpgme +++ b/lfs/pygpgme @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python b/lfs/python index 70299852c..35651ba60 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-clientform b/lfs/python-clientform index 4e6a29684..adf5f17f8 100644 --- a/lfs/python-clientform +++ b/lfs/python-clientform @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-daemon b/lfs/python-daemon index c96ec5568..e834f30fd 100644 --- a/lfs/python-daemon +++ b/lfs/python-daemon @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-distutils b/lfs/python-distutils index 42ea44e02..969bfecd3 100644 --- a/lfs/python-distutils +++ b/lfs/python-distutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra index f35b5819e..d11ca2561 100644 --- a/lfs/python-distutils-extra +++ b/lfs/python-distutils-extra @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-docutils b/lfs/python-docutils index 13f7ef17d..d4d8356d9 100644 --- a/lfs/python-docutils +++ b/lfs/python-docutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-feedparser b/lfs/python-feedparser index 5143c4a06..a111f5320 100644 --- a/lfs/python-feedparser +++ b/lfs/python-feedparser @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-inotify b/lfs/python-inotify index ea8a960c5..93775c595 100644 --- a/lfs/python-inotify +++ b/lfs/python-inotify @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-ipaddress b/lfs/python-ipaddress index dd9628918..27e42b431 100644 --- a/lfs/python-ipaddress +++ b/lfs/python-ipaddress @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-lzma b/lfs/python-lzma index c2ffcfc45..a0b02c3eb 100644 --- a/lfs/python-lzma +++ b/lfs/python-lzma @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-m2crypto b/lfs/python-m2crypto index 3e69f7090..d870bed45 100644 --- a/lfs/python-m2crypto +++ b/lfs/python-m2crypto @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-mechanize b/lfs/python-mechanize index a0f9086a2..3c8ca772e 100644 --- a/lfs/python-mechanize +++ b/lfs/python-mechanize @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 9ad1d5e85..82bb0e894 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-progressbar b/lfs/python-progressbar index cae318e30..4a8a3a8f4 100644 --- a/lfs/python-progressbar +++ b/lfs/python-progressbar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing index a4a8c552b..17581bff1 100644 --- a/lfs/python-pyparsing +++ b/lfs/python-pyparsing @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-rssdler b/lfs/python-rssdler index 09184610d..91ff8e732 100644 --- a/lfs/python-rssdler +++ b/lfs/python-rssdler @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-setuptools b/lfs/python-setuptools index 9720a84ed..76a519f71 100644 --- a/lfs/python-setuptools +++ b/lfs/python-setuptools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-six b/lfs/python-six index d210e4c75..89b54c36f 100644 --- a/lfs/python-six +++ b/lfs/python-six @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-typing b/lfs/python-typing index 9f028bed5..d7bbe412b 100644 --- a/lfs/python-typing +++ b/lfs/python-typing @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python-xattr b/lfs/python-xattr index 8932ccf9f..0f18004b7 100644 --- a/lfs/python-xattr +++ b/lfs/python-xattr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3 b/lfs/python3 index debb428a5..91a5b7381 100644 --- a/lfs/python3 +++ b/lfs/python3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-botocore b/lfs/python3-botocore index 222ecf750..c22c78a59 100644 --- a/lfs/python3-botocore +++ b/lfs/python3-botocore @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-colorama b/lfs/python3-colorama index c6d116a3a..cb95921ed 100644 --- a/lfs/python3-colorama +++ b/lfs/python3-colorama @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-dateutil b/lfs/python3-dateutil index a3c1729c3..32680cdc5 100644 --- a/lfs/python3-dateutil +++ b/lfs/python3-dateutil @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-docutils b/lfs/python3-docutils index 595409e61..a6d751095 100644 --- a/lfs/python3-docutils +++ b/lfs/python3-docutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath index b6cc739df..856e1d019 100644 --- a/lfs/python3-jmespath +++ b/lfs/python3-jmespath @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-pyasn1 b/lfs/python3-pyasn1 index f3d896a42..cb24a9762 100644 --- a/lfs/python3-pyasn1 +++ b/lfs/python3-pyasn1 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-rsa b/lfs/python3-rsa index 473d69b6f..7585eab56 100644 --- a/lfs/python3-rsa +++ b/lfs/python3-rsa @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer index 239be1469..588dfd1bb 100644 --- a/lfs/python3-s3transfer +++ b/lfs/python3-s3transfer @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-six b/lfs/python3-six index c8bdef968..40da11a61 100644 --- a/lfs/python3-six +++ b/lfs/python3-six @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/python3-yaml b/lfs/python3-yaml index adbdf8f4f..0d00dda29 100644 --- a/lfs/python3-yaml +++ b/lfs/python3-yaml @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/qemu b/lfs/qemu index 4bf3f07a9..be5d7193d 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/qpdf b/lfs/qpdf index 44cd23fe8..3a6bd96ed 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/readline b/lfs/readline index eb488e336..3e9e2a3d5 100644 --- a/lfs/readline +++ b/lfs/readline @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/readline-compat b/lfs/readline-compat index 4bdc9fc10..e7a49c306 100644 --- a/lfs/readline-compat +++ b/lfs/readline-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs index 3018aa169..218796d1a 100644 --- a/lfs/reiserfsprogs +++ b/lfs/reiserfsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/rng-tools b/lfs/rng-tools index c7a358e56..dc87a3406 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -24,7 +24,7 @@ include Config -VER = 6.3.1 +VER = 6.4 THISAPP = rng-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fe2d38e39ff02d0c7b3585407d51dc64 +$(DL_FILE)_MD5 = 52a8243858503f94eecd4ae0983a9818 install : $(TARGET) @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/rpcbind b/lfs/rpcbind index c1b696de7..551453dbf 100644 --- a/lfs/rpcbind +++ b/lfs/rpcbind @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/rrdtool b/lfs/rrdtool index 5d7c8943d..ef67dc26d 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/rtpproxy b/lfs/rtpproxy index be276c6dc..204f44bca 100644 --- a/lfs/rtpproxy +++ b/lfs/rtpproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/samba b/lfs/samba index c4a24eed9..44f4623c0 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sane b/lfs/sane index 9e456f017..b3c2a1205 100644 --- a/lfs/sane +++ b/lfs/sane @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/screen b/lfs/screen index f3c451dff..eb56ace7c 100644 --- a/lfs/screen +++ b/lfs/screen @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sdl b/lfs/sdl index f6d7200aa..868010e06 100644 --- a/lfs/sdl +++ b/lfs/sdl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sdparm b/lfs/sdparm index cd7bbc0f3..e5c5d796f 100644 --- a/lfs/sdparm +++ b/lfs/sdparm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sendEmail b/lfs/sendEmail index 86119297d..28646ef93 100644 --- a/lfs/sendEmail +++ b/lfs/sendEmail @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/setserial b/lfs/setserial index c1d2fc26c..739e7f686 100644 --- a/lfs/setserial +++ b/lfs/setserial @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/setup b/lfs/setup index 764d0edb3..dcd4829dd 100644 --- a/lfs/setup +++ b/lfs/setup @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/shadow b/lfs/shadow index 30000bfa1..29e66b130 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/slang b/lfs/slang index d913cdf25..d6e685855 100644 --- a/lfs/slang +++ b/lfs/slang @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/smartmontools b/lfs/smartmontools index a3c660a20..2c3fd39d8 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/snort b/lfs/snort index a5d0535b0..813c05c14 100644 --- a/lfs/snort +++ b/lfs/snort @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sox b/lfs/sox index 8a2aec646..fcbda5df9 100644 --- a/lfs/sox +++ b/lfs/sox @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/spamassassin b/lfs/spamassassin index 75944a78c..5d2519fb5 100644 --- a/lfs/spamassassin +++ b/lfs/spamassassin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/spandsp b/lfs/spandsp index 6ad72d92b..c186607ea 100644 --- a/lfs/spandsp +++ b/lfs/spandsp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/spice b/lfs/spice index 74706240f..bdba4f5a9 100644 --- a/lfs/spice +++ b/lfs/spice @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/spice-protocol b/lfs/spice-protocol index 9422def06..ac450c850 100644 --- a/lfs/spice-protocol +++ b/lfs/spice-protocol @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sqlite b/lfs/sqlite index 903bcb223..3b045e729 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/squid-accounting b/lfs/squid-accounting index e71b2ac5d..9bc43fb40 100644 --- a/lfs/squid-accounting +++ b/lfs/squid-accounting @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/squidclamav b/lfs/squidclamav index bb157a6ce..01befe50f 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/squidguard b/lfs/squidguard index a48c25cbe..f627a27d8 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sshfs b/lfs/sshfs index 3b5417634..23fbd18ca 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sslh b/lfs/sslh index f70cfa84b..100cec065 100644 --- a/lfs/sslh +++ b/lfs/sslh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/stage1 b/lfs/stage1 index 99e3edbbd..5ad5f1107 100644 --- a/lfs/stage1 +++ b/lfs/stage1 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/stage2 b/lfs/stage2 index 4ab5edd8b..7e8dfe316 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/strace b/lfs/strace index d2004d4b2..c8ad9ce03 100644 --- a/lfs/strace +++ b/lfs/strace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/streamripper b/lfs/streamripper index 681fc1458..223152acd 100644 --- a/lfs/streamripper +++ b/lfs/streamripper @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/stress b/lfs/stress index 166d840f9..19501d25a 100644 --- a/lfs/stress +++ b/lfs/stress @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/strip b/lfs/strip index b22cfb9a3..08aaee7c4 100644 --- a/lfs/strip +++ b/lfs/strip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/strongswan b/lfs/strongswan index 102c24724..9dee2613b 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/stunnel b/lfs/stunnel index 342b0370c..d23196a33 100644 --- a/lfs/stunnel +++ b/lfs/stunnel @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sudo b/lfs/sudo index 1c66bc558..066a29fa0 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/swatch b/lfs/swatch index 381cac302..da7733f29 100644 --- a/lfs/swatch +++ b/lfs/swatch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/swig b/lfs/swig index f9b0782e4..93ac4d7ab 100644 --- a/lfs/swig +++ b/lfs/swig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sysbench b/lfs/sysbench index b6e008ee6..932e41fe7 100644 --- a/lfs/sysbench +++ b/lfs/sysbench @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/sysfsutils b/lfs/sysfsutils index e854f1200..6da94cfec 100644 --- a/lfs/sysfsutils +++ b/lfs/sysfsutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sysklogd b/lfs/sysklogd index 58d107357..eaf647059 100644 --- a/lfs/sysklogd +++ b/lfs/sysklogd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/syslinux b/lfs/syslinux index 00a8415d0..eecf3aefa 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.06 +VER = 6.04-pre1 THISAPP = syslinux-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -33,6 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 i586 +# Clear compiler flags (mainly hardening) +CFLAGS = + ############################################################################### # Top-level Rules ############################################################################### @@ -41,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 77d33140860621cd850c3a7ab0ebb7d6 +$(DL_FILE)_MD5 = f9c956fde0de29be297402ecbc8ff4d0 install : $(TARGET) @@ -71,6 +74,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make install + + # Build + cd $(DIR_APP) && make bios $(MAKETUNING) +ifeq "$(BUILD_ARCH)" "x86_64" + cd $(DIR_APP) && make efi64 $(MAKETUNING) +endif + + # Install + cd $(DIR_APP) && make bios install +ifeq "$(BUILD_ARCH)" "x86_64" + cd $(DIR_APP) && make efi64 install +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sysstat b/lfs/sysstat index dc15765e8..bdd78ff86 100644 --- a/lfs/sysstat +++ b/lfs/sysstat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/sysvinit b/lfs/sysvinit index 85864fd06..82c4fa936 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/taglib b/lfs/taglib index acf2cab24..ad7da286b 100644 --- a/lfs/taglib +++ b/lfs/taglib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tar b/lfs/tar index 4e914b535..cbab6c2a9 100644 --- a/lfs/tar +++ b/lfs/tar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tcl b/lfs/tcl index 73c92cc81..bb2e3cdad 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tcpdump b/lfs/tcpdump index 7a055ddac..a53cae06f 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/telnet b/lfs/telnet index a43bebab3..651ab9769 100644 --- a/lfs/telnet +++ b/lfs/telnet @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/texinfo b/lfs/texinfo index 535612c44..68be5fc30 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tftpd b/lfs/tftpd index e0cd93bda..80062d2cc 100644 --- a/lfs/tftpd +++ b/lfs/tftpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tmux b/lfs/tmux index 1117969cc..d08904132 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tor b/lfs/tor index dcb99adb5..5b03aba5d 100644 --- a/lfs/tor +++ b/lfs/tor @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/traceroute b/lfs/traceroute index 74cffc7ea..2a29c858f 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/transmission b/lfs/transmission index 0377b4b56..5de887c43 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/tzdata b/lfs/tzdata index 2d1293ce8..258fce8d3 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/ubuntu-font-family b/lfs/ubuntu-font-family index f817b856b..fd64c5d35 100644 --- a/lfs/ubuntu-font-family +++ b/lfs/ubuntu-font-family @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/udev b/lfs/udev index 1e6323620..d55dec450 100644 --- a/lfs/udev +++ b/lfs/udev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/unbound b/lfs/unbound index b4c1b02f3..ae2795e0e 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.7.3 +VER = 1.8.0 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ea45068fb27ef358f581227b99645525 +$(DL_FILE)_MD5 = 495ffdff55a53ff1735fb58e956c1945 install : $(TARGET) diff --git a/lfs/unzip b/lfs/unzip index 793890d28..6fa9c787c 100644 --- a/lfs/unzip +++ b/lfs/unzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/urlgrabber b/lfs/urlgrabber index f2966c396..2c1f38239 100644 --- a/lfs/urlgrabber +++ b/lfs/urlgrabber @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 3afd32bec..afa719936 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 9fda7ace3..0ff0fce40 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/usbutils b/lfs/usbutils index 51192e7e7..055a7b822 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/util-linux b/lfs/util-linux index ac8d7410a..cb8e32d57 100644 --- a/lfs/util-linux +++ b/lfs/util-linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/util-macros b/lfs/util-macros index f2c347f18..4f6086042 100644 --- a/lfs/util-macros +++ b/lfs/util-macros @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index 781f00d26..d11a4b4dd 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index c8dd7f6fd..4a3f811d8 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index e0065accb..1a202b34b 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index b67843e6e..c6d21f110 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vdradmin b/lfs/vdradmin index bca5c5835..a78919f7e 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vim b/lfs/vim index 8928dbd92..81d1516d7 100644 --- a/lfs/vim +++ b/lfs/vim @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/vlan b/lfs/vlan index 6e862b98b..8410ce169 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/w_scan b/lfs/w_scan index c661a80b0..369c1554c 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/watchdog b/lfs/watchdog index 9bef90728..cd8c11bd0 100644 --- a/lfs/watchdog +++ b/lfs/watchdog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/wavemon b/lfs/wavemon index 0fd214ad0..65dc4bb38 100644 --- a/lfs/wavemon +++ b/lfs/wavemon @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/web-user-interface b/lfs/web-user-interface index 0c5688252..7b04ef803 100644 --- a/lfs/web-user-interface +++ b/lfs/web-user-interface @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -55,6 +55,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/updatecache/{download,metadata} cp -aR $(DIR_SRC)/html/* /srv/web/ipfire + # Add base64 encoded background image to Squid content access page + basedata="$$( base64 $(DIR_SRC)/html/html/images/background.gif | tr -d '\n' )"; \ + sed -i "s|IMAGEDATAPLACEHOLDER|$${basedata}|g" \ + /srv/web/ipfire/html/redirect-templates/legacy/template.html + # Change CONFIG_ROOT in cgi-scripts for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ if [ -f $$i ]; then \ diff --git a/lfs/whatmask b/lfs/whatmask index f2f2257ff..a9beb54a1 100644 --- a/lfs/whatmask +++ b/lfs/whatmask @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/which b/lfs/which index 75b47b974..7e529fc75 100644 --- a/lfs/which +++ b/lfs/which @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/wio b/lfs/wio index 4d5303e15..7098dd9cf 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,6 +1,6 @@ ############################################################################### # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # ############################################################################### ############################################################################### diff --git a/lfs/wireless b/lfs/wireless index 81330ad71..bd1bb18e7 100644 --- a/lfs/wireless +++ b/lfs/wireless @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb index 17a645045..84cad32ea 100644 --- a/lfs/wireless-regdb +++ b/lfs/wireless-regdb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 32cecfd00..4d8174cbb 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/xen-image b/lfs/xen-image index 78c242bf8..7590846bf 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 9c3239ea4..c104e8490 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/xinetd b/lfs/xinetd index 11c006232..d592c90ab 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/xtables-addons b/lfs/xtables-addons index cc98e35fe..af2784c1a 100644 --- a/lfs/xtables-addons +++ b/lfs/xtables-addons @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/xvid b/lfs/xvid index df45ea23d..5690b8038 100644 --- a/lfs/xvid +++ b/lfs/xvid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/zd1211-firmware b/lfs/zd1211-firmware index 25a9c4ab2..e19f1cbb5 100644 --- a/lfs/zd1211-firmware +++ b/lfs/zd1211-firmware @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/zerofree b/lfs/zerofree index 7e3dda551..b3f20aba6 100644 --- a/lfs/zerofree +++ b/lfs/zerofree @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/zlib b/lfs/zlib index 757995f41..d742dad86 100644 --- a/lfs/zlib +++ b/lfs/zlib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/make.sh b/make.sh index b8053a38f..d8b7856cb 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="123" # Core Level (Filename) -PAKFIRE_CORE="123" # Core Level (PAKFIRE) +CORE="124" # Core Level (Filename) +PAKFIRE_CORE="124" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -1083,6 +1083,7 @@ buildipfire() { lfsmake2 configroot lfsmake2 initscripts lfsmake2 backup + lfsmake2 popt lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1104,6 +1105,8 @@ buildipfire() { lfsmake2 multipath-tools lfsmake2 freetype lfsmake2 grub + lfsmake2 efivar + lfsmake2 efibootmgr lfsmake2 libmnl lfsmake2 libnfnetlink lfsmake2 libnetfilter_queue @@ -1207,7 +1210,6 @@ buildipfire() { lfsmake2 libtiff lfsmake2 libart lfsmake2 gd - lfsmake2 popt lfsmake2 slang lfsmake2 newt lfsmake2 libsmooth @@ -1228,7 +1230,9 @@ buildipfire() { lfsmake2 bootstrap lfsmake2 arping lfsmake2 beep - lfsmake2 dvdrtools + lfsmake2 libarchive + lfsmake2 cmake + lfsmake2 cdrkit lfsmake2 dosfstools lfsmake2 reiserfsprogs lfsmake2 xfsprogs @@ -1370,8 +1374,6 @@ buildipfire() { lfsmake2 libshout lfsmake2 xvid lfsmake2 libmpeg2 - lfsmake2 libarchive - lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync lfsmake2 libtirpc diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 893246ba1..e3f1d0a9f 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -50,22 +50,6 @@ prefix2netmask() { to_address "$(( netmask ^ 0xffffffff ))" } -find_interface() { - local mac="${1}" - - local path - for path in /sys/class/net/*; do - local address="$(<${path}/address)" - - if [ "${mac}" = "${address}" ]; then - basename "${path}" - return 0 - fi - done - - return 1 -} - import_aws_configuration() { local instance_id="$(get meta-data/instance-id)" @@ -114,18 +98,6 @@ import_aws_configuration() { # Download the user-data script only on the first boot if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then - # Initialize pakfire - /etc/init.d/pakfire start &>/dev/null - - # Install all available updates - ( pakfire update && pakfire upgrade -y ) &>/dev/null - - # If an update requires a reboot, we will do it - if [ -e "/var/run/need_reboot" ]; then - reboot - exit 1 - fi - # Download user-data local user_data="$(get user-data)" @@ -243,19 +215,13 @@ import_aws_configuration() { ) >> /var/ipfire/ethernet/settings ;; esac - - # Rename interface - local interface="$(find_interface "${mac}")" - - if [ -n "${interface}" ] && [ -n "${interface_name}" ] && [ "${interface}" != "${interface_name}" ]; then - ip link set "${interface}" down - ip link set "${interface}" name "${interface_name}" - fi done # Save CONFIG_TYPE echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings + + # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then # Enable SSH @@ -322,6 +288,9 @@ case "${reason}" in # Remove all IP addresses ip addr flush dev "${interface}" + + # Shut down the interface + ip link set "${interface}" down ;; *) diff --git a/src/initscripts/networking/red.down/10-static-routes b/src/initscripts/networking/red.down/10-static-routes index f8f00a7d1..650557a47 100644 --- a/src/initscripts/networking/red.down/10-static-routes +++ b/src/initscripts/networking/red.down/10-static-routes @@ -1,4 +1,4 @@ #!/bin/bash -# Update the static routes. -exec /etc/rc.d/init.d/static-routes start +# Update the static routes +exec /etc/rc.d/init.d/static-routes reload diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws index 6fce670a0..2a556801a 100644 --- a/src/initscripts/system/aws +++ b/src/initscripts/system/aws @@ -60,6 +60,9 @@ case "${1}" in # End DHCP client immediately dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null + # Rename network devices + udevadm trigger --action="add" --subsystem-match="net" + exit 0 ;; diff --git a/src/initscripts/system/firstsetup b/src/initscripts/system/firstsetup index 0704a98dc..e79c144d9 100644 --- a/src/initscripts/system/firstsetup +++ b/src/initscripts/system/firstsetup @@ -36,11 +36,5 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then fi fi -echo Restarting udev... -killall udevd -/sbin/udevadm hwdb --update -/sbin/udevd --daemon -/sbin/udevadm trigger -/sbin/udevadm settle /etc/init.d/sysklogd stop touch /var/ipfire/main/firstsetup_ok diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index e071216fd..a16b32e46 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -36,16 +36,10 @@ case "${1}" in ip link set lo up evaluate_retval - boot_mesg "Setting hostname to ${HOSTNAME}..." - hostname ${HOSTNAME} + boot_mesg "Setting hostname to ${HOSTNAME}.${DOMAINNAME}..." + hostname "${HOSTNAME}.${DOMAINNAME}" evaluate_retval - if [ -z "$DOMAINNAME" ]; then - boot_mesg "Setting domainname to ${DOMAINNAME}..." - domainname ${DOMAINNAME} - evaluate_retval - fi - # Update hosts write_hosts diff --git a/src/initscripts/system/network-trigger b/src/initscripts/system/network-trigger deleted file mode 100644 index 0d9de45c6..000000000 --- a/src/initscripts/system/network-trigger +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/network-trigger -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Triggering network devices..." - udevadm trigger --action="add" --subsystem-match="net" - evaluate_retval - ;; - - *) - echo "Usage: ${0} {start}" - exit 1 - ;; -esac - -# End $rc_base/init.d/network-trigger diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 819d12885..2fad11251 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -38,12 +38,12 @@ case "${1}" in echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" /etc/default/grub fi - /usr/local/bin/update-bootloader + + # Re-generate GRUB configuration + /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg fi umount /boot > /dev/null - sleep 30 - # Detect device mount | while read -r dev tmp1 mountpoint tmp2; do [ "${dev}" = "rootfs" ] && continue diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes index 940a7b45c..84e3e3d29 100644 --- a/src/initscripts/system/static-routes +++ b/src/initscripts/system/static-routes @@ -42,7 +42,7 @@ function create_all_routes() { CONFIGFILE="/var/ipfire/main/routing" case "${1}" in - start) + start|reload) boot_mesg "Adding static routes..." # First, initialize the table @@ -61,7 +61,7 @@ case "${1}" in ;; *) - echo "Usage: ${0} {start|stop}" + echo "Usage: ${0} {start|stop|reload}" exit 1 ;; esac diff --git a/src/installer/Makefile.am b/src/installer/Makefile.am index d0e52dc18..32f01bfa6 100644 --- a/src/installer/Makefile.am +++ b/src/installer/Makefile.am @@ -35,6 +35,7 @@ bin_PROGRAMS = \ bin_SCRIPTS = \ downloadsource.sh \ execute-postinstall.sh \ + install-bootloader \ start-networking.sh #- installer ------------------------------------------------------------------- diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh index b8803970a..103f754e9 100755 --- a/src/installer/dracut-module/module-setup.sh +++ b/src/installer/dracut-module/module-setup.sh @@ -29,7 +29,7 @@ install() { instmods virtio_net hv_netvsc vmxnet3 # Filesystem support - inst_multiple parted mkswap mke2fs mkreiserfs mkfs.xfs + inst_multiple parted mkswap mke2fs mkreiserfs mkfs.xfs mkfs.vfat instmods ext4 iso9660 reiserfs vfat xfs # Extraction diff --git a/src/installer/hw.c b/src/installer/hw.c index 6acddf9bf..8189aba18 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -37,6 +37,7 @@ #include <sys/stat.h> #include <sys/swap.h> #include <sys/sysinfo.h> +#include <sys/utsname.h> #include <unistd.h> #include <linux/fs.h> @@ -61,7 +62,7 @@ static int system_chroot(const char* output, const char* path, const char* cmd) } struct hw* hw_init() { - struct hw* hw = malloc(sizeof(*hw)); + struct hw* hw = calloc(1, sizeof(*hw)); assert(hw); // Initialize libudev @@ -71,6 +72,16 @@ struct hw* hw_init() { exit(1); } + // What architecture are we running on? + struct utsname uname_data; + int ret = uname(&uname_data); + if (ret == 0) + snprintf(hw->arch, sizeof(hw->arch), "%s", uname_data.machine); + + // Should we install in EFI mode? + if ((strcmp(hw->arch, "x86_64") == 0) || (strcmp(hw->arch, "aarch64") == 0)) + hw->efi = 1; + return hw; } @@ -438,7 +449,7 @@ static int hw_device_has_p_suffix(const struct hw_destination* dest) { return 0; } -static int hw_calculate_partition_table(struct hw_destination* dest, int disable_swap) { +static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* dest, int disable_swap) { char path[DEV_SIZE]; int part_idx = 1; @@ -496,9 +507,15 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable dest->size_boot = hw_boot_size(dest); + // Create an EFI partition when running in EFI mode + if (hw->efi) + dest->size_boot_efi = MB2BYTES(32); + else + dest->size_boot_efi = 0; + // Determine the size of the data partition. unsigned long long space_left = dest->size - \ - (dest->size_bootldr + dest->size_boot); + (dest->size_bootldr + dest->size_boot + dest->size_boot_efi); // If we have less than 2GB left, we disable swap if (space_left <= MB2BYTES(2048)) @@ -525,6 +542,14 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable } else *dest->part_boot = '\0'; + if (dest->size_boot_efi > 0) { + dest->part_boot_efi_idx = part_idx; + + snprintf(dest->part_boot_efi, sizeof(dest->part_boot_efi), + "%s%d", path, part_idx++); + } else + *dest->part_boot_efi = '\0'; + if (dest->size_swap > 0) snprintf(dest->part_swap, sizeof(dest->part_swap), "%s%d", path, part_idx++); else @@ -539,7 +564,7 @@ static int hw_calculate_partition_table(struct hw_destination* dest, int disable return 0; } -struct hw_destination* hw_make_destination(int part_type, struct hw_disk** disks, int disable_swap) { +struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, int disable_swap) { struct hw_destination* dest = malloc(sizeof(*dest)); if (part_type == HW_PART_TYPE_NORMAL) { @@ -559,7 +584,7 @@ struct hw_destination* hw_make_destination(int part_type, struct hw_disk** disks // Is this a RAID device? dest->is_raid = (part_type > HW_PART_TYPE_NORMAL); - int r = hw_calculate_partition_table(dest, disable_swap); + int r = hw_calculate_partition_table(hw, dest, disable_swap); if (r) return NULL; @@ -647,6 +672,14 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { part_start += dest->size_boot; } + if (*dest->part_boot_efi) { + asprintf(&cmd, "%s mkpart %s fat32 %lluB %lluB", cmd, + (dest->part_table == HW_PART_TABLE_GPT) ? "ESP" : "primary", + part_start, part_start + dest->size_boot_efi - 1); + + part_start += dest->size_boot_efi; + } + if (*dest->part_swap) { asprintf(&cmd, "%s mkpart %s linux-swap %lluB %lluB", cmd, (dest->part_table == HW_PART_TABLE_GPT) ? "SWAP" : "primary", @@ -666,6 +699,9 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { if (dest->part_boot_idx > 0) asprintf(&cmd, "%s set %d boot on", cmd, dest->part_boot_idx); + if (dest->part_boot_efi_idx > 0) + asprintf(&cmd, "%s set %d esp on", cmd, dest->part_boot_efi_idx); + if (dest->part_table == HW_PART_TABLE_GPT) { if (*dest->part_bootldr) { asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx); @@ -688,6 +724,9 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { if (*dest->part_boot && (try_open(dest->part_boot) != 0)) continue; + if (*dest->part_boot_efi && (try_open(dest->part_boot_efi) != 0)) + continue; + if (*dest->part_swap && (try_open(dest->part_swap) != 0)) continue; @@ -726,6 +765,10 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) { // XFS } else if (fs == HW_FS_XFS) { snprintf(cmd, sizeof(cmd), "/sbin/mkfs.xfs -f %s", path); + + // FAT32 + } else if (fs == HW_FS_FAT32) { + snprintf(cmd, sizeof(cmd), "/sbin/mkfs.vfat %s", path); } assert(*cmd); @@ -745,6 +788,13 @@ int hw_create_filesystems(struct hw_destination* dest, const char* output) { return r; } + // ESP + if (*dest->part_boot_efi) { + r = hw_format_filesystem(dest->part_boot_efi, HW_FS_FAT32, output); + if (r) + return r; + } + // swap if (*dest->part_swap) { r = hw_format_filesystem(dest->part_swap, HW_FS_SWAP, output); @@ -780,6 +830,10 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { filesystem = "xfs"; break; + case HW_FS_FAT32: + filesystem = "vfat"; + break; + default: assert(0); } @@ -802,6 +856,19 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { } } + // ESP + if (*dest->part_boot_efi) { + snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT_EFI); + mkdir(target, S_IRWXU|S_IRWXG|S_IRWXO); + + r = hw_mount(dest->part_boot_efi, target, "vfat", 0); + if (r) { + hw_umount_filesystems(dest, prefix); + + return r; + } + } + // swap if (*dest->part_swap) { r = swapon(dest->part_swap, 0); @@ -838,6 +905,14 @@ int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { // Write all buffers to disk before umounting hw_sync(); + // ESP + if (*dest->part_boot_efi) { + snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT_EFI); + r = hw_umount(target); + if (r) + return -1; + } + // boot if (*dest->part_boot) { snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT); @@ -952,35 +1027,17 @@ int hw_stop_all_raid_arrays(const char* output) { return mysystem(output, "/sbin/mdadm --stop --scan --verbose"); } -int hw_install_bootloader(struct hw_destination* dest, const char* output) { +int hw_install_bootloader(struct hw* hw, struct hw_destination* dest, const char* output) { char cmd[STRING_SIZE]; - int r; - // Generate configuration file - snprintf(cmd, sizeof(cmd), "/usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg"); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); + snprintf(cmd, sizeof(cmd), "/usr/bin/install-bootloader %s", dest->path); + int r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); if (r) return r; - char cmd_grub[STRING_SIZE]; - snprintf(cmd_grub, sizeof(cmd_grub), "/usr/sbin/grub-install --no-floppy --recheck"); - - if (dest->is_raid) { - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk1->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - if (r) - return r; - - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk2->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - } else { - snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->path); - r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd); - } - hw_sync(); - return r; + return 0; } static char* hw_get_uuid(const char* dev) { @@ -1021,6 +1078,17 @@ int hw_write_fstab(struct hw_destination* dest) { } } + // ESP + if (*dest->part_boot_efi) { + uuid = hw_get_uuid(dest->part_boot_efi); + + if (uuid) { + fprintf(f, FSTAB_FMT, uuid, "/boot/efi", "auto", "defaults", 1, 2); + free(uuid); + } + } + + // swap if (*dest->part_swap) { uuid = hw_get_uuid(dest->part_swap); diff --git a/src/installer/hw.h b/src/installer/hw.h index e127f1f51..9fe69271e 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -32,6 +32,7 @@ #define DEV_SIZE 128 #define HW_PATH_BOOT "/boot" +#define HW_PATH_BOOT_EFI "/boot/efi" #define HW_PATH_DATA "/var" #define HW_PART_TYPE_NORMAL 0 @@ -45,6 +46,7 @@ #define HW_FS_EXT4 2 #define HW_FS_EXT4_WO_JOURNAL 3 #define HW_FS_XFS 4 +#define HW_FS_FAT32 5 #define HW_FS_DEFAULT HW_FS_EXT4 @@ -57,6 +59,10 @@ struct hw { struct udev *udev; + char arch[STRING_SIZE]; + + // Enabled if we should install in EFI mode + int efi; }; struct hw_disk { @@ -82,15 +88,18 @@ struct hw_destination { int part_table; char part_bootldr[DEV_SIZE]; char part_boot[DEV_SIZE]; + char part_boot_efi[DEV_SIZE]; char part_swap[DEV_SIZE]; char part_root[DEV_SIZE]; int part_boot_idx; + int part_boot_efi_idx; int filesystem; unsigned long long size; unsigned long long size_bootldr; unsigned long long size_boot; + unsigned long long size_boot_efi; unsigned long long size_swap; unsigned long long size_root; }; @@ -109,7 +118,7 @@ unsigned int hw_count_disks(const struct hw_disk** disks); struct hw_disk** hw_select_disks(struct hw_disk** disks, int* selection); struct hw_disk** hw_select_first_disk(const struct hw_disk** disks); -struct hw_destination* hw_make_destination(int part_type, struct hw_disk** disks, +struct hw_destination* hw_make_destination(struct hw* hw, int part_type, struct hw_disk** disks, int disable_swap); unsigned long long hw_memory(); @@ -124,7 +133,7 @@ int hw_destroy_raid_superblocks(const struct hw_destination* dest, const char* o int hw_setup_raid(struct hw_destination* dest, const char* output); int hw_stop_all_raid_arrays(const char* output); -int hw_install_bootloader(struct hw_destination* dest, const char* output); +int hw_install_bootloader(struct hw* hw, struct hw_destination* dest, const char* output); int hw_write_fstab(struct hw_destination* dest); char* hw_find_backup_file(const char* output, const char* search_path); diff --git a/src/scripts/update-bootloader b/src/installer/install-bootloader similarity index 67% rename from src/scripts/update-bootloader rename to src/installer/install-bootloader index ad6fdb642..9c7869613 100644 --- a/src/scripts/update-bootloader +++ b/src/installer/install-bootloader @@ -21,7 +21,7 @@ # # ############################################################################ -GRUB_INSTALL_ARGS="--no-floppy --recheck" +GRUB_INSTALL_ARGS="--no-floppy --recheck --force" function find_bootloader_device() { local mp @@ -52,7 +52,7 @@ function find_device() { # Get the actual device from the partition that holds / while [ -n "${root}" ]; do if [ -e "/sys/block/${root}" ]; then - echo "${root}" + echo "/dev/${root}" return 0 fi @@ -66,15 +66,15 @@ function find_device() { function device_is_mdraid() { local device="${1}" - [ -d "/sys/block/${device}/md" ] + [ -d "/sys/block/${device/\/dev/}/md" ] } function mdraid_get_slaves() { local device="${1}" local slave - for slave in /sys/block/${device}/slaves/*; do - basename "${slave}" + for slave in /sys/block/${device/\/dev/}/slaves/*; do + echo "/dev/$(basename "${slave}")" done 2>/dev/null } @@ -99,44 +99,92 @@ function grub_install() { return 1 fi - local args - for args in "" "--force"; do - if grub-install ${GRUB_INSTALL_ARGS} ${args} "${device}" &>/dev/null; then - return 0 - fi + local arches + case "$(uname -m)" in + aarch64) + arches="arm64-efi" + ;; + i?86) + arches="i386-pc" + ;; + x86_64) + arches="i386-pc x86_64-efi" + ;; + esac + + local arch + for arch in ${arches}; do + local args="--target=${arch}" + + case "${arch}" in + *-efi) + # Skip all EFI architectures if no EFI partition exists + if [ ! -d "/boot/efi" ]; then + continue + fi + + args="${args} --efi-directory=/boot/efi" + + # Don't try to modify the BIOS when we are + # not running on EFI right now + if [ ! -d "/sys/firmware/efi" ]; then + args="${args} --no-nvram" + fi + ;; + esac + + local removable + for removable in "" "--removable"; do + if ! grub-install ${GRUB_INSTALL_ARGS} ${args} \ + ${removable} "${device}" &>/dev/null; then + echo "Could not install GRUB on ${device}" >&2 + return 1 + fi + + # Do not try to install with --removable for non-efi architectures + [[ "${arch}" =~ \-efi$ ]] || break + done done - echo "Could not install GRUB on ${device}" >&2 - return 1 + return 0 } function main() { + local device="${1}" + # Find the root device - local device="$(find_bootloader_device)" if [ -z "${device}" ]; then - echo "Could not find root device. Aborting." >&2 - exit 1 + device="$(find_bootloader_device)" + if [ -z "${device}" ]; then + echo "Could not find root device. Aborting." >&2 + return 1 + fi + + echo "Found bootloader device: ${device}" fi - echo "Found bootloader device: /dev/${device}" + if [ ! -b "${device}" ]; then + echo "${device} does not exist" >&2 + return 2 + fi # Update configuration files - grub_update_config || exit $? + grub_update_config || return $? # Handle mdraid devices if device_is_mdraid "${device}"; then local slave for slave in $(mdraid_get_slaves "${device}"); do - grub_install "/dev/${slave}" + grub_install "${slave}" done # Handle normal block devices else - grub_install "/dev/${device}" + grub_install "${device}" fi return 0 } # Run main function -main +main "$@" || exit $? diff --git a/src/installer/main.c b/src/installer/main.c index 5572a4da4..849976542 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -383,7 +383,9 @@ int main(int argc, char *argv[]) { } fprintf(flog, "Install program started.\n"); - + if (hw->efi) + fprintf(flog, "EFI mode enabled\n"); + newtInit(); newtCls(); @@ -673,7 +675,8 @@ int main(int argc, char *argv[]) { hw_free_disks(disks); - struct hw_destination* destination = hw_make_destination(part_type, selected_disks, config.disable_swap); + struct hw_destination* destination = hw_make_destination(hw, part_type, + selected_disks, config.disable_swap); if (!destination) { errorbox(_("Your harddisk is too small.")); @@ -683,6 +686,7 @@ int main(int argc, char *argv[]) { fprintf(flog, "Destination drive: %s\n", destination->path); fprintf(flog, " bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTES2MB(destination->size_bootldr)); fprintf(flog, " boot : %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot)); + fprintf(flog, " ESP : %s (%lluMB)\n", destination->part_boot_efi, BYTES2MB(destination->size_boot_efi)); fprintf(flog, " swap : %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap)); fprintf(flog, " root : %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root)); fprintf(flog, "Memory : %lluMB\n", BYTES2MB(hw_memory())); @@ -834,7 +838,7 @@ int main(int argc, char *argv[]) { fclose(f); } - rc = hw_install_bootloader(destination, logfile); + rc = hw_install_bootloader(hw, destination, logfile); if (rc) { errorbox(_("Unable to install the bootloader.")); goto EXIT; diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index dd4007a44..12a405bd7 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -118,20 +118,6 @@ sub usage { exit 1; } -sub pinghost { - my $host = shift; - - $p = Net::Ping->new("icmp"); - if ($p->ping($host)) { - logger("PING INFO: $host is alive"); - return 1; - } else { - logger("PING INFO: $host is unreachable"); - return 0; - } - $p->close(); -} - sub fetchfile { my $getfile = shift; my $gethost = shift; @@ -141,7 +127,7 @@ sub fetchfile { use File::Basename; $bfile = basename("$getfile"); - logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/); + logger("DOWNLOAD STARTED: $getfile"); $i = 0; while (($allok == 0) && $i < 5) { @@ -159,9 +145,7 @@ sub fetchfile { $proto = "HTTP" unless $proto; - unless ($bfile =~ /^counter\?.*/) { - logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); - } + logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); my $ua = LWP::UserAgent->new; $ua->agent("Pakfire/$Conf::version"); @@ -171,10 +155,10 @@ sub fetchfile { &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); if ($proxysettings{'UPSTREAM_PROXY'}) { - logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter.py\?.*/); + logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\""); if ($proxysettings{'UPSTREAM_USER'}) { $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]); - logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter.py\?.*/); + logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\""); } else { $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_PROXY'}/"]); } @@ -193,19 +177,13 @@ sub fetchfile { } } - my $response; + my $result = $ua->head($url); + my $remote_headers = $result->headers; + $total_size = $remote_headers->content_length; + logger("DOWNLOAD INFO: $file has size of $total_size bytes"); - unless ($bfile =~ /^counter.py\?.*/) { - my $result = $ua->head($url); - my $remote_headers = $result->headers; - $total_size = $remote_headers->content_length; - logger("DOWNLOAD INFO: $file has size of $total_size bytes"); - - $response = $ua->get($url, ':content_cb' => \&callback ); - message(""); - } else { - $response = $ua->get($url); - } + my $response = $ua->get($url, ':content_cb' => \&callback ); + message(""); my $code = $response->code(); my $log = $response->status_line; @@ -217,31 +195,27 @@ sub fetchfile { } if ($response->is_success) { - unless ($bfile =~ /^counter.py\?.*/) { - if (open(FILE, ">$Conf::tmpdir/$bfile")) { - print FILE $final_data; - close(FILE); - logger("DOWNLOAD INFO: File received. Start checking signature..."); - if (&valid_signature("$Conf::tmpdir/$bfile")) { - logger("DOWNLOAD INFO: Signature of $bfile is fine."); - move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile"); - } else { - message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting..."); - my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`; - if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");} - else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");} - exit 1; - } - logger("DOWNLOAD FINISHED: $file"); - $allok = 1; - return 0; + if (open(FILE, ">$Conf::tmpdir/$bfile")) { + print FILE $final_data; + close(FILE); + logger("DOWNLOAD INFO: File received. Start checking signature..."); + if (&valid_signature("$Conf::tmpdir/$bfile")) { + logger("DOWNLOAD INFO: Signature of $bfile is fine."); + move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile"); } else { - logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing."); + message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting..."); + my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`; + if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");} + else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");} + exit 1; } - } else { + logger("DOWNLOAD FINISHED: $file"); + $allok = 1; return 0; + } else { + logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing."); } - } else { + } else { logger("DOWNLOAD ERROR: $log"); } } @@ -349,10 +323,8 @@ sub selectmirror { ### Choose a random server and test if it is online # If the check fails try a new server. # This will never give up. - my $found = 0; my $servers = 0; - my $pingdelay = 1; - while ($found == 0) { + while (1) { $server = int(rand($scount) + 1); $servers = 0; my ($line, $proto, $path, $host); @@ -364,22 +336,8 @@ sub selectmirror { $proto = $templine[0]; $host = $templine[1]; $path = $templine[2]; - if ($pakfiresettings{'HEALTHCHECK'} eq "off") { - logger("PING INFO: Healthcheck is disabled"); - $found = 1; - return ($proto, $host, $path); - } - elsif (pinghost("$host")) { - $found = 1; - return ($proto, $host, $path); - } - if ($found == 0) { - sleep($pingdelay); - $pingdelay=$pingdelay*2; - if ($pingdelay>1200) { - $pingdelay=1200; - } - } + + return ($proto, $host, $path); } } } @@ -789,9 +747,6 @@ sub setuppak { message("PAKFIRE INST: $pak: Copying files and running post-installation scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); cleanup("tmp"); @@ -850,9 +805,6 @@ sub upgradepak { message("PAKFIRE UPGR: $pak: Upgrading files and running post-upgrading scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./update.sh >> $Conf::logdir/update-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak"); cleanup("tmp"); @@ -875,9 +827,6 @@ sub removepak { message("PAKFIRE REMV: $pak: Removing files and running post-removing scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1"); $return %= 255; - if ($pakfiresettings{'UUID'} ne "off") { - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver"); - } if ($return == 0) { unlink("$Conf::dbdir/rootfiles/$pak"); unlink("$Conf::dbdir/installed/meta-$pak"); @@ -924,17 +873,6 @@ sub makeuuid { } } -sub senduuid { - if ($pakfiresettings{'UUID'} ne "off") { - unless("$Conf::uuid") { - $Conf::uuid = `cat $Conf::dbdir/uuid`; - } - logger("Sending my uuid: $Conf::uuid"); - fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid", "$Conf::mainserver"); - system("rm -f $Conf::tmpdir/counter* 2>/dev/null"); - } -} - sub callback { my ($data, $response, $protocol) = @_; $final_data .= $data; diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index dfba91556..041ba669a 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -249,7 +249,6 @@ } elsif ("$ARGV[0]" eq "update") { &Pakfire::makeuuid(); - &Pakfire::senduuid(); &Pakfire::getmirrors("$force"); &Pakfire::dbgetlist("$force"); &Pakfire::getcoredb("$force"); diff --git a/src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch b/src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch new file mode 100644 index 000000000..75c4db2f5 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.10-build-fix.patch @@ -0,0 +1,11 @@ +diff -up cdrkit-1.1.10/genisoimage/genisoimage.c.build-fix cdrkit-1.1.10/genisoimage/genisoimage.c +--- cdrkit-1.1.10/genisoimage/genisoimage.c.build-fix 2010-01-20 11:05:05.000000000 +0100 ++++ cdrkit-1.1.10/genisoimage/genisoimage.c 2010-01-20 11:21:16.144098749 +0100 +@@ -47,6 +47,7 @@ + + #include <mconfig.h> + #include "genisoimage.h" ++#include "checksum.h" + #include "iso9660.h" + #include <errno.h> + #include <timedefs.h> diff --git a/src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch b/src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch new file mode 100644 index 000000000..a171e394e --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-cmakewarn.patch @@ -0,0 +1,9 @@ +diff -up cdrkit-1.1.11/CMakeLists.txt.cmakewarn cdrkit-1.1.11/CMakeLists.txt +--- cdrkit-1.1.11/CMakeLists.txt.cmakewarn 2012-07-31 13:11:10.075500531 +0200 ++++ cdrkit-1.1.11/CMakeLists.txt 2012-07-31 13:11:41.069108287 +0200 +@@ -1,3 +1,5 @@ ++cmake_minimum_required(VERSION 2.8) ++cmake_policy(SET CMP0015 OLD) + PROJECT (cdrkit C) + SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) + diff --git a/src/patches/cdrkit/cdrkit-1.1.11-devname.patch b/src/patches/cdrkit/cdrkit-1.1.11-devname.patch new file mode 100644 index 000000000..93e32d63e --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-devname.patch @@ -0,0 +1,30 @@ +diff -up wrk/libusal/scsi-linux-sg.c.wrk wrk/libusal/scsi-linux-sg.c +--- wrk/libusal/scsi-linux-sg.c.wrk 2015-05-29 13:30:41.088896572 +0200 ++++ wrk/libusal/scsi-linux-sg.c 2015-05-29 13:38:25.776303388 +0200 +@@ -509,7 +509,9 @@ usalo_open(SCSI *usalp, char *device) + /* scan and maybe keep one open, sg_setup decides */ + #define HDX 0 + #define SCD 1 +-#define SG 2 ++/* second scd option included because of Fedora naming convention /dev/srN */ ++#define SCD2 2 ++#define SG 3 + int h; + /* + retry_scan_open: +@@ -533,6 +535,15 @@ retry_scan_open: + first=0; + last=255; + break; ++ } ++ case(SCD2): ++ { ++ if(!check_linux_26()) ++ continue; ++ pattern="/dev/sr%d"; ++ first=0; ++ last=255; ++ break; + } + case(SG): + { diff --git a/src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch b/src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch new file mode 100644 index 000000000..471a7a96c --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-dvdman.patch @@ -0,0 +1,70 @@ +diff -up cdrkit-1.1.11/wodim/wodim.1.dvdman cdrkit-1.1.11/wodim/wodim.1 +--- cdrkit-1.1.11/wodim/wodim.1.dvdman 2011-06-08 14:49:00.073093571 +0200 ++++ cdrkit-1.1.11/wodim/wodim.1 2011-06-08 14:50:59.707093540 +0200 +@@ -835,49 +835,33 @@ newer ones) still implement the Sony pro + not yet become a problem to use this driver for all Sony drives. If you find + a newer Sony drive that does not work with this driver, please report. + .TP +-.B mmc_dvd ++.B mmc_mdvd + The generic SCSI-3/mmc-2 DVD-R/DVD-RW driver is auto-selected whenever + .B wodim + finds a MMC-2 or MMC-3 compliant drive that supports to write DVDs and + an appropriate medium is loaded. +-There is no Track At Once mode for DVD writers. +-.TP +-.B mmc_dvdplus +-The generic SCSI-3/mmc-3 DVD+R/DVD+RW driver is auto-selected whenever +-one of the DVD+ media types that are incompatible to each other is found. +-It checks media and then +-branches to the driver that matches the current medium. +-.TP +-.B mmc_dvdplusr +-The generic SCSI-3/mmc-3 DVD+R driver is auto-selected whenever +-a DVD+R medium is found in an appropriate writer. + Note that for unknown reason, the DVD-Plus alliance does not +-like that there is a simulation mode for DVD+R media. +-The author of +-.B wodim +-tries to convince manufacturers to implement a simulation mode for DVD+R +-and implement support. +-DVD+R only supports one write mode that is somewhere between Track At Once +-and Packet writing; this mode is selected in ++like that there is a simulation mode for DVD+R and DVD+RW media nor a way ++to erase DVD+RW media. ++DVD+R and DVD+RW only supports one write mode that is somewhere between ++Track At Once and Packet writing; this mode is selected in + .B wodim + via a the + .BR \-dao / \-sao + option. +-.TP +-.B mmc_dvdplusrw +-The generic SCSI-3/mmc-3 DVD+RW driver is auto-selected whenever +-a DVD+RW medium is found in an appropriate writer. +-As DVD+RW media needs to be formatted before its first use, wodim +-auto-detects this media state and performs a format before it starts +-to write. +-Note that for unknown reason, the DVD-Plus alliance does not +-like that there is a simulation mode nor a way to erase DVD+RW media. +-DVD+RW only supports one write mode that is close to +-Packet writing; this mode is selected in ++As DVD+RW media needs to be formatted before its first use, + .B wodim +-via a the +-.BR \-dao / \-sao +-option. ++auto-detects this media state and performs a format before it starts ++to write. ++.sp ++Note: If you have any problems during burning DVDs using ++.BR wodim , ++please consider ++.B growisofs ++from package ++.BR dvd+rw-tools , ++which often works better ++in these cases. + .TP + .B cw_7501 + The driver for Matsushita/Panasonic CW-7501 is auto-selected when diff --git a/src/patches/cdrkit/cdrkit-1.1.11-format.patch b/src/patches/cdrkit/cdrkit-1.1.11-format.patch new file mode 100644 index 000000000..983ed2326 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-format.patch @@ -0,0 +1,129 @@ +diff -up cdrkit-1.1.11/wodim/drv_mmc.c.format cdrkit-1.1.11/wodim/drv_mmc.c +--- cdrkit-1.1.11/wodim/drv_mmc.c.format 2011-05-18 16:49:14.591822130 +0200 ++++ cdrkit-1.1.11/wodim/drv_mmc.c 2011-05-18 16:49:14.596822130 +0200 +@@ -1507,6 +1507,11 @@ getdisktype_mdvd(SCSI *usalp, cdr_t *dp) + dstat_t *dsp = dp->cdr_dstat; + + struct track_info track_info; ++ ++ extern char *buf; ++ struct disk_info *dip; ++ int profile; ++ + if(lverbose) + printf("HINT: use dvd+rw-mediainfo from dvd+rw-tools for information extraction.\n"); + /* if(getdisktype_mmc(usalp, dp)<0) +@@ -1521,6 +1526,18 @@ getdisktype_mdvd(SCSI *usalp, cdr_t *dp) + dsp->ds_disktype&= ~DT_CD; + dsp->ds_disktype|= DT_DVD; + ++ profile = get_curprofile(usalp); ++ if (profile == 0x1A) { ++ dip = (struct disk_info *)buf; ++ if (get_diskinfo(usalp, dip) < 0) ++ return (-1); ++ if (dip->disk_status == DS_EMPTY) { /* Unformatted */ ++ dsp->ds_flags |= DSF_NEED_FORMAT; ++ if(lverbose) ++ printf("The medium is empty, it will be auto formatted.\n"); ++ } ++ } ++ + return (ret); + + } +diff -up cdrkit-1.1.11/wodim/scsi_cdr.c.format cdrkit-1.1.11/wodim/scsi_cdr.c +--- cdrkit-1.1.11/wodim/scsi_cdr.c.format 2011-05-18 16:49:14.601822130 +0200 ++++ cdrkit-1.1.11/wodim/scsi_cdr.c 2011-05-18 16:49:14.600822130 +0200 +@@ -1328,7 +1328,7 @@ scsi_format(SCSI *usalp, caddr_t addr, i + } + sleep(10); + printf("\rFormating in progress: 100.00 %% done. \n"); +- if (pid) exit (0); ++ if (pid > 0) exit (0); + return ret; + } + +diff -up cdrkit-1.1.11/wodim/wodim.c.format cdrkit-1.1.11/wodim/wodim.c +--- cdrkit-1.1.11/wodim/wodim.c.format 2011-05-18 16:49:14.584822130 +0200 ++++ cdrkit-1.1.11/wodim/wodim.c 2011-05-18 17:21:59.510821630 +0200 +@@ -946,6 +946,40 @@ int main(int argc, char *argv[]) + print_toc(usalp, dp); + comexit(0); + } ++ ++ if ((flags & F_FORMAT) || (dp->cdr_dstat->ds_flags & DSF_NEED_FORMAT)) { ++ printf("wodim: media format asked\n"); ++ /* ++ * Do not abort if OPC failes. Just give it a chance ++ * for better laser power calibration than without OPC. ++ * ++ * Ricoh drives return with a vendor unique sense code. ++ * This is most likely because they refuse to do OPC ++ * on a non blank media. ++ */ ++ usalp->silent++; ++ do_opc(usalp, dp, flags); ++ usalp->silent--; ++ wait_unit_ready(usalp, 120); ++ if (gettimeofday(&starttime, (struct timezone *)0) < 0) ++ errmsg("Cannot get start time\n"); ++ ++ if ((*dp->cdr_format)(usalp, dp, formattype) < 0) { ++ errmsgno(EX_BAD, "Cannot format disk, aborting.\n"); ++ comexit(EX_BAD); ++ } ++ if (gettimeofday(&fixtime, (struct timezone *)0) < 0) ++ errmsg("Cannot get format time\n"); ++ if (lverbose) ++ prtimediff("Formatting time: ", &starttime, &fixtime); ++ ++ if (!wait_unit_ready(usalp, 240) || tracks == 0) { ++ comexit(0); ++ } ++ if (gettimeofday(&starttime, (struct timezone *)0) < 0) ++ errmsg("Cannot get start time\n"); ++ } ++ + #ifdef XXX + if ((*dp->cdr_check_session)() < 0) { + comexit(EX_BAD); +@@ -1230,38 +1264,6 @@ int main(int argc, char *argv[]) + comexit(0); + } + } +- if (flags & F_FORMAT) { +- printf("wodim: media format asked\n"); +- /* +- * Do not abort if OPC failes. Just give it a chance +- * for better laser power calibration than without OPC. +- * +- * Ricoh drives return with a vendor unique sense code. +- * This is most likely because they refuse to do OPC +- * on a non blank media. +- */ +- usalp->silent++; +- do_opc(usalp, dp, flags); +- usalp->silent--; +- wait_unit_ready(usalp, 120); +- if (gettimeofday(&starttime, (struct timezone *)0) < 0) +- errmsg("Cannot get start time\n"); +- +- if ((*dp->cdr_format)(usalp, dp, formattype) < 0) { +- errmsgno(EX_BAD, "Cannot format disk, aborting.\n"); +- comexit(EX_BAD); +- } +- if (gettimeofday(&fixtime, (struct timezone *)0) < 0) +- errmsg("Cannot get format time\n"); +- if (lverbose) +- prtimediff("Formatting time: ", &starttime, &fixtime); +- +- if (!wait_unit_ready(usalp, 240) || tracks == 0) { +- comexit(0); +- } +- if (gettimeofday(&starttime, (struct timezone *)0) < 0) +- errmsg("Cannot get start time\n"); +- } + /* + * Reset start time so we will not see blanking time and + * writing time counted together. diff --git a/src/patches/cdrkit/cdrkit-1.1.11-handler.patch b/src/patches/cdrkit/cdrkit-1.1.11-handler.patch new file mode 100644 index 000000000..5b3fa6a8b --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-handler.patch @@ -0,0 +1,12 @@ +diff -up cdrkit-1.1.11/icedax/icedax.c.handler cdrkit-1.1.11/icedax/icedax.c +--- cdrkit-1.1.11/icedax/icedax.c.handler 2011-06-02 16:37:02.446206285 +0200 ++++ cdrkit-1.1.11/icedax/icedax.c 2011-06-02 16:37:25.444206279 +0200 +@@ -1054,7 +1054,7 @@ static void exit_wrapper(int status) + + if (child_pid != 0) { + SCSI *usalp = get_scsi_p(); +- if (usalp->running) { ++ if (usalp && usalp->running) { + usalp->cb_fun = on_exitscsi; + usalp->cb_arg = (void *) (uintptr_t) status; + } else { diff --git a/src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch b/src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch new file mode 100644 index 000000000..26b5175d7 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-manpagefix.patch @@ -0,0 +1,191 @@ +diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/genisoimage.1 +--- cdrkit-1.1.11/genisoimage/genisoimage.1.orig 2011-01-21 14:26:20.709816708 +0100 ++++ cdrkit-1.1.11/genisoimage/genisoimage.1 2011-01-24 08:49:24.283964211 +0100 +@@ -180,6 +180,8 @@ in the + file. + .TP + .BI \-A " application_id" ++.TP ++.BI \-appid " application_id" + Specifies a text string that will be written into the volume header. + This should describe the application that will be on the disc. There + is space for 128 characters. Equivalent to +@@ -365,6 +367,8 @@ the Sun disk label will overlay the firs + boot image. + .TP + .BI \-b " eltorito_boot_image" ++.TP ++.BI \-eltorito\-boot " eltorito_boot_image" + Specifies the path and filename of the boot image to be used when making + an El Torito bootable CD for x86 PCs. The pathname must be relative to + the source path specified to +@@ -427,6 +431,8 @@ See the + section for a description of this table. + .TP + .BI \-C " last_sess_start,next_sess_start" ++.TP ++.BI \-cdrecord\-params " last_sess_start,next_sess_start" + This option is needed to create a CD Extra or the image of a second + session or a higher-level session for a multisession disc. + .B \-C +@@ -452,6 +458,8 @@ session on a CD Extra. This is a multise + in the first session and an ISO9660 filesystem in the second session. + .TP + .BI \-c " boot_catalog" ++.TP ++.BI \-eltorito\-catalog " boot_catalog" + Specifies the path and filename of the boot catalog, which is required + for an El Torito bootable CD. The pathname must be relative to the source + path specified to +@@ -488,6 +496,12 @@ For the parameter + see the description of + .BR \-M . + .TP ++.BI \-checksum_algorithm_iso " alg1,alg2,..." ++Specify the checksum types desired for the output image. ++.TP ++.BI \-checksum_algorithm_template " alg1,alg2,..." ++Specify the checksum types desired for the output jigdo template. ++.TP + .BI \-copyright " file" + Specifies copyright information, typically a filename on the disc. + There is space for 37 characters. Equivalent to +@@ -497,12 +511,16 @@ in the + file. + .TP + .B \-d ++.TP ++.B \-omit\-period + Do not append a period to files that do not have one. + .br + This violates the ISO9660 standard, but it happens to work on many systems. + Use with caution. + .TP + .B \-D ++.TP ++.B \-disable\-deep\-relocation + Do not use deep directory relocation, and instead just pack them in the + way we see them. + .br +@@ -510,6 +528,9 @@ If ISO9660:1999 has not been selected, + this violates the ISO9660 standard, but it happens to work on many systems. + Use with caution. + .TP ++.B \-debug ++Set debug flag. ++.TP + .BI \-dir\-mode " mode" + Overrides the mode of directories used to create the image to + .IR mode , +@@ -535,7 +556,14 @@ another directory + needs to include all needed files (filenames must be all caps) for a + compliant DVD-Video filesystem. + .TP ++.BI \-e " efi_boot_file" ++.TP ++.BI \-efi\-boot " efi_boot_file" ++Set EFI boot image name. ++.TP + .B \-f ++.TP ++.B \-follow\-links + Follow symbolic links when generating the filesystem. When this option is not + in use, symbolic links will be entered using Rock Ridge if enabled, otherwise + they will be ignored. +@@ -740,6 +768,8 @@ See the + section below for more details. + .TP + .B \-l ++.TP ++.B \-full\-iso9660\-filenames + Allow full 31-character filenames. Normally the ISO9660 filename will be in an + 8.3 format which is compatible with MS-DOS, even though the ISO9660 standard + allows filenames of up to 31 characters. If you use this option, the disc may +@@ -870,6 +900,8 @@ with + .BR \-C . + .TP + .B \-N ++.TP ++.B \-omit\-version\-number + Omit version numbers from ISO9660 filenames. + .br + This violates the ISO9660 standard, but no one really uses the +@@ -967,6 +999,8 @@ in the + file. + .TP + .BI \-p " preparer_id" ++.TP ++.BI \-preparer " preparer_id" + Specifies a text string that will be written into the volume header. + This should describe the preparer of the CD-ROM, usually with a mailing + address and phone number. There is space for 128 characters. +@@ -1008,10 +1042,14 @@ This makes + even less verbose. No progress output will be provided. + .TP + .B \-R ++.TP ++.B \-rock + Generate SUSP and RR records using the Rock Ridge protocol to further describe + the files on the ISO9660 filesystem. + .TP + .B \-r ++.TP ++.B \-rational\-rock + This is like the \-R option, but file ownership and modes are set to + more useful values. The uid and gid are set to zero, because they are + usually only useful on the author's system, and not useful to the +@@ -1092,6 +1130,11 @@ intentionally. Accessing several older v + support by the operating system to choose which sessions are to be + mounted. + .TP ++.BI \-s " sector type" ++.TP ++.BI \-sectype " sector type" ++Set output sector type to e.g. data/xa1/raw. ++ .TP + .BI \-sort " sort_file" + Sort file locations on the media. Sorting is controlled by a file that + contains pairs of filenames and sorting offset weighting. +@@ -1213,6 +1256,8 @@ in the + file. + .TP + .B \-T ++.TP ++.B \-translation\-table + Generate a file + .I TRANS.TBL + in each directory on the CD-ROM, which can be used +@@ -1262,6 +1307,8 @@ to + This option is the default on VMS. + .TP + .B \-U ++.TP ++.B \-untranslated\-filenames + Allows "untranslated" filenames, completely violating the ISO9660 standards + described above. Enables the following flags: + .B \-d \-l \-N \-allow\-leading\-dots \-relaxed\-filenames +@@ -1333,6 +1380,8 @@ must be specified before + on each command line. + .TP + .B \-v ++.TP ++.B \-verbose + Verbose execution. If given twice on the command line, extra debug information + will be printed. + .TP +@@ -1341,7 +1390,15 @@ Identical to + .B \-m + .IR glob . + .TP ++.B \-XA ++Generate XA directory attruibutes. ++.TP ++.B \-xa ++Generate rationalized XA directory attruibutes. ++.TP + .B \-z ++.TP ++.B \-transparent\-compression + Generate special + .I RRIP + records for transparently compressed files. diff --git a/src/patches/cdrkit/cdrkit-1.1.11-memset.patch b/src/patches/cdrkit/cdrkit-1.1.11-memset.patch new file mode 100644 index 000000000..660915908 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-memset.patch @@ -0,0 +1,37 @@ +diff -up wrk/genisoimage/jte.c.wrk wrk/genisoimage/jte.c +--- wrk/genisoimage/jte.c.wrk 2013-02-22 13:24:47.722196877 +0100 ++++ wrk/genisoimage/jte.c 2013-02-25 12:41:45.136653487 +0100 +@@ -280,7 +280,7 @@ extern int list_file_in_jigdo(char *file + if (!jtemplate_out) + return 0; + +- memset(md5, 0, sizeof(md5)); ++ memset(md5, 0, 16); + + /* Cheaper to check file size first */ + if (size < jte_min_size) +diff -up wrk/genisoimage/md5.c.wrk wrk/genisoimage/md5.c +--- wrk/genisoimage/md5.c.wrk 2013-02-22 13:15:18.210866321 +0100 ++++ wrk/genisoimage/md5.c 2013-02-22 13:15:29.979935133 +0100 +@@ -183,7 +183,7 @@ mk_MD5Final (unsigned char digest[16], s + putu32(ctx->buf[1], digest + 4); + putu32(ctx->buf[2], digest + 8); + putu32(ctx->buf[3], digest + 12); +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + } + + /* The four core functions - F1 is optimized somewhat */ +diff -up wrk/libedc/edcspeed.c.wrk wrk/libedc/edcspeed.c +--- wrk/libedc/edcspeed.c.wrk 2013-02-22 10:45:33.353219110 +0100 ++++ wrk/libedc/edcspeed.c 2013-02-22 10:46:52.497686387 +0100 +@@ -35,7 +35,8 @@ static int encspeed() + secs = 10; + end = 75*1000000 * secs; + +- memset(sect, 0, sizeof(sect)); ++ //faulty and unneccessary, immediately rewritten again ++ //memset(sect, 0, sizeof(sect)); + for (i=0; i < 2352; ) { + sect[i++] = 'J'; + sect[i++] = 'S'; diff --git a/src/patches/cdrkit/cdrkit-1.1.11-paranoiacdda.patch b/src/patches/cdrkit/cdrkit-1.1.11-paranoiacdda.patch new file mode 100644 index 000000000..062971ddd --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-paranoiacdda.patch @@ -0,0 +1,556 @@ +diff -up cdrkit-1.1.11/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/CMakeLists.txt +--- cdrkit-1.1.11/CMakeLists.txt.paranoiacdda 2012-07-31 14:27:15.166155309 +0200 ++++ cdrkit-1.1.11/CMakeLists.txt 2012-07-31 14:27:28.469613175 +0200 +@@ -1,3 +1,3 @@ + PROJECT (cdrkit C) +-SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) ++SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) + +diff -up cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/icedax/CMakeLists.txt +--- cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda 2012-07-31 14:27:15.228157411 +0200 ++++ cdrkit-1.1.11/icedax/CMakeLists.txt 2012-07-31 14:27:15.239157786 +0200 +@@ -1,8 +1,9 @@ + PROJECT (icedax C) +-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include) ++INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include) + include(../include/AddScgBits.cmake) + include(../include/AddSchilyBits.cmake) + include(../include/AddNetworkBits.cmake) ++INCLUDE (CheckLibraryExists) + + FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h) + IF(HAVE_SYS_SOUNDCARD_H) +@@ -18,12 +19,20 @@ IF(HAVE_LIBOSSAUDIO) + LIST(APPEND EXTRA_LIBS "ossaudio") + ENDIF(HAVE_LIBOSSAUDIO) + +-LIST(APPEND EXTRA_LIBS paranoia) ++CHECK_INCLUDE_FILES(cdda/cdda_interface.h HAVE_CDDA_INTERFACE_H) ++CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA) ++IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) ++ LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface) ++ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) ++ MESSAGE(FATAL_ERROR "You need cdparanoia library installed") ++ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) ++ ++LIST(APPEND EXTRA_LIBS) + IF (WIN32) + LIST(APPEND EXTRA_LIBS winmm) + ENDIF (WIN32) + +-LINK_DIRECTORIES(../librols ../libusal ../libparanoia) ++LINK_DIRECTORIES(../librols ../libusal) + ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c) + TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS}) + SET_TARGET_PROPERTIES(icedax PROPERTIES SKIP_BUILD_RPATH TRUE) +diff -up cdrkit-1.1.11/icedax/global.h.paranoiacdda cdrkit-1.1.11/icedax/global.h +--- cdrkit-1.1.11/icedax/global.h.paranoiacdda 2012-07-31 14:27:15.232157548 +0200 ++++ cdrkit-1.1.11/icedax/global.h 2012-07-31 14:27:15.226157345 +0200 +@@ -17,7 +17,8 @@ + #include "md5.h" + #endif + #ifdef USE_PARANOIA +-#include "cdda_paranoia.h" ++#include <cdda/cdda_interface.h> ++#include <cdda/cdda_paranoia.h> + #endif + + typedef struct index_list +@@ -102,10 +103,10 @@ typedef struct global + + struct paranoia_parms_t + { +- Ucbit disable_paranoia:1; +- Ucbit disable_extra_paranoia:1; +- Ucbit disable_scratch_detect:1; +- Ucbit disable_scratch_repair:1; ++ char disable_paranoia:1; ++ char disable_extra_paranoia:1; ++ char disable_scratch_detect:1; ++ char disable_scratch_repair:1; + int retries; + int overlap; + int mindynoverlap; +diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.c +--- cdrkit-1.1.11/icedax/icedax.c.paranoiacdda 2012-07-31 14:27:15.237157718 +0200 ++++ cdrkit-1.1.11/icedax/icedax.c 2012-07-31 14:27:15.238157752 +0200 +@@ -120,6 +120,10 @@ + #ifdef USE_LAME + #include "mp3.h" /* mp3 file handling */ + #endif ++#ifdef USE_PARANOIA ++#include <cdda/cdda_interface.h> ++#include <cdda/cdda_paranoia.h> ++#endif + #include "interface.h" /* low level cdrom interfacing */ + #include "icedax.h" + #include "resample.h" +@@ -128,9 +132,6 @@ + #include "ringbuff.h" + #include "global.h" + #include "exitcodes.h" +-#ifdef USE_PARANOIA +-#include "cdda_paranoia.h" +-#endif + #include "defaults.h" + + static void RestrictPlaybackRate(long newrate); +@@ -800,7 +801,7 @@ static void init_globals() + global.useroverlap = -1; /* amount of overlapping sectors user override */ + global.need_hostorder = 0; /* processing needs samples in host endianess */ + global.in_lendian = -1; /* input endianess from SetupSCSI() */ +- global.outputendianess = NONE; /* user specified output endianess */ ++ global.outputendianess = NONE_EN; /* user specified output endianess */ + global.findminmax = 0; /* flag find extrem amplitudes */ + #ifdef HAVE_LIMITS_H + global.maxamp[0] = INT_MIN; /* maximum amplitude */ +@@ -2418,7 +2419,7 @@ Rate Divider Rate Divider + if (bulk == -1) bulk = 0; + + global.need_big_endian = global.audio_out->need_big_endian; +- if (global.outputendianess != NONE) ++ if (global.outputendianess != NONE_EN) + global.need_big_endian = global.outputendianess == BIG; + + if (global.no_file) global.fname_base[0] = '\0'; +@@ -2602,7 +2603,7 @@ Rate Divider Rate Divider + fputs( ", soundcard", stderr ); + #endif + #if defined USE_PARANOIA +- fputs( ", libparanoia", stderr ); ++ fputs( ", libcdda_paranoia", stderr ); + #endif + fputs( " support\n", stderr ); + } +@@ -2892,8 +2893,28 @@ Rate Divider Rate Divider + #ifdef USE_PARANOIA + if (global.paranoia_selected) { + long paranoia_mode; ++ cdrom_drive *tmpdrive; ++ usal_close(get_scsi_p()); + +- global.cdp = paranoia_init(get_scsi_p(), global.nsectors); ++ tmpdrive = cdda_identify(global.dev_name, 0, NULL); ++ if (!tmpdrive) ++ { ++ fputs("Can't identify disc\n", stderr); ++ return 1; ++ } ++ ++ if(global.nsectors) ++ { ++ tmpdrive->nsectors = global.nsectors; ++ tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW; ++ } ++ if (cdda_open(tmpdrive) != 0) ++ { ++ fputs("Can't open disc\n", stderr); ++ cdda_close(tmpdrive); ++ return 1; ++ } ++ global.cdp = paranoia_init(tmpdrive); + + if (global.paranoia_parms.overlap >= 0) { + int overlap = global.paranoia_parms.overlap; +@@ -2902,17 +2923,7 @@ Rate Divider Rate Divider + overlap = global.nsectors - 1; + paranoia_overlapset(global.cdp, overlap); + } +- /* +- * Default to a minimum of dynamic overlapping == 0.5 sectors. +- * If we don't do this, we get the default from libparanoia +- * which is approx. 0.1. +- */ +- if (global.paranoia_parms.mindynoverlap < 0) +- paranoia_dynoverlapset(global.cdp, CD_FRAMEWORDS/2, -1); +- paranoia_dynoverlapset(global.cdp, +- global.paranoia_parms.mindynoverlap * CD_FRAMEWORDS, +- global.paranoia_parms.maxdynoverlap * CD_FRAMEWORDS); +- ++ + paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP; + + if (global.paranoia_parms.disable_paranoia) { +diff -up cdrkit-1.1.11/icedax/icedax.h.paranoiacdda cdrkit-1.1.11/icedax/icedax.h +--- cdrkit-1.1.11/icedax/icedax.h.paranoiacdda 2012-07-31 14:27:15.216157005 +0200 ++++ cdrkit-1.1.11/icedax/icedax.h 2012-07-31 14:27:15.217157039 +0200 +@@ -41,7 +41,7 @@ + + /* Endianess */ + #define GUESS (-2) +-#define NONE (-1) ++#define NONE_EN (-1) + #define LITTLE 0 + #define BIG 1 + +diff -up cdrkit-1.1.11/icedax/interface.c.paranoiacdda cdrkit-1.1.11/icedax/interface.c +--- cdrkit-1.1.11/icedax/interface.c.paranoiacdda 2012-07-31 14:27:15.235157650 +0200 ++++ cdrkit-1.1.11/icedax/interface.c 2012-07-31 14:27:15.232157548 +0200 +@@ -116,7 +116,7 @@ int (*Play_at)(SCSI *usalp, unsigned in + int (*StopPlay)(SCSI *usalp); + void (*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal); + +-#if defined USE_PARANOIA ++#if 0 //defined USE_PARANOIA + long cdda_read(void *d, void *buffer, long beginsector, long sectors); + + long cdda_read(void *d, void *buffer, long beginsector, long sectors) +diff -up cdrkit-1.1.11/icedax/toc.c.paranoiacdda cdrkit-1.1.11/icedax/toc.c +--- cdrkit-1.1.11/icedax/toc.c.paranoiacdda 2012-07-31 14:27:15.225157311 +0200 ++++ cdrkit-1.1.11/icedax/toc.c 2012-07-31 14:27:15.230157480 +0200 +@@ -379,8 +379,7 @@ static void emit_cddb_form(char *fname_b + static void emit_cdindex_form(char *fname_baseval); + #endif + +- +-typedef struct TOC { /* structure of table of contents (cdrom) */ ++typedef struct TOC_t { /* structure of table of contents (cdrom) */ + unsigned char reserved1; + unsigned char bFlags; + unsigned char bTrack; +@@ -391,8 +390,7 @@ typedef struct TOC { /* structure of tab + int frms; + unsigned char ISRC[16]; + int SCMS; +-} TOC; +- ++} TOC_t; + + /* Flags contains two fields: + bits 7-4 (ADR) +@@ -432,7 +430,7 @@ struct iterator { + int index; + int startindex; + void (*reset)(struct iterator *this); +- struct TOC *(*getNextTrack)(struct iterator *this); ++ struct TOC_t *(*getNextTrack)(struct iterator *this); + int (*hasNextTrack)(struct iterator *this); + }; + +@@ -518,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks) + InitIterator(&i, 1); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + if (IS__AUDIO(p)) count_audio_tracks++; + } + +@@ -733,7 +731,7 @@ static void emit_cddb_form(char *fname_b + fprintf( cddb_form, "# Track frame offsets:\n#\n"); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + if (GETTRACK(p) == CDROM_LEADOUT) break; + fprintf( cddb_form, + "# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p))); +@@ -765,7 +763,7 @@ static void emit_cddb_form(char *fname_b + + i.reset(&i); + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + int ii; + + ii = GETTRACK(p); +@@ -788,7 +786,7 @@ static void emit_cddb_form(char *fname_b + + i.reset(&i); + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + int ii; + + ii = GETTRACK(p); +@@ -1495,7 +1493,7 @@ static int IsSingleArtist(void) + InitIterator(&i, 1); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + int ii; + + if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue; +@@ -1681,7 +1679,7 @@ static void emit_cdindex_form(char *fnam + global.creator ? ascii2html(global.creator) : ""); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + int ii = GETTRACK(p); + + if (ii == CDROM_LEADOUT) break; +@@ -1703,7 +1701,7 @@ static void emit_cdindex_form(char *fnam + fprintf( cdindex_form, " <MultipleArtistCD>\n"); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + int ii = GETTRACK(p); + + if (ii == CDROM_LEADOUT) break; +@@ -1942,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned + + if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0 + && i.hasNextTrack(&i)) { +- TOC *o = i.getNextTrack(&i); ++ TOC_t *o = i.getNextTrack(&i); + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + int from; + from = GETTRACK(o); + +@@ -2072,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l + count_audio_trks = 0; + + if (i.hasNextTrack(&i)) { +- TOC *o = i.getNextTrack(&i); ++ TOC_t *o = i.getNextTrack(&i); + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + int from; + from = GETTRACK(o); + +@@ -2131,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l + i.reset(&i); + if ((global.verbose & SHOW_TOC) != 0 && + i.hasNextTrack(&i)) { +- TOC *o = i.getNextTrack(&i); ++ TOC_t *o = i.getNextTrack(&i); + + for (; i.hasNextTrack(&i);) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + + if ( GETTRACK(o) <= MAXTRK ) { + unsigned char brace1, brace2; +@@ -2189,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l + ii = 0; + i.reset(&i); + if (i.hasNextTrack(&i)) { +- TOC *o = i.getNextTrack(&i); ++ TOC_t *o = i.getNextTrack(&i); + for ( ; i.hasNextTrack(&i);) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + fprintf ( stderr, + " %2u.(%8u)", + GETTRACK(o), +@@ -2248,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l + + i.reset(&i); + for ( ; i.hasNextTrack(&i);) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + int jj = GETTRACK(p); + + if ( global.tracktitle[jj] != NULL ) { +@@ -2260,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l + + i.reset(&i); + for ( ; i.hasNextTrack(&i); ) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + int jj; + + if (IS__DATA(p)) +@@ -2720,7 +2718,7 @@ void Read_MCN_ISRC(void) + InitIterator(&i, 1); + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + unsigned ii = GETTRACK(p); + + if (ii == CDROM_LEADOUT) break; +@@ -3155,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns + + + while (i.hasNextTrack(&i)) { +- struct TOC *p = i.getNextTrack(&i); ++ struct TOC_t *p = i.getNextTrack(&i); + unsigned ii = GETTRACK(p); + + if ( ii < starttrack || IS__DATA(p) ) +@@ -3322,7 +3320,7 @@ unsigned char *Get_MCN(void) + } + + +-static TOC g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */ ++static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */ + + /*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/ + +@@ -3397,10 +3395,10 @@ static int patch_cd_extra(unsigned track + + static int restrict_tracks_illleadout(void) + { +- struct TOC *o = &g_toc[cdtracks+1]; ++ struct TOC_t *o = &g_toc[cdtracks+1]; + int i; + for (i = cdtracks; i >= 0; i--) { +- struct TOC *p = &g_toc[i]; ++ struct TOC_t *p = &g_toc[i]; + if (GETSTART(o) > GETSTART(p)) break; + } + patch_cd_extra(i+1, GETSTART(o)); +@@ -3523,7 +3521,7 @@ static void it_reset(struct iterator *th + + + static int it_hasNextTrack(struct iterator *this); +-static struct TOC *it_getNextTrack(struct iterator *this); ++static struct TOC_t *it_getNextTrack(struct iterator *this); + + static int it_hasNextTrack(struct iterator *this) + { +@@ -3532,7 +3530,7 @@ static int it_hasNextTrack(struct iterat + + + +-static struct TOC *it_getNextTrack(struct iterator *this) ++static struct TOC_t *it_getNextTrack(struct iterator *this) + { + /* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */ + if ( this->index > (int)cdtracks+1 ) return NULL; +@@ -3583,7 +3581,7 @@ long Get_AudioStartSector(unsigned long + if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT; + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + + if (GETTRACK(p) == p_track) { + if (IS__DATA(p)) { +@@ -3613,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra + if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT; + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + + if (GETTRACK(p) == p_track) { + return GETSTART(p); +@@ -3637,7 +3635,7 @@ long Get_EndSector(unsigned long p_track + if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT; + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + if (GETTRACK(p) == p_track) { + p = i.getNextTrack(&i); + if (p == NULL) { +@@ -3669,7 +3667,7 @@ long FirstAudioTrack(void) + else i.reset(&i); + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + unsigned ii = GETTRACK(p); + + if (ii == CDROM_LEADOUT) break; +@@ -3687,7 +3685,7 @@ long FirstDataTrack(void) + else i.reset(&i); + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + if (IS__DATA(p)) { + return GETTRACK(p); + } +@@ -3708,7 +3706,7 @@ long LastAudioTrack(void) + else i.reset(&i); + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) { + j = GETTRACK(p); + } +@@ -3730,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_ + if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT; + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + + if (GETTRACK(p) < p_track) + continue; +@@ -3749,9 +3747,9 @@ int Get_Track(unsigned long sector) + else i.reset(&i); + + if (i.hasNextTrack(&i)) { +- TOC *o = i.getNextTrack(&i); ++ TOC_t *o = i.getNextTrack(&i); + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) { + if (IS__DATA(o)) { + return -1; +@@ -3772,7 +3770,7 @@ int CheckTrackrange(unsigned long from, + else i.reset(&i); + + while (i.hasNextTrack(&i)) { +- TOC *p = i.getNextTrack(&i); ++ TOC_t *p = i.getNextTrack(&i); + + if (GETTRACK(p) < from) + continue; +@@ -3788,54 +3786,3 @@ int CheckTrackrange(unsigned long from, + return 0; + } + +-#ifdef USE_PARANOIA +-long cdda_disc_firstsector(void *d); +- +-long cdda_disc_firstsector(void *d) +-{ +- return Get_StartSector(FirstAudioTrack()); +-} +- +-int cdda_tracks(void *d); +- +-int cdda_tracks(void *d) +-{ +- return LastAudioTrack() - FirstAudioTrack() +1; +-} +- +-int cdda_track_audiop(void *d, int track); +- +-int cdda_track_audiop(void *d, int track) +-{ +- return Get_Datatrack(track) == 0; +-} +- +-long cdda_track_firstsector(void *d, int track); +- +-long cdda_track_firstsector(void *d, int track) +-{ +- return Get_AudioStartSector(track); +-} +- +-long cdda_track_lastsector(void *d, int track); +- +-long cdda_track_lastsector(void *d, int track) +-{ +- return Get_EndSector(track); +-} +- +-long cdda_disc_lastsector(void *d); +- +-long cdda_disc_lastsector(void *d) +-{ +- return Get_LastSectorOnCd(cdtracks) - 1; +-} +- +-int cdda_sector_gettrack(void *d,long sector); +- +-int cdda_sector_gettrack(void *d, long sector) +-{ +- return Get_Track(sector); +-} +- +-#endif diff --git a/src/patches/cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch b/src/patches/cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch new file mode 100644 index 000000000..0542b4e1f --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-ppc64le_elfheader.patch @@ -0,0 +1,13 @@ +diff -up wrk/include/glibc_elf.h.wrk wrk/include/glibc_elf.h +--- wrk/include/glibc_elf.h.wrk 2014-09-19 16:04:45.546981432 +0200 ++++ wrk/include/glibc_elf.h 2014-09-19 16:38:55.407991682 +0200 +@@ -2081,7 +2081,8 @@ typedef Elf32_Addr Elf32_Conflict; + #define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ + + /* Keep this the last entry. */ +-#define R_PPC64_NUM 107 ++//symbol conflicting with system headers on ppc64le and nowhere used ++//#define R_PPC64_NUM 107 + + /* PowerPC64 specific values for the Dyn d_tag field. */ + #define DT_PPC64_GLINK (DT_LOPROC + 0) diff --git a/src/patches/cdrkit/cdrkit-1.1.11-readsegfault.patch b/src/patches/cdrkit/cdrkit-1.1.11-readsegfault.patch new file mode 100644 index 000000000..a3a130585 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-readsegfault.patch @@ -0,0 +1,12 @@ +diff -up cdrkit-1.1.11/readom/readom.c.readsegfault cdrkit-1.1.11/readom/readom.c +--- cdrkit-1.1.11/readom/readom.c.readsegfault 2011-03-07 15:51:46.889441591 +0100 ++++ cdrkit-1.1.11/readom/readom.c 2011-03-07 15:51:50.702938263 +0100 +@@ -906,7 +906,7 @@ read_ftoc(SCSI *usalp, parm_t *parmp, BO + + + strcpy(filename, "toc.dat"); +- if (strcmp(parmp->name, "/dev/null") != 0) { ++ if (parmp != NULL && strcmp(parmp->name, "/dev/null") != 0) { + + len = strlen(parmp->name); + if (len > (sizeof (filename)-5)) { diff --git a/src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch b/src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch new file mode 100644 index 000000000..d9ceb3b1a --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-rootstat.patch @@ -0,0 +1,31 @@ +diff -up cdrkit-1.1.11/genisoimage/tree.c.rootstat cdrkit-1.1.11/genisoimage/tree.c +--- cdrkit-1.1.11/genisoimage/tree.c.rootstat 2011-01-25 14:15:36.766389403 +0100 ++++ cdrkit-1.1.11/genisoimage/tree.c 2011-01-25 14:17:24.804643126 +0100 +@@ -48,6 +48,7 @@ + #include <fctldefs.h> + #include <device.h> + #include <schily.h> ++#include <libgen.h> + + extern int allow_limited_size; + +@@ -1421,12 +1422,16 @@ insert_file_entry(struct directory *this + return (0); + } + if (this_dir == root && strcmp(short_name, ".") == 0) +- root_statbuf = statbuf; /* Save this for later on */ ++ memcpy(&root_statbuf, &statbuf, sizeof(root_statbuf)); /* Save this for later on */ + + /* We do this to make sure that the root entries are consistent */ + if (this_dir == root && strcmp(short_name, "..") == 0) { +- statbuf = root_statbuf; +- lstatbuf = root_statbuf; ++ /* for the case .. comes before . */ ++ if (!root_statbuf.st_ctime) { ++ stat_filter(dirname(whole_path), &root_statbuf); ++ } ++ memcpy(&statbuf, &root_statbuf, sizeof(statbuf)); ++ memcpy(&lstatbuf, &root_statbuf, sizeof(lstatbuf)); + } + if (S_ISLNK(lstatbuf.st_mode)) { + diff --git a/src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch b/src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch new file mode 100644 index 000000000..de8dbbfab --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-usalinst.patch @@ -0,0 +1,33 @@ +diff -up cdrkit-1.1.11/librols/CMakeLists.txt.usalinst cdrkit-1.1.11/librols/CMakeLists.txt +--- cdrkit-1.1.11/librols/CMakeLists.txt.usalinst 2012-07-31 10:51:30.270669381 +0200 ++++ cdrkit-1.1.11/librols/CMakeLists.txt 2012-07-31 10:52:02.365378257 +0200 +@@ -3,5 +3,11 @@ INCLUDE_DIRECTORIES(../include ../libhfs + + SET(LIBROLS_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c default.c) + +-ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS}) ++ADD_LIBRARY (rols SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS}) ++SET_TARGET_PROPERTIES(rols PROPERTIES ++ VERSION 0.0.1 ++ SOVERSION 0 ++) ++ ++INSTALL(TARGETS rols DESTINATION lib${LIB_SUFFIX}) + +diff -up cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst cdrkit-1.1.11/libusal/CMakeLists.txt +--- cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst 2012-07-31 10:51:30.302670085 +0200 ++++ cdrkit-1.1.11/libusal/CMakeLists.txt 2012-07-31 10:52:09.190528942 +0200 +@@ -6,5 +6,12 @@ ADD_DEFINITIONS(-DUSE_RCMD_RSH) + #SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c) + SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c) + LINK_DIRECTORIES(../librols) +-ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS}) ++ADD_LIBRARY (usal SHARED ${LIBSCG_SRCS}) ++ + TARGET_LINK_LIBRARIES(usal ${SCG_SELF_LIBS}) ++SET_TARGET_PROPERTIES(usal PROPERTIES ++ VERSION 0.0.1 ++ SOVERSION 0 ++) ++INSTALL(TARGETS usal DESTINATION lib${LIB_SUFFIX}) ++INSTALL(FILES usal/scsicdb.h usal/aspi-dos.h usal/usalcmd.h usal/usalio.h usal/scsireg.h usal/usalops.h usal/scsidefs.h usal/spti-wnt.h usal/srb_os2.h usal/scsitransp.h usal/aspi-win32.h usal/scsisense.h usaltimes.h pg.h DESTINATION include/usal) diff --git a/src/patches/cdrkit/cdrkit-1.1.11-utf8.patch b/src/patches/cdrkit/cdrkit-1.1.11-utf8.patch new file mode 100644 index 000000000..511850933 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-utf8.patch @@ -0,0 +1,104 @@ +diff -up cdrkit-1.1.11/Changelog.utf8 cdrkit-1.1.11/Changelog +--- cdrkit-1.1.11/Changelog.utf8 2012-07-31 12:38:50.207872763 +0200 ++++ cdrkit-1.1.11/Changelog 2012-07-31 12:38:57.669026934 +0200 +@@ -519,7 +519,7 @@ cdrkit (2.01.01a08+X.12) UNRELEASED; urg + + cdrkit (2.01.01a08+X.11) UNRELEASED; urgency=low + +- * 26_author_locale (ASCII transliteration of Jörg in the standard credits ++ * 26_author_locale (ASCII transliteration of JÃ¶rg in the standard credits + message) + * 28_cdda2wav_interface (Linux friendly cdda2wav behaviour) + * 30_doc_typo_fixes (various documentation/message fixes) +@@ -821,8 +821,8 @@ Sun May 16 01:37:11 2004 Joerg Schilling + + Sun May 16 01:26:52 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * cdrecord.1 1.95 +- Eißfeldt -> Ei\*sfeldt +- µsec -> \*msec ++ EiÃfeldt -> Ei\*sfeldt ++ ÄŸsec -> \*msec + + Sat May 15 23:14:18 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * subchan.c 1.19 +@@ -1057,7 +1057,7 @@ Wed Jan 14 15:37:47 2004 Joerg Schilling + Wed Jan 14 01:14:27 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * scsi-mac-iokit.c 1.8 + ux_errno wird nun korrekt gesetzt wenn ein Kommando schiefgeht +- Die Sense Daten werden nicht mehr gelöscht ++ Die Sense Daten werden nicht mehr gelÃ¶scht + Author ist nun "schily", denn das Modul kommt nun teilweise dirch scgcheck + + Tue Jan 13 20:43:44 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> +@@ -1074,7 +1074,7 @@ Mon Jan 12 00:33:39 2004 Joerg Schilling + + Sun Jan 11 18:42:14 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * scsi-linux-sg.c 1.77 +- Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstützen. ++ Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstÃŒtzen. + + Sun Jan 11 16:18:48 2004 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * scsi-linux-sg.c 1.76 +@@ -6144,7 +6144,7 @@ Mon Oct 26 00:27:22 1998 Joerg Schilling + New manufacturer: Xcitec Inc. + Doremi Media Co., Ltd. + Matsushita Electric Industrial Co.,Ltd. +- CDA Datenträger Albrechts GmbH. ++ CDA DatentrÃ€ger Albrechts GmbH. + + Sun Oct 25 13:00:22 1998 Joerg Schilling <joerg(a)schily.isdn.cs.tu-berlin.de> + * cdrecord.c 1.71 +diff -up cdrkit-1.1.11/doc/icedax/README.utf8 cdrkit-1.1.11/doc/icedax/README +--- cdrkit-1.1.11/doc/icedax/README.utf8 2012-07-31 12:38:18.903226517 +0200 ++++ cdrkit-1.1.11/doc/icedax/README 2012-07-31 12:38:18.902226496 +0200 +@@ -387,7 +387,7 @@ and + + <http://www.anime.net/~goemon/linux-cd/cdda-list.html> + +-From a news posting from Björn Wiberg ++From a news posting from BjÃ¶rn Wiberg + + > The following table was generated using the CDROM.CFG file from Nero + > v3.0.4.2. +diff -up cdrkit-1.1.11/doc/icedax/THANKS.utf8 cdrkit-1.1.11/doc/icedax/THANKS +--- cdrkit-1.1.11/doc/icedax/THANKS.utf8 2012-07-31 12:38:18.901226475 +0200 ++++ cdrkit-1.1.11/doc/icedax/THANKS 2012-07-31 12:38:18.901226475 +0200 +@@ -5,7 +5,7 @@ http://www.mode.net/ + + and + +-Fraunhofer Institut für integrierte Schaltungen (FhG-IIS) ++Fraunhofer Institut fÃŒr integrierte Schaltungen (FhG-IIS) + http://www.iis.fhg.de/ + + Code for extraction of ISRC and MCN codes as well as MD5 signatures +@@ -33,4 +33,4 @@ Francesco Chemolli (getopt_long patches) + Thanks to all testers and finally Jim McLaughlin for supplying + the first cdda-reader source code (that got me started). + +-Heiko Eißfeldt ++Heiko EiÃfeldt +diff -up cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8 cdrkit-1.1.11/doc/READMEs/README.ATAPI +--- cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8 2012-07-31 12:38:18.899226433 +0200 ++++ cdrkit-1.1.11/doc/READMEs/README.ATAPI 2012-07-31 12:38:18.900226454 +0200 +@@ -279,7 +279,7 @@ selectively telling the kernel what to u + this would not be needed if the Linux SCSI CD-ROM driver would be more + up to date and supports standard conforming drives. + +-Jörg Schilling <schilling(a)fokus.fhg.de> ++JÃ¶rg Schilling <schilling(a)fokus.fhg.de> + + -------------------------------------------------- + Here is a hint from Alan Brown <alanb(a)manawatu.gen.nz>: +diff -up cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8 cdrkit-1.1.11/doc/READMEs/README.cdplus +--- cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8 2012-07-31 12:38:18.900226454 +0200 ++++ cdrkit-1.1.11/doc/READMEs/README.cdplus 2012-07-31 12:38:18.900226454 +0200 +@@ -63,7 +63,7 @@ Note: If you want to create an HFS hybri + use the '-part' option to genisoimage. Otherwise, the data track will be mounted + as an ISO9660/Joliet CD when used on a Mac. + +-Jörg ++JÃ¶rg + + Edited for cdrkit by Christian Fromme <kaner(a)strace.org> and Eduard Bloch + diff --git a/src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch b/src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch new file mode 100644 index 000000000..f98bd362b --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch @@ -0,0 +1,22 @@ +diff -up wrk/genisoimage/exclude.c.wrk wrk/genisoimage/exclude.c +--- wrk/genisoimage/exclude.c.wrk 2015-02-25 13:16:28.054237196 +0100 ++++ wrk/genisoimage/exclude.c 2015-02-25 13:33:06.761312002 +0100 +@@ -39,7 +39,7 @@ exclude(char *fn) + { + register int i; + +- for (i = 0; excl[i] && i < MAXEXCL; i++) ++ for (i = 0; i < MAXEXCL && excl[i]; i++) + ; + + if (i == MAXEXCL) { +@@ -69,7 +69,7 @@ is_excluded(char *fn) + /* + * very dumb search method ... + */ +- for (i = 0; excl[i] && i < MAXEXCL; i++) { ++ for (i = 0; i < MAXEXCL && excl[i]; i++) { + if (strcmp(excl[i], fn) == 0) { + return (1); /* found -> excluded filenmae */ + } +diff -up wrk/icedax/toc.c.wrk wrk/icedax/toc.c diff --git a/src/patches/cdrkit/cdrkit-1.1.8-werror.patch b/src/patches/cdrkit/cdrkit-1.1.8-werror.patch new file mode 100644 index 000000000..c5189ed5a --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.8-werror.patch @@ -0,0 +1,206 @@ +diff -up cdrkit-1.1.8/wodim/wodim.c.werror cdrkit-1.1.8/wodim/wodim.c +--- cdrkit-1.1.8/wodim/wodim.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/wodim/wodim.c 2008-05-27 15:36:22.000000000 +0200 +@@ -4089,7 +4089,7 @@ audioread(SCSI *usalp, cdr_t *dp, int fl + + read_scsi(usalp, buf, 1000, 1); + printf("XXX:\n"); +- write(1, buf, 512); /* FIXME: handle return value */ ++ do{int ret;ret=write(1, buf, 512);}while(0); /* FIXME: handle return value */ + unload_media(usalp, dp, flags); + comexit(0); + #endif +diff -up cdrkit-1.1.8/wodim/isosize.c.werror cdrkit-1.1.8/wodim/isosize.c +--- cdrkit-1.1.8/wodim/isosize.c.werror 2008-05-27 15:41:36.000000000 +0200 ++++ cdrkit-1.1.8/wodim/isosize.c 2008-05-27 15:42:12.000000000 +0200 +@@ -69,7 +69,7 @@ isosize(int f) + vp = (struct iso9660_pr_voldesc *) &vd; + + do { +- read(f, &vd, sizeof (vd)); /* FIXME: check return value */ ++ do{int ret;ret=read(f, &vd, sizeof (vd));}while(0); /* FIXME: check return value */ + if (GET_UBYTE(vd.vd_type) == VD_PRIMARY) + break; + +diff -up cdrkit-1.1.8/icedax/toc.c.werror cdrkit-1.1.8/icedax/toc.c +--- cdrkit-1.1.8/icedax/toc.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/icedax/toc.c 2008-05-27 15:41:11.000000000 +0200 +@@ -1071,7 +1071,7 @@ static int handle_userchoice(char *p, un + /* get user response. */ + do { + fprintf(stderr, "please choose one (0-%u): ", nr); +- scanf("%u", &user_choice); /* FIXME: check return value */ ++ do{int ret;ret=scanf("%u", &user_choice);}while(0); /* FIXME: check return value */ + } while (user_choice > nr); + + if (user_choice == nr) +diff -up cdrkit-1.1.8/genisoimage/diag/dump.c.werror cdrkit-1.1.8/genisoimage/diag/dump.c +--- cdrkit-1.1.8/genisoimage/diag/dump.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/diag/dump.c 2008-05-27 15:34:03.000000000 +0200 +@@ -368,7 +368,7 @@ main(int argc, char *argv[]) + do { + if (file_addr < (off_t)0) file_addr = (off_t)0; + showblock(1); +- read(STDIN_FILENO, &c, 1); /* FIXME: check return value */ ++ do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */ + if (c == 'a') + file_addr -= PAGE; + if (c == 'b') +@@ -378,11 +378,11 @@ main(int argc, char *argv[]) + printf("Enter new starting block (in hex):"); + if (sizeof (file_addr) > sizeof (long)) { + Llong ll; +- scanf("%llx", &ll); /* FIXME: check return value */ ++ do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */ + file_addr = (off_t)ll; + } else { + long l; +- scanf("%lx", &l); /* FIXME: check return value */ ++ do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */ + file_addr = (off_t)l; + } + file_addr = file_addr << 11; +@@ -392,7 +392,7 @@ main(int argc, char *argv[]) + if (c == 'f') { + crsr2(20, 1); + printf("Enter new search string:"); +- fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */ ++ do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */ + while (search[strlen((char *)search)-1] == '\n') + search[strlen((char *)search)-1] = 0; + crsr2(20, 1); +diff -up cdrkit-1.1.8/genisoimage/diag/isoinfo.c.werror cdrkit-1.1.8/genisoimage/diag/isoinfo.c +--- cdrkit-1.1.8/genisoimage/diag/isoinfo.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/diag/isoinfo.c 2008-05-27 15:34:03.000000000 +0200 +@@ -651,7 +651,7 @@ extract_file(struct iso_directory_record + #endif + len -= tlen; + extent++; +- write(STDOUT_FILENO, buff, tlen); /* FIXME: check return value */ ++ do{int ret;ret=write(STDOUT_FILENO, buff, tlen);}while(0); /* FIXME: check return value */ + } + } + +diff -up cdrkit-1.1.8/genisoimage/diag/isodump.c.werror cdrkit-1.1.8/genisoimage/diag/isodump.c +--- cdrkit-1.1.8/genisoimage/diag/isodump.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/diag/isodump.c 2008-05-27 15:34:03.000000000 +0200 +@@ -655,7 +655,7 @@ main(int argc, char *argv[]) + if (file_addr < 0) + file_addr = (off_t)0; + showblock(1); +- read(STDIN_FILENO, &c, 1); /* FIXME: check return value */ ++ do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */ + if (c == 'a') + file_addr -= blocksize; + if (c == 'b') +@@ -665,11 +665,11 @@ main(int argc, char *argv[]) + printf("Enter new starting block (in hex):"); + if (sizeof (file_addr) > sizeof (long)) { + Llong ll; +- scanf("%llx", &ll); /* FIXME: check return value */ ++ do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */ + file_addr = (off_t)ll; + } else { + long l; +- scanf("%lx", &l); /* FIXME: check return value */ ++ do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */ + file_addr = (off_t)l; + } + file_addr = file_addr * blocksize; +@@ -679,7 +679,7 @@ main(int argc, char *argv[]) + if (c == 'f') { + crsr2(20, 1); + printf("Enter new search string:"); +- fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */ ++ do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */ + while (search[strlen((char *)search)-1] == '\n') + search[strlen((char *)search)-1] = 0; + crsr2(20, 1); +diff -up cdrkit-1.1.8/genisoimage/diag/isovfy.c.werror cdrkit-1.1.8/genisoimage/diag/isovfy.c +--- cdrkit-1.1.8/genisoimage/diag/isovfy.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/diag/isovfy.c 2008-05-27 15:34:03.000000000 +0200 +@@ -591,11 +591,11 @@ check_path_tables(int typel_extent, int + readsecs(typel_extent * blocksize / 2048, typel, ISO_BLOCKS(path_table_size)); + #else + lseek(fileno(infile), (off_t)((off_t)typel_extent) * blocksize, SEEK_SET); +- read(fileno(infile), typel, path_table_size); /* FIXME: check return value */ ++ do{int ret;ret=read(fileno(infile), typel, path_table_size);}while(0); /* FIXME: check return value */ + #endif + typem = (char *) malloc(path_table_size); + lseek(fileno(infile), (off_t)((off_t)typem_extent) * blocksize, SEEK_SET); +- read(fileno(infile), typem, path_table_size); /* FIXME: check return value */ ++ do{int ret;ret=read(fileno(infile), typem, path_table_size);}while(0); /* FIXME: check return value */ + + j = path_table_size; + pnt = typel; +diff -up cdrkit-1.1.8/genisoimage/jte.c.werror cdrkit-1.1.8/genisoimage/jte.c +--- cdrkit-1.1.8/genisoimage/jte.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/jte.c 2008-05-27 15:34:03.000000000 +0200 +@@ -36,6 +36,8 @@ + #include "vms.h" + #endif + ++#include "md5.h" ++ + /* Different types used in building our state list below */ + #define JTET_FILE_MATCH 1 + #define JTET_NOMATCH 2 +@@ -643,7 +645,7 @@ static void flush_bz2_chunk(void *buffer + + err = BZ2_bzCompressInit(&c_stream, 9, 0, 0); + comp_buf = malloc(2 * size); /* Worst case */ +- c_stream.next_out = comp_buf; ++ c_stream.next_out = (char *)comp_buf; + c_stream.avail_out = 2 * size; + c_stream.next_in = buffer; + c_stream.avail_in = size; +@@ -691,7 +693,7 @@ static void write_compressed_chunk(unsig + if (!uncomp_buf) + { + #ifdef USE_LIBSCHILY +- comerr("failed to allocate %d bytes for template compression buffer\n", uncomp_size); ++ comerr("failed to allocate %d bytes for template compression buffer\n", (int)uncomp_size); + #else + fprintf(stderr, "failed to allocate %d bytes for template compression buffer\n", uncomp_size); + exit(1); +@@ -1019,8 +1021,8 @@ void write_jt_match_record(char *filenam + #endif + } + if (first_block) +- rsync64_sum = rsync64(buf, MIN_JIGDO_FILE_SIZE); +- checksum_update(iso_context, buf, use); ++ rsync64_sum = rsync64((unsigned char *)buf, MIN_JIGDO_FILE_SIZE); ++ checksum_update(iso_context, (unsigned char *)buf, use); + // mk_MD5Update(&iso_context, buf, use); + remain -= use; + first_block = 0; +@@ -1033,7 +1035,7 @@ void write_jt_match_record(char *filenam + { + int pad_size = sector_size - (size % sector_size); + memset(buf, 0, pad_size); +- checksum_update(iso_context, buf, pad_size); ++ checksum_update(iso_context, (unsigned char *)buf, pad_size); + // mk_MD5Update(&iso_context, buf, pad_size); + } + +@@ -1041,7 +1043,7 @@ void write_jt_match_record(char *filenam + if (size % sector_size) + { + int pad_size = sector_size - (size % sector_size); +- write_compressed_chunk(buf, pad_size); ++ write_compressed_chunk((unsigned char *)buf, pad_size); + add_unmatched_entry(pad_size); + } + } +diff -up cdrkit-1.1.8/genisoimage/eltorito.c.werror cdrkit-1.1.8/genisoimage/eltorito.c +--- cdrkit-1.1.8/genisoimage/eltorito.c.werror 2008-05-27 15:34:03.000000000 +0200 ++++ cdrkit-1.1.8/genisoimage/eltorito.c 2008-05-27 15:34:03.000000000 +0200 +@@ -660,7 +660,7 @@ fill_boot_desc(struct eltorito_defaultbo + set_731(bi_table.bi_length, de->size); + set_731(bi_table.bi_csum, bi_checksum); + +- write(bootimage, &bi_table, sizeof (bi_table)); /* FIXME: check return value */ ++ do{int ret;ret=write(bootimage, &bi_table, sizeof (bi_table));}while(0); /* FIXME: check return value */ + close(bootimage); + } + }/* fill_boot_desc(... */ diff --git a/src/patches/cdrkit/cdrkit-1.1.9-buffer_overflow.patch b/src/patches/cdrkit/cdrkit-1.1.9-buffer_overflow.patch new file mode 100644 index 000000000..b93d8d217 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.9-buffer_overflow.patch @@ -0,0 +1,66 @@ +diff -ru origin-1.1.9/wodim/scsi_cdr.c master-1.1.9/wodim/scsi_cdr.c +--- origin-1.1.9/wodim/scsi_cdr.c 2008-02-25 12:14:07.000000000 +0100 ++++ master-1.1.9/wodim/scsi_cdr.c 2009-07-16 12:01:29.000000000 +0200 +@@ -2181,26 +2181,30 @@ + if (inq->add_len == 0) { + if (usalp->dev == DEV_UNKNOWN && got_inquiry) { + usalp->dev = DEV_ACB5500; +- strcpy(inq->vendor_info, +- "ADAPTEC ACB-5500 FAKE"); ++ strncpy(inq->vendor_info, "ADAPTEC ", 8); ++ strncpy(inq->prod_ident,"ACB-5500 ", 16); ++ strncpy(inq->prod_revision, "FAKE", 4); + + } else switch (usalp->dev) { +- + case DEV_ACB40X0: +- strcpy(inq->vendor_info, +- "ADAPTEC ACB-40X0 FAKE"); ++ strncpy(inq->vendor_info, "ADAPTEC ", 8); ++ strncpy(inq->prod_ident, "ACB-40X0 ",16); ++ strncpy(inq->prod_revision, "FAKE", 4); + break; + case DEV_ACB4000: +- strcpy(inq->vendor_info, +- "ADAPTEC ACB-4000 FAKE"); ++ strncpy(inq->vendor_info, "ADAPTEC ",8); ++ strncpy(inq->prod_ident, "ACB-4000 ",16); ++ strncpy(inq->prod_revision, "FAKE",4); + break; + case DEV_ACB4010: +- strcpy(inq->vendor_info, +- "ADAPTEC ACB-4010 FAKE"); ++ strncpy(inq->vendor_info, "ADAPTEC ",8); ++ strncpy(inq->prod_ident, "ACB-4010 ",16); ++ strncpy(inq->prod_revision, "FAKE",4); + break; + case DEV_ACB4070: +- strcpy(inq->vendor_info, +- "ADAPTEC ACB-4070 FAKE"); ++ strncpy(inq->vendor_info,"ADAPTEC ",8); ++ strncpy(inq->prod_ident, "ACB-4070 ", 16); ++ strncpy(inq->prod_revision, "FAKE",4 ); + break; + } + } else if (inq->add_len < 31) { +@@ -2230,14 +2234,16 @@ + + case INQ_SEQD: + if (usalp->dev == DEV_SC4000) { +- strcpy(inq->vendor_info, +- "SYSGEN SC4000 FAKE"); ++ strncpy(inq->vendor_info,"SYSGEN ",8); ++ strncpy(inq->prod_ident, "SC4000 ",16); ++ strncpy(inq->prod_revision, "FAKE",4); + } else if (inq->add_len == 0 && + inq->removable && + inq->ansi_version == 1) { + usalp->dev = DEV_MT02; +- strcpy(inq->vendor_info, +- "EMULEX MT02 FAKE"); ++ strncpy(inq->vendor_info,"EMULEX ",8); ++ strncpy(inq->prod_ident, "MT02 ",16); ++ strncpy(inq->prod_revision, "FAKE",4); + } + break; + diff --git a/src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch b/src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch new file mode 100644 index 000000000..45f910b03 --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.9-efi-boot.patch @@ -0,0 +1,204 @@ +diff --git a/doc/icedax/tracknames.pl b/doc/icedax/tracknames.pl +old mode 100755 +new mode 100644 +index 09f0fcf..801b89e +--- a/doc/icedax/tracknames.pl ++++ b/doc/icedax/tracknames.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # A quick perl hack to get rename files pulled in with icedax. + # by billo(a)billo.com + # +diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c +index b97bdf1..5d7c2d1 100644 +--- a/genisoimage/eltorito.c ++++ b/genisoimage/eltorito.c +@@ -59,7 +59,7 @@ static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc); + static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry, + struct eltorito_boot_entry_info *boot_entry); + void get_boot_entry(void); +-void new_boot_entry(void); ++void new_boot_entry(); + static int tvd_write(FILE *outfile); + + +@@ -283,6 +283,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + int i; + int offset; + struct eltorito_defaultboot_entry boot_desc_record; ++ struct eltorito_sectionheader_entry section_header; + + memset(boot_desc, 0, sizeof (*boot_desc)); + boot_desc->type[0] = 0; +@@ -317,7 +318,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + */ + memset(&valid_desc, 0, sizeof (valid_desc)); + valid_desc.headerid[0] = 1; +- valid_desc.arch[0] = EL_TORITO_ARCH_x86; ++ valid_desc.arch[0] = first_boot_entry->arch; + + /* + * we'll shove start of publisher id into id field, +@@ -347,10 +348,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + /* now write it to the virtual boot catalog */ + memcpy(de2->table, &valid_desc, 32); + +- for (current_boot_entry = first_boot_entry, offset = sizeof (valid_desc); +- current_boot_entry != NULL; +- current_boot_entry = current_boot_entry->next, +- offset += sizeof (boot_desc_record)) { ++ /* Fill the first entry, since it's special and already has the ++ * matching header via the validation header... */ ++ offset = sizeof (valid_desc); ++ current_boot_entry = first_boot_entry; ++ ++ if (offset >= SECTOR_SIZE) { ++#ifdef USE_LIBSCHILY ++ comerrno(EX_BAD, "Too many El Torito boot entries\n"); ++#else ++ fprintf(stderr, "Too many El Torito boot entries\n"); ++ exit(1); ++#endif ++ } ++ fill_boot_desc(&boot_desc_record, current_boot_entry); ++ memcpy(de2->table + offset, &boot_desc_record, ++ sizeof (boot_desc_record)); ++ ++ offset += sizeof(boot_desc_record); ++ ++ for (current_boot_entry = current_boot_entry->next; ++ current_boot_entry != NULL; ++ current_boot_entry = current_boot_entry->next) { ++ struct eltorito_sectionheader_entry section_header; ++ ++ if (offset >= SECTOR_SIZE) { ++#ifdef USE_LIBSCHILY ++ comerrno(EX_BAD, ++ "Too many El Torito boot entries\n"); ++#else ++ fprintf(stderr, ++ "Too many El Torito boot entries\n"); ++ exit(1); ++#endif ++ } ++ ++ memset(&section_header, '\0', sizeof(section_header)); ++ if (current_boot_entry->next) ++ section_header.headerid[0] = EL_TORITO_SECTION_HEADER; ++ else ++ section_header.headerid[0] = EL_TORITO_LAST_SECTION_HEADER; ++ ++ section_header.arch[0] = current_boot_entry->arch; ++ set_721(section_header.num_entries, 1); ++ ++ memcpy(de2->table + offset, &section_header, ++ sizeof(section_header)); ++ offset += sizeof(section_header); + + if (offset >= SECTOR_SIZE) { + #ifdef USE_LIBSCHILY +@@ -365,6 +409,8 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + fill_boot_desc(&boot_desc_record, current_boot_entry); + memcpy(de2->table + offset, &boot_desc_record, + sizeof (boot_desc_record)); ++ offset += sizeof (boot_desc_record); ++ + } + }/* get_torito_desc(... */ + +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index a5b0b46..8add1ac 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -47,6 +47,7 @@ + + #include <mconfig.h> + #include "genisoimage.h" ++#include "iso9660.h" + #include <errno.h> + #include <timedefs.h> + #include <fctldefs.h> +@@ -523,6 +524,8 @@ static const struct ld_option ld_options[] = + '\0', NULL, "Set debug flag", ONE_DASH}, + {{"eltorito-boot", required_argument, NULL, 'b'}, + 'b', "FILE", "Set El Torito boot image name", ONE_DASH}, ++ {{"efi-boot", required_argument, NULL, 'e'}, ++ 'e', "FILE", "Set EFI boot image name", ONE_DASH}, + {{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT}, + '\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH}, + {{"sparc-boot", required_argument, NULL, 'B'}, +@@ -1502,6 +1505,7 @@ int main(int argc, char *argv[]) + all_files = 0; + break; + case 'b': ++ case 'e': + do_sort++; /* We sort bootcat/botimage */ + use_eltorito++; + boot_image = optarg; /* pathname of the boot image */ +@@ -1517,6 +1521,10 @@ int main(int argc, char *argv[]) + #endif + } + get_boot_entry(); ++ if (c == 'e') ++ current_boot_entry->arch = EL_TORITO_ARCH_EFI; ++ else ++ current_boot_entry->arch = EL_TORITO_ARCH_x86; + current_boot_entry->boot_image = boot_image; + break; + case OPTION_ALT_BOOT: +diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h +index bbedfb0..76e5e21 100644 +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -293,6 +293,7 @@ struct deferred_write { + struct eltorito_boot_entry_info { + struct eltorito_boot_entry_info *next; + char *boot_image; ++ char arch; + int not_bootable; + int no_emul_boot; + int hard_disk_boot; +diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h +index c74c2a9..c8b7a05 100644 +--- a/genisoimage/iso9660.h ++++ b/genisoimage/iso9660.h +@@ -62,10 +62,14 @@ struct iso_volume_descriptor { + #define EL_TORITO_ARCH_x86 0 + #define EL_TORITO_ARCH_PPC 1 + #define EL_TORITO_ARCH_MAC 2 ++#define EL_TORITO_ARCH_EFI 0xef + + #define EL_TORITO_BOOTABLE 0x88 + #define EL_TORITO_NOT_BOOTABLE 0 + ++#define EL_TORITO_SECTION_HEADER 0x90 ++#define EL_TORITO_LAST_SECTION_HEADER 0x91 ++ + #define EL_TORITO_MEDIA_NOEMUL 0 + #define EL_TORITO_MEDIA_12FLOP 1 + #define EL_TORITO_MEDIA_144FLOP 2 +@@ -173,7 +177,7 @@ struct eltorito_validation_entry { + struct eltorito_defaultboot_entry { + char boot_id [ISODCL(1, 1)]; /* 711 */ + char boot_media [ISODCL(2, 2)]; +- char loadseg [ISODCL(3, 4)]; /* 711 */ ++ char loadseg [ISODCL(3, 4)]; /* 712 */ + char sys_type [ISODCL(5, 5)]; + char pad1 [ISODCL(6, 6)]; + char nsect [ISODCL(7, 8)]; +@@ -181,6 +185,14 @@ struct eltorito_defaultboot_entry { + char pad2 [ISODCL(13, 32)]; + }; + ++/* El Torito Section Header Entry in boot catalog */ ++struct eltorito_sectionheader_entry { ++ char headerid [ISODCL(1, 1)]; /* 711 */ ++ char arch [ISODCL(2, 2)]; ++ char num_entries [ISODCL(3, 4)]; /* 711 */ ++ char id [ISODCL(5, 32)]; ++}; ++ + /* + * XXX JS: The next two structures have odd lengths! + * Some compilers (e.g. on Sun3/mc68020) padd the structures to even length. diff --git a/src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch b/src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch new file mode 100644 index 000000000..6948e4efa --- /dev/null +++ b/src/patches/cdrkit/cdrkit-1.1.9-no_mp3.patch @@ -0,0 +1,50 @@ +diff -up cdrkit-1.1.9/icedax/cdda2ogg.1.no_mp3 cdrkit-1.1.9/icedax/cdda2ogg.1 +--- cdrkit-1.1.9/icedax/cdda2ogg.1.no_mp3 2009-06-15 14:48:44.930637082 +0200 ++++ cdrkit-1.1.9/icedax/cdda2ogg.1 2009-06-15 14:50:35.596769274 +0200 +@@ -1,12 +1,11 @@ + '\" + .TH "cdda2ogg" "1" + .SH "NAME" +-cdda2ogg, cdda2mp3 \(em extract audio CD audio tracks and encode them ++cdda2ogg \(em extract audio CD audio tracks and encode them + .SH "SYNOPSIS" + .PP + .B cdda2ogg + .PP +-.B cdda2mp3 + .SH "DESCRIPTION" + .PP + .B cdda2ogg is a simple script that uses the +@@ -15,9 +14,6 @@ command to extract all audio tracks with + .B icedax <fileprefix> + command and encode them using the + .B ogg123 +-respective +-.I <censored> +-MP3 + encoder. The scripts are not intended to be full-featured music archiving + programs, but only for quick storing of few audio data. + It does not use databases like CDDB or have any extra features. You may look +@@ -36,8 +32,6 @@ for more information. + .SH "CONFIGURATION" + .PP + .B cdda2ogg +-and +-.B cdda2mp3 + have predefined values for reading and labeling of the target files. + You can overwrite them with following environment variables: + +@@ -65,11 +59,11 @@ Additional options passed to + The base part of the filename of resulting audio files. This can also be specified as the first argument to the script. + + .PP +-See cdda2ogg (cdda2mp3) script file to get the default values ++See cdda2ogg script file to get the default values + .PP + System administrator can also set default values by creating of a shell + include file, defining the variables for the POSIX shell, and storing them as +-/etc/default/cdda2ogg (resp. cdda2mp3). ++/etc/default/cdda2ogg. + .SH "EXAMPLES" + .PP + .B CDDA_DEVICE=/dev/cdrom1 cdda2ogg diff --git a/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch b/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch similarity index 90% rename from src/patches/openssh-7.7p1-openssl-1.1.0-1.patch rename to src/patches/openssh-7.8p1-openssl-1.1.0-1.patch index cfc9bba91..7f8c7cd4f 100644 --- a/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch +++ b/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch @@ -1,13 +1,6 @@ -Submitted by: Bruce Dubbs (bdubbs(a)linuxfromscratch.org) -Date: 2018-04-07 -Initial Package Version: 7.7p1 -Upstream Status: Pending (Still) -Origin: https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.p… -Description: Fixes build issues with OpenSSL-1.1.0. - diff -aurp old/auth-pam.c new/auth-pam.c ---- old/auth-pam.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/auth-pam.c 2018-03-23 10:05:03.886621278 -1000 +--- old/auth-pam.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/auth-pam.c 2018-08-23 21:31:53.324592767 -0700 @@ -128,6 +128,10 @@ extern u_int utmp_len; typedef pthread_t sp_pthread_t; #else @@ -20,9 +13,9 @@ diff -aurp old/auth-pam.c new/auth-pam.c struct pam_ctxt { diff -aurp old/cipher.c new/cipher.c ---- old/cipher.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/cipher.c 2018-03-23 10:05:03.886621278 -1000 -@@ -297,7 +297,10 @@ cipher_init(struct sshcipher_ctx **ccp, +--- old/cipher.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/cipher.c 2018-08-23 21:31:53.327926112 -0700 +@@ -299,7 +299,10 @@ cipher_init(struct sshcipher_ctx **ccp, goto out; } } @@ -34,7 +27,7 @@ diff -aurp old/cipher.c new/cipher.c ret = SSH_ERR_LIBCRYPTO_ERROR; goto out; } -@@ -483,7 +486,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c +@@ -485,7 +488,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c len, iv)) return SSH_ERR_LIBCRYPTO_ERROR; } else @@ -43,7 +36,7 @@ diff -aurp old/cipher.c new/cipher.c #endif return 0; } -@@ -517,14 +520,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c +@@ -519,14 +522,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv)) return SSH_ERR_LIBCRYPTO_ERROR; } else @@ -67,8 +60,8 @@ diff -aurp old/cipher.c new/cipher.c int diff -aurp old/cipher.h new/cipher.h ---- old/cipher.h 2018-03-22 16:21:14.000000000 -1000 -+++ new/cipher.h 2018-03-23 10:05:03.886621278 -1000 +--- old/cipher.h 2018-08-22 22:41:42.000000000 -0700 ++++ new/cipher.h 2018-08-23 21:31:53.327926112 -0700 @@ -46,7 +46,18 @@ #define CIPHER_DECRYPT 0 @@ -89,9 +82,9 @@ diff -aurp old/cipher.h new/cipher.h const struct sshcipher *cipher_by_name(const char *); const char *cipher_warning_message(const struct sshcipher_ctx *); diff -aurp old/configure new/configure ---- old/configure 2018-03-23 03:30:17.000000000 -1000 -+++ new/configure 2018-03-23 10:05:03.888621444 -1000 -@@ -13076,7 +13076,6 @@ if ac_fn_c_try_run "$LINENO"; then : +--- old/configure 2018-08-23 00:09:30.000000000 -0700 ++++ new/configure 2018-08-23 21:31:53.331259457 -0700 +@@ -13032,7 +13032,6 @@ if ac_fn_c_try_run "$LINENO"; then : 100*) ;; # 1.0.x 200*) ;; # LibreSSL *) @@ -100,9 +93,9 @@ diff -aurp old/configure new/configure esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5 diff -aurp old/dh.c new/dh.c ---- old/dh.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/dh.c 2018-03-23 10:05:03.888621444 -1000 -@@ -211,14 +211,15 @@ choose_dh(int min, int wantbits, int max +--- old/dh.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/dh.c 2018-08-23 21:39:18.863765579 -0700 +@@ -216,14 +216,15 @@ choose_dh(int min, int wantbits, int max /* diffie-hellman-groupN-sha1 */ int @@ -120,7 +113,7 @@ diff -aurp old/dh.c new/dh.c logit("invalid public DH value: negative"); return 0; } -@@ -231,7 +232,8 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) +@@ -236,7 +237,8 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) error("%s: BN_new failed", __func__); return 0; } @@ -130,7 +123,7 @@ diff -aurp old/dh.c new/dh.c BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */ BN_clear_free(tmp); logit("invalid public DH value: >= p-1"); -@@ -242,14 +244,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) +@@ -247,14 +249,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) for (i = 0; i <= n; i++) if (BN_is_bit_set(dh_pub, i)) bits_set++; @@ -147,7 +140,7 @@ diff -aurp old/dh.c new/dh.c return 0; } return 1; -@@ -259,9 +261,13 @@ int +@@ -264,9 +266,13 @@ int dh_gen_key(DH *dh, int need) { int pbits; @@ -163,7 +156,7 @@ diff -aurp old/dh.c new/dh.c need > INT_MAX / 2 || 2 * need > pbits) return SSH_ERR_INVALID_ARGUMENT; if (need < 256) -@@ -270,10 +276,13 @@ dh_gen_key(DH *dh, int need) +@@ -275,11 +281,13 @@ dh_gen_key(DH *dh, int need) * Pollard Rho, Big step/Little Step attacks are O(sqrt(n)), * so double requested need here. */ @@ -171,6 +164,7 @@ diff -aurp old/dh.c new/dh.c - if (DH_generate_key(dh) == 0 || - !dh_pub_is_valid(dh, dh->pub_key)) { - BN_clear_free(dh->priv_key); +- dh->priv_key = NULL; + DH_set_length(dh, MIN(need * 2, pbits - 1)); + if (DH_generate_key(dh) == 0) { + return SSH_ERR_LIBCRYPTO_ERROR; @@ -181,7 +175,7 @@ diff -aurp old/dh.c new/dh.c return SSH_ERR_LIBCRYPTO_ERROR; } return 0; -@@ -282,16 +291,27 @@ dh_gen_key(DH *dh, int need) +@@ -288,16 +296,27 @@ dh_gen_key(DH *dh, int need) DH * dh_new_group_asc(const char *gen, const char *modulus) { @@ -216,7 +210,7 @@ diff -aurp old/dh.c new/dh.c } /* -@@ -306,8 +326,8 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulu +@@ -312,8 +331,8 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulu if ((dh = DH_new()) == NULL) return NULL; @@ -228,8 +222,8 @@ diff -aurp old/dh.c new/dh.c return (dh); } diff -aurp old/dh.h new/dh.h ---- old/dh.h 2018-03-22 16:21:14.000000000 -1000 -+++ new/dh.h 2018-03-23 10:05:03.889621527 -1000 +--- old/dh.h 2018-08-22 22:41:42.000000000 -0700 ++++ new/dh.h 2018-08-23 21:31:53.331259457 -0700 @@ -42,7 +42,7 @@ DH *dh_new_group18(void); DH *dh_new_group_fallback(int); @@ -240,8 +234,8 @@ diff -aurp old/dh.h new/dh.h u_int dh_estimate(int); diff -aurp old/digest-openssl.c new/digest-openssl.c ---- old/digest-openssl.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/digest-openssl.c 2018-03-23 10:05:03.889621527 -1000 +--- old/digest-openssl.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/digest-openssl.c 2018-08-23 21:31:53.331259457 -0700 @@ -43,7 +43,7 @@ struct ssh_digest_ctx { @@ -314,8 +308,8 @@ diff -aurp old/digest-openssl.c new/digest-openssl.c free(ctx); } diff -aurp old/kexdhc.c new/kexdhc.c ---- old/kexdhc.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexdhc.c 2018-03-23 10:05:03.889621527 -1000 +--- old/kexdhc.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexdhc.c 2018-08-23 21:31:53.331259457 -0700 @@ -81,11 +81,16 @@ kexdh_client(struct ssh *ssh) goto out; } @@ -363,8 +357,8 @@ diff -aurp old/kexdhc.c new/kexdhc.c if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) != 0) diff -aurp old/kexdhs.c new/kexdhs.c ---- old/kexdhs.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexdhs.c 2018-03-23 10:58:58.126733207 -1000 +--- old/kexdhs.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexdhs.c 2018-08-23 21:36:50.600564263 -0700 @@ -163,6 +163,9 @@ input_kex_dh_init(int type, u_int32_t se goto out; /* calc H */ @@ -390,10 +384,10 @@ diff -aurp old/kexdhs.c new/kexdhs.c /* save session id := H */ if (kex->session_id == NULL) { -@@ -195,12 +200,17 @@ input_kex_dh_init(int type, u_int32_t se +@@ -195,12 +200,16 @@ input_kex_dh_init(int type, u_int32_t se /* destroy_sensitive_data(); */ - /* send server hostkey, DH pubkey 'f' and singed H */ + /* send server hostkey, DH pubkey 'f' and signed H */ + { + const BIGNUM *pub_key; + DH_get0_key(kex->dh, &pub_key, NULL); @@ -402,17 +396,15 @@ diff -aurp old/kexdhs.c new/kexdhs.c - (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ + (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ (r = sshpkt_put_string(ssh, signature, slen)) != 0 || -- (r = sshpkt_send(ssh)) != 0) -+ (r = sshpkt_send(ssh)) != 0) { + (r = sshpkt_send(ssh)) != 0) goto out; -+ } + } if ((r = kex_derive_keys_bn(ssh, hash, hashlen, shared_secret)) == 0) r = kex_send_newkeys(ssh); diff -aurp old/kexgexc.c new/kexgexc.c ---- old/kexgexc.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexgexc.c 2018-03-23 11:00:00.132866201 -1000 +--- old/kexgexc.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexgexc.c 2018-08-23 21:31:53.331259457 -0700 @@ -118,11 +118,17 @@ input_kex_dh_gex_group(int type, u_int32 p = g = NULL; /* belong to kex->dh now */ @@ -465,8 +457,8 @@ diff -aurp old/kexgexc.c new/kexgexc.c if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) != 0) diff -aurp old/kexgexs.c new/kexgexs.c ---- old/kexgexs.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexgexs.c 2018-03-23 11:03:06.045049721 -1000 +--- old/kexgexs.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexgexs.c 2018-08-23 21:36:11.493972372 -0700 @@ -101,11 +101,16 @@ input_kex_dh_gex_request(int type, u_int goto out; } @@ -516,10 +508,10 @@ diff -aurp old/kexgexs.c new/kexgexs.c /* save session id := H */ if (kex->session_id == NULL) { -@@ -225,12 +236,17 @@ input_kex_dh_gex_init(int type, u_int32_ +@@ -225,12 +236,16 @@ input_kex_dh_gex_init(int type, u_int32_ /* destroy_sensitive_data(); */ - /* send server hostkey, DH pubkey 'f' and singed H */ + /* send server hostkey, DH pubkey 'f' and signed H */ + { + const BIGNUM *pub_key; + DH_get0_key(kex->dh, &pub_key, NULL); @@ -528,35 +520,33 @@ diff -aurp old/kexgexs.c new/kexgexs.c - (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ + (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ (r = sshpkt_put_string(ssh, signature, slen)) != 0 || -- (r = sshpkt_send(ssh)) != 0) -+ (r = sshpkt_send(ssh)) != 0) { + (r = sshpkt_send(ssh)) != 0) goto out; -+ } + } if ((r = kex_derive_keys_bn(ssh, hash, hashlen, shared_secret)) == 0) r = kex_send_newkeys(ssh); diff -aurp old/monitor.c new/monitor.c ---- old/monitor.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/monitor.c 2018-03-23 10:05:03.890621610 -1000 -@@ -595,10 +595,12 @@ mm_answer_moduli(int sock, Buffer *m) - buffer_put_char(m, 0); +--- old/monitor.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/monitor.c 2018-08-23 21:34:14.594343260 -0700 +@@ -589,10 +589,12 @@ mm_answer_moduli(int sock, struct sshbuf + fatal("%s: buffer error: %s", __func__, ssh_err(r)); return (0); } else { + const BIGNUM *p, *g; + DH_get0_pqg(dh, &p, NULL, &g); /* Send first bignum */ - buffer_put_char(m, 1); -- buffer_put_bignum2(m, dh->p); -- buffer_put_bignum2(m, dh->g); -+ buffer_put_bignum2(m, p); -+ buffer_put_bignum2(m, g); + if ((r = sshbuf_put_u8(m, 1)) != 0 || +- (r = sshbuf_put_bignum2(m, dh->p)) != 0 || +- (r = sshbuf_put_bignum2(m, dh->g)) != 0) ++ (r = sshbuf_put_bignum2(m, p)) != 0 || ++ (r = sshbuf_put_bignum2(m, g)) != 0) + fatal("%s: buffer error: %s", __func__, ssh_err(r)); DH_free(dh); - } diff -aurp old/openbsd-compat/openssl-compat.c new/openbsd-compat/openssl-compat.c ---- old/openbsd-compat/openssl-compat.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/openbsd-compat/openssl-compat.c 2018-03-23 10:05:03.890621610 -1000 +--- old/openbsd-compat/openssl-compat.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/openbsd-compat/openssl-compat.c 2018-08-23 21:31:53.334592801 -0700 @@ -75,7 +75,6 @@ ssh_OpenSSL_add_all_algorithms(void) /* Enable use of crypto hardware */ ENGINE_load_builtin_engines(); @@ -566,8 +556,8 @@ diff -aurp old/openbsd-compat/openssl-compat.c new/openbsd-compat/openssl-compat #endif diff -aurp old/regress/unittests/sshkey/test_file.c new/regress/unittests/sshkey/test_file.c ---- old/regress/unittests/sshkey/test_file.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/regress/unittests/sshkey/test_file.c 2018-03-23 10:05:03.890621610 -1000 +--- old/regress/unittests/sshkey/test_file.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/regress/unittests/sshkey/test_file.c 2018-08-23 21:31:53.334592801 -0700 @@ -60,9 +60,14 @@ sshkey_file_tests(void) a = load_bignum("rsa_1.param.n"); b = load_bignum("rsa_1.param.p"); @@ -605,8 +595,8 @@ diff -aurp old/regress/unittests/sshkey/test_file.c new/regress/unittests/sshkey BN_free(b); BN_free(c); diff -aurp old/regress/unittests/sshkey/test_sshkey.c new/regress/unittests/sshkey/test_sshkey.c ---- old/regress/unittests/sshkey/test_sshkey.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/regress/unittests/sshkey/test_sshkey.c 2018-03-23 10:05:03.890621610 -1000 +--- old/regress/unittests/sshkey/test_sshkey.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/regress/unittests/sshkey/test_sshkey.c 2018-08-23 21:31:53.334592801 -0700 @@ -197,9 +197,14 @@ sshkey_tests(void) k1 = sshkey_new(KEY_RSA); ASSERT_PTR_NE(k1, NULL); @@ -745,8 +735,8 @@ diff -aurp old/regress/unittests/sshkey/test_sshkey.c new/regress/unittests/sshk TEST_START("equal KEY_DSA/demoted KEY_DSA"); diff -aurp old/ssh-dss.c new/ssh-dss.c ---- old/ssh-dss.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-dss.c 2018-03-23 10:05:03.891621693 -1000 +--- old/ssh-dss.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-dss.c 2018-08-23 21:31:53.334592801 -0700 @@ -53,6 +53,7 @@ ssh_dss_sign(const struct sshkey *key, u DSA_SIG *sig = NULL; u_char digest[SSH_DIGEST_MAX_LENGTH], sigblob[SIGBLOB_LEN]; @@ -808,8 +798,8 @@ diff -aurp old/ssh-dss.c new/ssh-dss.c /* sha1 the data */ if ((ret = ssh_digest_memory(SSH_DIGEST_SHA1, data, datalen, diff -aurp old/ssh-ecdsa.c new/ssh-ecdsa.c ---- old/ssh-ecdsa.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-ecdsa.c 2018-03-23 10:05:03.891621693 -1000 +--- old/ssh-ecdsa.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-ecdsa.c 2018-08-23 21:31:53.334592801 -0700 @@ -80,9 +80,14 @@ ssh_ecdsa_sign(const struct sshkey *key, ret = SSH_ERR_ALLOC_FAIL; goto out; @@ -858,9 +848,9 @@ diff -aurp old/ssh-ecdsa.c new/ssh-ecdsa.c ret = SSH_ERR_UNEXPECTED_TRAILING_DATA; goto out; diff -aurp old/ssh-keygen.c new/ssh-keygen.c ---- old/ssh-keygen.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-keygen.c 2018-03-23 10:05:03.891621693 -1000 -@@ -493,11 +493,33 @@ do_convert_private_ssh2_from_blob(u_char +--- old/ssh-keygen.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-keygen.c 2018-08-23 21:31:53.334592801 -0700 +@@ -494,11 +494,33 @@ do_convert_private_ssh2_from_blob(u_char switch (key->type) { case KEY_DSA: @@ -899,7 +889,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c break; case KEY_RSA: if ((r = sshbuf_get_u8(b, &e1)) != 0 || -@@ -514,16 +536,52 @@ do_convert_private_ssh2_from_blob(u_char +@@ -515,16 +537,52 @@ do_convert_private_ssh2_from_blob(u_char e += e3; debug("e %lx", e); } @@ -958,7 +948,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c if ((r = ssh_rsa_generate_additional_parameters(key)) != 0) fatal("generate RSA parameters failed: %s", ssh_err(r)); break; -@@ -633,7 +691,7 @@ do_convert_from_pkcs8(struct sshkey **k, +@@ -634,7 +692,7 @@ do_convert_from_pkcs8(struct sshkey **k, identity_file); } fclose(fp); @@ -967,7 +957,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c case EVP_PKEY_RSA: if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) fatal("sshkey_new failed"); -@@ -657,7 +715,7 @@ do_convert_from_pkcs8(struct sshkey **k, +@@ -658,7 +716,7 @@ do_convert_from_pkcs8(struct sshkey **k, #endif default: fatal("%s: unsupported pubkey type %d", __func__, @@ -977,9 +967,9 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c EVP_PKEY_free(pubkey); return; diff -aurp old/ssh-pkcs11-client.c new/ssh-pkcs11-client.c ---- old/ssh-pkcs11-client.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-pkcs11-client.c 2018-03-23 10:05:03.892621777 -1000 -@@ -144,12 +144,13 @@ pkcs11_rsa_private_encrypt(int flen, con +--- old/ssh-pkcs11-client.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-pkcs11-client.c 2018-08-23 21:31:53.334592801 -0700 +@@ -156,12 +156,13 @@ pkcs11_rsa_private_encrypt(int flen, con static int wrap_key(RSA *rsa) { @@ -999,8 +989,8 @@ diff -aurp old/ssh-pkcs11-client.c new/ssh-pkcs11-client.c } diff -aurp old/ssh-pkcs11.c new/ssh-pkcs11.c ---- old/ssh-pkcs11.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-pkcs11.c 2018-03-23 10:05:03.892621777 -1000 +--- old/ssh-pkcs11.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-pkcs11.c 2018-08-23 21:31:53.334592801 -0700 @@ -67,7 +67,7 @@ struct pkcs11_key { struct pkcs11_provider *provider; CK_ULONG slotidx; @@ -1090,9 +1080,9 @@ diff -aurp old/ssh-pkcs11.c new/ssh-pkcs11.c free(attribs[i].pValue); } diff -aurp old/ssh-rsa.c new/ssh-rsa.c ---- old/ssh-rsa.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-rsa.c 2018-03-23 10:05:03.892621777 -1000 -@@ -84,7 +84,6 @@ ssh_rsa_generate_additional_parameters(s +--- old/ssh-rsa.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-rsa.c 2018-08-23 21:31:53.334592801 -0700 +@@ -108,7 +108,6 @@ ssh_rsa_generate_additional_parameters(s { BIGNUM *aux = NULL; BN_CTX *ctx = NULL; @@ -1100,7 +1090,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c int r; if (key == NULL || key->rsa == NULL || -@@ -99,16 +98,27 @@ ssh_rsa_generate_additional_parameters(s +@@ -123,16 +122,27 @@ ssh_rsa_generate_additional_parameters(s } BN_set_flags(aux, BN_FLG_CONSTTIME); @@ -1135,7 +1125,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c r = 0; out: BN_clear_free(aux); -@@ -139,7 +149,7 @@ ssh_rsa_sign(const struct sshkey *key, u +@@ -163,7 +173,7 @@ ssh_rsa_sign(const struct sshkey *key, u if (key == NULL || key->rsa == NULL || hash_alg == -1 || sshkey_type_plain(key->type) != KEY_RSA) return SSH_ERR_INVALID_ARGUMENT; @@ -1144,7 +1134,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c return SSH_ERR_KEY_LENGTH; slen = RSA_size(key->rsa); if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM) -@@ -211,7 +221,7 @@ ssh_rsa_verify(const struct sshkey *key, +@@ -235,7 +245,7 @@ ssh_rsa_verify(const struct sshkey *key, sshkey_type_plain(key->type) != KEY_RSA || sig == NULL || siglen == 0) return SSH_ERR_INVALID_ARGUMENT; @@ -1154,9 +1144,9 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c if ((b = sshbuf_from(sig, siglen)) == NULL) diff -aurp old/sshkey.c new/sshkey.c ---- old/sshkey.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/sshkey.c 2018-03-23 10:05:03.893621860 -1000 -@@ -274,10 +274,18 @@ sshkey_size(const struct sshkey *k) +--- old/sshkey.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/sshkey.c 2018-08-23 21:31:53.334592801 -0700 +@@ -292,10 +292,18 @@ sshkey_size(const struct sshkey *k) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1176,7 +1166,7 @@ diff -aurp old/sshkey.c new/sshkey.c case KEY_ECDSA: case KEY_ECDSA_CERT: return sshkey_curve_nid_to_bits(k->ecdsa_nid); -@@ -482,26 +490,53 @@ sshkey_new(int type) +@@ -500,26 +508,53 @@ sshkey_new(int type) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1236,7 +1226,7 @@ diff -aurp old/sshkey.c new/sshkey.c k->dsa = dsa; break; case KEY_ECDSA: -@@ -539,6 +574,51 @@ sshkey_add_private(struct sshkey *k) +@@ -557,6 +592,51 @@ sshkey_add_private(struct sshkey *k) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1288,7 +1278,7 @@ diff -aurp old/sshkey.c new/sshkey.c #define bn_maybe_alloc_failed(p) (p == NULL && (p = BN_new()) == NULL) if (bn_maybe_alloc_failed(k->rsa->d) || bn_maybe_alloc_failed(k->rsa->iqmp) || -@@ -547,13 +627,28 @@ sshkey_add_private(struct sshkey *k) +@@ -565,13 +645,28 @@ sshkey_add_private(struct sshkey *k) bn_maybe_alloc_failed(k->rsa->dmq1) || bn_maybe_alloc_failed(k->rsa->dmp1)) return SSH_ERR_ALLOC_FAIL; @@ -1317,7 +1307,7 @@ diff -aurp old/sshkey.c new/sshkey.c case KEY_ECDSA: case KEY_ECDSA_CERT: /* Cannot do anything until we know the group */ -@@ -677,16 +772,34 @@ sshkey_equal_public(const struct sshkey +@@ -695,16 +790,34 @@ sshkey_equal_public(const struct sshkey #ifdef WITH_OPENSSL case KEY_RSA_CERT: case KEY_RSA: @@ -1360,7 +1350,7 @@ diff -aurp old/sshkey.c new/sshkey.c # ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: case KEY_ECDSA: -@@ -775,12 +888,17 @@ to_blob_buf(const struct sshkey *key, st +@@ -793,12 +906,17 @@ to_blob_buf(const struct sshkey *key, st case KEY_DSA: if (key->dsa == NULL) return SSH_ERR_INVALID_ARGUMENT; @@ -1382,7 +1372,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -796,10 +914,14 @@ to_blob_buf(const struct sshkey *key, st +@@ -814,10 +932,14 @@ to_blob_buf(const struct sshkey *key, st case KEY_RSA: if (key->rsa == NULL) return SSH_ERR_INVALID_ARGUMENT; @@ -1399,7 +1389,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519: -@@ -1740,13 +1862,32 @@ sshkey_from_private(const struct sshkey +@@ -1758,13 +1880,32 @@ sshkey_from_private(const struct sshkey case KEY_DSA_CERT: if ((n = sshkey_new(k->type)) == NULL) return SSH_ERR_ALLOC_FAIL; @@ -1436,7 +1426,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -1770,11 +1911,23 @@ sshkey_from_private(const struct sshkey +@@ -1788,11 +1929,23 @@ sshkey_from_private(const struct sshkey case KEY_RSA_CERT: if ((n = sshkey_new(k->type)) == NULL) return SSH_ERR_ALLOC_FAIL; @@ -1462,7 +1452,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519: -@@ -1995,12 +2148,27 @@ sshkey_from_blob_internal(struct sshbuf +@@ -2013,12 +2166,27 @@ sshkey_from_blob_internal(struct sshbuf ret = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1493,7 +1483,7 @@ diff -aurp old/sshkey.c new/sshkey.c ret = SSH_ERR_KEY_LENGTH; goto out; } -@@ -2020,13 +2188,36 @@ sshkey_from_blob_internal(struct sshbuf +@@ -2038,13 +2206,36 @@ sshkey_from_blob_internal(struct sshbuf ret = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1534,7 +1524,7 @@ diff -aurp old/sshkey.c new/sshkey.c #ifdef DEBUG_PK DSA_print_fp(stderr, key->dsa, 8); #endif -@@ -2327,26 +2518,63 @@ sshkey_demote(const struct sshkey *k, st +@@ -2389,26 +2580,63 @@ sshkey_demote(const struct sshkey *k, st goto fail; /* FALLTHROUGH */ case KEY_RSA: @@ -1606,7 +1596,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; case KEY_ECDSA_CERT: if ((ret = sshkey_cert_copy(k, pk)) != 0) -@@ -2496,11 +2724,17 @@ sshkey_certify_custom(struct sshkey *k, +@@ -2558,11 +2786,17 @@ sshkey_certify_custom(struct sshkey *k, switch (k->type) { #ifdef WITH_OPENSSL case KEY_DSA_CERT: @@ -1628,7 +1618,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: -@@ -2513,9 +2747,15 @@ sshkey_certify_custom(struct sshkey *k, +@@ -2575,9 +2809,15 @@ sshkey_certify_custom(struct sshkey *k, break; # endif /* OPENSSL_HAS_ECC */ case KEY_RSA_CERT: @@ -1646,7 +1636,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519_CERT: -@@ -2702,42 +2942,67 @@ sshkey_private_serialize_opt(const struc +@@ -2764,42 +3004,67 @@ sshkey_private_serialize_opt(const struc switch (key->type) { #ifdef WITH_OPENSSL case KEY_RSA: @@ -1730,7 +1720,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -2851,18 +3116,61 @@ sshkey_private_deserialize(struct sshbuf +@@ -2913,18 +3178,61 @@ sshkey_private_deserialize(struct sshbuf r = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1799,7 +1789,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -2921,29 +3229,104 @@ sshkey_private_deserialize(struct sshbuf +@@ -2983,29 +3291,104 @@ sshkey_private_deserialize(struct sshbuf r = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1918,7 +1908,7 @@ diff -aurp old/sshkey.c new/sshkey.c r = SSH_ERR_KEY_LENGTH; goto out; } -@@ -3707,7 +4090,6 @@ translate_libcrypto_error(unsigned long +@@ -3769,7 +4152,6 @@ translate_libcrypto_error(unsigned long switch (pem_reason) { case EVP_R_BAD_DECRYPT: return SSH_ERR_KEY_WRONG_PASSPHRASE; @@ -1926,7 +1916,7 @@ diff -aurp old/sshkey.c new/sshkey.c case EVP_R_DECODE_ERROR: #ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR case EVP_R_PRIVATE_KEY_DECODE_ERROR: -@@ -3772,7 +4154,7 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3834,7 +4216,7 @@ sshkey_parse_private_pem_fileblob(struct r = convert_libcrypto_error(); goto out; } @@ -1935,7 +1925,7 @@ diff -aurp old/sshkey.c new/sshkey.c (type == KEY_UNSPEC || type == KEY_RSA)) { if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { r = SSH_ERR_ALLOC_FAIL; -@@ -3787,11 +4169,11 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3849,11 +4231,11 @@ sshkey_parse_private_pem_fileblob(struct r = SSH_ERR_LIBCRYPTO_ERROR; goto out; } @@ -1949,7 +1939,7 @@ diff -aurp old/sshkey.c new/sshkey.c (type == KEY_UNSPEC || type == KEY_DSA)) { if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { r = SSH_ERR_ALLOC_FAIL; -@@ -3803,7 +4185,7 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3865,7 +4247,7 @@ sshkey_parse_private_pem_fileblob(struct DSA_print_fp(stderr, prv->dsa, 8); #endif #ifdef OPENSSL_HAS_ECC diff --git a/src/patches/parted-3.2-device-mapper.patch b/src/patches/parted-3.2-device-mapper.patch new file mode 100644 index 000000000..e866c8860 --- /dev/null +++ b/src/patches/parted-3.2-device-mapper.patch @@ -0,0 +1,44 @@ +--- parted-3.2/libparted/arch/linux.c.device-mapper 2014-06-15 20:15:54.000000000 +0100 ++++ parted-3.2/libparted/arch/linux.c 2014-07-29 22:27:54.487430030 +0100 +@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...) + static char * + dm_canonical_path (PedDevice const *dev) + { ++#ifdef ENABLE_DEVICE_MAPPER + LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); + + /* Get map name from devicemapper */ +@@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev) + dm_task_destroy (task); + return dev_name; + err: ++#endif + return NULL; + } + +@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk) + unsigned long long *start, + unsigned long long *length); + +- ++#ifdef ENABLE_DEVICE_MAPPER + if (disk->dev->type == PED_DEVICE_DM) { + add_partition = _dm_add_partition; + remove_partition = _dm_remove_partition; + resize_partition = _dm_resize_partition; + get_partition_start_and_length = _dm_get_partition_start_and_length; + } else { ++#endif + add_partition = _blkpg_add_partition; + remove_partition = _blkpg_remove_partition; + #ifdef BLKPG_RESIZE_PARTITION +@@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk) + resize_partition = NULL; + #endif + get_partition_start_and_length = _kernel_get_partition_start_and_length; ++#ifdef ENABLE_DEVICE_MAPPER + } ++#endif + + /* lpn = largest partition number. + * for remove pass, use greater of device or label limit */ diff --git a/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch b/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch new file mode 100644 index 000000000..7d45bd0b8 --- /dev/null +++ b/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch @@ -0,0 +1,35 @@ +From 1f023b49959aa58246e6bb7091ba7710116f6915 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun, 9 Sep 2018 17:29:15 +0100 +Subject: [PATCH] Enable RDRAND for i586, too + +IPFire is being compiled for i586 omitting some instructions +for i686. However, RDRAND is available on some systems and +can of course be used. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> + +Pull request sent: https://github.com/nhorman/rng-tools/pull/31 + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index faba7cc9857e..716175328ff6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,8 +53,8 @@ AC_CHECK_TOOLS([AR], [ar gar], :) + + AX_PTHREAD + +-AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686]) +-AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) ++AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586]) ++AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[]) + + AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le]) + AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[]) +-- +2.17.1 + diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 495ff394e..2cdef0094 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,6 +1,32 @@ #!/bin/sh arch=$(uname -m) +makeiso() { + local dir="${1}" + local output="${2}" + + local args="-J -r -V 'ipfire backup ${TS}' \ + -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ + -c boot/isolinux/boot.catalog" + + # Add EFI options when EFI image is present + if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then + args="${args} -eltorito-alt-boot -e boot/isolinux/efiboot.img -no-emul-boot" + fi + + # Compose ISO + mkisofs ${args} ${dir} > ${output} + + # Add DOS paritition table + if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then + isohybrid --uefi ${output} + else + isohybrid ${output} + fi + + return 0 +} + case $arch in i?86) arch="i586" @@ -73,10 +99,7 @@ rm -r backupiso.tmp.${TS} cp "/var/ipfire/backup/${TS}.ipf" "backupiso.${TS}/backup.ipf" echo "Running mkisofs" -mkisofs -J -r -V "ipfire backup ${TS}" \ - -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ - -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso -isohybrid $(basename ${ISO} .iso)-${TS}.iso +makeiso backupiso.${TS} $(basename ${ISO} .iso)-${TS}.iso echo "Cleaning up" rm -rf backupiso.${TS} diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 91e68ca57..3dd08dc21 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -17,11 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2008 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # # -KVER=`uname -r | cut -d"-" -f1` +KVER=`uname -r` -dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire +dracut --force --early-microcode --xz /boot/initramfs-$KVER.img $KVER hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0f2186725ef5cd62d1482b4482e20a6295ebf2ad
by Arne Fitzenreiter 21 Sep '18

21 Sep '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d
by Arne Fitzenreiter 20 Sep '18

20 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d (commit) from bdf9df742caf803272f7a34cadc9d7dc4ea17a78 (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 4eedf6793b5dc5c6f3d91fb1db0b32a3fc40c24d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 20 20:03:26 2018 +0200 rebuild-initrd: update for grub2 this was was not used for years because we usually ship a prebuild ramdisk so this incompatiblity was not noticed long time... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/scripts/rebuild-initrd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 91e68ca57..3dd08dc21 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -17,11 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2008 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # # -KVER=`uname -r | cut -d"-" -f1` +KVER=`uname -r` -dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire +dracut --force --early-microcode --xz /boot/initramfs-$KVER.img $KVER hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bdf9df742caf803272f7a34cadc9d7dc4ea17a78
by Arne Fitzenreiter 20 Sep '18

20 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via bdf9df742caf803272f7a34cadc9d7dc4ea17a78 (commit) from 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2 (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 bdf9df742caf803272f7a34cadc9d7dc4ea17a78 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 20 19:51:43 2018 +0200 kernel: update to 4.14.71 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 17 +++++++++++------ config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 11 +++++------ config/kernel/kernel.config.armv5tel-ipfire-multi | 12 +++++------- config/kernel/kernel.config.i586-ipfire | 3 +-- config/kernel/kernel.config.i586-ipfire-pae | 3 +-- config/kernel/kernel.config.x86_64-ipfire | 3 +-- lfs/linux | 9 +++++---- 7 files changed, 29 insertions(+), 29 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index a2f5a5e55..73a931c51 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.50-ipfire Kernel Configuration +# Linux/arm64 4.14.71 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -509,6 +509,7 @@ CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y # CONFIG_NUMA is not set +CONFIG_HOLES_IN_ZONE=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -574,6 +575,7 @@ CONFIG_CRASH_DUMP=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -1087,6 +1089,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1094,10 +1099,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1353,7 +1355,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -2415,6 +2416,7 @@ CONFIG_WLAN=y # CONFIG_WIRELESS_WDS is not set CONFIG_WLAN_VENDOR_ADMTEK=y CONFIG_ADM8211=m +# CONFIG_RTL8189ES is not set CONFIG_ATH_COMMON=m CONFIG_WLAN_VENDOR_ATH=y # CONFIG_ATH_DEBUG is not set @@ -2625,6 +2627,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WILINK_PLATFORM_DATA=y +# CONFIG_WLAN_VENDOR_XRADIO is not set CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m @@ -3594,6 +3597,7 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set +# CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -4246,6 +4250,7 @@ CONFIG_DRM_UDL=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_CIRRUS_QEMU is not set CONFIG_DRM_RCAR_DW_HDMI=m +# CONFIG_DRM_SUN4I is not set # CONFIG_DRM_QXL is not set # CONFIG_DRM_BOCHS is not set CONFIG_DRM_VIRTIO_GPU=m @@ -6667,7 +6672,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index f2d97c886..b101b343a 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.71 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1075,6 +1075,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1082,10 +1085,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1334,7 +1334,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -6089,7 +6088,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 6362cff2d..1f663f433 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.43 Kernel Configuration +# Linux/arm 4.14.71 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1344,6 +1344,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1351,10 +1354,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -1609,7 +1609,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y @@ -5879,7 +5878,6 @@ CONFIG_DMA_ENGINE_RAID=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_AUXDISPLAY is not set -CONFIG_ARM_CHARLCD=y # CONFIG_PANEL is not set CONFIG_UIO=m # CONFIG_UIO_CIF is not set @@ -7159,7 +7157,7 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3d0047ab4..eb600d6dd 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.69 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1549,7 +1549,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 0dabb067f..5a6391594 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.69 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1567,7 +1567,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 6c445d8b7..bb4c321c6 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.69 Kernel Configuration +# Linux/x86 4.14.71 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1542,7 +1542,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y diff --git a/lfs/linux b/lfs/linux index 7b4ea55e2..ad10bc8e5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.70 -ARM_PATCHES = 4.14.70-ipfire0 +VER = 4.14.71 +ARM_PATCHES = 4.14.71-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,8 +82,9 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = a56b56ca373d5dc95aefbd0fbcb1336a -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 7af1693eb8882c99e4d965a9f439ef17 +$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb + install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2
by Michael Tremer 20 Sep '18

20 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2 (commit) via b1bfe61711ac678632118180c06a34deeab96a24 (commit) via 37d7f3801877b3330465b1a20cfba2fc4987e610 (commit) via 74189c1d5519c077c43fe123e6e3a3d39176e1fb (commit) via 1d2fe90cc8952879835c3694a6cb8c45b097013c (commit) via bd0686f441cf09a2041e1647de6e0dffda590409 (commit) via 07da1af688135710960e6deb9049a3fab6cb6e81 (commit) via 38485efafba2936ca3856e1324cca2044a13e85b (commit) via a6c190818a15342db5d91f4219587aa08f692173 (commit) from 06131f41e4a186ed7a70e8ef4f002d63cc16707a (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 5210b5879ba1bf2c3836bf54c4e3a50fa1b0c6f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:54:02 2018 +0100 core124: Ship updated iproute2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b1bfe61711ac678632118180c06a34deeab96a24 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Sep 18 19:35:10 2018 +0200 iproute2: Update to 4.18.0 Triggered by https://bugzilla.ipfire.org/show_bug.cgi?id=11866 ;-) For details see: https://lwn.net/Articles/762515/ Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37d7f3801877b3330465b1a20cfba2fc4987e610 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:52:17 2018 +0100 core124: Ship updated openssh package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74189c1d5519c077c43fe123e6e3a3d39176e1fb Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Sep 10 19:38:17 2018 +0200 openssh: Update to 7.8p1 For details see: http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ChangeLog I didn't find an official lfs-patch for openssl-1.1-compatibility, so I used the patch from here: https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.p… Building ran without any errors. I tested with both machines (test on Core 120 - and productive - on Core 122) and found no errors so far: ... [root@ipfiretest ~]# ssh -V OpenSSH_7.8p1, OpenSSL 1.1.0h 27 Mar 2018 ... ... root@ipfire: / # ssh -V OpenSSH_7.8p1, OpenSSL 1.1.0h 27 Mar 2018 ... All ssh-connections ran fine but I'm not REALLY sure if this is sufficient for anyone else. Could someone please check and confirm!? Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Tested-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1d2fe90cc8952879835c3694a6cb8c45b097013c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:51:13 2018 +0100 core124: Ship updated OpenSSH configuration Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bd0686f441cf09a2041e1647de6e0dffda590409 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:50:25 2018 +0100 ssh: Remove AuthenticationMethods directive This is only setting something that is default anyways and prevents sshd from starting if one of the listed methods is not activated. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 07da1af688135710960e6deb9049a3fab6cb6e81 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Sep 10 17:52:23 2018 +0200 use custom SSH server configuration in LFS file Include OpenSSH server configuration file during build. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 38485efafba2936ca3856e1324cca2044a13e85b Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Sep 10 17:52:22 2018 +0200 add hardened SSH server configuration In order to harden OpenSSH server in IPFire, using the upstream default configuration and edit it via sed commands in LFS file is error-prone and does not scale. Thereof we ship a custom and more secure OpenSSH server configuration which is copied into the image during build time. The fourth version of this patch disables password authentication by default, since this is required by some cloud hosters in order to apply the image. Further, this method is less secure than pubkey authentication. Non-AEAD ciphers have been re-added to provide compatibility to older RHEL systems. Fixes #11750 Fixes #11751 Partially fixes #11538 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Cc: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Cc: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a6c190818a15342db5d91f4219587aa08f692173 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 14:21:41 2018 +0100 backup: Fix deleting backup files Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 7 +- config/rootfiles/common/iproute2 | 3 + config/rootfiles/core/124/exclude | 2 - config/rootfiles/core/124/filelists/files | 3 + .../{oldcore/106 => core/124}/filelists/iproute2 | 0 .../{oldcore/100 => core/124}/filelists/openssh | 0 config/rootfiles/core/124/update.sh | 3 + config/ssh/sshd_config | 78 ++++++++ html/cgi-bin/backup.cgi | 6 +- lfs/iproute2 | 4 +- lfs/openssh | 26 +-- ...1.patch => openssh-7.8p1-openssl-1.1.0-1.patch} | 210 ++++++++++----------- 12 files changed, 199 insertions(+), 143 deletions(-) copy config/rootfiles/{oldcore/106 => core/124}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/100 => core/124}/filelists/openssh (100%) create mode 100644 config/ssh/sshd_config rename src/patches/{openssh-7.7p1-openssl-1.1.0-1.patch => openssh-7.8p1-openssl-1.1.0-1.patch} (90%) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index ce16e7f42..ce8911635 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -138,11 +138,8 @@ elsif ($ARGV[0] eq 'cli') { elsif ($ARGV[0] eq 'addonbackup') { system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'"); } -elsif ($ARGV[0] =~ /ipf$/ ) { - system("rm /var/ipfire/backup/$ARGV[0]"); -} -elsif ($ARGV[0] =~ /iso$/ ) { - system("rm /var/tmp/backupiso/$ARGV[0]"); +elsif ($ARGV[0] =~ /\.(iso|ipf)$/ ) { + unlink("$ARGV[0]"); } elsif ($ARGV[0] eq '') { printf "No argument given, please use <include><exclude><cli>\n" diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index afa30467f..cf9a5c456 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -65,6 +65,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/devlink-dev.8 #usr/share/man/man8/devlink-monitor.8 #usr/share/man/man8/devlink-port.8 +#usr/share/man/man8/devlink-resource.8 #usr/share/man/man8/devlink-sb.8 #usr/share/man/man8/devlink.8 #usr/share/man/man8/genl.8 @@ -97,6 +98,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/nstat.8 #usr/share/man/man8/rdma-dev.8 #usr/share/man/man8/rdma-link.8 +#usr/share/man/man8/rdma-resource.8 #usr/share/man/man8/rdma.8 #usr/share/man/man8/routef.8 #usr/share/man/man8/routel.8 @@ -111,6 +113,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tc-bpf.8 #usr/share/man/man8/tc-cbq-details.8 #usr/share/man/man8/tc-cbq.8 +#usr/share/man/man8/tc-cbs.8 #usr/share/man/man8/tc-cgroup.8 #usr/share/man/man8/tc-choke.8 #usr/share/man/man8/tc-codel.8 diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/124/exclude index d6fd053b6..b22159878 100644 --- a/config/rootfiles/core/124/exclude +++ b/config/rootfiles/core/124/exclude @@ -11,8 +11,6 @@ etc/ipsec.user.secrets etc/localtime etc/shadow etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config etc/ssl/openssl.cnf etc/sudoers etc/sysconfig/firewall.local diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index e3e295706..25e812593 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -6,6 +6,8 @@ etc/rc.d/init.d/localnet etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/partresize etc/rc.d/init.d/static-routes +etc/ssh/ssh_config +etc/ssh/sshd_config etc/sysctl.conf etc/unbound/unbound.conf opt/pakfire/lib/functions.pl @@ -21,6 +23,7 @@ srv/web/ipfire/html/redirect-templates/legacy/template.html usr/bin/install-bootloader usr/local/bin/backupiso usr/local/bin/rebuild-initrd +var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude var/ipfire/backup/include var/ipfire/langs diff --git a/config/rootfiles/core/124/filelists/iproute2 b/config/rootfiles/core/124/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/124/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/openssh b/config/rootfiles/core/124/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/124/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index 88da254e0..3b5a601d6 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -95,6 +95,9 @@ ldconfig # Update Language cache /usr/local/bin/update-lang-cache +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Start services /etc/init.d/rngd restart /etc/init.d/ntp restart diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config new file mode 100644 index 000000000..4a25e8383 --- /dev/null +++ b/config/ssh/sshd_config @@ -0,0 +1,78 @@ +# ultra-secure OpenSSH server configuration + +# only allow version 2 of SSH protocol +Protocol 2 + +# listen on port 22 by default +Port 22 + +# listen on these interfaces and protocols +AddressFamily any +ListenAddress 0.0.0.0 + +# limit authentication thresholds +LoginGraceTime 30s +MaxAuthTries 3 + +# limit maximum instanctes to prevent DoS +MaxStartups 5 + +# ensure proper logging +SyslogFacility AUTH +LogLevel INFO + +# enforce permission checks before a login is accepted +# (prevents damage because of hacked systems with world-writeable +# home directories or similar) +StrictModes yes + +# 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(a)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 + +# enable data compression after successful login only +Compression delayed + +# only allow cryptographically safe SSH host keys (adjust paths if needed) +HostKey /etc/ssh/ssh_host_ed25519_key +HostKey /etc/ssh/ssh_host_ecdsa_key +HostKey /etc/ssh/ssh_host_rsa_key + +# only allow login via public key by default +PubkeyAuthentication yes +PasswordAuthentication no +ChallengeResponseAuthentication no +PermitEmptyPasswords no + +# permit root login as there is no other user in IPFire 2.x +PermitRootLogin yes + +# ignore user ~/.rhost* files +IgnoreRhosts yes + +# ignore user known hosts file +IgnoreUserKnownHosts yes + +# ignore user environments +PermitUserEnvironment no + +# do not allow any kind of forwarding (provides only low security) +# some of them might need to be re-enabled if SSH server is a jump platform +X11Forwarding no +AllowTcpForwarding no +AllowAgentForwarding no +PermitTunnel no +GatewayPorts no +PermitOpen none + +# detect broken sessions by sending keep-alive messages to +# clients (both via TCP and SSH) +TCPKeepAlive yes +ClientAliveInterval 10 + +# close unresponsive SSH sessions which fail to answer keep-alive +ClientAliveCountMax 6 + +# EOF diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 2a036279d..cac4146ab 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -137,8 +137,6 @@ elsif ( $cgiparams{'ACTION'} eq "delete" ) my $file = &sanitise_file($cgiparams{'FILE'}); exit(1) unless defined($file); - $file = &File::Basename::basename($file); - system("/usr/local/bin/backupctrl $file >/dev/null 2>&1"); } @@ -266,7 +264,7 @@ print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='delete' /> - <input type='hidden' name='FILE' value='addons//backup/$_.ipf' /> + <input type='hidden' name='FILE' value='$_.ipf' /> <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> </form> </td> @@ -305,7 +303,7 @@ print <<END <td align='right' width='5'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='delete' /> - <input type='hidden' name='FILE' value='addons//backup/$_.ipf' /> + <input type='hidden' name='FILE' value='$_.ipf' /> <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /> </form> </td> diff --git a/lfs/iproute2 b/lfs/iproute2 index 7fa8a1c13..4d2a6f4d7 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 4.14.1 +VER = 4.18.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1075423d7029e02a8f23ed4f42b7e372 +$(DL_FILE)_MD5 = 8b8680e91390c57cab788fbf8e929479 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index 0e6acc227..c67f135e8 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 7.7p1 +VER = 7.8p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 68ba883aff6958297432e5877e9a0fe2 +$(DL_FILE)_MD5 = ce1d090fa6239fd38eb989d5e983b074 install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure \ --prefix=/usr \ @@ -82,23 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - sed -i -e 's/^#\?Port .*$$/Port 22/' \ - -e 's/^#\?Protocol .*$$/Protocol 2/' \ - -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ - -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ - -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication no/' \ - -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ - -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ - -e 's/^#\?UsePAM .*$$//' \ - -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \ - -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \ - -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ - -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ - -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \ - -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \ + + # install custom OpenSSH server configuration + install -v -m 644 $(DIR_SRC)/config/ssh/sshd_config \ /etc/ssh/sshd_config # install custom OpenSSH client configuration diff --git a/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch b/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch similarity index 90% rename from src/patches/openssh-7.7p1-openssl-1.1.0-1.patch rename to src/patches/openssh-7.8p1-openssl-1.1.0-1.patch index cfc9bba91..7f8c7cd4f 100644 --- a/src/patches/openssh-7.7p1-openssl-1.1.0-1.patch +++ b/src/patches/openssh-7.8p1-openssl-1.1.0-1.patch @@ -1,13 +1,6 @@ -Submitted by: Bruce Dubbs (bdubbs(a)linuxfromscratch.org) -Date: 2018-04-07 -Initial Package Version: 7.7p1 -Upstream Status: Pending (Still) -Origin: https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.p… -Description: Fixes build issues with OpenSSL-1.1.0. - diff -aurp old/auth-pam.c new/auth-pam.c ---- old/auth-pam.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/auth-pam.c 2018-03-23 10:05:03.886621278 -1000 +--- old/auth-pam.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/auth-pam.c 2018-08-23 21:31:53.324592767 -0700 @@ -128,6 +128,10 @@ extern u_int utmp_len; typedef pthread_t sp_pthread_t; #else @@ -20,9 +13,9 @@ diff -aurp old/auth-pam.c new/auth-pam.c struct pam_ctxt { diff -aurp old/cipher.c new/cipher.c ---- old/cipher.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/cipher.c 2018-03-23 10:05:03.886621278 -1000 -@@ -297,7 +297,10 @@ cipher_init(struct sshcipher_ctx **ccp, +--- old/cipher.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/cipher.c 2018-08-23 21:31:53.327926112 -0700 +@@ -299,7 +299,10 @@ cipher_init(struct sshcipher_ctx **ccp, goto out; } } @@ -34,7 +27,7 @@ diff -aurp old/cipher.c new/cipher.c ret = SSH_ERR_LIBCRYPTO_ERROR; goto out; } -@@ -483,7 +486,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c +@@ -485,7 +488,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c len, iv)) return SSH_ERR_LIBCRYPTO_ERROR; } else @@ -43,7 +36,7 @@ diff -aurp old/cipher.c new/cipher.c #endif return 0; } -@@ -517,14 +520,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c +@@ -519,14 +522,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv)) return SSH_ERR_LIBCRYPTO_ERROR; } else @@ -67,8 +60,8 @@ diff -aurp old/cipher.c new/cipher.c int diff -aurp old/cipher.h new/cipher.h ---- old/cipher.h 2018-03-22 16:21:14.000000000 -1000 -+++ new/cipher.h 2018-03-23 10:05:03.886621278 -1000 +--- old/cipher.h 2018-08-22 22:41:42.000000000 -0700 ++++ new/cipher.h 2018-08-23 21:31:53.327926112 -0700 @@ -46,7 +46,18 @@ #define CIPHER_DECRYPT 0 @@ -89,9 +82,9 @@ diff -aurp old/cipher.h new/cipher.h const struct sshcipher *cipher_by_name(const char *); const char *cipher_warning_message(const struct sshcipher_ctx *); diff -aurp old/configure new/configure ---- old/configure 2018-03-23 03:30:17.000000000 -1000 -+++ new/configure 2018-03-23 10:05:03.888621444 -1000 -@@ -13076,7 +13076,6 @@ if ac_fn_c_try_run "$LINENO"; then : +--- old/configure 2018-08-23 00:09:30.000000000 -0700 ++++ new/configure 2018-08-23 21:31:53.331259457 -0700 +@@ -13032,7 +13032,6 @@ if ac_fn_c_try_run "$LINENO"; then : 100*) ;; # 1.0.x 200*) ;; # LibreSSL *) @@ -100,9 +93,9 @@ diff -aurp old/configure new/configure esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5 diff -aurp old/dh.c new/dh.c ---- old/dh.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/dh.c 2018-03-23 10:05:03.888621444 -1000 -@@ -211,14 +211,15 @@ choose_dh(int min, int wantbits, int max +--- old/dh.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/dh.c 2018-08-23 21:39:18.863765579 -0700 +@@ -216,14 +216,15 @@ choose_dh(int min, int wantbits, int max /* diffie-hellman-groupN-sha1 */ int @@ -120,7 +113,7 @@ diff -aurp old/dh.c new/dh.c logit("invalid public DH value: negative"); return 0; } -@@ -231,7 +232,8 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) +@@ -236,7 +237,8 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) error("%s: BN_new failed", __func__); return 0; } @@ -130,7 +123,7 @@ diff -aurp old/dh.c new/dh.c BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */ BN_clear_free(tmp); logit("invalid public DH value: >= p-1"); -@@ -242,14 +244,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) +@@ -247,14 +249,14 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) for (i = 0; i <= n; i++) if (BN_is_bit_set(dh_pub, i)) bits_set++; @@ -147,7 +140,7 @@ diff -aurp old/dh.c new/dh.c return 0; } return 1; -@@ -259,9 +261,13 @@ int +@@ -264,9 +266,13 @@ int dh_gen_key(DH *dh, int need) { int pbits; @@ -163,7 +156,7 @@ diff -aurp old/dh.c new/dh.c need > INT_MAX / 2 || 2 * need > pbits) return SSH_ERR_INVALID_ARGUMENT; if (need < 256) -@@ -270,10 +276,13 @@ dh_gen_key(DH *dh, int need) +@@ -275,11 +281,13 @@ dh_gen_key(DH *dh, int need) * Pollard Rho, Big step/Little Step attacks are O(sqrt(n)), * so double requested need here. */ @@ -171,6 +164,7 @@ diff -aurp old/dh.c new/dh.c - if (DH_generate_key(dh) == 0 || - !dh_pub_is_valid(dh, dh->pub_key)) { - BN_clear_free(dh->priv_key); +- dh->priv_key = NULL; + DH_set_length(dh, MIN(need * 2, pbits - 1)); + if (DH_generate_key(dh) == 0) { + return SSH_ERR_LIBCRYPTO_ERROR; @@ -181,7 +175,7 @@ diff -aurp old/dh.c new/dh.c return SSH_ERR_LIBCRYPTO_ERROR; } return 0; -@@ -282,16 +291,27 @@ dh_gen_key(DH *dh, int need) +@@ -288,16 +296,27 @@ dh_gen_key(DH *dh, int need) DH * dh_new_group_asc(const char *gen, const char *modulus) { @@ -216,7 +210,7 @@ diff -aurp old/dh.c new/dh.c } /* -@@ -306,8 +326,8 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulu +@@ -312,8 +331,8 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulu if ((dh = DH_new()) == NULL) return NULL; @@ -228,8 +222,8 @@ diff -aurp old/dh.c new/dh.c return (dh); } diff -aurp old/dh.h new/dh.h ---- old/dh.h 2018-03-22 16:21:14.000000000 -1000 -+++ new/dh.h 2018-03-23 10:05:03.889621527 -1000 +--- old/dh.h 2018-08-22 22:41:42.000000000 -0700 ++++ new/dh.h 2018-08-23 21:31:53.331259457 -0700 @@ -42,7 +42,7 @@ DH *dh_new_group18(void); DH *dh_new_group_fallback(int); @@ -240,8 +234,8 @@ diff -aurp old/dh.h new/dh.h u_int dh_estimate(int); diff -aurp old/digest-openssl.c new/digest-openssl.c ---- old/digest-openssl.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/digest-openssl.c 2018-03-23 10:05:03.889621527 -1000 +--- old/digest-openssl.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/digest-openssl.c 2018-08-23 21:31:53.331259457 -0700 @@ -43,7 +43,7 @@ struct ssh_digest_ctx { @@ -314,8 +308,8 @@ diff -aurp old/digest-openssl.c new/digest-openssl.c free(ctx); } diff -aurp old/kexdhc.c new/kexdhc.c ---- old/kexdhc.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexdhc.c 2018-03-23 10:05:03.889621527 -1000 +--- old/kexdhc.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexdhc.c 2018-08-23 21:31:53.331259457 -0700 @@ -81,11 +81,16 @@ kexdh_client(struct ssh *ssh) goto out; } @@ -363,8 +357,8 @@ diff -aurp old/kexdhc.c new/kexdhc.c if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) != 0) diff -aurp old/kexdhs.c new/kexdhs.c ---- old/kexdhs.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexdhs.c 2018-03-23 10:58:58.126733207 -1000 +--- old/kexdhs.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexdhs.c 2018-08-23 21:36:50.600564263 -0700 @@ -163,6 +163,9 @@ input_kex_dh_init(int type, u_int32_t se goto out; /* calc H */ @@ -390,10 +384,10 @@ diff -aurp old/kexdhs.c new/kexdhs.c /* save session id := H */ if (kex->session_id == NULL) { -@@ -195,12 +200,17 @@ input_kex_dh_init(int type, u_int32_t se +@@ -195,12 +200,16 @@ input_kex_dh_init(int type, u_int32_t se /* destroy_sensitive_data(); */ - /* send server hostkey, DH pubkey 'f' and singed H */ + /* send server hostkey, DH pubkey 'f' and signed H */ + { + const BIGNUM *pub_key; + DH_get0_key(kex->dh, &pub_key, NULL); @@ -402,17 +396,15 @@ diff -aurp old/kexdhs.c new/kexdhs.c - (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ + (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ (r = sshpkt_put_string(ssh, signature, slen)) != 0 || -- (r = sshpkt_send(ssh)) != 0) -+ (r = sshpkt_send(ssh)) != 0) { + (r = sshpkt_send(ssh)) != 0) goto out; -+ } + } if ((r = kex_derive_keys_bn(ssh, hash, hashlen, shared_secret)) == 0) r = kex_send_newkeys(ssh); diff -aurp old/kexgexc.c new/kexgexc.c ---- old/kexgexc.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexgexc.c 2018-03-23 11:00:00.132866201 -1000 +--- old/kexgexc.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexgexc.c 2018-08-23 21:31:53.331259457 -0700 @@ -118,11 +118,17 @@ input_kex_dh_gex_group(int type, u_int32 p = g = NULL; /* belong to kex->dh now */ @@ -465,8 +457,8 @@ diff -aurp old/kexgexc.c new/kexgexc.c if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) != 0) diff -aurp old/kexgexs.c new/kexgexs.c ---- old/kexgexs.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/kexgexs.c 2018-03-23 11:03:06.045049721 -1000 +--- old/kexgexs.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/kexgexs.c 2018-08-23 21:36:11.493972372 -0700 @@ -101,11 +101,16 @@ input_kex_dh_gex_request(int type, u_int goto out; } @@ -516,10 +508,10 @@ diff -aurp old/kexgexs.c new/kexgexs.c /* save session id := H */ if (kex->session_id == NULL) { -@@ -225,12 +236,17 @@ input_kex_dh_gex_init(int type, u_int32_ +@@ -225,12 +236,16 @@ input_kex_dh_gex_init(int type, u_int32_ /* destroy_sensitive_data(); */ - /* send server hostkey, DH pubkey 'f' and singed H */ + /* send server hostkey, DH pubkey 'f' and signed H */ + { + const BIGNUM *pub_key; + DH_get0_key(kex->dh, &pub_key, NULL); @@ -528,35 +520,33 @@ diff -aurp old/kexgexs.c new/kexgexs.c - (r = sshpkt_put_bignum2(ssh, kex->dh->pub_key)) != 0 || /* f */ + (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 || /* f */ (r = sshpkt_put_string(ssh, signature, slen)) != 0 || -- (r = sshpkt_send(ssh)) != 0) -+ (r = sshpkt_send(ssh)) != 0) { + (r = sshpkt_send(ssh)) != 0) goto out; -+ } + } if ((r = kex_derive_keys_bn(ssh, hash, hashlen, shared_secret)) == 0) r = kex_send_newkeys(ssh); diff -aurp old/monitor.c new/monitor.c ---- old/monitor.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/monitor.c 2018-03-23 10:05:03.890621610 -1000 -@@ -595,10 +595,12 @@ mm_answer_moduli(int sock, Buffer *m) - buffer_put_char(m, 0); +--- old/monitor.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/monitor.c 2018-08-23 21:34:14.594343260 -0700 +@@ -589,10 +589,12 @@ mm_answer_moduli(int sock, struct sshbuf + fatal("%s: buffer error: %s", __func__, ssh_err(r)); return (0); } else { + const BIGNUM *p, *g; + DH_get0_pqg(dh, &p, NULL, &g); /* Send first bignum */ - buffer_put_char(m, 1); -- buffer_put_bignum2(m, dh->p); -- buffer_put_bignum2(m, dh->g); -+ buffer_put_bignum2(m, p); -+ buffer_put_bignum2(m, g); + if ((r = sshbuf_put_u8(m, 1)) != 0 || +- (r = sshbuf_put_bignum2(m, dh->p)) != 0 || +- (r = sshbuf_put_bignum2(m, dh->g)) != 0) ++ (r = sshbuf_put_bignum2(m, p)) != 0 || ++ (r = sshbuf_put_bignum2(m, g)) != 0) + fatal("%s: buffer error: %s", __func__, ssh_err(r)); DH_free(dh); - } diff -aurp old/openbsd-compat/openssl-compat.c new/openbsd-compat/openssl-compat.c ---- old/openbsd-compat/openssl-compat.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/openbsd-compat/openssl-compat.c 2018-03-23 10:05:03.890621610 -1000 +--- old/openbsd-compat/openssl-compat.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/openbsd-compat/openssl-compat.c 2018-08-23 21:31:53.334592801 -0700 @@ -75,7 +75,6 @@ ssh_OpenSSL_add_all_algorithms(void) /* Enable use of crypto hardware */ ENGINE_load_builtin_engines(); @@ -566,8 +556,8 @@ diff -aurp old/openbsd-compat/openssl-compat.c new/openbsd-compat/openssl-compat #endif diff -aurp old/regress/unittests/sshkey/test_file.c new/regress/unittests/sshkey/test_file.c ---- old/regress/unittests/sshkey/test_file.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/regress/unittests/sshkey/test_file.c 2018-03-23 10:05:03.890621610 -1000 +--- old/regress/unittests/sshkey/test_file.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/regress/unittests/sshkey/test_file.c 2018-08-23 21:31:53.334592801 -0700 @@ -60,9 +60,14 @@ sshkey_file_tests(void) a = load_bignum("rsa_1.param.n"); b = load_bignum("rsa_1.param.p"); @@ -605,8 +595,8 @@ diff -aurp old/regress/unittests/sshkey/test_file.c new/regress/unittests/sshkey BN_free(b); BN_free(c); diff -aurp old/regress/unittests/sshkey/test_sshkey.c new/regress/unittests/sshkey/test_sshkey.c ---- old/regress/unittests/sshkey/test_sshkey.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/regress/unittests/sshkey/test_sshkey.c 2018-03-23 10:05:03.890621610 -1000 +--- old/regress/unittests/sshkey/test_sshkey.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/regress/unittests/sshkey/test_sshkey.c 2018-08-23 21:31:53.334592801 -0700 @@ -197,9 +197,14 @@ sshkey_tests(void) k1 = sshkey_new(KEY_RSA); ASSERT_PTR_NE(k1, NULL); @@ -745,8 +735,8 @@ diff -aurp old/regress/unittests/sshkey/test_sshkey.c new/regress/unittests/sshk TEST_START("equal KEY_DSA/demoted KEY_DSA"); diff -aurp old/ssh-dss.c new/ssh-dss.c ---- old/ssh-dss.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-dss.c 2018-03-23 10:05:03.891621693 -1000 +--- old/ssh-dss.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-dss.c 2018-08-23 21:31:53.334592801 -0700 @@ -53,6 +53,7 @@ ssh_dss_sign(const struct sshkey *key, u DSA_SIG *sig = NULL; u_char digest[SSH_DIGEST_MAX_LENGTH], sigblob[SIGBLOB_LEN]; @@ -808,8 +798,8 @@ diff -aurp old/ssh-dss.c new/ssh-dss.c /* sha1 the data */ if ((ret = ssh_digest_memory(SSH_DIGEST_SHA1, data, datalen, diff -aurp old/ssh-ecdsa.c new/ssh-ecdsa.c ---- old/ssh-ecdsa.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-ecdsa.c 2018-03-23 10:05:03.891621693 -1000 +--- old/ssh-ecdsa.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-ecdsa.c 2018-08-23 21:31:53.334592801 -0700 @@ -80,9 +80,14 @@ ssh_ecdsa_sign(const struct sshkey *key, ret = SSH_ERR_ALLOC_FAIL; goto out; @@ -858,9 +848,9 @@ diff -aurp old/ssh-ecdsa.c new/ssh-ecdsa.c ret = SSH_ERR_UNEXPECTED_TRAILING_DATA; goto out; diff -aurp old/ssh-keygen.c new/ssh-keygen.c ---- old/ssh-keygen.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-keygen.c 2018-03-23 10:05:03.891621693 -1000 -@@ -493,11 +493,33 @@ do_convert_private_ssh2_from_blob(u_char +--- old/ssh-keygen.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-keygen.c 2018-08-23 21:31:53.334592801 -0700 +@@ -494,11 +494,33 @@ do_convert_private_ssh2_from_blob(u_char switch (key->type) { case KEY_DSA: @@ -899,7 +889,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c break; case KEY_RSA: if ((r = sshbuf_get_u8(b, &e1)) != 0 || -@@ -514,16 +536,52 @@ do_convert_private_ssh2_from_blob(u_char +@@ -515,16 +537,52 @@ do_convert_private_ssh2_from_blob(u_char e += e3; debug("e %lx", e); } @@ -958,7 +948,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c if ((r = ssh_rsa_generate_additional_parameters(key)) != 0) fatal("generate RSA parameters failed: %s", ssh_err(r)); break; -@@ -633,7 +691,7 @@ do_convert_from_pkcs8(struct sshkey **k, +@@ -634,7 +692,7 @@ do_convert_from_pkcs8(struct sshkey **k, identity_file); } fclose(fp); @@ -967,7 +957,7 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c case EVP_PKEY_RSA: if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) fatal("sshkey_new failed"); -@@ -657,7 +715,7 @@ do_convert_from_pkcs8(struct sshkey **k, +@@ -658,7 +716,7 @@ do_convert_from_pkcs8(struct sshkey **k, #endif default: fatal("%s: unsupported pubkey type %d", __func__, @@ -977,9 +967,9 @@ diff -aurp old/ssh-keygen.c new/ssh-keygen.c EVP_PKEY_free(pubkey); return; diff -aurp old/ssh-pkcs11-client.c new/ssh-pkcs11-client.c ---- old/ssh-pkcs11-client.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-pkcs11-client.c 2018-03-23 10:05:03.892621777 -1000 -@@ -144,12 +144,13 @@ pkcs11_rsa_private_encrypt(int flen, con +--- old/ssh-pkcs11-client.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-pkcs11-client.c 2018-08-23 21:31:53.334592801 -0700 +@@ -156,12 +156,13 @@ pkcs11_rsa_private_encrypt(int flen, con static int wrap_key(RSA *rsa) { @@ -999,8 +989,8 @@ diff -aurp old/ssh-pkcs11-client.c new/ssh-pkcs11-client.c } diff -aurp old/ssh-pkcs11.c new/ssh-pkcs11.c ---- old/ssh-pkcs11.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-pkcs11.c 2018-03-23 10:05:03.892621777 -1000 +--- old/ssh-pkcs11.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-pkcs11.c 2018-08-23 21:31:53.334592801 -0700 @@ -67,7 +67,7 @@ struct pkcs11_key { struct pkcs11_provider *provider; CK_ULONG slotidx; @@ -1090,9 +1080,9 @@ diff -aurp old/ssh-pkcs11.c new/ssh-pkcs11.c free(attribs[i].pValue); } diff -aurp old/ssh-rsa.c new/ssh-rsa.c ---- old/ssh-rsa.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/ssh-rsa.c 2018-03-23 10:05:03.892621777 -1000 -@@ -84,7 +84,6 @@ ssh_rsa_generate_additional_parameters(s +--- old/ssh-rsa.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/ssh-rsa.c 2018-08-23 21:31:53.334592801 -0700 +@@ -108,7 +108,6 @@ ssh_rsa_generate_additional_parameters(s { BIGNUM *aux = NULL; BN_CTX *ctx = NULL; @@ -1100,7 +1090,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c int r; if (key == NULL || key->rsa == NULL || -@@ -99,16 +98,27 @@ ssh_rsa_generate_additional_parameters(s +@@ -123,16 +122,27 @@ ssh_rsa_generate_additional_parameters(s } BN_set_flags(aux, BN_FLG_CONSTTIME); @@ -1135,7 +1125,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c r = 0; out: BN_clear_free(aux); -@@ -139,7 +149,7 @@ ssh_rsa_sign(const struct sshkey *key, u +@@ -163,7 +173,7 @@ ssh_rsa_sign(const struct sshkey *key, u if (key == NULL || key->rsa == NULL || hash_alg == -1 || sshkey_type_plain(key->type) != KEY_RSA) return SSH_ERR_INVALID_ARGUMENT; @@ -1144,7 +1134,7 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c return SSH_ERR_KEY_LENGTH; slen = RSA_size(key->rsa); if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM) -@@ -211,7 +221,7 @@ ssh_rsa_verify(const struct sshkey *key, +@@ -235,7 +245,7 @@ ssh_rsa_verify(const struct sshkey *key, sshkey_type_plain(key->type) != KEY_RSA || sig == NULL || siglen == 0) return SSH_ERR_INVALID_ARGUMENT; @@ -1154,9 +1144,9 @@ diff -aurp old/ssh-rsa.c new/ssh-rsa.c if ((b = sshbuf_from(sig, siglen)) == NULL) diff -aurp old/sshkey.c new/sshkey.c ---- old/sshkey.c 2018-03-22 16:21:14.000000000 -1000 -+++ new/sshkey.c 2018-03-23 10:05:03.893621860 -1000 -@@ -274,10 +274,18 @@ sshkey_size(const struct sshkey *k) +--- old/sshkey.c 2018-08-22 22:41:42.000000000 -0700 ++++ new/sshkey.c 2018-08-23 21:31:53.334592801 -0700 +@@ -292,10 +292,18 @@ sshkey_size(const struct sshkey *k) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1176,7 +1166,7 @@ diff -aurp old/sshkey.c new/sshkey.c case KEY_ECDSA: case KEY_ECDSA_CERT: return sshkey_curve_nid_to_bits(k->ecdsa_nid); -@@ -482,26 +490,53 @@ sshkey_new(int type) +@@ -500,26 +508,53 @@ sshkey_new(int type) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1236,7 +1226,7 @@ diff -aurp old/sshkey.c new/sshkey.c k->dsa = dsa; break; case KEY_ECDSA: -@@ -539,6 +574,51 @@ sshkey_add_private(struct sshkey *k) +@@ -557,6 +592,51 @@ sshkey_add_private(struct sshkey *k) #ifdef WITH_OPENSSL case KEY_RSA: case KEY_RSA_CERT: @@ -1288,7 +1278,7 @@ diff -aurp old/sshkey.c new/sshkey.c #define bn_maybe_alloc_failed(p) (p == NULL && (p = BN_new()) == NULL) if (bn_maybe_alloc_failed(k->rsa->d) || bn_maybe_alloc_failed(k->rsa->iqmp) || -@@ -547,13 +627,28 @@ sshkey_add_private(struct sshkey *k) +@@ -565,13 +645,28 @@ sshkey_add_private(struct sshkey *k) bn_maybe_alloc_failed(k->rsa->dmq1) || bn_maybe_alloc_failed(k->rsa->dmp1)) return SSH_ERR_ALLOC_FAIL; @@ -1317,7 +1307,7 @@ diff -aurp old/sshkey.c new/sshkey.c case KEY_ECDSA: case KEY_ECDSA_CERT: /* Cannot do anything until we know the group */ -@@ -677,16 +772,34 @@ sshkey_equal_public(const struct sshkey +@@ -695,16 +790,34 @@ sshkey_equal_public(const struct sshkey #ifdef WITH_OPENSSL case KEY_RSA_CERT: case KEY_RSA: @@ -1360,7 +1350,7 @@ diff -aurp old/sshkey.c new/sshkey.c # ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: case KEY_ECDSA: -@@ -775,12 +888,17 @@ to_blob_buf(const struct sshkey *key, st +@@ -793,12 +906,17 @@ to_blob_buf(const struct sshkey *key, st case KEY_DSA: if (key->dsa == NULL) return SSH_ERR_INVALID_ARGUMENT; @@ -1382,7 +1372,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -796,10 +914,14 @@ to_blob_buf(const struct sshkey *key, st +@@ -814,10 +932,14 @@ to_blob_buf(const struct sshkey *key, st case KEY_RSA: if (key->rsa == NULL) return SSH_ERR_INVALID_ARGUMENT; @@ -1399,7 +1389,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519: -@@ -1740,13 +1862,32 @@ sshkey_from_private(const struct sshkey +@@ -1758,13 +1880,32 @@ sshkey_from_private(const struct sshkey case KEY_DSA_CERT: if ((n = sshkey_new(k->type)) == NULL) return SSH_ERR_ALLOC_FAIL; @@ -1436,7 +1426,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -1770,11 +1911,23 @@ sshkey_from_private(const struct sshkey +@@ -1788,11 +1929,23 @@ sshkey_from_private(const struct sshkey case KEY_RSA_CERT: if ((n = sshkey_new(k->type)) == NULL) return SSH_ERR_ALLOC_FAIL; @@ -1462,7 +1452,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519: -@@ -1995,12 +2148,27 @@ sshkey_from_blob_internal(struct sshbuf +@@ -2013,12 +2166,27 @@ sshkey_from_blob_internal(struct sshbuf ret = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1493,7 +1483,7 @@ diff -aurp old/sshkey.c new/sshkey.c ret = SSH_ERR_KEY_LENGTH; goto out; } -@@ -2020,13 +2188,36 @@ sshkey_from_blob_internal(struct sshbuf +@@ -2038,13 +2206,36 @@ sshkey_from_blob_internal(struct sshbuf ret = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1534,7 +1524,7 @@ diff -aurp old/sshkey.c new/sshkey.c #ifdef DEBUG_PK DSA_print_fp(stderr, key->dsa, 8); #endif -@@ -2327,26 +2518,63 @@ sshkey_demote(const struct sshkey *k, st +@@ -2389,26 +2580,63 @@ sshkey_demote(const struct sshkey *k, st goto fail; /* FALLTHROUGH */ case KEY_RSA: @@ -1606,7 +1596,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; case KEY_ECDSA_CERT: if ((ret = sshkey_cert_copy(k, pk)) != 0) -@@ -2496,11 +2724,17 @@ sshkey_certify_custom(struct sshkey *k, +@@ -2558,11 +2786,17 @@ sshkey_certify_custom(struct sshkey *k, switch (k->type) { #ifdef WITH_OPENSSL case KEY_DSA_CERT: @@ -1628,7 +1618,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: -@@ -2513,9 +2747,15 @@ sshkey_certify_custom(struct sshkey *k, +@@ -2575,9 +2809,15 @@ sshkey_certify_custom(struct sshkey *k, break; # endif /* OPENSSL_HAS_ECC */ case KEY_RSA_CERT: @@ -1646,7 +1636,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; #endif /* WITH_OPENSSL */ case KEY_ED25519_CERT: -@@ -2702,42 +2942,67 @@ sshkey_private_serialize_opt(const struc +@@ -2764,42 +3004,67 @@ sshkey_private_serialize_opt(const struc switch (key->type) { #ifdef WITH_OPENSSL case KEY_RSA: @@ -1730,7 +1720,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -2851,18 +3116,61 @@ sshkey_private_deserialize(struct sshbuf +@@ -2913,18 +3178,61 @@ sshkey_private_deserialize(struct sshbuf r = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1799,7 +1789,7 @@ diff -aurp old/sshkey.c new/sshkey.c break; # ifdef OPENSSL_HAS_ECC case KEY_ECDSA: -@@ -2921,29 +3229,104 @@ sshkey_private_deserialize(struct sshbuf +@@ -2983,29 +3291,104 @@ sshkey_private_deserialize(struct sshbuf r = SSH_ERR_ALLOC_FAIL; goto out; } @@ -1918,7 +1908,7 @@ diff -aurp old/sshkey.c new/sshkey.c r = SSH_ERR_KEY_LENGTH; goto out; } -@@ -3707,7 +4090,6 @@ translate_libcrypto_error(unsigned long +@@ -3769,7 +4152,6 @@ translate_libcrypto_error(unsigned long switch (pem_reason) { case EVP_R_BAD_DECRYPT: return SSH_ERR_KEY_WRONG_PASSPHRASE; @@ -1926,7 +1916,7 @@ diff -aurp old/sshkey.c new/sshkey.c case EVP_R_DECODE_ERROR: #ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR case EVP_R_PRIVATE_KEY_DECODE_ERROR: -@@ -3772,7 +4154,7 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3834,7 +4216,7 @@ sshkey_parse_private_pem_fileblob(struct r = convert_libcrypto_error(); goto out; } @@ -1935,7 +1925,7 @@ diff -aurp old/sshkey.c new/sshkey.c (type == KEY_UNSPEC || type == KEY_RSA)) { if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { r = SSH_ERR_ALLOC_FAIL; -@@ -3787,11 +4169,11 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3849,11 +4231,11 @@ sshkey_parse_private_pem_fileblob(struct r = SSH_ERR_LIBCRYPTO_ERROR; goto out; } @@ -1949,7 +1939,7 @@ diff -aurp old/sshkey.c new/sshkey.c (type == KEY_UNSPEC || type == KEY_DSA)) { if ((prv = sshkey_new(KEY_UNSPEC)) == NULL) { r = SSH_ERR_ALLOC_FAIL; -@@ -3803,7 +4185,7 @@ sshkey_parse_private_pem_fileblob(struct +@@ -3865,7 +4247,7 @@ sshkey_parse_private_pem_fileblob(struct DSA_print_fp(stderr, prv->dsa, 8); #endif #ifdef OPENSSL_HAS_ECC hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e9924988d14651d8a616e9af09b3959b465b1dc7
by Michael Tremer 20 Sep '18

20 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via e9924988d14651d8a616e9af09b3959b465b1dc7 (commit) from 902ce59339c2ff628212277ac4cb35b9756899ec (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 e9924988d14651d8a616e9af09b3959b465b1dc7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 20 10:21:47 2018 +0100 kernel: Update to 4.14.71 Notable changes are removal of ISDN, and setting CONFIG_DEFAULT_MMAP_MIN_ADDR to 64k. Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: kernel/config-arm-generic | 22 +++-- kernel/config-arm32-generic | 39 +++++--- kernel/config-arm64-generic | 34 ++++--- kernel/config-generic | 224 ++++++++++++++++---------------------------- kernel/config-x86-generic | 57 +++++------ kernel/kernel.nm | 4 +- 6 files changed, 172 insertions(+), 208 deletions(-) Difference in files: diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index f72679ba7..65f8848f7 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -61,7 +61,6 @@ CONFIG_PCI_HOST_GENERIC=y # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_HW_PERF_EVENTS=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_ARCH_WANTS_THP_SWAP is not set # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set @@ -104,6 +103,7 @@ CONFIG_ARM_AMBA=y # # Generic Driver Options # +CONFIG_SOC_BUS=y CONFIG_DMA_CMA=y # @@ -137,7 +137,6 @@ CONFIG_OF_RESERVED_MEM=y # Protocols # # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set -# CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_SX8 is not set @@ -196,6 +195,8 @@ CONFIG_HNS_MDIO=m CONFIG_HNS=m CONFIG_HNS_DSAF=m CONFIG_HNS_ENET=m +CONFIG_HNS3=m +CONFIG_HNS3_HCLGE=m # CONFIG_SKGE_GENESIS is not set CONFIG_8139TOO_PIO=y # CONFIG_8139TOO_8129 is not set @@ -226,6 +227,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m # CONFIG_INPUT_TWL4030_VIBRA is not set # CONFIG_INPUT_TWL6040_VIBRA is not set # CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set # # Hardware I/O ports @@ -278,8 +280,6 @@ CONFIG_I2C_SIS630=m # # I2C system bus drivers (mostly embedded / system-on-chip) # -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_MESON=m CONFIG_I2C_VERSATILE=m @@ -353,17 +353,14 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_VEXPRESS=m +# CONFIG_IR_MESON is not set +# CONFIG_IR_PWM_TX is not set # # Multimedia core support # # CONFIG_TTPCI_EEPROM is not set -# -# Media drivers -# -# CONFIG_IR_MESON is not set - # # Digital TV USB devices # @@ -515,6 +512,7 @@ CONFIG_SND_SOC_CS4271=m CONFIG_SND_SOC_CS4271_I2C=m CONFIG_SND_SOC_CS42XX8=m CONFIG_SND_SOC_CS42XX8_I2C=m +CONFIG_SND_SOC_CS43130=m CONFIG_SND_SOC_CS4349=m CONFIG_SND_SOC_CS53L30=m CONFIG_SND_SOC_DIO2125=m @@ -565,6 +563,7 @@ CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_WM8510=m CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8524=m CONFIG_SND_SOC_WM8580=m CONFIG_SND_SOC_WM8711=m CONFIG_SND_SOC_WM8728=m @@ -675,6 +674,11 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set CONFIG_IOMMU_DMA=y +# +# Amlogic SoC drivers +# +CONFIG_MESON_GX_SOCINFO=y + # # Extcon Device Drivers # diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 88dd345ae..28631e1fa 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -434,8 +434,8 @@ CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y # CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set CONFIG_ARM_EXYNOS5440_CPUFREQ=y CONFIG_ARM_HIGHBANK_CPUFREQ=m -CONFIG_ARM_DB8500_CPUFREQ=y CONFIG_ARM_IMX6Q_CPUFREQ=m +CONFIG_ARM_MEDIATEK_CPUFREQ=m CONFIG_ARM_OMAP2PLUS_CPUFREQ=y CONFIG_ARM_STI_CPUFREQ=m CONFIG_ARM_TEGRA20_CPUFREQ=y @@ -484,7 +484,6 @@ CONFIG_TEGRA_AHB=y # Generic Driver Options # CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -CONFIG_SOC_BUS=y # # Bus devices @@ -523,6 +522,7 @@ CONFIG_AHCI_BRCM=m CONFIG_AHCI_DM816=m CONFIG_AHCI_ST=m CONFIG_AHCI_IMX=m +CONFIG_AHCI_MTK=m CONFIG_AHCI_SUNXI=m CONFIG_AHCI_TEGRA=m @@ -655,6 +655,7 @@ CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_IPROC_RNG200=m CONFIG_HW_RANDOM_OMAP=y CONFIG_HW_RANDOM_OMAP3_ROM=y +CONFIG_HW_RANDOM_IMX_RNGC=m CONFIG_HW_RANDOM_HISI=y CONFIG_HW_RANDOM_MSM=m CONFIG_HW_RANDOM_ST=m @@ -673,6 +674,8 @@ CONFIG_I2C_BCM_IPROC=m # CONFIG_I2C_BRCMSTB is not set # CONFIG_I2C_CADENCE is not set CONFIG_I2C_DAVINCI=m +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_EXYNOS5=m CONFIG_I2C_IMX=m CONFIG_I2C_IMX_LPI2C=m @@ -784,7 +787,7 @@ CONFIG_PINCTRL_TEGRA30=y CONFIG_PINCTRL_TEGRA114=y CONFIG_PINCTRL_TEGRA124=y CONFIG_PINCTRL_TEGRA_XUSB=y -CONFIG_PINCTRL_TI_IODELAY=m +CONFIG_PINCTRL_TI_IODELAY=y # CONFIG_PINCTRL_WM8850 is not set CONFIG_PINCTRL_MTK=y # CONFIG_PINCTRL_MT2701 is not set @@ -941,10 +944,7 @@ CONFIG_REGULATOR_QCOM_RPM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_TI_ABB=m CONFIG_REGULATOR_TWL4030=y - -# -# Media drivers -# +CONFIG_CEC_PIN=y CONFIG_IR_MTK=m CONFIG_IR_RX51=m # CONFIG_RC_ST is not set @@ -955,6 +955,7 @@ CONFIG_IR_SUNXI=m # CONFIG_VIDEO_OMAP3=m # CONFIG_VIDEO_OMAP3_DEBUG is not set +# CONFIG_VIDEO_QCOM_CAMSS is not set # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set # CONFIG_VIDEO_AM437X_VPFE is not set # CONFIG_VIDEO_TI_CAL is not set @@ -1028,6 +1029,7 @@ CONFIG_DRM_ARMADA=m CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I_HDMI=m +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_OMAP=m @@ -1080,7 +1082,9 @@ CONFIG_DRM_ANALOGIX_DP=m # CONFIG_DRM_STI is not set # CONFIG_DRM_IMX is not set CONFIG_DRM_VC4=m +CONFIG_DRM_VC4_HDMI_CEC=y CONFIG_DRM_ETNAVIV=m +CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set CONFIG_DRM_MEDIATEK=m CONFIG_DRM_MEDIATEK_HDMI=m @@ -1331,11 +1335,6 @@ CONFIG_ST_FDMA=m # CONFIG_TI_EDMA is not set # CONFIG_QCOM_BAM_DMA is not set -# -# DMABUF options -# -# CONFIG_ARM_CHARLCD is not set - # # Microsoft Hyper-V guest support # @@ -1397,6 +1396,7 @@ CONFIG_MSM_MMCC_8996=m CONFIG_COMMON_CLK_SAMSUNG=y CONFIG_EXYNOS_AUDSS_CLK_CON=y CONFIG_SUNXI_CCU=y +CONFIG_SUN4I_A10_CCU=y CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y @@ -1405,6 +1405,7 @@ CONFIG_SUN8I_A83T_CCU=y CONFIG_SUN8I_H3_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN8I_DE2_CCU=y +CONFIG_SUN8I_R40_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_TEGRA_CLK_EMC=y @@ -1462,11 +1463,13 @@ CONFIG_ROCKCHIP_IOMMU=y CONFIG_ARM_SMMU=y CONFIG_MTK_IOMMU=y CONFIG_MTK_IOMMU_V1=y +CONFIG_QCOM_IOMMU=y # # Remoteproc drivers # CONFIG_REMOTEPROC=m +CONFIG_IMX_REMOTEPROC=m CONFIG_OMAP_REMOTEPROC=m CONFIG_WKUP_M3_RPROC=m CONFIG_KEYSTONE_REMOTEPROC=m @@ -1482,6 +1485,7 @@ CONFIG_ST_SLIM_REMOTEPROC=m # CONFIG_RPMSG=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set CONFIG_RPMSG_QCOM_SMD=m CONFIG_RPMSG_VIRTIO=m @@ -1497,6 +1501,11 @@ CONFIG_FSL_GUTS=y # CONFIG_MTK_INFRACFG is not set # CONFIG_MTK_PMIC_WRAP is not set # CONFIG_MTK_SCPSYS is not set + +# +# Qualcomm SoC drivers +# +# CONFIG_QCOM_GLINK_SSR is not set CONFIG_QCOM_GSBI=m CONFIG_QCOM_MDT_LOADER=m CONFIG_QCOM_PM=y @@ -1516,6 +1525,7 @@ CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y +CONFIG_SOC_TEGRA_FUSE=y CONFIG_SOC_TEGRA_FLOWCTRL=y CONFIG_SOC_TEGRA_PMC=y # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set @@ -1611,7 +1621,6 @@ CONFIG_COMMON_RESET_HI6220=m # # PHY Subsystem # -CONFIG_PHY_MT65XX_USB3=m CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN9I_USB=m CONFIG_PHY_BCM_NS_USB2=m @@ -1622,6 +1631,7 @@ CONFIG_PHY_BRCM_SATA=y CONFIG_PHY_HIX5HD2_SATA=m CONFIG_PHY_BERLIN_SATA=m CONFIG_PHY_BERLIN_USB=m +CONFIG_PHY_MTK_TPHY=m CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_QCOM_IPQ806X_SATA=m CONFIG_PHY_QCOM_QMP=m @@ -1699,6 +1709,7 @@ CONFIG_PROC_VMCORE=y # # RCU Debugging # +# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # @@ -1729,7 +1740,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m -CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m CONFIG_CRYPTO_DEV_OMAP=m @@ -1744,6 +1754,7 @@ CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_MXS_DCP=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_SUN4I_SS=m +CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_MEDIATEK=m CONFIG_CRYPTO_DEV_BCM_SPU=m diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index d256fe654..7e4fd31ab 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -36,6 +36,7 @@ CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_MMAP_RND_BITS=27 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_VMAP_STACK=y # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set @@ -107,6 +108,7 @@ CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -115,6 +117,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y +CONFIG_QCOM_FALKOR_ERRATUM_E1041=y # CONFIG_ARM64_4K_PAGES is not set # CONFIG_ARM64_16K_PAGES is not set CONFIG_ARM64_64K_PAGES=y @@ -149,6 +152,9 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_CRASH_DUMP is not set CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -167,6 +173,7 @@ CONFIG_ARM64_VHE=y # ARMv8.2 architectural features # CONFIG_ARM64_UAO=y +# CONFIG_ARM64_PMEM is not set CONFIG_ARM64_MODULE_CMODEL_LARGE=y CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y @@ -198,7 +205,6 @@ CONFIG_SYSVIPC_COMPAT=y # CPU frequency scaling drivers # CONFIG_ARM_DT_BL_CPUFREQ=m -# CONFIG_ARM_DB8500_CPUFREQ is not set CONFIG_ACPI_CPPC_CPUFREQ=m CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -262,6 +268,7 @@ CONFIG_THUNDER_NIC_BGX=m CONFIG_THUNDER_NIC_RGX=m CONFIG_LIQUIDIO=m CONFIG_LIQUIDIO_VF=m +CONFIG_HNS3_ENET=m CONFIG_NET_SB1000=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_CAVIUM=m @@ -316,6 +323,8 @@ CONFIG_I2C_SCMI=m # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_CADENCE=m +CONFIG_I2C_DESIGNWARE_CORE=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_NOMADIK=m CONFIG_I2C_THUNDERX=m @@ -342,13 +351,6 @@ CONFIG_PINCTRL_AMD=m CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_SINGLE=m CONFIG_PINCTRL_PALMAS=m -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_PINCTRL_CHERRYVIEW=m -CONFIG_PINCTRL_INTEL=m -CONFIG_PINCTRL_BROXTON=m -CONFIG_PINCTRL_CANNONLAKE=m -CONFIG_PINCTRL_GEMINILAKE=m -CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_GPIO_ACPI=y # @@ -360,6 +362,11 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=m CONFIG_GPIO_XILINX=m +# +# MFD GPIO expanders +# +# CONFIG_GPIO_TPS68470 is not set + # # USB GPIO expanders # @@ -390,16 +397,13 @@ CONFIG_ARM_SBSA_WATCHDOG=m # # STMicroelectronics STMPE Interface Drivers # +CONFIG_MFD_TPS68470=y # CONFIG_REGULATOR_88PM8607 is not set # CONFIG_REGULATOR_GPIO is not set CONFIG_REGULATOR_HI6421V530=m # CONFIG_REGULATOR_LP872X is not set # CONFIG_REGULATOR_LP8788 is not set # CONFIG_REGULATOR_TWL4030 is not set - -# -# Media drivers -# # CONFIG_IR_ENE is not set # CONFIG_IR_ITE_CIR is not set # CONFIG_IR_FINTEK is not set @@ -523,7 +527,7 @@ CONFIG_ARM_SMMU_V3=y # CONFIG_SOC_BRCMSTB is not set # -# i.MX SoC drivers +# Qualcomm SoC drivers # # CONFIG_SUNXI_SRAM is not set @@ -607,6 +611,7 @@ CONFIG_EFI_ARMSTUB=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_DEV_PATH_PARSER is not set # @@ -709,6 +714,7 @@ CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_NITROX=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m @@ -718,7 +724,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m # Certificates for signature checking # CONFIG_ARM64_CRYPTO=y -# CONFIG_CRYPTO_SHA256_ARM64 is not set +CONFIG_CRYPTO_SHA256_ARM64=m CONFIG_CRYPTO_SHA512_ARM64=m CONFIG_CRYPTO_SHA1_ARM64_CE=m CONFIG_CRYPTO_SHA2_ARM64_CE=m diff --git a/kernel/config-generic b/kernel/config-generic index 876ef6b07..2cd712bb8 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -42,8 +42,10 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_SIM=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_GENERIC_MSI_IRQ_DOMAIN=y @@ -156,11 +158,13 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -184,6 +188,7 @@ CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set @@ -214,6 +219,7 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y CONFIG_GCC_PLUGIN_STRUCTLEAK=y +CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set CONFIG_GCC_PLUGIN_RANDSTRUCT=y CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y @@ -226,6 +232,7 @@ CONFIG_THIN_ARCHIVES=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y # CONFIG_HAVE_ARCH_HASH is not set @@ -353,6 +360,7 @@ CONFIG_MIGRATION=y CONFIG_BOUNCE=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_CLEANCACHE=y # CONFIG_FRONTSWAP is not set CONFIG_CMA=y @@ -599,14 +607,12 @@ CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y CONFIG_IPV6_SEG6_LWTUNNEL=y -CONFIG_IPV6_SEG6_INLINE=y CONFIG_IPV6_SEG6_HMAC=y # CONFIG_NETLABEL is not set CONFIG_NETWORK_SECMARK=y CONFIG_NET_PTP_CLASSIFY=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y @@ -687,6 +693,7 @@ CONFIG_NFT_FIB_INET=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_FIB_NETDEV=m CONFIG_NETFILTER_XTABLES=y # @@ -865,6 +872,9 @@ CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -872,10 +882,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m # CONFIG_IP6_NF_IPTABLES is not set CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m @@ -1049,6 +1056,7 @@ CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m CONFIG_MPLS_ROUTING=m CONFIG_MPLS_IPTUNNEL=m +# CONFIG_NET_NSH is not set # CONFIG_HSR is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y @@ -1061,6 +1069,7 @@ CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_BPF_JIT=y +# CONFIG_BPF_STREAM_PARSER is not set CONFIG_NET_FLOW_LIMIT=y # @@ -1070,7 +1079,6 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -# CONFIG_IRDA is not set CONFIG_BT=m CONFIG_BT_BREDR=y CONFIG_BT_RFCOMM=m @@ -1078,7 +1086,6 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LE=y @@ -1100,9 +1107,7 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y CONFIG_BT_HCIUART_MRVL=y @@ -1167,6 +1172,7 @@ CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y CONFIG_NET_DEVLINK=y CONFIG_MAY_USE_DEVLINK=y +CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -1696,6 +1702,7 @@ CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_SYSTEMPORT=m CONFIG_BNXT=m +CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_VENDOR_CAVIUM=y @@ -1730,6 +1737,7 @@ CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m +CONFIG_NET_VENDOR_HUAWEI=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E100=m CONFIG_E1000=m @@ -1803,6 +1811,7 @@ CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCOM_EMAC=m +# CONFIG_RMNET is not set CONFIG_NET_VENDOR_REALTEK=y CONFIG_8139CP=m CONFIG_8139TOO=m @@ -1901,6 +1910,7 @@ CONFIG_MICROSEMI_PHY=m CONFIG_NATIONAL_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m +CONFIG_ROCKCHIP_PHY=m CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_TERANETICS_PHY=m @@ -1992,15 +2002,17 @@ CONFIG_ATH9K_HWRNG=y CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y -# CONFIG_CARL9170_HWRNG is not set +CONFIG_CARL9170_HWRNG=y # CONFIG_ATH6KL is not set CONFIG_AR5523=m CONFIG_WIL6210=m CONFIG_WIL6210_ISR_COR=y +# CONFIG_WIL6210_DEBUGFS is not set CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_ATH10K_AHB=y CONFIG_ATH10K_SDIO=m +CONFIG_ATH10K_USB=m # CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set @@ -2178,93 +2190,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m # Enable WiMAX (Networking options) to see the WiMAX drivers # # CONFIG_WAN is not set -CONFIG_ISDN=y -CONFIG_ISDN_I4L=m -CONFIG_ISDN_PPP=y -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_MPP=y -CONFIG_IPPP_FILTER=y -CONFIG_ISDN_PPP_BSDCOMP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_TTY_FAX=y - -# -# ISDN feature submodules -# -CONFIG_ISDN_DIVERSION=m - -# -# ISDN4Linux hardware drivers -# - -# -# Passive cards -# -CONFIG_ISDN_DRV_HISAX=m - -# -# D-channel protocol features -# -CONFIG_HISAX_EURO=y -CONFIG_DE_AOC=y -CONFIG_HISAX_NO_SENDCOMPLETE=y -CONFIG_HISAX_NO_LLC=y -CONFIG_HISAX_NO_KEYPAD=y -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# -CONFIG_HISAX_16_3=y -# CONFIG_HISAX_TELESPCI is not set -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_NICCY=y -# CONFIG_HISAX_BKM_A4T is not set -# CONFIG_HISAX_SCT_QUADRO is not set -CONFIG_HISAX_GAZEL=y -# CONFIG_HISAX_HFC_PCI is not set -# CONFIG_HISAX_W6692 is not set -CONFIG_HISAX_HFC_SX=y -# CONFIG_HISAX_DEBUG is not set - -# -# HiSax PCMCIA card service modules -# - -# -# HiSax sub driver modules -# -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_HFCUSB=m -CONFIG_HISAX_HFC4S8S=m -# CONFIG_HISAX_FRITZ_PCIPNP is not set -CONFIG_ISDN_CAPI=m -CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPIDRV=m -CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE=y - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set -# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set -# CONFIG_ISDN_DRV_AVMB1_C4 is not set -CONFIG_CAPI_EICON=y -# CONFIG_ISDN_DIVAS is not set -# CONFIG_ISDN_DRV_GIGASET is not set -# CONFIG_HYSDN is not set -# CONFIG_MISDN is not set -CONFIG_ISDN_HDLC=m +# CONFIG_ISDN is not set CONFIG_NVM=y # CONFIG_NVM_DEBUG is not set CONFIG_NVM_RRPC=m @@ -2375,6 +2301,7 @@ CONFIG_INPUT_AXP20X_PEK=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PALMAS_PWRBUTTON=m # CONFIG_INPUT_PCF8574 is not set +CONFIG_INPUT_RK805_PWRKEY=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_DA9052_ONKEY is not set # CONFIG_INPUT_DA9055_ONKEY is not set @@ -2412,6 +2339,7 @@ CONFIG_SERIO_ALTERA_PS2=m # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_ARC_PS2=m CONFIG_SERIO_APBPS2=m +# CONFIG_SERIO_GPIO_PS2 is not set # CONFIG_USERIO is not set # CONFIG_GAMEPORT is not set @@ -2622,6 +2550,7 @@ CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL_MAX77620=m +CONFIG_PINCTRL_RK805=m CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIOLIB_IRQCHIP=y @@ -2661,6 +2590,7 @@ CONFIG_GPIO_TPIC2810=m # MFD GPIO expanders # # CONFIG_GPIO_ADP5520 is not set +# CONFIG_GPIO_BD9571MWV is not set # CONFIG_GPIO_DA9052 is not set # CONFIG_GPIO_DA9055 is not set # CONFIG_GPIO_KEMPLD is not set @@ -2832,6 +2762,7 @@ CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_IBM_CFFPS=m # CONFIG_SENSORS_IR35221 is not set CONFIG_SENSORS_LM25066=m # CONFIG_SENSORS_LTC2978 is not set @@ -2841,6 +2772,7 @@ CONFIG_SENSORS_MAX20751=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_ZL6100 is not set @@ -2985,10 +2917,6 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y @@ -3011,6 +2939,7 @@ CONFIG_PMIC_ADP5520=y CONFIG_MFD_AAT2870_CORE=y CONFIG_MFD_ATMEL_FLEXCOM=m CONFIG_MFD_BCM590XX=m +CONFIG_MFD_BD9571MWV=m CONFIG_MFD_AXP20X=m CONFIG_MFD_AXP20X_I2C=m # CONFIG_MFD_CROS_EC is not set @@ -3111,6 +3040,7 @@ CONFIG_REGULATOR_AS3711=m CONFIG_REGULATOR_AS3722=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BCM590XX=m +CONFIG_REGULATOR_BD9571MWV=m CONFIG_REGULATOR_DA903X=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m @@ -3177,6 +3107,37 @@ CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +CONFIG_RC_CORE=y +# CONFIG_RC_MAP is not set +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_DEVICES=y +# CONFIG_RC_ATI_REMOTE is not set +# CONFIG_IR_HIX5HD2 is not set +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +# CONFIG_IR_GPIO_TX is not set +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_IR_SIR=m CONFIG_MEDIA_SUPPORT=y # @@ -3187,7 +3148,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CONTROLLER=y @@ -3219,35 +3179,6 @@ CONFIG_DVB_DYNAMIC_MINORS=y # # Media drivers # -CONFIG_RC_CORE=y -# CONFIG_RC_MAP is not set -CONFIG_RC_DECODERS=y -CONFIG_LIRC=m -CONFIG_IR_LIRC_CODEC=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_XMP_DECODER=m -CONFIG_RC_DEVICES=y -# CONFIG_RC_ATI_REMOTE is not set -# CONFIG_IR_HIX5HD2 is not set -CONFIG_IR_IMON=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y -CONFIG_IR_SIR=m CONFIG_MEDIA_USB_SUPPORT=y # @@ -3548,7 +3479,6 @@ CONFIG_SOC_CAMERA_MT9T031=m CONFIG_SOC_CAMERA_MT9T112=m CONFIG_SOC_CAMERA_MT9V022=m CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m CONFIG_SOC_CAMERA_OV9740=m @@ -3794,6 +3724,7 @@ CONFIG_DRM_TI_TFP410=m # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_DW_HDMI=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m +CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_ARCPGU=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_MXS=y @@ -4417,7 +4348,6 @@ CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m # CONFIG_UWB is not set CONFIG_MMC=y -# CONFIG_MMC_DEBUG is not set CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y @@ -4429,6 +4359,7 @@ CONFIG_MMC_BLOCK_MINORS=8 # # MMC/SD/SDIO Host Controller Drivers # +# CONFIG_MMC_DEBUG is not set CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m @@ -4473,6 +4404,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y # CONFIG_LEDS_88PM860X=m CONFIG_LEDS_AAT1290=m +CONFIG_LEDS_AS3645A=m CONFIG_LEDS_BCM6328=m CONFIG_LEDS_BCM6358=m CONFIG_LEDS_LM3530=m @@ -4672,6 +4604,7 @@ CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DMA_OF=y +# CONFIG_ALTERA_MSGDMA is not set CONFIG_FSL_EDMA=m CONFIG_INTEL_IDMA64=m CONFIG_QCOM_HIDMA_MGMT=m @@ -4721,6 +4654,7 @@ CONFIG_COMMON_CLK=y # # Common Clock Framework # +# CONFIG_CLK_HSDK is not set CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_SI5351=m CONFIG_COMMON_CLK_SI514=m @@ -4771,6 +4705,10 @@ CONFIG_OF_IOMMU=y # SOC (System On Chip) specific Drivers # +# +# Amlogic SoC drivers +# + # # Broadcom SoC drivers # @@ -4778,6 +4716,10 @@ CONFIG_OF_IOMMU=y # # i.MX SoC drivers # + +# +# Qualcomm SoC drivers +# CONFIG_SOC_TI=y CONFIG_PM_DEVFREQ=y @@ -4859,6 +4801,7 @@ CONFIG_KXCJK1013=m # CONFIG_ENVELOPE_DETECTOR is not set # CONFIG_HX711 is not set CONFIG_INA2XX_ADC=m +CONFIG_LTC2471=m # CONFIG_LTC2485 is not set # CONFIG_LTC2497 is not set # CONFIG_MAX1363 is not set @@ -4882,6 +4825,7 @@ CONFIG_VF610_ADC=m # Chemical Sensors # # CONFIG_ATLAS_PH_SENSOR is not set +# CONFIG_CCS811 is not set # CONFIG_IAQCORE is not set # CONFIG_VZ89X is not set @@ -5100,8 +5044,8 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_ATH79 is not set -# CONFIG_RESET_GEMINI is not set # CONFIG_RESET_IMX7 is not set +# CONFIG_RESET_LANTIQ is not set # CONFIG_RESET_LPC18XX is not set # CONFIG_RESET_PISTACHIO is not set # CONFIG_RESET_SOCFPGA is not set @@ -5143,10 +5087,6 @@ CONFIG_INTEL_TH_GTH=m CONFIG_INTEL_TH_MSU=m CONFIG_INTEL_TH_PTI=m # CONFIG_INTEL_TH_DEBUG is not set - -# -# FPGA Configuration Support -# # CONFIG_FPGA is not set # @@ -5544,7 +5484,6 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_UPROBE_EVENTS=y @@ -5559,6 +5498,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set CONFIG_TRACING_EVENTS_GPIO=y +# CONFIG_DMA_API_DEBUG is not set # # Runtime Testing @@ -5581,17 +5521,16 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_PARMAN is not set -# CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set -# CONFIG_MEMTEST is not set # CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_TEST_KMOD is not set +# CONFIG_MEMTEST is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -5885,3 +5824,4 @@ CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_PRIME_NUMBERS=m +# CONFIG_STRING_SELFTEST is not set diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index d71553607..5c0c8dbc0 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -38,7 +38,6 @@ CONFIG_KERNEL_XZ=y # # IRQ subsystem # -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_CLOCKSOURCE_WATCHDOG=y @@ -62,6 +61,7 @@ CONFIG_PCSPKR_PLATFORM=y # # Kernel Performance Events And Counters # +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_USER_RETURN_NOTIFIER=y @@ -77,6 +77,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_VMAP_STACK=y # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set +CONFIG_ARCH_HAS_REFCOUNT=y # # Partition Types @@ -99,7 +100,8 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y -# CONFIG_INTEL_RDT_A is not set +CONFIG_RETPOLINE=y +# CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_NUMACHIP=y # CONFIG_X86_VSMP is not set @@ -171,9 +173,12 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y # CONFIG_X86_MSR is not set CONFIG_X86_CPUID=y +# CONFIG_X86_5LEVEL is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_X86_DIRECT_GBPAGES=y +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +# CONFIG_AMD_MEM_ENCRYPT is not set CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y @@ -195,9 +200,9 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_VIRT_TO_BUS=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y # CONFIG_HWPOISON_INJECT is not set @@ -250,6 +255,7 @@ CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set # CONFIG_MODIFY_LDT_SYSCALL is not set # CONFIG_LIVEPATCH is not set +CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -410,6 +416,7 @@ CONFIG_RFKILL_GPIO=m # Generic Driver Options # # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_GENERIC_CPU_VULNERABILITIES=y # CONFIG_DMA_CMA is not set # @@ -435,8 +442,6 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_UMEM=m CONFIG_BLK_DEV_SKD=m @@ -576,6 +581,7 @@ CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y CONFIG_DE4X5=m CONFIG_PCMCIA_XIRCOM=m +CONFIG_HINIC=m CONFIG_E1000E_HWTS=y CONFIG_IGB_DCA=y CONFIG_IXGBE_DCA=y @@ -613,12 +619,6 @@ CONFIG_IPW2200_QOS=y CONFIG_VMXNET3=m # CONFIG_FUJITSU_ES is not set -# -# HiSax supported cards -# -# CONFIG_HISAX_NETJET is not set -# CONFIG_HISAX_NETJET_U is not set - # # Input device support # @@ -713,6 +713,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m # CONFIG_I2C_ALI15X3 is not set CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_ISMT=m +CONFIG_I2C_CHT_WC=m CONFIG_I2C_NFORCE2_S4985=m # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set @@ -772,7 +773,9 @@ CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_INTEL=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_DENVERTON=m CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_GPIO_ACPI=y @@ -800,6 +803,7 @@ CONFIG_GPIO_SCH=m # CONFIG_GPIO_CRYSTAL_COVE=m CONFIG_GPIO_TC3589X=y +# CONFIG_GPIO_TPS68470 is not set # CONFIG_GPIO_WHISKEY_COVE is not set # @@ -915,7 +919,7 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m CONFIG_LPC_ICH=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC_BXTWC=m -CONFIG_INTEL_SOC_PMIC_CHTWC=m +CONFIG_INTEL_SOC_PMIC_CHTWC=y CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_PCI=m @@ -925,6 +929,7 @@ CONFIG_MFD_RTSX_PCI=m # # STMicroelectronics STMPE Interface Drivers # +CONFIG_MFD_TPS68470=y CONFIG_MFD_VX855=m CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_VIRTUAL_CONSUMER=m @@ -935,6 +940,11 @@ CONFIG_REGULATOR_HI6421V530=m CONFIG_REGULATOR_LP872X=m CONFIG_REGULATOR_LP8788=m CONFIG_REGULATOR_TWL4030=m +CONFIG_IR_ENE=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_WINBOND_CIR=m # # Multimedia core support @@ -943,15 +953,6 @@ CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m CONFIG_TTPCI_EEPROM=m -# -# Media drivers -# -CONFIG_IR_ENE=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_WINBOND_CIR=m - # # Digital TV USB devices # @@ -1390,7 +1391,7 @@ CONFIG_IRQ_REMAP=y # CONFIG_REMOTEPROC is not set # -# i.MX SoC drivers +# Qualcomm SoC drivers # # CONFIG_SUNXI_SRAM is not set @@ -1486,6 +1487,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_UEFI_CPER=y CONFIG_EFI_DEV_PATH_PARSER=y @@ -1507,8 +1509,6 @@ CONFIG_EFIVAR_FS=m # # Compile-time checks and compiler options # -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y CONFIG_STACK_VALIDATION=y # @@ -1543,11 +1543,11 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # CONFIG_MMIOTRACE is not set # CONFIG_HIST_TRIGGERS is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # # Runtime Testing # -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y @@ -1578,11 +1578,15 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_NMI_SELFTEST is not set # CONFIG_X86_DEBUG_FPU is not set # CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_UNWINDER_ORC=y +# CONFIG_UNWINDER_FRAME_POINTER is not set +# CONFIG_UNWINDER_GUESS is not set # # Security options # CONFIG_KEYS_COMPAT=y +CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_INTEL_TXT=y CONFIG_FORTIFY_SOURCE=y @@ -1626,7 +1630,6 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES3_EDE_X86_64=m -CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_CHACHA20_X86_64=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m @@ -1644,6 +1647,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_QAT=m CONFIG_CRYPTO_DEV_QAT_DH895xCC=m @@ -1680,4 +1684,3 @@ CONFIG_HAS_IOPORT_MAP=y CONFIG_UCS2_STRING=y CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y -CONFIG_ARCH_HAS_MMIO_FLUSH=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 902f0709a..a0735012b 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,8 +4,8 @@ ############################################################################### name = kernel -version = 4.13.3 -release = 3 +version = 4.14.71 +release = 1 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 902ce59339c2ff628212277ac4cb35b9756899ec
by Michael Tremer 19 Sep '18

19 Sep '18

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e8b3ba46af85490dee3bc9b5f406aed70d40d7d1
by Michael Tremer 18 Sep '18

18 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via e8b3ba46af85490dee3bc9b5f406aed70d40d7d1 (commit) via 72f604e8279363408f10d2561d7ba5476578f074 (commit) via 1ad8926ba12192c115257a8e1733730922ccdfe3 (commit) via 8a1a5118af72f26636ffe2f861f2f36c27d20fc2 (commit) from da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea (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 e8b3ba46af85490dee3bc9b5f406aed70d40d7d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 18 21:39:45 2018 +0100 linux-firmware: Update to 20180918 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 72f604e8279363408f10d2561d7ba5476578f074 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 5 11:47:24 2018 +0100 glibc: Update to 2.28 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ad8926ba12192c115257a8e1733730922ccdfe3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 5 11:47:08 2018 +0100 gcc: Update to 8.2.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a1a5118af72f26636ffe2f861f2f36c27d20fc2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 3 13:10:55 2018 +0100 Remove fastd and libuecc This was added to support VPN peering with Freifunk with which we have no afiliation any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: fastd/fastd.nm | 55 ---------------------------------- gcc/gcc.nm | 42 ++++++-------------------- gcc/patches/gcc49-no-add-needed.patch0 | 50 ------------------------------- glibc/glibc.nm | 10 ++++--- libuecc/libuecc.nm | 43 -------------------------- linux-firmware/linux-firmware.nm | 10 +++---- 6 files changed, 20 insertions(+), 190 deletions(-) delete mode 100644 fastd/fastd.nm delete mode 100644 gcc/patches/gcc49-no-add-needed.patch0 delete mode 100644 libuecc/libuecc.nm Difference in files: diff --git a/fastd/fastd.nm b/fastd/fastd.nm deleted file mode 100644 index 80bd6952d..000000000 --- a/fastd/fastd.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = fastd -version = 17 -release = 1 - -groups = Networking/VPN -url = https://projects.universe-factory.net/projects/fastd/wiki -license = BSD -summary = Fast and Secure Tunnelling Daemon - -description - fastd is a fast and secure tunneling daemon that is designed - to run on embedded devices. -end - -source_dl = https://projects.universe-factory.net/attachments/download/81/ -sources = %{thisapp}.tar.xz - -build - requires - bison >= 2.5 - cmake >= 3.0 - doxygen - json-c-devel - libcap-devel - libsodium-devel - libuecc >= 5 - libuecc-devel - openssl-devel - end - - if "%{DISTRO_ARCH}" == "i686" - build_options = \ - -DWITH_CIPHER_SALSA2012_XMM=OFF \ - -DWITH_CIPHER_SALSA20_XMM=OFF \ - -DWITH_MAC_GHASH_PCLMULQDQ=OFF - end - - build - %{cmake} %{build_options} . - make %{PARALLELISMFLAGS} - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 7f1f5432b..cd3fb35a8 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,7 +7,7 @@ build_graphite = 1 name = gcc -version = 7.3.0 +version = 8.2.0 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -64,9 +64,6 @@ build # Build libubsan build_libubsan = 0 - # Build libcilkrts (only x86) - build_libcilkrts = 0 - # Build libmpx (only on x86_64) build_libmpx = 0 @@ -83,7 +80,6 @@ build build_liblsan = 1 build_libtsan = 1 build_libubsan = 1 - build_libcilkrts = 1 build_libmpx = 1 end @@ -92,7 +88,6 @@ build build_libquadmath = 1 build_libubsan = 1 - build_libcilkrts = 1 end if "%{DISTRO_ARCH}" == "aarch64" @@ -287,7 +282,7 @@ build chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.* # libstdc++ - ln -svf ../../../libstdc++.so.6.0.24 ${FULLPATH}/libstdc++.so + ln -svf ../../../libstdc++.so.6.0.25 ${FULLPATH}/libstdc++.so mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH} # libquadmath @@ -315,16 +310,10 @@ build # libubsan if [ "%{build_libubsan}" = "1" ]; then - ln -svf ../../../libubsan.so.0.0.0 ${FULLPATH}/libubsan.so + ln -svf ../../../libubsan.so.1.0.0 ${FULLPATH}/libubsan.so chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.* fi - # libcilkrts - if [ "%{build_libcilkrts}" = "1" ]; then - ln -svf ../../../libcilkrts.so.5.0.0 ${FULLPATH}/libcilkrts.so - chmod 755 %{BUILDROOT}%{libdir}/libcilkrts.so.5.* - fi - if [ "%{build_libmpx}" = "1" ]; then ln -svf ../../../libmpx.so.2.0.1 ${FULLPATH}/libmpx.so ln -svf ../../../libmpxwrappers.so.2.0.1 ${FULLPATH}/libmpxwrappers.so @@ -532,7 +521,7 @@ packages end files - %{libdir}/libitm.so.1* + %{libdir}/libitm.so.* end end @@ -565,7 +554,7 @@ packages end files - %{libdir}/libatomic.so.1* + %{libdir}/libatomic.so.* end end @@ -577,7 +566,7 @@ packages end files - %{libdir}/libasan.so.2* + %{libdir}/libasan.so.* end end @@ -590,7 +579,7 @@ packages end files - %{libdir}/libtsan.so.0* + %{libdir}/libtsan.so.* end end end @@ -604,7 +593,7 @@ packages end files - %{libdir}/libubsan.so.0* + %{libdir}/libubsan.so.* end end end @@ -618,20 +607,7 @@ packages end files - %{libdir}/liblsan.so.0* - end - end - end - - if "%{build_libcilkrts}" == "1" - package libcilkrts - summary = The Cilk+ runtime library - description - This package contains the Cilk+ runtime library. - end - - files - %{libdir}/libcilkrts.so.5* + %{libdir}/liblsan.so.* end end end diff --git a/gcc/patches/gcc49-no-add-needed.patch0 b/gcc/patches/gcc49-no-add-needed.patch0 deleted file mode 100644 index b6ca777eb..000000000 --- a/gcc/patches/gcc49-no-add-needed.patch0 +++ /dev/null @@ -1,50 +0,0 @@ -2010-02-08 Roland McGrath <roland(a)redhat.com> - - * config/rs6000/sysv4.h (LINK_EH_SPEC): Pass --no-add-needed to the - linker. - * config/gnu-user.h (LINK_EH_SPEC): Likewise. - * config/alpha/elf.h (LINK_EH_SPEC): Likewise. - * config/ia64/linux.h (LINK_EH_SPEC): Likewise. - ---- gcc/config/alpha/elf.h.jj 2011-01-03 12:52:31.118056764 +0100 -+++ gcc/config/alpha/elf.h 2011-01-04 18:14:10.931874160 +0100 -@@ -165,5 +165,5 @@ extern int alpha_this_gpdisp_sequence_nu - I imagine that other systems will catch up. In the meantime, it - doesn't harm to make sure that the data exists to be used later. */ - #if defined(HAVE_LD_EH_FRAME_HDR) --#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " -+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} " - #endif ---- gcc/config/ia64/linux.h.jj 2011-01-03 13:02:11.462994522 +0100 -+++ gcc/config/ia64/linux.h 2011-01-04 18:14:10.931874160 +0100 -@@ -77,7 +77,7 @@ do { \ - Signalize that because we have fde-glibc, we don't need all C shared libs - linked against -lgcc_s. */ - #undef LINK_EH_SPEC --#define LINK_EH_SPEC "" -+#define LINK_EH_SPEC "--no-add-needed " - - /* Put all *tf routines in libgcc. */ - #undef LIBGCC2_HAS_TF_MODE ---- gcc/config/gnu-user.h.jj 2011-01-03 12:53:03.739057299 +0100 -+++ gcc/config/gnu-user.h 2011-01-04 18:14:10.932814884 +0100 -@@ -82,7 +82,7 @@ see the files COPYING3 and COPYING.RUNTI - #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC - - #if defined(HAVE_LD_EH_FRAME_HDR) --#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " -+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} " - #endif - - #undef LINK_GCC_C_SEQUENCE_SPEC ---- gcc/config/rs6000/sysv4.h.jj 2011-01-03 13:02:18.255994215 +0100 -+++ gcc/config/rs6000/sysv4.h 2011-01-04 18:14:10.933888871 +0100 -@@ -820,7 +820,7 @@ extern int fixuplabelno; - -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}" - - #if defined(HAVE_LD_EH_FRAME_HDR) --# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " -+# define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} " - #endif - - #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \ diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 2143693dd..d4ec78b6b 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,7 +4,7 @@ ############################################################################### name = glibc -version = 2.27 +version = 2.28 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -33,11 +33,12 @@ build requires autoconf automake - binutils >= 2.27 + binutils >= 2.29 bison - gcc >= 4.9 + gcc >= 8 gettext kernel-headers >= %{OPTIMIZED_KERNEL} + make >= 4.0 libcap-devel libstdc++-static texinfo @@ -95,7 +96,8 @@ build --enable-bind-now \ --enable-obsolete-rpc \ --with-bugurl=http://bugtracker.ipfire.org \ - --enable-lock-elision + --enable-lock-elision \ + --enable-cet if "%{DISTRO_ARCH}" == "armv5tel" # Disable hardware FP for ARM. diff --git a/libuecc/libuecc.nm b/libuecc/libuecc.nm deleted file mode 100644 index 1d4fa0590..000000000 --- a/libuecc/libuecc.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = libuecc -version = 6 -release = 1 - -groups = Development/Tools -url = http://git.universe-factory.net/libuecc -license = BSD -summary = Very small Elliptic Curve Cryptography library - -description - %{summary}. -end - -source_dl = http://git.universe-factory.net/libuecc/snapshot/ -sources = %{thisapp}.tar.xz - -build - requires - cmake >= 2.8.4-3 - end - - build - %{cmake} . - make %{PARALLELISMFLAGS} - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index f5906f43e..7084e16f2 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -4,8 +4,8 @@ ############################################################################### name = linux-firmware -version = 20130910 -git_ver = 3fe01af +version = 20180918 +git_ver = 44d4fca release = 1.git%{git_ver} arch = noarch thisapp = %{name}-%{git_ver} @@ -17,9 +17,9 @@ license = Non-GPL summary = Firmware Binaries for some Devices. description - linux-firmware provides some firmware binaries that \ - are loaded into the devices at startup. \ - For detailed license info check the WHENCE and LICENSE.* texts \ + linux-firmware provides some firmware binaries that + are loaded into the devices at startup. + For detailed license info check the WHENCE and LICENSE.* texts for the specific firmware. end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06131f41e4a186ed7a70e8ef4f002d63cc16707a
by Arne Fitzenreiter 17 Sep '18

17 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 06131f41e4a186ed7a70e8ef4f002d63cc16707a (commit) from 362ac1ed61edb4ab8ddd510be13402b00d979d90 (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 06131f41e4a186ed7a70e8ef4f002d63cc16707a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 17 07:44:55 2018 +0200 kernel: arm32-bit: update rootfiles Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/linux-kirkwood | 5 +++-- config/rootfiles/common/armv5tel/linux-multi | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 161ecb4c3..00025a3bc 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -117,6 +117,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6_generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ccm.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20_generic.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20poly1305.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cmac.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cts.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/deflate.ko @@ -134,6 +136,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md4.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/michael_mic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/pcbc.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/poly1305_generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd128.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd160.ko #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd256.ko @@ -1063,7 +1066,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/b53/b53_mdio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/bcm-sf2.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_mdio.ko @@ -2003,7 +2005,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_bitmap.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_hash.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_rbtree.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_AUDIT.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CHECKSUM.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CLASSIFY.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CONNSECMARK.ko diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 94838e119..9c1f76248 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -521,6 +521,8 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/crypto/cast6_generic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cast_common.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/ccm.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20_generic.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20poly1305.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cmac.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/crypto_engine.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/cts.ko @@ -540,6 +542,7 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/crypto/michael_mic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/pcbc.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/pcrypt.ko +#lib/modules/KVER-ipfire-multi/kernel/crypto/poly1305_generic.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd128.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd160.ko #lib/modules/KVER-ipfire-multi/kernel/crypto/rmd256.ko @@ -1614,7 +1617,6 @@ lib/modules/KVER-ipfire-multi #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/b53/b53_mdio.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/bcm-sf2.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop.ko -#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303-core.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_i2c.ko #lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_mdio.ko hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea
by Michael Tremer 16 Sep '18

16 Sep '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea (commit) via 00a97de355cf5da516e84c5abaccf1daf93d0f23 (commit) from 1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee (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 da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 16 14:57:33 2018 +0200 iproute2: Update to 4.18.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 00a97de355cf5da516e84c5abaccf1daf93d0f23 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 16 14:57:00 2018 +0200 strongswan: Add network.conf with our own settings These settings are required to make everything in the network package work. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: iproute2/iproute2.nm | 2 +- strongswan/network.conf | 12 ++++++++++++ strongswan/strongswan.nm | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 strongswan/network.conf Difference in files: diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 17abdda18..6582385e3 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -4,7 +4,7 @@ ############################################################################### name = iproute2 -version = 4.15.0 +version = 4.18.0 release = 1 groups = Networking/Tools diff --git a/strongswan/network.conf b/strongswan/network.conf new file mode 100644 index 000000000..635a5fdc7 --- /dev/null +++ b/strongswan/network.conf @@ -0,0 +1,12 @@ +# +# Configuration options for IPFire +# + +charon { + # Send Cisco Unity vendor ID payload (IKEv1 only) + cisco_unity = yes + + # Install routes into a separate routing table for established IPsec + # tunnels. + install_routes = no +} diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 62795d775..12505baf0 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -5,7 +5,7 @@ name = strongswan version = 5.6.3 -release = 1 +release = 2 groups = Networking/VPN url = http://www.strongswan.org/ @@ -86,6 +86,10 @@ build install_cmds mv -v %{BUILDROOT}%{unitdir}/strongswan{-swanctl,}.service + # Install network settings + install -v -m 644 %{DIR_SOURCE}/network.conf \ + %{BUILDROOT}%{sysconfdir}/strongswan.d/ + # Create directory for connections mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections echo "include connections/*.conf" > \ hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2018