From 503526f4dd21dddc019c9731821ced44506b12c9 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 23 Oct 2006 14:45:04 +0000
Subject: EncapPackages: Updated Python 2.4.3 -> 2.4.4, because 2.4.3 has an
 arbitrary code execution (buffer overflow) bug.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2452 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.8.5.ep            |   6 +-
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep   |   2 +-
 .../src/encap-profiles/bcfg2-elementtree-1.2.6.ep  |   2 +-
 encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep      |   2 +-
 encap/src/encap-profiles/bcfg2-glib-2.8.6.ep       |   2 +-
 encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep   |   2 +-
 encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep   |   2 +-
 encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep       |   2 +-
 encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep    |   2 +-
 encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep    |   2 +-
 encap/src/encap-profiles/bcfg2-python-2.4.3.ep     | 125 ---------------------
 encap/src/encap-profiles/bcfg2-python-2.4.4.ep     | 125 +++++++++++++++++++++
 .../src/encap-profiles/bcfg2-python-apt-0.5.10.ep  |   2 +-
 .../bcfg2-python-apt-0.6.16.2ubuntu8.ep            |   2 +-
 .../src/encap-profiles/bcfg2-python-apt-0.6.19.ep  |   2 +-
 15 files changed, 140 insertions(+), 140 deletions(-)
 delete mode 100644 encap/src/encap-profiles/bcfg2-python-2.4.3.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-python-2.4.4.ep

diff --git a/encap/src/encap-profiles/bcfg2-0.8.5.ep b/encap/src/encap-profiles/bcfg2-0.8.5.ep
index d7afbaecd..55fc587d6 100644
--- a/encap/src/encap-profiles/bcfg2-0.8.5.ep
+++ b/encap/src/encap-profiles/bcfg2-0.8.5.ep
@@ -16,7 +16,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="patch-2.5.9" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-pyopenssl-0.6" />
 <prereq package="bcfg2-elementtree-1.2.6" />
 
@@ -188,7 +188,7 @@ touch var/encap/${ENCAP_PKGNAME}
 # thanks to roadrunner.py
 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52553
 # for some ideas and some code
-# tested with python 2.4.3
+# tested with python 2.4.4
 
 import sys, os, re, string
 
@@ -496,7 +496,7 @@ printf "Finished bcfg2 preremove script.\n"
 
 <encapinfo>
 description Bcfg2 - Provides a declarative interface to system configuration
-prereq pkgspec >= bcfg2-python-2.4.3
+prereq pkgspec >= bcfg2-python-2.4.4
 prereq pkgspec >= bcfg2-elementtree-1.2.6
 </encapinfo>
 
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
index a0eb396ac..9f8f70941 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
index a0897fe8a..aa923ceca 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="PATH"
diff --git a/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
index 3de54abcd..f4cfa81a7 100644
--- a/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
+++ b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-glib-2.8.6" />
 
 <environment
diff --git a/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
index 6044c1161..c80f78790 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-libxml2-2.6.26" />
 <prereq package="bcfg2-libxslt-1.1.17" />
 
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
index 586b7770d..b0301147b 100644
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
index 69576c910..3f5fbb687 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-libxml2-2.6.26" />
 
 <environment
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
index becf9d6bd..81720284f 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-pyrex-0.9.4.1" />
 <prereq package="bcfg2-libxml2-2.6.26" />
 <prereq package="bcfg2-libxslt-1.1.17" />
diff --git a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index 6878d20dc..1e8fc7e19 100644
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
@@ -11,7 +11,7 @@
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.20" />
 <prereq package="bcfg2-openssl-0.9.8c" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
index 707c39106..8ce13c232 100644
--- a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
deleted file mode 100644
index 636275325..000000000
--- a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-python-2.4.3"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-gzip-1.2.4b" />
-<prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-readline-5.1" />
-<prereq package="bcfg2-openssl-0.9.8c" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        type="set"
-/>
-
-<environment
-        variable="PATH"
-PLATFORM_IF_MATCH(solaris)
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
-PLATFORM_ELSE
-        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
-PLATFORM_ENDIF
-        type="prepend"
-/>
-
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-<environment
-        variable="MAKE"
-        value="gmake"
-        type="set"
-/>
-PLATFORM_ENDIF
-
-<environment
-        variable="LDFLAGS"
-PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="ftp://encapsrcdist/mirror/python/Python-2.4.3.tgz
-     http://www.pobox.com/users/dclark/mirror/python/Python-2.4.3.tgz
-     http://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz"
->
-
-<configure>
-if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
-cat setup.py \
-| sed s:\/usr\/local\/:\/usr\/local\/lib\/bcfg2\/:g \
-| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/include:\/usr\/local\/lib\/bcfg2\/include:g \
-| sed s:\/usr\/contrib\/ssl\/include\/:\/usr\/local\/lib\/bcfg2\/include\/openssl\/:g \
-| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/lib:\/usr\/local\/lib\/bcfg2\/lib:g \
-> setup.py.bcfg2
-mv setup.py setup.py.orig
-cp setup.py.bcfg2 setup.py
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-	--with-gcc \
-PLATFORM_ENDIF
-	--enable-shared=no \
-	--disable-ipv6 \
-	--without-cxx
-</configure>
-
-<build type="append"><![CDATA[
-# Make sure linking to openssl worked
-${builddir}/python -c "from httplib import HTTPS" || HS="no"; \
-if [ "${HS}x" = "nox" ]; then \
-    printf "ERROR: HTTPS fails (usually a problem with linking against "; \
-    printf "openssl), aborting...\n"; \
-    exit 1; \
-else \
-    printf "INFO: HTTPS works\n"; \
-fi
-]]></build>
-
-</source>
-
-<prepackage><![CDATA[
-# Put setup back into pristine state
-rm ${builddir}/setup.py
-cp ${builddir}/setup.py.orig ${builddir}/setup.py
-# Make site-packages be in the PYTHONPATH
-echo /usr/local/lib/bcfg2/lib/python2.4/site-packages > lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth
-# Convienience links
-mkdir bin 2>/dev/null || exit 0
-ln -sf ../lib/bcfg2/bin/pydoc bin/b2-pydoc
-ln -sf ../lib/bcfg2/bin/python bin/b2-python
-# Remove some big stuff that bcfg2 doesn't need
-if [ -d lib/bcfg2/lib/python2.4/test ]; then rm -rf lib/bcfg2/lib/python2.4/test; fi
-if [ -d lib/bcfg2/lib/python2.4/idlelib ]; then rm -rf lib/bcfg2/lib/python2.4/idlelib; fi
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-]]></prepackage>
-
-<encapinfo>
-description python - scripting language
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
new file mode 100644
index 000000000..15538df67
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-python-2.4.4"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-zlib-1.2.3" />
+<prereq package="bcfg2-gzip-1.2.4b" />
+<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-readline-5.1" />
+<prereq package="bcfg2-openssl-0.9.8c" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="ftp://encapsrcdist/mirror/python/Python-2.4.4.tgz
+     http://www.pobox.com/users/dclark/mirror/python/Python-2.4.4.tgz
+     http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz"
+>
+
+<configure>
+if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
+cat setup.py \
+| sed s:\/usr\/local\/:\/usr\/local\/lib\/bcfg2\/:g \
+| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/include:\/usr\/local\/lib\/bcfg2\/include:g \
+| sed s:\/usr\/contrib\/ssl\/include\/:\/usr\/local\/lib\/bcfg2\/include\/openssl\/:g \
+| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/lib:\/usr\/local\/lib\/bcfg2\/lib:g \
+> setup.py.bcfg2
+mv setup.py setup.py.orig
+cp setup.py.bcfg2 setup.py
+./configure \
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+	--with-gcc \
+PLATFORM_ENDIF
+	--enable-shared=no \
+	--disable-ipv6 \
+	--without-cxx
+</configure>
+
+<build type="append"><![CDATA[
+# Make sure linking to openssl worked
+${builddir}/python -c "from httplib import HTTPS" || HS="no"; \
+if [ "${HS}x" = "nox" ]; then \
+    printf "ERROR: HTTPS fails (usually a problem with linking against "; \
+    printf "openssl), aborting...\n"; \
+    exit 1; \
+else \
+    printf "INFO: HTTPS works\n"; \
+fi
+]]></build>
+
+</source>
+
+<prepackage><![CDATA[
+# Put setup back into pristine state
+rm ${builddir}/setup.py
+cp ${builddir}/setup.py.orig ${builddir}/setup.py
+# Make site-packages be in the PYTHONPATH
+echo /usr/local/lib/bcfg2/lib/python2.4/site-packages > lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth
+# Convienience links
+mkdir bin 2>/dev/null || exit 0
+ln -sf ../lib/bcfg2/bin/pydoc bin/b2-pydoc
+ln -sf ../lib/bcfg2/bin/python bin/b2-python
+# Remove some big stuff that bcfg2 doesn't need
+if [ -d lib/bcfg2/lib/python2.4/test ]; then rm -rf lib/bcfg2/lib/python2.4/test; fi
+if [ -d lib/bcfg2/lib/python2.4/idlelib ]; then rm -rf lib/bcfg2/lib/python2.4/idlelib; fi
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+]]></prepackage>
+
+<encapinfo>
+description python - scripting language
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index 1b4ec2b72..2434f6f3c 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index 7e40f3439..0ad82b1bc 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index e927188a9..4b7e95eca 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.3" />
+<prereq package="bcfg2-python-2.4.4" />
 
 <environment
         variable="CC"
-- 
cgit v1.2.3-1-g7c22