rpms/upstart/F-11 upstart-audit-events.patch, 1.1, 1.2 upstart-fedora-buglist.patch, 1.1, 1.2 upstart-save-state-across-reexec.patch, 1.1, 1.2 upstart-tty-stack.patch, 1.2, 1.3 upstart.spec, 1.29, 1.30
Bill Nottingham
notting at fedoraproject.org
Mon Apr 27 20:07:30 UTC 2009
- Previous message (by thread): rpms/logjam/devel logjam.spec,1.53,1.54
- Next message (by thread): rpms/upstart/devel upstart-audit-events.patch, 1.1, 1.2 upstart-fedora-buglist.patch, 1.1, 1.2 upstart-save-state-across-reexec.patch, 1.1, 1.2 upstart-tty-stack.patch, 1.2, 1.3 upstart.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: notting
Update of /cvs/extras/rpms/upstart/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24841
Modified Files:
upstart-audit-events.patch upstart-fedora-buglist.patch
upstart-save-state-across-reexec.patch upstart-tty-stack.patch
upstart.spec
Log Message:
Apply the audit patch correctly (#470661)
Also, rediff/rework everything else, so we don't end up re-running the
autotools, which only causes pain.
upstart-audit-events.patch:
Index: upstart-audit-events.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-audit-events.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-audit-events.patch 3 Apr 2009 23:32:49 -0000 1.1
+++ upstart-audit-events.patch 27 Apr 2009 20:06:59 -0000 1.2
@@ -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 @@
#include <string.h>
#include <unistd.h>
#include <utmp.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
+#include <libaudit.h>
+#endif
@@ -63,7 +39,7 @@
+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 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
+#include <libaudit.h>
+#endif
@@ -128,7 +104,7 @@
+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 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-+#ifdef HAVE_LIBAUDIT
++#if 1 /* HAVE_LIBAUDIT */
+#include <libaudit.h>
+#endif
@@ -173,7 +149,7 @@
+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 @@
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 at 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:
Index: upstart-fedora-buglist.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-fedora-buglist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-fedora-buglist.patch 3 Apr 2008 15:30:44 -0000 1.1
+++ upstart-fedora-buglist.patch 27 Apr 2009 20:06:59 -0000 1.2
@@ -19,15 +19,3 @@
_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 at lists.ubuntu.com])
-+AC_INIT([upstart], [0.3.9], [fedora-devel-list at redhat.com])
- AC_COPYRIGHT([[Copyright © 2007 Canonical Ltd.]])
- AC_CONFIG_SRCDIR([init/main.c])
- AC_CONFIG_MACRO_DIR([m4])
upstart-save-state-across-reexec.patch:
Index: upstart-save-state-across-reexec.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-save-state-across-reexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-save-state-across-reexec.patch 7 Mar 2009 23:32:31 -0000 1.1
+++ upstart-save-state-across-reexec.patch 27 Apr 2009 20:06:59 -0000 1.2
@@ -51,19 +51,6 @@
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-tty-stack.patch:
Index: upstart-tty-stack.patch
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart-tty-stack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upstart-tty-stack.patch 2 Mar 2008 23:29:26 -0000 1.2
+++ upstart-tty-stack.patch 27 Apr 2009 20:06:59 -0000 1.3
@@ -1,15 +1,3 @@
-=== 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
Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-11/upstart.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- upstart.spec 3 Apr 2009 23:32:49 -0000 1.29
+++ upstart.spec 27 Apr 2009 20:06:59 -0000 1.30
@@ -1,6 +1,6 @@
Name: upstart
Version: 0.3.9
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: An event-driven init system
Group: System Environment/Base
@@ -16,10 +16,11 @@
Patch5: upstart-telinit-u.patch
Patch6: upstart-initctl-man.patch
Patch7: upstart-save-state-across-reexec.patch
+Patch8: 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
@@ -36,6 +37,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
%configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -101,6 +103,9 @@
%{_mandir}/man8/telinit.8.gz
%changelog
+* Mon Apr 27 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-24
+- Apply the audit patch correctly (#470661)
+
* Fri Apr 3 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-23
- Add audit events patch from Steve Grubb <sgrubb at redhat.com> (Bug #470661)
- Previous message (by thread): rpms/logjam/devel logjam.spec,1.53,1.54
- Next message (by thread): rpms/upstart/devel upstart-audit-events.patch, 1.1, 1.2 upstart-fedora-buglist.patch, 1.1, 1.2 upstart-save-state-across-reexec.patch, 1.1, 1.2 upstart-tty-stack.patch, 1.2, 1.3 upstart.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list