Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/core/70/update.sh b/config/rootfiles/core/70/update.sh
index 6fbbb48ab9da980ab1e9137954268a76dfd35bfd..4076f06e4243d5b37215d30c1d9c586efedfee39 100644 (file)
--- a/config/rootfiles/core/70/update.sh
+++ b/config/rootfiles/core/70/update.sh
@@ -72,7 +72,7 @@ esac
 
 #
 #
-KVER="3.2.47"
+KVER="3.2.48"
 MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null

diff --git a/lfs/linux b/lfs/linux
index d7fc6a2d49e0dee91a7435df5bb598bfd6e073e3..094f09e6455ede9742fc993e24a33d9eff44b088 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.47
+VER        = 3.2.48
 
 RPI_PATCHES = linux-3.2.27-ada8b44
 
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 29
+PAK_VER    = 30
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -71,7 +71,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = 2fc39387136006be982aac90daaa4e3a
+$(DL_FILE)_MD5                         = f560aa5fcf07e57ea0ca66fdfdb53ef1
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 966687ff27e450e04ff50e0da829dc00
 
 

diff --git a/lfs/transmission b/lfs/transmission
index 083db58b6b8388862762543b5c6be6e3e7e6ee57..b20ae8852d788550957473fcd90e3bd35789bff0 100644 (file)
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.77
+VER        = 2.80
 
 THISAPP    = transmission-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 60c0e77a1852656215f7102a437b2a3d
+$(DL_FILE)_MD5 = 2bde600d4b0a75d0bd3784550d59a8af
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index c6ef5df928bfdc88949465ae907d8207505a8702..71df2c9b23e68fe4086f1692ebfe365cf1028e66 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="70"                                                      # Core Level (Filename)
-PAKFIRE_CORE="69"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="70"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir