From 65d37ffebd597c991fbb8718615cd4c9a1946ab3 Mon Sep 17 00:00:00 2001 From: Daniel Joseph Barnhart Clark Date: Mon, 31 Jul 2006 03:48:29 +0000 Subject: * Rename of .profile files to .ep, which is correct according to the author of encap. Also associated Makefile and m4-1.4.4.sh changes. * Added chmod 755 of .sh scripts before execution, in case the perms go bad for some reason. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2013 ce84e21b-d406-0410-9b95-82705330c041 --- encap/Makefile | 95 ++++++----- encap/bcfg2-0.8.2.ep | 331 ++++++++++++++++++++++++++++++++++++ encap/bcfg2-0.8.2.profile | 331 ------------------------------------ encap/bcfg2-gettext-0.14.5.ep | 76 +++++++++ encap/bcfg2-gettext-0.14.5.profile | 76 --------- encap/bcfg2-libiconv-1.9.2.ep | 76 +++++++++ encap/bcfg2-libiconv-1.9.2.profile | 76 --------- encap/bcfg2-libxml2-2.6.26.ep | 86 ++++++++++ encap/bcfg2-libxml2-2.6.26.profile | 86 ---------- encap/bcfg2-libxslt-1.1.17.ep | 89 ++++++++++ encap/bcfg2-libxslt-1.1.17.profile | 89 ---------- encap/bcfg2-lxml-1.0.1.ep | 94 ++++++++++ encap/bcfg2-lxml-1.0.1.profile | 94 ---------- encap/bcfg2-openssl-0.9.8b.ep | 82 +++++++++ encap/bcfg2-openssl-0.9.8b.profile | 82 --------- encap/bcfg2-patch-2.5.9.ep | 78 +++++++++ encap/bcfg2-patch-2.5.9.profile | 78 --------- encap/bcfg2-pkg-config-0.20.ep | 77 +++++++++ encap/bcfg2-pkg-config-0.20.profile | 77 --------- encap/bcfg2-pyopenssl-0.6.ep | 91 ++++++++++ encap/bcfg2-pyopenssl-0.6.profile | 91 ---------- encap/bcfg2-pyrex-0.9.4.1.ep | 90 ++++++++++ encap/bcfg2-pyrex-0.9.4.1.profile | 90 ---------- encap/bcfg2-python-2.4.3.ep | 88 ++++++++++ encap/bcfg2-python-2.4.3.profile | 88 ---------- encap/bcfg2-zlib-1.2.3.ep | 87 ++++++++++ encap/bcfg2-zlib-1.2.3.profile | 87 ---------- encap/m4-1.4.4.sh | 10 +- 28 files changed, 1398 insertions(+), 1397 deletions(-) create mode 100644 encap/bcfg2-0.8.2.ep delete mode 100644 encap/bcfg2-0.8.2.profile create mode 100644 encap/bcfg2-gettext-0.14.5.ep delete mode 100644 encap/bcfg2-gettext-0.14.5.profile create mode 100644 encap/bcfg2-libiconv-1.9.2.ep delete mode 100644 encap/bcfg2-libiconv-1.9.2.profile create mode 100644 encap/bcfg2-libxml2-2.6.26.ep delete mode 100644 encap/bcfg2-libxml2-2.6.26.profile create mode 100644 encap/bcfg2-libxslt-1.1.17.ep delete mode 100644 encap/bcfg2-libxslt-1.1.17.profile create mode 100644 encap/bcfg2-lxml-1.0.1.ep delete mode 100644 encap/bcfg2-lxml-1.0.1.profile create mode 100644 encap/bcfg2-openssl-0.9.8b.ep delete mode 100644 encap/bcfg2-openssl-0.9.8b.profile create mode 100644 encap/bcfg2-patch-2.5.9.ep delete mode 100644 encap/bcfg2-patch-2.5.9.profile create mode 100644 encap/bcfg2-pkg-config-0.20.ep delete mode 100644 encap/bcfg2-pkg-config-0.20.profile create mode 100644 encap/bcfg2-pyopenssl-0.6.ep delete mode 100644 encap/bcfg2-pyopenssl-0.6.profile create mode 100644 encap/bcfg2-pyrex-0.9.4.1.ep delete mode 100644 encap/bcfg2-pyrex-0.9.4.1.profile create mode 100644 encap/bcfg2-python-2.4.3.ep delete mode 100644 encap/bcfg2-python-2.4.3.profile create mode 100644 encap/bcfg2-zlib-1.2.3.ep delete mode 100644 encap/bcfg2-zlib-1.2.3.profile diff --git a/encap/Makefile b/encap/Makefile index 951df309a..969aa49a2 100644 --- a/encap/Makefile +++ b/encap/Makefile @@ -2,7 +2,7 @@ .PHONY : all install clean uninstall encaps rename .SUFFIXES : -.SUFFIXES : .profile .sh .e .ep +.SUFFIXES : .profile .sh .installed .packaged BASEDIR = /usr/local ENCAPDIR = ${BASEDIR}/encap @@ -29,43 +29,44 @@ LIBXSLT = bcfg2-libxslt-1.1.17 LXML = bcfg2-lxml-1.0.1 BCFG2 = bcfg2-0.8.2 -.profile.e : # Clean, compile and install an encap package - @printf "***** START .profile.e for |$*| ***** \n" +.ep.installed : # Clean, compile and install an encap package + @printf "***** START .ep.installed for |$*| ***** \n" ( ${EPKG} -q -r ${ENCAPDIR}/$* || true ) ( rm -rf ${ENCAPDIR}/$* || true ) - ( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.profile || true ) > $*.log 2>&1 - ( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.profile || true ) >> $*.log 2>&1 - ( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.profile ) >> $*.log 2>&1 + ( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1 + ( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1 + ( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1 ${EPKG} -q -i ${ENCAPDIR}/$* test -h ${BASEDIR}/var/encap/$* - touch $*.e - @printf "***** STOP .profile.e for |$*| ***** \n" + touch $*.installed + @printf "***** STOP .ep.installed for |$*| ***** \n" -.sh.e : # Create and install a "fake" encap package - @printf "***** START .sh.e for |$*| ***** \n" +.sh.installed : # Create and install a "fake" encap package + @printf "***** START .sh.installed for |$*| ***** \n" ( ${EPKG} -q -r ${ENCAPDIR}/$* || true ) ( rm -rf ${ENCAPDIR}/$* || true ) + chmod 755 ./$*.sh ./$*.sh ${EPKG} -q -i ${ENCAPDIR}/$* test -h ${BASEDIR}/var/encap/$* - touch $*.e - @printf "***** STOP .sh.e for |$*| ***** \n" + touch $*.installed + @printf "***** STOP .sh.installed for |$*| ***** \n" -.e.ep : # Create .tar.gz encap packages for distribution to other machines - @printf "***** START .e.ep for |$*| ***** \n" +.installed.packaged : # Create .tar.gz encap packages for distribution + @printf "***** START .installed.packaged for |$*| ***** \n" ( rm ${ENCAPDIR}/$*-*.tar.gz || true ) ( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true ) cd ${ENCAPDIR} && ${MKENCAP} -c $* mv ${ENCAPDIR}/$*-encap-*.tar.gz . - touch $*.ep - @printf "***** STOP .e.ep for |$*| ***** \n" + touch $*.packaged + @printf "***** STOP .installed.packaged for |$*| ***** \n" all : ( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) & -install : ${EPKG} ${MKENCAP} ${BCFG2}.e +install : ${EPKG} ${MKENCAP} ${BCFG2}.installed -encaps : ${EPKG} ${MKENCAP} ${BCFG2}.ep +encaps : ${EPKG} ${MKENCAP} ${BCFG2}.packaged rename : encaps test "$${OS}x" != "x" @@ -75,41 +76,41 @@ rename : encaps clean : ( rm *.log || true ) - ( rm *.ep || true ) + ( rm *.packaged || true ) ( rm *.gz || true ) uninstall : clean - ( rm *.e || true ) + ( rm *.installed || true ) ( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-* || true ) ( rm -rf ${ENCAPDIR}/bcfg2-* || true ) ( rm -rf ${BASEDIR}/lib/bcfg2 || true ) -${ZLIB}.e : ${M4}.e -${LIBICONV}.e : ${ZLIB}.e -${GETTEXT}.e : ${LIBICONV}.e -${PKG-CONFIG}.e : ${GETTEXT}.e -${PATCH}.e : ${PKG-CONFIG}.e -${OPENSSL}.e : ${PATCH}.e -${LIBSTDCXX}.e : ${OPENSSL}.e -${LIBGCC}.e : ${LIBSTDCXX}.e -${PYTHON}.e : ${LIBGCC}.e -${PYREX}.e : ${PYTHON}.e -${PYOPENSSL}.e : ${PYREX}.e -${LIBXML2}.e : ${PYOPENSSL}.e -${LIBXSLT}.e : ${LIBXML2}.e -${LXML}.e : ${LIBXSLT}.e -${BCFG2}.e : ${LXML}.e +${ZLIB}.installed : ${M4}.installed +${LIBICONV}.installed : ${ZLIB}.installed +${GETTEXT}.installed : ${LIBICONV}.installed +${PKG-CONFIG}.installed : ${GETTEXT}.installed +${PATCH}.installed : ${PKG-CONFIG}.installed +${OPENSSL}.installed : ${PATCH}.installed +${LIBSTDCXX}.installed : ${OPENSSL}.installed +${LIBGCC}.installed : ${LIBSTDCXX}.installed +${PYTHON}.installed : ${LIBGCC}.installed +${PYREX}.installed : ${PYTHON}.installed +${PYOPENSSL}.installed : ${PYREX}.installed +${LIBXML2}.installed : ${PYOPENSSL}.installed +${LIBXSLT}.installed : ${LIBXML2}.installed +${LXML}.installed : ${LIBXSLT}.installed +${BCFG2}.installed : ${LXML}.installed -${LIBICONV}.ep : ${ZLIB}.ep -${GETTEXT}.ep : ${LIBICONV}.ep -${PATCH}.ep : ${GETTEXT}.ep -${OPENSSL}.ep : ${PATCH}.ep -${LIBSTDCXX}.ep : ${OPENSSL}.ep -${LIBGCC}.ep : ${LIBSTDCXX}.ep -${PYTHON}.ep : ${LIBGCC}.ep -${PYOPENSSL}.ep : ${PYTHON}.ep -${LIBXML2}.ep : ${PYOPENSSL}.ep -${LIBXSLT}.ep : ${LIBXML2}.ep -${LXML}.ep : ${LIBXSLT}.ep -${BCFG2}.ep : ${LXML}.ep +${LIBICONV}.packaged : ${ZLIB}.packaged +${GETTEXT}.packaged : ${LIBICONV}.packaged +${PATCH}.packaged : ${GETTEXT}.packaged +${OPENSSL}.packaged : ${PATCH}.packaged +${LIBSTDCXX}.packaged : ${OPENSSL}.packaged +${LIBGCC}.packaged : ${LIBSTDCXX}.packaged +${PYTHON}.packaged : ${LIBGCC}.packaged +${PYOPENSSL}.packaged : ${PYTHON}.packaged +${LIBXML2}.packaged : ${PYOPENSSL}.packaged +${LIBXSLT}.packaged : ${LIBXML2}.packaged +${LXML}.packaged : ${LIBXSLT}.packaged +${BCFG2}.packaged : ${LXML}.packaged diff --git a/encap/bcfg2-0.8.2.ep b/encap/bcfg2-0.8.2.ep new file mode 100644 index 000000000..d0b2df5c0 --- /dev/null +++ b/encap/bcfg2-0.8.2.ep @@ -0,0 +1,331 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + +', 'Path to config file'), +- 'BCFG2_CONF', False, '/etc/bcfg2.conf', False)} ++ 'BCFG2_CONF', False, '/usr/local/etc/bcfg2.conf', False)} + + class OptionFailure(Exception): + pass +Index: src/lib/Server/Plugins/Cfg.py +=================================================================== +--- src/lib/Server/Plugins/Cfg.py (revision 1976) ++++ src/lib/Server/Plugins/Cfg.py (working copy) +@@ -186,7 +186,7 @@ + dfile = open(tempfile.mktemp(), 'w') + dfile.write(delta.data) + dfile.close() +- ret = os.system("patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name)) ++ ret = os.system("/usr/local/bin/b2patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name)) + output = open(basefile.name, 'r').read() + [os.unlink(fname) for fname in [basefile.name, dfile.name]] + if ret >> 8 != 0: +Index: src/lib/Server/Component.py +=================================================================== +--- src/lib/Server/Component.py (revision 1976) ++++ src/lib/Server/Component.py (working copy) +@@ -108,7 +108,7 @@ + if setup['configfile']: + cfilename = setup['configfile'] + else: +- cfilename = '/etc/bcfg2.conf' ++ cfilename = '/usr/local/etc/bcfg2.conf' + self.cfile.read([cfilename]) + if not self.cfile.has_section('communication'): + print "Configfile missing communication section" +Index: src/lib/Client/Solaris.py +=================================================================== +--- src/lib/Client/Solaris.py (revision 1976) ++++ src/lib/Client/Solaris.py (working copy) +@@ -28,7 +28,7 @@ + and standard SMF services''' + pkgtool = {'sysv':("/usr/sbin/pkgadd %s -d %%s -n %%%%s", (("%s", ["name"]))), + 'blast':("/opt/csw/bin/pkg-get install %s", ("%s", ["name"])), +- 'encap':("/local/sbin/epkg -l -q %s", ("%s", ["url"]))} ++ 'encap':("/usr/local/bin/epkg -l -q %s", ("%s", ["url"]))} + splitter = regcompile('.*/(?P[\w-]+)\-(?P[\w\.-]+)') + ptypes = {} + __name__ = 'Solaris' +@@ -71,7 +71,7 @@ + self.installed[pkg] = version + self.ptypes[pkg] = 'sysv' + # try to find encap packages +- for pkg in glob("/local/encap/*"): ++ for pkg in glob("/usr/local/encap/*"): + match = self.splitter.match(pkg) + if match: + self.installed[match.group('name')] = match.group('version') +@@ -141,7 +141,7 @@ + if entry.get('type') in ['sysv', 'blast'] or entry.get('type')[:4] == 'sysv': + cmdrc = self.saferun("/usr/bin/pkginfo -q -v \"%s\" %s" % (entry.get('version'), entry.get('name')))[0] + elif entry.get('type') in ['encap']: +- cmdrc = self.saferun("/local/sbin/epkg -q -k %s-%s >/dev/null" % ++ cmdrc = self.saferun("/usr/local/bin/epkg -q -k %s-%s >/dev/null" % + (entry.get('name'), entry.get('version')))[0] + if cmdrc != 0: + self.logger.debug("Package %s version incorrect" % entry.get('name')) +@@ -190,7 +190,7 @@ + if not self.saferun("/usr/sbin/pkgrm -n %s" % " ".join(sysvrmpkgs))[0]: + [self.pkgwork['remove'].remove(pkg) for pkg in sysvrmpkgs] + if enrmpkgs: +- if not self.saferun("/local/sbin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]: ++ if not self.saferun("/usr/local/bin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]: + [self.pkgwork['remove'].remove(pkg) for pkg in enrmpkgs] + else: + self.logger.info("Need to remove packages: %s" % (self.pkgwork['remove'])) +Index: src/lib/Client/Proxy.py +=================================================================== +--- src/lib/Client/Proxy.py (revision 1976) ++++ src/lib/Client/Proxy.py (working copy) +@@ -123,7 +123,7 @@ + class SafeProxy: + '''Wrapper for proxy''' + _cfile = ConfigParser.ConfigParser() +- _cfpath = '/etc/bcfg2.conf' ++ _cfpath = '/usr/local/etc/bcfg2.conf' + _cfile.read([_cfpath]) + try: + _components = _cfile._sections['components'] +Index: src/sbin/bcfg2 +=================================================================== +--- src/sbin/bcfg2 (revision 1976) ++++ src/sbin/bcfg2 (working copy) +@@ -51,8 +51,8 @@ + False, False, False, False), + 'help': (('-h', False, "print this help message"), + False, False, False, True), +- 'setup': (('-C', '', "use given config file (default /etc/bcfg2.conf)"), +- False, False, '/etc/bcfg2.conf', False), ++ 'setup': (('-C', '', "use given config file (default /usr/local/etc/bcfg2.conf)"), ++ False, False, '/usr/local/etc/bcfg2.conf', False), + 'server': (('-S', '', 'the server hostname to connect to'), + False, ('components', 'bcfg2'), 'https://localhost:6789', False), + 'user': (('-u', '', 'the user to provide for authentication'), +Index: src/sbin/GenerateHostInfo +=================================================================== +--- src/sbin/GenerateHostInfo (revision 1976) ++++ src/sbin/GenerateHostInfo (working copy) +@@ -12,7 +12,7 @@ + + if __name__ == '__main__': + c = ConfigParser() +- c.read(['/etc/bcfg2.conf']) ++ c.read(['/usr/local/etc/bcfg2.conf']) + configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository') + clientdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository') + sendmailpath = c.get('statistics','sendmailpath') +Index: src/sbin/bcfg2-server +=================================================================== +--- src/sbin/bcfg2-server (revision 1976) ++++ src/sbin/bcfg2-server (working copy) +@@ -182,7 +182,7 @@ + 'daemon': (('-D', '', 'daemonize the server, storing PID'), + False, False, False, False), + 'configfile': (('-C', '', 'use this config file'), +- False, False, '/etc/bcfg2.conf', False), ++ False, False, '/usr/local/etc/bcfg2.conf', False), + 'client': (('-c', '', 'hard set the client name (for debugging)'), + False, False, False, False) + } +Index: src/sbin/StatReports +=================================================================== +--- src/sbin/StatReports (revision 1976) ++++ src/sbin/StatReports (working copy) +@@ -147,12 +147,12 @@ + + if __name__ == '__main__': + c = ConfigParser() +- c.read(['/etc/bcfg2.conf']) ++ c.read(['/usr/local/etc/bcfg2.conf']) + configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository') + statpath = "%s/etc/statistics.xml" % c.get('server', 'repository') + clientsdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository') +- transformpath = "/usr/share/bcfg2/xsl-transforms/" +- #websrcspath = "/usr/share/bcfg2/web-rprt-srcs/" ++ transformpath = "/usr/local/lib/bcfg2/share/bcfg2/xsl-transforms/" ++ #websrcspath = "/usr/local/lib/bcfg2/share/bcfg2/web-rprt-srcs/" + + try: + opts, args = getopt(argv[1:], "hc:s:", ["help", "config=", "stats="]) +Index: src/sbin/bcfg2-info +=================================================================== +--- src/sbin/bcfg2-info (revision 1976) ++++ src/sbin/bcfg2-info (working copy) +@@ -169,7 +169,7 @@ + if '-c' in sys.argv: + cfile = sys.argv[-1] + else: +- cfile = '/etc/bcfg2.conf' ++ cfile = '/usr/local/etc/bcfg2.conf' + try: + bcore = Bcfg2.Server.Core.Core({}, cfile) + except Bcfg2.Server.Core.CoreInitError, msg: +Index: src/sbin/bcfg2-repo-validate +=================================================================== +--- src/sbin/bcfg2-repo-validate (revision 1976) ++++ src/sbin/bcfg2-repo-validate (working copy) +@@ -11,11 +11,11 @@ + verbose = True + sys.argv.remove('-v') + cf = ConfigParser.ConfigParser() +- cf.read(['/etc/bcfg2.conf']) ++ cf.read(['/usr/local/etc/bcfg2.conf']) + try: + prefix = cf.get('server', 'prefix') + except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): +- prefix = '/usr' ++ prefix = '/usr/local/lib/bcfg2' + if verbose: + print "Using installation prefix %s" % (prefix) + schemadir = "%s/share/bcfg2/schemas" % (prefix) +@@ -55,7 +55,7 @@ + datafile = lxml.etree.parse(open(filename)) + except SyntaxError: + print "%s ***FAILS*** to parse \t\t<----" % (filename) +- os.system("xmllint %s" % filename) ++ os.system("/usr/local/bin/b2xmllint %s" % filename) + failures = 1 + continue + except IOError: +@@ -67,6 +67,6 @@ + print "%s checks out" % (filename) + else: + print "%s ***FAILS*** to verify \t\t<----" % (filename) +- os.system("xmllint --schema %s %s" % (schemaname % schemadir, filename)) ++ os.system("/usr/local/bin/b2xmllint --schema %s %s" % (schemaname % schemadir, filename)) + failures = 1 + raise SystemExit, failures +Index: reports/brpt/settings.py +=================================================================== +--- reports/brpt/settings.py (revision 1976) ++++ reports/brpt/settings.py (working copy) +@@ -1,7 +1,8 @@ + # Django settings for brpt project. + from ConfigParser import ConfigParser, NoSectionError, NoOptionError + c = ConfigParser() +-c.read(['/etc/bcfg2.conf'])#This needs to be configurable one day somehow ++c.read(['/usr/local/etc/bcfg2.conf']) # This needs to be configurable one day somehow ++ # Using something other than patch(1) - dclark + sqlitedbpath = "%s/etc/brpt.sqlite" % c.get('server', 'repository') + + DEBUG = True + +]]> + + +: + + + +/usr/local/lib/bcfg2/bin/python setup.py build \ +--build-base=${builddir}/build + + + +/usr/local/lib/bcfg2/bin/python setup.py install \ +--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 + + + +/usr/local/lib/bcfg2/bin/python setup.py clean + + + + +/dev/null || exit 0 +ln -sf ../lib/bcfg2/bin/GenerateHostInfo bin/ +ln -sf ../lib/bcfg2/bin/StatReports bin/ +ln -sf ../lib/bcfg2/bin/bcfg2 bin/ +ln -sf ../lib/bcfg2/bin/bcfg2-info bin/ +ln -sf ../lib/bcfg2/bin/bcfg2-repo-validate bin/ +ln -sf ../lib/bcfg2/bin/bcfg2-server bin/ +mkdir share 2>/dev/null || exit 0 +mkdir share/bcfg2 2>/dev/null || exit 0 +(cp ${builddir}/doc/manual.pdf share/bcfg2/ || true) +cp -r ${builddir}/examples share/bcfg2/ +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} +]]> + + +description Bcfg2 - Provides a declarative interface to system configuration +prereq pkgspec >= bcfg2-zlib-1.2.3 +prereq pkgspec >= bcfg2-libiconv-1.9.2 +prereq pkgspec >= bcfg2-gettext-0.14.5 +prereq pkgspec >= bcfg2-patch-2.5.9 +prereq pkgspec >= bcfg2-openssl-0.9.8b +prereq pkgspec >= bcfg2-libstdc++-0.1 +prereq pkgspec >= bcfg2-libgcc-0.1 +prereq pkgspec >= bcfg2-python-2.4.3 +prereq pkgspec >= bcfg2-pyopenssl-0.6 +prereq pkgspec >= bcfg2-libxml2-2.6.26 +prereq pkgspec >= bcfg2-libxslt-1.1.17 +prereq pkgspec >= bcfg2-lxml-1.0.1 + + + diff --git a/encap/bcfg2-0.8.2.profile b/encap/bcfg2-0.8.2.profile deleted file mode 100644 index d0b2df5c0..000000000 --- a/encap/bcfg2-0.8.2.profile +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - -', 'Path to config file'), -- 'BCFG2_CONF', False, '/etc/bcfg2.conf', False)} -+ 'BCFG2_CONF', False, '/usr/local/etc/bcfg2.conf', False)} - - class OptionFailure(Exception): - pass -Index: src/lib/Server/Plugins/Cfg.py -=================================================================== ---- src/lib/Server/Plugins/Cfg.py (revision 1976) -+++ src/lib/Server/Plugins/Cfg.py (working copy) -@@ -186,7 +186,7 @@ - dfile = open(tempfile.mktemp(), 'w') - dfile.write(delta.data) - dfile.close() -- ret = os.system("patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name)) -+ ret = os.system("/usr/local/bin/b2patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name)) - output = open(basefile.name, 'r').read() - [os.unlink(fname) for fname in [basefile.name, dfile.name]] - if ret >> 8 != 0: -Index: src/lib/Server/Component.py -=================================================================== ---- src/lib/Server/Component.py (revision 1976) -+++ src/lib/Server/Component.py (working copy) -@@ -108,7 +108,7 @@ - if setup['configfile']: - cfilename = setup['configfile'] - else: -- cfilename = '/etc/bcfg2.conf' -+ cfilename = '/usr/local/etc/bcfg2.conf' - self.cfile.read([cfilename]) - if not self.cfile.has_section('communication'): - print "Configfile missing communication section" -Index: src/lib/Client/Solaris.py -=================================================================== ---- src/lib/Client/Solaris.py (revision 1976) -+++ src/lib/Client/Solaris.py (working copy) -@@ -28,7 +28,7 @@ - and standard SMF services''' - pkgtool = {'sysv':("/usr/sbin/pkgadd %s -d %%s -n %%%%s", (("%s", ["name"]))), - 'blast':("/opt/csw/bin/pkg-get install %s", ("%s", ["name"])), -- 'encap':("/local/sbin/epkg -l -q %s", ("%s", ["url"]))} -+ 'encap':("/usr/local/bin/epkg -l -q %s", ("%s", ["url"]))} - splitter = regcompile('.*/(?P[\w-]+)\-(?P[\w\.-]+)') - ptypes = {} - __name__ = 'Solaris' -@@ -71,7 +71,7 @@ - self.installed[pkg] = version - self.ptypes[pkg] = 'sysv' - # try to find encap packages -- for pkg in glob("/local/encap/*"): -+ for pkg in glob("/usr/local/encap/*"): - match = self.splitter.match(pkg) - if match: - self.installed[match.group('name')] = match.group('version') -@@ -141,7 +141,7 @@ - if entry.get('type') in ['sysv', 'blast'] or entry.get('type')[:4] == 'sysv': - cmdrc = self.saferun("/usr/bin/pkginfo -q -v \"%s\" %s" % (entry.get('version'), entry.get('name')))[0] - elif entry.get('type') in ['encap']: -- cmdrc = self.saferun("/local/sbin/epkg -q -k %s-%s >/dev/null" % -+ cmdrc = self.saferun("/usr/local/bin/epkg -q -k %s-%s >/dev/null" % - (entry.get('name'), entry.get('version')))[0] - if cmdrc != 0: - self.logger.debug("Package %s version incorrect" % entry.get('name')) -@@ -190,7 +190,7 @@ - if not self.saferun("/usr/sbin/pkgrm -n %s" % " ".join(sysvrmpkgs))[0]: - [self.pkgwork['remove'].remove(pkg) for pkg in sysvrmpkgs] - if enrmpkgs: -- if not self.saferun("/local/sbin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]: -+ if not self.saferun("/usr/local/bin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]: - [self.pkgwork['remove'].remove(pkg) for pkg in enrmpkgs] - else: - self.logger.info("Need to remove packages: %s" % (self.pkgwork['remove'])) -Index: src/lib/Client/Proxy.py -=================================================================== ---- src/lib/Client/Proxy.py (revision 1976) -+++ src/lib/Client/Proxy.py (working copy) -@@ -123,7 +123,7 @@ - class SafeProxy: - '''Wrapper for proxy''' - _cfile = ConfigParser.ConfigParser() -- _cfpath = '/etc/bcfg2.conf' -+ _cfpath = '/usr/local/etc/bcfg2.conf' - _cfile.read([_cfpath]) - try: - _components = _cfile._sections['components'] -Index: src/sbin/bcfg2 -=================================================================== ---- src/sbin/bcfg2 (revision 1976) -+++ src/sbin/bcfg2 (working copy) -@@ -51,8 +51,8 @@ - False, False, False, False), - 'help': (('-h', False, "print this help message"), - False, False, False, True), -- 'setup': (('-C', '', "use given config file (default /etc/bcfg2.conf)"), -- False, False, '/etc/bcfg2.conf', False), -+ 'setup': (('-C', '', "use given config file (default /usr/local/etc/bcfg2.conf)"), -+ False, False, '/usr/local/etc/bcfg2.conf', False), - 'server': (('-S', '', 'the server hostname to connect to'), - False, ('components', 'bcfg2'), 'https://localhost:6789', False), - 'user': (('-u', '', 'the user to provide for authentication'), -Index: src/sbin/GenerateHostInfo -=================================================================== ---- src/sbin/GenerateHostInfo (revision 1976) -+++ src/sbin/GenerateHostInfo (working copy) -@@ -12,7 +12,7 @@ - - if __name__ == '__main__': - c = ConfigParser() -- c.read(['/etc/bcfg2.conf']) -+ c.read(['/usr/local/etc/bcfg2.conf']) - configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository') - clientdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository') - sendmailpath = c.get('statistics','sendmailpath') -Index: src/sbin/bcfg2-server -=================================================================== ---- src/sbin/bcfg2-server (revision 1976) -+++ src/sbin/bcfg2-server (working copy) -@@ -182,7 +182,7 @@ - 'daemon': (('-D', '', 'daemonize the server, storing PID'), - False, False, False, False), - 'configfile': (('-C', '', 'use this config file'), -- False, False, '/etc/bcfg2.conf', False), -+ False, False, '/usr/local/etc/bcfg2.conf', False), - 'client': (('-c', '', 'hard set the client name (for debugging)'), - False, False, False, False) - } -Index: src/sbin/StatReports -=================================================================== ---- src/sbin/StatReports (revision 1976) -+++ src/sbin/StatReports (working copy) -@@ -147,12 +147,12 @@ - - if __name__ == '__main__': - c = ConfigParser() -- c.read(['/etc/bcfg2.conf']) -+ c.read(['/usr/local/etc/bcfg2.conf']) - configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository') - statpath = "%s/etc/statistics.xml" % c.get('server', 'repository') - clientsdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository') -- transformpath = "/usr/share/bcfg2/xsl-transforms/" -- #websrcspath = "/usr/share/bcfg2/web-rprt-srcs/" -+ transformpath = "/usr/local/lib/bcfg2/share/bcfg2/xsl-transforms/" -+ #websrcspath = "/usr/local/lib/bcfg2/share/bcfg2/web-rprt-srcs/" - - try: - opts, args = getopt(argv[1:], "hc:s:", ["help", "config=", "stats="]) -Index: src/sbin/bcfg2-info -=================================================================== ---- src/sbin/bcfg2-info (revision 1976) -+++ src/sbin/bcfg2-info (working copy) -@@ -169,7 +169,7 @@ - if '-c' in sys.argv: - cfile = sys.argv[-1] - else: -- cfile = '/etc/bcfg2.conf' -+ cfile = '/usr/local/etc/bcfg2.conf' - try: - bcore = Bcfg2.Server.Core.Core({}, cfile) - except Bcfg2.Server.Core.CoreInitError, msg: -Index: src/sbin/bcfg2-repo-validate -=================================================================== ---- src/sbin/bcfg2-repo-validate (revision 1976) -+++ src/sbin/bcfg2-repo-validate (working copy) -@@ -11,11 +11,11 @@ - verbose = True - sys.argv.remove('-v') - cf = ConfigParser.ConfigParser() -- cf.read(['/etc/bcfg2.conf']) -+ cf.read(['/usr/local/etc/bcfg2.conf']) - try: - prefix = cf.get('server', 'prefix') - except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): -- prefix = '/usr' -+ prefix = '/usr/local/lib/bcfg2' - if verbose: - print "Using installation prefix %s" % (prefix) - schemadir = "%s/share/bcfg2/schemas" % (prefix) -@@ -55,7 +55,7 @@ - datafile = lxml.etree.parse(open(filename)) - except SyntaxError: - print "%s ***FAILS*** to parse \t\t<----" % (filename) -- os.system("xmllint %s" % filename) -+ os.system("/usr/local/bin/b2xmllint %s" % filename) - failures = 1 - continue - except IOError: -@@ -67,6 +67,6 @@ - print "%s checks out" % (filename) - else: - print "%s ***FAILS*** to verify \t\t<----" % (filename) -- os.system("xmllint --schema %s %s" % (schemaname % schemadir, filename)) -+ os.system("/usr/local/bin/b2xmllint --schema %s %s" % (schemaname % schemadir, filename)) - failures = 1 - raise SystemExit, failures -Index: reports/brpt/settings.py -=================================================================== ---- reports/brpt/settings.py (revision 1976) -+++ reports/brpt/settings.py (working copy) -@@ -1,7 +1,8 @@ - # Django settings for brpt project. - from ConfigParser import ConfigParser, NoSectionError, NoOptionError - c = ConfigParser() --c.read(['/etc/bcfg2.conf'])#This needs to be configurable one day somehow -+c.read(['/usr/local/etc/bcfg2.conf']) # This needs to be configurable one day somehow -+ # Using something other than patch(1) - dclark - sqlitedbpath = "%s/etc/brpt.sqlite" % c.get('server', 'repository') - - DEBUG = True - -]]> - - -: - - - -/usr/local/lib/bcfg2/bin/python setup.py build \ ---build-base=${builddir}/build - - - -/usr/local/lib/bcfg2/bin/python setup.py install \ ---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 - - - -/usr/local/lib/bcfg2/bin/python setup.py clean - - - - -/dev/null || exit 0 -ln -sf ../lib/bcfg2/bin/GenerateHostInfo bin/ -ln -sf ../lib/bcfg2/bin/StatReports bin/ -ln -sf ../lib/bcfg2/bin/bcfg2 bin/ -ln -sf ../lib/bcfg2/bin/bcfg2-info bin/ -ln -sf ../lib/bcfg2/bin/bcfg2-repo-validate bin/ -ln -sf ../lib/bcfg2/bin/bcfg2-server bin/ -mkdir share 2>/dev/null || exit 0 -mkdir share/bcfg2 2>/dev/null || exit 0 -(cp ${builddir}/doc/manual.pdf share/bcfg2/ || true) -cp -r ${builddir}/examples share/bcfg2/ -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} -]]> - - -description Bcfg2 - Provides a declarative interface to system configuration -prereq pkgspec >= bcfg2-zlib-1.2.3 -prereq pkgspec >= bcfg2-libiconv-1.9.2 -prereq pkgspec >= bcfg2-gettext-0.14.5 -prereq pkgspec >= bcfg2-patch-2.5.9 -prereq pkgspec >= bcfg2-openssl-0.9.8b -prereq pkgspec >= bcfg2-libstdc++-0.1 -prereq pkgspec >= bcfg2-libgcc-0.1 -prereq pkgspec >= bcfg2-python-2.4.3 -prereq pkgspec >= bcfg2-pyopenssl-0.6 -prereq pkgspec >= bcfg2-libxml2-2.6.26 -prereq pkgspec >= bcfg2-libxslt-1.1.17 -prereq pkgspec >= bcfg2-lxml-1.0.1 - - - diff --git a/encap/bcfg2-gettext-0.14.5.ep b/encap/bcfg2-gettext-0.14.5.ep new file mode 100644 index 000000000..8bf753796 --- /dev/null +++ b/encap/bcfg2-gettext-0.14.5.ep @@ -0,0 +1,76 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Gettext - Tools to produce multi-lingual messages + + + diff --git a/encap/bcfg2-gettext-0.14.5.profile b/encap/bcfg2-gettext-0.14.5.profile deleted file mode 100644 index 8bf753796..000000000 --- a/encap/bcfg2-gettext-0.14.5.profile +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Gettext - Tools to produce multi-lingual messages - - - diff --git a/encap/bcfg2-libiconv-1.9.2.ep b/encap/bcfg2-libiconv-1.9.2.ep new file mode 100644 index 000000000..da6d76bd0 --- /dev/null +++ b/encap/bcfg2-libiconv-1.9.2.ep @@ -0,0 +1,76 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Libiconv - Converts between character encodings + + + diff --git a/encap/bcfg2-libiconv-1.9.2.profile b/encap/bcfg2-libiconv-1.9.2.profile deleted file mode 100644 index da6d76bd0..000000000 --- a/encap/bcfg2-libiconv-1.9.2.profile +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Libiconv - Converts between character encodings - - - diff --git a/encap/bcfg2-libxml2-2.6.26.ep b/encap/bcfg2-libxml2-2.6.26.ep new file mode 100644 index 000000000..fa0344477 --- /dev/null +++ b/encap/bcfg2-libxml2-2.6.26.ep @@ -0,0 +1,86 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ +PLATFORM_IF_MATCH(aix) +PLATFORM_ELSE + --enable-shared \ +PLATFORM_ENDIF + --enable-ipv6=no \ + --with-python=/usr/local/lib/bcfg2 \ + --with-zlib=/usr/local/lib/bcfg2 + + + + + +mkdir bin 2>/dev/null || exit 0 +ln -sf ../lib/bcfg2/bin/xmllint bin/b2xmllint +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Libxml2 - XML C library for the Gnome project + + + diff --git a/encap/bcfg2-libxml2-2.6.26.profile b/encap/bcfg2-libxml2-2.6.26.profile deleted file mode 100644 index fa0344477..000000000 --- a/encap/bcfg2-libxml2-2.6.26.profile +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ -PLATFORM_IF_MATCH(aix) -PLATFORM_ELSE - --enable-shared \ -PLATFORM_ENDIF - --enable-ipv6=no \ - --with-python=/usr/local/lib/bcfg2 \ - --with-zlib=/usr/local/lib/bcfg2 - - - - - -mkdir bin 2>/dev/null || exit 0 -ln -sf ../lib/bcfg2/bin/xmllint bin/b2xmllint -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Libxml2 - XML C library for the Gnome project - - - diff --git a/encap/bcfg2-libxslt-1.1.17.ep b/encap/bcfg2-libxslt-1.1.17.ep new file mode 100644 index 000000000..8845c4a4f --- /dev/null +++ b/encap/bcfg2-libxslt-1.1.17.ep @@ -0,0 +1,89 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ +PLATFORM_IF_MATCH(aix) +PLATFORM_ELSE + --enable-shared \ +PLATFORM_ENDIF + --with-crypto=no \ + --with-libxml-prefix=/usr/local/lib/bcfg2 \ + --with-libxml-include-prefix=/usr/local/lib/bcfg2/include \ + --with-libxml-libs-prefix=/usr/local/lib/bcfg2/lib \ + --enable-ipv6=no \ + --with-python=/usr/local/lib/bcfg2 \ + --with-zlib=/usr/local/lib/bcfg2 + + + + + +mv lib/bcfg2/lib/lib/python2.4 lib/bcfg2/lib +rmdir lib/bcfg2/lib/lib +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Libxml2 - XML C library for the Gnome project + + + diff --git a/encap/bcfg2-libxslt-1.1.17.profile b/encap/bcfg2-libxslt-1.1.17.profile deleted file mode 100644 index 8845c4a4f..000000000 --- a/encap/bcfg2-libxslt-1.1.17.profile +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ -PLATFORM_IF_MATCH(aix) -PLATFORM_ELSE - --enable-shared \ -PLATFORM_ENDIF - --with-crypto=no \ - --with-libxml-prefix=/usr/local/lib/bcfg2 \ - --with-libxml-include-prefix=/usr/local/lib/bcfg2/include \ - --with-libxml-libs-prefix=/usr/local/lib/bcfg2/lib \ - --enable-ipv6=no \ - --with-python=/usr/local/lib/bcfg2 \ - --with-zlib=/usr/local/lib/bcfg2 - - - - - -mv lib/bcfg2/lib/lib/python2.4 lib/bcfg2/lib -rmdir lib/bcfg2/lib/lib -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Libxml2 - XML C library for the Gnome project - - - diff --git a/encap/bcfg2-lxml-1.0.1.ep b/encap/bcfg2-lxml-1.0.1.ep new file mode 100644 index 000000000..aa8e009e1 --- /dev/null +++ b/encap/bcfg2-lxml-1.0.1.ep @@ -0,0 +1,94 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +/usr/local/lib/bcfg2/bin/python setup.py build_ext \ +-I/usr/local/lib/bcfg2/include \ +-L/usr/local/lib/bcfg2/lib \ +-lexslt \ +-L/usr/local/lib/bcfg2/lib/python2.4/site-packages + + + +/usr/local/lib/bcfg2/bin/python setup.py build \ +--build-base=${builddir}/build + + + +/usr/local/lib/bcfg2/bin/python setup.py install \ +--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 + + + +/usr/local/lib/bcfg2/bin/python setup.py clean +make clean + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description lxml - A Pythonic binding for the libxml2 and libxslt libraries + + + diff --git a/encap/bcfg2-lxml-1.0.1.profile b/encap/bcfg2-lxml-1.0.1.profile deleted file mode 100644 index aa8e009e1..000000000 --- a/encap/bcfg2-lxml-1.0.1.profile +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -/usr/local/lib/bcfg2/bin/python setup.py build_ext \ --I/usr/local/lib/bcfg2/include \ --L/usr/local/lib/bcfg2/lib \ --lexslt \ --L/usr/local/lib/bcfg2/lib/python2.4/site-packages - - - -/usr/local/lib/bcfg2/bin/python setup.py build \ ---build-base=${builddir}/build - - - -/usr/local/lib/bcfg2/bin/python setup.py install \ ---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 - - - -/usr/local/lib/bcfg2/bin/python setup.py clean -make clean - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description lxml - A Pythonic binding for the libxml2 and libxslt libraries - - - diff --git a/encap/bcfg2-openssl-0.9.8b.ep b/encap/bcfg2-openssl-0.9.8b.ep new file mode 100644 index 000000000..318ee6603 --- /dev/null +++ b/encap/bcfg2-openssl-0.9.8b.ep @@ -0,0 +1,82 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./config \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ + zlib-dynamic shared \ + -L/usr/local/lib/bcfg2/lib \ + -I/usr/local/lib/bcfg2/include + + + + + +mkdir bin 2>/dev/null || exit 0 +ln -sf ../lib/bcfg2/bin/openssl bin/b2openssl +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description SSL encryption tool and library + + + diff --git a/encap/bcfg2-openssl-0.9.8b.profile b/encap/bcfg2-openssl-0.9.8b.profile deleted file mode 100644 index 318ee6603..000000000 --- a/encap/bcfg2-openssl-0.9.8b.profile +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./config \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ - zlib-dynamic shared \ - -L/usr/local/lib/bcfg2/lib \ - -I/usr/local/lib/bcfg2/include - - - - - -mkdir bin 2>/dev/null || exit 0 -ln -sf ../lib/bcfg2/bin/openssl bin/b2openssl -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description SSL encryption tool and library - - - diff --git a/encap/bcfg2-patch-2.5.9.ep b/encap/bcfg2-patch-2.5.9.ep new file mode 100644 index 000000000..1784e59d2 --- /dev/null +++ b/encap/bcfg2-patch-2.5.9.ep @@ -0,0 +1,78 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" + + + + + +mkdir bin 2>/dev/null || exit 0 +ln -sf ../lib/bcfg2/bin/patch bin/b2patch +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description patch - Apply a diff file to an original + + + diff --git a/encap/bcfg2-patch-2.5.9.profile b/encap/bcfg2-patch-2.5.9.profile deleted file mode 100644 index 1784e59d2..000000000 --- a/encap/bcfg2-patch-2.5.9.profile +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" - - - - - -mkdir bin 2>/dev/null || exit 0 -ln -sf ../lib/bcfg2/bin/patch bin/b2patch -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description patch - Apply a diff file to an original - - - diff --git a/encap/bcfg2-pkg-config-0.20.ep b/encap/bcfg2-pkg-config-0.20.ep new file mode 100644 index 000000000..62db17661 --- /dev/null +++ b/encap/bcfg2-pkg-config-0.20.ep @@ -0,0 +1,77 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ + --with-pc-path=/usr/local/lib/bcfg2/lib/pkgconfig + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description pkg-config - application and library compilation helper tool + + + diff --git a/encap/bcfg2-pkg-config-0.20.profile b/encap/bcfg2-pkg-config-0.20.profile deleted file mode 100644 index 62db17661..000000000 --- a/encap/bcfg2-pkg-config-0.20.profile +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ - --with-pc-path=/usr/local/lib/bcfg2/lib/pkgconfig - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description pkg-config - application and library compilation helper tool - - - diff --git a/encap/bcfg2-pyopenssl-0.6.ep b/encap/bcfg2-pyopenssl-0.6.ep new file mode 100644 index 000000000..7f9fa97f6 --- /dev/null +++ b/encap/bcfg2-pyopenssl-0.6.ep @@ -0,0 +1,91 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +/usr/local/lib/bcfg2/bin/python setup.py build_ext \ +-I/usr/local/lib/bcfg2/include/openssl \ +-L/usr/local/lib/bcfg2/lib/ + + + +/usr/local/lib/bcfg2/bin/python setup.py build \ +--build-base=${builddir}/build + + + +/usr/local/lib/bcfg2/bin/python setup.py install \ +--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 + + + +/usr/local/lib/bcfg2/bin/python setup.py clean + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description pyOpenSSL - Python interface to the OpenSSL library + + + diff --git a/encap/bcfg2-pyopenssl-0.6.profile b/encap/bcfg2-pyopenssl-0.6.profile deleted file mode 100644 index 7f9fa97f6..000000000 --- a/encap/bcfg2-pyopenssl-0.6.profile +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -/usr/local/lib/bcfg2/bin/python setup.py build_ext \ --I/usr/local/lib/bcfg2/include/openssl \ --L/usr/local/lib/bcfg2/lib/ - - - -/usr/local/lib/bcfg2/bin/python setup.py build \ ---build-base=${builddir}/build - - - -/usr/local/lib/bcfg2/bin/python setup.py install \ ---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 - - - -/usr/local/lib/bcfg2/bin/python setup.py clean - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description pyOpenSSL - Python interface to the OpenSSL library - - - diff --git a/encap/bcfg2-pyrex-0.9.4.1.ep b/encap/bcfg2-pyrex-0.9.4.1.ep new file mode 100644 index 000000000..8fcc80449 --- /dev/null +++ b/encap/bcfg2-pyrex-0.9.4.1.ep @@ -0,0 +1,90 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +: + + + +/usr/local/lib/bcfg2/bin/python setup.py build \ +--build-base=${builddir}/build + + + +/usr/local/lib/bcfg2/bin/python setup.py install \ +--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \ + + + +/usr/local/lib/bcfg2/bin/python setup.py clean + + + + + +chmod -R o+r lib/bcfg2 +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Pyrex - a Language for Writing Python Extension Modules + + + diff --git a/encap/bcfg2-pyrex-0.9.4.1.profile b/encap/bcfg2-pyrex-0.9.4.1.profile deleted file mode 100644 index 8fcc80449..000000000 --- a/encap/bcfg2-pyrex-0.9.4.1.profile +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -: - - - -/usr/local/lib/bcfg2/bin/python setup.py build \ ---build-base=${builddir}/build - - - -/usr/local/lib/bcfg2/bin/python setup.py install \ ---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \ - - - -/usr/local/lib/bcfg2/bin/python setup.py clean - - - - - -chmod -R o+r lib/bcfg2 -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Pyrex - a Language for Writing Python Extension Modules - - - diff --git a/encap/bcfg2-python-2.4.3.ep b/encap/bcfg2-python-2.4.3.ep new file mode 100644 index 000000000..296bedff3 --- /dev/null +++ b/encap/bcfg2-python-2.4.3.ep @@ -0,0 +1,88 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + + + +./configure \ + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + --with-gcc \ + --with-cxx=g++ \ +PLATFORM_ENDIF + --enable-shared=yes \ + --disable-ipv6 + + + + + lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth +mkdir bin 2>/dev/null || exit 0 +ln -sf ../lib/bcfg2/bin/idle bin/b2idle +ln -sf ../lib/bcfg2/bin/pydoc bin/b2pydoc +ln -sf ../lib/bcfg2/bin/python bin/b2python +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} +]]> + + +description Python - Scripting language + + + diff --git a/encap/bcfg2-python-2.4.3.profile b/encap/bcfg2-python-2.4.3.profile deleted file mode 100644 index 296bedff3..000000000 --- a/encap/bcfg2-python-2.4.3.profile +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - - - - -./configure \ - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \ -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - --with-gcc \ - --with-cxx=g++ \ -PLATFORM_ENDIF - --enable-shared=yes \ - --disable-ipv6 - - - - - lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth -mkdir bin 2>/dev/null || exit 0 -ln -sf ../lib/bcfg2/bin/idle bin/b2idle -ln -sf ../lib/bcfg2/bin/pydoc bin/b2pydoc -ln -sf ../lib/bcfg2/bin/python bin/b2python -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} -]]> - - -description Python - Scripting language - - - diff --git a/encap/bcfg2-zlib-1.2.3.ep b/encap/bcfg2-zlib-1.2.3.ep new file mode 100644 index 000000000..4a081993b --- /dev/null +++ b/encap/bcfg2-zlib-1.2.3.ep @@ -0,0 +1,87 @@ + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + +PLATFORM_IF_MATCH(solaris) + +PLATFORM_ENDIF + + + + +./configure \ +PLATFORM_IF_MATCH(aix) +PLATFORM_ELSE + --shared \ +PLATFORM_ENDIF + --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" + + + + + +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} + + + +description Zlib compression library + + + diff --git a/encap/bcfg2-zlib-1.2.3.profile b/encap/bcfg2-zlib-1.2.3.profile deleted file mode 100644 index 4a081993b..000000000 --- a/encap/bcfg2-zlib-1.2.3.profile +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - -PLATFORM_IF_MATCH(linux) -PLATFORM_ELSE - -PLATFORM_ENDIF - - - - - -PLATFORM_IF_MATCH(solaris) - -PLATFORM_ENDIF - - - - -./configure \ -PLATFORM_IF_MATCH(aix) -PLATFORM_ELSE - --shared \ -PLATFORM_ENDIF - --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" - - - - - -mkdir var 2>/dev/null || exit 0 -mkdir var/encap 2>/dev/null || exit 0 -touch var/encap/${ENCAP_PKGNAME} - - - -description Zlib compression library - - - diff --git a/encap/m4-1.4.4.sh b/encap/m4-1.4.4.sh index 740c74cd8..b424007eb 100755 --- a/encap/m4-1.4.4.sh +++ b/encap/m4-1.4.4.sh @@ -5,7 +5,7 @@ ENCAP_PKGNAME=m4-1.4.4 PATH=$PATH:/usr/local/bin export PATH -cat > ${ENCAP_PKGNAME}.profile << EOF +cat > ${ENCAP_PKGNAME}.ep << EOF ${ENCAP_PKGNAME}.log 2>&1 -( ${MKENCAP} -m ${PWD}/m4-fake -b -T ${ENCAP_PKGNAME}.profile || true ) \ +( ${MKENCAP} -m ${PWD}/m4-fake -b -T ${ENCAP_PKGNAME}.ep || true ) \ >> ${ENCAP_PKGNAME}.log 2>&1 -( ${MKENCAP} -m ${PWD}/m4-fake -b -CBI ${ENCAP_PKGNAME}.profile ) \ +( ${MKENCAP} -m ${PWD}/m4-fake -b -CBI ${ENCAP_PKGNAME}.ep ) \ >> ${ENCAP_PKGNAME}.log 2>&1 rm m4-fake -rm ${ENCAP_PKGNAME}.profile +rm ${ENCAP_PKGNAME}.ep exit 0 -- cgit v1.2.3-1-g7c22