Merge branch 'master' into next

Conflicts:
	make.sh

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index b2462e107f49ff2456b39d338235f2b48ba3eb20..970598e38e2f18e9f7311ec81ffe56785db6b5a8 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1306,6 +1306,11 @@ usr/lib/apache/mod_userdir.so
 usr/lib/apache/mod_usertrack.so
 usr/lib/apache/mod_version.so
 usr/lib/apache/mod_vhost_alias.so
+#usr/lib/apr-util-1
+usr/lib/apr-util-1/apr_dbd_sqlite3-1.so
+#usr/lib/apr-util-1/apr_dbd_sqlite3.a
+#usr/lib/apr-util-1/apr_dbd_sqlite3.la
+usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/apr.exp
 #usr/lib/aprutil.exp
 #usr/lib/libapr-1.a

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 5cfdf20307a9d313df8e418c85fdc3dff8747275..6cf7a7186afc223bdda9e7414e228840cc69244b 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -11,196 +11,134 @@ etc/rc.d/rc6.d/K50collectd
 #usr/include/collectd/client.h
 #usr/include/collectd/lcc_features.h
 #usr/lib/collectd
-#usr/lib/collectd/apache.a
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
-#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
-#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
-#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
-#usr/lib/collectd/bind.a
 #usr/lib/collectd/bind.la
 usr/lib/collectd/bind.so
-#usr/lib/collectd/conntrack.a
 #usr/lib/collectd/conntrack.la
 usr/lib/collectd/conntrack.so
-#usr/lib/collectd/contextswitch.a
 #usr/lib/collectd/contextswitch.la
 usr/lib/collectd/contextswitch.so
-#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
-#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
-#usr/lib/collectd/curl.a
 #usr/lib/collectd/curl.la
 usr/lib/collectd/curl.so
-#usr/lib/collectd/df.a
+#usr/lib/collectd/curl_xml.la
+usr/lib/collectd/curl_xml.so
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
-#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
-#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
-#usr/lib/collectd/email.a
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
-#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
-#usr/lib/collectd/exec.a
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-#usr/lib/collectd/filecount.a
 #usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
-#usr/lib/collectd/fscache.a
 #usr/lib/collectd/fscache.la
 usr/lib/collectd/fscache.so
-#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
-#usr/lib/collectd/interface.a
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
-#usr/lib/collectd/iptables.a
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
-#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
-#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
-#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
-#usr/lib/collectd/madwifi.a
 #usr/lib/collectd/madwifi.la
 usr/lib/collectd/madwifi.so
-#usr/lib/collectd/match_empty_counter.a
 #usr/lib/collectd/match_empty_counter.la
 usr/lib/collectd/match_empty_counter.so
-#usr/lib/collectd/match_hashed.a
 #usr/lib/collectd/match_hashed.la
 usr/lib/collectd/match_hashed.so
-#usr/lib/collectd/match_regex.a
 #usr/lib/collectd/match_regex.la
 usr/lib/collectd/match_regex.so
-#usr/lib/collectd/match_timediff.a
 #usr/lib/collectd/match_timediff.la
 usr/lib/collectd/match_timediff.so
-#usr/lib/collectd/match_value.a
 #usr/lib/collectd/match_value.la
 usr/lib/collectd/match_value.so
-#usr/lib/collectd/memory.a
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
-#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
-#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
-#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
-#usr/lib/collectd/ntpd.a
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
-#usr/lib/collectd/olsrd.a
 #usr/lib/collectd/olsrd.la
 usr/lib/collectd/olsrd.so
-#usr/lib/collectd/openvpn.a
 #usr/lib/collectd/openvpn.la
 usr/lib/collectd/openvpn.so
-#usr/lib/collectd/ping.a
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
-#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
-#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
-#usr/lib/collectd/protocols.a
 #usr/lib/collectd/protocols.la
 usr/lib/collectd/protocols.so
-#usr/lib/collectd/python.a
 #usr/lib/collectd/python.la
 usr/lib/collectd/python.so
-#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
-#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
-#usr/lib/collectd/swap.a
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
-#usr/lib/collectd/syslog.a
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
-#usr/lib/collectd/table.a
 #usr/lib/collectd/table.la
 usr/lib/collectd/table.so
-#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
-#usr/lib/collectd/target_notification.a
 #usr/lib/collectd/target_notification.la
 usr/lib/collectd/target_notification.so
-#usr/lib/collectd/target_replace.a
 #usr/lib/collectd/target_replace.la
 usr/lib/collectd/target_replace.so
-#usr/lib/collectd/target_scale.a
 #usr/lib/collectd/target_scale.la
 usr/lib/collectd/target_scale.so
-#usr/lib/collectd/target_set.a
 #usr/lib/collectd/target_set.la
 usr/lib/collectd/target_set.so
-#usr/lib/collectd/tcpconns.a
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
-#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-#usr/lib/collectd/ted.a
 #usr/lib/collectd/ted.la
 usr/lib/collectd/ted.so
-#usr/lib/collectd/thermal.a
 #usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-#usr/lib/collectd/unixsock.a
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
-#usr/lib/collectd/uptime.a
 #usr/lib/collectd/uptime.la
 usr/lib/collectd/uptime.so
-#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
-#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
-#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
-#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
-#usr/lib/collectd/write_http.a
 #usr/lib/collectd/write_http.la
 usr/lib/collectd/write_http.so
-#usr/lib/libcollectdclient.a
 #usr/lib/libcollectdclient.la
 usr/lib/libcollectdclient.so
 usr/lib/libcollectdclient.so.0

diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext
index 6a927cad0c133fb85f965a81aaed8c592a3f37ae..915985b5aef150b18902741c9d04efa95e328e38 100644 (file)
--- a/config/rootfiles/common/gettext
+++ b/config/rootfiles/common/gettext
@@ -1,24 +1,24 @@
-#usr/bin/autopoint
-#usr/bin/envsubst
-#usr/bin/gettext
-#usr/bin/gettext.sh
-#usr/bin/gettextize
-#usr/bin/msgattrib
-#usr/bin/msgcat
-#usr/bin/msgcmp
-#usr/bin/msgcomm
-#usr/bin/msgconv
-#usr/bin/msgen
-#usr/bin/msgexec
-#usr/bin/msgfilter
-#usr/bin/msgfmt
-#usr/bin/msggrep
-#usr/bin/msginit
-#usr/bin/msgmerge
-#usr/bin/msgunfmt
-#usr/bin/msguniq
-#usr/bin/ngettext
-#usr/bin/xgettext
+usr/bin/autopoint
+usr/bin/envsubst
+usr/bin/gettext
+usr/bin/gettext.sh
+usr/bin/gettextize
+usr/bin/msgattrib
+usr/bin/msgcat
+usr/bin/msgcmp
+usr/bin/msgcomm
+usr/bin/msgconv
+usr/bin/msgen
+usr/bin/msgexec
+usr/bin/msgfilter
+usr/bin/msgfmt
+usr/bin/msggrep
+usr/bin/msginit
+usr/bin/msgmerge
+usr/bin/msgunfmt
+usr/bin/msguniq
+usr/bin/ngettext
+usr/bin/xgettext
 #usr/include/autosprintf.h
 #usr/include/gettext-po.h
 #usr/info/autosprintf.info
@@ -30,21 +30,21 @@
 #usr/lib/gettext/user-email
 #usr/lib/libasprintf.a
 #usr/lib/libasprintf.la
-#usr/lib/libasprintf.so
-#usr/lib/libasprintf.so.0
-#usr/lib/libasprintf.so.0.0.0
-#usr/lib/libgettextlib-0.14.5.so
+usr/lib/libasprintf.so
+usr/lib/libasprintf.so.0
+usr/lib/libasprintf.so.0.0.0
+usr/lib/libgettextlib-0.14.5.so
 #usr/lib/libgettextlib.la
-#usr/lib/libgettextlib.so
+usr/lib/libgettextlib.so
 #usr/lib/libgettextpo.a
 #usr/lib/libgettextpo.la
-#usr/lib/libgettextpo.so
-#usr/lib/libgettextpo.so.0
-#usr/lib/libgettextpo.so.0.1.0
-#usr/lib/libgettextsrc-0.14.5.so
+usr/lib/libgettextpo.so
+usr/lib/libgettextpo.so.0
+usr/lib/libgettextpo.so.0.1.0
+usr/lib/libgettextsrc-0.14.5.so
 #usr/lib/libgettextsrc.la
-#usr/lib/libgettextsrc.so
-#usr/lib/preloadable_libintl.so
+usr/lib/libgettextsrc.so
+usr/lib/preloadable_libintl.so
 #usr/share/aclocal/codeset.m4
 #usr/share/aclocal/gettext.m4
 #usr/share/aclocal/glibc2.m4

diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python
index 5f4b6a8797c18eb29f6006fec7c6fc544a16c9b3..c6421cb94be3d3d570cea156ec50ba8faef06c64 100644 (file)
--- a/config/rootfiles/common/python
+++ b/config/rootfiles/common/python
@@ -1815,7 +1815,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7-py2.7.egg-info
+usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -1843,10 +1843,10 @@ usr/lib/python2.7/lib-dynload/_multibytecodec.so
 usr/lib/python2.7/lib-dynload/_multiprocessing.so
 usr/lib/python2.7/lib-dynload/_random.so
 usr/lib/python2.7/lib-dynload/_socket.so
+usr/lib/python2.7/lib-dynload/_sqlite3.so
 usr/lib/python2.7/lib-dynload/_ssl.so
 usr/lib/python2.7/lib-dynload/_struct.so
 usr/lib/python2.7/lib-dynload/_testcapi.so
-usr/lib/python2.7/lib-dynload/_weakref.so
 usr/lib/python2.7/lib-dynload/array.so
 usr/lib/python2.7/lib-dynload/audioop.so
 usr/lib/python2.7/lib-dynload/binascii.so
@@ -1882,7 +1882,6 @@ usr/lib/python2.7/lib-dynload/termios.so
 usr/lib/python2.7/lib-dynload/time.so
 usr/lib/python2.7/lib-dynload/unicodedata.so
 usr/lib/python2.7/lib-dynload/zlib.so
-#usr/lib/python2.7/lib-old
 #usr/lib/python2.7/lib-tk
 #usr/lib/python2.7/lib-tk/Canvas.py
 #usr/lib/python2.7/lib-tk/Canvas.pyc
@@ -1974,12 +1973,21 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.0.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.0.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
+#usr/lib/python2.7/lib2to3/__main__.py
+#usr/lib/python2.7/lib2to3/__main__.pyc
+#usr/lib/python2.7/lib2to3/__main__.pyo
+#usr/lib/python2.7/lib2to3/btm_matcher.py
+#usr/lib/python2.7/lib2to3/btm_matcher.pyc
+#usr/lib/python2.7/lib2to3/btm_matcher.pyo
+#usr/lib/python2.7/lib2to3/btm_utils.py
+#usr/lib/python2.7/lib2to3/btm_utils.pyc
+#usr/lib/python2.7/lib2to3/btm_utils.pyo
 #usr/lib/python2.7/lib2to3/fixer_base.py
 #usr/lib/python2.7/lib2to3/fixer_base.pyc
 #usr/lib/python2.7/lib2to3/fixer_base.pyo
@@ -2637,14 +2645,39 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/buffer_tests.pyo
 #usr/lib/python2.7/test/cfgparser.1
 #usr/lib/python2.7/test/check_soundcard.vbs
-#usr/lib/python2.7/test/cjkencodings_test.py
-#usr/lib/python2.7/test/cjkencodings_test.pyc
-#usr/lib/python2.7/test/cjkencodings_test.pyo
+#usr/lib/python2.7/test/cjkencodings
+#usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/big5.txt
+#usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/big5hkscs.txt
+#usr/lib/python2.7/test/cjkencodings/cp949-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/cp949.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jisx0213-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jisx0213.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jp-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_jp.txt
+#usr/lib/python2.7/test/cjkencodings/euc_kr-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/euc_kr.txt
+#usr/lib/python2.7/test/cjkencodings/gb18030-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gb18030.txt
+#usr/lib/python2.7/test/cjkencodings/gb2312-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gb2312.txt
+#usr/lib/python2.7/test/cjkencodings/gbk-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/gbk.txt
+#usr/lib/python2.7/test/cjkencodings/hz-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/hz.txt
+#usr/lib/python2.7/test/cjkencodings/johab-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/johab.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jis.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt
+#usr/lib/python2.7/test/cjkencodings/shift_jisx0213.txt
 #usr/lib/python2.7/test/cmath_testcases.txt
 #usr/lib/python2.7/test/curses_tests.py
 #usr/lib/python2.7/test/curses_tests.pyc
 #usr/lib/python2.7/test/curses_tests.pyo
 #usr/lib/python2.7/test/data
+#usr/lib/python2.7/test/data/README
 #usr/lib/python2.7/test/decimaltestdata
 #usr/lib/python2.7/test/decimaltestdata/abs.decTest
 #usr/lib/python2.7/test/decimaltestdata/add.decTest
@@ -2887,6 +2920,10 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
+#usr/lib/python2.7/test/subprocessdata
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
+#usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
 #usr/lib/python2.7/test/svn_python_org_https_cert.pem
 #usr/lib/python2.7/test/test_MimeWriter.py
 #usr/lib/python2.7/test/test_MimeWriter.pyc
@@ -3535,6 +3572,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_modulefinder.py
 #usr/lib/python2.7/test/test_modulefinder.pyc
 #usr/lib/python2.7/test/test_modulefinder.pyo
+#usr/lib/python2.7/test/test_msilib.py
+#usr/lib/python2.7/test/test_msilib.pyc
+#usr/lib/python2.7/test/test_msilib.pyo
 #usr/lib/python2.7/test/test_multibytecodec.py
 #usr/lib/python2.7/test/test_multibytecodec.pyc
 #usr/lib/python2.7/test/test_multibytecodec.pyo
@@ -3667,9 +3707,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_profile.py
 #usr/lib/python2.7/test/test_profile.pyc
 #usr/lib/python2.7/test/test_profile.pyo
-#usr/lib/python2.7/test/test_profilehooks.py
-#usr/lib/python2.7/test/test_profilehooks.pyc
-#usr/lib/python2.7/test/test_profilehooks.pyo
 #usr/lib/python2.7/test/test_property.py
 #usr/lib/python2.7/test/test_property.pyc
 #usr/lib/python2.7/test/test_property.pyo
@@ -3721,6 +3758,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_richcmp.py
 #usr/lib/python2.7/test/test_richcmp.pyc
 #usr/lib/python2.7/test/test_richcmp.pyo
+#usr/lib/python2.7/test/test_rlcompleter.py
+#usr/lib/python2.7/test/test_rlcompleter.pyc
+#usr/lib/python2.7/test/test_rlcompleter.pyo
 #usr/lib/python2.7/test/test_robotparser.py
 #usr/lib/python2.7/test/test_robotparser.pyc
 #usr/lib/python2.7/test/test_robotparser.pyo
@@ -3850,6 +3890,12 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sys.py
 #usr/lib/python2.7/test/test_sys.pyc
 #usr/lib/python2.7/test/test_sys.pyo
+#usr/lib/python2.7/test/test_sys_setprofile.py
+#usr/lib/python2.7/test/test_sys_setprofile.pyc
+#usr/lib/python2.7/test/test_sys_setprofile.pyo
+#usr/lib/python2.7/test/test_sys_settrace.py
+#usr/lib/python2.7/test/test_sys_settrace.pyc
+#usr/lib/python2.7/test/test_sys_settrace.pyo
 #usr/lib/python2.7/test/test_sysconfig.py
 #usr/lib/python2.7/test/test_sysconfig.pyc
 #usr/lib/python2.7/test/test_sysconfig.pyo
@@ -4074,6 +4120,13 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/time_hashlib.pyc
 #usr/lib/python2.7/test/time_hashlib.pyo
 #usr/lib/python2.7/test/tokenize_tests.txt
+#usr/lib/python2.7/test/tracedmodules
+#usr/lib/python2.7/test/tracedmodules/__init__.py
+#usr/lib/python2.7/test/tracedmodules/__init__.pyc
+#usr/lib/python2.7/test/tracedmodules/__init__.pyo
+#usr/lib/python2.7/test/tracedmodules/testmod.py
+#usr/lib/python2.7/test/tracedmodules/testmod.pyc
+#usr/lib/python2.7/test/tracedmodules/testmod.pyo
 #usr/lib/python2.7/test/warning_tests.py
 #usr/lib/python2.7/test/warning_tests.pyc
 #usr/lib/python2.7/test/warning_tests.pyo

diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude
index bb0d8c84ba55edad13e03c26d8cce26bef54daa0..3446254b67c93e4b7a79ab45dbf9b1969b57c09f 100644 (file)
--- a/config/rootfiles/core/50/exclude
+++ b/config/rootfiles/core/50/exclude
@@ -1,2 +1,3 @@
 srv/web/ipfire/html/proxy.pac
 var/updatecache
+etc/collectd.custom

diff --git a/config/rootfiles/core/50/filelists/collectd b/config/rootfiles/core/50/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/gettext b/config/rootfiles/core/50/filelists/gettext
new file mode 120000 (symlink)
index 0000000..b6c6c6f
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file

diff --git a/config/rootfiles/core/50/filelists/python b/config/rootfiles/core/50/filelists/python
new file mode 120000 (symlink)
index 0000000..ffe6e2c
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/python
@@ -0,0 +1 @@
+../../../common/python
\ No newline at end of file

diff --git a/config/rootfiles/packages/intltool b/config/rootfiles/packages/intltool
new file mode 100644 (file)
index 0000000..e1421fa
--- /dev/null
+++ b/config/rootfiles/packages/intltool
@@ -0,0 +1,13 @@
+usr/bin/intltool-extract
+usr/bin/intltool-merge
+usr/bin/intltool-prepare
+usr/bin/intltool-update
+usr/bin/intltoolize
+#usr/share/aclocal/intltool.m4
+#usr/share/intltool
+#usr/share/intltool/Makefile.in.in
+#usr/share/man/man8/intltool-extract.8
+#usr/share/man/man8/intltool-merge.8
+#usr/share/man/man8/intltool-prepare.8
+#usr/share/man/man8/intltool-update.8
+#usr/share/man/man8/intltoolize.8

diff --git a/config/rootfiles/packages/pakfire3-deps b/config/rootfiles/packages/pakfire3-deps
new file mode 100644 (file)
index 0000000..464f5ca
--- /dev/null
+++ b/config/rootfiles/packages/pakfire3-deps
@@ -0,0 +1 @@
+var/ipfire/pakfire3-deps

diff --git a/config/rootfiles/packages/python-distutils b/config/rootfiles/packages/python-distutils
new file mode 100644 (file)
index 0000000..3c04b89
--- /dev/null
+++ b/config/rootfiles/packages/python-distutils
@@ -0,0 +1,293 @@
+#usr/lib/python2.7/distutils
+#usr/lib/python2.7/distutils/README
+usr/lib/python2.7/distutils/__init__.py
+usr/lib/python2.7/distutils/__init__.pyc
+#usr/lib/python2.7/distutils/__init__.pyo
+usr/lib/python2.7/distutils/archive_util.py
+usr/lib/python2.7/distutils/archive_util.pyc
+#usr/lib/python2.7/distutils/archive_util.pyo
+usr/lib/python2.7/distutils/bcppcompiler.py
+usr/lib/python2.7/distutils/bcppcompiler.pyc
+#usr/lib/python2.7/distutils/bcppcompiler.pyo
+usr/lib/python2.7/distutils/ccompiler.py
+usr/lib/python2.7/distutils/ccompiler.pyc
+#usr/lib/python2.7/distutils/ccompiler.pyo
+usr/lib/python2.7/distutils/cmd.py
+usr/lib/python2.7/distutils/cmd.pyc
+#usr/lib/python2.7/distutils/cmd.pyo
+#usr/lib/python2.7/distutils/command
+usr/lib/python2.7/distutils/command/__init__.py
+usr/lib/python2.7/distutils/command/__init__.pyc
+#usr/lib/python2.7/distutils/command/__init__.pyo
+usr/lib/python2.7/distutils/command/bdist.py
+usr/lib/python2.7/distutils/command/bdist.pyc
+#usr/lib/python2.7/distutils/command/bdist.pyo
+usr/lib/python2.7/distutils/command/bdist_dumb.py
+usr/lib/python2.7/distutils/command/bdist_dumb.pyc
+#usr/lib/python2.7/distutils/command/bdist_dumb.pyo
+usr/lib/python2.7/distutils/command/bdist_msi.py
+usr/lib/python2.7/distutils/command/bdist_msi.pyc
+#usr/lib/python2.7/distutils/command/bdist_msi.pyo
+usr/lib/python2.7/distutils/command/bdist_rpm.py
+usr/lib/python2.7/distutils/command/bdist_rpm.pyc
+#usr/lib/python2.7/distutils/command/bdist_rpm.pyo
+usr/lib/python2.7/distutils/command/bdist_wininst.py
+usr/lib/python2.7/distutils/command/bdist_wininst.pyc
+#usr/lib/python2.7/distutils/command/bdist_wininst.pyo
+usr/lib/python2.7/distutils/command/build.py
+usr/lib/python2.7/distutils/command/build.pyc
+#usr/lib/python2.7/distutils/command/build.pyo
+usr/lib/python2.7/distutils/command/build_clib.py
+usr/lib/python2.7/distutils/command/build_clib.pyc
+#usr/lib/python2.7/distutils/command/build_clib.pyo
+usr/lib/python2.7/distutils/command/build_ext.py
+usr/lib/python2.7/distutils/command/build_ext.pyc
+#usr/lib/python2.7/distutils/command/build_ext.pyo
+usr/lib/python2.7/distutils/command/build_py.py
+usr/lib/python2.7/distutils/command/build_py.pyc
+#usr/lib/python2.7/distutils/command/build_py.pyo
+usr/lib/python2.7/distutils/command/build_scripts.py
+usr/lib/python2.7/distutils/command/build_scripts.pyc
+#usr/lib/python2.7/distutils/command/build_scripts.pyo
+usr/lib/python2.7/distutils/command/check.py
+usr/lib/python2.7/distutils/command/check.pyc
+#usr/lib/python2.7/distutils/command/check.pyo
+usr/lib/python2.7/distutils/command/clean.py
+usr/lib/python2.7/distutils/command/clean.pyc
+#usr/lib/python2.7/distutils/command/clean.pyo
+#usr/lib/python2.7/distutils/command/command_template
+usr/lib/python2.7/distutils/command/config.py
+usr/lib/python2.7/distutils/command/config.pyc
+#usr/lib/python2.7/distutils/command/config.pyo
+usr/lib/python2.7/distutils/command/install.py
+usr/lib/python2.7/distutils/command/install.pyc
+#usr/lib/python2.7/distutils/command/install.pyo
+usr/lib/python2.7/distutils/command/install_data.py
+usr/lib/python2.7/distutils/command/install_data.pyc
+#usr/lib/python2.7/distutils/command/install_data.pyo
+usr/lib/python2.7/distutils/command/install_egg_info.py
+usr/lib/python2.7/distutils/command/install_egg_info.pyc
+#usr/lib/python2.7/distutils/command/install_egg_info.pyo
+usr/lib/python2.7/distutils/command/install_headers.py
+usr/lib/python2.7/distutils/command/install_headers.pyc
+#usr/lib/python2.7/distutils/command/install_headers.pyo
+usr/lib/python2.7/distutils/command/install_lib.py
+usr/lib/python2.7/distutils/command/install_lib.pyc
+#usr/lib/python2.7/distutils/command/install_lib.pyo
+usr/lib/python2.7/distutils/command/install_scripts.py
+usr/lib/python2.7/distutils/command/install_scripts.pyc
+#usr/lib/python2.7/distutils/command/install_scripts.pyo
+usr/lib/python2.7/distutils/command/register.py
+usr/lib/python2.7/distutils/command/register.pyc
+#usr/lib/python2.7/distutils/command/register.pyo
+usr/lib/python2.7/distutils/command/sdist.py
+usr/lib/python2.7/distutils/command/sdist.pyc
+#usr/lib/python2.7/distutils/command/sdist.pyo
+usr/lib/python2.7/distutils/command/upload.py
+usr/lib/python2.7/distutils/command/upload.pyc
+#usr/lib/python2.7/distutils/command/upload.pyo
+usr/lib/python2.7/distutils/command/wininst-6.0.exe
+usr/lib/python2.7/distutils/command/wininst-7.1.exe
+usr/lib/python2.7/distutils/command/wininst-8.0.exe
+usr/lib/python2.7/distutils/command/wininst-9.0-amd64.exe
+usr/lib/python2.7/distutils/command/wininst-9.0.exe
+usr/lib/python2.7/distutils/config.py
+usr/lib/python2.7/distutils/config.pyc
+#usr/lib/python2.7/distutils/config.pyo
+usr/lib/python2.7/distutils/core.py
+usr/lib/python2.7/distutils/core.pyc
+#usr/lib/python2.7/distutils/core.pyo
+usr/lib/python2.7/distutils/cygwinccompiler.py
+usr/lib/python2.7/distutils/cygwinccompiler.pyc
+#usr/lib/python2.7/distutils/cygwinccompiler.pyo
+usr/lib/python2.7/distutils/debug.py
+usr/lib/python2.7/distutils/debug.pyc
+#usr/lib/python2.7/distutils/debug.pyo
+usr/lib/python2.7/distutils/dep_util.py
+usr/lib/python2.7/distutils/dep_util.pyc
+#usr/lib/python2.7/distutils/dep_util.pyo
+usr/lib/python2.7/distutils/dir_util.py
+usr/lib/python2.7/distutils/dir_util.pyc
+#usr/lib/python2.7/distutils/dir_util.pyo
+usr/lib/python2.7/distutils/dist.py
+usr/lib/python2.7/distutils/dist.pyc
+#usr/lib/python2.7/distutils/dist.pyo
+usr/lib/python2.7/distutils/emxccompiler.py
+usr/lib/python2.7/distutils/emxccompiler.pyc
+#usr/lib/python2.7/distutils/emxccompiler.pyo
+usr/lib/python2.7/distutils/errors.py
+usr/lib/python2.7/distutils/errors.pyc
+#usr/lib/python2.7/distutils/errors.pyo
+usr/lib/python2.7/distutils/extension.py
+usr/lib/python2.7/distutils/extension.pyc
+#usr/lib/python2.7/distutils/extension.pyo
+usr/lib/python2.7/distutils/fancy_getopt.py
+usr/lib/python2.7/distutils/fancy_getopt.pyc
+#usr/lib/python2.7/distutils/fancy_getopt.pyo
+usr/lib/python2.7/distutils/file_util.py
+usr/lib/python2.7/distutils/file_util.pyc
+#usr/lib/python2.7/distutils/file_util.pyo
+usr/lib/python2.7/distutils/filelist.py
+usr/lib/python2.7/distutils/filelist.pyc
+#usr/lib/python2.7/distutils/filelist.pyo
+usr/lib/python2.7/distutils/log.py
+usr/lib/python2.7/distutils/log.pyc
+#usr/lib/python2.7/distutils/log.pyo
+usr/lib/python2.7/distutils/msvc9compiler.py
+usr/lib/python2.7/distutils/msvc9compiler.pyc
+#usr/lib/python2.7/distutils/msvc9compiler.pyo
+usr/lib/python2.7/distutils/msvccompiler.py
+usr/lib/python2.7/distutils/msvccompiler.pyc
+#usr/lib/python2.7/distutils/msvccompiler.pyo
+usr/lib/python2.7/distutils/spawn.py
+usr/lib/python2.7/distutils/spawn.pyc
+#usr/lib/python2.7/distutils/spawn.pyo
+usr/lib/python2.7/distutils/sysconfig.py
+usr/lib/python2.7/distutils/sysconfig.pyc
+#usr/lib/python2.7/distutils/sysconfig.pyo
+#usr/lib/python2.7/distutils/tests
+#usr/lib/python2.7/distutils/tests/Setup.sample
+#usr/lib/python2.7/distutils/tests/__init__.py
+#usr/lib/python2.7/distutils/tests/__init__.pyc
+#usr/lib/python2.7/distutils/tests/__init__.pyo
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.py
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc
+#usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo
+#usr/lib/python2.7/distutils/tests/setuptools_extension.py
+#usr/lib/python2.7/distutils/tests/setuptools_extension.pyc
+#usr/lib/python2.7/distutils/tests/setuptools_extension.pyo
+#usr/lib/python2.7/distutils/tests/support.py
+#usr/lib/python2.7/distutils/tests/support.pyc
+#usr/lib/python2.7/distutils/tests/support.pyo
+#usr/lib/python2.7/distutils/tests/test_archive_util.py
+#usr/lib/python2.7/distutils/tests/test_archive_util.pyc
+#usr/lib/python2.7/distutils/tests/test_archive_util.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist.py
+#usr/lib/python2.7/distutils/tests/test_bdist.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.py
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_dumb.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.py
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_msi.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.py
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_rpm.pyo
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.py
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.pyc
+#usr/lib/python2.7/distutils/tests/test_bdist_wininst.pyo
+#usr/lib/python2.7/distutils/tests/test_build.py
+#usr/lib/python2.7/distutils/tests/test_build.pyc
+#usr/lib/python2.7/distutils/tests/test_build.pyo
+#usr/lib/python2.7/distutils/tests/test_build_clib.py
+#usr/lib/python2.7/distutils/tests/test_build_clib.pyc
+#usr/lib/python2.7/distutils/tests/test_build_clib.pyo
+#usr/lib/python2.7/distutils/tests/test_build_ext.py
+#usr/lib/python2.7/distutils/tests/test_build_ext.pyc
+#usr/lib/python2.7/distutils/tests/test_build_ext.pyo
+#usr/lib/python2.7/distutils/tests/test_build_py.py
+#usr/lib/python2.7/distutils/tests/test_build_py.pyc
+#usr/lib/python2.7/distutils/tests/test_build_py.pyo
+#usr/lib/python2.7/distutils/tests/test_build_scripts.py
+#usr/lib/python2.7/distutils/tests/test_build_scripts.pyc
+#usr/lib/python2.7/distutils/tests/test_build_scripts.pyo
+#usr/lib/python2.7/distutils/tests/test_ccompiler.py
+#usr/lib/python2.7/distutils/tests/test_ccompiler.pyc
+#usr/lib/python2.7/distutils/tests/test_ccompiler.pyo
+#usr/lib/python2.7/distutils/tests/test_check.py
+#usr/lib/python2.7/distutils/tests/test_check.pyc
+#usr/lib/python2.7/distutils/tests/test_check.pyo
+#usr/lib/python2.7/distutils/tests/test_clean.py
+#usr/lib/python2.7/distutils/tests/test_clean.pyc
+#usr/lib/python2.7/distutils/tests/test_clean.pyo
+#usr/lib/python2.7/distutils/tests/test_cmd.py
+#usr/lib/python2.7/distutils/tests/test_cmd.pyc
+#usr/lib/python2.7/distutils/tests/test_cmd.pyo
+#usr/lib/python2.7/distutils/tests/test_config.py
+#usr/lib/python2.7/distutils/tests/test_config.pyc
+#usr/lib/python2.7/distutils/tests/test_config.pyo
+#usr/lib/python2.7/distutils/tests/test_config_cmd.py
+#usr/lib/python2.7/distutils/tests/test_config_cmd.pyc
+#usr/lib/python2.7/distutils/tests/test_config_cmd.pyo
+#usr/lib/python2.7/distutils/tests/test_core.py
+#usr/lib/python2.7/distutils/tests/test_core.pyc
+#usr/lib/python2.7/distutils/tests/test_core.pyo
+#usr/lib/python2.7/distutils/tests/test_dep_util.py
+#usr/lib/python2.7/distutils/tests/test_dep_util.pyc
+#usr/lib/python2.7/distutils/tests/test_dep_util.pyo
+#usr/lib/python2.7/distutils/tests/test_dir_util.py
+#usr/lib/python2.7/distutils/tests/test_dir_util.pyc
+#usr/lib/python2.7/distutils/tests/test_dir_util.pyo
+#usr/lib/python2.7/distutils/tests/test_dist.py
+#usr/lib/python2.7/distutils/tests/test_dist.pyc
+#usr/lib/python2.7/distutils/tests/test_dist.pyo
+#usr/lib/python2.7/distutils/tests/test_file_util.py
+#usr/lib/python2.7/distutils/tests/test_file_util.pyc
+#usr/lib/python2.7/distutils/tests/test_file_util.pyo
+#usr/lib/python2.7/distutils/tests/test_filelist.py
+#usr/lib/python2.7/distutils/tests/test_filelist.pyc
+#usr/lib/python2.7/distutils/tests/test_filelist.pyo
+#usr/lib/python2.7/distutils/tests/test_install.py
+#usr/lib/python2.7/distutils/tests/test_install.pyc
+#usr/lib/python2.7/distutils/tests/test_install.pyo
+#usr/lib/python2.7/distutils/tests/test_install_data.py
+#usr/lib/python2.7/distutils/tests/test_install_data.pyc
+#usr/lib/python2.7/distutils/tests/test_install_data.pyo
+#usr/lib/python2.7/distutils/tests/test_install_headers.py
+#usr/lib/python2.7/distutils/tests/test_install_headers.pyc
+#usr/lib/python2.7/distutils/tests/test_install_headers.pyo
+#usr/lib/python2.7/distutils/tests/test_install_lib.py
+#usr/lib/python2.7/distutils/tests/test_install_lib.pyc
+#usr/lib/python2.7/distutils/tests/test_install_lib.pyo
+#usr/lib/python2.7/distutils/tests/test_install_scripts.py
+#usr/lib/python2.7/distutils/tests/test_install_scripts.pyc
+#usr/lib/python2.7/distutils/tests/test_install_scripts.pyo
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.py
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.pyc
+#usr/lib/python2.7/distutils/tests/test_msvc9compiler.pyo
+#usr/lib/python2.7/distutils/tests/test_register.py
+#usr/lib/python2.7/distutils/tests/test_register.pyc
+#usr/lib/python2.7/distutils/tests/test_register.pyo
+#usr/lib/python2.7/distutils/tests/test_sdist.py
+#usr/lib/python2.7/distutils/tests/test_sdist.pyc
+#usr/lib/python2.7/distutils/tests/test_sdist.pyo
+#usr/lib/python2.7/distutils/tests/test_spawn.py
+#usr/lib/python2.7/distutils/tests/test_spawn.pyc
+#usr/lib/python2.7/distutils/tests/test_spawn.pyo
+#usr/lib/python2.7/distutils/tests/test_sysconfig.py
+#usr/lib/python2.7/distutils/tests/test_sysconfig.pyc
+#usr/lib/python2.7/distutils/tests/test_sysconfig.pyo
+#usr/lib/python2.7/distutils/tests/test_text_file.py
+#usr/lib/python2.7/distutils/tests/test_text_file.pyc
+#usr/lib/python2.7/distutils/tests/test_text_file.pyo
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.py
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.pyc
+#usr/lib/python2.7/distutils/tests/test_unixccompiler.pyo
+#usr/lib/python2.7/distutils/tests/test_upload.py
+#usr/lib/python2.7/distutils/tests/test_upload.pyc
+#usr/lib/python2.7/distutils/tests/test_upload.pyo
+#usr/lib/python2.7/distutils/tests/test_util.py
+#usr/lib/python2.7/distutils/tests/test_util.pyc
+#usr/lib/python2.7/distutils/tests/test_util.pyo
+#usr/lib/python2.7/distutils/tests/test_version.py
+#usr/lib/python2.7/distutils/tests/test_version.pyc
+#usr/lib/python2.7/distutils/tests/test_version.pyo
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.py
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyc
+#usr/lib/python2.7/distutils/tests/test_versionpredicate.pyo
+usr/lib/python2.7/distutils/text_file.py
+usr/lib/python2.7/distutils/text_file.pyc
+#usr/lib/python2.7/distutils/text_file.pyo
+usr/lib/python2.7/distutils/unixccompiler.py
+usr/lib/python2.7/distutils/unixccompiler.pyc
+#usr/lib/python2.7/distutils/unixccompiler.pyo
+usr/lib/python2.7/distutils/util.py
+usr/lib/python2.7/distutils/util.pyc
+#usr/lib/python2.7/distutils/util.pyo
+usr/lib/python2.7/distutils/version.py
+usr/lib/python2.7/distutils/version.pyc
+#usr/lib/python2.7/distutils/version.pyo
+usr/lib/python2.7/distutils/versionpredicate.py
+usr/lib/python2.7/distutils/versionpredicate.pyc
+#usr/lib/python2.7/distutils/versionpredicate.pyo

diff --git a/config/rootfiles/packages/python-distutils-extra b/config/rootfiles/packages/python-distutils-extra
new file mode 100644 (file)
index 0000000..1f0ddbe
--- /dev/null
+++ b/config/rootfiles/packages/python-distutils-extra
@@ -0,0 +1,20 @@
+#usr/lib/python2.7/site-packages/DistUtilsExtra
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.pyc
+#usr/lib/python2.7/site-packages/DistUtilsExtra/command
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.pyc

diff --git a/config/rootfiles/packages/python-lzma b/config/rootfiles/packages/python-lzma
new file mode 100644 (file)
index 0000000..21f647e
--- /dev/null
+++ b/config/rootfiles/packages/python-lzma
@@ -0,0 +1,5 @@
+usr/lib/python2.7/site-packages/liblzma.py
+usr/lib/python2.7/site-packages/liblzma.pyc
+usr/lib/python2.7/site-packages/lzma.py
+usr/lib/python2.7/site-packages/lzma.pyc
+usr/lib/python2.7/site-packages/lzma.so

diff --git a/config/rootfiles/packages/python-progressbar b/config/rootfiles/packages/python-progressbar
new file mode 100644 (file)
index 0000000..453f51d
--- /dev/null
+++ b/config/rootfiles/packages/python-progressbar
@@ -0,0 +1,3 @@
+usr/lib/python2.7/site-packages/progressbar-2.2-py2.7.egg-info
+usr/lib/python2.7/site-packages/progressbar.py
+usr/lib/python2.7/site-packages/progressbar.pyc

diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr
new file mode 100644 (file)
index 0000000..747ff5c
--- /dev/null
+++ b/config/rootfiles/packages/python-xattr
@@ -0,0 +1,2 @@
+usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info
+usr/lib/python2.7/site-packages/xattr.so

diff --git a/config/rootfiles/packages/sqlite b/config/rootfiles/packages/sqlite
index e483864b5ac2a271f1f8b43c8fa52bd61daccadf..f3b0b3697ee7f6fc18ebac101f8098882e444f2b 100644 (file)
--- a/config/rootfiles/packages/sqlite
+++ b/config/rootfiles/packages/sqlite
@@ -7,3 +7,4 @@ usr/lib/libsqlite3.so
 usr/lib/libsqlite3.so.0
 usr/lib/libsqlite3.so.0.8.6
 #usr/lib/pkgconfig/sqlite3.pc
+#usr/share/man/man1/sqlite3.1

diff --git a/lfs/collectd b/lfs/collectd
index c9e70608a99144fbb66d2dfb04c9a2c33b3878cd..f17879c9d36230e41e8d285513f84ffb221e47ce 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  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        #
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.9.1
+VER        = 4.10.3
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5753496651c8c84afaea1fe290876bfc
+$(DL_FILE)_MD5 = 5f17bfd7342af4f97f78c608f1d1eb1d
 
 install : $(TARGET)
 

diff --git a/lfs/intltool b/lfs/intltool
new file mode 100644 (file)
index 0000000..8fb42ac
--- /dev/null
+++ b/lfs/intltool
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.40.5
+
+THISAPP    = intltool-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = intltool
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3e7ded6f50d88cf8b8bb505eaf591775
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/pakfire3-deps b/lfs/pakfire3-deps
new file mode 100644 (file)
index 0000000..3a34e4f
--- /dev/null
+++ b/lfs/pakfire3-deps
@@ -0,0 +1,56 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER       = 0
+
+THISAPP    = pakfire3-deps
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG      = pakfire3-deps
+PAK_VER    = 1
+DEPS       = "intltool git make libsatsolver python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
+
+###############################################################################
+
+install : $(TARGET)
+
+check :
+
+download :
+
+md5 :
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       #Create a file for the package. Because empty rootfile will break.
+       echo "# Pakfire 3 deps is installed" > /var/ipfire/pakfire3-deps
+       @$(POSTBUILD)

diff --git a/lfs/python b/lfs/python
index 3a226b66c21361071d7a9d8899496afd75b12913..0deaadd1104ee8f29969ac05d7fa453a1cf58e5a 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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,10 +24,10 @@
 
 include Config
 
-VER        = 2.7
+VER        = 2.7.2
 
 THISAPP    = Python-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0e8c9ec32abf5b732bea7d91b38c3339
+$(DL_FILE)_MD5 = 75c87a80c6ddb0b785a57ea3583e04fa
 
 install : $(TARGET)
 
@@ -69,7 +69,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 Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/python-distutils b/lfs/python-distutils
new file mode 100644 (file)
index 0000000..42ea44e
--- /dev/null
+++ b/lfs/python-distutils
@@ -0,0 +1,37 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER       = 2.7.1
+
+include python
+
+PROG      = python-distutils
+PAK_VER    = 2
+DEPS       =
+
+dist: 
+       @$(PAK)
+

diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra
new file mode 100644 (file)
index 0000000..f35b581
--- /dev/null
+++ b/lfs/python-distutils-extra
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.25
+
+THISAPP    = python-distutils-extra-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-distutils-extra
+PAK_VER    = 1
+
+DEPS       = "python-distutils"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 76d298db8d6d4fcdbf5d190046f70362
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       mv -f /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg/DistUtilsExtra \
+               /usr/lib/python2.7/site-packages/
+       rm -rf  /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-lzma b/lfs/python-lzma
new file mode 100644 (file)
index 0000000..f2f6aab
--- /dev/null
+++ b/lfs/python-lzma
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.3
+
+THISAPP    = pyliblzma-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-lzma
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 500f61116ee1ab4063b49c121786863a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       # unzip the egg because it won't work without
+       cd /usr/lib/python2.7/site-packages && \
+               unzip pyliblzma-$(VER)-py2.7-linux-i686.egg
+       rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-i686.egg
+       rm -rf /usr/lib/python2.7/site-packages/EGG-INFO
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-optional-src b/lfs/python-optional-src
index d193f3dad0ed0517601a745cae08b891117dfc71..7b9e0c7c8625bd8aadf6b8c3a5dd62b691ca8cb8 100644 (file)
--- a/lfs/python-optional-src
+++ b/lfs/python-optional-src
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  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,12 +24,12 @@
 
 include Config
 
-VER       = 2.7
+VER       = 2.7.1
 
 include python
 
 PROG      = python-optional-src
-PAK_VER    = 1
+PAK_VER    = 2
 DEPS       =
 
 dist: 

diff --git a/lfs/python-progressbar b/lfs/python-progressbar
new file mode 100644 (file)
index 0000000..cae318e
--- /dev/null
+++ b/lfs/python-progressbar
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.2
+
+THISAPP    = progressbar-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-progressbar
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8ea4e2c17a8ec9e7d153767c5f2a7b28
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/python-xattr b/lfs/python-xattr
new file mode 100644 (file)
index 0000000..8932ccf
--- /dev/null
+++ b/lfs/python-xattr
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.0
+
+THISAPP    = pyxattr-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python-xattr
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && python setup.py install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/samba b/lfs/samba
index 449cb12fd2e5fd72bf3b6adde1d54b8a071db160..ace0afb27872fc276d8c51ed6a151cec5f558bf4 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.8
+VER        = 3.5.9
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 34
+PAK_VER    = 35
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 355b4530c20997e94aebc74cd6ea5307
+$(DL_FILE)_MD5 = fc3fe1103cf9d71abe12a8c604f31c76
 
 install : $(TARGET)
 

diff --git a/lfs/sqlite b/lfs/sqlite
index 2e56feb589d532cac6fe741205cd7a794812d865..5bc694a28b0c18fe40ebd18e93a72492f6469fa7 100644 (file)
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        = 3.6.10
+VER        = 3070603
 
-THISAPP    = sqlite-$(VER)
+THISAPP    = sqlite-autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sqlite
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a03bdc86df4025b6881d58557e4b5bd3
+$(DL_FILE)_MD5 = 7eb41eea5ffa5cbe359a48629084c425
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index ba25ec3b476000140df7e2d024c62ff5d4dceeb8..6d1e423905537ee788afe62917f7515ac4d35376 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -418,6 +418,8 @@ buildipfire() {
   ipfiremake pam
   ipfiremake openssl
   ipfiremake curl
+  ipfiremake tcl
+  ipfiremake sqlite
   ipfiremake python
   ipfiremake fireinfo
   ipfiremake libnet
@@ -651,7 +653,6 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
   ipfiremake sslh
@@ -682,7 +683,6 @@ buildipfire() {
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
-  ipfiremake tcl
   ipfiremake imspector
   ipfiremake miniupnpd
   ipfiremake client175
@@ -694,6 +694,12 @@ buildipfire() {
   ipfiremake crda
   ipfiremake libsatsolver
   ipfiremake python-satsolver
+  ipfiremake python-distutils-extra
+  ipfiremake python-lzma
+  ipfiremake python-progressbar
+  ipfiremake python-xattr
+  ipfiremake intltool
+  ipfiremake pakfire3-deps
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/patches/Python-2.7-gdbm-1.patch b/src/patches/Python-2.7.2-gdbm-1.patch
similarity index 100%
rename from src/patches/Python-2.7-gdbm-1.patch
rename to src/patches/Python-2.7.2-gdbm-1.patch