dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-upstart-0.3.9.tar.bz2

.gitignore

@@ -0,0 +1 @@
+upstart-0.3.11.tar.bz2

Makefile

@@ -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)

sources

@@ -1 +1 @@
-794208083d405ece123ad59a02f3e233  upstart-0.3.9.tar.bz2
+a9e475e1458c876add0441d9d4cfe9c0  upstart-0.3.11.tar.bz2

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)

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])

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 .
  

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

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,

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)