Rootfile update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index d929aced8c33d12dd085c8ec3a78378af777eeaa..1fb29561e5fd270ae4f78bc3f54500cd3c712003 100644 (file)
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -12,7 +12,7 @@ usr/bin/curl
 #usr/include/curl/typecheck-gcc.h
 #usr/lib/libcurl.a
 #usr/lib/libcurl.la
-usr/lib/libcurl.so
+#usr/lib/libcurl.so
 usr/lib/libcurl.so.3
 usr/lib/libcurl.so.4
 usr/lib/libcurl.so.4.4.0
@@ -20,6 +20,51 @@ usr/lib/libcurl.so.4.4.0
 #usr/share/aclocal/libcurl.m4
 #usr/share/man/man1/curl-config.1
 #usr/share/man/man1/curl.1
+#usr/share/man/man3/CURLINFO_ACTIVESOCKET.3
+#usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_CERTINFO.3
+#usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
+#usr/share/man/man3/CURLINFO_CONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
+#usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
+#usr/share/man/man3/CURLINFO_COOKIELIST.3
+#usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
+#usr/share/man/man3/CURLINFO_FILETIME.3
+#usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3
+#usr/share/man/man3/CURLINFO_HEADER_SIZE.3
+#usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3
+#usr/share/man/man3/CURLINFO_LASTSOCKET.3
+#usr/share/man/man3/CURLINFO_LOCAL_IP.3
+#usr/share/man/man3/CURLINFO_LOCAL_PORT.3
+#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3
+#usr/share/man/man3/CURLINFO_NUM_CONNECTS.3
+#usr/share/man/man3/CURLINFO_OS_ERRNO.3
+#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_PRIMARY_IP.3
+#usr/share/man/man3/CURLINFO_PRIMARY_PORT.3
+#usr/share/man/man3/CURLINFO_PRIVATE.3
+#usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
+#usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
+#usr/share/man/man3/CURLINFO_REDIRECT_URL.3
+#usr/share/man/man3/CURLINFO_REQUEST_SIZE.3
+#usr/share/man/man3/CURLINFO_RESPONSE_CODE.3
+#usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3
+#usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3
+#usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3
+#usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3
+#usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3
+#usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3
+#usr/share/man/man3/CURLINFO_SSL_ENGINES.3
+#usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
+#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_TLS_SESSION.3
+#usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3
+#usr/share/man/man3/CURLINFO_TOTAL_TIME.3
 #usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
 #usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
 #usr/share/man/man3/CURLMOPT_MAXCONNECTS.3
@@ -29,6 +74,8 @@ usr/lib/libcurl.so.4.4.0
 #usr/share/man/man3/CURLMOPT_PIPELINING.3
 #usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
 #usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3
+#usr/share/man/man3/CURLMOPT_PUSHDATA.3
+#usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3
 #usr/share/man/man3/CURLMOPT_SOCKETDATA.3
 #usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3
 #usr/share/man/man3/CURLMOPT_TIMERDATA.3
@@ -64,6 +111,7 @@ usr/lib/libcurl.so.4.4.0
 #usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3
 #usr/share/man/man3/CURLOPT_DEBUGDATA.3
 #usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
+#usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3
 #usr/share/man/man3/CURLOPT_DIRLISTONLY.3
 #usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
 #usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
@@ -221,12 +269,16 @@ usr/lib/libcurl.so.4.4.0
 #usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3
 #usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3
 #usr/share/man/man3/CURLOPT_STDERR.3
+#usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3
+#usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3
+#usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3
 #usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
 #usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
 #usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3
 #usr/share/man/man3/CURLOPT_TCP_NODELAY.3
 #usr/share/man/man3/CURLOPT_TELNETOPTIONS.3
 #usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3
+#usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3
 #usr/share/man/man3/CURLOPT_TIMECONDITION.3
 #usr/share/man/man3/CURLOPT_TIMEOUT.3
 #usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
@@ -304,5 +356,9 @@ usr/lib/libcurl.so.4.4.0
 #usr/share/man/man3/libcurl-multi.3
 #usr/share/man/man3/libcurl-share.3
 #usr/share/man/man3/libcurl-symbols.3
+#usr/share/man/man3/libcurl-thread.3
 #usr/share/man/man3/libcurl-tutorial.3
 #usr/share/man/man3/libcurl.3
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_curl

diff --git a/config/rootfiles/common/sdparm b/config/rootfiles/common/sdparm
index 1bfb6a9abf10cc08645c2ad74d7315f85299eb55..439c42965ab55e05cec1faacb47317992c6a2417 100644 (file)
--- a/config/rootfiles/common/sdparm
+++ b/config/rootfiles/common/sdparm
@@ -1,2 +1,6 @@
+#usr/bin/sas_disk_blink
+#usr/bin/scsi_ch_swp
 usr/bin/sdparm
+#usr/share/man/man8/sas_disk_blink.8
+#usr/share/man/man8/scsi_ch_swp.8
 #usr/share/man/man8/sdparm.8

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 07446b73b175ef5d7222af27b5cc2db556f3c4ac..bfca1bf17259924325fb1099de0d8fbd05af55b7 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -41,7 +41,6 @@ etc/profile.d/term256.sh
 etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
-etc/sysconfig/ramdisk
 etc/sysctl.conf
 etc/syslog.conf
 etc/system-release

diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata
index 86b1e27d8b2a078f150a2d3504042c5b21668632..61481999e2fa5c03aab40763b185b14111ff4d63 100644 (file)
--- a/config/rootfiles/common/tzdata
+++ b/config/rootfiles/common/tzdata
@@ -252,6 +252,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Asia/Bahrain
 #usr/share/zoneinfo/Asia/Baku
 #usr/share/zoneinfo/Asia/Bangkok
+#usr/share/zoneinfo/Asia/Barnaul
 #usr/share/zoneinfo/Asia/Beirut
 #usr/share/zoneinfo/Asia/Bishkek
 #usr/share/zoneinfo/Asia/Brunei
@@ -323,6 +324,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Asia/Thimbu
 #usr/share/zoneinfo/Asia/Thimphu
 #usr/share/zoneinfo/Asia/Tokyo
+#usr/share/zoneinfo/Asia/Tomsk
 #usr/share/zoneinfo/Asia/Ujung_Pandang
 #usr/share/zoneinfo/Asia/Ulaanbaatar
 #usr/share/zoneinfo/Asia/Ulan_Bator
@@ -435,6 +437,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe
 #usr/share/zoneinfo/Europe/Amsterdam
 #usr/share/zoneinfo/Europe/Andorra
+#usr/share/zoneinfo/Europe/Astrakhan
 #usr/share/zoneinfo/Europe/Athens
 #usr/share/zoneinfo/Europe/Belfast
 #usr/share/zoneinfo/Europe/Belgrade
@@ -455,6 +458,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe/Jersey
 #usr/share/zoneinfo/Europe/Kaliningrad
 #usr/share/zoneinfo/Europe/Kiev
+#usr/share/zoneinfo/Europe/Kirov
 #usr/share/zoneinfo/Europe/Lisbon
 #usr/share/zoneinfo/Europe/Ljubljana
 #usr/share/zoneinfo/Europe/London
@@ -482,6 +486,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe/Tallinn
 #usr/share/zoneinfo/Europe/Tirane
 #usr/share/zoneinfo/Europe/Tiraspol
+#usr/share/zoneinfo/Europe/Ulyanovsk
 #usr/share/zoneinfo/Europe/Uzhgorod
 #usr/share/zoneinfo/Europe/Vaduz
 #usr/share/zoneinfo/Europe/Vatican
@@ -857,6 +862,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Asia/Bahrain
 #usr/share/zoneinfo/posix/Asia/Baku
 #usr/share/zoneinfo/posix/Asia/Bangkok
+#usr/share/zoneinfo/posix/Asia/Barnaul
 #usr/share/zoneinfo/posix/Asia/Beirut
 #usr/share/zoneinfo/posix/Asia/Bishkek
 #usr/share/zoneinfo/posix/Asia/Brunei
@@ -928,6 +934,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Asia/Thimbu
 #usr/share/zoneinfo/posix/Asia/Thimphu
 #usr/share/zoneinfo/posix/Asia/Tokyo
+#usr/share/zoneinfo/posix/Asia/Tomsk
 #usr/share/zoneinfo/posix/Asia/Ujung_Pandang
 #usr/share/zoneinfo/posix/Asia/Ulaanbaatar
 #usr/share/zoneinfo/posix/Asia/Ulan_Bator
@@ -1040,6 +1047,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe
 #usr/share/zoneinfo/posix/Europe/Amsterdam
 #usr/share/zoneinfo/posix/Europe/Andorra
+#usr/share/zoneinfo/posix/Europe/Astrakhan
 #usr/share/zoneinfo/posix/Europe/Athens
 #usr/share/zoneinfo/posix/Europe/Belfast
 #usr/share/zoneinfo/posix/Europe/Belgrade
@@ -1060,6 +1068,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Jersey
 #usr/share/zoneinfo/posix/Europe/Kaliningrad
 #usr/share/zoneinfo/posix/Europe/Kiev
+#usr/share/zoneinfo/posix/Europe/Kirov
 #usr/share/zoneinfo/posix/Europe/Lisbon
 #usr/share/zoneinfo/posix/Europe/Ljubljana
 #usr/share/zoneinfo/posix/Europe/London
@@ -1087,6 +1096,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Tallinn
 #usr/share/zoneinfo/posix/Europe/Tirane
 #usr/share/zoneinfo/posix/Europe/Tiraspol
+#usr/share/zoneinfo/posix/Europe/Ulyanovsk
 #usr/share/zoneinfo/posix/Europe/Uzhgorod
 #usr/share/zoneinfo/posix/Europe/Vaduz
 #usr/share/zoneinfo/posix/Europe/Vatican
@@ -1462,6 +1472,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Asia/Bahrain
 #usr/share/zoneinfo/right/Asia/Baku
 #usr/share/zoneinfo/right/Asia/Bangkok
+#usr/share/zoneinfo/right/Asia/Barnaul
 #usr/share/zoneinfo/right/Asia/Beirut
 #usr/share/zoneinfo/right/Asia/Bishkek
 #usr/share/zoneinfo/right/Asia/Brunei
@@ -1533,6 +1544,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Asia/Thimbu
 #usr/share/zoneinfo/right/Asia/Thimphu
 #usr/share/zoneinfo/right/Asia/Tokyo
+#usr/share/zoneinfo/right/Asia/Tomsk
 #usr/share/zoneinfo/right/Asia/Ujung_Pandang
 #usr/share/zoneinfo/right/Asia/Ulaanbaatar
 #usr/share/zoneinfo/right/Asia/Ulan_Bator
@@ -1645,6 +1657,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe
 #usr/share/zoneinfo/right/Europe/Amsterdam
 #usr/share/zoneinfo/right/Europe/Andorra
+#usr/share/zoneinfo/right/Europe/Astrakhan
 #usr/share/zoneinfo/right/Europe/Athens
 #usr/share/zoneinfo/right/Europe/Belfast
 #usr/share/zoneinfo/right/Europe/Belgrade
@@ -1665,6 +1678,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Jersey
 #usr/share/zoneinfo/right/Europe/Kaliningrad
 #usr/share/zoneinfo/right/Europe/Kiev
+#usr/share/zoneinfo/right/Europe/Kirov
 #usr/share/zoneinfo/right/Europe/Lisbon
 #usr/share/zoneinfo/right/Europe/Ljubljana
 #usr/share/zoneinfo/right/Europe/London
@@ -1692,6 +1706,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Tallinn
 #usr/share/zoneinfo/right/Europe/Tirane
 #usr/share/zoneinfo/right/Europe/Tiraspol
+#usr/share/zoneinfo/right/Europe/Ulyanovsk
 #usr/share/zoneinfo/right/Europe/Uzhgorod
 #usr/share/zoneinfo/right/Europe/Vaduz
 #usr/share/zoneinfo/right/Europe/Vatican

diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index 531daaadd39c80d5c0ebf2e9a3de6cd916591e7d..d21c3ff6248091bb5c2fbc23882d4daa5f808871 100644 (file)
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -22,6 +22,7 @@ etc/mime.types
 etc/modprobe.d
 etc/modprobe.d/btmrvl_sdio.conf
 etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
 etc/mtab