diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 414db0d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-upstart-0.3.9.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a69330a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+upstart-0.3.11.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7d2ec21..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: upstart
-# $Id$
-NAME := upstart
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index 51af2c3..736f5d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-794208083d405ece123ad59a02f3e233  upstart-0.3.9.tar.bz2
+a9e475e1458c876add0441d9d4cfe9c0  upstart-0.3.11.tar.bz2
diff --git a/upstart-audit-events.patch b/upstart-audit-events.patch
index 09ceeae..2329f8d 100644
--- a/upstart-audit-events.patch
+++ b/upstart-audit-events.patch
@@ -1,27 +1,3 @@
-diff -urp upstart-0.3.9.orig/compat/sysv/Makefile.am upstart-0.3.9/compat/sysv/Makefile.am
---- upstart-0.3.9.orig/compat/sysv/Makefile.am	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/compat/sysv/Makefile.am	2008-11-05 08:16:22.000000000 -0500
-@@ -28,15 +28,17 @@ endif
- 
- reboot_SOURCES = reboot.c
- reboot_LDFLAGS = -static
--reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- runlevel_SOURCES = runlevel.c
- runlevel_LDFLAGS = -static
--runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
-+runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) @LIBAUDIT@
- 
- shutdown_SOURCES = shutdown.c
- shutdown_LDFLAGS = -static
--shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
-+shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) \
-+	@LIBAUDIT@
- 
- telinit_SOURCES = telinit.c
- telinit_LDFLAGS = -static
 diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
 --- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
 +++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
@@ -29,7 +5,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/rebo
  #include <string.h>
  #include <unistd.h>
  #include <utmp.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -63,7 +39,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/rebo
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +        if (fd < 0)
 +                return;
@@ -82,7 +58,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/runlevel.c upstart-0.3.9/compat/sysv/ru
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -128,7 +104,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/runlevel.c upstart-0.3.9/compat/sysv/ru
 +static void
 +send_audit_event (int old, int level)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +        int fd = audit_open ();
 +
 +        if (fd < 0)
@@ -155,7 +131,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/sh
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +#include <libaudit.h>
 +#endif
  
@@ -173,7 +149,7 @@ diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/sh
 +static void
 +send_audit_event (void)
 +{
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
 +	int fd = audit_open ();
 +	if (fd < 0)
 +		return;
@@ -201,45 +177,23 @@ diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/sh
  	unlink (ETC_NOLOGIN);
  	nih_main_unlink_pidfile ();
  
-diff -urp upstart-0.3.9.orig/config.h.in upstart-0.3.9/config.h.in
---- upstart-0.3.9.orig/config.h.in	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/config.h.in	2008-11-05 08:16:22.000000000 -0500
-@@ -250,6 +250,9 @@
- /* Define to 1 if your C compiler doesn't accept -c and -o together. */
- #undef NO_MINUS_C_MINUS_O
- 
-+/* Define to 1 if you want audit support */
-+#undef HAVE_LIBAUDIT
-+
- /* Name of package */
- #undef PACKAGE
- 
-diff -urp upstart-0.3.9.orig/configure.ac upstart-0.3.9/configure.ac
---- upstart-0.3.9.orig/configure.ac	2008-11-03 12:29:30.000000000 -0500
-+++ upstart-0.3.9/configure.ac	2008-11-05 08:16:22.000000000 -0500
-@@ -38,6 +38,25 @@ AC_ARG_ENABLE(compat,
- esac], [compat_sysv=none])dnl
- AM_CONDITIONAL(COMPAT_SYSV, test "x$compat" = "xsysv")dnl
- 
-+AC_ARG_WITH(libaudit,
-+  [  --with-libaudit=[auto/yes/no]  Add Linux audit support [default=auto]],,
-+  with_libaudit=auto)
-+
-+# Check for Linux auditing API
-+#
-+# libaudit detection
-+if test x$with_libaudit = xno ; then
-+    have_libaudit=no;
-+else
-+    # See if we have audit daemon library
-+    AC_CHECK_LIB(audit, audit_log_user_message,
-+                 LIBAUDIT=-laudit, LIBAUDIT="")
-+fi
-+AC_SUBST(LIBAUDIT)
-+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$LIBAUDIT != x)
-+if test x$LIBAUDIT != x ; then
-+    AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
-+fi
- 
- AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in intl/Makefile
- 		  nih/Makefile upstart/Makefile init/Makefile util/Makefile
+diff -up upstart-0.3.9/compat/sysv/Makefile.in.foo upstart-0.3.9/compat/sysv/Makefile.in
+--- upstart-0.3.9/compat/sysv/Makefile.in.foo	2009-04-27 15:53:35.000000000 -0400
++++ upstart-0.3.9/compat/sysv/Makefile.in	2009-04-27 15:53:55.000000000 -0400
+@@ -280,13 +280,13 @@ EXTRA_DIST = $(manpages)
+ @COMPAT_SYSV_TRUE@man_MANS = $(manpages)
+ reboot_SOURCES = reboot.c
+ reboot_LDFLAGS = -static
+-reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ runlevel_SOURCES = runlevel.c
+ runlevel_LDFLAGS = -static
+-runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
++runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) -laudit
+ shutdown_SOURCES = shutdown.c
+ shutdown_LDFLAGS = -static
+-shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ telinit_SOURCES = telinit.c
+ telinit_LDFLAGS = -static
+ telinit_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
diff --git a/upstart-fedora-buglist.patch b/upstart-fedora-buglist.patch
index 63aff3a..a89c43b 100644
--- a/upstart-fedora-buglist.patch
+++ b/upstart-fedora-buglist.patch
@@ -1,16 +1,15 @@
-diff -urN upstart-0.3.9/configure upstart-0.3.9-adj/configure
---- upstart-0.3.9/configure	2007-10-11 17:12:41.000000000 -0400
-+++ upstart-0.3.9-adj/configure	2008-04-03 11:22:20.000000000 -0400
-@@ -732,7 +732,7 @@
+--- upstart-0.3.11/configure	2009-06-19 20:03:59.000000000 +0200
++++ upstart-0.3.11-adj/configure	2009-06-22 14:51:40.000000000 +0200
+@@ -749,7 +749,7 @@
  PACKAGE_TARNAME='upstart'
- PACKAGE_VERSION='0.3.9'
- PACKAGE_STRING='upstart 0.3.9'
+ PACKAGE_VERSION='0.3.11'
+ PACKAGE_STRING='upstart 0.3.11'
 -PACKAGE_BUGREPORT='upstart-devel@lists.ubuntu.com'
 +PACKAGE_BUGREPORT='fedora-devel-list@redhat.com'
  
  ac_unique_file="init/main.c"
- gt_needs=
-@@ -1574,7 +1574,7 @@
+ # Factoring default headers for most tests.
+@@ -1655,7 +1655,7 @@
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
  
@@ -19,15 +18,3 @@ diff -urN upstart-0.3.9/configure upstart-0.3.9-adj/configure
  _ACEOF
  ac_status=$?
  fi
-diff -urN upstart-0.3.9/configure.ac upstart-0.3.9-adj/configure.ac
---- upstart-0.3.9/configure.ac	2007-10-11 17:11:27.000000000 -0400
-+++ upstart-0.3.9-adj/configure.ac	2008-04-03 11:22:20.000000000 -0400
-@@ -1,7 +1,7 @@
- # Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.60)
--AC_INIT([upstart], [0.3.9], [upstart-devel@lists.ubuntu.com])
-+AC_INIT([upstart], [0.3.9], [fedora-devel-list@redhat.com])
- AC_COPYRIGHT([[Copyright © 2007 Canonical Ltd.]])
- AC_CONFIG_SRCDIR([init/main.c])
- AC_CONFIG_MACRO_DIR([m4])
diff --git a/upstart-initctl-man.patch b/upstart-initctl-man.patch
index c2f446b..097bbdc 100644
--- a/upstart-initctl-man.patch
+++ b/upstart-initctl-man.patch
@@ -1,14 +1,5 @@
 --- upstart-0.3.9/util/man/initctl.8-orig	2008-04-09 16:52:23.000000000 -0400
 +++ upstart-0.3.9/util/man/initctl.8	2008-04-24 01:42:57.000000000 -0400
-@@ -4,7 +4,7 @@
- initctl \- init daemon control utility
- .\"
- .SH SYNOPSIS
--\fBinitctl\fR [\fIOPTION\fR]... \fICOMMAND\fR [\fIOPTION\fR]... \fIARG...\fR
-+\fBinitctl\fR [\fIOPTION\fR]... \fICOMMAND\fR [\fIOPTION\fR]... \fIARG\fR...
- .\"
- .SH DESCRIPTION
- .B initctl
 @@ -14,7 +14,7 @@
  .IR COMMAND .
  
diff --git a/upstart-save-state-across-reexec.patch b/upstart-save-state-across-reexec.patch
index af0edcd..68001d1 100644
--- a/upstart-save-state-across-reexec.patch
+++ b/upstart-save-state-across-reexec.patch
@@ -51,19 +51,6 @@ diff -uNr upstart-0.3.9.orig/init/main.c upstart-0.3.9/init/main.c
  	nih_error_raise_system ();
  
  	err = nih_error_get ();
-diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am
---- upstart-0.3.9.orig/init/Makefile.am	2009-01-23 13:44:32.000000000 -0500
-+++ upstart-0.3.9/init/Makefile.am	2009-01-23 13:44:54.000000000 -0500
-@@ -23,7 +23,8 @@
- 	event.c event.h \
- 	control.c control.h \
- 	notify.c notify.h \
--	cfgfile.c cfgfile.h
-+	cfgfile.c cfgfile.h \
-+	restore.c restore.h
- 
- init_LDFLAGS = -static
- init_LDADD = \
 diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
 --- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
 +++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500
diff --git a/upstart-telinit-u.patch b/upstart-telinit-u.patch
index 85dcfb3..4e39757 100644
--- a/upstart-telinit-u.patch
+++ b/upstart-telinit-u.patch
@@ -1,10 +1,13 @@
 diff -urN upstart-0.3.9-old/compat/sysv/telinit.c upstart-0.3.9/compat/sysv/telinit.c
 --- upstart-0.3.9-old/compat/sysv/telinit.c	2008-04-09 00:52:06.000000000 -0400
 +++ upstart-0.3.9/compat/sysv/telinit.c	2008-04-09 01:02:39.000000000 -0400
-@@ -113,6 +113,11 @@
+@@ -113,9 +113,11 @@
  				  NULL, UPSTART_INIT_DAEMON,
  				  UPSTART_EVENT_EMIT, "runlevel", args, NULL));
  		break;
+-	case 'u':
+-		kill (UPSTART_INIT_DAEMON, SIGTERM);
+-		exit (0);
 +	case 'u':
 +		NIH_MUST (message = upstart_message_new (
 +				  NULL, UPSTART_INIT_DAEMON,
diff --git a/upstart-tty-stack.patch b/upstart-tty-stack.patch
index 6658c32..271aff2 100644
--- a/upstart-tty-stack.patch
+++ b/upstart-tty-stack.patch
@@ -1,51 +1,6 @@
-=== modified file 'init/Makefile.am'
---- init/Makefile.am	2007-10-11 21:00:43 +0000
-+++ init/Makefile.am	2008-02-29 21:38:58 +0000
-@@ -16,6 +16,7 @@
- 
- init_SOURCES = \
- 	main.c \
-+	tty.c tty.h\
- 	errors.h paths.h \
- 	process.c process.h \
- 	job.c job.h \
-
-=== modified file 'init/Makefile.in'
---- init/Makefile.in	2008-03-02 23:21:30 +0000
-+++ init/Makefile.in	2008-02-29 21:39:16 +0000
-@@ -70,9 +70,9 @@
- am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
--am_init_OBJECTS = main.$(OBJEXT) process.$(OBJEXT) job.$(OBJEXT) \
--	event.$(OBJEXT) control.$(OBJEXT) notify.$(OBJEXT) \
--	cfgfile.$(OBJEXT)
-+am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
-+	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
-+	notify.$(OBJEXT) cfgfile.$(OBJEXT)
- init_OBJECTS = $(am_init_OBJECTS)
- am__DEPENDENCIES_1 =
- init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
-@@ -308,6 +308,7 @@
- 
- init_SOURCES = \
- 	main.c \
-+	tty.c tty.h\
- 	errors.h paths.h \
- 	process.c process.h \
- 	job.c job.h \
-@@ -468,6 +469,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notify.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-
-=== modified file 'init/control.c'
---- init/control.c	2007-03-13 17:25:34 +0000
-+++ init/control.c	2008-03-01 08:00:46 +0000
+diff -up init/control.c.old init/control.c
+--- init/control.c.old	2009-06-22 11:59:11.000000000 +0200
++++ init/control.c	2009-06-22 11:59:26.000000000 +0200
 @@ -43,6 +43,7 @@
  #include <upstart/message.h>
  
@@ -54,7 +9,7 @@
  #include "control.h"
  #include "notify.h"
  
-@@ -57,6 +58,11 @@
+@@ -57,6 +58,11 @@ static int  control_log_priority       (
  static int  control_job_find           (void *data, pid_t pid,
  					UpstartMessageType type,
  					const char *pattern);
@@ -66,7 +21,7 @@
  static int  control_job_query          (void *data, pid_t pid,
  					UpstartMessageType type,
  					const char *name, unsigned int id);
-@@ -96,6 +102,10 @@
+@@ -96,6 +102,10 @@ NihIo *control_io = NULL;
  static UpstartMessage message_handlers[] = {
  	{ -1, UPSTART_VERSION_QUERY,
  	  (UpstartMessageHandler)control_version_query },
@@ -77,7 +32,7 @@
  	{ -1, UPSTART_LOG_PRIORITY,
  	  (UpstartMessageHandler)control_log_priority },
  	{ -1, UPSTART_JOB_FIND,
-@@ -308,6 +318,66 @@
+@@ -308,6 +318,66 @@ control_send_instance (pid_t  pid,
  	nih_io_send_message (control_io, message);
  }
  
@@ -144,10 +99,9 @@
  
  /**
   * control_version_query:
-
-=== modified file 'init/main.c'
---- init/main.c	2007-03-13 19:13:19 +0000
-+++ init/main.c	2008-03-02 03:14:59 +0000
+diff -up init/main.c.old init/main.c
+--- init/main.c.old	2009-06-22 13:42:44.000000000 +0200
++++ init/main.c	2009-06-22 13:42:55.000000000 +0200
 @@ -58,6 +58,7 @@
  #include "control.h"
  #include "cfgfile.h"
@@ -156,7 +110,7 @@
  
  
  /* Prototypes for static functions */
-@@ -190,6 +191,8 @@
+@@ -190,6 +191,8 @@ main (int   argc,
  	if (! (restart || rescue))
  		reset_console ();
  
@@ -165,10 +119,41 @@
  	/* Set the PATH environment variable */
  	setenv ("PATH", PATH, TRUE);
  
-
-=== modified file 'init/process.c'
---- init/process.c	2007-10-11 21:08:38 +0000
-+++ init/process.c	2008-03-02 21:22:05 +0000
+diff -up init/Makefile.in.old init/Makefile.in
+--- init/Makefile.in.old	2009-06-22 11:56:34.000000000 +0200
++++ init/Makefile.in	2009-06-22 11:56:53.000000000 +0200
+@@ -72,9 +72,9 @@ am__EXEEXT_1 = test_process$(EXEEXT) tes
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_init_OBJECTS = main.$(OBJEXT) process.$(OBJEXT) job.$(OBJEXT) \
+-	event.$(OBJEXT) control.$(OBJEXT) notify.$(OBJEXT) \
+-	cfgfile.$(OBJEXT)
++am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
++	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
++	notify.$(OBJEXT) cfgfile.$(OBJEXT)
+ init_OBJECTS = $(am_init_OBJECTS)
+ am__DEPENDENCIES_1 =
+ init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
+@@ -314,6 +314,7 @@ dist_man_MANS = \
+ 
+ init_SOURCES = \
+ 	main.c \
++	tty.c tty.h\
+ 	errors.h paths.h \
+ 	process.c process.h \
+ 	job.c job.h \
+@@ -474,6 +475,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notify.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+diff -up init/process.c.old init/process.c
+--- init/process.c.old	2009-06-22 13:45:48.000000000 +0200
++++ init/process.c	2009-06-22 13:45:48.000000000 +0200
 @@ -51,6 +51,7 @@
  #include "job.h"
  #include "process.h"
@@ -177,7 +162,7 @@
  
  
  /* Prototypes for static functions */
-@@ -385,10 +386,11 @@
+@@ -385,10 +386,11 @@ process_setup_console (Job         *job,
  
  		break;
  
@@ -191,10 +176,9 @@
  
  	case CONSOLE_OWNER:
  		/* As CONSOLE_OUTPUT but with ^C, etc. sent */
-
-=== added file 'init/tty.c'
---- init/tty.c	1970-01-01 00:00:00 +0000
-+++ init/tty.c	2008-03-02 21:18:03 +0000
+diff -up init/tty.c.old init/tty.c
+--- init/tty.c.old	2009-06-22 13:45:48.000000000 +0200
++++ init/tty.c	2009-06-22 13:45:48.000000000 +0200
 @@ -0,0 +1,97 @@
 +/* upstart
 + *
@@ -293,10 +277,9 @@
 +	return current_tty ();
 +}
 +
-
-=== added file 'init/tty.h'
---- init/tty.h	1970-01-01 00:00:00 +0000
-+++ init/tty.h	2008-03-02 03:09:57 +0000
+diff -up init/tty.h.old init/tty.h
+--- init/tty.h.old	2009-06-22 13:45:48.000000000 +0200
++++ init/tty.h	2009-06-22 13:45:48.000000000 +0200
 @@ -0,0 +1,35 @@
 +/* upstart
 + *
@@ -333,20 +316,10 @@
 +NIH_END_EXTERN
 +
 +#endif /* INIT_TTY_H */
-
-=== modified file 'po/ca.po'
---- po/ca.po	2007-10-11 21:20:43 +0000
-+++ po/ca.po	2008-02-28 15:56:28 +0000
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: upstart\n"
- "Report-Msgid-Bugs-To: new@bugs.launchpad.net\n"
--"POT-Creation-Date: 2007-10-11 22:13+0100\n"
-+"POT-Creation-Date: 2008-02-28 10:56-0500\n"
- "PO-Revision-Date: 2006-09-18 16:07+0000\n"
- "Last-Translator: Jordi Mallach <jordi@canonical.com>\n"
- "Language-Team: Catalan <ca@li.org>\n"
-@@ -22,46 +22,46 @@
+diff -up po/ca.po.old po/ca.po
+--- po/ca.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/ca.po	2009-06-22 13:45:48.000000000 +0200
+@@ -22,46 +22,46 @@ msgstr ""
  msgid "display list of commands"
  msgstr "mostra aquesta ajuda i surt"
  
@@ -402,7 +375,7 @@
  #, c-format
  msgid "Commands:\n"
  msgstr ""
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ msgstr ""
  msgid "Unhandled Error"
  msgstr "Error no gestionat"
  
@@ -411,7 +384,7 @@
  msgid "Error while reading from descriptor"
  msgstr "S'ha produït un error en llegir del descriptor"
  
-@@ -101,60 +101,60 @@
+@@ -101,60 +101,60 @@ msgstr "mostra aquesta ajuda i surt"
  msgid "output version information and exit"
  msgstr "mostra la informació sobre la versió i surt"
  
@@ -484,7 +457,7 @@
  msgid "Unable to watch directory"
  msgstr ""
  
-@@ -300,82 +300,92 @@
+@@ -305,82 +305,92 @@ msgstr ""
  msgid "Deleting %s job"
  msgstr "S'està tornant a exiecutar %s"
  
@@ -593,16 +566,7 @@
  #, c-format
  msgid "Control request to unsubscribe %d from events"
  msgstr ""
-@@ -405,7 +415,7 @@
- msgid "%s state changed from %s to %s"
- msgstr ""
- 
--#: init/job.c:817 util/initctl.c:787
-+#: init/job.c:817 util/initctl.c:828
- #, c-format
- msgid "%s respawning too fast, stopped"
- msgstr ""
-@@ -480,7 +490,7 @@
+@@ -485,7 +495,7 @@ msgid ""
  "actually run /sbin/telinit."
  msgstr ""
  
@@ -611,227 +575,19 @@
  #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
  msgid "Need to be root"
  msgstr "Es necessita ser root"
-@@ -552,175 +562,180 @@
- msgid "Failed to open console: %s"
- msgstr ""
- 
--#: util/initctl.c:396 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
-+#: util/initctl.c:403 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
- #, c-format
- msgid "Unable to send message: %s"
- msgstr "No es pot enviar el missatge: %s"
- 
--#: util/initctl.c:447
-+#: util/initctl.c:454
- #, fuzzy, c-format
- msgid "Unable to receive message: %s"
- msgstr "No es pot enviar el missatge: %s"
- 
--#: util/initctl.c:464
-+#: util/initctl.c:471
- #, fuzzy, c-format
- msgid "Unable to handle message: %s"
- msgstr "No es pot enviar el missatge: %s"
- 
--#: util/initctl.c:534
-+#: util/initctl.c:541
- #, c-format
- msgid "%s (instance)"
- msgstr ""
- 
--#: util/initctl.c:605
-+#: util/initctl.c:612
- #, fuzzy, c-format
- msgid "%s, process %d"
- msgstr "Procés %s actiu (%d)"
- 
--#: util/initctl.c:607
-+#: util/initctl.c:614
- #, fuzzy, c-format
- msgid "%s, (main) process %d"
- msgstr "Procés %s actiu (%d)"
- 
--#: util/initctl.c:620
-+#: util/initctl.c:627
- #, fuzzy, c-format
- msgid "\t%s process %d"
- msgstr "Procés %s actiu (%d)"
- 
--#: util/initctl.c:731
-+#: util/initctl.c:772
- #, c-format
- msgid "%s: goal changed"
- msgstr ""
- 
--#: util/initctl.c:793
-+#: util/initctl.c:834
- #, fuzzy, c-format
- msgid "%s %s process killed by %s signal"
- msgstr "El procés %s (%d) ha estat mort pel senyal %d"
- 
--#: util/initctl.c:796
-+#: util/initctl.c:837
- #, fuzzy, c-format
- msgid "%s %s process killed by signal %d"
- msgstr "El procés %s (%d) ha estat mort pel senyal %d"
- 
--#: util/initctl.c:801
-+#: util/initctl.c:842
- #, fuzzy, c-format
- msgid "%s %s process terminated with status %d"
- msgstr "El procés %s (%d) ha finalitzat amb l'estat %d"
- 
--#: util/initctl.c:890
-+#: util/initctl.c:931
- #, c-format
- msgid "No jobs matching `%s'"
- msgstr ""
- 
--#: util/initctl.c:894
-+#: util/initctl.c:935
- msgid "No jobs registered"
- msgstr ""
- 
--#: util/initctl.c:1226
-+#: util/initctl.c:1267
- #, c-format
- msgid "Unknown job: %s"
- msgstr ""
- 
--#: util/initctl.c:1228
-+#: util/initctl.c:1269
- #, c-format
- msgid "Unknown job: #%d"
- msgstr ""
- 
--#: util/initctl.c:1271
-+#: util/initctl.c:1312
- #, fuzzy, c-format
- msgid "Invalid job: %s"
- msgstr "%s: l'opció és invàlida: --%s\n"
- 
--#: util/initctl.c:1314
-+#: util/initctl.c:1355
- #, c-format
- msgid "Job not changed: %s"
- msgstr ""
- 
--#: util/initctl.c:1462
-+#: util/initctl.c:1503
- #, c-format
- msgid "%s event failed"
- msgstr ""
- 
--#: util/initctl.c:1581 util/initctl.c:1618 util/initctl.c:1671
--#: util/initctl.c:1708 util/initctl.c:1761
-+#: util/initctl.c:1622 util/initctl.c:1659 util/initctl.c:1712
-+#: util/initctl.c:1749 util/initctl.c:1802
- #, fuzzy, c-format
- msgid "%s: invalid job id: %s\n"
- msgstr "%s: l'opció és invàlida: --%s\n"
- 
--#: util/initctl.c:1603 util/initctl.c:1693 util/initctl.c:1749
-+#: util/initctl.c:1644 util/initctl.c:1734 util/initctl.c:1790
- #, c-format
+@@ -657,6 +667,11 @@ msgstr "%s: l'opció és invàlida: --%s
  msgid "%s: missing job name\n"
  msgstr ""
  
--#: util/initctl.c:1826
-+#: util/initctl.c:1864 util/initctl.c:1895
++#: util/initctl.c:1889
 +#, fuzzy, c-format
 +msgid "%s: missing device name\n"
 +msgstr "%s: manca un argument: %s\n"
 +
-+#: util/initctl.c:1928
+ #: util/initctl.c:1826
  #, c-format
  msgid "%s: missing event name\n"
- msgstr ""
- 
--#: util/initctl.c:1930
-+#: util/initctl.c:2032
- #, fuzzy, c-format
- msgid "%s: missing priority\n"
- msgstr "%s: manca un argument: %s\n"
- 
--#: util/initctl.c:1948
-+#: util/initctl.c:2050
- #, fuzzy, c-format
- msgid "%s: invalid priority\n"
- msgstr "%s: l'opció és invàlida: -%c\n"
- 
--#: util/initctl.c:1967
-+#: util/initctl.c:2069
- msgid "destination process"
- msgstr ""
- 
--#: util/initctl.c:1980 util/initctl.c:1996 util/initctl.c:2012
-+#: util/initctl.c:2082 util/initctl.c:2098 util/initctl.c:2114
- msgid "arguments are job ids, instead of names"
- msgstr ""
- 
--#: util/initctl.c:1982 util/initctl.c:1998 util/initctl.c:2014
--#: util/initctl.c:2026 util/initctl.c:2054
-+#: util/initctl.c:2084 util/initctl.c:2100 util/initctl.c:2116
-+#: util/initctl.c:2128 util/initctl.c:2156
- msgid "show job ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:1984
-+#: util/initctl.c:2086
- msgid "do not wait for job to start before exiting"
- msgstr ""
- 
--#: util/initctl.c:2000
-+#: util/initctl.c:2102
- msgid "do not wait for job to stop before exiting"
- msgstr ""
- 
--#: util/initctl.c:2038
-+#: util/initctl.c:2140
- msgid "show job and event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2040
-+#: util/initctl.c:2142
- msgid "do not wait for event to finish before exiting"
- msgstr ""
- 
--#: util/initctl.c:2042
-+#: util/initctl.c:2144
- msgid "set environment variable in jobs changed by this event"
- msgstr ""
- 
--#: util/initctl.c:2066
-+#: util/initctl.c:2168
- msgid "show event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2096
-+#: util/initctl.c:2216
- msgid "Job"
- msgstr ""
- 
--#: util/initctl.c:2103
-+#: util/initctl.c:2223
- msgid "Event"
- msgstr ""
- 
--#: util/initctl.c:2111 util/initctl.c:2118 util/initctl.c:2125
-+#: util/initctl.c:2231 util/initctl.c:2238 util/initctl.c:2245
- msgid "JOB..."
- msgstr ""
- 
--#: util/initctl.c:2112
-+#: util/initctl.c:2232
- msgid "Start jobs."
- msgstr ""
- 
--#: util/initctl.c:2113
-+#: util/initctl.c:2233
- msgid ""
- "JOB is one or more job names that are to be started.\n"
- "\n"
-@@ -728,11 +743,11 @@
+@@ -733,11 +748,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -845,7 +601,7 @@
  msgid ""
  "JOB is one or more job names that are to be stopped.\n"
  "\n"
-@@ -740,11 +755,11 @@
+@@ -745,11 +760,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -859,7 +615,7 @@
  msgid ""
  "JOB is one or more job names that are to be queried.\n"
  "\n"
-@@ -752,19 +767,19 @@
+@@ -757,19 +772,19 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -883,7 +639,7 @@
  msgid ""
  "EVENT is the name of an event the init daemon should emit, which may have "
  "zero or more arguments specified by ARG.  These may be matched in the job "
-@@ -775,27 +790,35 @@
+@@ -780,27 +795,35 @@ msgid ""
  "taken from the environment or ignored if not present there."
  msgstr ""
  
@@ -925,20 +681,10 @@
  msgid ""
  "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
  "logged, equivalent to --debug on kernel command-line); `info' (messages "
-
-=== modified file 'po/fr.po'
---- po/fr.po	2007-10-11 21:20:43 +0000
-+++ po/fr.po	2008-02-28 15:56:29 +0000
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: upstart\n"
- "Report-Msgid-Bugs-To: new@bugs.launchpad.net\n"
--"POT-Creation-Date: 2007-10-11 22:13+0100\n"
-+"POT-Creation-Date: 2008-02-28 10:56-0500\n"
- "PO-Revision-Date: 2006-10-03 23:30+0000\n"
- "Last-Translator: Nicolas Velin <nsv@fr.st>\n"
- "Language-Team: French <fr@li.org>\n"
-@@ -22,46 +22,46 @@
+diff -up po/fr.po.old po/fr.po
+--- po/fr.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/fr.po	2009-06-22 13:45:48.000000000 +0200
+@@ -22,46 +22,46 @@ msgstr ""
  msgid "display list of commands"
  msgstr "afficher cette aide et quitter"
  
@@ -994,7 +740,7 @@
  #, c-format
  msgid "Commands:\n"
  msgstr ""
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ msgstr ""
  msgid "Unhandled Error"
  msgstr "Erreur non traitée"
  
@@ -1003,7 +749,7 @@
  #, fuzzy
  msgid "Error while reading from descriptor"
  msgstr "Erreur lors de la lecture du descripteur"
-@@ -106,60 +106,60 @@
+@@ -106,60 +106,60 @@ msgstr "afficher cette aide et quitter"
  msgid "output version information and exit"
  msgstr "affichage de l'information de version et sortie"
  
@@ -1076,7 +822,7 @@
  #, fuzzy
  msgid "Unable to watch directory"
  msgstr "Impossible d'accepter la connexion : %s"
-@@ -310,82 +310,92 @@
+@@ -315,82 +315,92 @@ msgstr "Impossible d'accepter la connexi
  msgid "Deleting %s job"
  msgstr "Ré-éxecution de %s"
  
@@ -1185,16 +931,7 @@
  #, fuzzy, c-format
  msgid "Control request to unsubscribe %d from events"
  msgstr "Demande de contrôle pour désinscrire %d des évènements"
-@@ -415,7 +425,7 @@
- msgid "%s state changed from %s to %s"
- msgstr "L'état de %s a été changé de %s à %s"
- 
--#: init/job.c:817 util/initctl.c:787
-+#: init/job.c:817 util/initctl.c:828
- #, fuzzy, c-format
- msgid "%s respawning too fast, stopped"
- msgstr "Résurection de %s trop rapide, arret"
-@@ -491,7 +501,7 @@
+@@ -496,7 +506,7 @@ msgid ""
  "actually run /sbin/telinit."
  msgstr ""
  
@@ -1203,227 +940,19 @@
  #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
  #, fuzzy
  msgid "Need to be root"
-@@ -567,175 +577,180 @@
- msgid "Failed to open console: %s"
- msgstr "Echec lors de l'ouverture de la console : %s"
- 
--#: util/initctl.c:396 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
-+#: util/initctl.c:403 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
- #, c-format
- msgid "Unable to send message: %s"
- msgstr "Impossible d'envoyer le message : %s"
- 
--#: util/initctl.c:447
-+#: util/initctl.c:454
- #, fuzzy, c-format
- msgid "Unable to receive message: %s"
- msgstr "Impossible d'envoyer le message : %s"
- 
--#: util/initctl.c:464
-+#: util/initctl.c:471
- #, fuzzy, c-format
- msgid "Unable to handle message: %s"
- msgstr "Impossible d'envoyer le message : %s"
- 
--#: util/initctl.c:534
-+#: util/initctl.c:541
- #, c-format
- msgid "%s (instance)"
- msgstr ""
- 
--#: util/initctl.c:605
-+#: util/initctl.c:612
- #, fuzzy, c-format
- msgid "%s, process %d"
- msgstr "processus %s (%d) actif"
- 
--#: util/initctl.c:607
-+#: util/initctl.c:614
- #, fuzzy, c-format
- msgid "%s, (main) process %d"
- msgstr "processus %s (%d) actif"
- 
--#: util/initctl.c:620
-+#: util/initctl.c:627
- #, fuzzy, c-format
- msgid "\t%s process %d"
- msgstr "processus %s (%d) actif"
- 
--#: util/initctl.c:731
-+#: util/initctl.c:772
- #, fuzzy, c-format
- msgid "%s: goal changed"
- msgstr "L'état de %s a été changé de %s à %s"
- 
--#: util/initctl.c:793
-+#: util/initctl.c:834
- #, fuzzy, c-format
- msgid "%s %s process killed by %s signal"
- msgstr "Le processus %s (%d) a été tué par le signal %d"
- 
--#: util/initctl.c:796
-+#: util/initctl.c:837
- #, fuzzy, c-format
- msgid "%s %s process killed by signal %d"
- msgstr "Le processus %s (%d) a été tué par le signal %d"
- 
--#: util/initctl.c:801
-+#: util/initctl.c:842
- #, fuzzy, c-format
- msgid "%s %s process terminated with status %d"
- msgstr "le processus %s (%d) s'est terminé en retournant %d"
- 
--#: util/initctl.c:890
-+#: util/initctl.c:931
- #, c-format
- msgid "No jobs matching `%s'"
- msgstr ""
- 
--#: util/initctl.c:894
-+#: util/initctl.c:935
- msgid "No jobs registered"
- msgstr ""
- 
--#: util/initctl.c:1226
-+#: util/initctl.c:1267
- #, fuzzy, c-format
- msgid "Unknown job: %s"
- msgstr "ignore la strophe inconnue"
- 
--#: util/initctl.c:1228
-+#: util/initctl.c:1269
- #, c-format
- msgid "Unknown job: #%d"
- msgstr ""
- 
--#: util/initctl.c:1271
-+#: util/initctl.c:1312
- #, fuzzy, c-format
- msgid "Invalid job: %s"
- msgstr "%s : option invalide : --%s\n"
- 
--#: util/initctl.c:1314
-+#: util/initctl.c:1355
- #, c-format
- msgid "Job not changed: %s"
- msgstr ""
- 
--#: util/initctl.c:1462
-+#: util/initctl.c:1503
- #, c-format
- msgid "%s event failed"
- msgstr ""
- 
--#: util/initctl.c:1581 util/initctl.c:1618 util/initctl.c:1671
--#: util/initctl.c:1708 util/initctl.c:1761
-+#: util/initctl.c:1622 util/initctl.c:1659 util/initctl.c:1712
-+#: util/initctl.c:1749 util/initctl.c:1802
- #, fuzzy, c-format
- msgid "%s: invalid job id: %s\n"
- msgstr "%s : option invalide : --%s\n"
- 
--#: util/initctl.c:1603 util/initctl.c:1693 util/initctl.c:1749
-+#: util/initctl.c:1644 util/initctl.c:1734 util/initctl.c:1790
- #, c-format
+@@ -672,6 +682,11 @@ msgstr "%s : option invalide : --%s\n"
  msgid "%s: missing job name\n"
  msgstr ""
  
--#: util/initctl.c:1826
-+#: util/initctl.c:1864 util/initctl.c:1895
++#: util/initctl.c:1889
 +#, fuzzy, c-format
 +msgid "%s: missing device name\n"
-+msgstr "%s : argument manquant : %s\n"
++msgstr "%s: argument manquant : %s\n"
 +
-+#: util/initctl.c:1928
+ #: util/initctl.c:1826
  #, c-format
  msgid "%s: missing event name\n"
- msgstr ""
- 
--#: util/initctl.c:1930
-+#: util/initctl.c:2032
- #, fuzzy, c-format
- msgid "%s: missing priority\n"
- msgstr "%s : argument manquant : %s\n"
- 
--#: util/initctl.c:1948
-+#: util/initctl.c:2050
- #, fuzzy, c-format
- msgid "%s: invalid priority\n"
- msgstr "%s: option ivalide: -%c\n"
- 
--#: util/initctl.c:1967
-+#: util/initctl.c:2069
- msgid "destination process"
- msgstr ""
- 
--#: util/initctl.c:1980 util/initctl.c:1996 util/initctl.c:2012
-+#: util/initctl.c:2082 util/initctl.c:2098 util/initctl.c:2114
- msgid "arguments are job ids, instead of names"
- msgstr ""
- 
--#: util/initctl.c:1982 util/initctl.c:1998 util/initctl.c:2014
--#: util/initctl.c:2026 util/initctl.c:2054
-+#: util/initctl.c:2084 util/initctl.c:2100 util/initctl.c:2116
-+#: util/initctl.c:2128 util/initctl.c:2156
- msgid "show job ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:1984
-+#: util/initctl.c:2086
- msgid "do not wait for job to start before exiting"
- msgstr ""
- 
--#: util/initctl.c:2000
-+#: util/initctl.c:2102
- msgid "do not wait for job to stop before exiting"
- msgstr ""
- 
--#: util/initctl.c:2038
-+#: util/initctl.c:2140
- msgid "show job and event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2040
-+#: util/initctl.c:2142
- msgid "do not wait for event to finish before exiting"
- msgstr ""
- 
--#: util/initctl.c:2042
-+#: util/initctl.c:2144
- msgid "set environment variable in jobs changed by this event"
- msgstr ""
- 
--#: util/initctl.c:2066
-+#: util/initctl.c:2168
- msgid "show event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2096
-+#: util/initctl.c:2216
- msgid "Job"
- msgstr ""
- 
--#: util/initctl.c:2103
-+#: util/initctl.c:2223
- msgid "Event"
- msgstr ""
- 
--#: util/initctl.c:2111 util/initctl.c:2118 util/initctl.c:2125
-+#: util/initctl.c:2231 util/initctl.c:2238 util/initctl.c:2245
- msgid "JOB..."
- msgstr ""
- 
--#: util/initctl.c:2112
-+#: util/initctl.c:2232
- msgid "Start jobs."
- msgstr ""
- 
--#: util/initctl.c:2113
-+#: util/initctl.c:2233
- msgid ""
- "JOB is one or more job names that are to be started.\n"
- "\n"
-@@ -743,11 +758,11 @@
+@@ -748,11 +763,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -1437,7 +966,7 @@
  msgid ""
  "JOB is one or more job names that are to be stopped.\n"
  "\n"
-@@ -755,11 +770,11 @@
+@@ -760,11 +775,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -1451,7 +980,7 @@
  msgid ""
  "JOB is one or more job names that are to be queried.\n"
  "\n"
-@@ -767,19 +782,19 @@
+@@ -772,19 +787,19 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -1475,7 +1004,7 @@
  msgid ""
  "EVENT is the name of an event the init daemon should emit, which may have "
  "zero or more arguments specified by ARG.  These may be matched in the job "
-@@ -790,27 +805,35 @@
+@@ -795,27 +810,35 @@ msgid ""
  "taken from the environment or ignored if not present there."
  msgstr ""
  
@@ -1517,20 +1046,10 @@
  msgid ""
  "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
  "logged, equivalent to --debug on kernel command-line); `info' (messages "
-
-=== modified file 'po/sv.po'
---- po/sv.po	2007-10-11 21:20:43 +0000
-+++ po/sv.po	2008-02-28 15:56:29 +0000
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: upstart\n"
- "Report-Msgid-Bugs-To: new@bugs.launchpad.net\n"
--"POT-Creation-Date: 2007-10-11 22:13+0100\n"
-+"POT-Creation-Date: 2008-02-28 10:56-0500\n"
- "PO-Revision-Date: 2006-10-05 05:38+0000\n"
- "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
- "Language-Team: Swedish <sv@li.org>\n"
-@@ -21,46 +21,46 @@
+diff -up po/sv.po.old po/sv.po
+--- po/sv.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/sv.po	2009-06-22 13:45:48.000000000 +0200
+@@ -21,46 +21,46 @@ msgstr ""
  msgid "display list of commands"
  msgstr ""
  
@@ -1586,7 +1105,7 @@
  #, c-format
  msgid "Commands:\n"
  msgstr ""
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ msgstr ""
  msgid "Unhandled Error"
  msgstr ""
  
@@ -1595,7 +1114,7 @@
  msgid "Error while reading from descriptor"
  msgstr ""
  
-@@ -100,60 +100,60 @@
+@@ -100,60 +100,60 @@ msgstr ""
  msgid "output version information and exit"
  msgstr ""
  
@@ -1629,15 +1148,13 @@
  msgid "%s: illegal argument: %s\n"
  msgstr ""
  
+-#: nih/option.c:862
 +#: nih/option.c:858
-+msgid "Usage"
-+msgstr ""
-+
- #: nih/option.c:862
--msgid "Usage"
--msgstr ""
--
+ msgid "Usage"
+ msgstr ""
+ 
 -#: nih/option.c:866
++#: nih/option.c:862
  msgid "[OPTION]..."
  msgstr ""
  
@@ -1670,7 +1187,7 @@
  msgid "Unable to watch directory"
  msgstr ""
  
-@@ -291,79 +291,87 @@
+@@ -295,79 +295,87 @@ msgstr ""
  msgid "Deleting %s job"
  msgstr ""
  
@@ -1774,16 +1291,7 @@
  #, c-format
  msgid "Control request to unsubscribe %d from events"
  msgstr ""
-@@ -393,7 +401,7 @@
- msgid "%s state changed from %s to %s"
- msgstr ""
- 
--#: init/job.c:817 util/initctl.c:787
-+#: init/job.c:817 util/initctl.c:828
- #, c-format
- msgid "%s respawning too fast, stopped"
- msgstr ""
-@@ -468,7 +476,7 @@
+@@ -472,7 +480,7 @@ msgid ""
  "actually run /sbin/telinit."
  msgstr ""
  
@@ -1792,227 +1300,19 @@
  #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
  msgid "Need to be root"
  msgstr ""
-@@ -538,175 +546,180 @@
- msgid "Failed to open console: %s"
- msgstr ""
- 
--#: util/initctl.c:396 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
-+#: util/initctl.c:403 compat/sysv/shutdown.c:513 compat/sysv/telinit.c:138
- #, c-format
- msgid "Unable to send message: %s"
- msgstr ""
- 
--#: util/initctl.c:447
-+#: util/initctl.c:454
- #, c-format
- msgid "Unable to receive message: %s"
- msgstr ""
- 
--#: util/initctl.c:464
-+#: util/initctl.c:471
- #, c-format
- msgid "Unable to handle message: %s"
- msgstr ""
- 
--#: util/initctl.c:534
-+#: util/initctl.c:541
- #, c-format
- msgid "%s (instance)"
- msgstr ""
- 
--#: util/initctl.c:605
-+#: util/initctl.c:612
- #, c-format
- msgid "%s, process %d"
- msgstr ""
- 
--#: util/initctl.c:607
-+#: util/initctl.c:614
- #, c-format
- msgid "%s, (main) process %d"
- msgstr ""
- 
--#: util/initctl.c:620
-+#: util/initctl.c:627
- #, c-format
- msgid "\t%s process %d"
- msgstr ""
- 
--#: util/initctl.c:731
-+#: util/initctl.c:772
- #, c-format
- msgid "%s: goal changed"
- msgstr ""
- 
--#: util/initctl.c:793
-+#: util/initctl.c:834
- #, c-format
- msgid "%s %s process killed by %s signal"
- msgstr ""
- 
--#: util/initctl.c:796
-+#: util/initctl.c:837
- #, c-format
- msgid "%s %s process killed by signal %d"
- msgstr ""
- 
--#: util/initctl.c:801
-+#: util/initctl.c:842
- #, c-format
- msgid "%s %s process terminated with status %d"
- msgstr ""
- 
--#: util/initctl.c:890
-+#: util/initctl.c:931
- #, c-format
- msgid "No jobs matching `%s'"
- msgstr ""
- 
--#: util/initctl.c:894
-+#: util/initctl.c:935
- msgid "No jobs registered"
- msgstr ""
- 
--#: util/initctl.c:1226
-+#: util/initctl.c:1267
- #, c-format
- msgid "Unknown job: %s"
- msgstr ""
- 
--#: util/initctl.c:1228
-+#: util/initctl.c:1269
- #, c-format
- msgid "Unknown job: #%d"
- msgstr ""
- 
--#: util/initctl.c:1271
-+#: util/initctl.c:1312
- #, c-format
- msgid "Invalid job: %s"
- msgstr ""
- 
--#: util/initctl.c:1314
-+#: util/initctl.c:1355
- #, c-format
- msgid "Job not changed: %s"
- msgstr ""
- 
--#: util/initctl.c:1462
-+#: util/initctl.c:1503
- #, c-format
- msgid "%s event failed"
- msgstr ""
- 
--#: util/initctl.c:1581 util/initctl.c:1618 util/initctl.c:1671
--#: util/initctl.c:1708 util/initctl.c:1761
-+#: util/initctl.c:1622 util/initctl.c:1659 util/initctl.c:1712
-+#: util/initctl.c:1749 util/initctl.c:1802
- #, c-format
- msgid "%s: invalid job id: %s\n"
- msgstr ""
- 
--#: util/initctl.c:1603 util/initctl.c:1693 util/initctl.c:1749
-+#: util/initctl.c:1644 util/initctl.c:1734 util/initctl.c:1790
- #, c-format
+@@ -642,6 +650,11 @@ msgstr ""
  msgid "%s: missing job name\n"
  msgstr ""
  
--#: util/initctl.c:1826
-+#: util/initctl.c:1864 util/initctl.c:1895
-+#, c-format
++#: util/initctl.c:1889
++#, fuzzy, c-format
 +msgid "%s: missing device name\n"
 +msgstr ""
 +
-+#: util/initctl.c:1928
+ #: util/initctl.c:1826
  #, c-format
  msgid "%s: missing event name\n"
- msgstr ""
- 
--#: util/initctl.c:1930
-+#: util/initctl.c:2032
- #, c-format
- msgid "%s: missing priority\n"
- msgstr ""
- 
--#: util/initctl.c:1948
-+#: util/initctl.c:2050
- #, c-format
- msgid "%s: invalid priority\n"
- msgstr ""
- 
--#: util/initctl.c:1967
-+#: util/initctl.c:2069
- msgid "destination process"
- msgstr ""
- 
--#: util/initctl.c:1980 util/initctl.c:1996 util/initctl.c:2012
-+#: util/initctl.c:2082 util/initctl.c:2098 util/initctl.c:2114
- msgid "arguments are job ids, instead of names"
- msgstr ""
- 
--#: util/initctl.c:1982 util/initctl.c:1998 util/initctl.c:2014
--#: util/initctl.c:2026 util/initctl.c:2054
-+#: util/initctl.c:2084 util/initctl.c:2100 util/initctl.c:2116
-+#: util/initctl.c:2128 util/initctl.c:2156
- msgid "show job ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:1984
-+#: util/initctl.c:2086
- msgid "do not wait for job to start before exiting"
- msgstr ""
- 
--#: util/initctl.c:2000
-+#: util/initctl.c:2102
- msgid "do not wait for job to stop before exiting"
- msgstr ""
- 
--#: util/initctl.c:2038
-+#: util/initctl.c:2140
- msgid "show job and event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2040
-+#: util/initctl.c:2142
- msgid "do not wait for event to finish before exiting"
- msgstr ""
- 
--#: util/initctl.c:2042
-+#: util/initctl.c:2144
- msgid "set environment variable in jobs changed by this event"
- msgstr ""
- 
--#: util/initctl.c:2066
-+#: util/initctl.c:2168
- msgid "show event ids, as well as names"
- msgstr ""
- 
--#: util/initctl.c:2096
-+#: util/initctl.c:2216
- msgid "Job"
- msgstr ""
- 
--#: util/initctl.c:2103
-+#: util/initctl.c:2223
- msgid "Event"
- msgstr ""
- 
--#: util/initctl.c:2111 util/initctl.c:2118 util/initctl.c:2125
-+#: util/initctl.c:2231 util/initctl.c:2238 util/initctl.c:2245
- msgid "JOB..."
- msgstr ""
- 
--#: util/initctl.c:2112
-+#: util/initctl.c:2232
- msgid "Start jobs."
- msgstr ""
- 
--#: util/initctl.c:2113
-+#: util/initctl.c:2233
- msgid ""
- "JOB is one or more job names that are to be started.\n"
- "\n"
-@@ -714,11 +727,11 @@
+@@ -718,11 +731,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -2026,7 +1326,7 @@
  msgid ""
  "JOB is one or more job names that are to be stopped.\n"
  "\n"
-@@ -726,11 +739,11 @@
+@@ -730,11 +743,11 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -2040,7 +1340,7 @@
  msgid ""
  "JOB is one or more job names that are to be queried.\n"
  "\n"
-@@ -738,19 +751,19 @@
+@@ -742,19 +755,19 @@ msgid ""
  "uniquely identifying a particular instance of a job."
  msgstr ""
  
@@ -2064,7 +1364,7 @@
  msgid ""
  "EVENT is the name of an event the init daemon should emit, which may have "
  "zero or more arguments specified by ARG.  These may be matched in the job "
-@@ -761,27 +774,35 @@
+@@ -765,27 +778,35 @@ msgid ""
  "taken from the environment or ignored if not present there."
  msgstr ""
  
@@ -2106,11 +1406,10 @@
  msgid ""
  "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
  "logged, equivalent to --debug on kernel command-line); `info' (messages "
-
-=== modified file 'upstart/message.c'
---- upstart/message.c	2007-03-16 17:18:00 +0000
-+++ upstart/message.c	2008-02-29 03:13:11 +0000
-@@ -261,6 +261,20 @@
+diff -up upstart/message.c.old upstart/message.c
+--- upstart/message.c.old	2009-06-22 13:45:48.000000000 +0200
++++ upstart/message.c	2009-06-22 13:45:48.000000000 +0200
+@@ -261,6 +261,20 @@ upstart_message_newv (const void        
  		break;
  	case UPSTART_VERSION_QUERY:
  		break;
@@ -2131,7 +1430,7 @@
  	case UPSTART_LOG_PRIORITY:
  		if (upstart_push_packv (message, "u", args_copy))
  			goto error;
-@@ -550,6 +564,9 @@
+@@ -550,6 +564,9 @@ upstart_message_handle (const void     *
  	case UPSTART_VERSION_QUERY:
  		ret = handler (data, cred.pid, type);
  		break;
@@ -2141,7 +1440,7 @@
  	case UPSTART_LOG_PRIORITY: {
  		NihLogLevel priority;
  
-@@ -559,6 +576,41 @@
+@@ -559,6 +576,41 @@ upstart_message_handle (const void     *
  		ret = handler (data, cred.pid, type, priority);
  		break;
  	}
@@ -2183,11 +1482,10 @@
  	case UPSTART_VERSION: {
  		char *version = NULL;
  
-
-=== modified file 'upstart/message.h'
---- upstart/message.h	2007-03-13 17:27:09 +0000
-+++ upstart/message.h	2008-02-28 04:52:36 +0000
-@@ -57,11 +57,20 @@
+diff -up upstart/message.h.old upstart/message.h
+--- upstart/message.h.old	2009-06-22 13:45:48.000000000 +0200
++++ upstart/message.h	2009-06-22 13:45:48.000000000 +0200
+@@ -57,11 +57,20 @@ typedef enum upstart_message_type {
  	 * UPSTART_VERSION message in reply.
  	 *
  	 * Clients may send UPSTART_LOG_PRIORITY, without any reply.
@@ -2208,11 +1506,10 @@
  
  	/* Job requests and responses.
  	 *
-
-=== modified file 'util/initctl.c'
---- util/initctl.c	2007-03-13 18:08:31 +0000
-+++ util/initctl.c	2008-03-02 21:05:23 +0000
-@@ -99,6 +99,9 @@
+diff -up util/initctl.c.old util/initctl.c
+--- util/initctl.c.old	2009-06-22 13:45:48.000000000 +0200
++++ util/initctl.c	2009-06-22 13:45:48.000000000 +0200
+@@ -99,6 +99,9 @@ static void  job_info_output (const JobI
  static char *output_name     (unsigned int id, const char *name);
  
  /* Prototypes of response handler functions */
@@ -2222,7 +1519,7 @@
  static int handle_version          (void *data, pid_t pid,
  				    UpstartMessageType type,
  				    const char *version);
-@@ -159,6 +162,8 @@
+@@ -159,6 +162,8 @@ static int  handle_unknown_message (void
  
  /* Prototypes for option and command functions */
  int env_option          (NihOption *option, const char *arg);
@@ -2231,7 +1528,7 @@
  int start_action        (NihCommand *command, char * const *args);
  int stop_action         (NihCommand *command, char * const *args);
  int status_action       (NihCommand *command, char * const *args);
-@@ -296,6 +301,8 @@
+@@ -296,6 +301,8 @@ static UpstartMessage handlers[] = {
  	{ -1, UPSTART_VERSION,
  	  (UpstartMessageHandler)handle_version },
  
@@ -2240,7 +1537,7 @@
  	{ -1, UPSTART_JOB,
  	  (UpstartMessageHandler)handle_job },
  	{ -1, UPSTART_JOB_FINISHED,
-@@ -687,6 +694,40 @@
+@@ -687,6 +694,40 @@ handle_version (void               *data
  }
  
  /**
@@ -2281,7 +1578,7 @@
   * handle_job:
   * @data: data passed to handler,
   * @pid: origin of message,
-@@ -1802,6 +1843,61 @@
+@@ -1802,6 +1843,61 @@ list_action (NihCommand   *command,
  }
  
  /**
@@ -2343,7 +1640,7 @@
   * emit_action:
   * @command: NihCommand invoked,
   * @args: command-line arguments.
-@@ -2079,6 +2175,24 @@
+@@ -2079,6 +2175,24 @@ NihOption version_options[] = {
  };
  
  /**
@@ -2368,7 +1665,7 @@
   * log_priority_options:
   *
   * Command-line options accepted for the log-priority command.
-@@ -2156,6 +2270,16 @@
+@@ -2156,6 +2270,16 @@ static NihCommand commands[] = {
  	  NULL,
  	  &event_commands, events_options, events_action },
  
@@ -2385,4 +1682,3 @@
  	{ "version", NULL,
  	  N_("Request the version of the init daemon."),
  	  NULL,
-
diff --git a/upstart.spec b/upstart.spec
index 7058095..fe0e618 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -1,6 +1,6 @@
 Name:           upstart
-Version:        0.3.9
-Release:        23%{?dist}
+Version:        0.3.11
+Release:        1%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -8,18 +8,17 @@ License:        GPLv2+
 URL:            http://upstart.ubuntu.com
 Source0:        http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2
 Source1:	events.5
-Patch0:         upstart-gcc43.patch
-Patch1:         upstart-force-on-shutdown-reboot.patch
-Patch2:         upstart-tty-stack.patch
-Patch3:         upstart-rpm.patch
-Patch4:         upstart-fedora-buglist.patch
-Patch5:         upstart-telinit-u.patch
-Patch6:	        upstart-initctl-man.patch
-Patch7:		upstart-save-state-across-reexec.patch
+Patch0:         upstart-force-on-shutdown-reboot.patch
+Patch1:         upstart-tty-stack.patch
+Patch2:         upstart-fedora-buglist.patch
+Patch3:         upstart-telinit-u.patch
+Patch4:	        upstart-initctl-man.patch
+Patch5:		upstart-save-state-across-reexec.patch
+Patch6:		upstart-audit-events.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
-BuildRequires:  gettext
+BuildRequires:  gettext audit-libs-devel
 
 %description
 Upstart is an event-based replacement for the /sbin/init daemon which
@@ -29,13 +28,12 @@ during shutdown and supervising them while the system is running.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2
-%patch3
+%patch1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +99,12 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Wed Jul 22 2009 Petr Lautrbach <plautrba@redhat.com> - 0.3.11-1
+- Update to 0.3.11
+
+* Mon Apr 27 2009 Bill Nottingham <notting@redhat.com> - 0.3.9-24
+- Apply the audit patch correctly (#470661)
+
 * Fri Apr 3 2009 Casey Dahlin <cdahlin@redhat.com> - 0.3.9-23
 - Add audit events patch from Steve Grubb <sgrubb@redhat.com> (Bug #470661)