summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--encap/README15
-rw-r--r--encap/VERSION2
-rw-r--r--encap/bcfg2-0.8.2pre10.profile14
-rw-r--r--encap/bcfg2-gettext-0.14.5.profile3
-rw-r--r--encap/bcfg2-libiconv-1.9.2.profile3
-rw-r--r--encap/bcfg2-libxml2-2.6.26.profile5
-rw-r--r--encap/bcfg2-libxslt-1.1.17.profile3
-rw-r--r--encap/bcfg2-lxml-1.0.1.profile3
-rw-r--r--encap/bcfg2-openssl-0.9.8b.profile3
-rw-r--r--encap/bcfg2-pkg-config-0.20.profile3
-rw-r--r--encap/bcfg2-pyopenssl-0.6.profile3
-rw-r--r--encap/bcfg2-pyrex-0.9.4.1.profile3
-rw-r--r--encap/bcfg2-python-2.4.3.profile3
-rw-r--r--encap/bcfg2-zlib-1.2.3.profile3
-rwxr-xr-xencap/m4-1.4.4.sh3
15 files changed, 53 insertions, 16 deletions
diff --git a/encap/README b/encap/README
index 7b5873de2..702eb7540 100644
--- a/encap/README
+++ b/encap/README
@@ -114,6 +114,19 @@ Note that the doc for the encap profile format is in "man 5 encap_profile".
0.3::
* Updated bcfg2 to 0.8.2pre10
-
+
+ 0.4::
+ * Versions before this version won't work without manually fixing paths
+ * Added patches so paths actually exist, specifically:
+ * bcfg2.conf default location is /usr/local/etc
+ * epkg/encap paths changed to encap default /usr/local paths
+ * schema prefix patch (changeset 1953) applied
+ * default schema prefix changed to /usr/local/lib/bcfg2
+ * Added mirror of all packages downloaded by the profiles at
+ http://www.pobox.com/users/dclark/mirror and made mirror default for
+ those downloads
+ * Set up automatic hourly mirror of bcfg2 ftp site *.tar.gz files
+ * Mirror of other packages is manual (but deps shouldn't change often)
+
== Documentation Version ==
$Id$
diff --git a/encap/VERSION b/encap/VERSION
index be5863417..bd73f4707 100644
--- a/encap/VERSION
+++ b/encap/VERSION
@@ -1 +1 @@
-0.3
+0.4
diff --git a/encap/bcfg2-0.8.2pre10.profile b/encap/bcfg2-0.8.2pre10.profile
index 75ac54e45..bc10f39d1 100644
--- a/encap/bcfg2-0.8.2pre10.profile
+++ b/encap/bcfg2-0.8.2pre10.profile
@@ -46,9 +46,21 @@ PLATFORM_ENDIF
/>
<source
-url="ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.8.2pre10.tar.gz"
+url="http://www.pobox.com/users/dclark/mirror/bcfg2-0.8.2pre10.tar.gz
+ ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.8.2pre10.tar.gz"
>
+<patch
+url="http://trac.mcs.anl.gov/projects/bcfg2/changeset/1953?format=diff"
+options=""
+from_dir="src/sbin"
+/>
+
+<patch
+url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1956&amp;format=raw"
+options="-p0"
+/>
+
<configure>
:
</configure>
diff --git a/encap/bcfg2-gettext-0.14.5.profile b/encap/bcfg2-gettext-0.14.5.profile
index 925aa42fc..75ac1ba2b 100644
--- a/encap/bcfg2-gettext-0.14.5.profile
+++ b/encap/bcfg2-gettext-0.14.5.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.5.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/gettext-0.14.5.tar.gz
+ http://ftp.gnu.org/pub/gnu/gettext/gettext-0.14.5.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-libiconv-1.9.2.profile b/encap/bcfg2-libiconv-1.9.2.profile
index d34f6512c..4cbea5057 100644
--- a/encap/bcfg2-libiconv-1.9.2.profile
+++ b/encap/bcfg2-libiconv-1.9.2.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/libiconv-1.9.2.tar.gz
+ http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-libxml2-2.6.26.profile b/encap/bcfg2-libxml2-2.6.26.profile
index 0321f30df..ac8dae36c 100644
--- a/encap/bcfg2-libxml2-2.6.26.profile
+++ b/encap/bcfg2-libxml2-2.6.26.profile
@@ -46,8 +46,9 @@ PLATFORM_ENDIF
/>
<source
- url="ftp://xmlsoft.org/libxml2/libxml2-sources-2.6.26.tar.gz"
- subdir="libxml2-2.6.26"
+url="http://www.pobox.com/users/dclark/mirror/libxml2-sources-2.6.26.tar.gz
+ ftp://xmlsoft.org/libxml2/libxml2-sources-2.6.26.tar.gz"
+subdir="libxml2-2.6.26"
>
<configure>
diff --git a/encap/bcfg2-libxslt-1.1.17.profile b/encap/bcfg2-libxslt-1.1.17.profile
index 4c321d77d..0e832e5b2 100644
--- a/encap/bcfg2-libxslt-1.1.17.profile
+++ b/encap/bcfg2-libxslt-1.1.17.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="ftp://xmlsoft.org/libxml2/libxslt-1.1.17.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/libxslt-1.1.17.tar.gz
+ ftp://xmlsoft.org/libxml2/libxslt-1.1.17.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-lxml-1.0.1.profile b/encap/bcfg2-lxml-1.0.1.profile
index a78e14b75..d2f96f9df 100644
--- a/encap/bcfg2-lxml-1.0.1.profile
+++ b/encap/bcfg2-lxml-1.0.1.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
-url="http://codespeak.net/lxml/lxml-1.0.1.tgz"
+url="http://www.pobox.com/users/dclark/mirror/lxml-1.0.1.tgz
+ http://codespeak.net/lxml/lxml-1.0.1.tgz"
>
<configure>
diff --git a/encap/bcfg2-openssl-0.9.8b.profile b/encap/bcfg2-openssl-0.9.8b.profile
index 9c00b8960..2cf8cb9f9 100644
--- a/encap/bcfg2-openssl-0.9.8b.profile
+++ b/encap/bcfg2-openssl-0.9.8b.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="http://www.openssl.org/source/openssl-0.9.8b.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/openssl-0.9.8b.tar.gz
+ http://www.openssl.org/source/openssl-0.9.8b.tar.gz"
use_objdir="no"
>
diff --git a/encap/bcfg2-pkg-config-0.20.profile b/encap/bcfg2-pkg-config-0.20.profile
index cc028069d..42aa705df 100644
--- a/encap/bcfg2-pkg-config-0.20.profile
+++ b/encap/bcfg2-pkg-config-0.20.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
-url="http://pkgconfig.freedesktop.org/releases/pkg-config-0.20.tar.gz"
+url="http://www.pobox.com/users/dclark/mirror/pkg-config-0.20.tar.gz
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.20.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-pyopenssl-0.6.profile b/encap/bcfg2-pyopenssl-0.6.profile
index d8f486e46..4e6a9980a 100644
--- a/encap/bcfg2-pyopenssl-0.6.profile
+++ b/encap/bcfg2-pyopenssl-0.6.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
-url="http://umn.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.6.tar.gz"
+url="http://www.pobox.com/users/dclark/mirror/pyOpenSSL-0.6.tar.gz
+ http://umn.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.6.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-pyrex-0.9.4.1.profile b/encap/bcfg2-pyrex-0.9.4.1.profile
index f28dabc5d..f44a72d2c 100644
--- a/encap/bcfg2-pyrex-0.9.4.1.profile
+++ b/encap/bcfg2-pyrex-0.9.4.1.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
-url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.4.1.tar.gz"
+url="http://www.pobox.com/users/dclark/mirror/Pyrex-0.9.4.1.tar.gz
+ http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.4.1.tar.gz"
>
<configure>
diff --git a/encap/bcfg2-python-2.4.3.profile b/encap/bcfg2-python-2.4.3.profile
index 8e30777d3..a156ab48f 100644
--- a/encap/bcfg2-python-2.4.3.profile
+++ b/encap/bcfg2-python-2.4.3.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="http://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz"
+ url="http://www.pobox.com/users/dclark/mirror/Python-2.4.3.tgz
+ http://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz"
>
<configure>
diff --git a/encap/bcfg2-zlib-1.2.3.profile b/encap/bcfg2-zlib-1.2.3.profile
index 50eaed255..79756bba5 100644
--- a/encap/bcfg2-zlib-1.2.3.profile
+++ b/encap/bcfg2-zlib-1.2.3.profile
@@ -46,7 +46,8 @@ PLATFORM_ENDIF
/>
<source
- url="http://www.zlib.net/zlib-1.2.3.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/zlib-1.2.3.tar.gz
+ http://www.zlib.net/zlib-1.2.3.tar.gz"
>
<configure>
diff --git a/encap/m4-1.4.4.sh b/encap/m4-1.4.4.sh
index 4373319fa..b2268bfd0 100755
--- a/encap/m4-1.4.4.sh
+++ b/encap/m4-1.4.4.sh
@@ -26,7 +26,8 @@ cat > ${ENCAP_PKGNAME}.profile << EOF
/>
<source
- url="http://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz"
+ url="http://www.pobox.com/users/dclark/mirror/m4-1.4.4.tar.gz
+ http://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz"
>
</source>