Merge remote-tracking branch 'origin/kernel-update' into thirteen

diff --git a/config/rootfiles/common/file b/config/rootfiles/common/file
index 0f76df8521dff21e93d255ef2f2f0c2b79ce4606..aadc4e68205a1c31a64a18bbadacf8bf128ae41a 100644 (file)
--- a/config/rootfiles/common/file
+++ b/config/rootfiles/common/file
@@ -5,15 +5,10 @@ usr/bin/file
 #usr/lib/libmagic.so
 usr/lib/libmagic.so.1
 usr/lib/libmagic.so.1.0.0
-#usr/man
-#usr/man/man1
-#usr/man/man1/file.1
-#usr/man/man3
-#usr/man/man3/libmagic.3
-#usr/man/man4
-#usr/man/man4/magic.4
-#usr/man/man5
-#usr/share/file
+#usr/share/man/man1/file.1
+#usr/share/man/man3/libmagic.3
+#usr/share/man/man4/magic.4
+usr/share/misc/magic.mgc
 usr/share/file/magic
 usr/share/file/magic.mgc
 usr/share/file/magic.mime

diff --git a/config/rootfiles/common/less b/config/rootfiles/common/less
index bd8faf544ffbce2e4b9eb8ad9f370eb7e8b7ef4d..5b573c9ba170830e1899f560d5073efc14a1a2af 100644 (file)
--- a/config/rootfiles/common/less
+++ b/config/rootfiles/common/less
@@ -1,6 +1,6 @@
 usr/bin/less
 #usr/bin/lessecho
 #usr/bin/lesskey
-#usr/man/man1/less.1
-#usr/man/man1/lessecho.1
-#usr/man/man1/lesskey.1
+#usr/share/man/man1/less.1
+#usr/share/man/man1/lessecho.1
+#usr/share/man/man1/lesskey.1

diff --git a/lfs/bluetooth b/lfs/bluetooth
index 961b1e603823ab8189afaec3cc5fc2ea3fdd48ba..ca3176d0f9fdce9506196353ba1429922e01cf9c 100644 (file)
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bluetooth
 PAK_VER    = 1
 
-DEPS       = "dbus glib"
+DEPS       = "dbus"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/file b/lfs/file
index 0d6fcf4693c6d1be944a414e9a7fb241cbd9664e..70a38e24df8aa3aee05ff1edfb670b3704268a73 100644 (file)
--- a/lfs/file
+++ b/lfs/file
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.17
+VER        = 5.11
 
 THISAPP    = file-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50919c65e0181423d66bb25d7fe7b0fd
+$(DL_FILE)_MD5 = 16a407bd66d6c7a832f3a5c0d609c27b
 
 install : $(TARGET)
 
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/less b/lfs/less
index 0a4833f37af32ac7e54c98d64cb42adf8365420e..d9680c87382cb6543e7cee86b41f185d5fc5b1d6 100644 (file)
--- a/lfs/less
+++ b/lfs/less
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 394
+VER        = 443
 
 THISAPP    = less-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a9f072ccefa0d315b325f3e9cdbd4b97
+$(DL_FILE)_MD5 = 47db098fb3cdaf847b3c4be05ee954fc
 
 install : $(TARGET)
 

diff --git a/lfs/mc b/lfs/mc
index 25a949eda356e8e1e1ad34e377257da2e446b487..895b2d49c296fb0f2c89f703200476ae296e9eae 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
 PAK_VER    = 5
 
-DEPS       = "glib"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/mpd b/lfs/mpd
index ca82ad2e44ac6074ffad5f4d64f4e9722463c89b..1f57f18980f52e4003d7ee59bd11fc01c48aa27d 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
 PAK_VER    = 14
 
-DEPS       = "alsa faad2 ffmpeg-libs glib lame libmad libshout libogg libid3tag libvorbis"
+DEPS       = "alsa faad2 ffmpeg-libs lame libmad libshout libogg libid3tag libvorbis"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/nagios b/lfs/nagios
index bbaed79e1bc7153302fec1ddc336a0a26990234f..c2affea31abf142286f08944f22628ed78bcbf49 100644 (file)
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios
 PAK_VER    = 2
 
-DEPS       = "glib traceroute libtool"
+DEPS       = "traceroute libtool"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/openvmtools b/lfs/openvmtools
index d8a7c482b09eacd7875ed715c83ad2f0ecc01118..229ed8f8f8c3a8dbc40aa7abc1b0c9c793c2a32d 100644 (file)
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -34,7 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586
 PROG       = openvmtools
 PAK_VER    = 1
-DEPS       = "glib"
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/streamripper b/lfs/streamripper
index 9ef65af0b26455cc92a2372b27e996137a9d15fa..4e30f8b714b44721a45bbfedbfcd6e27d5c64139 100644 (file)
--- a/lfs/streamripper
+++ b/lfs/streamripper
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = streamripper
 PAK_VER    = 1
 
-DEPS       = "glib libmad libogg libvorbis faad2"
+DEPS       = "libmad libogg libvorbis faad2"
 
 ###############################################################################
 # Top-level Rules