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

diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 47109e9afac93670920645ea71203eac0d620e7e..626107b263dc1feaeca616c2f9efc0255847561b 100644 (file)
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -1,10 +1,10 @@
 #etc/mc
 etc/mc/edit.indent.rc
 etc/mc/filehighlight.ini
+etc/mc/mc.default.keymap
+etc/mc/mc.emacs.keymap
 etc/mc/mc.ext
 etc/mc/mc.keymap
-etc/mc/mc.keymap.default
-etc/mc/mc.keymap.emacs
 etc/mc/mc.menu
 etc/mc/mc.menu.sr
 etc/mc/mcedit.menu
@@ -124,6 +124,7 @@ usr/share/mc/syntax/awk.syntax
 usr/share/mc/syntax/c.syntax
 usr/share/mc/syntax/cabal.syntax
 usr/share/mc/syntax/changelog.syntax
+usr/share/mc/syntax/cmake.syntax
 usr/share/mc/syntax/cs.syntax
 usr/share/mc/syntax/css.syntax
 usr/share/mc/syntax/cxx.syntax
@@ -134,6 +135,7 @@ usr/share/mc/syntax/debian-control.syntax
 usr/share/mc/syntax/debian-description.syntax
 usr/share/mc/syntax/debian-sources-list.syntax
 usr/share/mc/syntax/diff.syntax
+usr/share/mc/syntax/dlink.syntax
 usr/share/mc/syntax/dos.syntax
 usr/share/mc/syntax/ebuild.syntax
 usr/share/mc/syntax/eiffel.syntax
@@ -146,10 +148,12 @@ usr/share/mc/syntax/html.syntax
 usr/share/mc/syntax/idl.syntax
 usr/share/mc/syntax/ini.syntax
 usr/share/mc/syntax/j.syntax
+usr/share/mc/syntax/jal.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
 usr/share/mc/syntax/latex.syntax
 usr/share/mc/syntax/lisp.syntax
+usr/share/mc/syntax/lkr.syntax
 usr/share/mc/syntax/lsm.syntax
 usr/share/mc/syntax/lua.syntax
 usr/share/mc/syntax/m4.syntax

diff --git a/lfs/htop b/lfs/htop
index 967fc8ab8440d3ddcc731fb40b35e505df74e9a3..c334a91c0efc11ae069a22ca163b2acb3636e333 100644 (file)
--- a/lfs/htop
+++ b/lfs/htop
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  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.0
+VER        = 1.0.2
 
 THISAPP    = htop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = htop
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 325112ca7947ea1f6d6441f631e00384
+$(DL_FILE)_MD5 = 0d01cca8df3349c74569cefebbd9919e
 
 install : $(TARGET)
 

diff --git a/lfs/mc b/lfs/mc
index 32946c17abe4ee734e906405a7247ceaa78f0c46..eb59a440ef459def0c48c985b3e2c9be2d30a4dd 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  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,15 +24,15 @@
 
 include Config
 
-VER        = 4.8.4
+VER        = 4.8.8
 
 THISAPP    = mc-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a8edb8226cb25869f925ecce043faf1e
+$(DL_FILE)_MD5 = 14231665535fc80cc654b6ccfd070995
 
 install : $(TARGET)
 
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                --sysconfdir=/etc \
                                --without-x --disable-nls \