From f2a7c1f578591257495e2c859a344e8cac397ee8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 23 Jun 2014 22:50:01 +0200 Subject: [PATCH 1/6] pppd: pppd 2.4.6 has changed behaviour and waited for hours. --- src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch b/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch index b09a9b52d..5127c1f10 100644 --- a/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch +++ b/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch @@ -7,7 +7,7 @@ index 9ab2eee..86762bd 100644 /* How many PADI/PADS attempts? */ -#define MAX_PADI_ATTEMPTS 3 -+#define MAX_PADI_ATTEMPTS 12 ++#define MAX_PADI_ATTEMPTS 4 /* Initial timeout for PADO/PADS */ #define PADI_TIMEOUT 5 From 4eff454e2f886df6b6dc6f8dad26dfc0900e925c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 23 Jun 2014 23:01:38 +0200 Subject: [PATCH 2/6] kernel: disable intel p-state. Our userspace tools doesn't support this. --- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- lfs/linux | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index ea1faff91..329d96d5f 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -581,7 +581,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 9ade8729f..b6b4adde4 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -593,7 +593,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set diff --git a/lfs/linux b/lfs/linux index 72166c4b2..6beb75c57 100644 --- a/lfs/linux +++ b/lfs/linux @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 50 +PAK_VER = 51 DEPS = "" VERSUFIX=ipfire$(KCFG) From 4c1e9ae0d9cff0191d5a7081d550695a9928b5f9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 23 Jun 2014 23:04:27 +0200 Subject: [PATCH 3/6] samba: security update to 3.6.24. This is a security releases in order to address CVE-2014-0244 (Denial of service - CPU loop) and CVE-2014-3493 (Denial of service - Server crash/memory corruption). --- lfs/samba | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/samba b/lfs/samba index 4f5375c07..e2a5bdf3a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 57 +PAK_VER = 58 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2f7aee1dc5d31aefcb364600915b31dc +$(DL_FILE)_MD5 = d98425c0c2b73e08f048d31ffc727fb0 install : $(TARGET) From ec6b2ccbc0bdbc50d24cfa879ffd89ea9f81e0f4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 21 Jun 2014 19:04:33 +0200 Subject: [PATCH 4/6] syslinux: add serial console output. --- config/syslinux/syslinux.cfg | 53 +++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index 88320890c..3c7ae87d2 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -1,3 +1,4 @@ +SERIAL 0 115200 UI vesamenu.c32 PROMPT 0 @@ -25,8 +26,7 @@ MENU TITLE Welcome! LABEL installer MENU LABEL Install IPFire VERSION TEXT HELP -Install the version of IPFire that is -on this disk. +Install the version of IPFire that is on this disk. ENDTEXT KERNEL vmlinuz INITRD instroot @@ -80,12 +80,57 @@ Diagnose memory problems with memtest86+. LABEL hdt MENU LABEL Hardware Detection Tool TEXT HELP -Check your hardware with the Hardware Detection -Tool! +Check your hardware with the Hardware Detection Tool! ENDTEXT KERNEL hdt.c32 MENU END +MENU BEGIN serial + MENU TITLE Serial console options + + LABEL serial.back + MENU LABEL Back + MENU EXIT + + MENU SEPARATOR + + LABEL ipfire-serial + MENU LABEL Install IPFire (serial) + TEXT HELP +Run the installer with serial console. + ENDTEXT + KERNEL vmlinuz + INITRD instroot + APPEND console=ttyS0,115200 novga + + LABEL unattended-serial + MENU LABEL Unattended installation (serial) + TEXT HELP +Run an unattended installation wit serial console. + ENDTEXT + KERNEL vmlinuz + INITRD instroot + APPEND console=ttyS0,115200 novga unattended + + MENU SEPARATOR + + LABEL memtest-serial + MENU LABEL memtest86+ (serial) + TEXT HELP +Diagnose memory problems with memtest86+ with serial console. + ENDTEXT + KERNEL memtest + APPEND console=ttyS0,115200 + + LABEL hdt-serial + MENU LABEL Hardware Detection Tool + TEXT HELP +Check your hardware with the Hardware Detection Tool! + ENDTEXT + KERNEL hdt.c32 + +MENU END + MENU SEPARATOR LABEL netboot From f285bf4481eef58db7a2bd8f77f62c71fd26f310 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 Jun 2014 01:17:05 +0200 Subject: [PATCH 5/6] kernel: fix typo in cfg. --- config/kernel/kernel.config.i586-ipfire-pae | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index b6b4adde4..f395f3116 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -593,7 +593,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # -# CONFIG_X86_INTEL_PSTATE +# CONFIG_X86_INTEL_PSTATE is not set CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set From ef7686badbfa5018ca183bc6d8af000014a18a38 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 Jun 2014 06:48:41 +0200 Subject: [PATCH 6/6] samba: fix version. --- lfs/samba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/samba b/lfs/samba index e2a5bdf3a..603f215b3 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.6.23 +VER = 3.6.24 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz