EncapPackages: Fixes to work with Debian GNU/Linux Etch on x86_64

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2837 ce84e21b-d406-0410-9b95-82705330c041

28 files changed, 59 insertions, 55 deletions

diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index 674206cd5..abdbf7d91 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -59,6 +59,11 @@ BCFG2_PYTHON_APT = bcfg2-python-apt-0.5.10
 OS ?= linux_debian_sarge
 endif
 
+ifeq ($(DISTRO),Debian GNU/Linux 4.0 \n \l)
+BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
+OS ?= linux_debian_etch
+endif
+
 ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l)
 BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
 OS ?= linux_debian_sid
diff --git a/encap/src/encap-profiles/bcfg2-0.9.2.ep b/encap/src/encap-profiles/bcfg2-0.9.2.ep
index 804e90d77..5808cfd38 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.2.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.2.ep
@@ -65,8 +65,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/bcfg/bcfg2-0.8.7.tar.gz
-     http://www.pobox.com/users/dclark/mirror/bcfg/bcfg2-0.8.7.tar.gz
+url="http://encapsrcdist/mirror/bcfg/bcfg2-0.8.7.tar.gz
+     http://mirror.opensysadmin.com/bcfg/bcfg2-0.8.7.tar.gz
      ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.8.7.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
index 9f8f70941..6c8fa0a36 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/cheetah/Cheetah-2.0rc7.tar.gz
-http://www.pobox.com/users/dclark/mirror/cheetah/Cheetah-2.0rc7.tar.gz
+url="http://encapsrcdist/mirror/cheetah/Cheetah-2.0rc7.tar.gz
+http://mirror.opensysadmin.com/cheetah/Cheetah-2.0rc7.tar.gz
 http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc7.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep b/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
index 9d045274a..1c671b58b 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
@@ -20,8 +20,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/cheetah/CheetahDocs-0.9.16a1.tgz
-http://www.pobox.com/users/dclark/mirror/cheetah/CheetahDocs-0.9.16a1.tgz
+url="http://encapsrcdist/mirror/cheetah/CheetahDocs-0.9.16a1.tgz
+http://mirror.opensysadmin.com/cheetah/CheetahDocs-0.9.16a1.tgz
 http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/CheetahDocs-0.9.16a1.tgz"
 subdir="CheetahDocs"
 >
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 aa923ceca..908c33518 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -30,8 +30,8 @@ PLATFORM_ELSE
 PLATFORM_ENDIF
 
 <source
-url="ftp://encapsrcdist/mirror/elementtree/elementtree-1.2.6-20050316.tar.gz
-http://www.pobox.com/users/dclark/mirror/elementtree/elementtree-1.2.6-20050316.tar.gz
+url="http://encapsrcdist/mirror/elementtree/elementtree-1.2.6-20050316.tar.gz
+http://mirror.opensysadmin.com/elementtree/elementtree-1.2.6-20050316.tar.gz
 http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz"
 >
 
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 f4cfa81a7..0fe796ac1 100644
--- a/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
+++ b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
@@ -57,8 +57,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/gamin/gamin-0.1.7.tar.gz
-     http://www.pobox.com/users/dclark/mirror/gamin/gamin-0.1.7.tar.gz
+url="http://encapsrcdist/mirror/gamin/gamin-0.1.7.tar.gz
+     http://mirror.opensysadmin.com/gamin/gamin-0.1.7.tar.gz
      http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.7.tar.gz"
 >
 
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 c80f78790..325e5ceee 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
@@ -59,8 +59,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/glib/glib-2.8.6.tar.gz
-     http://www.pobox.com/users/dclark/mirror/glib/glib-2.8.6.tar.gz
+url="http://encapsrcdist/mirror/glib/glib-2.8.6.tar.gz
+     http://mirror.opensysadmin.com/glib/glib-2.8.6.tar.gz
      http://ftp.gnome.org/pub/GNOME/sources/glib/2.8/glib-2.8.6.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
index 4ee4fae19..0abb8668e 100644
--- a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
+++ b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
@@ -56,8 +56,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/gzip/gzip-1.2.4a.tar.gz
-     http://www.pobox.com/users/dclark/mirror/gzip/gzip-1.2.4a.tar.gz
+url="http://encapsrcdist/mirror/gzip/gzip-1.2.4a.tar.gz
+     http://mirror.opensysadmin.com/gzip/gzip-1.2.4a.tar.gz
      ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
 >
 
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 b0301147b..3fbedfc1d 100644
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
@@ -57,8 +57,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/libxml2/libxml2-sources-2.6.26.tar.gz
-     http://www.pobox.com/users/dclark/mirror/libxml2/libxml2-sources-2.6.26.tar.gz
+url="http://encapsrcdist/mirror/libxml2/libxml2-sources-2.6.26.tar.gz
+     http://mirror.opensysadmin.com/libxml2/libxml2-sources-2.6.26.tar.gz
      ftp://xmlsoft.org/libxml2/libxml2-sources-2.6.26.tar.gz"
 subdir="libxml2-2.6.26"
 >
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 3f5fbb687..60d8af445 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
@@ -58,8 +58,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/libxslt/libxslt-1.1.17.tar.gz
-     http://www.pobox.com/users/dclark/mirror/libxslt/libxslt-1.1.17.tar.gz
+url="http://encapsrcdist/mirror/libxslt/libxslt-1.1.17.tar.gz
+     http://mirror.opensysadmin.com/libxslt/libxslt-1.1.17.tar.gz
      ftp://xmlsoft.org/libxml2/libxslt-1.1.17.tar.gz"
 >
 
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 81720284f..83cb1a651 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
@@ -60,8 +60,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/lxml/lxml-1.1.1.tgz
-     http://www.pobox.com/users/dclark/mirror/lxml/lxml-1.1.1.tgz
+url="http://encapsrcdist/mirror/lxml/lxml-1.1.1.tgz
+     http://mirror.opensysadmin.com/lxml/lxml-1.1.1.tgz
      http://codespeak.net/lxml/lxml-1.1.1.tgz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
index 33bc36578..0e3b368fb 100644
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8c.ep
@@ -56,8 +56,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/openssl/openssl-0.9.8c.tar.gz
-     http://www.pobox.com/users/dclark/mirror/openssl/openssl-0.9.8c.tar.gz
+url="http://encapsrcdist/mirror/openssl/openssl-0.9.8c.tar.gz
+     http://mirror.opensysadmin.com/openssl/openssl-0.9.8c.tar.gz
      http://www.openssl.org/source/openssl-0.9.8c.tar.gz"
 	use_objdir="no"
 >
diff --git a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
index f2f3dd3aa..728005b63 100644
--- a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
+++ b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
@@ -54,8 +54,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/pkg-config/pkg-config-0.20.tar.gz
-     http://www.pobox.com/users/dclark/mirror/pkg-config/pkg-config-0.20.tar.gz
+url="http://encapsrcdist/mirror/pkg-config/pkg-config-0.20.tar.gz
+     http://mirror.opensysadmin.com/pkg-config/pkg-config-0.20.tar.gz
      http://pkgconfig.freedesktop.org/releases/pkg-config-0.20.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index 1e8fc7e19..be587183e 100644
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
@@ -58,8 +58,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/pyopenssl/pyOpenSSL-0.6.tar.gz
-     http://www.pobox.com/users/dclark/mirror/pyopenssl/pyOpenSSL-0.6.tar.gz
+url="http://encapsrcdist/mirror/pyopenssl/pyOpenSSL-0.6.tar.gz
+     http://mirror.opensysadmin.com/pyopenssl/pyOpenSSL-0.6.tar.gz
      http://umn.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.6.tar.gz"
 >
 
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 8ce13c232..d17b934c0 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
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/pyrex/Pyrex-0.9.4.1.tar.gz
-     http://www.pobox.com/users/dclark/mirror/pyrex/Pyrex-0.9.4.1.tar.gz
+url="http://encapsrcdist/mirror/pyrex/Pyrex-0.9.4.1.tar.gz
+     http://mirror.opensysadmin.com/pyrex/Pyrex-0.9.4.1.tar.gz
      http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.4.1.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index 15538df67..1f74cfb3d 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -59,8 +59,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/python/Python-2.4.4.tgz
-     http://www.pobox.com/users/dclark/mirror/python/Python-2.4.4.tgz
+url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
+     http://mirror.opensysadmin.com/python/Python-2.4.4.tgz
      http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz"
 >
 
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 2434f6f3c..d4b30b663 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
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/python-apt/python-apt_0.5.10.tar.gz
-     http://www.pobox.com/users/dclark/mirror/python-apt/python-apt_0.5.10.tar.gz
+url="http://encapsrcdist/mirror/python-apt/python-apt_0.5.10.tar.gz
+     http://mirror.opensysadmin.com/python-apt/python-apt_0.5.10.tar.gz
      http://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_0.5.10.tar.gz"
 subdir="python-apt-0.5.10"
 >
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 0ad82b1bc..45b044820 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
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
-     http://www.pobox.com/users/dclark/mirror/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
+url="http://encapsrcdist/mirror/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
+     http://mirror.opensysadmin.com/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
      http://archive.ubuntu.com/ubuntu/pool/main/p/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz"
 subdir="python-apt-0.6.16.2ubuntu8"
 >
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 4b7e95eca..4f298e821 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
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/python-apt/python-apt_0.6.19.tar.gz
-     http://www.pobox.com/users/dclark/mirror/python-apt/python-apt_0.6.19.tar.gz
+url="http://encapsrcdist/mirror/python-apt/python-apt_0.6.19.tar.gz
+     http://mirror.opensysadmin.com/python-apt/python-apt_0.6.19.tar.gz
      http://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_0.6.19.tar.gz"
 subdir="python-apt-0.6.19"
 >
diff --git a/encap/src/encap-profiles/bcfg2-readline-5.1.ep b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
index a5dd55cbd..77610e990 100644
--- a/encap/src/encap-profiles/bcfg2-readline-5.1.ep
+++ b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
@@ -55,8 +55,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/readline/readline-5.1.tar.gz
-     http://www.pobox.com/users/dclark/mirror/readline/readline-5.1.tar.gz
+url="http://encapsrcdist/mirror/readline/readline-5.1.tar.gz
+     http://mirror.opensysadmin.com/readline/readline-5.1.tar.gz
      ftp://ftp.cwru.edu/pub/bash/readline-5.1.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
index 240fd7146..c5de03977 100644
--- a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
+++ b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
@@ -61,8 +61,8 @@ PLATFORM_IF_MATCH(solaris)
 PLATFORM_ENDIF
 
 <source
-url="ftp://encapsrcdist/mirror/zlib/zlib-1.2.3.tar.gz
-     http://www.pobox.com/users/dclark/mirror/zlib/zlib-1.2.3.tar.gz
+url="http://encapsrcdist/mirror/zlib/zlib-1.2.3.tar.gz
+     http://mirror.opensysadmin.com/zlib/zlib-1.2.3.tar.gz
      http://www.zlib.net/zlib-1.2.3.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/daemontools-0.76.ep b/encap/src/encap-profiles/daemontools-0.76.ep
index 3dae637d7..02cc29eda 100644
--- a/encap/src/encap-profiles/daemontools-0.76.ep
+++ b/encap/src/encap-profiles/daemontools-0.76.ep
@@ -36,8 +36,8 @@ PLATFORM_ELSE
 PLATFORM_ENDIF
 
 <source
-url="ftp://encapsrcdist/mirror/daemontools/daemontools-0.76.tar.gz
-     http://www.pobox.com/users/dclark/mirror/daemontools/daemontools-0.76.tar.gz
+url="http://encapsrcdist/mirror/daemontools/daemontools-0.76.tar.gz
+     http://mirror.opensysadmin.com/daemontools/daemontools-0.76.tar.gz
      http://cr.yp.to/daemontools/daemontools-0.76.tar.gz"
 use_objdir="no"
 subdir="admin/daemontools-0.76"
diff --git a/encap/src/encap-profiles/daemontools-doc-20060731.ep b/encap/src/encap-profiles/daemontools-doc-20060731.ep
index 07b4fc5ae..81540d2b3 100644
--- a/encap/src/encap-profiles/daemontools-doc-20060731.ep
+++ b/encap/src/encap-profiles/daemontools-doc-20060731.ep
@@ -20,8 +20,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/daemontools/daemontools-doc-20060731.tar.gz
-     http://www.pobox.com/users/dclark/mirror/daemontools/daemontools-doc-20060731.tar.gz"
+url="http://encapsrcdist/mirror/daemontools/daemontools-doc-20060731.tar.gz
+     http://mirror.opensysadmin.com/daemontools/daemontools-doc-20060731.tar.gz"
 use_objdir="no"
 >
 
diff --git a/encap/src/encap-profiles/m4-1.4.4.sh b/encap/src/encap-profiles/m4-1.4.4.sh
index 40b72e932..b779244ae 100755
--- a/encap/src/encap-profiles/m4-1.4.4.sh
+++ b/encap/src/encap-profiles/m4-1.4.4.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id$
 
 ENCAP_PKGNAME="m4-1.4.4"
@@ -35,8 +35,7 @@ cat > ${ENCAP_PKGNAME}.ep << EOF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/m4/m4-1.4.4.tar.gz
-     http://www.pobox.com/users/dclark/mirror/m4/m4-1.4.4.tar.gz
+url="http://www.opensysadmin.com/mirror/m4/m4-1.4.4.tar.gz
      http://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz"
 >
 
diff --git a/encap/src/encap-profiles/makeself-2.1.4.ep b/encap/src/encap-profiles/makeself-2.1.4.ep
index 7dc1c588a..871db7745 100644
--- a/encap/src/encap-profiles/makeself-2.1.4.ep
+++ b/encap/src/encap-profiles/makeself-2.1.4.ep
@@ -10,8 +10,8 @@
 <prereq package="m4-1.4.4" />
 
 <source
-url="ftp://encapsrcdist/mirror/makeself/makeself-2.1.4.run
-     http://www.pobox.com/users/dclark/mirror/makeself/makeself-2.1.4.run
+url="http://encapsrcdist/mirror/makeself/makeself-2.1.4.run
+     http://mirror.opensysadmin.com/makeself/makeself-2.1.4.run
      http://www.megastep.org/makeself/makeself-2.1.4.run"
 subdir="/"
 >
diff --git a/encap/src/encap-profiles/ostiary-3.4.ep b/encap/src/encap-profiles/ostiary-3.4.ep
index ed57effd7..5199c3abd 100644
--- a/encap/src/encap-profiles/ostiary-3.4.ep
+++ b/encap/src/encap-profiles/ostiary-3.4.ep
@@ -36,8 +36,8 @@ PLATFORM_ELSE
 PLATFORM_ENDIF
 
 <source
-url="ftp://encapsrcdist/mirror/ostiary/ostiary-3.4.tar.gz
-     http://www.pobox.com/users/dclark/mirror/ostiary/ostiary-3.4.tar.gz
+url="http://encapsrcdist/mirror/ostiary/ostiary-3.4.tar.gz
+     http://mirror.opensysadmin.com/ostiary/ostiary-3.4.tar.gz
      http://ingles.homeunix.org/software/ost/ostiary-3.4.tar.gz"
 use_objdir="no"
 >
diff --git a/encap/src/encap-profiles/ostiary-doc-20060801.ep b/encap/src/encap-profiles/ostiary-doc-20060801.ep
index e4ada6723..75db01462 100644
--- a/encap/src/encap-profiles/ostiary-doc-20060801.ep
+++ b/encap/src/encap-profiles/ostiary-doc-20060801.ep
@@ -20,8 +20,8 @@ PLATFORM_ENDIF
 />
 
 <source
-url="ftp://encapsrcdist/mirror/ostiary/ostiary-doc-20060801.tar.gz
-     http://www.pobox.com/users/dclark/mirror/ostiary/ostiary-doc-20060801.tar.gz"
+url="http://encapsrcdist/mirror/ostiary/ostiary-doc-20060801.tar.gz
+     http://mirror.opensysadmin.com/ostiary/ostiary-doc-20060801.tar.gz"
 use_objdir="no"
 >
 
diff --git a/encap/src/encap-profiles/patch-2.5.9.ep b/encap/src/encap-profiles/patch-2.5.9.ep
index ff2c0fa8d..57a0ae4bc 100644
--- a/encap/src/encap-profiles/patch-2.5.9.ep
+++ b/encap/src/encap-profiles/patch-2.5.9.ep
@@ -35,8 +35,8 @@ PLATFORM_ELSE
 PLATFORM_ENDIF
 
 <source
-url="ftp://encapsrcdist/mirror/patch/patch-2.5.9.tar.gz
-     http://www.pobox.com/users/dclark/mirror/patch/patch-2.5.9.tar.gz
+url="http://encapsrcdist/mirror/patch/patch-2.5.9.tar.gz
+     http://mirror.opensysadmin.com/patch/patch-2.5.9.tar.gz
      ftp://alpha.gnu.org/gnu/diffutils/patch-2.5.9.tar.gz"
 >