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 3ed1c621cf45bcd1dc13f7569263bb301eb8ae9d (commit) via 637eb1eda5f444199c8e7daba5a62726e2d24bd1 (commit) via a996dd211f528a7f38bdc2cd1384f90d4495683d (commit) via c5845b096d69375105837d17a55462afc5a0b2eb (commit) via be5c29b037f621ff3e74a56c13e5c337510483cf (commit) via 68fa5e78100765948cf60fd6d2d4f7404880d936 (commit) via d3ae3b9974638308876c461889d19903d5e66208 (commit) from cad9257ae28d7c869f17ce0678820863db574589 (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 3ed1c621cf45bcd1dc13f7569263bb301eb8ae9d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 24 16:08:22 2018 +0000
Revert "Add Intel microcode updates from Jan 2018"
This reverts commit d404b1dba2a357e3683dbf62b95cefc41075c4ef.
Intel has pulled these microcode updates because of random system reboots and systems becoming unstable.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 637eb1eda5f444199c8e7daba5a62726e2d24bd1 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 24 16:07:58 2018 +0000
Revert "core118: Ship microcode updates for Intel processors"
This reverts commit c015d425d177a18927f56cebd0d1b4d29a827d8b.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a996dd211f528a7f38bdc2cd1384f90d4495683d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 24 16:07:11 2018 +0000
core118: Ship updated wget
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c5845b096d69375105837d17a55462afc5a0b2eb Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jan 24 08:32:24 2018 +0100
wget: Update to 1.9.4
Excerpts from changelog (Details => http://git.savannah.gnu.org/cgit/wget.git):
"Switch off compression by default
Gzip compression has a number of bugs which need to be ironed out before we can support it by default. Some of these stem from a misunderstanding of the HTTP spec, but a lot of them are also due to many web servers not being compliant with RFC 7231.
With this commit, I am marking GZip compression support as experimental in GNU Wget pending further investigation and the addition of tests.
* src/http.c (gethttp): Fix bug that prevented all files from being decompressed
* src/host.c (sufmatch): Fix to domain matching
Replace HTTP urls with HTTPS where valid
Avoid redirecting output to file when tcgetpgrp fails * src/log.c (check_redirect_output): tcgetpgrp can return -1 (ENOTTY), be sure to check whether a valid controlling terminal exists before redirecting. (Fixes: #51181)
Fix heap overflow in HTTP protocol handling (CVE-2017-13090)
Fix stack overflow in HTTP protocol handling (CVE-2017-13089)"
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit be5c29b037f621ff3e74a56c13e5c337510483cf Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jan 24 08:10:42 2018 +0100
nano: Update to 2.9.2
For details see: https://www.nano-editor.org/news.php
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 68fa5e78100765948cf60fd6d2d4f7404880d936 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 24 16:06:32 2018 +0000
core118: Ship updated sed
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d3ae3b9974638308876c461889d19903d5e66208 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jan 23 22:18:48 2018 +0100
sed: Update to 4.4
Hi,
'sed' hasn't been updated in IPFire for a few years - I thought it could be worthy an update:
Excerpt from 'NEWS':
"* Noteworthy changes in release 4.4 (2017-02-03) [stable]
sed could segfault when invoked with specific combination of newlines in the input and regex pattern. [Bug introduced in sed-4.3]"
"Noteworthy changes" from release 4.2.2 to 4.3 can be found in 'NEWS' file, too much to list them all...
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/dracut/dracut.conf | 3 - config/rootfiles/common/i586/intel-microcode | 95 ---------------------- config/rootfiles/common/x86_64/intel-microcode | 95 ---------------------- config/rootfiles/core/118/filelists/files | 1 - .../core/118/filelists/i586/intel-microcode | 1 - .../{oldcore/100 => core/118}/filelists/sed | 0 .../{oldcore/104 => core/118}/filelists/wget | 0 .../core/118/filelists/x86_64/intel-microcode | 1 - config/rootfiles/core/118/update.sh | 11 +-- lfs/cdrom | 2 +- lfs/intel-microcode | 80 ------------------ lfs/linux-initrd | 2 +- lfs/nano | 8 +- lfs/sed | 10 +-- lfs/wget | 6 +- make.sh | 1 - src/paks/linux-pae/install.sh | 2 +- src/scripts/rebuild-initrd | 2 +- 18 files changed, 17 insertions(+), 303 deletions(-) delete mode 100644 config/rootfiles/common/i586/intel-microcode delete mode 100644 config/rootfiles/common/x86_64/intel-microcode delete mode 120000 config/rootfiles/core/118/filelists/i586/intel-microcode copy config/rootfiles/{oldcore/100 => core/118}/filelists/sed (100%) copy config/rootfiles/{oldcore/104 => core/118}/filelists/wget (100%) delete mode 120000 config/rootfiles/core/118/filelists/x86_64/intel-microcode delete mode 100644 lfs/intel-microcode
Difference in files: diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf index e9bd566b6..52bba9c62 100644 --- a/config/dracut/dracut.conf +++ b/config/dracut/dracut.conf @@ -31,9 +31,6 @@ 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/common/i586/intel-microcode b/config/rootfiles/common/i586/intel-microcode deleted file mode 100644 index 765debc79..000000000 --- a/config/rootfiles/common/i586/intel-microcode +++ /dev/null @@ -1,95 +0,0 @@ -#lib/firmware/intel-ucode -lib/firmware/intel-ucode/06-03-02 -lib/firmware/intel-ucode/06-05-00 -lib/firmware/intel-ucode/06-05-01 -lib/firmware/intel-ucode/06-05-02 -lib/firmware/intel-ucode/06-05-03 -lib/firmware/intel-ucode/06-06-00 -lib/firmware/intel-ucode/06-06-05 -lib/firmware/intel-ucode/06-06-0a -lib/firmware/intel-ucode/06-06-0d -lib/firmware/intel-ucode/06-07-01 -lib/firmware/intel-ucode/06-07-02 -lib/firmware/intel-ucode/06-07-03 -lib/firmware/intel-ucode/06-08-01 -lib/firmware/intel-ucode/06-08-03 -lib/firmware/intel-ucode/06-08-06 -lib/firmware/intel-ucode/06-08-0a -lib/firmware/intel-ucode/06-09-05 -lib/firmware/intel-ucode/06-0a-00 -lib/firmware/intel-ucode/06-0a-01 -lib/firmware/intel-ucode/06-0b-01 -lib/firmware/intel-ucode/06-0b-04 -lib/firmware/intel-ucode/06-0d-06 -lib/firmware/intel-ucode/06-0e-08 -lib/firmware/intel-ucode/06-0e-0c -lib/firmware/intel-ucode/06-0f-02 -lib/firmware/intel-ucode/06-0f-06 -lib/firmware/intel-ucode/06-0f-07 -lib/firmware/intel-ucode/06-0f-0a -lib/firmware/intel-ucode/06-0f-0b -lib/firmware/intel-ucode/06-0f-0d -lib/firmware/intel-ucode/06-16-01 -lib/firmware/intel-ucode/06-17-06 -lib/firmware/intel-ucode/06-17-07 -lib/firmware/intel-ucode/06-17-0a -lib/firmware/intel-ucode/06-1a-04 -lib/firmware/intel-ucode/06-1a-05 -lib/firmware/intel-ucode/06-1c-02 -lib/firmware/intel-ucode/06-1c-0a -lib/firmware/intel-ucode/06-1d-01 -lib/firmware/intel-ucode/06-1e-05 -lib/firmware/intel-ucode/06-25-02 -lib/firmware/intel-ucode/06-25-05 -lib/firmware/intel-ucode/06-26-01 -lib/firmware/intel-ucode/06-2a-07 -lib/firmware/intel-ucode/06-2d-06 -lib/firmware/intel-ucode/06-2d-07 -lib/firmware/intel-ucode/06-2f-02 -lib/firmware/intel-ucode/06-3a-09 -lib/firmware/intel-ucode/06-3c-03 -lib/firmware/intel-ucode/06-3d-04 -lib/firmware/intel-ucode/06-3e-04 -lib/firmware/intel-ucode/06-3e-06 -lib/firmware/intel-ucode/06-3e-07 -lib/firmware/intel-ucode/06-3f-02 -lib/firmware/intel-ucode/06-3f-04 -lib/firmware/intel-ucode/06-45-01 -lib/firmware/intel-ucode/06-46-01 -lib/firmware/intel-ucode/06-47-01 -lib/firmware/intel-ucode/06-4e-03 -lib/firmware/intel-ucode/06-4f-01 -lib/firmware/intel-ucode/06-55-04 -lib/firmware/intel-ucode/06-56-02 -lib/firmware/intel-ucode/06-56-03 -lib/firmware/intel-ucode/06-56-04 -lib/firmware/intel-ucode/06-5c-09 -lib/firmware/intel-ucode/06-5e-03 -lib/firmware/intel-ucode/06-7a-01 -lib/firmware/intel-ucode/06-8e-09 -lib/firmware/intel-ucode/06-8e-0a -lib/firmware/intel-ucode/06-9e-09 -lib/firmware/intel-ucode/06-9e-0a -lib/firmware/intel-ucode/06-9e-0b -lib/firmware/intel-ucode/0f-00-07 -lib/firmware/intel-ucode/0f-00-0a -lib/firmware/intel-ucode/0f-01-02 -lib/firmware/intel-ucode/0f-02-04 -lib/firmware/intel-ucode/0f-02-05 -lib/firmware/intel-ucode/0f-02-06 -lib/firmware/intel-ucode/0f-02-07 -lib/firmware/intel-ucode/0f-02-09 -lib/firmware/intel-ucode/0f-03-02 -lib/firmware/intel-ucode/0f-03-03 -lib/firmware/intel-ucode/0f-03-04 -lib/firmware/intel-ucode/0f-04-01 -lib/firmware/intel-ucode/0f-04-03 -lib/firmware/intel-ucode/0f-04-04 -lib/firmware/intel-ucode/0f-04-07 -lib/firmware/intel-ucode/0f-04-08 -lib/firmware/intel-ucode/0f-04-09 -lib/firmware/intel-ucode/0f-04-0a -lib/firmware/intel-ucode/0f-06-02 -lib/firmware/intel-ucode/0f-06-04 -lib/firmware/intel-ucode/0f-06-05 -lib/firmware/intel-ucode/0f-06-08 diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode deleted file mode 100644 index 765debc79..000000000 --- a/config/rootfiles/common/x86_64/intel-microcode +++ /dev/null @@ -1,95 +0,0 @@ -#lib/firmware/intel-ucode -lib/firmware/intel-ucode/06-03-02 -lib/firmware/intel-ucode/06-05-00 -lib/firmware/intel-ucode/06-05-01 -lib/firmware/intel-ucode/06-05-02 -lib/firmware/intel-ucode/06-05-03 -lib/firmware/intel-ucode/06-06-00 -lib/firmware/intel-ucode/06-06-05 -lib/firmware/intel-ucode/06-06-0a -lib/firmware/intel-ucode/06-06-0d -lib/firmware/intel-ucode/06-07-01 -lib/firmware/intel-ucode/06-07-02 -lib/firmware/intel-ucode/06-07-03 -lib/firmware/intel-ucode/06-08-01 -lib/firmware/intel-ucode/06-08-03 -lib/firmware/intel-ucode/06-08-06 -lib/firmware/intel-ucode/06-08-0a -lib/firmware/intel-ucode/06-09-05 -lib/firmware/intel-ucode/06-0a-00 -lib/firmware/intel-ucode/06-0a-01 -lib/firmware/intel-ucode/06-0b-01 -lib/firmware/intel-ucode/06-0b-04 -lib/firmware/intel-ucode/06-0d-06 -lib/firmware/intel-ucode/06-0e-08 -lib/firmware/intel-ucode/06-0e-0c -lib/firmware/intel-ucode/06-0f-02 -lib/firmware/intel-ucode/06-0f-06 -lib/firmware/intel-ucode/06-0f-07 -lib/firmware/intel-ucode/06-0f-0a -lib/firmware/intel-ucode/06-0f-0b -lib/firmware/intel-ucode/06-0f-0d -lib/firmware/intel-ucode/06-16-01 -lib/firmware/intel-ucode/06-17-06 -lib/firmware/intel-ucode/06-17-07 -lib/firmware/intel-ucode/06-17-0a -lib/firmware/intel-ucode/06-1a-04 -lib/firmware/intel-ucode/06-1a-05 -lib/firmware/intel-ucode/06-1c-02 -lib/firmware/intel-ucode/06-1c-0a -lib/firmware/intel-ucode/06-1d-01 -lib/firmware/intel-ucode/06-1e-05 -lib/firmware/intel-ucode/06-25-02 -lib/firmware/intel-ucode/06-25-05 -lib/firmware/intel-ucode/06-26-01 -lib/firmware/intel-ucode/06-2a-07 -lib/firmware/intel-ucode/06-2d-06 -lib/firmware/intel-ucode/06-2d-07 -lib/firmware/intel-ucode/06-2f-02 -lib/firmware/intel-ucode/06-3a-09 -lib/firmware/intel-ucode/06-3c-03 -lib/firmware/intel-ucode/06-3d-04 -lib/firmware/intel-ucode/06-3e-04 -lib/firmware/intel-ucode/06-3e-06 -lib/firmware/intel-ucode/06-3e-07 -lib/firmware/intel-ucode/06-3f-02 -lib/firmware/intel-ucode/06-3f-04 -lib/firmware/intel-ucode/06-45-01 -lib/firmware/intel-ucode/06-46-01 -lib/firmware/intel-ucode/06-47-01 -lib/firmware/intel-ucode/06-4e-03 -lib/firmware/intel-ucode/06-4f-01 -lib/firmware/intel-ucode/06-55-04 -lib/firmware/intel-ucode/06-56-02 -lib/firmware/intel-ucode/06-56-03 -lib/firmware/intel-ucode/06-56-04 -lib/firmware/intel-ucode/06-5c-09 -lib/firmware/intel-ucode/06-5e-03 -lib/firmware/intel-ucode/06-7a-01 -lib/firmware/intel-ucode/06-8e-09 -lib/firmware/intel-ucode/06-8e-0a -lib/firmware/intel-ucode/06-9e-09 -lib/firmware/intel-ucode/06-9e-0a -lib/firmware/intel-ucode/06-9e-0b -lib/firmware/intel-ucode/0f-00-07 -lib/firmware/intel-ucode/0f-00-0a -lib/firmware/intel-ucode/0f-01-02 -lib/firmware/intel-ucode/0f-02-04 -lib/firmware/intel-ucode/0f-02-05 -lib/firmware/intel-ucode/0f-02-06 -lib/firmware/intel-ucode/0f-02-07 -lib/firmware/intel-ucode/0f-02-09 -lib/firmware/intel-ucode/0f-03-02 -lib/firmware/intel-ucode/0f-03-03 -lib/firmware/intel-ucode/0f-03-04 -lib/firmware/intel-ucode/0f-04-01 -lib/firmware/intel-ucode/0f-04-03 -lib/firmware/intel-ucode/0f-04-04 -lib/firmware/intel-ucode/0f-04-07 -lib/firmware/intel-ucode/0f-04-08 -lib/firmware/intel-ucode/0f-04-09 -lib/firmware/intel-ucode/0f-04-0a -lib/firmware/intel-ucode/0f-06-02 -lib/firmware/intel-ucode/0f-06-04 -lib/firmware/intel-ucode/0f-06-05 -lib/firmware/intel-ucode/0f-06-08 diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files index f04bca68c..f019f2ca9 100644 --- a/config/rootfiles/core/118/filelists/files +++ b/config/rootfiles/core/118/filelists/files @@ -12,7 +12,6 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat usr/lib/firewall/rules.pl -usr/local/bin/rebuild-initrd usr/local/bin/syslogdctrl usr/sbin/updxlrator var/ipfire/langs diff --git a/config/rootfiles/core/118/filelists/i586/intel-microcode b/config/rootfiles/core/118/filelists/i586/intel-microcode deleted file mode 120000 index f03e84778..000000000 --- a/config/rootfiles/core/118/filelists/i586/intel-microcode +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/118/filelists/sed b/config/rootfiles/core/118/filelists/sed new file mode 120000 index 000000000..fc5f5c6d6 --- /dev/null +++ b/config/rootfiles/core/118/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/118/filelists/wget b/config/rootfiles/core/118/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/core/118/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/118/filelists/x86_64/intel-microcode b/config/rootfiles/core/118/filelists/x86_64/intel-microcode deleted file mode 120000 index d5ac074e2..000000000 --- a/config/rootfiles/core/118/filelists/x86_64/intel-microcode +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/core/118/update.sh index b30d7b3ac..49d67f223 100644 --- a/config/rootfiles/core/118/update.sh +++ b/config/rootfiles/core/118/update.sh @@ -63,16 +63,7 @@ ldconfig /etc/init.d/snort start
# This update need a reboot... -touch /var/run/need_reboot - -# Rebuild the initrd to include the microcode updates -rebuild-initrd - -# Reload microcode -modprobe microcode -if [ -w "/sys/devices/system/cpu/microcode/reload" ]; - echo 1 > /sys/devices/system/cpu/microcode/reload -fi +#touch /var/run/need_reboot
# Finish /etc/init.d/fireinfo start diff --git a/lfs/cdrom b/lfs/cdrom index 7056e9a0b..7a7fff166 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -94,7 +94,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 --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire + dracut --force -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/intel-microcode b/lfs/intel-microcode deleted file mode 100644 index 03a000e91..000000000 --- a/lfs/intel-microcode +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 20180108 - -THISAPP = microcode-$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 x86_64 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 871df55f0ab010ee384dabfc424f2c12 - -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) && mkdir -p $(DIR_APP) && tar zxf $(DIR_DL)/$(DL_FILE) -C $(DIR_APP) - ls /usr/src - # Copy the firmware files into the right position - cd $(DIR_APP) && cp -R intel-ucode /lib/firmware/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/linux-initrd b/lfs/linux-initrd index e4d449b24..b5cc42212 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi" ifneq "$(KCFG)" "-pae"
# Create initramfs images - dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX) + dracut --force --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/lfs/nano b/lfs/nano index 3935a8b09..e567d2c09 100644 --- a/lfs/nano +++ b/lfs/nano @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.9.1 +VER = 2.9.2
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 = 17 +PAK_VER = 18
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0e2c5d7ae5378fe42b7166e7fe268736 +$(DL_FILE)_MD5 = 40ac792d28641969ce0be0a4a37df6a0
install : $(TARGET)
diff --git a/lfs/sed b/lfs/sed index 3ac39a71c..9123183e3 100644 --- a/lfs/sed +++ b/lfs/sed @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@
include Config
-VER = 4.2.2 +VER = 4.4
THISAPP = sed-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -53,7 +53,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4111de4faa3b9848a0686b2f260c5056 +$(DL_FILE)_MD5 = e0c583d4c380059abd818cd540fe6938
install : $(TARGET)
@@ -82,7 +82,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install diff --git a/lfs/wget b/lfs/wget index 774928bdc..7a5cdbb11 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.19.2 +VER = 1.19.4
THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = caabf9727fa429626316619a6369fffa +$(DL_FILE)_MD5 = a2a2c1dc4ac5003fc25a8e60b4a9464e
install : $(TARGET)
diff --git a/make.sh b/make.sh index 530186c2e..cc5f0fb79 100755 --- a/make.sh +++ b/make.sh @@ -1120,7 +1120,6 @@ buildipfire() { lfsmake2 linux-initrd KCFG="-kirkwood" ;; esac - lfsmake2 intel-microcode lfsmake2 xtables-addons USPACE="1" lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index d11fffa69..e5f82c567 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 --early-microcode --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae +/usr/bin/dracut --force --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 2ec8fda50..06f30bbf0 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -24,4 +24,4 @@ # KVER=`uname -r | cut -d"-" -f1`
-dracut --early-microcode --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire +dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
hooks/post-receive -- IPFire 2.x development tree