Hello community,
here is the log from the commit of package upstart for openSUSE:Factory
checked in at Fri Mar 19 10:04:22 CET 2010.
--------
--- upstart/upstart.changes 2010-03-03 14:21:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/upstart/upstart.changes 2010-03-12 11:58:30.000000000 +0100
@@ -1,0 +2,27 @@
+Fri Mar 12 10:58:20 UTC 2010 - coolo@novell.com
+
+- source the initrd exports
+
+-------------------------------------------------------------------
+Fri Mar 12 09:07:39 UTC 2010 - coolo@novell.com
+
+- update to 0.6.5 "Our last, best hope for victory"
+
+ * Since libnih has been separated out into its own project, Upstart
+ no longer includes its source and now uses the installed version by
+ default.
+ * There is a new initctl "reload" command, with matching
+ /sbin/reload symlink. This sends the SIGHUP signal to the running
+ main process of the named job instance.
+ * Event operator matches in jobs now support "!=" in addition to the
+ usual "=", e.g. start on net-device-added INTERFACE!=eth*
+ * Moved D-Bus system bus reconnection trigger from SIGHUP to SIGUSR1,
+ since SIGHUP is already used for a forced configuration reload and
+ causes Upstart to "forget" state.
+ * Fixed bug where the default runlevel would be lost when an
+ /etc/inittab file exists without an initdefault line.
+ * Fixed "Unhandled error" message from shutdown.
+ * No longer holds /dev/console open, so the SAK SysRq key will not
+ kill Upstart.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
upstart-0.6.3.tar.bz2
upstart-nih-alloc.patch
upstart-usr1-handler.patch
New:
----
upstart-0.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ upstart.spec ++++++
--- /var/tmp/diff_new_pack.2KS9ii/_old 2010-03-19 10:03:44.000000000 +0100
+++ /var/tmp/diff_new_pack.2KS9ii/_new 2010-03-19 10:03:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package upstart (Version 0.6.3)
+# spec file for package upstart (Version 0.6.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,8 +18,8 @@
Name: upstart
-Version: 0.6.3
-Release: 3
+Version: 0.6.5
+Release: 1
Summary: An event-driven init system
Group: System/Boot
License: GPLv2 and LGPLv2+
@@ -29,18 +29,13 @@
Patch0: upstart-remove-tests.patch
Patch1: upstart-telinit.patch
Patch2: upstart-audit-events.patch
-# pulled from https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/436758
-# sparc specific allignment errors
-Patch3: upstart-nih-alloc.patch
-# SIGUSR1 handler - connect to system dbus
-Patch4: upstart-usr1-handler.patch
Patch5: upstart-fix-decl.diff
Patch6: scripts.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: sysvinit
Provides: sbin_init
BuildRequires: audit-devel gettext libexpat-devel
-BuildRequires: dbus-1-devel >= 1.2.16 pkg-config
+BuildRequires: dbus-1-devel >= 1.2.16 libnih-devel pkg-config
Requires: sysvinit-tools
%description
@@ -53,14 +48,12 @@
%patch0 -p1 -b .tests
%patch1 -p1 -b .u
%patch2 -p1 -b .audit
-%patch3 -p1 -b .alignment
-%patch4 -p1 -b .usr1
%patch5 -p1
%patch6 -p1
%build
%configure --sbindir=/sbin --libdir=/%{_lib}
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
%install
rm -rf %{buildroot}
@@ -99,6 +92,7 @@
/sbin/poweroff
/sbin/reboot
/sbin/runlevel
+/sbin/reload
/sbin/shutdown
/sbin/start
/sbin/status
@@ -129,5 +123,6 @@
%{_mandir}/man8/status.8.gz
%{_mandir}/man8/stop.8.gz
%{_mandir}/man8/telinit.8.gz
+%{_mandir}/man8/reload.8.gz
%changelog
++++++ scripts.diff ++++++
--- /var/tmp/diff_new_pack.2KS9ii/_old 2010-03-19 10:03:44.000000000 +0100
+++ /var/tmp/diff_new_pack.2KS9ii/_new 2010-03-19 10:03:44.000000000 +0100
@@ -1,8 +1,8 @@
-Index: upstart-0.6.3/conf/control-alt-delete.conf
+Index: upstart-0.6.5/conf/control-alt-delete.conf
===================================================================
---- upstart-0.6.3.orig/conf/control-alt-delete.conf 2010-02-11 11:48:21.000000000 +0100
-+++ upstart-0.6.3/conf/control-alt-delete.conf 2010-02-11 11:55:00.000000000 +0100
-@@ -1,12 +1,8 @@
+--- upstart-0.6.5.orig/conf/control-alt-delete.conf 2010-03-11 18:10:09.000000000 +0100
++++ upstart-0.6.5/conf/control-alt-delete.conf 2010-03-12 11:49:04.000000000 +0100
+@@ -1,12 +1,9 @@
# control-alt-delete - emergency keypress handling
#
# This task is run whenever the Control-Alt-Delete key combination is
@@ -14,13 +14,13 @@
start on control-alt-delete
--task
+ task
-exec shutdown -r now "Control-Alt-Delete pressed"
+exec /sbin/shutdown -r now "Control-Alt-Delete pressed"
-Index: upstart-0.6.3/conf/rc.conf
+Index: upstart-0.6.5/conf/rc.conf
===================================================================
---- upstart-0.6.3.orig/conf/rc.conf 2010-02-11 11:48:21.000000000 +0100
-+++ upstart-0.6.3/conf/rc.conf 2010-02-11 11:55:00.000000000 +0100
+--- upstart-0.6.5.orig/conf/rc.conf 2010-03-11 18:10:09.000000000 +0100
++++ upstart-0.6.5/conf/rc.conf 2010-03-11 20:25:21.000000000 +0100
@@ -1,18 +1,15 @@
# rc - System V runlevel compatibility
#
@@ -45,11 +45,11 @@
+export PREVLEVEL
console output
exec /etc/init.d/rc $RUNLEVEL
-Index: upstart-0.6.3/conf/rcS.conf
+Index: upstart-0.6.5/conf/rcS.conf
===================================================================
---- upstart-0.6.3.orig/conf/rcS.conf 2010-02-11 11:48:21.000000000 +0100
-+++ upstart-0.6.3/conf/rcS.conf 2010-02-11 11:55:00.000000000 +0100
-@@ -1,26 +1,28 @@
+--- upstart-0.6.5.orig/conf/rcS.conf 2010-03-11 18:10:09.000000000 +0100
++++ upstart-0.6.5/conf/rcS.conf 2010-03-12 12:11:02.000000000 +0100
+@@ -1,26 +1,35 @@
-# rcS - System V single-user mode compatibility
+# rcS - runlevel compatibility
#
@@ -70,21 +70,28 @@
-exec /sbin/sulogin
+task
-+# Note: there can be no previous runlevel here, if we have one it's bad
-+# information (we enter rc1 not rcS for maintenance). Run /etc/rc.d/rc
-+# without information so that it defaults to previous=N runlevel=S.
-+console output
-+exec /etc/init.d/boot
- post-stop script
+-post-stop script
- # Don't switch runlevels if we were stopped by an event, since that
- # means we're already switching runlevels
- if [ -n "${UPSTART_STOP_EVENTS}" ]
- then
- exit 0
- fi
--
++# Note: there can be no previous runlevel here, if we have one it's bad
++# information (we enter rc1 not rcS for maintenance). Run /etc/rc.d/rc
++# without information so that it defaults to previous=N runlevel=S.
++console output
++
++script
++ if [ -f /dev/shm/initrd_exports.sh ]; then
++ . /dev/shm/initrd_exports.sh
++ fi
++ /etc/init.d/boot
++end script
+
- # Switch, passing a magic flag
- start --no-wait rc-sysinit FROM_SINGLE_USER_MODE=y
++post-stop script
+ if [ "$UPSTART_EVENTS" = "startup" ]; then
+ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab)
+ [ -z "$runlevel" ] && runlevel="3"
@@ -97,19 +104,19 @@
+ exec telinit $runlevel
+ fi
end script
-Index: upstart-0.6.3/conf/reload-init.conf
+Index: upstart-0.6.5/conf/reload-init.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.3/conf/reload-init.conf 2010-02-11 11:55:00.000000000 +0100
++++ upstart-0.6.5/conf/reload-init.conf 2010-03-06 13:21:06.000000000 +0100
@@ -0,0 +1,4 @@
+start on started messagebus
+
+task
+exec /bin/kill -HUP 1
-Index: upstart-0.6.3/conf/start-ttys.conf
+Index: upstart-0.6.5/conf/start-ttys.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.3/conf/start-ttys.conf 2010-02-11 15:19:26.000000000 +0100
++++ upstart-0.6.5/conf/start-ttys.conf 2010-03-06 13:21:06.000000000 +0100
@@ -0,0 +1,18 @@
+#
+# This service starts the configured number of gettys.
@@ -129,10 +136,10 @@
+ fi
+ done
+end script
-Index: upstart-0.6.3/conf/tty.conf
+Index: upstart-0.6.5/conf/tty.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.3/conf/tty.conf 2010-02-11 15:18:31.000000000 +0100
++++ upstart-0.6.5/conf/tty.conf 2010-03-06 13:21:06.000000000 +0100
@@ -0,0 +1,9 @@
+# tty - getty
+#
@@ -143,10 +150,10 @@
+respawn
+instance $TTY
+exec /sbin/mingetty $OPTS $TTY
-Index: upstart-0.6.3/conf/Makefile.am
+Index: upstart-0.6.5/conf/Makefile.am
===================================================================
---- upstart-0.6.3.orig/conf/Makefile.am 2010-02-11 11:56:01.000000000 +0100
-+++ upstart-0.6.3/conf/Makefile.am 2010-02-12 07:26:19.000000000 +0100
+--- upstart-0.6.5.orig/conf/Makefile.am 2010-03-11 18:10:09.000000000 +0100
++++ upstart-0.6.5/conf/Makefile.am 2010-03-12 11:52:58.000000000 +0100
@@ -5,4 +5,8 @@ dist_init_DATA = \
rc-sysinit.conf \
rc.conf \
@@ -157,11 +164,11 @@
+ reload-init.conf \
+ start-ttys.conf \
+ tty.conf
-Index: upstart-0.6.3/conf/Makefile.in
+Index: upstart-0.6.5/conf/Makefile.in
===================================================================
---- upstart-0.6.3.orig/conf/Makefile.in 2010-02-11 11:46:02.000000000 +0100
-+++ upstart-0.6.3/conf/Makefile.in 2010-02-12 07:26:11.000000000 +0100
-@@ -237,7 +237,12 @@ dist_init_DATA = \
+--- upstart-0.6.5.orig/conf/Makefile.in 2010-03-11 18:10:09.000000000 +0100
++++ upstart-0.6.5/conf/Makefile.in 2010-03-12 11:53:04.000000000 +0100
+@@ -269,7 +269,12 @@ dist_init_DATA = \
rc-sysinit.conf \
rc.conf \
rcS.conf \
@@ -175,10 +182,10 @@
all: all-am
-Index: upstart-0.6.3/conf/rcS-sulogin.conf
+Index: upstart-0.6.5/conf/rcS-sulogin.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.3/conf/rcS-sulogin.conf 2010-02-12 07:25:47.000000000 +0100
++++ upstart-0.6.5/conf/rcS-sulogin.conf 2010-03-06 13:21:06.000000000 +0100
@@ -0,0 +1,21 @@
+# rcS-sulogin - "single-user" runlevel compatibility
+#
@@ -201,3 +208,27 @@
+ fi
+end script
+
+Index: upstart-0.6.5/conf/rc-sysinit.conf
+===================================================================
+--- upstart-0.6.5.orig/conf/rc-sysinit.conf 2010-02-04 04:58:39.000000000 +0100
++++ upstart-0.6.5/conf/rc-sysinit.conf 2010-03-12 12:11:32.000000000 +0100
+@@ -25,6 +25,10 @@ task
+
+ console owner
+ script
++ if [ -f /dev/shm/initrd_exports.sh ]; then
++ . /dev/shm/initrd_exports.sh
++ fi
++
+ # Check for default runlevel in /etc/inittab
+ if [ -r /etc/inittab ]
+ then
+@@ -51,7 +55,7 @@ script
+ done
+
+ # Run the system initialisation scripts
+- [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/rcS
++ [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/boot
+
+ # Switch into the default runlevel
+ telinit "${DEFAULT_RUNLEVEL}"
++++++ upstart-0.6.3.tar.bz2 -> upstart-0.6.5.tar.bz2 ++++++
++++ 286991 lines of diff (skipped)
++++++ upstart-audit-events.patch ++++++
--- /var/tmp/diff_new_pack.2KS9ii/_old 2010-03-19 10:03:46.000000000 +0100
+++ /var/tmp/diff_new_pack.2KS9ii/_new 2010-03-19 10:03:46.000000000 +0100
@@ -1,51 +1,70 @@
-diff --git a/util/Makefile.in b/util/Makefile.in
-index 26025ce..f7b61a3 100644
---- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -376,6 +376,7 @@ reboot_SOURCES = \
- reboot_LDFLAGS = -static
+Index: upstart-0.6.5/util/Makefile.in
+===================================================================
+--- upstart-0.6.5.orig/util/Makefile.in 2010-03-11 18:10:15.000000000 +0100
++++ upstart-0.6.5/util/Makefile.in 2010-03-12 10:01:59.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -308,7 +308,6 @@ PACKAGE_COPYRIGHT = @PACKAGE_COPYRIGHT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -419,7 +418,7 @@ reboot_SOURCES = \
+
reboot_LDADD = \
- ../nih/libnih.la \
-+ -laudit \
- $(LTLIBINTL)
+ $(LTLIBINTL) \
+- $(NIH_LIBS)
++ $(NIH_LIBS) -laudit
runlevel_SOURCES = \
-@@ -399,6 +400,7 @@ shutdown_LDFLAGS = -static
- shutdown_LDADD = \
- ../nih/libnih.la \
- ../nih-dbus/libnih-dbus.la \
-+ -laudit \
- $(LTLIBINTL) \
- $(DBUS_LIBS)
-
-@@ -414,6 +416,7 @@ telinit_LDFLAGS = -static
- telinit_LDADD = \
- ../nih/libnih.la \
- ../nih-dbus/libnih-dbus.la \
-+ -laudit \
- $(LTLIBINTL) \
- $(DBUS_LIBS)
-
-@@ -477,6 +480,7 @@ test_sysv_LDADD = \
- sysv.o utmp.o \
- ../nih/libnih.la \
- ../nih-dbus/libnih-dbus.la \
-+ -laudit \
+ runlevel.c \
+@@ -441,7 +440,7 @@ shutdown_LDADD = \
$(LTLIBINTL) \
- $(DBUS_LIBS)
-
-@@ -489,6 +493,7 @@ test_telinit_LDADD = \
+ $(NIH_LIBS) \
+ $(NIH_DBUS_LIBS) \
+- $(DBUS_LIBS)
++ $(DBUS_LIBS) -laudit
+
+ telinit_SOURCES = \
+ telinit.c \
+@@ -455,7 +454,7 @@ telinit_LDADD = \
+ $(LTLIBINTL) \
+ $(NIH_LIBS) \
+ $(NIH_DBUS_LIBS) \
+- $(DBUS_LIBS)
++ $(DBUS_LIBS) -laudit
+
+ com_ubuntu_Upstart_OUTPUTS = \
+ com.ubuntu.Upstart.c \
+@@ -515,7 +514,7 @@ test_sysv_LDADD = \
+ $(LTLIBINTL) \
+ $(NIH_LIBS) \
+ $(NIH_DBUS_LIBS) \
+- $(DBUS_LIBS)
++ $(DBUS_LIBS) -laudit
+
+ test_telinit_SOURCES = tests/test_telinit.c telinit.c
+ test_telinit_CFLAGS = $(AM_CFLAGS) -DTEST
+@@ -525,7 +524,7 @@ test_telinit_LDADD = \
com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
- ../nih/libnih.la \
- ../nih-dbus/libnih-dbus.la \
-+ -laudit \
- $(DBUS_LIBS)
+ $(NIH_LIBS) \
+ $(NIH_DBUS_LIBS) \
+- $(DBUS_LIBS)
++ $(DBUS_LIBS) -laudit
all: $(BUILT_SOURCES)
-diff --git a/util/reboot.c b/util/reboot.c
-index dda2935..eef9ed2 100644
---- a/util/reboot.c
-+++ b/util/reboot.c
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+Index: upstart-0.6.5/util/reboot.c
+===================================================================
+--- upstart-0.6.5.orig/util/reboot.c 2010-03-11 18:10:15.000000000 +0100
++++ upstart-0.6.5/util/reboot.c 2010-03-11 18:10:21.000000000 +0100
@@ -36,6 +36,10 @@
#include