From 64add19dfe8ecef092679871eac1d56560e2b0f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Apolinarski Date: Tue, 17 Jul 2018 20:13:30 +0200 Subject: [PATCH 01/21] Apache: Update to 2.4.34 Signed-off-by: Michael Tremer --- lfs/apache2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/apache2 b/lfs/apache2 index 16dd101d7..0e526a575 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.33 +VER = 2.4.34 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5 +$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95 install : $(TARGET) From 51099ddfd7a497d535662a93362e774ba30fe1ca Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Tue, 17 Jul 2018 20:50:41 +0200 Subject: [PATCH 02/21] squid: Update to 3.5.28 For details see: http://www.squid-cache.org/Versions/v3/3.5/changesets/ Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/squid | 8 ++---- src/patches/squid/SQUID-2018_1.patch | 28 ------------------- src/patches/squid/SQUID-2018_2.patch | 23 --------------- ...uid-3.5.28-fix-max-file-descriptors.patch} | 0 4 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 src/patches/squid/SQUID-2018_1.patch delete mode 100644 src/patches/squid/SQUID-2018_2.patch rename src/patches/squid/{squid-3.5.27-fix-max-file-descriptors.patch => squid-3.5.28-fix-max-file-descriptors.patch} (100%) diff --git a/lfs/squid b/lfs/squid index f93097019..cae56407c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.27 +VER = 3.5.28 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39ef8199675d48a314b540f92c00c545 +$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2018_1.patch deleted file mode 100644 index 9392219a9..000000000 --- a/src/patches/squid/SQUID-2018_1.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) -Author: Amos Jeffries -Date: 2018-01-19 13:54:14 +1300 - - ESI: make sure endofName never exceeds tagEnd (#130) - -diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc -index d86d2d3..db634d9 100644 ---- a/src/esi/CustomParser.cc -+++ b/src/esi/CustomParser.cc -@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast(tagEnd); - - *endofName = '\0'; -@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast(tagEnd); - - *endofName = '\0'; diff --git a/src/patches/squid/SQUID-2018_2.patch b/src/patches/squid/SQUID-2018_2.patch deleted file mode 100644 index 9ecd8a5b7..000000000 --- a/src/patches/squid/SQUID-2018_2.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) -Author: squidadm -Date: 2018-01-21 08:07:08 +1300 - - Fix indirect IP logging for transactions without a client connection (#129) (#136) - -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index be124f3..203f89d 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data) - * Ensure that the access log shows the indirect client - * instead of the direct client. - */ -- ConnStateData *conn = http->getConn(); -- conn->log_addr = request->indirect_client_addr; -- http->al->cache.caddr = conn->log_addr; -+ http->al->cache.caddr = request->indirect_client_addr; -+ if (ConnStateData *conn = http->getConn()) -+ conn->log_addr = request->indirect_client_addr; - } - request->x_forwarded_for_iterator.clean(); - request->flags.done_follow_x_forwarded_for = true; diff --git a/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch b/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch rename to src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch From a580a31c0ff5c596027b4e942869e4e7342f2de6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 26 Jul 2018 14:46:53 +0100 Subject: [PATCH 03/21] core123: Ship and restart squid and apache Signed-off-by: Michael Tremer --- config/rootfiles/core/123/filelists/apache2 | 1 + config/rootfiles/core/123/filelists/squid | 1 + config/rootfiles/core/123/update.sh | 3 +++ 3 files changed, 5 insertions(+) create mode 120000 config/rootfiles/core/123/filelists/apache2 create mode 120000 config/rootfiles/core/123/filelists/squid diff --git a/config/rootfiles/core/123/filelists/apache2 b/config/rootfiles/core/123/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/123/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/core/123/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/123/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index ee8a5ec0b..cf488ec49 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/init.d/squid stop # Extract files extract_files @@ -46,7 +47,9 @@ ldconfig /usr/local/bin/update-lang-cache # Start services +/etc/init.d/apache restart /etc/init.d/unbound restart +/etc/init.d/squid start # This update needs a reboot... touch /var/run/need_reboot From 0cf70cae66593ce985d22b05d0be95c5b43b0565 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 30 Jul 2018 16:54:50 +0100 Subject: [PATCH 04/21] aws: Disable SSH password authentication by default Signed-off-by: Michael Tremer --- src/initscripts/helper/aws-setup | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index e16678339..122e5a31d 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -231,6 +231,9 @@ import_aws_configuration() { # Enable SSH sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings + # Disable SSH password authentication + sed -e "s/^ENABLE_SSH_PASSWORDS=.*/ENABLE_SSH_PASSWORDS=off/" -i /var/ipfire/remote/settings + # Enable SSH key authentication sed -e "s/^ENABLE_SSH_KEYS=.*/ENABLE_SSH_KEYS=on/" -i /var/ipfire/remote/settings From b5a1294c987be0f81b597ea2abca563b26118927 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 2 Aug 2018 21:15:11 +0200 Subject: [PATCH 05/21] linux-firmware: update to 30.7.2018 include new amd microcodes for Spectre updates Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/linux-firmware | 213 ++++++++++- .../core/123/filelists/linux-firmware-updates | 356 ++++++++++++++++++ lfs/linux-firmware | 4 +- 3 files changed, 568 insertions(+), 5 deletions(-) create mode 100644 config/rootfiles/core/123/filelists/linux-firmware-updates diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 85ff713b5..07e026ee8 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -16,6 +16,7 @@ lib/firmware/LICENCE.ca0132 lib/firmware/LICENCE.cavium lib/firmware/LICENCE.chelsio_firmware lib/firmware/LICENCE.cw1200 +lib/firmware/LICENCE.cypress lib/firmware/LICENCE.e100 lib/firmware/LICENCE.ene_firmware lib/firmware/LICENCE.fw_sst_0f28 @@ -25,6 +26,7 @@ lib/firmware/LICENCE.ibt_firmware lib/firmware/LICENCE.it913x lib/firmware/LICENCE.iwlwifi_firmware lib/firmware/LICENCE.kaweth +lib/firmware/LICENCE.mediatek lib/firmware/LICENCE.moxa lib/firmware/LICENCE.myri10ge_firmware lib/firmware/LICENCE.nvidia @@ -91,7 +93,22 @@ lib/firmware/amd-ucode/microcode_amd_fam15h.bin lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc lib/firmware/amd-ucode/microcode_amd_fam16h.bin lib/firmware/amd-ucode/microcode_amd_fam16h.bin.asc +lib/firmware/amd-ucode/microcode_amd_fam17h.bin +lib/firmware/amd-ucode/microcode_amd_fam17h.bin.asc #lib/firmware/amdgpu +lib/firmware/amdgpu/banks_k_2_smc.bin +lib/firmware/amdgpu/bonaire_ce.bin +lib/firmware/amdgpu/bonaire_k_smc.bin +lib/firmware/amdgpu/bonaire_mc.bin +lib/firmware/amdgpu/bonaire_me.bin +lib/firmware/amdgpu/bonaire_mec.bin +lib/firmware/amdgpu/bonaire_pfp.bin +lib/firmware/amdgpu/bonaire_rlc.bin +lib/firmware/amdgpu/bonaire_sdma.bin +lib/firmware/amdgpu/bonaire_sdma1.bin +lib/firmware/amdgpu/bonaire_smc.bin +lib/firmware/amdgpu/bonaire_uvd.bin +lib/firmware/amdgpu/bonaire_vce.bin lib/firmware/amdgpu/carrizo_ce.bin lib/firmware/amdgpu/carrizo_me.bin lib/firmware/amdgpu/carrizo_mec.bin @@ -114,6 +131,67 @@ lib/firmware/amdgpu/fiji_sdma1.bin lib/firmware/amdgpu/fiji_smc.bin lib/firmware/amdgpu/fiji_uvd.bin lib/firmware/amdgpu/fiji_vce.bin +lib/firmware/amdgpu/hainan_ce.bin +lib/firmware/amdgpu/hainan_k_smc.bin +lib/firmware/amdgpu/hainan_mc.bin +lib/firmware/amdgpu/hainan_me.bin +lib/firmware/amdgpu/hainan_pfp.bin +lib/firmware/amdgpu/hainan_rlc.bin +lib/firmware/amdgpu/hainan_smc.bin +lib/firmware/amdgpu/hawaii_ce.bin +lib/firmware/amdgpu/hawaii_k_smc.bin +lib/firmware/amdgpu/hawaii_mc.bin +lib/firmware/amdgpu/hawaii_me.bin +lib/firmware/amdgpu/hawaii_mec.bin +lib/firmware/amdgpu/hawaii_pfp.bin +lib/firmware/amdgpu/hawaii_rlc.bin +lib/firmware/amdgpu/hawaii_sdma.bin +lib/firmware/amdgpu/hawaii_sdma1.bin +lib/firmware/amdgpu/hawaii_smc.bin +lib/firmware/amdgpu/hawaii_uvd.bin +lib/firmware/amdgpu/hawaii_vce.bin +lib/firmware/amdgpu/kabini_ce.bin +lib/firmware/amdgpu/kabini_me.bin +lib/firmware/amdgpu/kabini_mec.bin +lib/firmware/amdgpu/kabini_pfp.bin +lib/firmware/amdgpu/kabini_rlc.bin +lib/firmware/amdgpu/kabini_sdma.bin +lib/firmware/amdgpu/kabini_sdma1.bin +lib/firmware/amdgpu/kabini_uvd.bin +lib/firmware/amdgpu/kabini_vce.bin +lib/firmware/amdgpu/kaveri_ce.bin +lib/firmware/amdgpu/kaveri_me.bin +lib/firmware/amdgpu/kaveri_mec.bin +lib/firmware/amdgpu/kaveri_mec2.bin +lib/firmware/amdgpu/kaveri_pfp.bin +lib/firmware/amdgpu/kaveri_rlc.bin +lib/firmware/amdgpu/kaveri_sdma.bin +lib/firmware/amdgpu/kaveri_sdma1.bin +lib/firmware/amdgpu/kaveri_uvd.bin +lib/firmware/amdgpu/kaveri_vce.bin +lib/firmware/amdgpu/mullins_ce.bin +lib/firmware/amdgpu/mullins_me.bin +lib/firmware/amdgpu/mullins_mec.bin +lib/firmware/amdgpu/mullins_pfp.bin +lib/firmware/amdgpu/mullins_rlc.bin +lib/firmware/amdgpu/mullins_sdma.bin +lib/firmware/amdgpu/mullins_sdma1.bin +lib/firmware/amdgpu/mullins_uvd.bin +lib/firmware/amdgpu/mullins_vce.bin +lib/firmware/amdgpu/oland_ce.bin +lib/firmware/amdgpu/oland_k_smc.bin +lib/firmware/amdgpu/oland_mc.bin +lib/firmware/amdgpu/oland_me.bin +lib/firmware/amdgpu/oland_pfp.bin +lib/firmware/amdgpu/oland_rlc.bin +lib/firmware/amdgpu/oland_smc.bin +lib/firmware/amdgpu/pitcairn_ce.bin +lib/firmware/amdgpu/pitcairn_k_smc.bin +lib/firmware/amdgpu/pitcairn_mc.bin +lib/firmware/amdgpu/pitcairn_me.bin +lib/firmware/amdgpu/pitcairn_pfp.bin +lib/firmware/amdgpu/pitcairn_rlc.bin +lib/firmware/amdgpu/pitcairn_smc.bin lib/firmware/amdgpu/polaris10_ce.bin lib/firmware/amdgpu/polaris10_ce_2.bin lib/firmware/amdgpu/polaris10_k_smc.bin @@ -179,6 +257,7 @@ lib/firmware/amdgpu/raven_pfp.bin lib/firmware/amdgpu/raven_rlc.bin lib/firmware/amdgpu/raven_sdma.bin lib/firmware/amdgpu/raven_vcn.bin +lib/firmware/amdgpu/si58_mc.bin lib/firmware/amdgpu/stoney_ce.bin lib/firmware/amdgpu/stoney_me.bin lib/firmware/amdgpu/stoney_mec.bin @@ -187,6 +266,13 @@ lib/firmware/amdgpu/stoney_rlc.bin lib/firmware/amdgpu/stoney_sdma.bin lib/firmware/amdgpu/stoney_uvd.bin lib/firmware/amdgpu/stoney_vce.bin +lib/firmware/amdgpu/tahiti_ce.bin +lib/firmware/amdgpu/tahiti_k_smc.bin +lib/firmware/amdgpu/tahiti_mc.bin +lib/firmware/amdgpu/tahiti_me.bin +lib/firmware/amdgpu/tahiti_pfp.bin +lib/firmware/amdgpu/tahiti_rlc.bin +lib/firmware/amdgpu/tahiti_smc.bin lib/firmware/amdgpu/tonga_ce.bin lib/firmware/amdgpu/tonga_k_smc.bin lib/firmware/amdgpu/tonga_mc.bin @@ -226,6 +312,24 @@ lib/firmware/amdgpu/vega10_smc.bin lib/firmware/amdgpu/vega10_sos.bin lib/firmware/amdgpu/vega10_uvd.bin lib/firmware/amdgpu/vega10_vce.bin +lib/firmware/amdgpu/vegam_ce.bin +lib/firmware/amdgpu/vegam_me.bin +lib/firmware/amdgpu/vegam_mec.bin +lib/firmware/amdgpu/vegam_mec2.bin +lib/firmware/amdgpu/vegam_pfp.bin +lib/firmware/amdgpu/vegam_rlc.bin +lib/firmware/amdgpu/vegam_sdma.bin +lib/firmware/amdgpu/vegam_sdma1.bin +lib/firmware/amdgpu/vegam_smc.bin +lib/firmware/amdgpu/vegam_uvd.bin +lib/firmware/amdgpu/vegam_vce.bin +lib/firmware/amdgpu/verde_ce.bin +lib/firmware/amdgpu/verde_k_smc.bin +lib/firmware/amdgpu/verde_mc.bin +lib/firmware/amdgpu/verde_me.bin +lib/firmware/amdgpu/verde_pfp.bin +lib/firmware/amdgpu/verde_rlc.bin +lib/firmware/amdgpu/verde_smc.bin #lib/firmware/ar3k #lib/firmware/ar3k/1020200 lib/firmware/ar3k/1020200/PS_ASIC.pst @@ -468,6 +572,7 @@ lib/firmware/bnx2x/bnx2x-e2-7.2.51.0.fw lib/firmware/bnx2x/bnx2x-e2-7.8.17.0.fw lib/firmware/bnx2x/bnx2x-e2-7.8.19.0.fw lib/firmware/bnx2x/bnx2x-e2-7.8.2.0.fw +lib/firmware/brcm/BCM-0bb4-0306.hcd lib/firmware/brcm/bcm4329-fullmac-4.bin lib/firmware/brcm/bcm43xx-0.fw lib/firmware/brcm/bcm43xx_hdr-0.fw @@ -485,6 +590,8 @@ lib/firmware/brcm/brcmfmac43340-sdio.bin lib/firmware/brcm/brcmfmac4335-sdio.bin lib/firmware/brcm/brcmfmac43362-sdio.bin lib/firmware/brcm/brcmfmac4339-sdio.bin +lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt +lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt lib/firmware/brcm/brcmfmac43430-sdio.bin lib/firmware/brcm/brcmfmac43430a0-sdio.bin lib/firmware/brcm/brcmfmac43455-sdio.bin @@ -500,6 +607,8 @@ lib/firmware/brcm/brcmfmac43602-pcie.ap.bin lib/firmware/brcm/brcmfmac43602-pcie.bin lib/firmware/brcm/brcmfmac4366b-pcie.bin lib/firmware/brcm/brcmfmac4371-pcie.bin +lib/firmware/brcm/brcmfmac4373-sdio.bin +lib/firmware/brcm/brcmfmac4373.bin lib/firmware/carl9170-1.fw #lib/firmware/carl9170fw #lib/firmware/carl9170fw/CMakeLists.txt @@ -698,13 +807,13 @@ lib/firmware/cxgb4/aq1202_fw.cld lib/firmware/cxgb4/bcm8483.bin lib/firmware/cxgb4/t4fw-1.14.4.0.bin lib/firmware/cxgb4/t4fw-1.15.37.0.bin -lib/firmware/cxgb4/t4fw-1.16.63.0.bin +lib/firmware/cxgb4/t4fw-1.20.8.0.bin lib/firmware/cxgb4/t4fw.bin lib/firmware/cxgb4/t5fw-1.14.4.0.bin lib/firmware/cxgb4/t5fw-1.15.37.0.bin -lib/firmware/cxgb4/t5fw-1.16.63.0.bin +lib/firmware/cxgb4/t5fw-1.20.8.0.bin lib/firmware/cxgb4/t5fw.bin -lib/firmware/cxgb4/t6fw-1.16.63.0.bin +lib/firmware/cxgb4/t6fw-1.20.8.0.bin lib/firmware/cxgb4/t6fw.bin #lib/firmware/dabusb lib/firmware/dabusb/bitstream.bin @@ -778,6 +887,7 @@ lib/firmware/i915/bxt_guc_ver8_7.bin lib/firmware/i915/bxt_guc_ver9_29.bin lib/firmware/i915/bxt_huc_ver01_07_1398.bin lib/firmware/i915/cnl_dmc_ver1_06.bin +lib/firmware/i915/cnl_dmc_ver1_07.bin lib/firmware/i915/glk_dmc_ver1_04.bin lib/firmware/i915/kbl_dmc_ver1.bin lib/firmware/i915/kbl_dmc_ver1_01.bin @@ -803,17 +913,24 @@ lib/firmware/imx/sdma/sdma-imx7d.bin lib/firmware/intel/IntcSST2.bin lib/firmware/intel/dsp_fw_bxtn.bin lib/firmware/intel/dsp_fw_bxtn_v2219.bin +lib/firmware/intel/dsp_fw_bxtn_v3366.bin lib/firmware/intel/dsp_fw_cnl.bin lib/firmware/intel/dsp_fw_cnl_v1191.bin lib/firmware/intel/dsp_fw_glk.bin lib/firmware/intel/dsp_fw_glk_v1814.bin +lib/firmware/intel/dsp_fw_glk_v2768.bin lib/firmware/intel/dsp_fw_glk_v2880.bin +lib/firmware/intel/dsp_fw_glk_v3366.bin lib/firmware/intel/dsp_fw_kbl.bin lib/firmware/intel/dsp_fw_kbl_v1037.bin lib/firmware/intel/dsp_fw_kbl_v2042.bin lib/firmware/intel/dsp_fw_kbl_v2630.bin +lib/firmware/intel/dsp_fw_kbl_v3266.bin +lib/firmware/intel/dsp_fw_kbl_v3402.bin +lib/firmware/intel/dsp_fw_kbl_v3420.bin lib/firmware/intel/dsp_fw_kbl_v701.bin lib/firmware/intel/dsp_fw_release.bin +lib/firmware/intel/dsp_fw_release_v3402.bin lib/firmware/intel/dsp_fw_release_v969.bin lib/firmware/intel/fw_sst_0f28.bin lib/firmware/intel/fw_sst_0f28.bin-48kHz_i2s_master @@ -924,15 +1041,19 @@ lib/firmware/iwlwifi-8000C-22.ucode lib/firmware/iwlwifi-8000C-27.ucode lib/firmware/iwlwifi-8000C-31.ucode lib/firmware/iwlwifi-8000C-34.ucode +lib/firmware/iwlwifi-8000C-36.ucode lib/firmware/iwlwifi-8265-21.ucode lib/firmware/iwlwifi-8265-22.ucode lib/firmware/iwlwifi-8265-27.ucode lib/firmware/iwlwifi-8265-31.ucode lib/firmware/iwlwifi-8265-34.ucode +lib/firmware/iwlwifi-8265-36.ucode lib/firmware/iwlwifi-9000-pu-b0-jf-b0-33.ucode lib/firmware/iwlwifi-9000-pu-b0-jf-b0-34.ucode +lib/firmware/iwlwifi-9000-pu-b0-jf-b0-38.ucode lib/firmware/iwlwifi-9260-th-b0-jf-b0-33.ucode lib/firmware/iwlwifi-9260-th-b0-jf-b0-34.ucode +lib/firmware/iwlwifi-9260-th-b0-jf-b0-38.ucode #lib/firmware/kaweth lib/firmware/kaweth/new_code.bin lib/firmware/kaweth/new_code_fix.bin @@ -991,13 +1112,20 @@ lib/firmware/libertas/usb8682.bin lib/firmware/liquidio/lio_210nv_nic.bin lib/firmware/liquidio/lio_210sv_nic.bin lib/firmware/liquidio/lio_23xx_nic.bin +lib/firmware/liquidio/lio_23xx_vsw.bin lib/firmware/liquidio/lio_410nv_nic.bin #lib/firmware/matrox lib/firmware/matrox/g200_warp.fw lib/firmware/matrox/g400_warp.fw +#lib/firmware/mediatek +lib/firmware/mediatek/mt7622pr2h.bin +lib/firmware/mediatek/mt7662u.bin +lib/firmware/mediatek/mt7662u_rom_patch.bin #lib/firmware/mellanox lib/firmware/mellanox/mlxsw_spectrum-13.1420.122.mfa2 lib/firmware/mellanox/mlxsw_spectrum-13.1530.152.mfa2 +lib/firmware/mellanox/mlxsw_spectrum-13.1620.192.mfa2 +lib/firmware/mellanox/mlxsw_spectrum-13.1702.6.mfa2 #lib/firmware/moxa lib/firmware/moxa/moxa-1110.fw lib/firmware/moxa/moxa-1130.fw @@ -1062,12 +1190,43 @@ lib/firmware/myri10ge_rss_ethp_z8e.dat #lib/firmware/myricom lib/firmware/myricom/lanai.bin #lib/firmware/netronome +#lib/firmware/netronome/flower +lib/firmware/netronome/flower/nic_AMDA0081-0001_1x40.nffw +lib/firmware/netronome/flower/nic_AMDA0081-0001_4x10.nffw +lib/firmware/netronome/flower/nic_AMDA0081.nffw +lib/firmware/netronome/flower/nic_AMDA0096-0001_2x10.nffw +lib/firmware/netronome/flower/nic_AMDA0096.nffw +lib/firmware/netronome/flower/nic_AMDA0097-0001_2x40.nffw +lib/firmware/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw +lib/firmware/netronome/flower/nic_AMDA0097-0001_8x10.nffw +lib/firmware/netronome/flower/nic_AMDA0097.nffw +lib/firmware/netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw +lib/firmware/netronome/flower/nic_AMDA0099-0001_2x10.nffw +lib/firmware/netronome/flower/nic_AMDA0099-0001_2x25.nffw +lib/firmware/netronome/flower/nic_AMDA0099.nffw +#lib/firmware/netronome/nic +lib/firmware/netronome/nic/nic_AMDA0058-0011_2x40.nffw +lib/firmware/netronome/nic/nic_AMDA0058-0012_2x40.nffw +lib/firmware/netronome/nic/nic_AMDA0078-0011_1x100.nffw +lib/firmware/netronome/nic/nic_AMDA0081-0001_1x40.nffw +lib/firmware/netronome/nic/nic_AMDA0081-0001_4x10.nffw +lib/firmware/netronome/nic/nic_AMDA0096-0001_2x10.nffw +lib/firmware/netronome/nic/nic_AMDA0097-0001_2x40.nffw +lib/firmware/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw +lib/firmware/netronome/nic/nic_AMDA0097-0001_8x10.nffw +lib/firmware/netronome/nic/nic_AMDA0099-0001_1x10_1x25.nffw +lib/firmware/netronome/nic/nic_AMDA0099-0001_2x10.nffw +lib/firmware/netronome/nic/nic_AMDA0099-0001_2x25.nffw +lib/firmware/netronome/nic_AMDA0058-0011_2x40.nffw +lib/firmware/netronome/nic_AMDA0058-0012_2x40.nffw +lib/firmware/netronome/nic_AMDA0078-0011_1x100.nffw lib/firmware/netronome/nic_AMDA0081-0001_1x40.nffw lib/firmware/netronome/nic_AMDA0081-0001_4x10.nffw lib/firmware/netronome/nic_AMDA0096-0001_2x10.nffw lib/firmware/netronome/nic_AMDA0097-0001_2x40.nffw lib/firmware/netronome/nic_AMDA0097-0001_4x10_1x40.nffw lib/firmware/netronome/nic_AMDA0097-0001_8x10.nffw +lib/firmware/netronome/nic_AMDA0099-0001_1x10_1x25.nffw lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw #lib/firmware/nvidia @@ -1271,6 +1430,31 @@ lib/firmware/nvidia/gp107/nvdec/scrubber.bin lib/firmware/nvidia/gp107/sec2/desc.bin lib/firmware/nvidia/gp107/sec2/image.bin lib/firmware/nvidia/gp107/sec2/sig.bin +#lib/firmware/nvidia/gp108 +#lib/firmware/nvidia/gp108/acr +lib/firmware/nvidia/gp108/acr/bl.bin +lib/firmware/nvidia/gp108/acr/ucode_load.bin +lib/firmware/nvidia/gp108/acr/ucode_unload.bin +lib/firmware/nvidia/gp108/acr/unload_bl.bin +#lib/firmware/nvidia/gp108/gr +lib/firmware/nvidia/gp108/gr/fecs_bl.bin +lib/firmware/nvidia/gp108/gr/fecs_data.bin +lib/firmware/nvidia/gp108/gr/fecs_inst.bin +lib/firmware/nvidia/gp108/gr/fecs_sig.bin +lib/firmware/nvidia/gp108/gr/gpccs_bl.bin +lib/firmware/nvidia/gp108/gr/gpccs_data.bin +lib/firmware/nvidia/gp108/gr/gpccs_inst.bin +lib/firmware/nvidia/gp108/gr/gpccs_sig.bin +lib/firmware/nvidia/gp108/gr/sw_bundle_init.bin +lib/firmware/nvidia/gp108/gr/sw_ctx.bin +lib/firmware/nvidia/gp108/gr/sw_method_init.bin +lib/firmware/nvidia/gp108/gr/sw_nonctx.bin +#lib/firmware/nvidia/gp108/nvdec +lib/firmware/nvidia/gp108/nvdec/scrubber.bin +#lib/firmware/nvidia/gp108/sec2 +lib/firmware/nvidia/gp108/sec2/desc.bin +lib/firmware/nvidia/gp108/sec2/image.bin +lib/firmware/nvidia/gp108/sec2/sig.bin #lib/firmware/nvidia/gp10b #lib/firmware/nvidia/gp10b/acr lib/firmware/nvidia/gp10b/acr/bl.bin @@ -1349,12 +1533,28 @@ lib/firmware/qcom/venus-4.2/venus.b02 lib/firmware/qcom/venus-4.2/venus.b03 lib/firmware/qcom/venus-4.2/venus.b04 lib/firmware/qcom/venus-4.2/venus.mdt +#lib/firmware/qcom/venus-5.2 +lib/firmware/qcom/venus-5.2/venus.b00 +lib/firmware/qcom/venus-5.2/venus.b01 +lib/firmware/qcom/venus-5.2/venus.b02 +lib/firmware/qcom/venus-5.2/venus.b03 +lib/firmware/qcom/venus-5.2/venus.b04 +lib/firmware/qcom/venus-5.2/venus.mbn +lib/firmware/qcom/venus-5.2/venus.mdt #lib/firmware/qed +lib/firmware/qed/qed_init_values-8.10.9.0.bin +lib/firmware/qed/qed_init_values-8.14.6.0.bin +lib/firmware/qed/qed_init_values-8.18.9.0.bin +lib/firmware/qed/qed_init_values-8.20.0.0.bin +lib/firmware/qed/qed_init_values-8.30.12.0.bin +lib/firmware/qed/qed_init_values-8.33.12.0.bin lib/firmware/qed/qed_init_values_zipped-8.10.10.0.bin lib/firmware/qed/qed_init_values_zipped-8.10.5.0.bin lib/firmware/qed/qed_init_values_zipped-8.15.3.0.bin lib/firmware/qed/qed_init_values_zipped-8.20.0.0.bin lib/firmware/qed/qed_init_values_zipped-8.33.1.0.bin +lib/firmware/qed/qed_init_values_zipped-8.33.11.0.bin +lib/firmware/qed/qed_init_values_zipped-8.37.2.0.bin lib/firmware/qed/qed_init_values_zipped-8.4.2.0.bin lib/firmware/qed/qed_init_values_zipped-8.7.3.0.bin lib/firmware/ql2100_fw.bin @@ -1626,6 +1826,8 @@ lib/firmware/rockchip lib/firmware/rockchip/dptx.bin lib/firmware/rp2.fw #lib/firmware/rsi +lib/firmware/rsi/rs9113_ap_bt_dual_mode.rps +lib/firmware/rsi/rs9113_wlan_bt_dual_mode.rps lib/firmware/rsi/rs9113_wlan_qspi.rps lib/firmware/rsi_91x.fw lib/firmware/rt2561.bin @@ -1643,9 +1845,13 @@ lib/firmware/rtl_bt/rtl8192ee_fw.bin lib/firmware/rtl_bt/rtl8192eu_fw.bin lib/firmware/rtl_bt/rtl8723a_fw.bin lib/firmware/rtl_bt/rtl8723b_fw.bin +lib/firmware/rtl_bt/rtl8723d_config.bin +lib/firmware/rtl_bt/rtl8723d_fw.bin lib/firmware/rtl_bt/rtl8761a_fw.bin lib/firmware/rtl_bt/rtl8812ae_fw.bin lib/firmware/rtl_bt/rtl8821a_fw.bin +lib/firmware/rtl_bt/rtl8821c_config.bin +lib/firmware/rtl_bt/rtl8821c_fw.bin lib/firmware/rtl_bt/rtl8822b_config.bin lib/firmware/rtl_bt/rtl8822b_fw.bin #lib/firmware/rtl_nic @@ -1698,6 +1904,7 @@ lib/firmware/rtlwifi/rtl8723bs_wowlan.bin lib/firmware/rtlwifi/rtl8723bu_ap_wowlan.bin lib/firmware/rtlwifi/rtl8723bu_nic.bin lib/firmware/rtlwifi/rtl8723bu_wowlan.bin +lib/firmware/rtlwifi/rtl8723defw.bin lib/firmware/rtlwifi/rtl8723fw.bin lib/firmware/rtlwifi/rtl8723fw_B.bin lib/firmware/rtlwifi/rtl8821aefw.bin diff --git a/config/rootfiles/core/123/filelists/linux-firmware-updates b/config/rootfiles/core/123/filelists/linux-firmware-updates new file mode 100644 index 000000000..288a8722e --- /dev/null +++ b/config/rootfiles/core/123/filelists/linux-firmware-updates @@ -0,0 +1,356 @@ +/lib/firmware/amdgpu/banks_k_2_smc.bin +/lib/firmware/amdgpu/bonaire_ce.bin +/lib/firmware/amdgpu/bonaire_k_smc.bin +/lib/firmware/amdgpu/bonaire_mc.bin +/lib/firmware/amdgpu/bonaire_me.bin +/lib/firmware/amdgpu/bonaire_mec.bin +/lib/firmware/amdgpu/bonaire_pfp.bin +/lib/firmware/amdgpu/bonaire_rlc.bin +/lib/firmware/amdgpu/bonaire_sdma1.bin +/lib/firmware/amdgpu/bonaire_sdma.bin +/lib/firmware/amdgpu/bonaire_smc.bin +/lib/firmware/amdgpu/bonaire_uvd.bin +/lib/firmware/amdgpu/bonaire_vce.bin +/lib/firmware/amdgpu/carrizo_ce.bin +/lib/firmware/amdgpu/carrizo_me.bin +/lib/firmware/amdgpu/carrizo_mec2.bin +/lib/firmware/amdgpu/carrizo_mec.bin +/lib/firmware/amdgpu/carrizo_pfp.bin +/lib/firmware/amdgpu/carrizo_rlc.bin +/lib/firmware/amdgpu/carrizo_uvd.bin +/lib/firmware/amdgpu/fiji_ce.bin +/lib/firmware/amdgpu/fiji_me.bin +/lib/firmware/amdgpu/fiji_mec2.bin +/lib/firmware/amdgpu/fiji_mec.bin +/lib/firmware/amdgpu/fiji_pfp.bin +/lib/firmware/amdgpu/fiji_rlc.bin +/lib/firmware/amdgpu/fiji_sdma1.bin +/lib/firmware/amdgpu/fiji_sdma.bin +/lib/firmware/amdgpu/fiji_uvd.bin +/lib/firmware/amdgpu/fiji_vce.bin +/lib/firmware/amdgpu/hainan_ce.bin +/lib/firmware/amdgpu/hainan_k_smc.bin +/lib/firmware/amdgpu/hainan_mc.bin +/lib/firmware/amdgpu/hainan_me.bin +/lib/firmware/amdgpu/hainan_pfp.bin +/lib/firmware/amdgpu/hainan_rlc.bin +/lib/firmware/amdgpu/hainan_smc.bin +/lib/firmware/amdgpu/hawaii_ce.bin +/lib/firmware/amdgpu/hawaii_k_smc.bin +/lib/firmware/amdgpu/hawaii_mc.bin +/lib/firmware/amdgpu/hawaii_me.bin +/lib/firmware/amdgpu/hawaii_mec.bin +/lib/firmware/amdgpu/hawaii_pfp.bin +/lib/firmware/amdgpu/hawaii_rlc.bin +/lib/firmware/amdgpu/hawaii_sdma1.bin +/lib/firmware/amdgpu/hawaii_sdma.bin +/lib/firmware/amdgpu/hawaii_smc.bin +/lib/firmware/amdgpu/hawaii_uvd.bin +/lib/firmware/amdgpu/hawaii_vce.bin +/lib/firmware/amdgpu/kabini_ce.bin +/lib/firmware/amdgpu/kabini_me.bin +/lib/firmware/amdgpu/kabini_mec.bin +/lib/firmware/amdgpu/kabini_pfp.bin +/lib/firmware/amdgpu/kabini_rlc.bin +/lib/firmware/amdgpu/kabini_sdma1.bin +/lib/firmware/amdgpu/kabini_sdma.bin +/lib/firmware/amdgpu/kabini_uvd.bin +/lib/firmware/amdgpu/kabini_vce.bin +/lib/firmware/amdgpu/kaveri_ce.bin +/lib/firmware/amdgpu/kaveri_me.bin +/lib/firmware/amdgpu/kaveri_mec2.bin +/lib/firmware/amdgpu/kaveri_mec.bin +/lib/firmware/amdgpu/kaveri_pfp.bin +/lib/firmware/amdgpu/kaveri_rlc.bin +/lib/firmware/amdgpu/kaveri_sdma1.bin +/lib/firmware/amdgpu/kaveri_sdma.bin +/lib/firmware/amdgpu/kaveri_uvd.bin +/lib/firmware/amdgpu/kaveri_vce.bin +/lib/firmware/amdgpu/mullins_ce.bin +/lib/firmware/amdgpu/mullins_me.bin +/lib/firmware/amdgpu/mullins_mec.bin +/lib/firmware/amdgpu/mullins_pfp.bin +/lib/firmware/amdgpu/mullins_rlc.bin +/lib/firmware/amdgpu/mullins_sdma1.bin +/lib/firmware/amdgpu/mullins_sdma.bin +/lib/firmware/amdgpu/mullins_uvd.bin +/lib/firmware/amdgpu/mullins_vce.bin +/lib/firmware/amdgpu/oland_ce.bin +/lib/firmware/amdgpu/oland_k_smc.bin +/lib/firmware/amdgpu/oland_mc.bin +/lib/firmware/amdgpu/oland_me.bin +/lib/firmware/amdgpu/oland_pfp.bin +/lib/firmware/amdgpu/oland_rlc.bin +/lib/firmware/amdgpu/oland_smc.bin +/lib/firmware/amdgpu/pitcairn_ce.bin +/lib/firmware/amdgpu/pitcairn_k_smc.bin +/lib/firmware/amdgpu/pitcairn_mc.bin +/lib/firmware/amdgpu/pitcairn_me.bin +/lib/firmware/amdgpu/pitcairn_pfp.bin +/lib/firmware/amdgpu/pitcairn_rlc.bin +/lib/firmware/amdgpu/pitcairn_smc.bin +/lib/firmware/amdgpu/polaris10_ce_2.bin +/lib/firmware/amdgpu/polaris10_ce.bin +/lib/firmware/amdgpu/polaris10_k_smc.bin +/lib/firmware/amdgpu/polaris10_mc.bin +/lib/firmware/amdgpu/polaris10_me_2.bin +/lib/firmware/amdgpu/polaris10_me.bin +/lib/firmware/amdgpu/polaris10_mec2_2.bin +/lib/firmware/amdgpu/polaris10_mec_2.bin +/lib/firmware/amdgpu/polaris10_mec2.bin +/lib/firmware/amdgpu/polaris10_mec.bin +/lib/firmware/amdgpu/polaris10_pfp_2.bin +/lib/firmware/amdgpu/polaris10_pfp.bin +/lib/firmware/amdgpu/polaris10_rlc.bin +/lib/firmware/amdgpu/polaris10_sdma1.bin +/lib/firmware/amdgpu/polaris10_sdma.bin +/lib/firmware/amdgpu/polaris10_smc.bin +/lib/firmware/amdgpu/polaris10_smc_sk.bin +/lib/firmware/amdgpu/polaris10_uvd.bin +/lib/firmware/amdgpu/polaris10_vce.bin +/lib/firmware/amdgpu/polaris11_ce_2.bin +/lib/firmware/amdgpu/polaris11_ce.bin +/lib/firmware/amdgpu/polaris11_k_smc.bin +/lib/firmware/amdgpu/polaris11_mc.bin +/lib/firmware/amdgpu/polaris11_me_2.bin +/lib/firmware/amdgpu/polaris11_me.bin +/lib/firmware/amdgpu/polaris11_mec2_2.bin +/lib/firmware/amdgpu/polaris11_mec_2.bin +/lib/firmware/amdgpu/polaris11_mec2.bin +/lib/firmware/amdgpu/polaris11_mec.bin +/lib/firmware/amdgpu/polaris11_pfp_2.bin +/lib/firmware/amdgpu/polaris11_pfp.bin +/lib/firmware/amdgpu/polaris11_rlc.bin +/lib/firmware/amdgpu/polaris11_sdma1.bin +/lib/firmware/amdgpu/polaris11_sdma.bin +/lib/firmware/amdgpu/polaris11_smc.bin +/lib/firmware/amdgpu/polaris11_smc_sk.bin +/lib/firmware/amdgpu/polaris11_uvd.bin +/lib/firmware/amdgpu/polaris11_vce.bin +/lib/firmware/amdgpu/polaris12_ce_2.bin +/lib/firmware/amdgpu/polaris12_ce.bin +/lib/firmware/amdgpu/polaris12_mc.bin +/lib/firmware/amdgpu/polaris12_me_2.bin +/lib/firmware/amdgpu/polaris12_me.bin +/lib/firmware/amdgpu/polaris12_mec2_2.bin +/lib/firmware/amdgpu/polaris12_mec_2.bin +/lib/firmware/amdgpu/polaris12_mec2.bin +/lib/firmware/amdgpu/polaris12_mec.bin +/lib/firmware/amdgpu/polaris12_pfp_2.bin +/lib/firmware/amdgpu/polaris12_pfp.bin +/lib/firmware/amdgpu/polaris12_rlc.bin +/lib/firmware/amdgpu/polaris12_sdma1.bin +/lib/firmware/amdgpu/polaris12_sdma.bin +/lib/firmware/amdgpu/polaris12_smc.bin +/lib/firmware/amdgpu/polaris12_uvd.bin +/lib/firmware/amdgpu/polaris12_vce.bin +/lib/firmware/amdgpu/raven_asd.bin +/lib/firmware/amdgpu/raven_ce.bin +/lib/firmware/amdgpu/raven_me.bin +/lib/firmware/amdgpu/raven_mec2.bin +/lib/firmware/amdgpu/raven_mec.bin +/lib/firmware/amdgpu/raven_pfp.bin +/lib/firmware/amdgpu/raven_rlc.bin +/lib/firmware/amdgpu/raven_sdma.bin +/lib/firmware/amdgpu/raven_vcn.bin +/lib/firmware/amdgpu/si58_mc.bin +/lib/firmware/amdgpu/stoney_ce.bin +/lib/firmware/amdgpu/stoney_me.bin +/lib/firmware/amdgpu/stoney_mec.bin +/lib/firmware/amdgpu/stoney_pfp.bin +/lib/firmware/amdgpu/stoney_rlc.bin +/lib/firmware/amdgpu/stoney_uvd.bin +/lib/firmware/amdgpu/tahiti_ce.bin +/lib/firmware/amdgpu/tahiti_k_smc.bin +/lib/firmware/amdgpu/tahiti_mc.bin +/lib/firmware/amdgpu/tahiti_me.bin +/lib/firmware/amdgpu/tahiti_pfp.bin +/lib/firmware/amdgpu/tahiti_rlc.bin +/lib/firmware/amdgpu/tahiti_smc.bin +/lib/firmware/amdgpu/tonga_ce.bin +/lib/firmware/amdgpu/tonga_k_smc.bin +/lib/firmware/amdgpu/tonga_me.bin +/lib/firmware/amdgpu/tonga_mec2.bin +/lib/firmware/amdgpu/tonga_mec.bin +/lib/firmware/amdgpu/tonga_pfp.bin +/lib/firmware/amdgpu/tonga_rlc.bin +/lib/firmware/amdgpu/tonga_sdma1.bin +/lib/firmware/amdgpu/tonga_sdma.bin +/lib/firmware/amdgpu/tonga_smc.bin +/lib/firmware/amdgpu/tonga_uvd.bin +/lib/firmware/amdgpu/topaz_ce.bin +/lib/firmware/amdgpu/topaz_me.bin +/lib/firmware/amdgpu/topaz_mec.bin +/lib/firmware/amdgpu/topaz_pfp.bin +/lib/firmware/amdgpu/vega10_acg_smc.bin +/lib/firmware/amdgpu/vega10_asd.bin +/lib/firmware/amdgpu/vega10_ce.bin +/lib/firmware/amdgpu/vega10_me.bin +/lib/firmware/amdgpu/vega10_mec2.bin +/lib/firmware/amdgpu/vega10_mec.bin +/lib/firmware/amdgpu/vega10_pfp.bin +/lib/firmware/amdgpu/vega10_sdma1.bin +/lib/firmware/amdgpu/vega10_sdma.bin +/lib/firmware/amdgpu/vega10_smc.bin +/lib/firmware/amdgpu/vega10_sos.bin +/lib/firmware/amdgpu/vega10_uvd.bin +/lib/firmware/amdgpu/vega10_vce.bin +/lib/firmware/amdgpu/vegam_ce.bin +/lib/firmware/amdgpu/vegam_me.bin +/lib/firmware/amdgpu/vegam_mec2.bin +/lib/firmware/amdgpu/vegam_mec.bin +/lib/firmware/amdgpu/vegam_pfp.bin +/lib/firmware/amdgpu/vegam_rlc.bin +/lib/firmware/amdgpu/vegam_sdma1.bin +/lib/firmware/amdgpu/vegam_sdma.bin +/lib/firmware/amdgpu/vegam_smc.bin +/lib/firmware/amdgpu/vegam_uvd.bin +/lib/firmware/amdgpu/vegam_vce.bin +/lib/firmware/amdgpu/verde_ce.bin +/lib/firmware/amdgpu/verde_k_smc.bin +/lib/firmware/amdgpu/verde_mc.bin +/lib/firmware/amdgpu/verde_me.bin +/lib/firmware/amdgpu/verde_pfp.bin +/lib/firmware/amdgpu/verde_rlc.bin +/lib/firmware/amdgpu/verde_smc.bin +/lib/firmware/amd-ucode/microcode_amd_fam15h.bin +/lib/firmware/amd-ucode/microcode_amd_fam15h.bin.asc +/lib/firmware/amd-ucode/microcode_amd_fam17h.bin +/lib/firmware/amd-ucode/microcode_amd_fam17h.bin.asc +/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin +/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin +/lib/firmware/ath10k/QCA6174/hw3.0/board-2.bin +/lib/firmware/ath10k/QCA6174/hw3.0/firmware-6.bin +/lib/firmware/ath10k/QCA9377/hw1.0/firmware-5.bin +/lib/firmware/ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt +/lib/firmware/ath10k/QCA9887/hw1.0/firmware-5.bin +/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin +/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin +/lib/firmware/ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt +/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin +/lib/firmware/brcm/BCM-0bb4-0306.hcd +/lib/firmware/brcm/brcmfmac43340-sdio.bin +/lib/firmware/brcm/brcmfmac43362-sdio.bin +/lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt +/lib/firmware/brcm/brcmfmac43430-sdio.bin +/lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt +/lib/firmware/brcm/brcmfmac4354-sdio.bin +/lib/firmware/brcm/brcmfmac4356-pcie.bin +/lib/firmware/brcm/brcmfmac4373.bin +/lib/firmware/brcm/brcmfmac4373-sdio.bin +/lib/firmware/cxgb4/t4fw-1.20.8.0.bin +/lib/firmware/cxgb4/t4fw.bin +/lib/firmware/cxgb4/t5fw-1.20.8.0.bin +/lib/firmware/cxgb4/t5fw.bin +/lib/firmware/cxgb4/t6fw-1.20.8.0.bin +/lib/firmware/cxgb4/t6fw.bin +/lib/firmware/hfi1_dc8051.fw +/lib/firmware/i915/cnl_dmc_ver1_07.bin +/lib/firmware/intel/dsp_fw_bxtn.bin +/lib/firmware/intel/dsp_fw_bxtn_v3366.bin +/lib/firmware/intel/dsp_fw_glk.bin +/lib/firmware/intel/dsp_fw_glk_v2768.bin +/lib/firmware/intel/dsp_fw_glk_v3366.bin +/lib/firmware/intel/dsp_fw_kbl.bin +/lib/firmware/intel/dsp_fw_kbl_v3266.bin +/lib/firmware/intel/dsp_fw_kbl_v3402.bin +/lib/firmware/intel/dsp_fw_kbl_v3420.bin +/lib/firmware/intel/dsp_fw_release.bin +/lib/firmware/intel/dsp_fw_release_v3402.bin +/lib/firmware/intel/ibt-11-5.ddc +/lib/firmware/intel/ibt-11-5.sfi +/lib/firmware/intel/ibt-12-16.ddc +/lib/firmware/intel/ibt-12-16.sfi +/lib/firmware/intel/ibt-17-0-1.ddc +/lib/firmware/intel/ibt-17-0-1.sfi +/lib/firmware/intel/ibt-17-16-1.ddc +/lib/firmware/intel/ibt-17-16-1.sfi +/lib/firmware/intel/ibt-17-1.ddc +/lib/firmware/intel/ibt-17-1.sfi +/lib/firmware/intel/ibt-17-2.ddc +/lib/firmware/intel/ibt-17-2.sfi +/lib/firmware/intel/ibt-18-0-1.ddc +/lib/firmware/intel/ibt-18-0-1.sfi +/lib/firmware/intel/ibt-18-16-1.ddc +/lib/firmware/intel/ibt-18-16-1.sfi +/lib/firmware/intel/ibt-18-1.ddc +/lib/firmware/intel/ibt-18-1.sfi +/lib/firmware/intel/ibt-18-2.ddc +/lib/firmware/intel/ibt-18-2.sfi +/lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq +/lib/firmware/intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq +/lib/firmware/intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq +/lib/firmware/intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq +/lib/firmware/iwlwifi-3160-17.ucode +/lib/firmware/iwlwifi-3168-29.ucode +/lib/firmware/iwlwifi-7260-17.ucode +/lib/firmware/iwlwifi-7265-17.ucode +/lib/firmware/iwlwifi-7265D-29.ucode +/lib/firmware/iwlwifi-8000C-36.ucode +/lib/firmware/iwlwifi-8265-36.ucode +/lib/firmware/iwlwifi-9000-pu-b0-jf-b0-34.ucode +/lib/firmware/iwlwifi-9000-pu-b0-jf-b0-38.ucode +/lib/firmware/iwlwifi-9260-th-b0-jf-b0-34.ucode +/lib/firmware/iwlwifi-9260-th-b0-jf-b0-38.ucode +/lib/firmware/LICENCE.cypress +/lib/firmware/LICENCE.mediatek +/lib/firmware/LICENCE.Netronome +/lib/firmware/LICENSE.amdgpu +/lib/firmware/LICENSE.amd-ucode +/lib/firmware/liquidio/lio_210nv_nic.bin +/lib/firmware/liquidio/lio_210sv_nic.bin +/lib/firmware/liquidio/lio_23xx_nic.bin +/lib/firmware/liquidio/lio_23xx_vsw.bin +/lib/firmware/liquidio/lio_410nv_nic.bin +/lib/firmware/mediatek +/lib/firmware/mellanox/mlxsw_spectrum-13.1620.192.mfa2 +/lib/firmware/mellanox/mlxsw_spectrum-13.1702.6.mfa2 +/lib/firmware/mrvl/pcie8897_uapsta.bin +/lib/firmware/mrvl/pcieusb8997_combo_v4.bin +/lib/firmware/mrvl/sd8897_uapsta.bin +/lib/firmware/mrvl/usb8801_uapsta.bin +/lib/firmware/mrvl/usbusb8997_combo_v4.bin +/lib/firmware/netronome/flower +/lib/firmware/netronome/nic +/lib/firmware/netronome/nic_AMDA0058-0011_2x40.nffw +/lib/firmware/netronome/nic_AMDA0058-0012_2x40.nffw +/lib/firmware/netronome/nic_AMDA0078-0011_1x100.nffw +/lib/firmware/netronome/nic_AMDA0081-0001_1x40.nffw +/lib/firmware/netronome/nic_AMDA0081-0001_4x10.nffw +/lib/firmware/netronome/nic_AMDA0096-0001_2x10.nffw +/lib/firmware/netronome/nic_AMDA0097-0001_2x40.nffw +/lib/firmware/netronome/nic_AMDA0097-0001_4x10_1x40.nffw +/lib/firmware/netronome/nic_AMDA0097-0001_8x10.nffw +/lib/firmware/netronome/nic_AMDA0099-0001_1x10_1x25.nffw +/lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw +/lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw +/lib/firmware/nvidia/gp108 +/lib/firmware/qcom/venus-5.2 +/lib/firmware/qed/qed_init_values-8.10.9.0.bin +/lib/firmware/qed/qed_init_values-8.14.6.0.bin +/lib/firmware/qed/qed_init_values-8.18.9.0.bin +/lib/firmware/qed/qed_init_values-8.20.0.0.bin +/lib/firmware/qed/qed_init_values-8.30.12.0.bin +/lib/firmware/qed/qed_init_values-8.33.12.0.bin +/lib/firmware/qed/qed_init_values_zipped-8.33.11.0.bin +/lib/firmware/qed/qed_init_values_zipped-8.37.2.0.bin +/lib/firmware/rsi/rs9113_ap_bt_dual_mode.rps +/lib/firmware/rsi/rs9113_wlan_bt_dual_mode.rps +/lib/firmware/rsi/rs9113_wlan_qspi.rps +/lib/firmware/rtl_bt/rtl8723d_config.bin +/lib/firmware/rtl_bt/rtl8723d_fw.bin +/lib/firmware/rtl_bt/rtl8821c_config.bin +/lib/firmware/rtl_bt/rtl8821c_fw.bin +/lib/firmware/rtlwifi/rtl8723defw.bin +/lib/firmware/ti-connectivity/wl127x-fw-5-mr.bin +/lib/firmware/ti-connectivity/wl127x-fw-5-plt.bin +/lib/firmware/ti-connectivity/wl127x-fw-5-sr.bin +/lib/firmware/ti-connectivity/wl128x-fw-5-mr.bin +/lib/firmware/ti-connectivity/wl128x-fw-5-plt.bin +/lib/firmware/ti-connectivity/wl128x-fw-5-sr.bin +/lib/firmware/ti-connectivity/wl18xx-fw-4.bin +/lib/firmware/vpu_d.bin +/lib/firmware/vpu_p.bin +/lib/firmware/WHENCE +/lib/firmware/wil6210.brd +/lib/firmware/wil6210.fw diff --git a/lfs/linux-firmware b/lfs/linux-firmware index b5a4cbfd8..c732ace9d 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -24,7 +24,7 @@ include Config -VER = 5d98692 +VER = 7b5835fd37630d18ac0c755329172f6a17c1af29 THISAPP = linux-firmware-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a9e561b3070508614fdaf3386aaa6745 +$(DL_FILE)_MD5 = 09fc172e36a431c44ecb8171c4c07a3c install : $(TARGET) From f32cbd89d9990b2a1017b7ad19ba98f8d38a5c11 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 31 Jul 2018 16:23:07 +0100 Subject: [PATCH 06/21] backup: Bump release number in ISO download script Signed-off-by: Michael Tremer --- config/rootfiles/core/123/filelists/files | 1 + src/scripts/backupiso | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index bb833fc3a..48f2e0e67 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/123/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/backupiso usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat var/ipfire/backup/exclude diff --git a/src/scripts/backupiso b/src/scripts/backupiso index caafe92fe..495ff394e 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -18,8 +18,8 @@ esac COREVER=$(cat /opt/pakfire/db/core/mine) # FIXME: edit this lines before release -URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core$COREVER/" -ISO="ipfire-2.19.$arch-full-core$COREVER.iso" +URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core$COREVER/" +ISO="ipfire-2.21.$arch-full-core$COREVER.iso" if [ -z $1 ]; then echo usage: $0 backup-file From 79bcc6f769eff10558db6a2c5d7247e5ced508bb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 3 Aug 2018 16:13:12 +0200 Subject: [PATCH 07/21] collectd: fix cpufreq plugin enable Signed-off-by: Arne Fitzenreiter --- src/initscripts/system/collectd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 1c685b44a..cdb8693ae 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -92,7 +92,7 @@ case "$1" in fi # Enable cpufreq plugin if cpufreq found - if [ ! -e /sys/devices/system/cpu/cpufreq/policy0/*_cur_freq ]; then + if [ ! -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq ]; then sed -i -e "s|^LoadPlugin cpufreq|#LoadPlugin cpufreq|g" /etc/collectd.conf else sed -i -e "s|^#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf From 1fb7f56e11729f27cab7c5c3349d2c05a8e41a53 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 4 Aug 2018 13:39:00 +0100 Subject: [PATCH 08/21] make.sh: Add command to update list of contributors Signed-off-by: Michael Tremer --- html/cgi-bin/credits.cgi | 74 +++++++++++++++++++++++++++++++++++++++- make.sh | 27 ++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 7cda40251..eb76de72e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -59,7 +59,79 @@ print <

- Core Developers: + +Michael Tremer, +Arne Fitzenreiter, +Christian Schmidt, +Alexander Marx, +Matthias Fischer, +Stefan Schantl, +Jan Paul Tuecking, +Jonatan Schlag, +Dirk Wagner, +Marcel Lorenz, +Erik Kapfer, +Peter Müller, +Alf Høgemark, +Ben Schweikert, +Peter Pfeiffer, +Daniel Glanzmann, +Heiner Schmeling, +Timo Eissler, +Daniel Weismüller, +Jan Lentfer, +Marcus Scholz, +Ersan Yildirim, +Joern-Ingo Weigert, +Alfred Haas, +Lars Schuhmacher, +Rene Zingel, +Sascha Kilian, +Wolfgang Apolinarski, +Ronald Wiesinger, +Stephan Feddersen, +Daniel Weismueller, +Justin Luth, +Michael Eitelwein, +Bernhard Bitsch, +Dominik Hassler, +Larsen, +Gabriel Rolland, +Anton D. Seliverstov, +Bernhard Bittner, +David Kleuker, +Hans Horsten, +Jakub Ratajczak, +Jorrit de Jonge, +Przemek Zdroik, +Andrew Bellows, +Axel Gembe, +Bernhard Held, +Christoph Anderegg, +Daniel Aleksandersen, +Douglas Duckworth, +Eberhard Beilharz, +Ersan Yildirim Ersan, +Gerd Hoerst, +H. Horsten, +Heino Gutschmidt, +Jan Behrens, +Jochen Kauz, +Julian McConnell, +Jörn-Ingo Weigert, +Kay-Michael Köhler, +Kim Wölfel, +Logan Schmidt, +Nico Prenzel, +Osmar Gonzalez, +Paul T. Simmons, +Robert Möker, +Stefan Ernst, +Stefan Ferstl, +Thomas Ebert, +Timmothy Wilson, +Umberto Parma +

    diff --git a/make.sh b/make.sh index 47e1420d8..f26f713c8 100755 --- a/make.sh +++ b/make.sh @@ -871,6 +871,28 @@ update_language_list() { done | sort -u > "${path}/LINGUAS" } +contributors() { + local commits name + + git shortlog --summary --numbered | while read -r commits name; do + echo "${name}" + done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Development$" -e "@" -e "#$" +} + +update_contributors() { + echo -n "Updating list of contributors" + + local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")" + + # Edit contributors into credits.cgi + awk -i inplace \ + "//{ p=1; print; printf \"${contributors}\n\"}//{ p=0 } !p" \ + "${BASEDIR}/html/cgi-bin/credits.cgi" + + print_status DONE + return 0 +} + # Load configuration file if [ -f .config ]; then . .config @@ -1864,8 +1886,11 @@ lang) update_language_list ${BASEDIR}/src/setup/po print_status DONE ;; +update-contributors) + update_contributors + ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}" cat doc/make.sh-usage ;; esac From b856ad695a29059939b16789d410ef52448c6160 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 4 Aug 2018 08:35:05 +0200 Subject: [PATCH 09/21] rng-tools: Update to 6.3.1 Bugfix release, for details see: https://github.com/nhorman/rng-tools/releases Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/rng-tools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/rng-tools b/lfs/rng-tools index f9b79d108..c7a358e56 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team # # # # This 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 = 6.2 +VER = 6.3.1 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 = a596ecd89afc584afe48758923fe6195 +$(DL_FILE)_MD5 = fe2d38e39ff02d0c7b3585407d51dc64 install : $(TARGET) From 351567966d83908eb3de7108f79c4eab7a37e1e0 Mon Sep 17 00:00:00 2001 From: Erik Kapfer Date: Sat, 4 Aug 2018 13:49:00 +0200 Subject: [PATCH 10/21] nginx: Update to version 1.15.1 Deleted last slash in --prefix configure option to prevent such --> https://forum.ipfire.org/viewtopic.php?t=19213#p109787 problems. Signed-off-by: Michael Tremer --- lfs/nginx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/nginx b/lfs/nginx index 0fa6250f3..ecbe16221 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-14 IPFire Team # +# Copyright (C) 2007-18 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.13.7 +VER = 1.15.1 THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 7 +PAK_VER = 8 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d +$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 install : $(TARGET) @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr/share/nginx/ \ + --prefix=/usr/share/nginx \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ --pid-path=/var/run/nginx.pid \ From 4a50681905af88adb0c4c19e6bc7dfda3dbe3606 Mon Sep 17 00:00:00 2001 From: Erik Kapfer Date: Sat, 4 Aug 2018 13:52:32 +0200 Subject: [PATCH 11/21] tor: Update to version 0.3.3.9 Signed-off-by: Michael Tremer --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index c646e738d..dcb99adb5 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.3.3.7 +VER = 0.3.3.9 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 29 +PAK_VER = 30 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5288d8de30c516073ad13fee44f6fdf3 +$(DL_FILE)_MD5 = 16b24bda0772dc3d5c4c05254ec4bce7 install : $(TARGET) From b403b04a139c02156829d8d21943bc69b2cf0c53 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 5 Aug 2018 13:32:36 +0200 Subject: [PATCH 12/21] initrd: add early microcode load Signed-off-by: Arne Fitzenreiter --- config/dracut/dracut.conf | 3 +++ config/rootfiles/core/123/update.sh | 3 +++ lfs/cdrom | 2 +- lfs/linux | 2 +- lfs/linux-initrd | 2 +- src/paks/linux-pae/install.sh | 2 +- src/scripts/rebuild-initrd | 2 +- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf index 52bba9c62..e9bd566b6 100644 --- a/config/dracut/dracut.conf +++ b/config/dracut/dracut.conf @@ -31,6 +31,9 @@ filesystems+="reiserfs vfat xfs" #hostonly="yes" # +# Load microcode for the CPU early +early_microcode=yes + # install local /etc/mdadm.conf #mdadmconf="no" diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index cf488ec49..76eff74bb 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -51,6 +51,9 @@ ldconfig /etc/init.d/unbound restart /etc/init.d/squid start +# rebuild initrd to add early microcode updates +rebuild-initrd + # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/cdrom b/lfs/cdrom index 6382034b5..08bd609c4 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog ifneq "$(BUILD_PLATFORM)" "arm" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz - dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire + dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire 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 diff --git a/lfs/linux b/lfs/linux index c5d8a8e88..b5877fc5b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 75 +PAK_VER = 76 DEPS = "" KERNEL_ARCH = $(BUILD_ARCH) diff --git a/lfs/linux-initrd b/lfs/linux-initrd index 1e6b071f9..93f21078e 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi" ifneq "$(KCFG)" "-pae" # Create initramfs images - dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) + dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) ifeq "$(KCFG)" "-kirkwood" # cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX) diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index e5f82c567..fd71621d5 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae # # Made initramdisk # -/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae +/usr/bin/dracut --force --early-microcode --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae if [ -e /boot/grub/grub.cfg ]; then # diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 06f30bbf0..91e68ca57 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -24,4 +24,4 @@ # KVER=`uname -r | cut -d"-" -f1` -dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire +dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire From 7529349754e0f99f626a36c895347806fc6f2dd2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 5 Aug 2018 17:19:52 +0200 Subject: [PATCH 13/21] kernel: apu2 leds: update string for newer bios Signed-off-by: Arne Fitzenreiter --- src/patches/linux/linux-4.9.8-apu_leds.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/patches/linux/linux-4.9.8-apu_leds.patch b/src/patches/linux/linux-4.9.8-apu_leds.patch index d34017896..27da2f166 100644 --- a/src/patches/linux/linux-4.9.8-apu_leds.patch +++ b/src/patches/linux/linux-4.9.8-apu_leds.patch @@ -175,7 +175,7 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86 + goto out; + + product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (!product || strcmp(product, "apu2")) ++ if (!product || (strcmp(product, "PC Engines apu2") && strcmp(product, "apu2")) ) + goto out; + + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", From 07664187ac7323af8cbcce166be6fb5e6786fdca Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 7 Aug 2018 19:05:35 +0200 Subject: [PATCH 14/21] kernel: fix build on armv5tel Signed-off-by: Arne Fitzenreiter --- lfs/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/linux b/lfs/linux index b5877fc5b..cfdcc4a42 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,6 @@ CXXFLAGS = PAK_VER = 76 DEPS = "" -KERNEL_ARCH = $(BUILD_ARCH) KERNEL_TARGET = bzImage HEADERS_ARCH = $(BUILD_PLATFORM) @@ -52,6 +51,7 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif ifeq "$(BUILD_ARCH)" "armv5tel" + KERNEL_ARCH = arm KERNEL_TARGET = zImage endif From 7f841117c5377136b85c878fa7252e9a4458a526 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 8 Aug 2018 10:26:38 +0200 Subject: [PATCH 15/21] kernel: fix build on x86_64 oops i deleted a wrong line... Signed-off-by: Arne Fitzenreiter --- lfs/linux | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/linux b/lfs/linux index cfdcc4a42..5e7b334cd 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,8 +37,9 @@ CXXFLAGS = PAK_VER = 76 DEPS = "" -KERNEL_TARGET = bzImage HEADERS_ARCH = $(BUILD_PLATFORM) +KERNEL_ARCH = $(BUILD_ARCH) +KERNEL_TARGET = bzImage ifeq "$(BUILD_ARCH)" "i586" KERNEL_ARCH = i386 From ebbca90d70765fac6a42d8ebcc8ec98c1c38f434 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 9 Aug 2018 16:28:14 +0100 Subject: [PATCH 16/21] openssh: Disable password authentication by default Signed-off-by: Michael Tremer --- lfs/openssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/openssh b/lfs/openssh index 9d551f198..a88b2d126 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?Protocol .*$$/Protocol 2/' \ -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \ -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ - -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \ + -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication no/' \ -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \ -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \ -e 's/^#\?UsePAM .*$$//' \ From 6064cd87ccfdccc02baaf17e75184ca378977d1c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 Aug 2018 11:08:09 +0100 Subject: [PATCH 17/21] Revert "avahi: Drop package" This reverts commit aa6ee515c59cd42b12d69981329a2438e4d6e933. Signed-off-by: Michael Tremer --- config/avahi/avahi | 45 +++++++++ config/avahi/smb.service | 9 ++ config/backup/includes/avahi | 1 + config/rootfiles/packages/avahi | 172 ++++++++++++++++++++++++++++++++ config/rootfiles/packages/cups | 3 + lfs/avahi | 99 ++++++++++++++++++ lfs/cups | 8 +- make.sh | 1 + src/paks/avahi/install.sh | 37 +++++++ src/paks/avahi/uninstall.sh | 28 ++++++ src/paks/avahi/update.sh | 26 +++++ 11 files changed, 425 insertions(+), 4 deletions(-) create mode 100755 config/avahi/avahi create mode 100644 config/avahi/smb.service create mode 100644 config/backup/includes/avahi create mode 100644 config/rootfiles/packages/avahi create mode 100644 lfs/avahi create mode 100644 src/paks/avahi/install.sh create mode 100644 src/paks/avahi/uninstall.sh create mode 100644 src/paks/avahi/update.sh diff --git a/config/avahi/avahi b/config/avahi/avahi new file mode 100755 index 000000000..7413f56f1 --- /dev/null +++ b/config/avahi/avahi @@ -0,0 +1,45 @@ +#!/bin/sh +# Begin $rc_base/init.d/avahi + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting avahi..." + loadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + stop) + boot_mesg "Stopping avahi..." + /usr/sbin/avahi-daemon -k + ;; + + reload) + boot_mesg "Reloading avahi..." + reloadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/avahi-daemon -c + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/avahi diff --git a/config/avahi/smb.service b/config/avahi/smb.service new file mode 100644 index 000000000..d89535438 --- /dev/null +++ b/config/avahi/smb.service @@ -0,0 +1,9 @@ + + + + Samba Shares on %h + + _smb._tcp + 139 + + diff --git a/config/backup/includes/avahi b/config/backup/includes/avahi new file mode 100644 index 000000000..7f32af64d --- /dev/null +++ b/config/backup/includes/avahi @@ -0,0 +1 @@ +/etc/avahi/avahi-daemon.conf diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi new file mode 100644 index 000000000..4a3b57232 --- /dev/null +++ b/config/rootfiles/packages/avahi @@ -0,0 +1,172 @@ +etc/avahi +etc/avahi/avahi-autoipd.action +etc/avahi/avahi-daemon.conf +etc/avahi/avahi-dnsconfd.action +etc/avahi/hosts +etc/avahi/services +etc/avahi/services/sftp-ssh.service +etc/avahi/services/smb.service +etc/avahi/services/ssh.service +etc/dbus-1/system.d/avahi-dbus.conf +etc/rc.d/init.d/avahi +usr/bin/avahi-browse +usr/bin/avahi-browse-domains +usr/bin/avahi-publish +usr/bin/avahi-publish-address +usr/bin/avahi-publish-service +usr/bin/avahi-resolve +usr/bin/avahi-resolve-address +usr/bin/avahi-resolve-host-name +usr/bin/avahi-set-host-name +#usr/include/avahi-client +#usr/include/avahi-client/client.h +#usr/include/avahi-client/lookup.h +#usr/include/avahi-client/publish.h +#usr/include/avahi-common +#usr/include/avahi-common/address.h +#usr/include/avahi-common/alternative.h +#usr/include/avahi-common/cdecl.h +#usr/include/avahi-common/defs.h +#usr/include/avahi-common/domain.h +#usr/include/avahi-common/error.h +#usr/include/avahi-common/gccmacro.h +#usr/include/avahi-common/llist.h +#usr/include/avahi-common/malloc.h +#usr/include/avahi-common/rlist.h +#usr/include/avahi-common/simple-watch.h +#usr/include/avahi-common/strlst.h +#usr/include/avahi-common/thread-watch.h +#usr/include/avahi-common/timeval.h +#usr/include/avahi-common/watch.h +#usr/include/avahi-core +#usr/include/avahi-core/core.h +#usr/include/avahi-core/log.h +#usr/include/avahi-core/lookup.h +#usr/include/avahi-core/publish.h +#usr/include/avahi-core/rr.h +#usr/include/avahi-glib +#usr/include/avahi-glib/glib-malloc.h +#usr/include/avahi-glib/glib-watch.h +#usr/include/avahi-gobject +#usr/include/avahi-gobject/ga-client.h +#usr/include/avahi-gobject/ga-entry-group.h +#usr/include/avahi-gobject/ga-enums.h +#usr/include/avahi-gobject/ga-error.h +#usr/include/avahi-gobject/ga-record-browser.h +#usr/include/avahi-gobject/ga-service-browser.h +#usr/include/avahi-gobject/ga-service-resolver.h +#usr/lib/avahi +usr/lib/avahi/service-types.db +#usr/lib/libavahi-client.a +#usr/lib/libavahi-client.la +#usr/lib/libavahi-client.so +usr/lib/libavahi-client.so.3 +usr/lib/libavahi-client.so.3.2.9 +#usr/lib/libavahi-common.a +#usr/lib/libavahi-common.la +#usr/lib/libavahi-common.so +usr/lib/libavahi-common.so.3 +usr/lib/libavahi-common.so.3.5.3 +#usr/lib/libavahi-core.a +#usr/lib/libavahi-core.la +#usr/lib/libavahi-core.so +usr/lib/libavahi-core.so.7 +usr/lib/libavahi-core.so.7.0.2 +#usr/lib/libavahi-glib.a +#usr/lib/libavahi-glib.la +#usr/lib/libavahi-glib.so +usr/lib/libavahi-glib.so.1 +usr/lib/libavahi-glib.so.1.0.2 +#usr/lib/libavahi-gobject.a +#usr/lib/libavahi-gobject.la +#usr/lib/libavahi-gobject.so +usr/lib/libavahi-gobject.so.0 +usr/lib/libavahi-gobject.so.0.0.4 +#usr/lib/pkgconfig/avahi-client.pc +#usr/lib/pkgconfig/avahi-core.pc +#usr/lib/pkgconfig/avahi-glib.pc +#usr/lib/pkgconfig/avahi-gobject.pc +usr/lib/python2.7/site-packages/avahi +usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py +usr/sbin/avahi-autoipd +usr/sbin/avahi-daemon +usr/sbin/avahi-dnsconfd +usr/share/avahi +usr/share/avahi/avahi-service.dtd +usr/share/avahi/service-types +#usr/share/dbus-1/interfaces +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml +usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml +#usr/share/locale/ach +#usr/share/locale/ach/LC_MESSAGES +#usr/share/locale/ach/LC_MESSAGES/avahi.mo +#usr/share/locale/ar/LC_MESSAGES/avahi.mo +#usr/share/locale/bg/LC_MESSAGES/avahi.mo +#usr/share/locale/ca/LC_MESSAGES/avahi.mo +#usr/share/locale/cs/LC_MESSAGES/avahi.mo +#usr/share/locale/da/LC_MESSAGES/avahi.mo +#usr/share/locale/de/LC_MESSAGES/avahi.mo +#usr/share/locale/el/LC_MESSAGES/avahi.mo +#usr/share/locale/en_AU/LC_MESSAGES/avahi.mo +#usr/share/locale/en_CA/LC_MESSAGES/avahi.mo +#usr/share/locale/en_GB/LC_MESSAGES/avahi.mo +#usr/share/locale/en_NZ +#usr/share/locale/en_NZ/LC_MESSAGES +#usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo +#usr/share/locale/eo/LC_MESSAGES/avahi.mo +#usr/share/locale/es/LC_MESSAGES/avahi.mo +#usr/share/locale/et/LC_MESSAGES/avahi.mo +#usr/share/locale/fa/LC_MESSAGES/avahi.mo +#usr/share/locale/fi/LC_MESSAGES/avahi.mo +#usr/share/locale/fo +#usr/share/locale/fo/LC_MESSAGES +#usr/share/locale/fo/LC_MESSAGES/avahi.mo +#usr/share/locale/fr/LC_MESSAGES/avahi.mo +#usr/share/locale/gl/LC_MESSAGES/avahi.mo +#usr/share/locale/he/LC_MESSAGES/avahi.mo +#usr/share/locale/hu/LC_MESSAGES/avahi.mo +#usr/share/locale/id/LC_MESSAGES/avahi.mo +#usr/share/locale/it/LC_MESSAGES/avahi.mo +#usr/share/locale/ja/LC_MESSAGES/avahi.mo +#usr/share/locale/ko/LC_MESSAGES/avahi.mo +#usr/share/locale/lv/LC_MESSAGES/avahi.mo +#usr/share/locale/ms/LC_MESSAGES/avahi.mo +#usr/share/locale/nl/LC_MESSAGES/avahi.mo +#usr/share/locale/pl/LC_MESSAGES/avahi.mo +#usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo +#usr/share/locale/ro/LC_MESSAGES/avahi.mo +#usr/share/locale/ru/LC_MESSAGES/avahi.mo +#usr/share/locale/sk/LC_MESSAGES/avahi.mo +#usr/share/locale/sl/LC_MESSAGES/avahi.mo +#usr/share/locale/sr/LC_MESSAGES/avahi.mo +#usr/share/locale/sr@latin/LC_MESSAGES/avahi.mo +#usr/share/locale/sv/LC_MESSAGES/avahi.mo +#usr/share/locale/tr/LC_MESSAGES/avahi.mo +#usr/share/locale/uk/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo +#usr/share/man/man1/avahi-bookmarks.1 +#usr/share/man/man1/avahi-browse-domains.1 +#usr/share/man/man1/avahi-browse.1 +#usr/share/man/man1/avahi-publish-address.1 +#usr/share/man/man1/avahi-publish-service.1 +#usr/share/man/man1/avahi-publish.1 +#usr/share/man/man1/avahi-resolve-address.1 +#usr/share/man/man1/avahi-resolve-host-name.1 +#usr/share/man/man1/avahi-resolve.1 +#usr/share/man/man1/avahi-set-host-name.1 +#usr/share/man/man5/avahi-daemon.conf.5 +#usr/share/man/man5/avahi.hosts.5 +#usr/share/man/man5/avahi.service.5 +#usr/share/man/man8/avahi-autoipd.8 +#usr/share/man/man8/avahi-autoipd.action.8 +#usr/share/man/man8/avahi-daemon.8 +#usr/share/man/man8/avahi-dnsconfd.8 +#usr/share/man/man8/avahi-dnsconfd.action.8 diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 05a618dd3..8234be5e1 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -17,6 +17,7 @@ usr/bin/cancel #usr/bin/cups-config usr/bin/cupstestdsc usr/bin/cupstestppd +usr/bin/ippfind usr/bin/ipptool usr/bin/lp usr/bin/lpoptions @@ -47,6 +48,7 @@ usr/bin/ppdpo #usr/include/cups/versioning.h usr/lib/cups usr/lib/cups/backend +usr/lib/cups/backend/dnssd usr/lib/cups/backend/http usr/lib/cups/backend/https usr/lib/cups/backend/ipp @@ -721,6 +723,7 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man1/cups.1.gz #usr/share/man/man1/cupstestdsc.1.gz #usr/share/man/man1/cupstestppd.1.gz +#usr/share/man/man1/ippfind.1.gz #usr/share/man/man1/ipptool.1.gz #usr/share/man/man1/lp.1.gz #usr/share/man/man1/lpoptions.1.gz diff --git a/lfs/avahi b/lfs/avahi new file mode 100644 index 000000000..adcb84c54 --- /dev/null +++ b/lfs/avahi @@ -0,0 +1,99 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.6.32 + +THISAPP = avahi-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = avahi +PAK_VER = 4 + +DEPS = "dbus libdaemon" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-avahi-user=avahi \ + --disable-qt3 \ + --disable-qt4 \ + --disable-gtk \ + --disable-gtk3 \ + --disable-pygtk \ + --disable-python-dbus \ + --disable-mono \ + --disable-monodoc \ + --with-distro=none + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/ + cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index a9e2b1ac0..47f71f876 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 16 +PAK_VER = 15 -DEPS = "cups-filters dbus ghostscript krb5 libtiff" +DEPS = "avahi cups-filters dbus ghostscript krb5 libtiff" ############################################################################### # Top-level Rules @@ -83,10 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/var/ipfire \ --localstatedir=/var \ --enable-debug \ + --enable-avahi \ --enable-dbus \ --enable-gnutls \ - --enable-libusb \ - --disable-avahi + --enable-libusb cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index f26f713c8..f1b2dc209 100755 --- a/make.sh +++ b/make.sh @@ -1329,6 +1329,7 @@ buildipfire() { lfsmake2 dbus lfsmake2 intltool lfsmake2 libdaemon + lfsmake2 avahi lfsmake2 cups lfsmake2 lcms2 lfsmake2 ghostscript diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh new file mode 100644 index 000000000..cb0266bae --- /dev/null +++ b/src/paks/avahi/install.sh @@ -0,0 +1,37 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +# Create Username and group. +getent group avahi >/dev/null || groupadd -r avahi +getent passwd avahi >/dev/null || \ + useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \ + -c "Avahi mDNS daemon" avahi + +extract_files +ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi +ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi +ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh new file mode 100644 index 000000000..1c8e67c9a --- /dev/null +++ b/src/paks/avahi/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*avahi diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/avahi/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh From 467581b8ab2c9a62a2239a7dcea4fe40fe70093c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 Aug 2018 11:19:25 +0100 Subject: [PATCH 18/21] avahi: Update to 0.7 Signed-off-by: Michael Tremer --- config/rootfiles/packages/avahi | 8 ++------ lfs/avahi | 13 ++++++++++--- lfs/cups | 2 +- {config/avahi => src/initscripts/packages}/avahi | 0 4 files changed, 13 insertions(+), 10 deletions(-) rename {config/avahi => src/initscripts/packages}/avahi (100%) diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index 4a3b57232..a394cc20a 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -56,7 +56,6 @@ usr/bin/avahi-set-host-name #usr/include/avahi-gobject/ga-service-browser.h #usr/include/avahi-gobject/ga-service-resolver.h #usr/lib/avahi -usr/lib/avahi/service-types.db #usr/lib/libavahi-client.a #usr/lib/libavahi-client.la #usr/lib/libavahi-client.so @@ -81,19 +80,16 @@ usr/lib/libavahi-glib.so.1.0.2 #usr/lib/libavahi-gobject.la #usr/lib/libavahi-gobject.so usr/lib/libavahi-gobject.so.0 -usr/lib/libavahi-gobject.so.0.0.4 +usr/lib/libavahi-gobject.so.0.0.5 #usr/lib/pkgconfig/avahi-client.pc #usr/lib/pkgconfig/avahi-core.pc #usr/lib/pkgconfig/avahi-glib.pc #usr/lib/pkgconfig/avahi-gobject.pc -usr/lib/python2.7/site-packages/avahi -usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py usr/sbin/avahi-autoipd usr/sbin/avahi-daemon usr/sbin/avahi-dnsconfd usr/share/avahi usr/share/avahi/avahi-service.dtd -usr/share/avahi/service-types #usr/share/dbus-1/interfaces usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml @@ -139,6 +135,7 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml #usr/share/locale/lv/LC_MESSAGES/avahi.mo #usr/share/locale/ms/LC_MESSAGES/avahi.mo #usr/share/locale/nl/LC_MESSAGES/avahi.mo +#usr/share/locale/oc/LC_MESSAGES/avahi.mo #usr/share/locale/pl/LC_MESSAGES/avahi.mo #usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo #usr/share/locale/ro/LC_MESSAGES/avahi.mo @@ -152,7 +149,6 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml #usr/share/locale/uk/LC_MESSAGES/avahi.mo #usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo #usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo -#usr/share/man/man1/avahi-bookmarks.1 #usr/share/man/man1/avahi-browse-domains.1 #usr/share/man/man1/avahi-browse.1 #usr/share/man/man1/avahi-publish-address.1 diff --git a/lfs/avahi b/lfs/avahi index adcb84c54..ff171f001 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -24,7 +24,7 @@ include Config -VER = 0.6.32 +VER = 0.7 THISAPP = avahi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 22b5e705d3eabb31d26f2e1e7b074013 +$(DL_FILE)_MD5 = d76c59d0882ac6c256d70a2a585362a6 install : $(TARGET) @@ -87,13 +87,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-gtk \ --disable-gtk3 \ --disable-pygtk \ + --disable-python \ + --disable-pygobject \ --disable-python-dbus \ --disable-mono \ --disable-monodoc \ --with-distro=none cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/ + + # Install configuration for samba cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + + # Install initscript + $(call INSTALL_INITSCRIPT,avahi) + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index 47f71f876..ae0c603b7 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 15 +PAK_VER = 17 DEPS = "avahi cups-filters dbus ghostscript krb5 libtiff" diff --git a/config/avahi/avahi b/src/initscripts/packages/avahi similarity index 100% rename from config/avahi/avahi rename to src/initscripts/packages/avahi From 4ec7c2936dc06cf3096134e955f4e6ad779c96ae Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 Aug 2018 12:18:29 +0100 Subject: [PATCH 19/21] avahi: Build with -U_FORTIFY_SOURCE Avahi locks up when built with -D_FORTIFY_SOURCE=2 Signed-off-by: Michael Tremer --- lfs/avahi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lfs/avahi b/lfs/avahi index ff171f001..d33d7b5e3 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -36,6 +36,8 @@ PAK_VER = 4 DEPS = "dbus libdaemon" +CFLAGS += -U_FORTIFY_SOURCE + ############################################################################### # Top-level Rules ############################################################################### From 5221a852e80526d188306b05202e595616f0c065 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 Aug 2018 12:20:06 +0100 Subject: [PATCH 20/21] avahi: Build without dbus We don't have any services connected to dbus, so what is the point of avahi trying to connect to it? Signed-off-by: Michael Tremer --- config/rootfiles/packages/avahi | 11 ----------- lfs/avahi | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index a394cc20a..bf8a387c3 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -7,7 +7,6 @@ etc/avahi/services etc/avahi/services/sftp-ssh.service etc/avahi/services/smb.service etc/avahi/services/ssh.service -etc/dbus-1/system.d/avahi-dbus.conf etc/rc.d/init.d/avahi usr/bin/avahi-browse usr/bin/avahi-browse-domains @@ -90,16 +89,6 @@ usr/sbin/avahi-daemon usr/sbin/avahi-dnsconfd usr/share/avahi usr/share/avahi/avahi-service.dtd -#usr/share/dbus-1/interfaces -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml -usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml #usr/share/locale/ach #usr/share/locale/ach/LC_MESSAGES #usr/share/locale/ach/LC_MESSAGES/avahi.mo diff --git a/lfs/avahi b/lfs/avahi index d33d7b5e3..682ac96a5 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi PAK_VER = 4 -DEPS = "dbus libdaemon" +DEPS = "libdaemon" CFLAGS += -U_FORTIFY_SOURCE @@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-gtk \ --disable-gtk3 \ --disable-pygtk \ + --disable-dbus \ --disable-python \ --disable-pygobject \ --disable-python-dbus \ From 98ce8975201d48754c89fb2c476571d99d9ae109 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 10 Aug 2018 12:20:38 +0100 Subject: [PATCH 21/21] avahi: Bump package version Signed-off-by: Michael Tremer --- lfs/avahi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/avahi b/lfs/avahi index 682ac96a5..c476e7e45 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 4 +PAK_VER = 5 DEPS = "libdaemon"