Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog
	NEWS

diff --cc ChangeLog
index 47937846bf23599602ce59cc3971393241058090,a3e9978120ee90ccb556ca335cac85d3d46cfd05..f743fd0f90b320c4a4b956a25006f5c0db21ff0c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,25 +1,36 @@@
 +2009-02-02  Dave Brolley  <brolley@redhat.com>
 +
 +      * NEWS: Update status of client/server.
 +      * stap-server (initialization): Ensure that all server response
 +      files are created.
 +      (check_request): Parse the client's command line here.
 +      (check_comnpatibility): Don't require client/server platform match
 +      for phases 1-4.
 +      (fatal,error): Correct quoting typos.
 +      stap-server.8.in: Add SSL information.
 +
+ 2009-02-02  Stan Cox  <scox@redhat.com>
+ 
+       * NEWS, stapprobes.5.in: Add process.label.
+ 
+ 2009-02-01  Stan Cox  <scox@redhat.com>
+ 
+       * tapsets.cxx (dwflpp::iterate_over_cu_labels): New.
+       (query_cu): Use it. 
+       (dwarf_derived_probe::register_patterns): Register .label.
+ 
+ 2009-02-01  Mark Wielaard  <mjw@redhat.com>
+ 
+       * translate.cxx (dump_unwindsyms): Process extra_offset with
+       dwfl_module_relocate_address.
+ 
+ 2009-01-30  Masami Hiramatsu  <mhiramat@redhat.com>
+ 
+       PR6936
+       * configure.ac (AC_CONFIG_FILES): Add initscript/systemtap.in.
+       * configure: Regenerated.
+       * systemtap.spec: Add systemtap-initscript subpackage.
+ 
  2009-01-30  Dave Brolley  <brolley@redhat.com>
  
        * Makefile.am (install-scripts): New target. Set exec_prefix and

diff --cc NEWS
index 91cc34883b6cad3790bf8ee4d723649e627dd608,81887a7f01e052a6cd090d8a2c737078d3898fd9..16e0d2ba4aefe97a59093925b9d3098e9257b09d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,19 -1,13 +1,27 @@@
  * What's new
  
 +- The systemtap client and compile server are now available.
 +  These allow you to compile a systemtap module on a host other than
 +  the one which it will be run, providing the client and server
 +  are compatible. Other than using a server for passes 1 through
 +  4, the client behaves like the 'stap' front end itself. This
 +  means, among other things, that the client will automatically
 +  load the resulting module on the local host unless -p[1234]
 +  was specified.
 +
 +  The client/server now use SSL for network connection security and
 +   for signing.
 +
 +  See stap-server(8) for more details.
 +
+ - function("func").label("label") probes are now supported to allow matching
+   the label of a function.
+ 
+ - Systemtap initscript is available. This initscript allows you to run
+   systemtap scripts as system services (in flight recorder mode) and
+   control those scripts individually.
+   See README.initscript for details.
+ 
  - The stap "-r DIR" option may be used to identify a hand-made kernel
    build directory.  The tool determines the appropriate release string
    automatically from the directory.