summaryrefslogtreecommitdiffstats
path: root/encap
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-07-20 21:50:42 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-07-20 21:50:42 +0000
commit3bbe7a851f04b710f16e2ca326f437f414c7b476 (patch)
tree33d1ce47ca094228c1d12f2a1bdb98ad81a25255 /encap
parent169fa407ffdda0602a84f4519fd6047020f8d659 (diff)
downloadbcfg2-3bbe7a851f04b710f16e2ca326f437f414c7b476.tar.gz
bcfg2-3bbe7a851f04b710f16e2ca326f437f414c7b476.tar.bz2
bcfg2-3bbe7a851f04b710f16e2ca326f437f414c7b476.zip
Updates for release 0.8.2 of bcfg2
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1977 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap')
-rw-r--r--encap/Makefile2
-rw-r--r--encap/README13
-rw-r--r--encap/VERSION2
-rw-r--r--encap/bcfg2-0.8.2.profile (renamed from encap/bcfg2-0.8.2pre10.profile)38
4 files changed, 17 insertions, 38 deletions
diff --git a/encap/Makefile b/encap/Makefile
index 345cd026f..951df309a 100644
--- a/encap/Makefile
+++ b/encap/Makefile
@@ -27,7 +27,7 @@ PYOPENSSL = bcfg2-pyopenssl-0.6
LIBXML2 = bcfg2-libxml2-2.6.26
LIBXSLT = bcfg2-libxslt-1.1.17
LXML = bcfg2-lxml-1.0.1
-BCFG2 = bcfg2-0.8.2pre10
+BCFG2 = bcfg2-0.8.2
.profile.e : # Clean, compile and install an encap package
@printf "***** START .profile.e for |$*| ***** \n"
diff --git a/encap/README b/encap/README
index b8b7d49f8..0e3588985 100644
--- a/encap/README
+++ b/encap/README
@@ -23,10 +23,16 @@ It attempts to be as self contained as possible; everything gets linked to
under `/usr/local/lib/bcfg2`, except for bcfg2 itself and some dependent
software, which is prefixed by `b2` (`b2openssl`, `b2python` etc.).
-Note that to run the bcfg2 server, you also need to install gamin, which
+To run the bcfg2 server, you also need to install gamin, which
supports a subset of the platforms bcfg2 client will work on, including
GNU/Linux and FreeBSD.
+When using this packaging, `/etc/bcfg2.conf` is instead
+`/usr/local/etc/bcfg2.conf`.
+
+This should be considered an alpha version. Everything compiles and seems to
+work, but it has not yet been tested with a working bcfg2 repository.
+
== Building and installing everything ==
1. Make sure all of the Prerequisites (see below) are installed.
1. The build user needs write access to the encap source and build
@@ -133,6 +139,11 @@ Note that the doc for the encap profile format is in "man 5 encap_profile".
replaced with patches inline the bcfg2 .profile
* Added GNU patch dependancy, both for bcfg2 patches and call from Cfg.py
* Fixed bcfg-repo-validate so it can find xmllint (as b2xmllint)
+
+ 0.6::
+ * Updated bcfg2 to 0.8.2 (released version)
+ * Removed r1953 patch from bcfg2 .profile, since that is included in 0.8.2
+ * Added alpha version warning
== Documentation Version ==
$Id$
diff --git a/encap/VERSION b/encap/VERSION
index 2eb3c4fe4..5a2a5806d 100644
--- a/encap/VERSION
+++ b/encap/VERSION
@@ -1 +1 @@
-0.5
+0.6
diff --git a/encap/bcfg2-0.8.2pre10.profile b/encap/bcfg2-0.8.2.profile
index c9b04dc8b..de5433cbc 100644
--- a/encap/bcfg2-0.8.2pre10.profile
+++ b/encap/bcfg2-0.8.2.profile
@@ -4,7 +4,7 @@
<encap_profile
profile_ver="1.0"
- pkgspec="bcfg2-0.8.2pre10"
+ pkgspec="bcfg2-0.8.2"
>
<environment
@@ -46,42 +46,10 @@ PLATFORM_ENDIF
/>
<source
-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"
+url="http://www.pobox.com/users/dclark/mirror/bcfg2-0.8.2.tar.gz
+ ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.8.2.tar.gz"
>
-<patch options="" from_dir="src/sbin"><![CDATA[
-Index: trunk/bcfg2/src/sbin/bcfg2-repo-validate
-===================================================================
---- trunk/bcfg2/src/sbin/bcfg2-repo-validate (revision 1947)
-+++ trunk/bcfg2/src/sbin/bcfg2-repo-validate (revision 1953)
-@@ -7,14 +7,20 @@
-
- if __name__ == '__main__':
-- cf = ConfigParser.ConfigParser()
-- schemadir = '/usr/share/bcfg2/schemas'
- verbose = False
- if '-v' in sys.argv:
- verbose = True
- sys.argv.remove('-v')
-+ cf = ConfigParser.ConfigParser()
-+ cf.read(['/etc/bcfg2.conf'])
-+ try:
-+ prefix = cf.get('server', 'prefix')
-+ except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-+ prefix = '/usr'
-+ if verbose:
-+ print "Using installation prefix %s" % (prefix)
-+ schemadir = "%s/share/bcfg2/schemas" % (prefix)
- if len(sys.argv) > 1:
- repo = sys.argv[1]
- else:
-- cf.read(['/etc/bcfg2.conf'])
- try:
- repo = cf.get('server', 'repository')
-
-]]></patch>
-
<patch options="-p0"><![CDATA[
Index: src/lib/Options.py
===================================================================