* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ef7686badbfa5018ca183bc6d8af000014a18a38
@ 2014-06-24 6:05 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-06-24 6:05 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6251 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via ef7686badbfa5018ca183bc6d8af000014a18a38 (commit)
via f285bf4481eef58db7a2bd8f77f62c71fd26f310 (commit)
via ec6b2ccbc0bdbc50d24cfa879ffd89ea9f81e0f4 (commit)
via 4c1e9ae0d9cff0191d5a7081d550695a9928b5f9 (commit)
via 4eff454e2f886df6b6dc6f8dad26dfc0900e925c (commit)
from f2a7c1f578591257495e2c859a344e8cac397ee8 (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 ef7686badbfa5018ca183bc6d8af000014a18a38
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jun 24 06:48:41 2014 +0200
samba: fix version.
commit f285bf4481eef58db7a2bd8f77f62c71fd26f310
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jun 24 01:17:05 2014 +0200
kernel: fix typo in cfg.
commit ec6b2ccbc0bdbc50d24cfa879ffd89ea9f81e0f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jun 21 19:04:33 2014 +0200
syslinux: add serial console output.
commit 4c1e9ae0d9cff0191d5a7081d550695a9928b5f9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jun 23 23:04:27 2014 +0200
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).
commit 4eff454e2f886df6b6dc6f8dad26dfc0900e925c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jun 23 23:01:38 2014 +0200
kernel: disable intel p-state.
Our userspace tools doesn't support this.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 2 +-
config/kernel/kernel.config.i586-ipfire-pae | 2 +-
config/syslinux/syslinux.cfg | 53 ++++++++++++++++++++++++++---
lfs/linux | 2 +-
lfs/samba | 6 ++--
5 files changed, 55 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index ea1faff..329d96d 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 9ade872..f395f31 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 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/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 8832089..3c7ae87 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
diff --git a/lfs/linux b/lfs/linux
index 72166c4..6beb75c 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)
diff --git a/lfs/samba b/lfs/samba
index 4f5375c..603f215 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
@@ -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)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-06-24 6:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-24 6:05 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ef7686badbfa5018ca183bc6d8af000014a18a38 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox