Menu
▾
▴
etch-devel
|
From: <jh...@us...> - 2009-01-06 00:13:36
|
Revision: 60
http://etch.svn.sourceforge.net/etch/?rev=60&view=rev
Author: jheiss
Date: 2009-01-06 00:13:34 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Tag 3.4 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.4/
Modified: Makefile
===================================================================
--- Makefile 2009-01-06 00:02:17 UTC (rev 59)
+++ Makefile 2009-01-06 00:13:34 UTC (rev 60)
@@ -1,4 +1,4 @@
-VER=3.3
+VER=3.4
TAGNAME=release-$(VER)
# Perhaps somewith with better make skill than I've got can make this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-04-02 01:21:39
|
Revision: 80
http://etch.svn.sourceforge.net/etch/?rev=80&view=rev
Author: jheiss
Date: 2009-04-02 01:21:34 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
Tag 3.5 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.5/
Modified: Makefile
===================================================================
--- Makefile 2009-04-02 00:21:34 UTC (rev 79)
+++ Makefile 2009-04-02 01:21:34 UTC (rev 80)
@@ -1,7 +1,7 @@
-VER=3.4
+VER=3.5
TAGNAME=release-$(VER)
-# Perhaps somewith with better make skill than I've got can make this
+# Perhaps someone with better make skill than I've got can make this
# more elegant
# Note, must indent with spaces here
MD5=$(shell which md5)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-10-13 19:51:38
|
Revision: 120
http://etch.svn.sourceforge.net/etch/?rev=120&view=rev
Author: jheiss
Date: 2009-10-13 19:51:24 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Tag 3.8 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.8/
Modified: Makefile
===================================================================
--- Makefile 2009-10-13 18:29:59 UTC (rev 119)
+++ Makefile 2009-10-13 19:51:24 UTC (rev 120)
@@ -1,4 +1,4 @@
-VER=3.7
+VER=3.8
TAGNAME=release-$(VER)
all: dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-10-29 21:09:16
|
Revision: 134
http://etch.svn.sourceforge.net/etch/?rev=134&view=rev
Author: jheiss
Date: 2009-10-29 21:09:09 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
Tag 3.9 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.9/
Modified: Makefile
===================================================================
--- Makefile 2009-10-29 20:45:18 UTC (rev 133)
+++ Makefile 2009-10-29 21:09:09 UTC (rev 134)
@@ -1,4 +1,4 @@
-VER=3.8
+VER=3.9
TAGNAME=release-$(VER)
all: dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-11-06 01:04:18
|
Revision: 139
http://etch.svn.sourceforge.net/etch/?rev=139&view=rev
Author: jheiss
Date: 2009-11-06 01:04:05 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Tag 3.10 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.10/
Modified: Makefile
===================================================================
--- Makefile 2009-11-06 00:56:57 UTC (rev 138)
+++ Makefile 2009-11-06 01:04:05 UTC (rev 139)
@@ -1,4 +1,4 @@
-VER=3.9
+VER=3.10
TAGNAME=release-$(VER)
all: dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-11-14 18:20:06
|
Revision: 164
http://etch.svn.sourceforge.net/etch/?rev=164&view=rev
Author: jheiss
Date: 2009-11-14 18:19:58 +0000 (Sat, 14 Nov 2009)
Log Message:
-----------
Re-tagging 3.12 release
Modified Paths:
--------------
tags/release-3.12/VERSION
Added Paths:
-----------
tags/release-3.12/
tags/release-3.12/client/Portfile
tags/release-3.12/client/Rakefile
Removed Paths:
-------------
tags/release-3.12/client/Portfile
tags/release-3.12/client/Rakefile
Modified: tags/release-3.12/VERSION
===================================================================
--- trunk/VERSION 2009-11-14 17:58:54 UTC (rev 159)
+++ tags/release-3.12/VERSION 2009-11-14 18:19:58 UTC (rev 164)
@@ -1 +1 @@
-trunk
+3.12
Deleted: tags/release-3.12/client/Portfile
===================================================================
--- trunk/client/Portfile 2009-11-14 17:58:54 UTC (rev 159)
+++ tags/release-3.12/client/Portfile 2009-11-14 18:19:58 UTC (rev 164)
@@ -1,50 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name etch
-version 3.11
-categories sysutils
-maintainers aput.net:jheiss openmaintainer
-
-description Etch is a system configuration management tool.
-
-long_description Etch is a tool for managing the configuration of \
- Unix systems. Etch can manage text or binary \
- files, links and directories. The contents of \
- files can be supplied from static files or \
- generated on the fly by scripts or templates. \
- Permissions and ownership as well as any pre or \
- post commands to run when updating the file are \
- configured in simple XML files.
-
-homepage http://etch.sourceforge.net/
-platforms darwin
-
-master_sites sourceforge
-
-checksums md5 e462d44552ce628b2a2e121eb5825b62 \
- sha1 0cee484b291e89adaa46b1fccc763e14ccb41f90 \
- rmd160 5221532a9bba2b93274a8fd419dc4da6ec965e5e
-
-depends_build port:rb-rake
-depends_run port:ruby \
- port:facter
-
-PortGroup ruby 1.0
-
-# fetch
-# extract
-# patch
-# configure
-# build
-# destroot
-
-use_configure no
-build {}
-test.run no
-destroot.cmd cd client && rake
-destroot.target install\[${destroot}\]
-destroot.destdir ""
-
Copied: tags/release-3.12/client/Portfile (from rev 161, trunk/client/Portfile)
===================================================================
--- tags/release-3.12/client/Portfile (rev 0)
+++ tags/release-3.12/client/Portfile 2009-11-14 18:19:58 UTC (rev 164)
@@ -0,0 +1,50 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name etch
+version %VER%
+categories sysutils
+maintainers aput.net:jheiss openmaintainer
+
+description Etch is a system configuration management tool.
+
+long_description Etch is a tool for managing the configuration of \
+ Unix systems. Etch can manage text or binary \
+ files, links and directories. The contents of \
+ files can be supplied from static files or \
+ generated on the fly by scripts or templates. \
+ Permissions and ownership as well as any pre or \
+ post commands to run when updating the file are \
+ configured in simple XML files.
+
+homepage http://etch.sourceforge.net/
+platforms darwin
+
+master_sites sourceforge
+
+checksums md5 e462d44552ce628b2a2e121eb5825b62 \
+ sha1 0cee484b291e89adaa46b1fccc763e14ccb41f90 \
+ rmd160 5221532a9bba2b93274a8fd419dc4da6ec965e5e
+
+depends_build port:rb-rake
+depends_run port:ruby \
+ port:facter
+
+PortGroup ruby 1.0
+
+# fetch
+# extract
+# patch
+# configure
+# build
+# destroot
+
+use_configure no
+build {}
+test.run no
+destroot.cmd cd client && rake
+destroot.target install\[${destroot}\]
+destroot.destdir ""
+
Deleted: tags/release-3.12/client/Rakefile
===================================================================
--- trunk/client/Rakefile 2009-11-14 17:58:54 UTC (rev 159)
+++ tags/release-3.12/client/Rakefile 2009-11-14 18:19:58 UTC (rev 164)
@@ -1,426 +0,0 @@
-require 'rbconfig'
-require 'tempfile'
-require 'tmpdir'
-
-ETCHVER = IO.read('../VERSION').chomp
-
-BUILDROOT = '/var/tmp/etch-client-buildroot'
-
-# Copies the etch client files to destdir. Appropriate subdirectories will be
-# composed unless specified via options.
-# options:
-# :bindir
-# :libdir
-# :etcdir
-# :mandir
-# :crondir (note no default here, crontab will not be copied if not specified)
-# :ruby (#! lines in scripts will be changed to specified ruby)
-# :installbase (base directory where files will end up)
-def copy_etch_files(destdir, options={})
- bindir = nil
- if options[:bindir]
- bindir = File.join(destdir, options[:bindir])
- else
- bindir = File.join(destdir, 'bin')
- end
- mkdir_p(bindir)
- binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
- binapps.each do |binapp|
- if options[:ruby]
- # Change #! line
- File.open(File.join(bindir, binapp), 'w') do |newfile|
- File.open(binapp) do |oldfile|
- # Modify the first line
- firstline = oldfile.gets
- # Preserve any options. I.e. #!/usr/bin/ruby -w
- shebang, shebangopts = firstline.split(' ', 2)
- newfile.puts "#!#{options[:ruby]} #{shebangopts}"
- # Then dump in the rest of the file
- newfile.write(oldfile.read)
- end
- end
- else
- cp(binapp, bindir, :preserve => true)
- end
- chmod(0555, File.join(bindir, binapp))
- end
-
- libdir = nil
- if options[:libdir]
- libdir = File.join(destdir, options[:libdir])
- else
- libdir = File.join(destdir, 'lib')
- end
- mkdir_p(libdir)
- clientlibs = ['etchclient.rb']
- clientlibs.each do |clientlib|
- cp(clientlib, libdir, :preserve => true)
- end
- serverlibs = ['etch.rb', 'versiontype.rb']
- serverlibs.each do |serverlib|
- cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
- end
- clientlibs + serverlibs.each do |lib|
- chmod(0444, File.join(libdir, lib))
- end
-
- mandir = nil
- if options[:mandir]
- mandir = File.join(destdir, options[:mandir])
- else
- mandir = File.join(destdir, 'man')
- end
- man8dir = File.join(mandir, 'man8')
- mkdir_p(man8dir)
- cp('etch.8', man8dir, :preserve => true)
- chmod(0444, File.join(man8dir, 'etch.8'))
-
- etcdir = nil
- realetcdir = nil
- if options[:etcdir]
- realetcdir = options[:etcdir]
- else
- realetcdir = '/etc'
- end
- etcdir = File.join(destdir, realetcdir)
- mkdir_p(etcdir)
- etcfiles = ['ca.pem', 'dhparams']
- etcfiles.each do |etcfile|
- cp(etcfile, etcdir, :preserve => true)
- chmod(0644, File.join(etcdir, etcfile))
- end
-
- if options[:crondir]
- crondir = File.join(destdir, options[:crondir])
- mkdir_p(crondir)
- # Note file renamed to 'etch' here. Filename is different in the repo for
- # clarity and to avoid conflict with the main executable.
- cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
- chmod(0444, File.join(crondir, 'etch'))
- end
-
- # Substitute ETCHVER into etchclient.rb
- # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
- newetchclient = File.join(libdir, 'etchclient.rb.new')
- etchclient = File.join(libdir, 'etchclient.rb')
- File.open(newetchclient, 'w') do |newfile|
- IO.foreach(etchclient) do |line|
- if line =~ /^\s*VERSION/
- line.sub!(/=.*/, "= '#{ETCHVER}'")
- end
- if options[:installbase] && line =~ /^\s*CONFIGDIR/
- line.sub!(/=.*/, "= #{realetcdir}")
- end
- newfile.write(line)
- end
- end
- mv(newetchclient, etchclient)
- chmod(0444, etchclient)
-end
-
-desc 'Build an etch client RPM on a Red Hat box'
-task :redhat => [:redhatprep, :rpm]
-desc 'Prep a Red Hat box for building an RPM'
-task :redhatprep do
- # Install the package which contains the rpmbuild command
- system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
-end
-desc 'Build an etch client RPM'
-task :rpm do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
- :installbase => '/')
-
- #
- # Prep spec file
- #
-
- spec = Tempfile.new('etchrpm')
- IO.foreach('etch-client.spec') do |line|
- line.sub!('%VER%', ETCHVER)
- spec.puts(line)
- end
-
- #
- # Build the package
- #
-
- system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build an etch client deb'
-task :deb do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
- File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
- IO.foreach('control') do |line|
- next if line =~ /^\s*#/ # Remove comments
- line.sub!('%VER%', ETCHVER)
- control.puts(line)
- end
- end
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
- :installbase => '/')
-
- #
- # Set permissions
- #
-
- system("sudo chown -R 0:0 #{BUILDROOT}")
-
- #
- # Build the package
- #
-
- system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build etch client SysV packages for Solaris'
-task :solaris => [:sysvpkg, :sysvpkgsparc]
-desc 'Build an etch client SysV package'
-task :sysvpkg do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/opt/csw/bin/ruby', :installbase => '/')
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../YPCetch-#{ETCHVER}.pkg YPCetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# On Sparc systems we're having problems with the CSW/Blastwave ruby core
-# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
-# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
-# express all the dependencies against CSW, and put our library file
-# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
-# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
-# for libraries. Users will have to manually install the Sunfreeware ruby
-# package.
-desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
-task :sysvpkgsparc do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/usr/local/bin/ruby', :installbase => '/')
-
- # Since we're using the Sunfreeware ruby but CSW libraries we need to add
- # the CSW ruby library directory to the search path
- newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
- etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
- File.open(newetch, 'w') do |newfile|
- IO.foreach(etch) do |line|
- if line =~ /unshift.*__FILE__/
- line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
- end
- newfile.write(line)
- end
- end
- mv(newetch, etch)
- chmod(0555, etch)
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../YPCetch-#{ETCHVER}-sparc.pkg YPCetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# Install based on Config::CONFIG paths
-task :install, :destdir do |t, args|
- destdir = nil
- if args.destdir
- destdir = args.destdir
- else
- destdir = '/'
- end
- copy_etch_files(destdir,
- :bindir => Config::CONFIG['sbindir'],
- :libdir => Config::CONFIG['sitelibdir'],
- :mandir => Config::CONFIG['mandir'],
- :etcdir => Config::CONFIG['sysconfdir'],
- # Can't find a better way to get the path to the current ruby
- :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']),
- :installbase => '/')
-end
-
-task :gem do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
- copy_etch_files(BUILDROOT)
-
- #
- # Prep gemspec
- #
- File.open(File.join(BUILDROOT, 'Rakefile'), 'w') do |gemspec|
- IO.foreach('gemspec') do |line|
- line.sub!('%VER%', ETCHVER)
- gemspec.puts(line)
- end
- end
-
- #
- # Build the package
- #
-
- system("cd #{BUILDROOT} && rake gem")
- gemglob = File.join(BUILDROOT, 'pkg', '*.gem')
- gemfile = Dir.glob(gemglob).first
- if gemfile
- mv(gemfile, Dir.tmpdir)
- puts "Gem is #{File.join(Dir.tmpdir, File.basename(gemfile))}"
- else
- warn "Gem file #{gemglob} not found!"
- end
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
Copied: tags/release-3.12/client/Rakefile (from rev 161, trunk/client/Rakefile)
===================================================================
--- tags/release-3.12/client/Rakefile (rev 0)
+++ tags/release-3.12/client/Rakefile 2009-11-14 18:19:58 UTC (rev 164)
@@ -0,0 +1,439 @@
+require 'rbconfig'
+require 'tempfile'
+require 'tmpdir'
+
+ETCHVER = IO.read('../VERSION').chomp
+
+BUILDROOT = '/var/tmp/etch-client-buildroot'
+
+# Copies the etch client files to destdir. Appropriate subdirectories will be
+# composed unless specified via options.
+# options:
+# :bindir
+# :libdir
+# :etcdir
+# :mandir
+# :crondir (note no default here, crontab will not be copied if not specified)
+# :ruby (#! lines in scripts will be changed to specified ruby)
+# :installbase (base directory where files will end up)
+def copy_etch_files(destdir, options={})
+ bindir = nil
+ if options[:bindir]
+ bindir = File.join(destdir, options[:bindir])
+ else
+ bindir = File.join(destdir, 'bin')
+ end
+ mkdir_p(bindir)
+ binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
+ binapps.each do |binapp|
+ if options[:ruby]
+ # Change #! line
+ File.open(File.join(bindir, binapp), 'w') do |newfile|
+ File.open(binapp) do |oldfile|
+ # Modify the first line
+ firstline = oldfile.gets
+ # Preserve any options. I.e. #!/usr/bin/ruby -w
+ shebang, shebangopts = firstline.split(' ', 2)
+ newfile.puts "#!#{options[:ruby]} #{shebangopts}"
+ # Then dump in the rest of the file
+ newfile.write(oldfile.read)
+ end
+ end
+ else
+ cp(binapp, bindir, :preserve => true)
+ end
+ chmod(0555, File.join(bindir, binapp))
+ end
+
+ libdir = nil
+ if options[:libdir]
+ libdir = File.join(destdir, options[:libdir])
+ else
+ libdir = File.join(destdir, 'lib')
+ end
+ mkdir_p(libdir)
+ clientlibs = ['etchclient.rb']
+ clientlibs.each do |clientlib|
+ cp(clientlib, libdir, :preserve => true)
+ end
+ serverlibs = ['etch.rb', 'versiontype.rb']
+ serverlibs.each do |serverlib|
+ cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
+ end
+ clientlibs + serverlibs.each do |lib|
+ chmod(0444, File.join(libdir, lib))
+ end
+
+ mandir = nil
+ if options[:mandir]
+ mandir = File.join(destdir, options[:mandir])
+ else
+ mandir = File.join(destdir, 'man')
+ end
+ man8dir = File.join(mandir, 'man8')
+ mkdir_p(man8dir)
+ cp('etch.8', man8dir, :preserve => true)
+ chmod(0444, File.join(man8dir, 'etch.8'))
+
+ etcdir = nil
+ realetcdir = nil
+ if options[:etcdir]
+ realetcdir = options[:etcdir]
+ else
+ realetcdir = '/etc'
+ end
+ etcdir = File.join(destdir, realetcdir)
+ mkdir_p(etcdir)
+ etcfiles = ['ca.pem', 'dhparams']
+ etcfiles.each do |etcfile|
+ cp(etcfile, etcdir, :preserve => true)
+ chmod(0644, File.join(etcdir, etcfile))
+ end
+
+ if options[:crondir]
+ crondir = File.join(destdir, options[:crondir])
+ mkdir_p(crondir)
+ # Note file renamed to 'etch' here. Filename is different in the repo for
+ # clarity and to avoid conflict with the main executable.
+ cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
+ chmod(0444, File.join(crondir, 'etch'))
+ end
+
+ # Substitute ETCHVER into etchclient.rb
+ # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
+ newetchclient = File.join(libdir, 'etchclient.rb.new')
+ etchclient = File.join(libdir, 'etchclient.rb')
+ File.open(newetchclient, 'w') do |newfile|
+ IO.foreach(etchclient) do |line|
+ if line =~ /^\s*VERSION/
+ line.sub!(/=.*/, "= '#{ETCHVER}'")
+ end
+ if options[:installbase] && line =~ /^\s*CONFIGDIR/
+ line.sub!(/=.*/, "= #{realetcdir}")
+ end
+ newfile.write(line)
+ end
+ end
+ mv(newetchclient, etchclient)
+ chmod(0444, etchclient)
+end
+
+desc 'Build an etch client RPM on a Red Hat box'
+task :redhat => [:redhatprep, :rpm]
+desc 'Prep a Red Hat box for building an RPM'
+task :redhatprep do
+ # Install the package which contains the rpmbuild command
+ system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
+end
+desc 'Build an etch client RPM'
+task :rpm do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
+ :installbase => '/')
+
+ #
+ # Prep spec file
+ #
+
+ spec = Tempfile.new('etchrpm')
+ IO.foreach('etch-client.spec') do |line|
+ line.sub!('%VER%', ETCHVER)
+ spec.puts(line)
+ end
+
+ #
+ # Build the package
+ #
+
+ system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build an etch client deb'
+task :deb do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
+ File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
+ IO.foreach('control') do |line|
+ next if line =~ /^\s*#/ # Remove comments
+ line.sub!('%VER%', ETCHVER)
+ control.puts(line)
+ end
+ end
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
+ :installbase => '/')
+
+ #
+ # Set permissions
+ #
+
+ system("sudo chown -R 0:0 #{BUILDROOT}")
+
+ #
+ # Build the package
+ #
+
+ system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build etch client SysV packages for Solaris'
+task :solaris => [:sysvpkg, :sysvpkgsparc]
+desc 'Build an etch client SysV package'
+task :sysvpkg do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/opt/csw/bin/ruby', :installbase => '/')
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../YPCetch-#{ETCHVER}.pkg YPCetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# On Sparc systems we're having problems with the CSW/Blastwave ruby core
+# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
+# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
+# express all the dependencies against CSW, and put our library file
+# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
+# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
+# for libraries. Users will have to manually install the Sunfreeware ruby
+# package.
+desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
+task :sysvpkgsparc do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/usr/local/bin/ruby', :installbase => '/')
+
+ # Since we're using the Sunfreeware ruby but CSW libraries we need to add
+ # the CSW ruby library directory to the search path
+ newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
+ etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
+ File.open(newetch, 'w') do |newfile|
+ IO.foreach(etch) do |line|
+ if line =~ /unshift.*__FILE__/
+ line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
+ end
+ newfile.write(line)
+ end
+ end
+ mv(newetch, etch)
+ chmod(0555, etch)
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../YPCetch-#{ETCHVER}-sparc.pkg YPCetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# Install based on Config::CONFIG paths
+task :install, :destdir do |t, args|
+ destdir = nil
+ if args.destdir
+ destdir = args.destdir
+ else
+ destdir = '/'
+ end
+ copy_etch_files(destdir,
+ :bindir => Config::CONFIG['sbindir'],
+ :libdir => Config::CONFIG['sitelibdir'],
+ :mandir => Config::CONFIG['mandir'],
+ :etcdir => Config::CONFIG['sysconfdir'],
+ # Can't find a better way to get the path to the current ruby
+ :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']),
+ :installbase => '/')
+end
+
+desc 'Prepare portfile for submission to MacPorts'
+task :macport do
+ portfile = File.join(Dir.tmpdir, 'Portfile')
+ rm_f(portfile)
+ File.open(portfile, 'w') do |newfile|
+ IO.foreach('Portfile') do |line|
+ line.sub!('%VER%', ETCHVER)
+ newfile.puts(line)
+ end
+ end
+ puts "Portfile is #{portfile}"
+end
+
+task :gem do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+ copy_etch_files(BUILDROOT)
+
+ #
+ # Prep gemspec
+ #
+ File.open(File.join(BUILDROOT, 'Rakefile'), 'w') do |gemspec|
+ IO.foreach('gemspec') do |line|
+ line.sub!('%VER%', ETCHVER)
+ gemspec.puts(line)
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd #{BUILDROOT} && rake gem")
+ gemglob = File.join(BUILDROOT, 'pkg', '*.gem')
+ gemfile = Dir.glob(gemglob).first
+ if gemfile
+ mv(gemfile, Dir.tmpdir)
+ puts "Gem is #{File.join(Dir.tmpdir, File.basename(gemfile))}"
+ else
+ warn "Gem file #{gemglob} not found!"
+ end
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-11-14 22:08:20
|
Revision: 168
http://etch.svn.sourceforge.net/etch/?rev=168&view=rev
Author: jheiss
Date: 2009-11-14 22:08:11 +0000 (Sat, 14 Nov 2009)
Log Message:
-----------
Tag 3.13 release
Modified Paths:
--------------
Rakefile
tags/release-3.13/VERSION
Added Paths:
-----------
tags/release-3.13/
tags/release-3.13/client/Portfile
tags/release-3.13/client/Rakefile
Removed Paths:
-------------
tags/release-3.13/client/Portfile
tags/release-3.13/client/Rakefile
Modified: Rakefile
===================================================================
--- Rakefile 2009-11-14 22:06:33 UTC (rev 167)
+++ Rakefile 2009-11-14 22:08:11 UTC (rev 168)
@@ -1,4 +1,4 @@
-ETCHVER = '3.12'
+ETCHVER = '3.13'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.13/VERSION
===================================================================
--- trunk/VERSION 2009-11-14 19:20:11 UTC (rev 165)
+++ tags/release-3.13/VERSION 2009-11-14 22:08:11 UTC (rev 168)
@@ -1 +1 @@
-trunk
+3.13
Deleted: tags/release-3.13/client/Portfile
===================================================================
--- trunk/client/Portfile 2009-11-14 19:20:11 UTC (rev 165)
+++ tags/release-3.13/client/Portfile 2009-11-14 22:08:11 UTC (rev 168)
@@ -1,50 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name etch
-version %VER%
-categories sysutils
-maintainers aput.net:jheiss openmaintainer
-
-description Etch is a system configuration management tool.
-
-long_description Etch is a tool for managing the configuration of \
- Unix systems. Etch can manage text or binary \
- files, links and directories. The contents of \
- files can be supplied from static files or \
- generated on the fly by scripts or templates. \
- Permissions and ownership as well as any pre or \
- post commands to run when updating the file are \
- configured in simple XML files.
-
-homepage http://etch.sourceforge.net/
-platforms darwin
-
-master_sites sourceforge
-
-checksums md5 e462d44552ce628b2a2e121eb5825b62 \
- sha1 0cee484b291e89adaa46b1fccc763e14ccb41f90 \
- rmd160 5221532a9bba2b93274a8fd419dc4da6ec965e5e
-
-depends_build port:rb-rake
-depends_run port:ruby \
- port:facter
-
-PortGroup ruby 1.0
-
-# fetch
-# extract
-# patch
-# configure
-# build
-# destroot
-
-use_configure no
-build {}
-test.run no
-destroot.cmd cd client && rake
-destroot.target install\[${destroot}\]
-destroot.destdir ""
-
Copied: tags/release-3.13/client/Portfile (from rev 166, trunk/client/Portfile)
===================================================================
--- tags/release-3.13/client/Portfile (rev 0)
+++ tags/release-3.13/client/Portfile 2009-11-14 22:08:11 UTC (rev 168)
@@ -0,0 +1,50 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name etch
+version %VER%
+categories sysutils
+maintainers aput.net:jheiss openmaintainer
+
+description Etch is a system configuration management tool.
+
+long_description Etch is a tool for managing the configuration of \
+ Unix systems. Etch can manage text or binary \
+ files, links and directories. The contents of \
+ files can be supplied from static files or \
+ generated on the fly by scripts or templates. \
+ Permissions and ownership as well as any pre or \
+ post commands to run when updating the file are \
+ configured in simple XML files.
+
+homepage http://etch.sourceforge.net/
+platforms darwin
+
+master_sites sourceforge
+
+checksums md5 %MD5% \
+ sha1 %SHA1% \
+ rmd160 %RMD160%
+
+depends_build port:rb-rake
+depends_run port:ruby \
+ port:facter
+
+PortGroup ruby 1.0
+
+# fetch
+# extract
+# patch
+# configure
+# build
+# destroot
+
+use_configure no
+build {}
+test.run no
+destroot.cmd cd client && rake
+destroot.target install\[${destroot}\]
+destroot.destdir ""
+
Deleted: tags/release-3.13/client/Rakefile
===================================================================
--- trunk/client/Rakefile 2009-11-14 19:20:11 UTC (rev 165)
+++ tags/release-3.13/client/Rakefile 2009-11-14 22:08:11 UTC (rev 168)
@@ -1,439 +0,0 @@
-require 'rbconfig'
-require 'tempfile'
-require 'tmpdir'
-
-ETCHVER = IO.read('../VERSION').chomp
-
-BUILDROOT = '/var/tmp/etch-client-buildroot'
-
-# Copies the etch client files to destdir. Appropriate subdirectories will be
-# composed unless specified via options.
-# options:
-# :bindir
-# :libdir
-# :etcdir
-# :mandir
-# :crondir (note no default here, crontab will not be copied if not specified)
-# :ruby (#! lines in scripts will be changed to specified ruby)
-# :installbase (base directory where files will end up)
-def copy_etch_files(destdir, options={})
- bindir = nil
- if options[:bindir]
- bindir = File.join(destdir, options[:bindir])
- else
- bindir = File.join(destdir, 'bin')
- end
- mkdir_p(bindir)
- binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
- binapps.each do |binapp|
- if options[:ruby]
- # Change #! line
- File.open(File.join(bindir, binapp), 'w') do |newfile|
- File.open(binapp) do |oldfile|
- # Modify the first line
- firstline = oldfile.gets
- # Preserve any options. I.e. #!/usr/bin/ruby -w
- shebang, shebangopts = firstline.split(' ', 2)
- newfile.puts "#!#{options[:ruby]} #{shebangopts}"
- # Then dump in the rest of the file
- newfile.write(oldfile.read)
- end
- end
- else
- cp(binapp, bindir, :preserve => true)
- end
- chmod(0555, File.join(bindir, binapp))
- end
-
- libdir = nil
- if options[:libdir]
- libdir = File.join(destdir, options[:libdir])
- else
- libdir = File.join(destdir, 'lib')
- end
- mkdir_p(libdir)
- clientlibs = ['etchclient.rb']
- clientlibs.each do |clientlib|
- cp(clientlib, libdir, :preserve => true)
- end
- serverlibs = ['etch.rb', 'versiontype.rb']
- serverlibs.each do |serverlib|
- cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
- end
- clientlibs + serverlibs.each do |lib|
- chmod(0444, File.join(libdir, lib))
- end
-
- mandir = nil
- if options[:mandir]
- mandir = File.join(destdir, options[:mandir])
- else
- mandir = File.join(destdir, 'man')
- end
- man8dir = File.join(mandir, 'man8')
- mkdir_p(man8dir)
- cp('etch.8', man8dir, :preserve => true)
- chmod(0444, File.join(man8dir, 'etch.8'))
-
- etcdir = nil
- realetcdir = nil
- if options[:etcdir]
- realetcdir = options[:etcdir]
- else
- realetcdir = '/etc'
- end
- etcdir = File.join(destdir, realetcdir)
- mkdir_p(etcdir)
- etcfiles = ['ca.pem', 'dhparams']
- etcfiles.each do |etcfile|
- cp(etcfile, etcdir, :preserve => true)
- chmod(0644, File.join(etcdir, etcfile))
- end
-
- if options[:crondir]
- crondir = File.join(destdir, options[:crondir])
- mkdir_p(crondir)
- # Note file renamed to 'etch' here. Filename is different in the repo for
- # clarity and to avoid conflict with the main executable.
- cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
- chmod(0444, File.join(crondir, 'etch'))
- end
-
- # Substitute ETCHVER into etchclient.rb
- # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
- newetchclient = File.join(libdir, 'etchclient.rb.new')
- etchclient = File.join(libdir, 'etchclient.rb')
- File.open(newetchclient, 'w') do |newfile|
- IO.foreach(etchclient) do |line|
- if line =~ /^\s*VERSION/
- line.sub!(/=.*/, "= '#{ETCHVER}'")
- end
- if options[:installbase] && line =~ /^\s*CONFIGDIR/
- line.sub!(/=.*/, "= #{realetcdir}")
- end
- newfile.write(line)
- end
- end
- mv(newetchclient, etchclient)
- chmod(0444, etchclient)
-end
-
-desc 'Build an etch client RPM on a Red Hat box'
-task :redhat => [:redhatprep, :rpm]
-desc 'Prep a Red Hat box for building an RPM'
-task :redhatprep do
- # Install the package which contains the rpmbuild command
- system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
-end
-desc 'Build an etch client RPM'
-task :rpm do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
- :installbase => '/')
-
- #
- # Prep spec file
- #
-
- spec = Tempfile.new('etchrpm')
- IO.foreach('etch-client.spec') do |line|
- line.sub!('%VER%', ETCHVER)
- spec.puts(line)
- end
-
- #
- # Build the package
- #
-
- system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build an etch client deb'
-task :deb do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
- File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
- IO.foreach('control') do |line|
- next if line =~ /^\s*#/ # Remove comments
- line.sub!('%VER%', ETCHVER)
- control.puts(line)
- end
- end
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
- :installbase => '/')
-
- #
- # Set permissions
- #
-
- system("sudo chown -R 0:0 #{BUILDROOT}")
-
- #
- # Build the package
- #
-
- system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build etch client SysV packages for Solaris'
-task :solaris => [:sysvpkg, :sysvpkgsparc]
-desc 'Build an etch client SysV package'
-task :sysvpkg do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/opt/csw/bin/ruby', :installbase => '/')
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../YPCetch-#{ETCHVER}.pkg YPCetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# On Sparc systems we're having problems with the CSW/Blastwave ruby core
-# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
-# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
-# express all the dependencies against CSW, and put our library file
-# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
-# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
-# for libraries. Users will have to manually install the Sunfreeware ruby
-# package.
-desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
-task :sysvpkgsparc do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = File.join('etc', 'etch')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/usr/local/bin/ruby', :installbase => '/')
-
- # Since we're using the Sunfreeware ruby but CSW libraries we need to add
- # the CSW ruby library directory to the search path
- newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
- etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
- File.open(newetch, 'w') do |newfile|
- IO.foreach(etch) do |line|
- if line =~ /unshift.*__FILE__/
- line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
- end
- newfile.write(line)
- end
- end
- mv(newetch, etch)
- chmod(0555, etch)
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../YPCetch-#{ETCHVER}-sparc.pkg YPCetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# Install based on Config::CONFIG paths
-task :install, :destdir do |t, args|
- destdir = nil
- if args.destdir
- destdir = args.destdir
- else
- destdir = '/'
- end
- copy_etch_files(destdir,
- :bindir => Config::CONFIG['sbindir'],
- :libdir => Config::CONFIG['sitelibdir'],
- :mandir => Config::CONFIG['mandir'],
- :etcdir => Config::CONFIG['sysconfdir'],
- # Can't find a better way to get the path to the current ruby
- :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']),
- :installbase => '/')
-end
-
-desc 'Prepare portfile for submission to MacPorts'
-task :macport do
- portfile = File.join(Dir.tmpdir, 'Portfile')
- rm_f(portfile)
- File.open(portfile, 'w') do |newfile|
- IO.foreach('Portfile') do |line|
- line.sub!('%VER%', ETCHVER)
- newfile.puts(line)
- end
- end
- puts "Portfile is #{portfile}"
-end
-
-task :gem do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
- copy_etch_files(BUILDROOT)
-
- #
- # Prep gemspec
- #
- File.open(File.join(BUILDROOT, 'Rakefile'), 'w') do |gemspec|
- IO.foreach('gemspec') do |line|
- line.sub!('%VER%', ETCHVER)
- gemspec.puts(line)
- end
- end
-
- #
- # Build the package
- #
-
- system("cd #{BUILDROOT} && rake gem")
- gemglob = File.join(BUILDROOT, 'pkg', '*.gem')
- gemfile = Dir.glob(gemglob).first
- if gemfile
- mv(gemfile, Dir.tmpdir)
- puts "Gem is #{File.join(Dir.tmpdir, File.basename(gemfile))}"
- else
- warn "Gem file #{gemglob} not found!"
- end
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
Copied: tags/release-3.13/client/Rakefile (from rev 166, trunk/client/Rakefile)
===================================================================
--- tags/release-3.13/client/Rakefile (rev 0)
+++ tags/release-3.13/client/Rakefile 2009-11-14 22:08:11 UTC (rev 168)
@@ -0,0 +1,462 @@
+require 'rbconfig'
+require 'tempfile'
+require 'tmpdir'
+require 'open-uri'
+
+ETCHVER = IO.read('../VERSION').chomp
+TARBALLFILE = "etch-#{ETCHVER}.tar.gz"
+TARBALL = File.expand_path(TARBALLFILE)
+
+BUILDROOT = '/var/tmp/etch-client-buildroot'
+
+# Copies the etch client files to destdir. Appropriate subdirectories will be
+# composed unless specified via options.
+# options:
+# :bindir
+# :libdir
+# :etcdir
+# :mandir
+# :crondir (note no default here, crontab will not be copied if not specified)
+# :ruby (#! lines in scripts will be changed to specified ruby)
+# :installbase (base directory where files will end up)
+def copy_etch_files(destdir, options={})
+ bindir = nil
+ if options[:bindir]
+ bindir = File.join(destdir, options[:bindir])
+ else
+ bindir = File.join(destdir, 'bin')
+ end
+ mkdir_p(bindir)
+ binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
+ binapps.each do |binapp|
+ if options[:ruby]
+ # Change #! line
+ File.open(File.join(bindir, binapp), 'w') do |newfile|
+ File.open(binapp) do |oldfile|
+ # Modify the first line
+ firstline = oldfile.gets
+ # Preserve any options. I.e. #!/usr/bin/ruby -w
+ shebang, shebangopts = firstline.split(' ', 2)
+ newfile.puts "#!#{options[:ruby]} #{shebangopts}"
+ # Then dump in the rest of the file
+ newfile.write(oldfile.read)
+ end
+ end
+ else
+ cp(binapp, bindir, :preserve => true)
+ end
+ chmod(0555, File.join(bindir, binapp))
+ end
+
+ libdir = nil
+ if options[:libdir]
+ libdir = File.join(destdir, options[:libdir])
+ else
+ libdir = File.join(destdir, 'lib')
+ end
+ mkdir_p(libdir)
+ clientlibs = ['etchclient.rb']
+ clientlibs.each do |clientlib|
+ cp(clientlib, libdir, :preserve => true)
+ end
+ serverlibs = ['etch.rb', 'versiontype.rb']
+ serverlibs.each do |serverlib|
+ cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
+ end
+ clientlibs + serverlibs.each do |lib|
+ chmod(0444, File.join(libdir, lib))
+ end
+
+ mandir = nil
+ if options[:mandir]
+ mandir = File.join(destdir, options[:mandir])
+ else
+ mandir = File.join(destdir, 'man')
+ end
+ man8dir = File.join(mandir, 'man8')
+ mkdir_p(man8dir)
+ cp('etch.8', man8dir, :preserve => true)
+ chmod(0444, File.join(man8dir, 'etch.8'))
+
+ etcdir = nil
+ realetcdir = nil
+ if options[:etcdir]
+ realetcdir = options[:etcdir]
+ else
+ realetcdir = '/etc'
+ end
+ etcdir = File.join(destdir, realetcdir)
+ mkdir_p(etcdir)
+ etcfiles = ['ca.pem', 'dhparams']
+ etcfiles.each do |etcfile|
+ cp(etcfile, etcdir, :preserve => true)
+ chmod(0644, File.join(etcdir, etcfile))
+ end
+
+ if options[:crondir]
+ crondir = File.join(destdir, options[:crondir])
+ mkdir_p(crondir)
+ # Note file renamed to 'etch' here. Filename is different in the repo for
+ # clarity and to avoid conflict with the main executable.
+ cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
+ chmod(0444, File.join(crondir, 'etch'))
+ end
+
+ # Substitute ETCHVER into etchclient.rb
+ # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
+ newetchclient = File.join(libdir, 'etchclient.rb.new')
+ etchclient = File.join(libdir, 'etchclient.rb')
+ File.open(newetchclient, 'w') do |newfile|
+ IO.foreach(etchclient) do |line|
+ if line =~ /^\s*VERSION/
+ line.sub!(/=.*/, "= '#{ETCHVER}'")
+ end
+ if options[:installbase] && line =~ /^\s*CONFIGDIR/
+ line.sub!(/=.*/, "= #{realetcdir}")
+ end
+ newfile.write(line)
+ end
+ end
+ mv(newetchclient, etchclient)
+ chmod(0444, etchclient)
+end
+
+desc 'Build an etch client RPM on a Red Hat box'
+task :redhat => [:redhatprep, :rpm]
+desc 'Prep a Red Hat box for building an RPM'
+task :redhatprep do
+ # Install the package which contains the rpmbuild command
+ system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
+end
+desc 'Build an etch client RPM'
+task :rpm do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
+ :installbase => '/')
+
+ #
+ # Prep spec file
+ #
+
+ spec = Tempfile.new('etchrpm')
+ IO.foreach('etch-client.spec') do |line|
+ line.sub!('%VER%', ETCHVER)
+ spec.puts(line)
+ end
+
+ #
+ # Build the package
+ #
+
+ system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build an etch client deb'
+task :deb do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
+ File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
+ IO.foreach('control') do |line|
+ next if line =~ /^\s*#/ # Remove comments
+ line.sub!('%VER%', ETCHVER)
+ control.puts(line)
+ end
+ end
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir,
+ :installbase => '/')
+
+ #
+ # Set permissions
+ #
+
+ system("sudo chown -R 0:0 #{BUILDROOT}")
+
+ #
+ # Build the package
+ #
+
+ system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build etch client SysV packages for Solaris'
+task :solaris => [:sysvpkg, :sysvpkgsparc]
+desc 'Build an etch client SysV package'
+task :sysvpkg do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/opt/csw/bin/ruby', :installbase => '/')
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../YPCetch-#{ETCHVER}.pkg YPCetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# On Sparc systems we're having problems with the CSW/Blastwave ruby core
+# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
+# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
+# express all the dependencies against CSW, and put our library file
+# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
+# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
+# for libraries. Users will have to manually install the Sunfreeware ruby
+# package.
+desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
+task :sysvpkgsparc do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = File.join('etc', 'etch')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/usr/local/bin/ruby', :installbase => '/')
+
+ # Since we're using the Sunfreeware ruby but CSW libraries we need to add
+ # the CSW ruby library directory to the search path
+ newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
+ etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
+ File.open(newetch, 'w') do |newfile|
+ IO.foreach(etch) do |line|
+ if line =~ /unshift.*__FILE__/
+ line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
+ end
+ newfile.write(line)
+ end
+ end
+ mv(newetch, etch)
+ chmod(0555, etch)
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../YPCetch-#{ETCHVER}-sparc.pkg YPCetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# Install based on Config::CONFIG paths
+task :install, :destdir do |t, args|
+ destdir = nil
+ if args.destdir
+ destdir = args.destdir
+ else
+ destdir = '/'
+ end
+ copy_etch_files(destdir,
+ :bindir => Config::CONFIG['sbindir'],
+ :libdir => Config::CONFIG['sitelibdir'],
+ :mandir => Config::CONFIG['mandir'],
+ :etcdir => Config::CONFIG['sysconfdir'],
+ # Can't find a better way to get the path to the current ruby
+ :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']),
+ :installbase => '/')
+end
+
+desc 'Fetch tarball from sourceforge'
+task :fetch do
+ if !File.exist?(TARBALL)
+ url = "http://downloads.sourceforge.net/project/etch/etch/#{ETCHVER}/#{TARBALLFILE}?use_mirror=autoselect"
+ puts "Fetching tarball from #{url}"
+ open(url) do |df|
+ open(TARBALL, 'w') do |lf|
+ lf.write(df.read)
+ end
+ end
+ end
+end
+
+desc 'Prepare portfile for submission to MacPorts'
+task :macport => :fetch do
+ md5 = `openssl md5 #{TARBALL}`.chomp.split.last
+ sha1 = `openssl sha1 #{TARBALL}`.chomp.split.last
+ rmd160 = `openssl rmd160 #{TARBALL}`.c...
[truncated message content] |
|
From: <jh...@us...> - 2010-01-21 00:01:56
|
Revision: 194
http://etch.svn.sourceforge.net/etch/?rev=194&view=rev
Author: jheiss
Date: 2010-01-21 00:01:49 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Tag 3.15.0 release
Modified Paths:
--------------
tags/release-3.15.0/VERSION
Added Paths:
-----------
tags/release-3.15.0/
Modified: tags/release-3.15.0/VERSION
===================================================================
--- trunk/VERSION 2010-01-20 23:55:26 UTC (rev 193)
+++ tags/release-3.15.0/VERSION 2010-01-21 00:01:49 UTC (rev 194)
@@ -1 +1 @@
-trunk
+3.15.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2010-01-21 01:17:43
|
Revision: 197
http://etch.svn.sourceforge.net/etch/?rev=197&view=rev
Author: jheiss
Date: 2010-01-21 01:17:36 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Tag 3.15.1 release
Modified Paths:
--------------
Rakefile
tags/release-3.15.1/VERSION
Added Paths:
-----------
tags/release-3.15.1/
Modified: Rakefile
===================================================================
--- Rakefile 2010-01-21 01:08:34 UTC (rev 196)
+++ Rakefile 2010-01-21 01:17:36 UTC (rev 197)
@@ -1,4 +1,4 @@
-ETCHVER = '3.15.0'
+ETCHVER = '3.15.1'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.15.1/VERSION
===================================================================
--- trunk/VERSION 2010-01-21 01:08:34 UTC (rev 196)
+++ tags/release-3.15.1/VERSION 2010-01-21 01:17:36 UTC (rev 197)
@@ -1 +1 @@
-trunk
+3.15.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2010-01-21 04:12:15
|
Revision: 199
http://etch.svn.sourceforge.net/etch/?rev=199&view=rev
Author: jheiss
Date: 2010-01-21 04:12:08 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Tag 3.15.2 release
Modified Paths:
--------------
Rakefile
tags/release-3.15.2/VERSION
Added Paths:
-----------
tags/release-3.15.2/
tags/release-3.15.2/client/Rakefile
Removed Paths:
-------------
tags/release-3.15.2/client/Rakefile
Modified: Rakefile
===================================================================
--- Rakefile 2010-01-21 04:09:46 UTC (rev 198)
+++ Rakefile 2010-01-21 04:12:08 UTC (rev 199)
@@ -1,4 +1,4 @@
-ETCHVER = '3.15.1'
+ETCHVER = '3.15.2'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.15.2/VERSION
===================================================================
--- trunk/VERSION 2010-01-21 01:17:36 UTC (rev 197)
+++ tags/release-3.15.2/VERSION 2010-01-21 04:12:08 UTC (rev 199)
@@ -1 +1 @@
-trunk
+3.15.2
Deleted: tags/release-3.15.2/client/Rakefile
===================================================================
--- trunk/client/Rakefile 2010-01-21 01:17:36 UTC (rev 197)
+++ tags/release-3.15.2/client/Rakefile 2010-01-21 04:12:08 UTC (rev 199)
@@ -1,446 +0,0 @@
-require 'rbconfig'
-require 'tempfile'
-require 'tmpdir'
-require 'open-uri'
-
-ETCHVER = IO.read('../VERSION').chomp
-TARBALLFILE = "etch-#{ETCHVER}.tar.gz"
-TARBALL = File.expand_path(TARBALLFILE)
-
-BUILDROOT = '/var/tmp/etch-client-buildroot'
-
-# Copies the etch client files to destdir. If any of the dir options
-# are not specified the files that would go in that directory will not
-# be copied.
-# options:
-# :bindir
-# :libdir
-# :etcdir
-# :mandir
-# :crondir
-# :ruby (#! lines in scripts will be changed to specified ruby)
-def copy_etch_files(destdir, options={})
- if options[:bindir]
- bindir = File.join(destdir, options[:bindir])
- mkdir_p(bindir)
- binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
- binapps.each do |binapp|
- if options[:ruby]
- # Change #! line
- File.open(File.join(bindir, binapp), 'w') do |newfile|
- File.open(binapp) do |oldfile|
- # Modify the first line
- firstline = oldfile.gets
- # Preserve any options. I.e. #!/usr/bin/ruby -w
- shebang, shebangopts = firstline.split(' ', 2)
- newfile.puts "#!#{options[:ruby]} #{shebangopts}"
- # Then dump in the rest of the file
- newfile.write(oldfile.read)
- end
- end
- else
- cp(binapp, bindir, :preserve => true)
- end
- chmod(0555, File.join(bindir, binapp))
- end
- end
-
- if options[:libdir]
- libdir = File.join(destdir, options[:libdir])
- mkdir_p(libdir)
-
- # Substitute ETCHVER into etchclient.rb
- # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
- File.open(File.join(libdir, 'etchclient.rb'), 'w') do |newfile|
- IO.foreach('etchclient.rb') do |line|
- if line =~ /^\s*VERSION/
- line.sub!(/=.*/, "= '#{ETCHVER}'")
- end
- if options[:etcdir] && line =~ /^\s*CONFIGDIR/
- line.sub!(/=.*/, "= #{options[:etcdir]}")
- end
- newfile.write(line)
- end
- end
- chmod(0444, File.join(libdir, 'etchclient.rb'))
-
- serverlibs = ['etch.rb', 'versiontype.rb']
- serverlibs.each do |serverlib|
- cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
- chmod(0444, File.join(libdir, serverlib))
- end
- end
-
- if options[:mandir]
- mandir = File.join(destdir, options[:mandir])
- man8dir = File.join(mandir, 'man8')
- mkdir_p(man8dir)
- cp('etch.8', man8dir, :preserve => true)
- chmod(0444, File.join(man8dir, 'etch.8'))
- end
-
- if options[:etcdir]
- etcdir = File.join(destdir, options[:etcdir])
- # FIXME: Need to add support for etch.conf to the code
- #mkdir_p(etcdir)
- #cp('etch.conf', etcdir, :preserve => true)
- #chmod(0644, File.join(etcdir, 'etch.conf'))
- # All of the supporting config files go into a subdirectory
- etcetchdir = File.join(etcdir, 'etch')
- mkdir_p(etcetchdir)
- etcetchfiles = ['ca.pem', 'dhparams']
- etcetchfiles.each do |etcetchfile|
- cp(etcetchfile, etcetchdir, :preserve => true)
- chmod(0644, File.join(etcetchdir, etcetchfile))
- end
- end
-
- if options[:crondir]
- crondir = File.join(destdir, options[:crondir])
- mkdir_p(crondir)
- # Note file renamed to 'etch' here. Filename is different in the repo for
- # clarity and to avoid conflict with the main executable.
- cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
- chmod(0444, File.join(crondir, 'etch'))
- end
-end
-
-desc 'Build an etch client RPM on a Red Hat box'
-task :redhat => [:redhatprep, :rpm]
-desc 'Prep a Red Hat box for building an RPM'
-task :redhatprep do
- # Install the package which contains the rpmbuild command
- system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
-end
-desc 'Build an etch client RPM'
-task :rpm do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = '/etc'
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir)
-
- #
- # Prep spec file
- #
-
- spec = Tempfile.new('etchrpm')
- IO.foreach('etch-client.spec') do |line|
- line.sub!('%VER%', ETCHVER)
- spec.puts(line)
- end
- spec.close
-
- #
- # Build the package
- #
-
- system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build an etch client deb'
-task :deb do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
- File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
- IO.foreach('control') do |line|
- next if line =~ /^\s*#/ # Remove comments
- line.sub!('%VER%', ETCHVER)
- control.puts(line)
- end
- end
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = '/etc'
- crondir = File.join('etc', 'cron.d')
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir, :crondir => crondir)
-
- #
- # Set permissions
- #
-
- system("sudo chown -R 0:0 #{BUILDROOT}")
-
- #
- # Build the package
- #
-
- system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
-desc 'Build etch client SysV packages for Solaris'
-task :solaris => [:sysvpkg, :sysvpkgsparc]
-desc 'Build an etch client SysV package'
-task :sysvpkg do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = '/etc'
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/opt/csw/bin/ruby')
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall.solaris', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove.solaris', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../OSSetch-#{ETCHVER}.pkg OSSetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# On Sparc systems we're having problems with the CSW/Blastwave ruby core
-# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
-# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
-# express all the dependencies against CSW, and put our library file
-# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
-# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
-# for libraries. Users will have to manually install the Sunfreeware ruby
-# package.
-desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
-task :sysvpkgsparc do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
-
- sbindir = File.join('usr', 'sbin')
- libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
- mandir = File.join('usr', 'share', 'man')
- etcdir = '/etc'
- copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
- :mandir => mandir, :etcdir => etcdir,
- :ruby => '/usr/local/bin/ruby')
-
- # Since we're using the Sunfreeware ruby but CSW libraries we need to add
- # the CSW ruby library directory to the search path
- newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
- etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
- File.open(newetch, 'w') do |newfile|
- IO.foreach(etch) do |line|
- if line =~ /unshift.*__FILE__/
- line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
- end
- newfile.write(line)
- end
- end
- mv(newetch, etch)
- chmod(0555, etch)
-
- #
- # Prep packaging files
- #
-
- rm_rf('solbuild')
- mkdir('solbuild')
- File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
- IO.foreach('pkginfo') do |line|
- line.sub!('%VER%', ETCHVER)
- pkginfo.puts(line)
- end
- end
- File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
- prototype.puts("i pkginfo=./pkginfo")
- cp('depend', 'solbuild/depend')
- prototype.puts("i depend=./depend")
- cp('postinstall.solaris', 'solbuild/postinstall')
- prototype.puts("i postinstall=./postinstall")
- cp('postremove.solaris', 'solbuild/postremove')
- prototype.puts("i postremove=./postremove")
- # The tail +2 removes the first line, which is the base directory
- # and doesn't need to be included in the package.
- IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
- pipe.each do |line|
- # Clean up the directory names
- line.sub!(BUILDROOT, '')
- # Don't force our permissions on directories
- if line =~ /^d/
- line.sub!(/\S+ \S+ \S+$/, '? ? ?')
- end
- prototype.write(line)
- end
- end
- end
-
- #
- # Build the package
- #
-
- system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
- system("pkgtrans solbuild ../OSSetch-#{ETCHVER}-sparc.pkg OSSetch")
-
- #
- # Cleanup
- #
-
- rm_rf('solbuild')
- rm_rf(BUILDROOT)
-end
-
-# Install based on Config::CONFIG paths
-task :install, :destdir do |t, args|
- destdir = nil
- if args.destdir
- destdir = args.destdir
- else
- destdir = '/'
- end
- copy_etch_files(destdir,
- :bindir => Config::CONFIG['sbindir'],
- :libdir => Config::CONFIG['sitelibdir'],
- :mandir => Config::CONFIG['mandir'],
- :etcdir => Config::CONFIG['sysconfdir'],
- # Can't find a better way to get the path to the current ruby
- :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']))
-end
-
-desc 'Fetch tarball from sourceforge'
-task :fetch do
- if !File.exist?(TARBALL)
- url = "http://downloads.sourceforge.net/project/etch/etch/#{ETCHVER}/#{TARBALLFILE}"
- puts "Fetching tarball from #{url}"
- open(url) do |df|
- open(TARBALL, 'w') do |lf|
- lf.write(df.read)
- end
- end
- end
-end
-
-desc 'Prepare portfile for submission to MacPorts'
-task :macport => :fetch do
- md5 = `openssl md5 #{TARBALL}`.chomp.split.last
- sha1 = `openssl sha1 #{TARBALL}`.chomp.split.last
- rmd160 = `openssl rmd160 #{TARBALL}`.chomp.split.last
-
- portfile = File.join(Dir.tmpdir, 'Portfile')
- rm_f(portfile)
- File.open(portfile, 'w') do |newfile|
- IO.foreach('Portfile') do |line|
- line.sub!('%VER%', ETCHVER)
- line.sub!('%MD5%', md5)
- line.sub!('%SHA1%', sha1)
- line.sub!('%RMD160%', rmd160)
- newfile.puts(line)
- end
- end
- puts "Portfile is #{portfile}"
-end
-
-task :gem do
- #
- # Create package file structure in build root
- #
-
- rm_rf(BUILDROOT)
- copy_etch_files(BUILDROOT,
- :bindir => 'bin',
- :libdir => 'lib')
-
- #
- # Prep gemspec (renaming to Rakefile in the process)
- #
- File.open(File.join(BUILDROOT, 'Rakefile'), 'w') do |gemspec|
- IO.foreach('gemspec') do |line|
- line.sub!('%VER%', ETCHVER)
- gemspec.puts(line)
- end
- end
-
- #
- # Build the package
- #
-
- system("cd #{BUILDROOT} && rake gem")
- gemglob = File.join(BUILDROOT, 'pkg', '*.gem')
- gemfile = Dir.glob(gemglob).first
- if gemfile
- mv(gemfile, Dir.tmpdir)
- puts "Gem is #{File.join(Dir.tmpdir, File.basename(gemfile))}"
- else
- warn "Gem file #{gemglob} not found!"
- end
-
- #
- # Cleanup
- #
-
- rm_rf(BUILDROOT)
-end
-
Copied: tags/release-3.15.2/client/Rakefile (from rev 198, trunk/client/Rakefile)
===================================================================
--- tags/release-3.15.2/client/Rakefile (rev 0)
+++ tags/release-3.15.2/client/Rakefile 2010-01-21 04:12:08 UTC (rev 199)
@@ -0,0 +1,446 @@
+require 'rbconfig'
+require 'tempfile'
+require 'tmpdir'
+require 'open-uri'
+
+ETCHVER = IO.read('../VERSION').chomp
+TARBALLFILE = "etch-#{ETCHVER}.tar.gz"
+TARBALL = File.expand_path(TARBALLFILE)
+
+BUILDROOT = '/var/tmp/etch-client-buildroot'
+
+# Copies the etch client files to destdir. If any of the dir options
+# are not specified the files that would go in that directory will not
+# be copied.
+# options:
+# :bindir
+# :libdir
+# :etcdir
+# :mandir
+# :crondir
+# :ruby (#! lines in scripts will be changed to specified ruby)
+def copy_etch_files(destdir, options={})
+ if options[:bindir]
+ bindir = File.join(destdir, options[:bindir])
+ mkdir_p(bindir)
+ binapps = ['etch', 'etch_to_trunk', 'etch_cron_wrapper']
+ binapps.each do |binapp|
+ if options[:ruby]
+ # Change #! line
+ File.open(File.join(bindir, binapp), 'w') do |newfile|
+ File.open(binapp) do |oldfile|
+ # Modify the first line
+ firstline = oldfile.gets
+ # Preserve any options. I.e. #!/usr/bin/ruby -w
+ shebang, shebangopts = firstline.split(' ', 2)
+ newfile.puts "#!#{options[:ruby]} #{shebangopts}"
+ # Then dump in the rest of the file
+ newfile.write(oldfile.read)
+ end
+ end
+ else
+ cp(binapp, bindir, :preserve => true)
+ end
+ chmod(0555, File.join(bindir, binapp))
+ end
+ end
+
+ if options[:libdir]
+ libdir = File.join(destdir, options[:libdir])
+ mkdir_p(libdir)
+
+ # Substitute ETCHVER into etchclient.rb
+ # Substitute proper path into CONFIGDIR in etchclient.rb if appropriate
+ File.open(File.join(libdir, 'etchclient.rb'), 'w') do |newfile|
+ IO.foreach('etchclient.rb') do |line|
+ if line =~ /^\s*VERSION/
+ line.sub!(/=.*/, "= '#{ETCHVER}'")
+ end
+ if options[:etcdir] && line =~ /^\s*CONFIGDIR/
+ line.sub!(/=.*/, "= '#{options[:etcdir]}'")
+ end
+ newfile.write(line)
+ end
+ end
+ chmod(0444, File.join(libdir, 'etchclient.rb'))
+
+ serverlibs = ['etch.rb', 'versiontype.rb']
+ serverlibs.each do |serverlib|
+ cp(File.join('..', 'server', 'lib', serverlib), libdir, :preserve => true)
+ chmod(0444, File.join(libdir, serverlib))
+ end
+ end
+
+ if options[:mandir]
+ mandir = File.join(destdir, options[:mandir])
+ man8dir = File.join(mandir, 'man8')
+ mkdir_p(man8dir)
+ cp('etch.8', man8dir, :preserve => true)
+ chmod(0444, File.join(man8dir, 'etch.8'))
+ end
+
+ if options[:etcdir]
+ etcdir = File.join(destdir, options[:etcdir])
+ # FIXME: Need to add support for etch.conf to the code
+ #mkdir_p(etcdir)
+ #cp('etch.conf', etcdir, :preserve => true)
+ #chmod(0644, File.join(etcdir, 'etch.conf'))
+ # All of the supporting config files go into a subdirectory
+ etcetchdir = File.join(etcdir, 'etch')
+ mkdir_p(etcetchdir)
+ etcetchfiles = ['ca.pem', 'dhparams']
+ etcetchfiles.each do |etcetchfile|
+ cp(etcetchfile, etcetchdir, :preserve => true)
+ chmod(0644, File.join(etcetchdir, etcetchfile))
+ end
+ end
+
+ if options[:crondir]
+ crondir = File.join(destdir, options[:crondir])
+ mkdir_p(crondir)
+ # Note file renamed to 'etch' here. Filename is different in the repo for
+ # clarity and to avoid conflict with the main executable.
+ cp('etch_cron', File.join(crondir, 'etch'), :preserve => true)
+ chmod(0444, File.join(crondir, 'etch'))
+ end
+end
+
+desc 'Build an etch client RPM on a Red Hat box'
+task :redhat => [:redhatprep, :rpm]
+desc 'Prep a Red Hat box for building an RPM'
+task :redhatprep do
+ # Install the package which contains the rpmbuild command
+ system('rpm --quiet -q rpm-build || sudo yum install rpm-build')
+end
+desc 'Build an etch client RPM'
+task :rpm do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = '/etc'
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir)
+
+ #
+ # Prep spec file
+ #
+
+ spec = Tempfile.new('etchrpm')
+ IO.foreach('etch-client.spec') do |line|
+ line.sub!('%VER%', ETCHVER)
+ spec.puts(line)
+ end
+ spec.close
+
+ #
+ # Build the package
+ #
+
+ system("rpmbuild -bb --buildroot #{BUILDROOT} #{spec.path}")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build an etch client deb'
+task :deb do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ mkdir_p(File.join(BUILDROOT, 'DEBIAN'))
+ File.open(File.join(BUILDROOT, 'DEBIAN', 'control'), 'w') do |control|
+ IO.foreach('control') do |line|
+ next if line =~ /^\s*#/ # Remove comments
+ line.sub!('%VER%', ETCHVER)
+ control.puts(line)
+ end
+ end
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('usr', 'local', 'lib', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = '/etc'
+ crondir = File.join('etc', 'cron.d')
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir, :crondir => crondir)
+
+ #
+ # Set permissions
+ #
+
+ system("sudo chown -R 0:0 #{BUILDROOT}")
+
+ #
+ # Build the package
+ #
+
+ system("dpkg --build #{BUILDROOT} etch-client-#{ETCHVER}.deb")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
+desc 'Build etch client SysV packages for Solaris'
+task :solaris => [:sysvpkg, :sysvpkgsparc]
+desc 'Build an etch client SysV package'
+task :sysvpkg do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = '/etc'
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/opt/csw/bin/ruby')
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall.solaris', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove.solaris', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../OSSetch-#{ETCHVER}.pkg OSSetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# On Sparc systems we're having problems with the CSW/Blastwave ruby core
+# dumping when running etch. The Sunfreeware ruby seems to work. Sunfreeware
+# doesn't play well with pkg-get, so we create a bit of a hybrid. We still
+# express all the dependencies against CSW, and put our library file
+# (etchclient.rb) into /opt/csw. We modify etch to use the Sunfreeware ruby
+# in /usr/local/bin, but then tell it to also look in the /opt/csw directory
+# for libraries. Users will have to manually install the Sunfreeware ruby
+# package.
+desc 'Build an etch client SysV package with hybrid CSW/Sunfreeware dependencies'
+task :sysvpkgsparc do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+
+ sbindir = File.join('usr', 'sbin')
+ libdir = File.join('opt', 'csw', 'lib', 'ruby', 'site_ruby', '1.8')
+ mandir = File.join('usr', 'share', 'man')
+ etcdir = '/etc'
+ copy_etch_files(BUILDROOT, :bindir => sbindir, :libdir => libdir,
+ :mandir => mandir, :etcdir => etcdir,
+ :ruby => '/usr/local/bin/ruby')
+
+ # Since we're using the Sunfreeware ruby but CSW libraries we need to add
+ # the CSW ruby library directory to the search path
+ newetch = File.join(BUILDROOT, 'usr', 'sbin', 'etch.new')
+ etch = File.join(BUILDROOT, 'usr', 'sbin', 'etch')
+ File.open(newetch, 'w') do |newfile|
+ IO.foreach(etch) do |line|
+ if line =~ /unshift.*__FILE__/
+ line << "$:.unshift('/opt/csw/lib/ruby/site_ruby/1.8')\n"
+ end
+ newfile.write(line)
+ end
+ end
+ mv(newetch, etch)
+ chmod(0555, etch)
+
+ #
+ # Prep packaging files
+ #
+
+ rm_rf('solbuild')
+ mkdir('solbuild')
+ File.open(File.join('solbuild', 'pkginfo'), 'w') do |pkginfo|
+ IO.foreach('pkginfo') do |line|
+ line.sub!('%VER%', ETCHVER)
+ pkginfo.puts(line)
+ end
+ end
+ File.open(File.join('solbuild', 'prototype'), 'w') do |prototype|
+ prototype.puts("i pkginfo=./pkginfo")
+ cp('depend', 'solbuild/depend')
+ prototype.puts("i depend=./depend")
+ cp('postinstall.solaris', 'solbuild/postinstall')
+ prototype.puts("i postinstall=./postinstall")
+ cp('postremove.solaris', 'solbuild/postremove')
+ prototype.puts("i postremove=./postremove")
+ # The tail +2 removes the first line, which is the base directory
+ # and doesn't need to be included in the package.
+ IO.popen("find #{BUILDROOT} | tail +2 | pkgproto") do |pipe|
+ pipe.each do |line|
+ # Clean up the directory names
+ line.sub!(BUILDROOT, '')
+ # Don't force our permissions on directories
+ if line =~ /^d/
+ line.sub!(/\S+ \S+ \S+$/, '? ? ?')
+ end
+ prototype.write(line)
+ end
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd solbuild && pkgmk -r #{BUILDROOT} -d $PWD/solbuild")
+ system("pkgtrans solbuild ../OSSetch-#{ETCHVER}-sparc.pkg OSSetch")
+
+ #
+ # Cleanup
+ #
+
+ rm_rf('solbuild')
+ rm_rf(BUILDROOT)
+end
+
+# Install based on Config::CONFIG paths
+task :install, :destdir do |t, args|
+ destdir = nil
+ if args.destdir
+ destdir = args.destdir
+ else
+ destdir = '/'
+ end
+ copy_etch_files(destdir,
+ :bindir => Config::CONFIG['sbindir'],
+ :libdir => Config::CONFIG['sitelibdir'],
+ :mandir => Config::CONFIG['mandir'],
+ :etcdir => Config::CONFIG['sysconfdir'],
+ # Can't find a better way to get the path to the current ruby
+ :ruby => File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']))
+end
+
+desc 'Fetch tarball from sourceforge'
+task :fetch do
+ if !File.exist?(TARBALL)
+ url = "http://downloads.sourceforge.net/project/etch/etch/#{ETCHVER}/#{TARBALLFILE}"
+ puts "Fetching tarball from #{url}"
+ open(url) do |df|
+ open(TARBALL, 'w') do |lf|
+ lf.write(df.read)
+ end
+ end
+ end
+end
+
+desc 'Prepare portfile for submission to MacPorts'
+task :macport => :fetch do
+ md5 = `openssl md5 #{TARBALL}`.chomp.split.last
+ sha1 = `openssl sha1 #{TARBALL}`.chomp.split.last
+ rmd160 = `openssl rmd160 #{TARBALL}`.chomp.split.last
+
+ portfile = File.join(Dir.tmpdir, 'Portfile')
+ rm_f(portfile)
+ File.open(portfile, 'w') do |newfile|
+ IO.foreach('Portfile') do |line|
+ line.sub!('%VER%', ETCHVER)
+ line.sub!('%MD5%', md5)
+ line.sub!('%SHA1%', sha1)
+ line.sub!('%RMD160%', rmd160)
+ newfile.puts(line)
+ end
+ end
+ puts "Portfile is #{portfile}"
+end
+
+task :gem do
+ #
+ # Create package file structure in build root
+ #
+
+ rm_rf(BUILDROOT)
+ copy_etch_files(BUILDROOT,
+ :bindir => 'bin',
+ :libdir => 'lib')
+
+ #
+ # Prep gemspec (renaming to Rakefile in the process)
+ #
+ File.open(File.join(BUILDROOT, 'Rakefile'), 'w') do |gemspec|
+ IO.foreach('gemspec') do |line|
+ line.sub!('%VER%', ETCHVER)
+ gemspec.puts(line)
+ end
+ end
+
+ #
+ # Build the package
+ #
+
+ system("cd #{BUILDROOT} && rake gem")
+ gemglob = File.join(BUILDROOT, 'pkg', '*.gem')
+ gemfile = Dir.glob(gemglob).first
+ if gemfile
+ mv(gemfile, Dir.tmpdir)
+ puts "Gem is #{File.join(Dir.tmpdir, File.basename(gemfile))}"
+ else
+ warn "Gem file #{gemglob} not found!"
+ end
+
+ #
+ # Cleanup
+ #
+
+ rm_rf(BUILDROOT)
+end
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2010-08-12 08:06:35
|
Revision: 212
http://etch.svn.sourceforge.net/etch/?rev=212&view=rev
Author: jheiss
Date: 2010-08-12 08:06:28 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
Tag 3.16.0 release
Modified Paths:
--------------
Rakefile
tags/release-3.16.0/VERSION
Added Paths:
-----------
tags/release-3.16.0/
Modified: Rakefile
===================================================================
--- Rakefile 2010-08-12 08:05:44 UTC (rev 211)
+++ Rakefile 2010-08-12 08:06:28 UTC (rev 212)
@@ -1,4 +1,4 @@
-ETCHVER = '3.15.2'
+ETCHVER = '3.16.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.16.0/VERSION
===================================================================
--- trunk/VERSION 2010-08-12 07:48:08 UTC (rev 210)
+++ tags/release-3.16.0/VERSION 2010-08-12 08:06:28 UTC (rev 212)
@@ -1 +1 @@
-trunk
+3.16.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2011-04-12 06:49:11
|
Revision: 271
http://etch.svn.sourceforge.net/etch/?rev=271&view=rev
Author: jheiss
Date: 2011-04-12 06:49:05 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
Tag 3.19.0 release
Modified Paths:
--------------
Rakefile
tags/release-3.19.0/VERSION
Added Paths:
-----------
tags/release-3.19.0/
Modified: Rakefile
===================================================================
--- Rakefile 2011-04-12 06:44:23 UTC (rev 270)
+++ Rakefile 2011-04-12 06:49:05 UTC (rev 271)
@@ -1,4 +1,4 @@
-ETCHVER = '3.18.0'
+ETCHVER = '3.19.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.19.0/VERSION
===================================================================
--- trunk/VERSION 2011-04-12 06:44:23 UTC (rev 270)
+++ tags/release-3.19.0/VERSION 2011-04-12 06:49:05 UTC (rev 271)
@@ -1 +1 @@
-trunk
+3.19.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2012-03-19 11:58:56
|
Revision: 308
http://etch.svn.sourceforge.net/etch/?rev=308&view=rev
Author: jheiss
Date: 2012-03-19 11:58:44 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Tag 3.20.0 release
Modified Paths:
--------------
Rakefile
tags/release-3.20.0/VERSION
Added Paths:
-----------
tags/release-3.20.0/
tags/release-3.20.0/client/lib/etch/client.rb
Removed Paths:
-------------
tags/release-3.20.0/client/lib/etch/client.rb
Modified: Rakefile
===================================================================
--- Rakefile 2012-03-18 15:28:44 UTC (rev 307)
+++ Rakefile 2012-03-19 11:58:44 UTC (rev 308)
@@ -1,4 +1,4 @@
-ETCHVER = '3.19.0'
+ETCHVER = '3.20.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.20.0/VERSION
===================================================================
--- trunk/VERSION 2012-03-03 16:21:43 UTC (rev 306)
+++ tags/release-3.20.0/VERSION 2012-03-19 11:58:44 UTC (rev 308)
@@ -1 +1 @@
-trunk
+3.20.0
Deleted: tags/release-3.20.0/client/lib/etch/client.rb
===================================================================
--- trunk/client/lib/etch/client.rb 2012-03-03 16:21:43 UTC (rev 306)
+++ tags/release-3.20.0/client/lib/etch/client.rb 2012-03-19 11:58:44 UTC (rev 308)
@@ -1,2575 +0,0 @@
-##############################################################################
-# Etch configuration file management tool library
-##############################################################################
-
-# Ensure we can find etch.rb if run within the development directory structure
-# This is roughly equivalent to "../../../server/lib"
-serverlibdir = File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'server', 'lib')
-if File.exist?(serverlibdir)
- $:.unshift(serverlibdir)
-end
-
-# Exclude standard libraries and gems from the warnings induced by
-# running ruby with the -w flag. Several of these have warnings under
-# ruby 1.9 and there's nothing we can do to fix that.
-require 'silently'
-Silently.silently do
- begin
- # Try loading facter w/o gems first so that we don't introduce a
- # dependency on gems if it is not needed.
- require 'facter' # Facter
- rescue LoadError
- require 'rubygems'
- require 'facter'
- end
- require 'find'
- require 'digest/sha1' # hexdigest
- require 'openssl' # OpenSSL
- require 'base64' # decode64, encode64
- require 'uri'
- require 'net/http'
- require 'net/https'
- require 'rexml/document'
- require 'fileutils' # copy, mkpath, rmtree
- require 'fcntl' # Fcntl::O_*
- require 'etc' # getpwnam, getgrnam
- require 'tempfile' # Tempfile
- require 'find' # Find.find
- require 'cgi'
- require 'timeout'
- require 'logger'
-end
-require 'etch'
-
-class Etch::Client
- VERSION = 'unset'
-
- CONFIRM_PROCEED = 1
- CONFIRM_SKIP = 2
- CONFIRM_QUIT = 3
- PRIVATE_KEY_PATHS = ["/etc/ssh/ssh_host_rsa_key", "/etc/ssh_host_rsa_key"]
- DEFAULT_CONFIGDIR = '/etc'
- DEFAULT_VARDIR = '/var/etch'
- DEFAULT_DETAILED_RESULTS = ['SERVER']
-
- # We need these in relation to the output capturing
- ORIG_STDOUT = STDOUT.dup
- ORIG_STDERR = STDERR.dup
-
- attr_reader :exec_once_per_run
-
- def initialize(options)
- @server = options[:server] ? options[:server] : 'https://etch'
- @configdir = options[:configdir] ? options[:configdir] : DEFAULT_CONFIGDIR
- @vardir = options[:vardir] ? options[:vardir] : DEFAULT_VARDIR
- @tag = options[:tag]
- @local = options[:local] ? File.expand_path(options[:local]) : nil
- @debug = options[:debug]
- @dryrun = options[:dryrun]
- @listfiles = options[:listfiles]
- @interactive = options[:interactive]
- @filenameonly = options[:filenameonly]
- @fullfile = options[:fullfile]
- @key = options[:key] ? options[:key] : get_private_key_path
- @disableforce = options[:disableforce]
- @lockforce = options[:lockforce]
-
- @last_response = ""
-
- @file_system_root = '/' # Not sure if this needs to be more portable
- # This option is only intended for use by the test suite
- if options[:file_system_root]
- @file_system_root = options[:file_system_root]
- @vardir = File.join(@file_system_root, @vardir)
- @configdir = File.join(@file_system_root, @configdir)
- end
-
- @configfile = File.join(@configdir, 'etch.conf')
- @detailed_results = []
-
- if File.exist?(@configfile)
- IO.foreach(@configfile) do |line|
- line.chomp!
- next if (line =~ /^\s*$/); # Skip blank lines
- next if (line =~ /^\s*#/); # Skip comments
- line.strip! # Remove leading/trailing whitespace
- key, value = line.split(/\s*=\s*/, 2)
- if key == 'server'
- # A setting for the server to use which comes from upstream
- # (generally from a command line option) takes precedence
- # over the config file
- if !options[:server]
- @server = value
- # Warn the user, as this could potentially be confusing
- # if they don't realize there's a config file lying
- # around
- warn "Using server #{@server} from #{@configfile}" if @debug
- else
- # "command line override" isn't necessarily accurate, we don't
- # know why the caller passed us an option to override the config
- # file, but most of the time it will be due to a command line
- # option and I want the message to be easily understood by users.
- # If someone can come up with some better wording without turning
- # the message into something as long as this comment that would be
- # welcome.
- warn "Ignoring 'server' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'local'
- if !options[:local] && !options[:server]
- @local = value
- warn "Using local directory #{@local} from #{@configfile}" if @debug
- else
- warn "Ignoring 'local' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'key'
- if !options[:key]
- @key = value
- warn "Using key #{@key} from #{@configfile}" if @debug
- else
- warn "Ignoring 'key' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'path'
- ENV['PATH'] = value
- elsif key == 'detailed_results'
- warn "Adding detailed results destination '#{value}'" if @debug
- @detailed_results << value
- end
- end
- end
-
- if @key && !File.readable?(@key)
- @key = nil
- end
- if !@key
- warn "No readable private key found, messages to server will not be signed and may be rejected depending on server configuration"
- end
-
- if @detailed_results.empty?
- @detailed_results = DEFAULT_DETAILED_RESULTS
- end
-
- @origbase = File.join(@vardir, 'orig')
- @historybase = File.join(@vardir, 'history')
- @lockbase = File.join(@vardir, 'locks')
- @requestbase = File.join(@vardir, 'requests')
-
- @facts = Facter.to_hash
- if @facts['operatingsystemrelease']
- # Some versions of Facter have a bug that leaves extraneous
- # whitespace on this fact. Work around that with strip. I.e. on
- # CentOS you'll get '5 ' or '5.2 '.
- @facts['operatingsystemrelease'].strip!
- end
-
- if @local
- logger = Logger.new(STDOUT)
- dlogger = Logger.new(STDOUT)
- if @debug
- dlogger.level = Logger::DEBUG
- else
- dlogger.level = Logger::INFO
- end
- blankrequest = {}
- @facts.each_pair { |key, value| blankrequest[key] = value.to_s }
- blankrequest['fqdn'] = @facts['fqdn']
- @facts = blankrequest
- @etch = Etch.new(logger, dlogger)
- else
- # Make sure the server URL ends in a / so that we can append paths
- # to it using URI.join
- if @server !~ %r{/$}
- @server << '/'
- end
- @filesuri = URI.join(@server, 'files')
- @resultsuri = URI.join(@server, 'results')
-
- @blankrequest = {}
- # If the user specified a non-standard key then override the
- # sshrsakey fact so that authentication works
- if @key
- @facts['sshrsakey'] = IO.read(@key+'.pub').chomp.split[1]
- end
- @facts.each_pair { |key, value| @blankrequest["facts[#{key}]"] = value.to_s }
- @blankrequest['fqdn'] = @facts['fqdn']
- if @debug
- @blankrequest['debug'] = '1'
- end
- if @tag
- @blankrequest['tag'] = @tag
- end
- end
-
- @locked_files = {}
- @first_update = {}
- @already_processed = {}
- @exec_already_processed = {}
- @exec_once_per_run = {}
- @results = []
- # See start/stop_output_capture for these
- @output_pipes = []
-
- @lchown_supported = nil
- @lchmod_supported = nil
- end
-
- def process_until_done(files, commands)
- # Our overall status. Will be reported to the server and used as the
- # return value for this method. Command-line clients should use it as
- # their exit value. Zero indicates no errors.
- status = 0
- message = ''
-
- # A variable to collect filenames if operating in @listfiles mode
- files_to_list = {}
-
- # Prep http instance
- http = nil
- if !@local
- puts "Connecting to #{@filesuri}" if (@debug)
- http = Net::HTTP.new(@filesuri.host, @filesuri.port)
- if @filesuri.scheme == "https"
- # Eliminate the OpenSSL "using default DH parameters" warning
- if File.exist?(File.join(@configdir, 'etch', 'dhparams'))
- dh = OpenSSL::PKey::DH.new(IO.read(File.join(@configdir, 'etch', 'dhparams')))
- Net::HTTP.ssl_context_accessor(:tmp_dh_callback)
- http.tmp_dh_callback = proc { dh }
- end
- http.use_ssl = true
- if File.exist?(File.join(@configdir, 'etch', 'ca.pem'))
- http.ca_file = File.join(@configdir, 'etch', 'ca.pem')
- http.verify_mode = OpenSSL::SSL::VERIFY_PEER
- elsif File.directory?(File.join(@configdir, 'etch', 'ca'))
- http.ca_path = File.join(@configdir, 'etch', 'ca')
- http.verify_mode = OpenSSL::SSL::VERIFY_PEER
- end
- end
- http.start
- end
-
- # catch/throw for expected/non-error events that end processing
- # begin/raise for error events that end processing
- catch :stop_processing do
- begin
- enabled, message = check_for_disable_etch_file
- if !enabled
- # 200 is the arbitrarily picked exit value indicating
- # that etch is disabled
- status = 200
- throw :stop_processing
- end
- remove_stale_lock_files
-
- # Assemble the initial request
- request = nil
- if @local
- request = {}
- if files && !files.empty?
- request[:files] = {}
- files.each do |file|
- request[:files][file] = {:orig => save_orig(file)}
- local_requests = get_local_requests(file)
- if local_requests
- request[:files][file][:local_requests] = local_requests
- end
- end
- end
- if commands && !commands.empty?
- request[:commands] = {}
- commands.each do |command|
- request[:commands][command] = {}
- end
- end
- else
- request = get_blank_request
- if (files && !files.empty?) || (commands && !commands.empty?)
- if files
- files.each do |file|
- request["files[#{CGI.escape(file)}][sha1sum]"] =
- get_orig_sum(file)
- local_requests = get_local_requests(file)
- if local_requests
- request["files[#{CGI.escape(file)}][local_requests]"] =
- local_requests
- end
- end
- end
- if commands
- commands.each do |command|
- request["commands[#{CGI.escape(command)}]"] = '1'
- end
- end
- else
- request['files[GENERATEALL]'] = '1'
- end
- end
-
- #
- # Loop back and forth with the server sending requests for files and
- # responding to the server's requests for original contents or sums
- # it needs
- #
-
- Signal.trap('EXIT') do
- STDOUT.reopen(ORIG_STDOUT)
- STDERR.reopen(ORIG_STDERR)
- unlock_all_files
- end
-
- # It usually takes a few back and forth exchanges with the server to
- # exchange all needed data and get a complete set of configuration.
- # The number of iterations is capped at 10 to prevent any unplanned
- # infinite loops. The limit of 10 was chosen somewhat arbitrarily but
- # seems fine in practice.
- 10.times do
- #
- # Send request to server
- #
-
- responsedata = {}
- if @local
- results = @etch.generate(@local, @facts, request)
- # FIXME: Etch#generate returns parsed XML using whatever XML
- # library it happens to use. In order to avoid re-parsing
- # the XML we'd have to use the XML abstraction code from Etch
- # everwhere here.
- # Until then re-parse the XML using REXML.
- #responsedata[:configs] = results[:configs]
- responsedata[:configs] = {}
- results[:configs].each {|f,c| responsedata[:configs][f] = REXML::Document.new(c.to_s) }
- responsedata[:need_sums] = {}
- responsedata[:need_origs] = results[:need_orig]
- #responsedata[:allcommands] = results[:allcommands]
- responsedata[:allcommands] = {}
- results[:allcommands].each {|cn,c| responsedata[:allcommands][cn] = REXML::Document.new(c.to_s) }
- responsedata[:retrycommands] = results[:retrycommands]
- else
- puts "Sending request to server #{@filesuri}: #{request.inspect}" if (@debug)
- post = Net::HTTP::Post.new(@filesuri.path)
- post.set_form_data(request)
- sign_post!(post, @key)
- response = http.request(post)
- if !response.kind_of?(Net::HTTPSuccess)
- $stderr.puts response.body
- # error! raises an exception
- response.error!
- end
- puts "Response from server:\n'#{response.body}'" if (@debug)
- if !response.body.nil? && !response.body.empty?
- response_xml = REXML::Document.new(response.body)
- responsedata[:configs] = {}
- response_xml.elements.each('/files/configs/config') do |config|
- file = config.attributes['filename']
- # We have to make a new document so that XPath paths are
- # referenced relative to the configuration for this
- # specific file.
- #responsedata[:configs][file] = REXML::Document.new(response_xml.elements["/files/configs/config[@filename='#{file}']"].to_s)
- responsedata[:configs][file] = REXML::Document.new(config.to_s)
- end
- responsedata[:need_sums] = {}
- response_xml.elements.each('/files/need_sums/need_sum') do |ns|
- responsedata[:need_sums][ns.text] = true
- end
- responsedata[:need_origs] = {}
- response_xml.elements.each('/files/need_origs/need_orig') do |no|
- responsedata[:need_origs][no.text] = true
- end
- responsedata[:allcommands] = {}
- response_xml.elements.each('/files/allcommands/commands') do |command|
- commandname = command.attributes['commandname']
- # We have to make a new document so that XPath paths are
- # referenced relative to the configuration for this
- # specific file.
- #responsedata[:allcommands][commandname] = REXML::Document.new(response_xml.root.elements["/files/allcommands/commands[@commandname='#{commandname}']"].to_s)
- responsedata[:allcommands][commandname] = REXML::Document.new(command.to_s)
- end
- responsedata[:retrycommands] = {}
- response_xml.elements.each('/files/retrycommands/retrycommand') do |rc|
- responsedata[:retrycommands][rc.text] = true
- end
- else
- puts " Response is empty" if (@debug)
- break
- end
- end
-
- #
- # Process the response from the server
- #
-
- # Prep a clean request hash
- if @local
- request = {}
- if !responsedata[:need_origs].empty?
- request[:files] = {}
- end
- if !responsedata[:retrycommands].empty?
- request[:commands] = {}
- end
- else
- request = get_blank_request
- end
-
- # With generateall we expect to make at least two round trips
- # to the server.
- # 1) Send GENERATEALL request, get back a list of need_sums
- # 2) Send sums, possibly get back some need_origs
- # 3) Send origs, get back generated files
- need_to_loop = false
- reset_already_processed
- # Process configs first, as they may contain setup entries that are
- # needed to create the original files.
- responsedata[:configs].each_key do |file|
- puts "Processing config for #{file}" if (@debug)
- if !@listfiles
- continue_processing = process_file(file, responsedata)
- if !continue_processing
- throw :stop_processing
- end
- else
- files_to_list[file] = true
- end
- end
- responsedata[:need_sums].each_key do |need_sum|
- puts "Processing request for sum of #{need_sum}" if (@debug)
- if @local
- # If this happens we screwed something up, the local mode
- # code never requests sums.
- raise "No support for sums in local mode"
- else
- request["files[#{CGI.escape(need_sum)}][sha1sum]"] =
- get_orig_sum(need_sum)
- end
- local_requests = get_local_requests(need_sum)
- if local_requests
- if @local
- request[:files][need_sum][:local_requests] = local_requests
- else
- request["files[#{CGI.escape(need_sum)}][local_requests]"] =
- local_requests
- end
- end
- need_to_loop = true
- end
- responsedata[:need_origs].each_key do |need_orig|
- puts "Processing request for contents of #{need_orig}" if (@debug)
- if @local
- request[:files][need_orig] = {:orig => save_orig(need_orig)}
- else
- request["files[#{CGI.escape(need_orig)}][contents]"] =
- Base64.encode64(get_orig_contents(need_orig))
- request["files[#{CGI.escape(need_orig)}][sha1sum]"] =
- get_orig_sum(need_orig)
- end
- local_requests = get_local_requests(need_orig)
- if local_requests
- if @local
- request[:files][need_orig][:local_requests] = local_requests
- else
- request["files[#{CGI.escape(need_orig)}][local_requests]"] =
- local_requests
- end
- end
- need_to_loop = true
- end
- responsedata[:allcommands].each_key do |commandname|
- puts "Processing commands #{commandname}" if (@debug)
- continue_processing = process_commands(commandname, responsedata)
- if !continue_processing
- throw :stop_processing
- end
- end
- responsedata[:retrycommands].each_key do |commandname|
- puts "Processing request to retry command #{commandname}" if (@debug)
- if @local
- request[:commands][commandname] = true
- else
- request["commands[#{CGI.escape(commandname)}]"] = '1'
- end
- need_to_loop = true
- end
-
- if !need_to_loop
- break
- end
- end
-
- puts "Processing 'exec once per run' commands" if (!exec_once_per_run.empty?)
- exec_once_per_run.keys.each do |exec|
- process_exec('post', exec)
- end
- rescue Exception => e
- status = 1
- $stderr.puts e.message
- message << e.message
- $stderr.puts e.backtrace.join("\n") if @debug
- message << e.backtrace.join("\n") if @debug
- end # begin/rescue
- end # catch
-
- if @listfiles
- puts "Files under management:"
- files_to_list.keys.sort.each {|file| puts file}
- end
-
- # Send results to server
- if !@dryrun && !@local
- rails_results = []
- # A few of the fields here are numbers or booleans and need a
- # to_s to make them compatible with CGI.escape, which expects a
- # string.
- rails_results << "fqdn=#{CGI.escape(@facts['fqdn'])}"
- rails_results << "status=#{CGI.escape(status.to_s)}"
- rails_results << "message=#{CGI.escape(message)}"
- if @detailed_results.include?('SERVER')
- @results.each do |result|
- # Strangely enough this works. Even though the key is not unique to
- # each result the Rails parameter parsing code keeps track of keys it
- # has seen, and if it sees a duplicate it starts a new hash.
- rails_results << "results[][file]=#{CGI.escape(result['file'])}"
- rails_results << "results[][success]=#{CGI.escape(result['success'].to_s)}"
- rails_results << "results[][message]=#{CGI.escape(result['message'])}"
- end
- end
- puts "Sending results to server #{@resultsuri}" if (@debug)
- resultspost = Net::HTTP::Post.new(@resultsuri.path)
- # We have to bypass Net::HTTP's set_form_data method in this case
- # because it expects a hash and we can't provide the results in the
- # format we want in a hash because we'd have duplicate keys (see above).
- results_as_string = rails_results.join('&')
- resultspost.body = results_as_string
- resultspost.content_type = 'application/x-www-form-urlencoded'
- sign_post!(resultspost, @key)
- response = http.request(resultspost)
- case response
- when Net::HTTPSuccess
- puts "Response from server:\n'#{response.body}'" if (@debug)
- else
- $stderr.puts "Error submitting results:"
- $stderr.puts response.body
- end
- end
-
- if !@dryrun
- @detailed_results.each do |detail_dest|
- # If any of the destinations look like a file (start with a /) then we
- # log to that file
- if detail_dest =~ %r{^/}
- FileUtils.mkpath(File.dirname(detail_dest))
- File.open(detail_dest, 'a') do |file|
- # Add a header for the overall status of the run
- file.puts "Etch run at #{Time.now}"
- file.puts "Status: #{status}"
- if !message.empty?
- file.puts "Message:\n#{message}\n"
- end
- # Then the detailed results
- @results.each do |result|
- file.puts "File #{result['file']}, result #{result['success']}:\n"
- file.puts result['message']
- end
- end
- end
- end
- end
-
- status
- end
-
- def check_for_disable_etch_file
- disable_etch = File.join(@vardir, 'disable_etch')
- message = ''
- if File.exist?(disable_etch)
- if !@disableforce
- message = "Etch disabled:\n"
- message << IO.read(disable_etch)
- puts message
- return false, message
- else
- puts "Ignoring disable_etch file"
- end
- end
- return true, message
- end
-
- def get_blank_request
- @blankrequest.dup
- end
-
- # Raises an exception if any fatal error is encountered
- # Returns a boolean, true unless the user indicated in interactive mode
- # that further processing should be halted
- def process_file(file, responsedata)
- continue_processing = true
- save_results = true
- exception = nil
-
- # We may not have configuration for this file, if it does not apply
- # to this host. The server takes care of detecting any errors that
- # might involve, so here we can just silently return.
- config = responsedata[:configs][file]
- if !config
- puts "No configuration for #{file}, skipping" if (@debug)
- return continue_processing
- end
-
- # Skip files we've already processed in response to <depend>
- # statements.
- if @already_processed.has_key?(file)
- puts "Skipping already processed #{file}" if (@debug)
- return continue_processing
- end
-
- # Prep the results capturing for this file
- result = {}
- result['file'] = file
- result['success'] = true
- result['message'] = ''
-
- # catch/throw for expected/non-error events that end processing
- # begin/raise for error events that end processing
- # Within this block you should throw :process_done if you've reached
- # a natural stopping point and nothing further needs to be done. You
- # should raise an exception if you encounter an error condition.
- # Do not 'return' or 'abort'.
- catch :process_done do
- begin
- start_output_capture
-
- puts "Processing #{file}" if (@debug)
-
- # The %locked_files hash provides a convenient way to
- # detect circular dependancies. It doesn't give us an ordered
- # list of dependencies, which might be handy to help the user
- # debug the problem, but I don't think it's worth maintaining a
- # seperate array just for that purpose.
- if @locked_files.has_key?(file)
- raise "Circular dependancy detected. " +
- "Dependancy list (unsorted) contains:\n " +
- @locked_files.keys.join(', ')
- end
-
- # This needs to be after the circular dependency check
- lock_file(file)
-
- # Process any other files that this file depends on
- config.elements.each('/config/depend') do |depend|
- puts "Processing dependency #{depend.text}" if (@debug)
- process_file(depend.text, responsedata)
- end
-
- # Process any commands that this file depends on
- config.elements.each('/config/dependcommand') do |dependcommand|
- puts "Processing command dependency #{dependcommand.text}" if (@debug)
- process_commands(dependcommand.text, responsedata)
- end
-
- # See what type of action the user has requested
-
- # Check to see if the user has requested that we revert back to the
- # original file.
- if config.elements['/config/revert']
- origpathbase = File.join(@origbase, file)
- origpath = nil
-
- # Restore the original file if it is around
- revert_occurred = false
- if File.exist?("#{origpathbase}.ORIG")
- origpath = "#{origpathbase}.ORIG"
- origdir = File.dirname(origpath)
- origbase = File.basename(origpath)
- filedir = File.dirname(file)
-
- # Remove anything we might have written out for this file
- remove_file(file) if (!@dryrun)
-
- puts "Restoring #{origpath} to #{file}"
- recursive_copy_and_rename(origdir, origbase, file) if (!@dryrun)
- revert_occurred = true
- elsif File.exist?("#{origpathbase}.TAR")
- origpath = "#{origpathbase}.TAR"
- filedir = File.dirname(file)
-
- # Remove anything we might have written out for this file
- remove_file(file) if (!@dryrun)
-
- puts "Restoring #{file} from #{origpath}"
- system("cd #{filedir} && tar xf #{origpath}") if (!@dryrun)
- revert_occurred = true
- elsif File.exist?("#{origpathbase}.NOORIG")
- origpath = "#{origpathbase}.NOORIG"
- puts "Original #{file} didn't exist, restoring that state"
-
- # Remove anything we might have written out for this file
- remove_file(file) if (!@dryrun)
- revert_occurred = true
- end
-
- # Update the history log
- if revert_occurred
- save_history(file)
- end
-
- # Now remove the backed-up original so that future runs
- # don't do anything
- if origpath
- remove_file(origpath) if (!@dryrun)
- end
-
- throw :process_done
- end
-
- # Perform any setup commands that the user has requested.
- # These are occasionally needed to install software that is
- # required to generate the file (think m4 for sendmail.cf) or to
- # install a package containing a sample config file which we
- # then edit with a script, and thus doing the install in <pre>
- # is too late.
- if config.elements['/config/setup']
- process_setup(file, config)
- end
-
- if config.elements['/config/file'] # Regular file
- newcontents = nil
- if config.elements['/config/file/contents']
- newcontents = Base64.decode64(config.elements['/config/file/contents'].text)
- end
-
- permstring = config.elements['/config/file/perms'].text
- perms = permstring.oct
- owner = config.elements['/config/file/ow...
[truncated message content] |
|
From: <jh...@us...> - 2012-04-30 02:06:14
|
Revision: 337
http://etch.svn.sourceforge.net/etch/?rev=337&view=rev
Author: jheiss
Date: 2012-04-30 02:06:05 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Tag 4.0.0 release
Modified Paths:
--------------
Rakefile
tags/release-4.0.0/VERSION
Added Paths:
-----------
tags/release-4.0.0/
tags/release-4.0.0/client/Gemfile
tags/release-4.0.0/client/Gemfile.lock
tags/release-4.0.0/client/lib/etch/client.rb
tags/release-4.0.0/server/
tags/release-4.0.0/server/app/assets/stylesheets/design.css
tags/release-4.0.0/server/app/controllers/dashboard_controller.rb
tags/release-4.0.0/server/config/initializers/session_store.rb
tags/release-4.0.0/server/config/initializers/wrap_parameters.rb
tags/release-4.0.0/server/lib/etch/server.rb
tags/release-4.0.0/server/lib/etch.rb
tags/release-4.0.0/test/TODO
tags/release-4.0.0/test/etchtest.rb
tags/release-4.0.0/test/test_auth.rb
tags/release-4.0.0/test/test_conf.rb
tags/release-4.0.0/test/test_file.rb
tags/release-4.0.0/test/test_outputcapture.rb
Removed Paths:
-------------
tags/release-4.0.0/Gemfile
tags/release-4.0.0/Gemfile.lock
tags/release-4.0.0/client/lib/etch/client.rb
tags/release-4.0.0/server/
tags/release-4.0.0/server/app/assets/stylesheets/design.css
tags/release-4.0.0/server/app/controllers/dashboard_controller.rb
tags/release-4.0.0/server/config/initializers/session_store.rb
tags/release-4.0.0/server/config/initializers/wrap_parameters.rb
tags/release-4.0.0/server/lib/etch/server.rb
tags/release-4.0.0/server/lib/etch.rb
tags/release-4.0.0/test/TODO
tags/release-4.0.0/test/etchtest.rb
tags/release-4.0.0/test/test_auth.rb
tags/release-4.0.0/test/test_conf.rb
tags/release-4.0.0/test/test_file.rb
tags/release-4.0.0/test/test_outputcapture.rb
Modified: Rakefile
===================================================================
--- Rakefile 2012-04-30 01:44:32 UTC (rev 336)
+++ Rakefile 2012-04-30 02:06:05 UTC (rev 337)
@@ -1,4 +1,4 @@
-ETCHVER = '3.20.1'
+ETCHVER = '4.0.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Deleted: tags/release-4.0.0/Gemfile
===================================================================
--- trunk/Gemfile 2012-04-21 04:22:22 UTC (rev 315)
+++ tags/release-4.0.0/Gemfile 2012-04-30 02:06:05 UTC (rev 337)
@@ -1,14 +0,0 @@
-source :rubygems
-gem 'facter'
-gem 'nokogiri'
-# Tests will be run with nokogiri by default, but it might be nice to have
-# libxml available too if you want to test with it as well.
-gem 'libxml-ruby'
-
-group :server do
- gem 'rails', '2.3.14'
- gem 'sqlite3'
- gem 'will_paginate', '~> 2.3.15'
- gem 'searchlogic'
-end
-
Deleted: tags/release-4.0.0/Gemfile.lock
===================================================================
--- trunk/Gemfile.lock 2012-04-21 04:22:22 UTC (rev 315)
+++ tags/release-4.0.0/Gemfile.lock 2012-04-30 02:06:05 UTC (rev 337)
@@ -1,42 +0,0 @@
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (2.3.14)
- actionpack (= 2.3.14)
- actionpack (2.3.14)
- activesupport (= 2.3.14)
- rack (~> 1.1.0)
- activerecord (2.3.14)
- activesupport (= 2.3.14)
- activeresource (2.3.14)
- activesupport (= 2.3.14)
- activesupport (2.3.14)
- facter (1.6.5)
- libxml-ruby (2.2.2)
- nokogiri (1.5.0)
- rack (1.1.3)
- rails (2.3.14)
- actionmailer (= 2.3.14)
- actionpack (= 2.3.14)
- activerecord (= 2.3.14)
- activeresource (= 2.3.14)
- activesupport (= 2.3.14)
- rake (>= 0.8.3)
- rake (0.9.2)
- searchlogic (2.5.8)
- activerecord (~> 2.3.12)
- activerecord (~> 2.3.12)
- sqlite3 (1.3.5)
- will_paginate (2.3.16)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- facter
- libxml-ruby
- nokogiri
- rails (= 2.3.14)
- searchlogic
- sqlite3
- will_paginate (~> 2.3.15)
Modified: tags/release-4.0.0/VERSION
===================================================================
--- trunk/VERSION 2012-04-21 04:22:22 UTC (rev 315)
+++ tags/release-4.0.0/VERSION 2012-04-30 02:06:05 UTC (rev 337)
@@ -1 +1 @@
-trunk
+4.0.0
Copied: tags/release-4.0.0/client/Gemfile (from rev 323, trunk/client/Gemfile)
===================================================================
--- tags/release-4.0.0/client/Gemfile (rev 0)
+++ tags/release-4.0.0/client/Gemfile 2012-04-30 02:06:05 UTC (rev 337)
@@ -0,0 +1,2 @@
+source :rubygems
+gem 'facter'
Copied: tags/release-4.0.0/client/Gemfile.lock (from rev 323, trunk/client/Gemfile.lock)
===================================================================
--- tags/release-4.0.0/client/Gemfile.lock (rev 0)
+++ tags/release-4.0.0/client/Gemfile.lock 2012-04-30 02:06:05 UTC (rev 337)
@@ -0,0 +1,10 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ facter (1.6.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ facter
Deleted: tags/release-4.0.0/client/lib/etch/client.rb
===================================================================
--- trunk/client/lib/etch/client.rb 2012-04-21 04:22:22 UTC (rev 315)
+++ tags/release-4.0.0/client/lib/etch/client.rb 2012-04-30 02:06:05 UTC (rev 337)
@@ -1,2583 +0,0 @@
-##############################################################################
-# Etch configuration file management tool library
-##############################################################################
-
-# Ensure we can find etch.rb if run within the development directory structure
-# This is roughly equivalent to "../../../server/lib"
-serverlibdir = File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'server', 'lib')
-if File.exist?(serverlibdir)
- $:.unshift(serverlibdir)
-end
-
-# Exclude standard libraries and gems from the warnings induced by
-# running ruby with the -w flag. Several of these have warnings under
-# ruby 1.9 and there's nothing we can do to fix that.
-require 'silently'
-Silently.silently do
- begin
- # Try loading facter w/o gems first so that we don't introduce a
- # dependency on gems if it is not needed.
- require 'facter' # Facter
- rescue LoadError
- require 'rubygems'
- require 'facter'
- end
- require 'find'
- require 'digest/sha1' # hexdigest
- require 'openssl' # OpenSSL
- require 'base64' # decode64, encode64
- require 'uri'
- require 'net/http'
- require 'net/https'
- require 'rexml/document'
- require 'fileutils' # copy, mkpath, rmtree
- require 'fcntl' # Fcntl::O_*
- require 'etc' # getpwnam, getgrnam
- require 'tempfile' # Tempfile
- require 'find' # Find.find
- require 'cgi'
- require 'timeout'
- require 'logger'
-end
-require 'etch'
-
-class Etch::Client
- VERSION = 'unset'
-
- CONFIRM_PROCEED = 1
- CONFIRM_SKIP = 2
- CONFIRM_QUIT = 3
- PRIVATE_KEY_PATHS = ["/etc/ssh/ssh_host_rsa_key", "/etc/ssh_host_rsa_key"]
- DEFAULT_CONFIGDIR = '/etc'
- DEFAULT_VARDIR = '/var/etch'
- DEFAULT_DETAILED_RESULTS = ['SERVER']
-
- # We need these in relation to the output capturing
- ORIG_STDOUT = STDOUT.dup
- ORIG_STDERR = STDERR.dup
-
- attr_reader :exec_once_per_run
-
- def initialize(options)
- @server = options[:server] ? options[:server] : 'https://etch'
- @configdir = options[:configdir] ? options[:configdir] : DEFAULT_CONFIGDIR
- @vardir = options[:vardir] ? options[:vardir] : DEFAULT_VARDIR
- @tag = options[:tag]
- @local = options[:local] ? File.expand_path(options[:local]) : nil
- @debug = options[:debug]
- @dryrun = options[:dryrun]
- @listfiles = options[:listfiles]
- @interactive = options[:interactive]
- @filenameonly = options[:filenameonly]
- @fullfile = options[:fullfile]
- @key = options[:key] ? options[:key] : get_private_key_path
- @disableforce = options[:disableforce]
- @lockforce = options[:lockforce]
-
- @last_response = ""
-
- @file_system_root = '/' # Not sure if this needs to be more portable
- # This option is only intended for use by the test suite
- if options[:file_system_root]
- @file_system_root = options[:file_system_root]
- @vardir = File.join(@file_system_root, @vardir)
- @configdir = File.join(@file_system_root, @configdir)
- end
-
- @configfile = File.join(@configdir, 'etch.conf')
- @detailed_results = []
-
- if File.exist?(@configfile)
- IO.foreach(@configfile) do |line|
- line.chomp!
- next if (line =~ /^\s*$/); # Skip blank lines
- next if (line =~ /^\s*#/); # Skip comments
- line.strip! # Remove leading/trailing whitespace
- key, value = line.split(/\s*=\s*/, 2)
- if key == 'server'
- # A setting for the server to use which comes from upstream
- # (generally from a command line option) takes precedence
- # over the config file
- if !options[:server]
- @server = value
- # Warn the user, as this could potentially be confusing
- # if they don't realize there's a config file lying
- # around
- warn "Using server #{@server} from #{@configfile}" if @debug
- else
- # "command line override" isn't necessarily accurate, we don't
- # know why the caller passed us an option to override the config
- # file, but most of the time it will be due to a command line
- # option and I want the message to be easily understood by users.
- # If someone can come up with some better wording without turning
- # the message into something as long as this comment that would be
- # welcome.
- warn "Ignoring 'server' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'local'
- if !options[:local] && !options[:server]
- @local = value
- warn "Using local directory #{@local} from #{@configfile}" if @debug
- else
- warn "Ignoring 'local' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'key'
- if !options[:key]
- @key = value
- warn "Using key #{@key} from #{@configfile}" if @debug
- else
- warn "Ignoring 'key' option in #{@configfile} due to command line override" if @debug
- end
- elsif key == 'path'
- ENV['PATH'] = value
- elsif key == 'detailed_results'
- warn "Adding detailed results destination '#{value}'" if @debug
- @detailed_results << value
- end
- end
- end
-
- if @key && !File.readable?(@key)
- @key = nil
- end
- if !@key
- warn "No readable private key found, messages to server will not be signed and may be rejected depending on server configuration"
- end
-
- if @detailed_results.empty?
- @detailed_results = DEFAULT_DETAILED_RESULTS
- end
-
- @origbase = File.join(@vardir, 'orig')
- @historybase = File.join(@vardir, 'history')
- @lockbase = File.join(@vardir, 'locks')
- @requestbase = File.join(@vardir, 'requests')
-
- @facts = Facter.to_hash
- if @facts['operatingsystemrelease']
- # Some versions of Facter have a bug that leaves extraneous
- # whitespace on this fact. Work around that with strip. I.e. on
- # CentOS you'll get '5 ' or '5.2 '.
- @facts['operatingsystemrelease'].strip!
- end
-
- if @local
- logger = Logger.new(STDOUT)
- dlogger = Logger.new(STDOUT)
- if @debug
- dlogger.level = Logger::DEBUG
- else
- dlogger.level = Logger::INFO
- end
- blankrequest = {}
- @facts.each_pair { |key, value| blankrequest[key] = value.to_s }
- blankrequest['fqdn'] = @facts['fqdn']
- @facts = blankrequest
- @etch = Etch.new(logger, dlogger)
- else
- # Make sure the server URL ends in a / so that we can append paths
- # to it using URI.join
- if @server !~ %r{/$}
- @server << '/'
- end
- @filesuri = URI.join(@server, 'files')
- @resultsuri = URI.join(@server, 'results')
-
- @blankrequest = {}
- # If the user specified a non-standard key then override the
- # sshrsakey fact so that authentication works
- if @key
- @facts['sshrsakey'] = IO.read(@key+'.pub').chomp.split[1]
- end
- @facts.each_pair { |key, value| @blankrequest["facts[#{key}]"] = value.to_s }
- @blankrequest['fqdn'] = @facts['fqdn']
- if @debug
- @blankrequest['debug'] = '1'
- end
- if @tag
- @blankrequest['tag'] = @tag
- end
- end
-
- @locked_files = {}
- @first_update = {}
- @already_processed = {}
- @exec_already_processed = {}
- @exec_once_per_run = {}
- @results = []
- # See start/stop_output_capture for these
- @output_pipes = []
-
- @lchown_supported = nil
- @lchmod_supported = nil
- end
-
- def process_until_done(files, commands)
- # Our overall status. Will be reported to the server and used as the
- # return value for this method. Command-line clients should use it as
- # their exit value. Zero indicates no errors.
- status = 0
- message = ''
-
- # A variable to collect filenames if operating in @listfiles mode
- files_to_list = {}
-
- # Prep http instance
- http = nil
- if !@local
- puts "Connecting to #{@filesuri}" if (@debug)
- http = Net::HTTP.new(@filesuri.host, @filesuri.port)
- if @filesuri.scheme == "https"
- # Eliminate the OpenSSL "using default DH parameters" warning
- if File.exist?(File.join(@configdir, 'etch', 'dhparams'))
- dh = OpenSSL::PKey::DH.new(IO.read(File.join(@configdir, 'etch', 'dhparams')))
- Net::HTTP.ssl_context_accessor(:tmp_dh_callback)
- http.tmp_dh_callback = proc { dh }
- end
- http.use_ssl = true
- if File.exist?(File.join(@configdir, 'etch', 'ca.pem'))
- http.ca_file = File.join(@configdir, 'etch', 'ca.pem')
- http.verify_mode = OpenSSL::SSL::VERIFY_PEER
- elsif File.directory?(File.join(@configdir, 'etch', 'ca'))
- http.ca_path = File.join(@configdir, 'etch', 'ca')
- http.verify_mode = OpenSSL::SSL::VERIFY_PEER
- end
- end
- http.start
- end
-
- # catch/throw for expected/non-error events that end processing
- # begin/raise for error events that end processing
- catch :stop_processing do
- begin
- enabled, message = check_for_disable_etch_file
- if !enabled
- # 200 is the arbitrarily picked exit value indicating
- # that etch is disabled
- status = 200
- throw :stop_processing
- end
- remove_stale_lock_files
-
- # Assemble the initial request
- request = nil
- if @local
- request = {}
- if files && !files.empty?
- request[:files] = {}
- files.each do |file|
- request[:files][file] = {:orig => save_orig(file)}
- local_requests = get_local_requests(file)
- if local_requests
- request[:files][file][:local_requests] = local_requests
- end
- end
- end
- if commands && !commands.empty?
- request[:commands] = {}
- commands.each do |command|
- request[:commands][command] = {}
- end
- end
- else
- request = get_blank_request
- if (files && !files.empty?) || (commands && !commands.empty?)
- if files
- files.each do |file|
- request["files[#{CGI.escape(file)}][sha1sum]"] =
- get_orig_sum(file)
- local_requests = get_local_requests(file)
- if local_requests
- request["files[#{CGI.escape(file)}][local_requests]"] =
- local_requests
- end
- end
- end
- if commands
- commands.each do |command|
- request["commands[#{CGI.escape(command)}]"] = '1'
- end
- end
- else
- request['files[GENERATEALL]'] = '1'
- end
- end
-
- #
- # Loop back and forth with the server sending requests for files and
- # responding to the server's requests for original contents or sums
- # it needs
- #
-
- Signal.trap('EXIT') do
- STDOUT.reopen(ORIG_STDOUT)
- STDERR.reopen(ORIG_STDERR)
- unlock_all_files
- end
-
- # It usually takes a few back and forth exchanges with the server to
- # exchange all needed data and get a complete set of configuration.
- # The number of iterations is capped at 10 to prevent any unplanned
- # infinite loops. The limit of 10 was chosen somewhat arbitrarily but
- # seems fine in practice.
- 10.times do
- #
- # Send request to server
- #
-
- responsedata = {}
- if @local
- results = @etch.generate(@local, @facts, request)
- # FIXME: Etch#generate returns parsed XML using whatever XML
- # library it happens to use. In order to avoid re-parsing
- # the XML we'd have to use the XML abstraction code from Etch
- # everwhere here.
- # Until then re-parse the XML using REXML.
- #responsedata[:configs] = results[:configs]
- responsedata[:configs] = {}
- results[:configs].each {|f,c| responsedata[:configs][f] = REXML::Document.new(c.to_s) }
- responsedata[:need_sums] = {}
- responsedata[:need_origs] = results[:need_orig]
- #responsedata[:allcommands] = results[:allcommands]
- responsedata[:allcommands] = {}
- results[:allcommands].each {|cn,c| responsedata[:allcommands][cn] = REXML::Document.new(c.to_s) }
- responsedata[:retrycommands] = results[:retrycommands]
- else
- puts "Sending request to server #{@filesuri}: #{request.inspect}" if (@debug)
- post = Net::HTTP::Post.new(@filesuri.path)
- post.set_form_data(request)
- sign_post!(post, @key)
- response = http.request(post)
- if !response.kind_of?(Net::HTTPSuccess)
- $stderr.puts response.body
- # error! raises an exception
- response.error!
- end
- puts "Response from server:\n'#{response.body}'" if (@debug)
- if !response.body.nil? && !response.body.empty?
- response_xml = REXML::Document.new(response.body)
- responsedata[:configs] = {}
- response_xml.elements.each('/files/configs/config') do |config|
- file = config.attributes['filename']
- # We have to make a new document so that XPath paths are
- # referenced relative to the configuration for this
- # specific file.
- #responsedata[:configs][file] = REXML::Document.new(response_xml.elements["/files/configs/config[@filename='#{file}']"].to_s)
- responsedata[:configs][file] = REXML::Document.new(config.to_s)
- end
- responsedata[:need_sums] = {}
- response_xml.elements.each('/files/need_sums/need_sum') do |ns|
- responsedata[:need_sums][ns.text] = true
- end
- responsedata[:need_origs] = {}
- response_xml.elements.each('/files/need_origs/need_orig') do |no|
- responsedata[:need_origs][no.text] = true
- end
- responsedata[:allcommands] = {}
- response_xml.elements.each('/files/allcommands/commands') do |command|
- commandname = command.attributes['commandname']
- # We have to make a new document so that XPath paths are
- # referenced relative to the configuration for this
- # specific file.
- #responsedata[:allcommands][commandname] = REXML::Document.new(response_xml.root.elements["/files/allcommands/commands[@commandname='#{commandname}']"].to_s)
- responsedata[:allcommands][commandname] = REXML::Document.new(command.to_s)
- end
- responsedata[:retrycommands] = {}
- response_xml.elements.each('/files/retrycommands/retrycommand') do |rc|
- responsedata[:retrycommands][rc.text] = true
- end
- else
- puts " Response is empty" if (@debug)
- break
- end
- end
-
- #
- # Process the response from the server
- #
-
- # Prep a clean request hash
- if @local
- request = {}
- if !responsedata[:need_origs].empty?
- request[:files] = {}
- end
- if !responsedata[:retrycommands].empty?
- request[:commands] = {}
- end
- else
- request = get_blank_request
- end
-
- # With generateall we expect to make at least two round trips
- # to the server.
- # 1) Send GENERATEALL request, get back a list of need_sums
- # 2) Send sums, possibly get back some need_origs
- # 3) Send origs, get back generated files
- need_to_loop = false
- reset_already_processed
- # Process configs first, as they may contain setup entries that are
- # needed to create the original files.
- responsedata[:configs].each_key do |file|
- puts "Processing config for #{file}" if (@debug)
- if !@listfiles
- continue_processing = process_file(file, responsedata)
- if !continue_processing
- throw :stop_processing
- end
- else
- files_to_list[file] = true
- end
- end
- responsedata[:need_sums].each_key do |need_sum|
- puts "Processing request for sum of #{need_sum}" if (@debug)
- if @local
- # If this happens we screwed something up, the local mode
- # code never requests sums.
- raise "No support for sums in local mode"
- else
- request["files[#{CGI.escape(need_sum)}][sha1sum]"] =
- get_orig_sum(need_sum)
- end
- local_requests = get_local_requests(need_sum)
- if local_requests
- if @local
- request[:files][need_sum][:local_requests] = local_requests
- else
- request["files[#{CGI.escape(need_sum)}][local_requests]"] =
- local_requests
- end
- end
- need_to_loop = true
- end
- responsedata[:need_origs].each_key do |need_orig|
- puts "Processing request for contents of #{need_orig}" if (@debug)
- if @local
- request[:files][need_orig] = {:orig => save_orig(need_orig)}
- else
- request["files[#{CGI.escape(need_orig)}][contents]"] =
- Base64.encode64(get_orig_contents(need_orig))
- request["files[#{CGI.escape(need_orig)}][sha1sum]"] =
- get_orig_sum(need_orig)
- end
- local_requests = get_local_requests(need_orig)
- if local_requests
- if @local
- request[:files][need_orig][:local_requests] = local_requests
- else
- request["files[#{CGI.escape(need_orig)}][local_requests]"] =
- local_requests
- end
- end
- need_to_loop = true
- end
- responsedata[:allcommands].each_key do |commandname|
- puts "Processing commands #{commandname}" if (@debug)
- continue_processing = process_commands(commandname, responsedata)
- if !continue_processing
- throw :stop_processing
- end
- end
- responsedata[:retrycommands].each_key do |commandname|
- puts "Processing request to retry command #{commandname}" if (@debug)
- if @local
- request[:commands][commandname] = true
- else
- request["commands[#{CGI.escape(commandname)}]"] = '1'
- end
- need_to_loop = true
- end
-
- if !need_to_loop
- break
- end
- end
-
- puts "Processing 'exec once per run' commands" if (!exec_once_per_run.empty?)
- exec_once_per_run.keys.each do |exec|
- process_exec('post', exec)
- end
- rescue Exception => e
- status = 1
- $stderr.puts e.message
- message << e.message
- $stderr.puts e.backtrace.join("\n") if @debug
- message << e.backtrace.join("\n") if @debug
- end # begin/rescue
- end # catch
-
- if @listfiles
- puts "Files under management:"
- files_to_list.keys.sort.each {|file| puts file}
- end
-
- # Send results to server
- if !@dryrun && !@local
- rails_results = []
- # A few of the fields here are numbers or booleans and need a
- # to_s to make them compatible with CGI.escape, which expects a
- # string.
- rails_results << "fqdn=#{CGI.escape(@facts['fqdn'])}"
- rails_results << "status=#{CGI.escape(status.to_s)}"
- rails_results << "message=#{CGI.escape(message)}"
- if @detailed_results.include?('SERVER')
- @results.each do |result|
- # Strangely enough this works. Even though the key is not unique to
- # each result the Rails parameter parsing code keeps track of keys it
- # has seen, and if it sees a duplicate it starts a new hash.
- rails_results << "results[][file]=#{CGI.escape(result['file'])}"
- rails_results << "results[][success]=#{CGI.escape(result['success'].to_s)}"
- rails_results << "results[][message]=#{CGI.escape(result['message'])}"
- end
- end
- puts "Sending results to server #{@resultsuri}" if (@debug)
- resultspost = Net::HTTP::Post.new(@resultsuri.path)
- # We have to bypass Net::HTTP's set_form_data method in this case
- # because it expects a hash and we can't provide the results in the
- # format we want in a hash because we'd have duplicate keys (see above).
- results_as_string = rails_results.join('&')
- resultspost.body = results_as_string
- resultspost.content_type = 'application/x-www-form-urlencoded'
- sign_post!(resultspost, @key)
- response = http.request(resultspost)
- case response
- when Net::HTTPSuccess
- puts "Response from server:\n'#{response.body}'" if (@debug)
- else
- $stderr.puts "Error submitting results:"
- $stderr.puts response.body
- end
- end
-
- if !@dryrun
- @detailed_results.each do |detail_dest|
- # If any of the destinations look like a file (start with a /) then we
- # log to that file
- if detail_dest =~ %r{^/}
- FileUtils.mkpath(File.dirname(detail_dest))
- File.open(detail_dest, 'a') do |file|
- # Add a header for the overall status of the run
- file.puts "Etch run at #{Time.now}"
- file.puts "Status: #{status}"
- if !message.empty?
- file.puts "Message:\n#{message}\n"
- end
- # Then the detailed results
- @results.each do |result|
- file.puts "File #{result['file']}, result #{result['success']}:\n"
- file.puts result['message']
- end
- end
- end
- end
- end
-
- status
- end
-
- def check_for_disable_etch_file
- disable_etch = File.join(@vardir, 'disable_etch')
- message = ''
- if File.exist?(disable_etch)
- if !@disableforce
- message = "Etch disabled:\n"
- message << IO.read(disable_etch)
- puts message
- return false, message
- else
- puts "Ignoring disable_etch file"
- end
- end
- return true, message
- end
-
- def get_blank_request
- @blankrequest.dup
- end
-
- # Raises an exception if any fatal error is encountered
- # Returns a boolean, true unless the user indicated in interactive mode
- # that further processing should be halted
- def process_file(file, responsedata)
- continue_processing = true
- save_results = true
- exception = nil
-
- # We may not have configuration for this file, if it does not apply
- # to this host. The server takes care of detecting any errors that
- # might involve, so here we can just silently return.
- config = responsedata[:configs][file]
- if !config
- puts "No configuration for #{file}, skipping" if (@debug)
- return continue_processing
- end
-
- # Skip files we've already processed in response to <depend>
- # statements.
- if @already_processed.has_key?(file)
- puts "Skipping already processed #{file}" if (@debug)
- return continue_processing
- end
-
- # Prep the results capturing for this file
- result = {}
- result['file'] = file
- result['success'] = true
- result['message'] = ''
-
- # catch/throw for expected/non-error events that end processing
- # begin/raise for error events that end processing
- # Within this block you should throw :process_done if you've reached
- # a natural stopping point and nothing further needs to be done. You
- # should raise an exception if you encounter an error condition.
- # Do not 'return' or 'abort'.
- catch :process_done do
- begin
- start_output_capture
-
- puts "Processing #{file}" if (@debug)
-
- # The %locked_files hash provides a convenient way to
- # detect circular dependancies. It doesn't give us an ordered
- # list of depend...
[truncated message content] |
|
From: <jh...@us...> - 2009-10-13 17:41:01
|
Revision: 117
http://etch.svn.sourceforge.net/etch/?rev=117&view=rev
Author: jheiss
Date: 2009-10-13 17:40:53 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Tag 3.7 release
Modified Paths:
--------------
Makefile
Added Paths:
-----------
tags/release-3.7/
Modified: Makefile
===================================================================
--- Makefile 2009-10-12 23:49:06 UTC (rev 116)
+++ Makefile 2009-10-13 17:40:53 UTC (rev 117)
@@ -1,4 +1,4 @@
-VER=3.6
+VER=3.7
TAGNAME=release-$(VER)
all: dist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2009-11-14 18:05:45
|
Revision: 160
http://etch.svn.sourceforge.net/etch/?rev=160&view=rev
Author: jheiss
Date: 2009-11-14 18:05:29 +0000 (Sat, 14 Nov 2009)
Log Message:
-----------
Tag 3.12 release.
Fix typo in top-level rakefile.
Modified Paths:
--------------
Rakefile
tags/release-3.12/VERSION
Added Paths:
-----------
tags/release-3.12/
Modified: Rakefile
===================================================================
--- Rakefile 2009-11-14 17:58:54 UTC (rev 159)
+++ Rakefile 2009-11-14 18:05:29 UTC (rev 160)
@@ -1,4 +1,4 @@
-ETCHVER = '3.11'
+ETCHVER = '3.12'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
@@ -27,7 +27,7 @@
desc 'Tag a new release'
task :tag do
- if !File.exist(TAGDIR)
+ if !File.exist?(TAGDIR)
system("svn copy trunk #{TAGDIR}")
# Remove files that aren't in svn
system("svn status #{TAGDIR} | grep '^?' | awk '{print $2}' | xargs rm -rf")
Modified: tags/release-3.12/VERSION
===================================================================
--- trunk/VERSION 2009-11-14 17:58:54 UTC (rev 159)
+++ tags/release-3.12/VERSION 2009-11-14 18:05:29 UTC (rev 160)
@@ -1 +1 @@
-trunk
+3.12
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2010-12-22 20:16:04
|
Revision: 239
http://etch.svn.sourceforge.net/etch/?rev=239&view=rev
Author: jheiss
Date: 2010-12-22 20:15:58 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Tag 3.17.0 release
Modified Paths:
--------------
Rakefile
tags/release-3.17.0/VERSION
Added Paths:
-----------
tags/release-3.17.0/
Modified: Rakefile
===================================================================
--- Rakefile 2010-12-19 07:13:05 UTC (rev 238)
+++ Rakefile 2010-12-22 20:15:58 UTC (rev 239)
@@ -1,4 +1,4 @@
-ETCHVER = '3.16.0'
+ETCHVER = '3.17.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.17.0/VERSION
===================================================================
--- trunk/VERSION 2010-12-19 07:13:05 UTC (rev 238)
+++ tags/release-3.17.0/VERSION 2010-12-22 20:15:58 UTC (rev 239)
@@ -1 +1 @@
-trunk
+3.17.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2011-01-18 00:20:03
|
Revision: 256
http://etch.svn.sourceforge.net/etch/?rev=256&view=rev
Author: jheiss
Date: 2011-01-18 00:19:56 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Tag 3.18.0 release
Modified Paths:
--------------
Rakefile
tags/release-3.18.0/VERSION
Added Paths:
-----------
tags/release-3.18.0/
Modified: Rakefile
===================================================================
--- Rakefile 2011-01-17 05:31:39 UTC (rev 255)
+++ Rakefile 2011-01-18 00:19:56 UTC (rev 256)
@@ -1,4 +1,4 @@
-ETCHVER = '3.17.0'
+ETCHVER = '3.18.0'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.18.0/VERSION
===================================================================
--- trunk/VERSION 2011-01-17 05:31:39 UTC (rev 255)
+++ tags/release-3.18.0/VERSION 2011-01-18 00:19:56 UTC (rev 256)
@@ -1 +1 @@
-trunk
+3.18.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jh...@us...> - 2012-03-21 23:23:52
|
Revision: 312
http://etch.svn.sourceforge.net/etch/?rev=312&view=rev
Author: jheiss
Date: 2012-03-21 23:23:46 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
Tag 3.20.1 release
Modified Paths:
--------------
Rakefile
tags/release-3.20.1/VERSION
Added Paths:
-----------
tags/release-3.20.1/
Modified: Rakefile
===================================================================
--- Rakefile 2012-03-21 21:12:32 UTC (rev 311)
+++ Rakefile 2012-03-21 23:23:46 UTC (rev 312)
@@ -1,4 +1,4 @@
-ETCHVER = '3.20.0'
+ETCHVER = '3.20.1'
TAGNAME = "release-#{ETCHVER}"
TAGDIR = "tags/#{TAGNAME}"
DIST = "etch-#{ETCHVER}"
Modified: tags/release-3.20.1/VERSION
===================================================================
--- trunk/VERSION 2012-03-21 21:12:32 UTC (rev 311)
+++ tags/release-3.20.1/VERSION 2012-03-21 23:23:46 UTC (rev 312)
@@ -1 +1 @@
-trunk
+3.20.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X