Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / glibc

diff --git a/config/rootfiles/common/glibc b/config/rootfiles/common/glibc
index c605b8582bd9f20bf41d4df717e7ec06795dcbed..2648e70a417e4ffedad6cca3c4872c3b57aecd8c 100644 (file)
--- a/config/rootfiles/common/glibc
+++ b/config/rootfiles/common/glibc
@@ -49,7 +49,7 @@ sbin/ldconfig
 #usr/bin/getconf
 #usr/bin/getent
 #usr/bin/iconv
-#usr/bin/ldd
+usr/bin/ldd
 #usr/bin/lddlibc4
 #usr/bin/locale
 #usr/bin/localedef
@@ -710,7 +710,7 @@ sbin/ldconfig
 #usr/lib/libutil.a
 #usr/lib/libutil.so
 #usr/lib/locale
-#usr/lib/locale/locale-archive
+usr/lib/locale/locale-archive
 #usr/sbin/iconvconfig
 #usr/sbin/nscd
 #usr/sbin/nscd_nischeck
@@ -1588,19 +1588,19 @@ sbin/ldconfig
 #usr/share/zoneinfo/Eire
 #usr/share/zoneinfo/Etc
 #usr/share/zoneinfo/Etc/GMT
-#usr/share/zoneinfo/Etc/GMT#0
-#usr/share/zoneinfo/Etc/GMT#1
-#usr/share/zoneinfo/Etc/GMT#10
-#usr/share/zoneinfo/Etc/GMT#11
-#usr/share/zoneinfo/Etc/GMT#12
-#usr/share/zoneinfo/Etc/GMT#2
-#usr/share/zoneinfo/Etc/GMT#3
-#usr/share/zoneinfo/Etc/GMT#4
-#usr/share/zoneinfo/Etc/GMT#5
-#usr/share/zoneinfo/Etc/GMT#6
-#usr/share/zoneinfo/Etc/GMT#7
-#usr/share/zoneinfo/Etc/GMT#8
-#usr/share/zoneinfo/Etc/GMT#9
+#usr/share/zoneinfo/Etc/GMT+0
+#usr/share/zoneinfo/Etc/GMT+1
+#usr/share/zoneinfo/Etc/GMT+10
+#usr/share/zoneinfo/Etc/GMT+11
+#usr/share/zoneinfo/Etc/GMT+12
+#usr/share/zoneinfo/Etc/GMT+2
+#usr/share/zoneinfo/Etc/GMT+3
+#usr/share/zoneinfo/Etc/GMT+4
+#usr/share/zoneinfo/Etc/GMT+5
+#usr/share/zoneinfo/Etc/GMT+6
+#usr/share/zoneinfo/Etc/GMT+7
+#usr/share/zoneinfo/Etc/GMT+8
+#usr/share/zoneinfo/Etc/GMT+9
 #usr/share/zoneinfo/Etc/GMT-0
 #usr/share/zoneinfo/Etc/GMT-1
 #usr/share/zoneinfo/Etc/GMT-10
@@ -1680,7 +1680,7 @@ sbin/ldconfig
 #usr/share/zoneinfo/GB
 #usr/share/zoneinfo/GB-Eire
 #usr/share/zoneinfo/GMT
-#usr/share/zoneinfo/GMT#0
+#usr/share/zoneinfo/GMT+0
 #usr/share/zoneinfo/GMT-0
 #usr/share/zoneinfo/GMT0
 #usr/share/zoneinfo/Greenwich
@@ -2165,19 +2165,19 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Eire
 #usr/share/zoneinfo/posix/Etc
 #usr/share/zoneinfo/posix/Etc/GMT
-#usr/share/zoneinfo/posix/Etc/GMT#0
-#usr/share/zoneinfo/posix/Etc/GMT#1
-#usr/share/zoneinfo/posix/Etc/GMT#10
-#usr/share/zoneinfo/posix/Etc/GMT#11
-#usr/share/zoneinfo/posix/Etc/GMT#12
-#usr/share/zoneinfo/posix/Etc/GMT#2
-#usr/share/zoneinfo/posix/Etc/GMT#3
-#usr/share/zoneinfo/posix/Etc/GMT#4
-#usr/share/zoneinfo/posix/Etc/GMT#5
-#usr/share/zoneinfo/posix/Etc/GMT#6
-#usr/share/zoneinfo/posix/Etc/GMT#7
-#usr/share/zoneinfo/posix/Etc/GMT#8
-#usr/share/zoneinfo/posix/Etc/GMT#9
+#usr/share/zoneinfo/posix/Etc/GMT+0
+#usr/share/zoneinfo/posix/Etc/GMT+1
+#usr/share/zoneinfo/posix/Etc/GMT+10
+#usr/share/zoneinfo/posix/Etc/GMT+11
+#usr/share/zoneinfo/posix/Etc/GMT+12
+#usr/share/zoneinfo/posix/Etc/GMT+2
+#usr/share/zoneinfo/posix/Etc/GMT+3
+#usr/share/zoneinfo/posix/Etc/GMT+4
+#usr/share/zoneinfo/posix/Etc/GMT+5
+#usr/share/zoneinfo/posix/Etc/GMT+6
+#usr/share/zoneinfo/posix/Etc/GMT+7
+#usr/share/zoneinfo/posix/Etc/GMT+8
+#usr/share/zoneinfo/posix/Etc/GMT+9
 #usr/share/zoneinfo/posix/Etc/GMT-0
 #usr/share/zoneinfo/posix/Etc/GMT-1
 #usr/share/zoneinfo/posix/Etc/GMT-10
@@ -2257,7 +2257,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/GB
 #usr/share/zoneinfo/posix/GB-Eire
 #usr/share/zoneinfo/posix/GMT
-#usr/share/zoneinfo/posix/GMT#0
+#usr/share/zoneinfo/posix/GMT+0
 #usr/share/zoneinfo/posix/GMT-0
 #usr/share/zoneinfo/posix/GMT0
 #usr/share/zoneinfo/posix/Greenwich
@@ -2742,19 +2742,19 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Eire
 #usr/share/zoneinfo/right/Etc
 #usr/share/zoneinfo/right/Etc/GMT
-#usr/share/zoneinfo/right/Etc/GMT#0
-#usr/share/zoneinfo/right/Etc/GMT#1
-#usr/share/zoneinfo/right/Etc/GMT#10
-#usr/share/zoneinfo/right/Etc/GMT#11
-#usr/share/zoneinfo/right/Etc/GMT#12
-#usr/share/zoneinfo/right/Etc/GMT#2
-#usr/share/zoneinfo/right/Etc/GMT#3
-#usr/share/zoneinfo/right/Etc/GMT#4
-#usr/share/zoneinfo/right/Etc/GMT#5
-#usr/share/zoneinfo/right/Etc/GMT#6
-#usr/share/zoneinfo/right/Etc/GMT#7
-#usr/share/zoneinfo/right/Etc/GMT#8
-#usr/share/zoneinfo/right/Etc/GMT#9
+#usr/share/zoneinfo/right/Etc/GMT+0
+#usr/share/zoneinfo/right/Etc/GMT+1
+#usr/share/zoneinfo/right/Etc/GMT+10
+#usr/share/zoneinfo/right/Etc/GMT+11
+#usr/share/zoneinfo/right/Etc/GMT+12
+#usr/share/zoneinfo/right/Etc/GMT+2
+#usr/share/zoneinfo/right/Etc/GMT+3
+#usr/share/zoneinfo/right/Etc/GMT+4
+#usr/share/zoneinfo/right/Etc/GMT+5
+#usr/share/zoneinfo/right/Etc/GMT+6
+#usr/share/zoneinfo/right/Etc/GMT+7
+#usr/share/zoneinfo/right/Etc/GMT+8
+#usr/share/zoneinfo/right/Etc/GMT+9
 #usr/share/zoneinfo/right/Etc/GMT-0
 #usr/share/zoneinfo/right/Etc/GMT-1
 #usr/share/zoneinfo/right/Etc/GMT-10
@@ -2834,7 +2834,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/GB
 #usr/share/zoneinfo/right/GB-Eire
 #usr/share/zoneinfo/right/GMT
-#usr/share/zoneinfo/right/GMT#0
+#usr/share/zoneinfo/right/GMT+0
 #usr/share/zoneinfo/right/GMT-0
 #usr/share/zoneinfo/right/GMT0
 #usr/share/zoneinfo/right/Greenwich