Updated python (2.7).

2026-04-09 18:45:54 +02:00 · 2010-07-25 20:13:50 +02:00
parent b6de67684f
commit 7924261f8f
24 changed files with 4438 additions and 3089 deletions
--- a/config/rootfiles/common/ipaddr
+++ b/config/rootfiles/common/ipaddr
@@ -1,2 +1,2 @@
-#usr/lib/python2.4/ipaddr.py
-usr/lib/python2.4/ipaddr.pyc
+#usr/lib/python2.7/ipaddr.py
+usr/lib/python2.7/ipaddr.pyc
--- a/config/rootfiles/common/kudzu
+++ b/config/rootfiles/common/kudzu
@@ -24,13 +24,26 @@ sbin/kudzu
 #usr/include/kudzu/usb.h
 #usr/lib/libkudzu.a
 #usr/lib/libkudzu_loader.a
-#usr/lib/python2.4/site-packages/_kudzumodule.so
-#usr/lib/python2.4/site-packages/drv_libxml2.pyc
-#usr/lib/python2.4/site-packages/kudzu.py
-#usr/lib/python2.4/site-packages/kudzu.pyc
-#usr/lib/python2.4/site-packages/libxslt.pyc
-#usr/lib/python2.4/site-packages/libxml2.pyc
-#usr/lib/python2.4/site-packages/snack.pyc
+#usr/lib/python2.7/lib2to3/tests/data/bom.pyc
+#usr/lib/python2.7/lib2to3/tests/data/crlf.pyc
+#usr/lib/python2.7/lib2to3/tests/data/different_encoding.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/__init__.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_explicit.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_first.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_last.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_parrot.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_preorder.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/no_fixer_cls.pyc
+#usr/lib/python2.7/lib2to3/tests/data/fixers/parrot_example.pyc
+#usr/lib/python2.7/lib2to3/tests/data/infinite_recursion.pyc
+#usr/lib/python2.7/lib2to3/tests/data/py2_test_grammar.pyc
+#usr/lib/python2.7/site-packages/_kudzumodule.so
+#usr/lib/python2.7/site-packages/drv_libxml2.pyc
+#usr/lib/python2.7/site-packages/kudzu.py
+#usr/lib/python2.7/site-packages/kudzu.pyc
+#usr/lib/python2.7/site-packages/libxslt.pyc
+#usr/lib/python2.7/site-packages/snack.pyc
 usr/sbin/kudzu
 #usr/share/locale/ar
 #usr/share/locale/ar/LC_MESSAGES
--- a/config/rootfiles/common/libxml2
+++ b/config/rootfiles/common/libxml2
@@ -56,11 +56,11 @@ usr/lib/libxml2.so
 usr/lib/libxml2.so.2
 usr/lib/libxml2.so.2.6.26
 #usr/lib/pkgconfig/libxml-2.0.pc
-usr/lib/python2.4/site-packages/drv_libxml2.py
-usr/lib/python2.4/site-packages/libxml2.py
-#usr/lib/python2.4/site-packages/libxml2mod.a
-#usr/lib/python2.4/site-packages/libxml2mod.la
-usr/lib/python2.4/site-packages/libxml2mod.so
+usr/lib/python2.7/site-packages/drv_libxml2.py
+usr/lib/python2.7/site-packages/libxml2.py
+#usr/lib/python2.7/site-packages/libxml2mod.a
+#usr/lib/python2.7/site-packages/libxml2mod.la
+usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/lib/xml2Conf.sh
 #usr/man/man1/xml2-config.1
 #usr/man/man1/xmlcatalog.1
--- a/config/rootfiles/common/libxslt
+++ b/config/rootfiles/common/libxslt
@@ -38,11 +38,11 @@ usr/lib/libxslt.so.1
 usr/lib/libxslt.so.1.1.17
 #usr/lib/pkgconfig/libexslt.pc
 #usr/lib/pkgconfig/libxslt.pc
-usr/lib/python2.4/site-packages/libxml2.pyc
-usr/lib/python2.4/site-packages/libxslt.py
-#usr/lib/python2.4/site-packages/libxsltmod.a
-#usr/lib/python2.4/site-packages/libxsltmod.la
-usr/lib/python2.4/site-packages/libxsltmod.so
+usr/lib/python2.7/site-packages/libxml2.pyc
+#usr/lib/python2.7/site-packages/libxslt.py
+#usr/lib/python2.7/site-packages/libxsltmod.a
+#usr/lib/python2.7/site-packages/libxsltmod.la
+usr/lib/python2.7/site-packages/libxsltmod.so
 #usr/lib/xsltConf.sh
 #usr/man/man1/xsltproc.1
 #usr/man/man3/libexslt.3
--- a/config/rootfiles/common/newt
+++ b/config/rootfiles/common/newt
@@ -4,5 +4,5 @@
 usr/lib/libnewt.so
 usr/lib/libnewt.so.0.51
 usr/lib/libnewt.so.0.51.6
-#usr/lib/python2.4/site-packages/_snackmodule.so
-#usr/lib/python2.4/site-packages/snack.py
+#usr/lib/python2.7/site-packages/_snackmodule.so
+#usr/lib/python2.7/site-packages/snack.py
--- a/config/rootfiles/common/python
+++ b/config/rootfiles/common/python
--- a/config/rootfiles/common/python-setuptools
+++ b/config/rootfiles/common/python-setuptools
@@ -1,87 +1,5 @@
 #usr/bin/easy_install
-#usr/bin/easy_install-2.4
-#usr/lib/python2.4/site-packages/easy-install.pth
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/PKG-INFO
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/SOURCES.txt
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/dependency_links.txt
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/entry_points.txt
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/not-zip-safe
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/top_level.txt
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/easy_install.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/easy_install.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/pkg_resources.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/pkg_resources.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/__init__.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/__init__.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/archive_util.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/archive_util.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/cli.exe
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/__init__.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/__init__.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/alias.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/alias.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_egg.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_egg.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_rpm.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_rpm.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_wininst.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_wininst.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_ext.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_ext.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_py.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_py.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/develop.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/develop.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/easy_install.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/easy_install.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/egg_info.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/egg_info.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_egg_info.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_egg_info.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_lib.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_lib.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_scripts.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_scripts.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/register.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/register.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/rotate.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/rotate.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/saveopts.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/saveopts.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/sdist.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/sdist.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/setopt.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/setopt.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/test.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/test.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/upload.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/upload.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/depends.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/depends.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/dist.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/dist.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/extension.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/extension.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/gui.exe
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/package_index.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/package_index.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/sandbox.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/sandbox.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/__init__.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/__init__.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/doctest.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/doctest.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_packageindex.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_packageindex.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_resources.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_resources.pyc
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/site.py
-#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/site.pyc
-#usr/lib/python2.4/site-packages/setuptools.pth
+#usr/bin/easy_install-2.7
+#usr/lib/python2.7/site-packages/easy-install.pth
+#usr/lib/python2.7/site-packages/setuptools-0.6c11-py2.7.egg
+#usr/lib/python2.7/site-packages/setuptools.pth
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -164,6 +164,9 @@ usr/lib/alsa-lib/smixer/smixer-ac97.so
 #usr/lib/alsa-lib/smixer/smixer-hda.a
 #usr/lib/alsa-lib/smixer/smixer-hda.la
 usr/lib/alsa-lib/smixer/smixer-hda.so
+#usr/lib/alsa-lib/smixer/smixer-python.a
+#usr/lib/alsa-lib/smixer/smixer-python.la
+usr/lib/alsa-lib/smixer/smixer-python.so
 #usr/lib/alsa-lib/smixer/smixer-sbase.a
 #usr/lib/alsa-lib/smixer/smixer-sbase.la
 usr/lib/alsa-lib/smixer/smixer-sbase.so
--- a/config/rootfiles/packages/fetchmail
+++ b/config/rootfiles/packages/fetchmail
@@ -2,9 +2,9 @@ etc/rc.d/init.d/fetchmail
 root/.fetchmailrc
 usr/bin/fetchmail
 #usr/bin/fetchmailconf
-#usr/lib/python2.4/site-packages/fetchmailconf.py
-#usr/lib/python2.4/site-packages/fetchmailconf.pyc
-#usr/lib/python2.4/site-packages/fetchmailconf.pyo
+#usr/lib/python2.7/site-packages/fetchmailconf.py
+#usr/lib/python2.7/site-packages/fetchmailconf.pyc
+#usr/lib/python2.7/site-packages/fetchmailconf.pyo
 #usr/share/man/man1/fetchmail.1
 #usr/share/man/man1/fetchmailconf.1
 var/ipfire/backup/addons/includes/fetchmail
--- a/config/rootfiles/packages/python-clientform
+++ b/config/rootfiles/packages/python-clientform
@@ -1 +1 @@
-usr/lib/python2.4/site-packages/ClientForm-0.2.9-py2.4.egg
+usr/lib/python2.7/site-packages/ClientForm-0.2.9-py2.7.egg
--- a/config/rootfiles/packages/python-feedparser
+++ b/config/rootfiles/packages/python-feedparser
@@ -1,2 +1,3 @@
-usr/lib/python2.4/site-packages/feedparser.py
-usr/lib/python2.4/site-packages/feedparser.pyc
+#usr/lib/python2.7/site-packages/feedparser-4.1-py2.7.egg-info
+#usr/lib/python2.7/site-packages/feedparser.py
+usr/lib/python2.7/site-packages/feedparser.pyc
--- a/config/rootfiles/packages/python-mechanize
+++ b/config/rootfiles/packages/python-mechanize
@@ -1 +1 @@
-usr/lib/python2.4/site-packages/mechanize-0.1.8-py2.4.egg
+usr/lib/python2.7/site-packages/mechanize-0.1.8-py2.7.egg
--- a/config/rootfiles/packages/python-rssdler
+++ b/config/rootfiles/packages/python-rssdler
@@ -1,3 +1,4 @@
 usr/bin/rssdler
-usr/lib/python2.4/site-packages/rssdler.py
-usr/lib/python2.4/site-packages/rssdler.pyc
+#usr/lib/python2.7/site-packages/rssdler-0.4.0-py2.7.egg-info
+usr/lib/python2.7/site-packages/rssdler.py
+usr/lib/python2.7/site-packages/rssdler.pyc
--- a/config/rootfiles/packages/urlgrabber
+++ b/config/rootfiles/packages/urlgrabber
@@ -1,22 +1,20 @@
 usr/bin/urlgrabber
-usr/lib/python2.4/httplib.pyc
-usr/lib/python2.4/socket.pyc
-usr/lib/python2.4/encodings/idna.pyc
-#usr/lib/python2.4/site-packages/urlgrabber
-#usr/lib/python2.4/site-packages/urlgrabber/__init__.py
-usr/lib/python2.4/site-packages/urlgrabber/__init__.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/byterange.py
-usr/lib/python2.4/site-packages/urlgrabber/byterange.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/grabber.py
-usr/lib/python2.4/site-packages/urlgrabber/grabber.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/keepalive.py
-usr/lib/python2.4/site-packages/urlgrabber/keepalive.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/mirror.py
-usr/lib/python2.4/site-packages/urlgrabber/mirror.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/progress.py
-usr/lib/python2.4/site-packages/urlgrabber/progress.pyc
-#usr/lib/python2.4/site-packages/urlgrabber/sslfactory.py
-usr/lib/python2.4/site-packages/urlgrabber/sslfactory.pyc
+#usr/lib/python2.7/site-packages/urlgrabber
+#usr/lib/python2.7/site-packages/urlgrabber-3.1.0-py2.7.egg-info
+#usr/lib/python2.7/site-packages/urlgrabber/__init__.py
+usr/lib/python2.7/site-packages/urlgrabber/__init__.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/byterange.py
+usr/lib/python2.7/site-packages/urlgrabber/byterange.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/grabber.py
+usr/lib/python2.7/site-packages/urlgrabber/grabber.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/keepalive.py
+usr/lib/python2.7/site-packages/urlgrabber/keepalive.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/mirror.py
+usr/lib/python2.7/site-packages/urlgrabber/mirror.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/progress.py
+usr/lib/python2.7/site-packages/urlgrabber/progress.pyc
+#usr/lib/python2.7/site-packages/urlgrabber/sslfactory.py
+usr/lib/python2.7/site-packages/urlgrabber/sslfactory.pyc
 #usr/share/doc/urlgrabber-3.1.0
 #usr/share/doc/urlgrabber-3.1.0/ChangeLog
 #usr/share/doc/urlgrabber-3.1.0/LICENSE
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -30,7 +30,7 @@
 * Net-SSLeay-1.36
 * Net-Server-0.97
 * Pound-2.5
-* Python-2.4.3
+* Python-2.7
 * SDL-1.2.11
 * Text-Tabs+Wrap-2005.0824
 * URI-1.35
@@ -304,7 +304,7 @@
 * sdparm-1.01
 * sed-4.1.5
 * setserial-2.17
-* setuptools-0.6c8
+* setuptools-0.6c11
 * shadow-4.0.15
 * slang-1.4.9
 * smartmontools-5.39.1
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -40,7 +40,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 7
+PAK_VER    = 8

 DEPS       = ""

--- a/lfs/python
+++ b/lfs/python
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.4.3
+VER        = 2.7

 THISAPP    = Python-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 141c683447d5e76be1d2bd4829574f02
+$(DL_FILE)_MD5 = 0e8c9ec32abf5b732bea7d91b38c3339

 install : $(TARGET)

@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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 --disable-nls
+	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--- a/lfs/python-clientform
+++ b/lfs/python-clientform
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-clientform
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = ""

--- a/lfs/python-feedparser
+++ b/lfs/python-feedparser
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-feedparser
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = "python-mechanize"

--- a/lfs/python-mechanize
+++ b/lfs/python-mechanize
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-mechanize
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = "python-clientform"

--- a/lfs/python-rssdler
+++ b/lfs/python-rssdler
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/rssdler040
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-rssdler
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = "python-feedparser python-mechanize"

--- a/lfs/python-setuptools
+++ b/lfs/python-setuptools
@@ -24,15 +24,15 @@

 include Config

-VER        = 0.6c8
+VER        = 0.6c11

 THISAPP    = setuptools-$(VER)
-DL_FILE    = $(THISAPP)-py2.4.egg
+DL_FILE    = $(THISAPP)-py2.7.egg
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-setuptools
-PAK_VER    = 1
+PAK_VER    = 2

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = cba38d74f7d483c06e9daa6070cce6de
+$(DL_FILE)_MD5 = fe1f997bc722265116870bc7919059ea

 install : $(TARGET)

--- a/src/patches/Python-2.4.3-gdbm-1.patch
+++ b/src/patches/Python-2.4.3-gdbm-1.patch
@@ -1,32 +0,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2003-12-26
-Initial Package Version: 2.3.3
-Origin: Greg Schafer and Jim Gifford
-Description: Fixes Python build issue with gdbm
-
-       *** WARNING: renaming "dbm" since importing it failed:                         
-       build/lib.linux-i686-2.3/dbm.so: undefined symbol: dbm_firstkey  
-
-
- 
-$LastChangedBy: dnicholson $
-$Date: 2006-04-20 10:08:34 -0600 (Thu, 20 Apr 2006) $
-
-diff -Naur Python-2.3.2.orig/setup.py Python-2.3.2/setup.py
--- Python-2.3.2.orig/setup.py	2003-09-22 01:19:45.000000000 +0000
-+++ Python-2.3.2/setup.py	2003-10-13 06:28:34.000000000 +0000
-@@ -596,12 +596,12 @@
-                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                     ndbm_libs = ['ndbm']
-                 else:
-                    ndbm_libs = []
-+                    ndbm_libs = ['gdbm', 'gdbm_compat']
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_NDBM_H',None)],
-                                        libraries = ndbm_libs ) )
-             elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
-                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-+                  and find_file("ndbm.h", inc_dirs, []) is not None):
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
-                                        libraries = ['gdbm'] ) )
--- a/src/patches/Python-2.7-gdbm-1.patch
+++ b/src/patches/Python-2.7-gdbm-1.patch
@@ -0,0 +1,21 @@
+diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
+--- Python-2.7-org/setup.py	2010-06-27 14:36:16.000000000 +0200
+++ Python-2.7/setup.py	2010-07-13 22:23:04.000000000 +0200
+@@ -1125,7 +1125,7 @@
+                                                                'ndbm'):
+                             ndbm_libs = ['ndbm']
+                         else:
+-                            ndbm_libs = []
+                            ndbm_libs = ['gdbm', 'gdbm_compat' ]
+                         print "building dbm using ndbm"
+                         dbmext = Extension('dbm', ['dbmmodule.c'],
+                                            define_macros=[
+@@ -1140,7 +1140,7 @@
+                         if self.compiler.find_library_file(lib_dirs,
+                                                                'gdbm_compat'):
+                             gdbm_libs.append('gdbm_compat')
+-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
+                        if find_file("ndbm.h", inc_dirs, []) is not None:
+                             print "building dbm using gdbm"
+                             dbmext = Extension(
+                                 'dbm', ['dbmmodule.c'],