solaris sysV packaging (not tool) update; rebase on blastwave for sol10

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

5 files changed, 140 insertions, 55 deletions

diff --git a/solaris/Makefile b/solaris/Makefile
index 6f72a432a..9d177e4b6 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,13 +1,14 @@
 #!/usr/sfw/bin/gmake
 
-VERS=0.6.8-2
+VERS=1.0-1
 
 default: clean package
 
 package:
 	-mkdir tmp tmp/bcfg2-server tmp/bcfg2
-	-cd ../ && python setup.py install --prefix=$(PWD)
-	-pkgmk -o -a `uname -m` -f prototype.bcfg2 -d $(PWD)/tmp -r $(PWD)
+	-cd ../ && /opt/csw/bin/python setup.py install --prefix=$(PWD)
+	-cat bin/bcfg2 | sed -e 's!/usr/bin/python!/opt/csw/bin/python!' > bin/bcfg2.new && mv bin/bcfg2.new bin/bcfg2
+	-pkgmk -o -a `uname -m` -f prototype.bcfg2 -d $(PWD)/tmp -r $(PWD) 
 	-pkgmk -o -a `uname -m` -f prototype.bcfg2-server -d $(PWD)/tmp -r $(PWD)
 	-pkgtrans -o -s $(PWD)/tmp $(PWD)/bcfg2-$(VERS) SCbcfg2
 	-pkgtrans -o -s $(PWD)/tmp $(PWD)/bcfg2-server-$(VERS) SCbcfg2-server
diff --git a/solaris/pkginfo.bcfg2 b/solaris/pkginfo.bcfg2
index 91ab30e4e..50eaed274 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,10 +1,10 @@
 PKG="SCbcfg2"
 NAME="bcfg2"
-ARCH="i86pc"
-VERSION="0.6.8-2"
+ARCH="sparc"
+VERSION="1.0pre1-1"
 CATEGORY="application"
 VENDOR="Argonne National Labratory"
-EMAIL="zach@mcs.anl.gov"
-PSTAMP="Zach Lowry"
-BASEDIR="/usr/local"
+EMAIL="bcfg-dev@mcs.anl.gov"
+PSTAMP=""
+BASEDIR="/opt/csw"
 CLASSES="none"
diff --git a/solaris/pkginfo.bcfg2-server b/solaris/pkginfo.bcfg2-server
index 552aa1ebd..f3ab806ee 100644
--- a/solaris/pkginfo.bcfg2-server
+++ b/solaris/pkginfo.bcfg2-server
@@ -1,10 +1,10 @@
 PKG="SCbcfg2-server"
 NAME="bcfg2-server"
-ARCH="i86pc"
-VERSION="0.6.8-2"
+ARCH="sparc"
+VERSION="1.0pre1-1"
 CATEGORY="application"
 VENDOR="Argonne National Labratory"
 EMAIL="zach@mcs.anl.gov"
 PSTAMP="Zach Lowry"
-BASEDIR="/usr/local"
+BASEDIR="/usr"
 CLASSES="none"
diff --git a/solaris/prototype.bcfg2 b/solaris/prototype.bcfg2
index 251d2ab34..f5a9bf360 100644
--- a/solaris/prototype.bcfg2
+++ b/solaris/prototype.bcfg2
@@ -1,19 +1,103 @@
 i pkginfo=./pkginfo.bcfg2
-d none lib 0755 bin bin
-d none lib/python2.3 0755 bin bin
-d none lib/python2.3/site-packages 0755 bin bin
-d none lib/python2.3/site-packages/Bcfg2 0755 bin bin
-f none lib/python2.3/site-packages/Bcfg2/__init__.py 0644 bin bin
-d none lib/python2.3/site-packages/Bcfg2/Client 0755 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/Debian.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/Gentoo.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/Redhat.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/Solaris.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/Toolset.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Client/__init__.py 0644 bin bin
-d none bin 0755 bin bin
+d none lib 0755 root bin
+d none lib/python2.5 0755 root bin
+d none lib/python2.5/site-packages 0755 root bin
+d none lib/python2.5/site-packages/Bcfg2 0755 bin bin
+f none lib/python2.5/site-packages/Bcfg2/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Component.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Daemon.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Logger.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Options.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Proxy.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/X509.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/TLSConnection.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Cryptlib_RC4.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/AES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Python_AES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/prngd.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/OpenSSL_AES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/PyCrypto_TripleDES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/RC4.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/PyCrypto_AES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/dateFuncs.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/cipherfactory.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Python_RSAKey.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/ASN1Parser.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/OpenSSL_TripleDES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/PyCrypto_RC4.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/cryptomath.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/OpenSSL_RC4.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/hmac.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/xmltools.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/jython_compat.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/PyCrypto_RSAKey.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/codec.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/keyfactory.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/OpenSSL_RSAKey.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Python_RC4.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Cryptlib_TripleDES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/TripleDES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/Cryptlib_AES.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/rijndael.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/RSAKey.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/utils/compat.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/HandshakeSettings.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/SessionCache.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/X509CertChain.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/Session.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/errors.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/FileObject.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/mathtls.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/BaseDB.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/messages.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/VerifierDB.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/constants.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/AsyncStateMachine.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/TLSTwistedProtocolWrapper.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/HTTPTLSConnection.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/IntegrationHelper.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/XMLRPCTransport.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/IMAP4_TLS.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/TLSSocketServerMixIn.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/ClientHelper.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/POP3_TLS.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/SMTP_TLS.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/integration/TLSAsyncDispatcherMixIn.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/SharedKeyDB.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/Checker.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/TLSRecordLayer.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/tlslite/api.py 0644 bin bin
+d none lib/python2.5/site-packages/Bcfg2/Client 0755 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Frame.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/XML.py 0644 bin bin
+d none lib/python2.5/site-packages/Bcfg2/Client/Tools 0755 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/__init__.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/RPMng.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Portage.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/YUMng.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Blast.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/SYSV.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Chkconfig.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/DebInit.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/FreeBSDInit.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/SMF.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/APT.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/launchd.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/RcUpdate.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/rpmtools.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Yum.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Action.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/Encap.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/FreeBSDPackage.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/POSIX.py 0644 bin bin
+f none lib/python2.5/site-packages/Bcfg2/Client/Tools/RPM.py 0644 bin bin
+d none bin 0755 root bin
 f none bin/bcfg2 0755 bin bin
-d none share 0755 bin bin
-d none share/man 0755 bin bin
-d none share/man/man1 0755 bin bin
-f none share/man/man1/bcfg2.1 0444 bin bin
+d none share 0755 root bin
+d none share/man 0755 root bin
+d none share/man/man1 0755 root bin
+f none share/man/man1/bcfg2.1 0444 root bin
diff --git a/solaris/prototype.bcfg2-server b/solaris/prototype.bcfg2-server
index 0b953d9e0..4acca5b14 100644
--- a/solaris/prototype.bcfg2-server
+++ b/solaris/prototype.bcfg2-server
@@ -1,31 +1,31 @@
 i pkginfo=./pkginfo.bcfg2-server
 d none lib 0755 bin bin
-d none lib/python2.3 0755 bin bin
-d none lib/python2.3/site-packages 0755 bin bin
-d none lib/python2.3/site-packages/Bcfg2 0755 bin bin
-d none lib/python2.3/site-packages/Bcfg2/Server 0755 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Core.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generator.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Metadata.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Statistics.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Structure.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/__init__.py 0644 bin bin
-d none lib/python2.3/site-packages/Bcfg2/Server/Generators 0755 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/Account.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/Cfg.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/Chiba.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/Pkgmgr.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/SSHbase.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/Svcmgr.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/TCheetah.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Generators/__init__.py 0644 bin bin
-d none lib/python2.3/site-packages/Bcfg2/Server/Structures 0755 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Structures/Base.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Structures/Bundler.py 0644 bin bin
-f none lib/python2.3/site-packages/Bcfg2/Server/Structures/__init__.py 0644 bin bin
+d none lib/python2.4 0755 bin bin
+d none lib/python2.4/site-packages 0755 bin bin
+d none lib/python2.4/site-packages/Bcfg2 0755 bin bin
+d none lib/python2.4/site-packages/Bcfg2/Server 0755 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Core.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generator.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Metadata.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Statistics.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Structure.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/__init__.py 0644 bin bin
+d none lib/python2.4/site-packages/Bcfg2/Server/Generators 0755 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/Account.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/Cfg.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/Chiba.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/Pkgmgr.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/SSHbase.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/Svcmgr.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/TCheetah.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Generators/__init__.py 0644 bin bin
+d none lib/python2.4/site-packages/Bcfg2/Server/Structures 0755 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Structures/Base.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Structures/Bundler.py 0644 bin bin
+f none lib/python2.4/site-packages/Bcfg2/Server/Structures/__init__.py 0644 bin bin
 d none sbin 0755 bin bin
-f none sbin/Bcfg2Server=bin/Bcfg2Server 0755 bin bin
-f none sbin/ValidateBcfg2Repo=bin/ValidateBcfg2Repo 0755 bin bin
+f none sbin/bcfg2-server=bin/bcfg2-server 0755 bin bin
+f none sbin/bcfg2-repo-validate=bin/bcfg2-repo-validate 0755 bin bin
 d none share 0755 bin bin
 d none share/bcfg2 0755 bin bin
 d none share/bcfg2/schemas 0755 bin bin
@@ -38,5 +38,5 @@ f none share/bcfg2/schemas/services.xsd 0444 bin bin
 f none share/bcfg2/schemas/translation.xsd 0444 bin bin
 d none share/man 0755 bin bin
 d none share/man/man8 0755 bin bin
-f none share/man/man8/Bcfg2Server.8 0444 bin bin
-f none share/man/man8/ValidateBcfg2Repo.8 0444 bin bin
+f none share/man/man8/bcfg2-server.8 0444 bin bin
+f none share/man/man8/bcfg2-repo-validate.8 0444 bin bin