python-distutils-extra: new package.

diff --git a/config/rootfiles/packages/python-distutils-extra b/config/rootfiles/packages/python-distutils-extra
new file mode 100644 (file)
index 0000000..74d1a85
--- /dev/null
+++ b/config/rootfiles/packages/python-distutils-extra
@@ -0,0 +1,28 @@
+#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg
+#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/__init__.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/__init__.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/auto.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/auto.pyc
+#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/__init__.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/__init__.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_extra.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_extra.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_help.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_help.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_i18n.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_i18n.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_icons.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_icons.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/clean_i18n.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/clean_i18n.pyc
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/pylint.py
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/pylint.pyc
+#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/PKG-INFO
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/SOURCES.txt
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/dependency_links.txt
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/entry_points.txt
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/not-zip-safe
+usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/top_level.txt

diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra
new file mode 100644 (file)
index 0000000..ae18085
--- /dev/null
+++ b/lfs/python-distutils-extra
@@ -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.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
+       @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/make.sh b/make.sh
index 1e6d81f135ae0e30474d8ad12862f1741309e234..412f47445dd303ad085ec83e78684c6cc9c29f81 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -689,6 +689,8 @@ buildipfire() {
   ipfiremake swig
   ipfiremake python-m2crypto
   ipfiremake crda
+  ipfiremake python-distutils-extra
+
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild