[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a788e50410b204d4ef1f436fbd25fc67f792cd29

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a788e50410b204d4ef1f436fbd25fc67f792cd29

[git]

[-- Attachment #1: Type: text/plain, Size: 4222 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, next has been updated
       via  a788e50410b204d4ef1f436fbd25fc67f792cd29 (commit)
       via  ef7686badbfa5018ca183bc6d8af000014a18a38 (commit)
       via  f285bf4481eef58db7a2bd8f77f62c71fd26f310 (commit)
       via  ec6b2ccbc0bdbc50d24cfa879ffd89ea9f81e0f4 (commit)
       via  4c1e9ae0d9cff0191d5a7081d550695a9928b5f9 (commit)
       via  4eff454e2f886df6b6dc6f8dad26dfc0900e925c (commit)
       via  f2a7c1f578591257495e2c859a344e8cac397ee8 (commit)
      from  01183cccc3e6f79fc554f1c275be6cb227ee0485 (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 a788e50410b204d4ef1f436fbd25fc67f792cd29
Merge: 01183cc ef7686b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jun 24 08:05:39 2014 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.i586-ipfire                    | 2 +-
 config/kernel/kernel.config.i586-ipfire-pae                | 2 +-
 lfs/linux                                                  | 2 +-
 lfs/samba                                                  | 6 +++---
 src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch | 2 +-
 5 files changed, 7 insertions(+), 7 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/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)
 
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 b09a9b5..5127c1f 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


hooks/post-receive
--
IPFire 2.x development tree