]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blame - pkgs/upstart/patches/upstart-0.6.7-upstream-1.patch
projects / people / ms / ipfire-3.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Move packages to pkgs subdirectory.
[people/ms/ipfire-3.x.git] / pkgs / upstart / patches / upstart-0.6.7-upstream-1.patch
CommitLineData
64106e56
SS		 1--- upstart-0.6.7.orig/configure
2+++ upstart-0.6.7/configure
70b263ba 3@@ -1,6 +1,6 @@
64106e56
SS		 4 #! /bin/sh
5 # Guess values for system-dependent variables and create Makefiles.
6-# Generated by GNU Autoconf 2.67 for upstart 0.6.7.
7+# Generated by GNU Autoconf 2.67 for upstart 0.6.6.
8 #
9 # Report bugs to <upstart-devel@lists.ubuntu.com>.
10 #
11@@ -703,8 +703,8 @@
12 # Identity of this package.
13 PACKAGE_NAME='upstart'
14 PACKAGE_TARNAME='upstart'
15-PACKAGE_VERSION='0.6.7'
16-PACKAGE_STRING='upstart 0.6.7'
17+PACKAGE_VERSION='0.6.6'
18+PACKAGE_STRING='upstart 0.6.6'
19 PACKAGE_BUGREPORT='upstart-devel@lists.ubuntu.com'
20 PACKAGE_URL=''
70b263ba 21
70b263ba
SS		 22@@ -751,6 +751,8 @@
23 am__EXEEXT_TRUE
24 LTLIBOBJS
25 LIBOBJS
26+UDEV_LIBS
27+UDEV_CFLAGS
28 DBUS_LIBS
29 DBUS_CFLAGS
30 NIH_DBUS_LIBS
64106e56 31@@ -962,7 +964,9 @@
70b263ba
SS		 32 NIH_DBUS_CFLAGS
33 NIH_DBUS_LIBS
34 DBUS_CFLAGS
35-DBUS_LIBS'
36+DBUS_LIBS
37+UDEV_CFLAGS
38+UDEV_LIBS'
39
40
41 # Initialize some variables set by options.
64106e56
SS		 42@@ -1505,7 +1509,7 @@
43 # Omit some internal or obsolete options to make the list less imposing.
44 # This message is too long to be a string in the A/UX 3.1 sh.
45 cat <<_ACEOF
46-\`configure' configures upstart 0.6.7 to adapt to many kinds of systems.
47+\`configure' configures upstart 0.6.6 to adapt to many kinds of systems.
48
49 Usage: $0 [OPTION]... [VAR=VALUE]...
50
51@@ -1575,7 +1579,7 @@
52
53 if test -n "$ac_init_help"; then
54 case $ac_init_help in
55- short | recursive ) echo "Configuration of upstart 0.6.7:";;
56+ short | recursive ) echo "Configuration of upstart 0.6.6:";;
57 esac
58 cat <<\_ACEOF
59
60@@ -1648,6 +1652,8 @@
70b263ba
SS		 61 linker flags for NIH_DBUS, overriding pkg-config
62 DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
63 DBUS_LIBS linker flags for DBUS, overriding pkg-config
64+ UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
65+ UDEV_LIBS linker flags for UDEV, overriding pkg-config
66
67 Use these variables to override the choices made by `configure' or to help
68 it to find libraries and programs with nonstandard names/locations.
64106e56
SS		 69@@ -1715,7 +1721,7 @@
70 test -n "$ac_init_help" && exit $ac_status
71 if $ac_init_version; then
72 cat <<\_ACEOF
73-upstart configure 0.6.7
74+upstart configure 0.6.6
75 generated by GNU Autoconf 2.67
76
77 Copyright (C) 2010 Free Software Foundation, Inc.
78@@ -2318,7 +2324,7 @@
79 This file contains any messages produced by compilers while
80 running configure, to aid debugging if configure makes a mistake.
81
82-It was created by upstart $as_me 0.6.7, which was
83+It was created by upstart $as_me 0.6.6, which was
84 generated by GNU Autoconf 2.67. Invocation command line was
85
86 $ $0 $@
87@@ -4473,7 +4479,7 @@
88
89 # Define the identity of the package.
90 PACKAGE='upstart'
91- VERSION='0.6.7'
92+ VERSION='0.6.6'
93
94
95 cat >>confdefs.h <<_ACEOF
96@@ -5227,13 +5233,13 @@
70b263ba
SS		 97 else
98 lt_cv_nm_interface="BSD nm"
99 echo "int some_variable = 0;" > conftest.$ac_ext
64106e56
SS		 100- (eval echo "\"\$as_me:5230: $ac_compile\"" >&5)
101+ (eval echo "\"\$as_me:5236: $ac_compile\"" >&5)
70b263ba
SS		 102 (eval "$ac_compile" 2>conftest.err)
103 cat conftest.err >&5
64106e56
SS		 104- (eval echo "\"\$as_me:5233: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
105+ (eval echo "\"\$as_me:5239: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
70b263ba
SS		 106 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
107 cat conftest.err >&5
64106e56
SS		 108- (eval echo "\"\$as_me:5236: output\"" >&5)
109+ (eval echo "\"\$as_me:5242: output\"" >&5)
70b263ba
SS		 110 cat conftest.out >&5
111 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
112 lt_cv_nm_interface="MS dumpbin"
64106e56 113@@ -6438,7 +6444,7 @@
70b263ba
SS		 114 ;;
115 *-*-irix6*)
116 # Find out which ABI we are using.
64106e56
SS		 117- echo '#line 6441 "configure"' > conftest.$ac_ext
118+ echo '#line 6447 "configure"' > conftest.$ac_ext
70b263ba
SS		 119 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
120 (eval $ac_compile) 2>&5
121 ac_status=$?
64106e56 122@@ -7700,11 +7706,11 @@
70b263ba
SS		 123 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
124 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
125 -e 's:$: $lt_compiler_flag:'`
64106e56
SS		 126- (eval echo "\"\$as_me:7703: $lt_compile\"" >&5)
127+ (eval echo "\"\$as_me:7709: $lt_compile\"" >&5)
70b263ba
SS		 128 (eval "$lt_compile" 2>conftest.err)
129 ac_status=$?
130 cat conftest.err >&5
64106e56
SS		 131- echo "$as_me:7707: \$? = $ac_status" >&5
132+ echo "$as_me:7713: \$? = $ac_status" >&5
70b263ba
SS		 133 if (exit $ac_status) && test -s "$ac_outfile"; then
134 # The compiler can only warn and ignore the option if not recognized
135 # So say no if there are warnings other than the usual output.
64106e56 136@@ -8039,11 +8045,11 @@
70b263ba
SS		 137 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
138 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
139 -e 's:$: $lt_compiler_flag:'`
64106e56
SS		 140- (eval echo "\"\$as_me:8042: $lt_compile\"" >&5)
141+ (eval echo "\"\$as_me:8048: $lt_compile\"" >&5)
70b263ba
SS		 142 (eval "$lt_compile" 2>conftest.err)
143 ac_status=$?
144 cat conftest.err >&5
64106e56
SS		 145- echo "$as_me:8046: \$? = $ac_status" >&5
146+ echo "$as_me:8052: \$? = $ac_status" >&5
70b263ba
SS		 147 if (exit $ac_status) && test -s "$ac_outfile"; then
148 # The compiler can only warn and ignore the option if not recognized
149 # So say no if there are warnings other than the usual output.
64106e56 150@@ -8144,11 +8150,11 @@
70b263ba
SS		 151 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
152 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
153 -e 's:$: $lt_compiler_flag:'`
64106e56
SS		 154- (eval echo "\"\$as_me:8147: $lt_compile\"" >&5)
155+ (eval echo "\"\$as_me:8153: $lt_compile\"" >&5)
70b263ba
SS		 156 (eval "$lt_compile" 2>out/conftest.err)
157 ac_status=$?
158 cat out/conftest.err >&5
64106e56
SS		 159- echo "$as_me:8151: \$? = $ac_status" >&5
160+ echo "$as_me:8157: \$? = $ac_status" >&5
70b263ba
SS		 161 if (exit $ac_status) && test -s out/conftest2.$ac_objext
162 then
163 # The compiler can only warn and ignore the option if not recognized
64106e56 164@@ -8199,11 +8205,11 @@
70b263ba
SS		 165 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
166 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
167 -e 's:$: $lt_compiler_flag:'`
64106e56
SS		 168- (eval echo "\"\$as_me:8202: $lt_compile\"" >&5)
169+ (eval echo "\"\$as_me:8208: $lt_compile\"" >&5)
70b263ba
SS		 170 (eval "$lt_compile" 2>out/conftest.err)
171 ac_status=$?
172 cat out/conftest.err >&5
64106e56
SS		 173- echo "$as_me:8206: \$? = $ac_status" >&5
174+ echo "$as_me:8212: \$? = $ac_status" >&5
70b263ba
SS		 175 if (exit $ac_status) && test -s out/conftest2.$ac_objext
176 then
177 # The compiler can only warn and ignore the option if not recognized
64106e56 178@@ -10583,7 +10589,7 @@
70b263ba
SS		 179 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
180 lt_status=$lt_dlunknown
181 cat > conftest.$ac_ext <<_LT_EOF
64106e56
SS		 182-#line 10586 "configure"
183+#line 10592 "configure"
70b263ba
SS		 184 #include "confdefs.h"
185
186 #if HAVE_DLFCN_H
64106e56 187@@ -10679,7 +10685,7 @@
70b263ba
SS		 188 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
189 lt_status=$lt_dlunknown
190 cat > conftest.$ac_ext <<_LT_EOF
64106e56
SS		 191-#line 10682 "configure"
192+#line 10688 "configure"
70b263ba
SS		 193 #include "confdefs.h"
194
195 #if HAVE_DLFCN_H
64106e56
SS		 196@@ -16848,6 +16854,95 @@
197
70b263ba
SS		 198 fi
199
200+pkg_failed=no
201+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
202+$as_echo_n "checking for UDEV... " >&6; }
203+
64106e56
SS		 204+if test -n "$UDEV_CFLAGS"; then
205+ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
206+ elif test -n "$PKG_CONFIG"; then
207+ if test -n "$PKG_CONFIG" && \
70b263ba
SS		 208+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 146\""; } >&5
209+ ($PKG_CONFIG --exists --print-errors "libudev >= 146") 2>&5
210+ ac_status=$?
211+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
212+ test $ac_status = 0; }; then
213+ pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 146" 2>/dev/null`
214+else
215+ pkg_failed=yes
216+fi
64106e56
SS		 217+ else
218+ pkg_failed=untried
70b263ba 219+fi
64106e56
SS		 220+if test -n "$UDEV_LIBS"; then
221+ pkg_cv_UDEV_LIBS="$UDEV_LIBS"
222+ elif test -n "$PKG_CONFIG"; then
223+ if test -n "$PKG_CONFIG" && \
70b263ba
SS		 224+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 146\""; } >&5
225+ ($PKG_CONFIG --exists --print-errors "libudev >= 146") 2>&5
226+ ac_status=$?
227+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
228+ test $ac_status = 0; }; then
229+ pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 146" 2>/dev/null`
230+else
231+ pkg_failed=yes
232+fi
64106e56
SS		 233+ else
234+ pkg_failed=untried
70b263ba
SS		 235+fi
236+
237+
238+
239+if test $pkg_failed = yes; then
64106e56
SS		 240+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
241+$as_echo "no" >&6; }
70b263ba
SS		 242+
243+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
244+ _pkg_short_errors_supported=yes
245+else
246+ _pkg_short_errors_supported=no
247+fi
248+ if test $_pkg_short_errors_supported = yes; then
64106e56 249+ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev >= 146" 2>&1`
70b263ba 250+ else
64106e56 251+ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 146" 2>&1`
70b263ba
SS		 252+ fi
253+ # Put the nasty error message in config.log where it belongs
254+ echo "$UDEV_PKG_ERRORS" >&5
255+
64106e56 256+ as_fn_error $? "Package requirements (libudev >= 146) were not met:
70b263ba
SS		 257+
258+$UDEV_PKG_ERRORS
259+
260+Consider adjusting the PKG_CONFIG_PATH environment variable if you
261+installed software in a non-standard prefix.
262+
263+Alternatively, you may set the environment variables UDEV_CFLAGS
264+and UDEV_LIBS to avoid the need to call pkg-config.
64106e56 265+See the pkg-config man page for more details." "$LINENO" 5
70b263ba 266+elif test $pkg_failed = untried; then
64106e56
SS		 267+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
268+$as_echo "no" >&6; }
70b263ba
SS		 269+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
270+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
64106e56 271+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
70b263ba
SS		 272+is in your PATH or set the PKG_CONFIG environment variable to the full
273+path to pkg-config.
274+
275+Alternatively, you may set the environment variables UDEV_CFLAGS
276+and UDEV_LIBS to avoid the need to call pkg-config.
277+See the pkg-config man page for more details.
278+
279+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
64106e56 280+See \`config.log' for more details" "$LINENO" 5 ; }
70b263ba
SS		 281+else
282+ UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
283+ UDEV_LIBS=$pkg_cv_UDEV_LIBS
284+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
285+$as_echo "yes" >&6; }
64106e56 286+
70b263ba
SS		 287+fi
288+
289 # Checks for header files.
290 for ac_header in valgrind/valgrind.h
291 do :
64106e56 292@@ -17278,7 +17373,7 @@
70b263ba
SS		 293
294
295
296-ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile init/Makefile util/Makefile conf/Makefile doc/Makefile contrib/Makefile po/Makefile.in"
297+ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile init/Makefile util/Makefile udev/Makefile conf/Makefile doc/Makefile contrib/Makefile po/Makefile.in"
298
299 ac_config_headers="$ac_config_headers config.h"
300
64106e56
SS		 301@@ -17808,7 +17903,7 @@
302 # report actual input values of CONFIG_FILES etc. instead of their
303 # values after options handling.
304 ac_log="
305-This file was extended by upstart $as_me 0.6.7, which was
306+This file was extended by upstart $as_me 0.6.6, which was
307 generated by GNU Autoconf 2.67. Invocation command line was
308
309 CONFIG_FILES = $CONFIG_FILES
310@@ -17874,7 +17969,7 @@
311 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
312 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
313 ac_cs_version="\\
314-upstart config.status 0.6.7
315+upstart config.status 0.6.6
316 configured by $0, generated by GNU Autoconf 2.67,
317 with options \\"\$ac_cs_config\\"
318
319@@ -18273,6 +18368,7 @@
70b263ba
SS		 320 "dbus/Makefile") CONFIG_FILES="$CONFIG_FILES dbus/Makefile" ;;
321 "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
322 "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
323+ "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;;
324 "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
325 "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
326 "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
64106e56
SS		 327--- upstart-0.6.7.orig/ChangeLog
328+++ upstart-0.6.7/ChangeLog
329@@ -70,9 +70,6 @@
330
331 2010-04-27 Scott James Remnant <scott@netsplit.com>
332
333- * configure.ac: Bump version to 0.6.7
334- * NEWS: Begin new release
335-
336 * NEWS: Release 0.6.6
337
338 * configure.ac: Bump the requirement of libnih to 1.0.2 after
339--- upstart-0.6.7.orig/Makefile.in
340+++ upstart-0.6.7/Makefile.in
341@@ -237,6 +237,8 @@
70b263ba
SS		 342 SET_MAKE = @SET_MAKE@
343 SHELL = @SHELL@
344 STRIP = @STRIP@
345+UDEV_CFLAGS = @UDEV_CFLAGS@
346+UDEV_LIBS = @UDEV_LIBS@
347 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
348 USE_NLS = @USE_NLS@
349 VERSION = @VERSION@
64106e56 350@@ -298,7 +300,7 @@
70b263ba
SS		 351 top_build_prefix = @top_build_prefix@
352 top_builddir = @top_builddir@
353 top_srcdir = @top_srcdir@
354-SUBDIRS = intl dbus init util conf doc contrib po
355+SUBDIRS = intl dbus init util udev conf doc contrib po
356 EXTRA_DIST = HACKING
357 ACLOCAL_AMFLAGS = --install -I m4
358 all: config.h
64106e56
SS		 359--- upstart-0.6.7.orig/configure.ac
360+++ upstart-0.6.7/configure.ac
361@@ -1,7 +1,7 @@
362 # Process this file with autoconf to produce a configure script.
363
364 AC_PREREQ(2.61)
365-AC_INIT([upstart], [0.6.7], [upstart-devel@lists.ubuntu.com])
366+AC_INIT([upstart], [0.6.6], [upstart-devel@lists.ubuntu.com])
367 NIH_COPYRIGHT([[Copyright © 2010 Canonical Ltd.]])
368 AC_CONFIG_SRCDIR([init/main.c])
369 AC_CONFIG_MACRO_DIR([m4])
370@@ -30,6 +30,7 @@
371 PKG_CHECK_MODULES([NIH], [libnih >= 1.0.2])
372 PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0])
373 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
374+PKG_CHECK_MODULES([UDEV], [libudev >= 146])
375
376 # Checks for header files.
377 AC_CHECK_HEADERS([valgrind/valgrind.h])
378@@ -63,7 +64,7 @@
379
380
381 AC_CONFIG_FILES([ Makefile intl/Makefile
382- dbus/Makefile init/Makefile util/Makefile conf/Makefile
383+ dbus/Makefile init/Makefile util/Makefile udev/Makefile conf/Makefile
384 doc/Makefile contrib/Makefile po/Makefile.in ])
385 AC_CONFIG_HEADERS([config.h])
386 AC_OUTPUT
387--- upstart-0.6.7.orig/Makefile.am
388+++ upstart-0.6.7/Makefile.am
389@@ -1,6 +1,6 @@
390 ## Process this file with automake to produce Makefile.in
391
392-SUBDIRS = intl dbus init util conf doc contrib po
393+SUBDIRS = intl dbus init util udev conf doc contrib po
394
395 EXTRA_DIST = HACKING
396
397--- upstart-0.6.7.orig/udev/Makefile.in
398+++ upstart-0.6.7/udev/Makefile.in
399@@ -0,0 +1,779 @@
400+# Makefile.in generated by automake 1.11.1 from Makefile.am.
401+# @configure_input@
70b263ba 402+
64106e56
SS		 403+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
404+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
405+# Inc.
406+# This Makefile.in is free software; the Free Software Foundation
407+# gives unlimited permission to copy and/or distribute it,
408+# with or without modifications, as long as this notice is preserved.
70b263ba 409+
64106e56
SS		 410+# This program is distributed in the hope that it will be useful,
411+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
412+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
413+# PARTICULAR PURPOSE.
70b263ba 414+
64106e56 415+@SET_MAKE@
70b263ba 416+
70b263ba 417+
64106e56
SS		 418+VPATH = @srcdir@
419+pkgdatadir = $(datadir)/@PACKAGE@
420+pkgincludedir = $(includedir)/@PACKAGE@
421+pkglibdir = $(libdir)/@PACKAGE@
422+pkglibexecdir = $(libexecdir)/@PACKAGE@
423+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
424+install_sh_DATA = $(install_sh) -c -m 644
425+install_sh_PROGRAM = $(install_sh) -c
426+install_sh_SCRIPT = $(install_sh) -c
427+INSTALL_HEADER = $(INSTALL_DATA)
428+transform = $(program_transform_name)
429+NORMAL_INSTALL = :
430+PRE_INSTALL = :
431+POST_INSTALL = :
432+NORMAL_UNINSTALL = :
433+PRE_UNINSTALL = :
434+POST_UNINSTALL = :
435+build_triplet = @build@
436+host_triplet = @host@
437+sbin_PROGRAMS = upstart-udev-bridge$(EXEEXT)
438+subdir = udev
439+DIST_COMMON = $(dist_init_DATA) $(dist_man_MANS) $(srcdir)/Makefile.am \
440+ $(srcdir)/Makefile.in
441+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
442+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
443+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
444+ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
445+ $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
446+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
447+ $(top_srcdir)/m4/inttypes-pri.m4 \
448+ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
449+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
450+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnih.m4 \
451+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
452+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
453+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
454+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
455+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
456+ $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
457+ $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
458+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
459+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
460+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
461+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
462+ $(ACLOCAL_M4)
463+mkinstalldirs = $(install_sh) -d
464+CONFIG_HEADER = $(top_builddir)/config.h
465+CONFIG_CLEAN_FILES =
466+CONFIG_CLEAN_VPATH_FILES =
467+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" \
468+ "$(DESTDIR)$(initdir)"
469+PROGRAMS = $(sbin_PROGRAMS)
470+am_upstart_udev_bridge_OBJECTS = upstart-udev-bridge.$(OBJEXT)
471+am__objects_1 = com.ubuntu.Upstart.$(OBJEXT)
472+nodist_upstart_udev_bridge_OBJECTS = $(am__objects_1)
473+upstart_udev_bridge_OBJECTS = $(am_upstart_udev_bridge_OBJECTS) \
474+ $(nodist_upstart_udev_bridge_OBJECTS)
475+am__DEPENDENCIES_1 =
476+upstart_udev_bridge_DEPENDENCIES = $(am__DEPENDENCIES_1) \
477+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
478+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
479+AM_V_lt = $(am__v_lt_$(V))
480+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
481+am__v_lt_0 = --silent
482+DEFAULT_INCLUDES =
483+depcomp = $(SHELL) $(top_srcdir)/depcomp
484+am__depfiles_maybe = depfiles
485+am__mv = mv -f
486+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
487+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
488+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
489+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
490+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
491+ $(AM_CFLAGS) $(CFLAGS)
492+AM_V_CC = $(am__v_CC_$(V))
493+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
494+am__v_CC_0 = @echo " CC " $@;
495+AM_V_at = $(am__v_at_$(V))
496+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
497+am__v_at_0 = @
498+CCLD = $(CC)
499+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
500+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
501+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
502+AM_V_CCLD = $(am__v_CCLD_$(V))
503+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
504+am__v_CCLD_0 = @echo " CCLD " $@;
505+AM_V_GEN = $(am__v_GEN_$(V))
506+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
507+am__v_GEN_0 = @echo " GEN " $@;
508+SOURCES = $(upstart_udev_bridge_SOURCES) \
509+ $(nodist_upstart_udev_bridge_SOURCES)
510+DIST_SOURCES = $(upstart_udev_bridge_SOURCES)
511+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
512+am__vpath_adj = case $$p in \
513+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
514+ *) f=$$p;; \
515+ esac;
516+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
517+am__install_max = 40
518+am__nobase_strip_setup = \
519+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
520+am__nobase_strip = \
521+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
522+am__nobase_list = $(am__nobase_strip_setup); \
523+ for p in $$list; do echo "$$p $$p"; done | \
524+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
525+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
526+ if (++n[$$2] == $(am__install_max)) \
527+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
528+ END { for (dir in files) print dir, files[dir] }'
529+am__base_list = \
530+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
531+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
532+man8dir = $(mandir)/man8
533+NROFF = nroff
534+MANS = $(dist_man_MANS)
535+DATA = $(dist_init_DATA)
536+ETAGS = etags
537+CTAGS = ctags
538+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
539+ACLOCAL = @ACLOCAL@
540+ALLOCA = @ALLOCA@
541+AMTAR = @AMTAR@
542+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
543+AR = @AR@
544+AUTOCONF = @AUTOCONF@
545+AUTOHEADER = @AUTOHEADER@
546+AUTOMAKE = @AUTOMAKE@
547+AWK = @AWK@
548+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
549+CATOBJEXT = @CATOBJEXT@
550+CC = @CC@
551+CCDEPMODE = @CCDEPMODE@
552+CFLAGS = @CFLAGS@
553+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
554+CPP = @CPP@
555+CPPFLAGS = @CPPFLAGS@
556+CYGPATH_W = @CYGPATH_W@
557+DATADIRNAME = @DATADIRNAME@
558+DBUS_CFLAGS = @DBUS_CFLAGS@
559+DBUS_LIBS = @DBUS_LIBS@
560+DEFS = @DEFS@
561+DEPDIR = @DEPDIR@
562+DSYMUTIL = @DSYMUTIL@
563+DUMPBIN = @DUMPBIN@
564+ECHO_C = @ECHO_C@
565+ECHO_N = @ECHO_N@
566+ECHO_T = @ECHO_T@
567+EGREP = @EGREP@
568+EXEEXT = @EXEEXT@
569+FGREP = @FGREP@
570+GENCAT = @GENCAT@
571+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
572+GLIBC2 = @GLIBC2@
573+GLIBC21 = @GLIBC21@
574+GMSGFMT = @GMSGFMT@
575+GMSGFMT_015 = @GMSGFMT_015@
576+GREP = @GREP@
577+HAVE_ASPRINTF = @HAVE_ASPRINTF@
578+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
579+HAVE_SNPRINTF = @HAVE_SNPRINTF@
580+HAVE_VISIBILITY = @HAVE_VISIBILITY@
581+HAVE_WPRINTF = @HAVE_WPRINTF@
582+INSTALL = @INSTALL@
583+INSTALL_DATA = @INSTALL_DATA@
584+INSTALL_PROGRAM = @INSTALL_PROGRAM@
585+INSTALL_SCRIPT = @INSTALL_SCRIPT@
586+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
587+INSTOBJEXT = @INSTOBJEXT@
588+INTLBISON = @INTLBISON@
589+INTLLIBS = @INTLLIBS@
590+INTLOBJS = @INTLOBJS@
591+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
592+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
593+LD = @LD@
594+LDFLAGS = @LDFLAGS@
595+LIBICONV = @LIBICONV@
596+LIBINTL = @LIBINTL@
597+LIBMULTITHREAD = @LIBMULTITHREAD@
598+LIBOBJS = @LIBOBJS@
599+LIBPTH = @LIBPTH@
600+LIBPTH_PREFIX = @LIBPTH_PREFIX@
601+LIBS = @LIBS@
602+LIBTHREAD = @LIBTHREAD@
603+LIBTOOL = @LIBTOOL@
604+LIPO = @LIPO@
605+LN_S = @LN_S@
606+LTLIBC = @LTLIBC@
607+LTLIBICONV = @LTLIBICONV@
608+LTLIBINTL = @LTLIBINTL@
609+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
610+LTLIBOBJS = @LTLIBOBJS@
611+LTLIBPTH = @LTLIBPTH@
612+LTLIBTHREAD = @LTLIBTHREAD@
613+MAINT = @MAINT@
614+MAKEINFO = @MAKEINFO@
615+MKDIR_P = @MKDIR_P@
616+MSGFMT = @MSGFMT@
617+MSGFMT_015 = @MSGFMT_015@
618+MSGMERGE = @MSGMERGE@
619+NIH_CFLAGS = @NIH_CFLAGS@
620+NIH_DBUS_CFLAGS = @NIH_DBUS_CFLAGS@
621+NIH_DBUS_LIBS = @NIH_DBUS_LIBS@
622+NIH_DBUS_TOOL = @NIH_DBUS_TOOL@
623+NIH_LIBS = @NIH_LIBS@
624+NM = @NM@
625+NMEDIT = @NMEDIT@
626+OBJDUMP = @OBJDUMP@
627+OBJEXT = @OBJEXT@
628+OTOOL = @OTOOL@
629+OTOOL64 = @OTOOL64@
630+PACKAGE = @PACKAGE@
631+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
632+PACKAGE_COPYRIGHT = @PACKAGE_COPYRIGHT@
633+PACKAGE_NAME = @PACKAGE_NAME@
634+PACKAGE_STRING = @PACKAGE_STRING@
635+PACKAGE_TARNAME = @PACKAGE_TARNAME@
636+PACKAGE_URL = @PACKAGE_URL@
637+PACKAGE_VERSION = @PACKAGE_VERSION@
638+PATH_SEPARATOR = @PATH_SEPARATOR@
639+PKG_CONFIG = @PKG_CONFIG@
640+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
641+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
642+POSUB = @POSUB@
643+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
644+RANLIB = @RANLIB@
645+SED = @SED@
646+SET_MAKE = @SET_MAKE@
647+SHELL = @SHELL@
648+STRIP = @STRIP@
649+UDEV_CFLAGS = @UDEV_CFLAGS@
650+UDEV_LIBS = @UDEV_LIBS@
651+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
652+USE_NLS = @USE_NLS@
653+VERSION = @VERSION@
654+WINDRES = @WINDRES@
655+WOE32 = @WOE32@
656+WOE32DLL = @WOE32DLL@
657+XGETTEXT = @XGETTEXT@
658+XGETTEXT_015 = @XGETTEXT_015@
659+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
660+abs_builddir = @abs_builddir@
661+abs_srcdir = @abs_srcdir@
662+abs_top_builddir = @abs_top_builddir@
663+abs_top_srcdir = @abs_top_srcdir@
664+ac_ct_CC = @ac_ct_CC@
665+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
666+am__include = @am__include@
667+am__leading_dot = @am__leading_dot@
668+am__quote = @am__quote@
669+am__tar = @am__tar@
670+am__untar = @am__untar@
671+bindir = @bindir@
672+build = @build@
673+build_alias = @build_alias@
674+build_cpu = @build_cpu@
675+build_os = @build_os@
676+build_vendor = @build_vendor@
677+builddir = @builddir@
678+datadir = @datadir@
679+datarootdir = @datarootdir@
680+docdir = @docdir@
681+dvidir = @dvidir@
682+exec_prefix = @exec_prefix@
683+host = @host@
684+host_alias = @host_alias@
685+host_cpu = @host_cpu@
686+host_os = @host_os@
687+host_vendor = @host_vendor@
688+htmldir = @htmldir@
689+includedir = @includedir@
690+infodir = @infodir@
691+install_sh = @install_sh@
692+libdir = @libdir@
693+libexecdir = @libexecdir@
694+localedir = @localedir@
695+localstatedir = @localstatedir@
696+lt_ECHO = @lt_ECHO@
697+mandir = @mandir@
698+mkdir_p = @mkdir_p@
699+oldincludedir = @oldincludedir@
700+pdfdir = @pdfdir@
701+prefix = @prefix@
702+program_transform_name = @program_transform_name@
703+psdir = @psdir@
704+sbindir = @sbindir@
705+sharedstatedir = @sharedstatedir@
706+srcdir = @srcdir@
707+sysconfdir = @sysconfdir@
708+target_alias = @target_alias@
709+top_build_prefix = @top_build_prefix@
710+top_builddir = @top_builddir@
711+top_srcdir = @top_srcdir@
712+AM_CFLAGS = \
713+ $(NIH_CFLAGS) \
714+ $(NIH_DBUS_CFLAGS) \
715+ $(DBUS_CFLAGS) \
716+ $(UDEV_CFLAGS)
70b263ba 717+
64106e56
SS		 718+AM_CPPFLAGS = \
719+ -DLOCALEDIR="\"$(localedir)\"" \
720+ -I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
721+ -I$(top_srcdir)/intl
70b263ba 722+
64106e56
SS		 723+initdir = $(sysconfdir)/init
724+dist_init_DATA = \
725+ conf/upstart-udev-bridge.conf
70b263ba 726+
64106e56
SS		 727+dist_man_MANS = \
728+ man/upstart-udev-bridge.8
70b263ba 729+
64106e56
SS		 730+upstart_udev_bridge_SOURCES = \
731+ upstart-udev-bridge.c
70b263ba 732+
64106e56
SS		 733+nodist_upstart_udev_bridge_SOURCES = \
734+ $(com_ubuntu_Upstart_OUTPUTS)
70b263ba 735+
64106e56
SS		 736+upstart_udev_bridge_LDADD = \
737+ $(LTLIBINTL) \
738+ $(NIH_LIBS) \
739+ $(NIH_DBUS_LIBS) \
740+ $(DBUS_LIBS) \
741+ $(UDEV_LIBS)
70b263ba 742+
64106e56
SS		 743+com_ubuntu_Upstart_OUTPUTS = \
744+ com.ubuntu.Upstart.c \
745+ com.ubuntu.Upstart.h
70b263ba 746+
64106e56
SS		 747+com_ubuntu_Upstart_XML = \
748+ ../dbus/com.ubuntu.Upstart.xml
70b263ba 749+
70b263ba 750+
64106e56
SS		 751+# These have to be built sources because we can't compile object files
752+# without the header file existing first
753+BUILT_SOURCES = \
754+ $(com_ubuntu_Upstart_OUTPUTS)
70b263ba 755+
64106e56
SS		 756+CLEANFILES = \
757+ $(com_ubuntu_Upstart_OUTPUTS)
70b263ba 758+
64106e56
SS		 759+all: $(BUILT_SOURCES)
760+ $(MAKE) $(AM_MAKEFLAGS) all-am
70b263ba 761+
64106e56
SS		 762+.SUFFIXES:
763+.SUFFIXES: .c .lo .o .obj
764+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
765+ @for dep in $?; do \
766+ case '$(am__configure_deps)' in \
767+ *$$dep*) \
768+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
769+ && { if test -f $@; then exit 0; else break; fi; }; \
770+ exit 1;; \
771+ esac; \
772+ done; \
773+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu udev/Makefile'; \
774+ $(am__cd) $(top_srcdir) && \
775+ $(AUTOMAKE) --gnu udev/Makefile
776+.PRECIOUS: Makefile
777+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
778+ @case '$?' in \
779+ *config.status*) \
780+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
781+ *) \
782+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
783+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
784+ esac;
70b263ba 785+
64106e56
SS		 786+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
787+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
70b263ba 788+
64106e56
SS		 789+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
790+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
791+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
792+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
793+$(am__aclocal_m4_deps):
794+install-sbinPROGRAMS: $(sbin_PROGRAMS)
795+ @$(NORMAL_INSTALL)
796+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
797+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
798+ for p in $$list; do echo "$$p $$p"; done | \
799+ sed 's/$(EXEEXT)$$//' | \
800+ while read p p1; do if test -f $$p || test -f $$p1; \
801+ then echo "$$p"; echo "$$p"; else :; fi; \
802+ done | \
803+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
804+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
805+ sed 'N;N;N;s,\n, ,g' | \
806+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
807+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
808+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
809+ else { print "f", $$3 "/" $$4, $$1; } } \
810+ END { for (d in files) print "f", d, files[d] }' | \
811+ while read type dir files; do \
812+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
813+ test -z "$$files" || { \
814+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
815+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
816+ } \
817+ ; done
70b263ba 818+
64106e56
SS		 819+uninstall-sbinPROGRAMS:
820+ @$(NORMAL_UNINSTALL)
821+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
822+ files=`for p in $$list; do echo "$$p"; done | \
823+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
824+ -e 's/$$/$(EXEEXT)/' `; \
825+ test -n "$$list" || exit 0; \
826+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
827+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
70b263ba 828+
64106e56
SS		 829+clean-sbinPROGRAMS:
830+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
831+ echo " rm -f" $$list; \
832+ rm -f $$list || exit $$?; \
833+ test -n "$(EXEEXT)" || exit 0; \
834+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
835+ echo " rm -f" $$list; \
836+ rm -f $$list
837+upstart-udev-bridge$(EXEEXT): $(upstart_udev_bridge_OBJECTS) $(upstart_udev_bridge_DEPENDENCIES)
838+ @rm -f upstart-udev-bridge$(EXEEXT)
839+ $(AM_V_CCLD)$(LINK) $(upstart_udev_bridge_OBJECTS) $(upstart_udev_bridge_LDADD) $(LIBS)
70b263ba 840+
64106e56
SS		 841+mostlyclean-compile:
842+ -rm -f *.$(OBJEXT)
70b263ba 843+
64106e56
SS		 844+distclean-compile:
845+ -rm -f *.tab.c
70b263ba 846+
64106e56
SS		 847+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/com.ubuntu.Upstart.Po@am__quote@
848+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upstart-udev-bridge.Po@am__quote@
70b263ba 849+
64106e56
SS		 850+.c.o:
851+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
852+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
853+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
854+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
855+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
856+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
70b263ba 857+
64106e56
SS		 858+.c.obj:
859+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
860+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
861+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
862+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
863+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
864+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
70b263ba 865+
64106e56
SS		 866+.c.lo:
867+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
868+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
869+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
870+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
871+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
872+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
70b263ba 873+
64106e56
SS		 874+mostlyclean-libtool:
875+ -rm -f *.lo
70b263ba 876+
64106e56
SS		 877+clean-libtool:
878+ -rm -rf .libs _libs
879+install-man8: $(dist_man_MANS)
880+ @$(NORMAL_INSTALL)
881+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
882+ @list=''; test -n "$(man8dir)" || exit 0; \
883+ { for i in $$list; do echo "$$i"; done; \
884+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
885+ sed -n '/\.8[a-z]*$$/p'; \
886+ } | while read p; do \
887+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
888+ echo "$$d$$p"; echo "$$p"; \
889+ done | \
890+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
891+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
892+ sed 'N;N;s,\n, ,g' | { \
893+ list=; while read file base inst; do \
894+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
895+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
896+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
897+ fi; \
898+ done; \
899+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
900+ while read files; do \
901+ test -z "$$files" || { \
902+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
903+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
904+ done; }
70b263ba 905+
64106e56
SS		 906+uninstall-man8:
907+ @$(NORMAL_UNINSTALL)
908+ @list=''; test -n "$(man8dir)" || exit 0; \
909+ files=`{ for i in $$list; do echo "$$i"; done; \
910+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
911+ sed -n '/\.8[a-z]*$$/p'; \
912+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
913+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
914+ test -z "$$files" || { \
915+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
916+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
917+install-dist_initDATA: $(dist_init_DATA)
918+ @$(NORMAL_INSTALL)
919+ test -z "$(initdir)" || $(MKDIR_P) "$(DESTDIR)$(initdir)"
920+ @list='$(dist_init_DATA)'; test -n "$(initdir)" || list=; \
921+ for p in $$list; do \
922+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
923+ echo "$$d$$p"; \
924+ done | $(am__base_list) | \
925+ while read files; do \
926+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(initdir)'"; \
927+ $(INSTALL_DATA) $$files "$(DESTDIR)$(initdir)" || exit $$?; \
928+ done
70b263ba 929+
64106e56
SS		 930+uninstall-dist_initDATA:
931+ @$(NORMAL_UNINSTALL)
932+ @list='$(dist_init_DATA)'; test -n "$(initdir)" || list=; \
933+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
934+ test -n "$$files" || exit 0; \
935+ echo " ( cd '$(DESTDIR)$(initdir)' && rm -f" $$files ")"; \
936+ cd "$(DESTDIR)$(initdir)" && rm -f $$files
70b263ba 937+
64106e56
SS		 938+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
939+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
940+ unique=`for i in $$list; do \
941+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
942+ done | \
943+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
944+ END { if (nonempty) { for (i in files) print i; }; }'`; \
945+ mkid -fID $$unique
946+tags: TAGS
70b263ba 947+
64106e56
SS		 948+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
949+ $(TAGS_FILES) $(LISP)
950+ set x; \
951+ here=`pwd`; \
952+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
953+ unique=`for i in $$list; do \
954+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
955+ done | \
956+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
957+ END { if (nonempty) { for (i in files) print i; }; }'`; \
958+ shift; \
959+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
960+ test -n "$$unique" || unique=$$empty_fix; \
961+ if test $$# -gt 0; then \
962+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
963+ "$$@" $$unique; \
964+ else \
965+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
966+ $$unique; \
967+ fi; \
968+ fi
969+ctags: CTAGS
970+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
971+ $(TAGS_FILES) $(LISP)
972+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
973+ unique=`for i in $$list; do \
974+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
975+ done | \
976+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
977+ END { if (nonempty) { for (i in files) print i; }; }'`; \
978+ test -z "$(CTAGS_ARGS)$$unique" \
979+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
980+ $$unique
70b263ba 981+
64106e56
SS		 982+GTAGS:
983+ here=`$(am__cd) $(top_builddir) && pwd` \
984+ && $(am__cd) $(top_srcdir) \
985+ && gtags -i $(GTAGS_ARGS) "$$here"
70b263ba 986+
64106e56
SS		 987+distclean-tags:
988+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
70b263ba 989+
64106e56
SS		 990+distdir: $(DISTFILES)
991+ @list='$(MANS)'; if test -n "$$list"; then \
992+ list=`for p in $$list; do \
993+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
994+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
995+ if test -n "$$list" && \
996+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
997+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
998+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
999+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
1000+ echo " typically \`make maintainer-clean' will remove them" >&2; \
1001+ exit 1; \
1002+ else :; fi; \
1003+ else :; fi
1004+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1005+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1006+ list='$(DISTFILES)'; \
1007+ dist_files=`for file in $$list; do echo $$file; done | \
1008+ sed -e "s|^$$srcdirstrip/||;t" \
1009+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1010+ case $$dist_files in \
1011+ */*) $(MKDIR_P) `echo "$$dist_files" | \
1012+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1013+ sort -u` ;; \
1014+ esac; \
1015+ for file in $$dist_files; do \
1016+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1017+ if test -d $$d/$$file; then \
1018+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1019+ if test -d "$(distdir)/$$file"; then \
1020+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1021+ fi; \
1022+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1023+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1024+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1025+ fi; \
1026+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1027+ else \
1028+ test -f "$(distdir)/$$file" \
1029+ || cp -p $$d/$$file "$(distdir)/$$file" \
1030+ || exit 1; \
1031+ fi; \
1032+ done
1033+check-am: all-am
1034+check: $(BUILT_SOURCES)
1035+ $(MAKE) $(AM_MAKEFLAGS) check-am
1036+all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
1037+installdirs:
1038+ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(initdir)"; do \
1039+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1040+ done
1041+install: $(BUILT_SOURCES)
1042+ $(MAKE) $(AM_MAKEFLAGS) install-am
1043+install-exec: install-exec-am
1044+install-data: install-data-am
1045+uninstall: uninstall-am
70b263ba 1046+
64106e56
SS		 1047+install-am: all-am
1048+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
70b263ba 1049+
64106e56
SS		 1050+installcheck: installcheck-am
1051+install-strip:
1052+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1053+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1054+ `test -z '$(STRIP)' || \
1055+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1056+mostlyclean-generic:
70b263ba 1057+
64106e56
SS		 1058+clean-generic:
1059+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
70b263ba 1060+
64106e56
SS		 1061+distclean-generic:
1062+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1063+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
70b263ba 1064+
64106e56
SS		 1065+maintainer-clean-generic:
1066+ @echo "This command is intended for maintainers to use"
1067+ @echo "it deletes files that may require special tools to rebuild."
1068+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
1069+clean: clean-am
70b263ba 1070+
64106e56
SS		 1071+clean-am: clean-generic clean-libtool clean-local clean-sbinPROGRAMS \
1072+ mostlyclean-am
70b263ba 1073+
64106e56
SS		 1074+distclean: distclean-am
1075+ -rm -rf ./$(DEPDIR)
1076+ -rm -f Makefile
1077+distclean-am: clean-am distclean-compile distclean-generic \
1078+ distclean-tags
70b263ba 1079+
64106e56 1080+dvi: dvi-am
70b263ba 1081+
64106e56 1082+dvi-am:
70b263ba 1083+
64106e56 1084+html: html-am
70b263ba 1085+
64106e56 1086+html-am:
70b263ba 1087+
64106e56 1088+info: info-am
70b263ba 1089+
64106e56 1090+info-am:
70b263ba 1091+
64106e56 1092+install-data-am: install-dist_initDATA install-man
70b263ba 1093+
64106e56 1094+install-dvi: install-dvi-am
70b263ba 1095+
64106e56 1096+install-dvi-am:
70b263ba 1097+
64106e56 1098+install-exec-am: install-sbinPROGRAMS
70b263ba 1099+
64106e56 1100+install-html: install-html-am
70b263ba 1101+
64106e56 1102+install-html-am:
70b263ba 1103+
64106e56 1104+install-info: install-info-am
70b263ba 1105+
64106e56 1106+install-info-am:
70b263ba 1107+
64106e56 1108+install-man: install-man8
70b263ba 1109+
64106e56 1110+install-pdf: install-pdf-am
70b263ba 1111+
64106e56 1112+install-pdf-am:
70b263ba 1113+
64106e56 1114+install-ps: install-ps-am
70b263ba 1115+
64106e56 1116+install-ps-am:
70b263ba 1117+
64106e56 1118+installcheck-am:
70b263ba 1119+
64106e56
SS		 1120+maintainer-clean: maintainer-clean-am
1121+ -rm -rf ./$(DEPDIR)
1122+ -rm -f Makefile
1123+maintainer-clean-am: distclean-am maintainer-clean-generic \
1124+ maintainer-clean-local
70b263ba 1125+
64106e56 1126+mostlyclean: mostlyclean-am
70b263ba 1127+
64106e56
SS		 1128+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
1129+ mostlyclean-libtool
70b263ba 1130+
64106e56 1131+pdf: pdf-am
70b263ba 1132+
64106e56 1133+pdf-am:
70b263ba 1134+
64106e56 1135+ps: ps-am
70b263ba 1136+
64106e56 1137+ps-am:
70b263ba 1138+
64106e56
SS		 1139+uninstall-am: uninstall-dist_initDATA uninstall-man \
1140+ uninstall-sbinPROGRAMS
70b263ba 1141+
64106e56 1142+uninstall-man: uninstall-man8
70b263ba 1143+
64106e56 1144+.MAKE: all check install install-am install-strip
70b263ba 1145+
64106e56
SS		 1146+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
1147+ clean-libtool clean-local clean-sbinPROGRAMS ctags distclean \
1148+ distclean-compile distclean-generic distclean-libtool \
1149+ distclean-tags distdir dvi dvi-am html html-am info info-am \
1150+ install install-am install-data install-data-am \
1151+ install-dist_initDATA install-dvi install-dvi-am install-exec \
1152+ install-exec-am install-html install-html-am install-info \
1153+ install-info-am install-man install-man8 install-pdf \
1154+ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
1155+ install-strip installcheck installcheck-am installdirs \
1156+ maintainer-clean maintainer-clean-generic \
1157+ maintainer-clean-local mostlyclean mostlyclean-compile \
1158+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1159+ tags uninstall uninstall-am uninstall-dist_initDATA \
1160+ uninstall-man uninstall-man8 uninstall-sbinPROGRAMS
70b263ba 1161+
70b263ba
SS		 1162+
1163+$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
1164+ $(AM_V_GEN)$(NIH_DBUS_TOOL) \
1165+ --package=$(PACKAGE) \
1166+ --mode=proxy --prefix=upstart \
1167+ --default-interface=com.ubuntu.Upstart0_6 \
1168+ --output=$@ $<
1169+
70b263ba
SS		 1170+clean-local:
1171+ rm -f *.gcno *.gcda
1172+
1173+maintainer-clean-local:
1174+ rm -f *.gcov
64106e56
SS		 1175+
1176+# Tell versions [3.59,3.63) of GNU make to not export all variables.
1177+# Otherwise a system limit (for SysV at least) may be exceeded.
1178+.NOEXPORT:
1179--- upstart-0.6.7.orig/udev/upstart-udev-bridge.c
1180+++ upstart-0.6.7/udev/upstart-udev-bridge.c
70b263ba
SS		 1181@@ -0,0 +1,310 @@
1182+/* upstart
1183+ *
1184+ * Copyright © 2009 Canonical Ltd.
1185+ * Author: Scott James Remnant <scott@netsplit.com>.
1186+ *
1187+ * This program is free software; you can redistribute it and/or modify
1188+ * it under the terms of the GNU General Public License version 2, as
1189+ * published by the Free Software Foundation.
1190+ *
1191+ * This program is distributed in the hope that it will be useful,
1192+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
1193+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1194+ * GNU General Public License for more details.
1195+ *
1196+ * You should have received a copy of the GNU General Public License along
1197+ * with this program; if not, write to the Free Software Foundation, Inc.,
1198+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1199+ */
1200+
1201+#ifdef HAVE_CONFIG_H
1202+# include <config.h>
1203+#endif /* HAVE_CONFIG_H */
1204+
1205+
1206+#include <libudev.h>
1207+
1208+#include <stdlib.h>
1209+#include <string.h>
1210+#include <syslog.h>
1211+
1212+#include <nih/macros.h>
1213+#include <nih/alloc.h>
1214+#include <nih/string.h>
1215+#include <nih/io.h>
1216+#include <nih/option.h>
1217+#include <nih/main.h>
1218+#include <nih/logging.h>
1219+#include <nih/error.h>
1220+
1221+#include <nih-dbus/dbus_connection.h>
1222+#include <nih-dbus/dbus_proxy.h>
1223+
1224+#include "dbus/upstart.h"
1225+#include "com.ubuntu.Upstart.h"
1226+
1227+
1228+/* Prototypes for static functions */
1229+static void udev_monitor_watcher (struct udev_monitor *udev_monitor,
1230+ NihIoWatch *watch, NihIoEvents events);
1231+static void upstart_disconnected (DBusConnection *connection);
1232+static void emit_event_error (void *data, NihDBusMessage *message);
1233+
1234+
1235+/**
1236+ * daemonise:
1237+ *
1238+ * Set to TRUE if we should become a daemon, rather than just running
1239+ * in the foreground.
1240+ **/
1241+static int daemonise = FALSE;
1242+
1243+/**
1244+ * upstart:
1245+ *
1246+ * Proxy to Upstart daemon.
1247+ **/
1248+static NihDBusProxy *upstart = NULL;
1249+
1250+
1251+/**
1252+ * options:
1253+ *
1254+ * Command-line options accepted by this program.
1255+ **/
1256+static NihOption options[] = {
1257+ { 0, "daemon", N_("Detach and run in the background"),
1258+ NULL, NULL, &daemonise, NULL },
1259+
1260+ NIH_OPTION_LAST
1261+};
1262+
1263+
1264+int
1265+main (int argc,
1266+ char *argv[])
1267+{
1268+ char ** args;
1269+ DBusConnection * connection;
1270+ struct udev * udev;
1271+ struct udev_monitor *udev_monitor;
1272+ int ret;
1273+
1274+ nih_main_init (argv[0]);
1275+
1276+ nih_option_set_synopsis (_("Bridge udev events into upstart"));
1277+ nih_option_set_help (
1278+ _("By default, upstart-udev-bridge does not detach from the "
1279+ "console and remains in the foreground. Use the --daemon "
1280+ "option to have it detach."));
1281+
1282+ args = nih_option_parser (NULL, argc, argv, options, FALSE);
1283+ if (! args)
1284+ exit (1);
1285+
1286+ /* Initialise the connection to Upstart */
1287+ connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
1288+ if (! connection) {
1289+ NihError *err;
1290+
1291+ err = nih_error_get ();
1292+ nih_fatal ("%s: %s", _("Could not connect to Upstart"),
1293+ err->message);
1294+ nih_free (err);
1295+
1296+ exit (1);
1297+ }
1298+
1299+ upstart = NIH_SHOULD (nih_dbus_proxy_new (NULL, connection,
1300+ NULL, DBUS_PATH_UPSTART,
1301+ NULL, NULL));
1302+ if (! upstart) {
1303+ NihError *err;
1304+
1305+ err = nih_error_get ();
1306+ nih_fatal ("%s: %s", _("Could not create Upstart proxy"),
1307+ err->message);
1308+ nih_free (err);
1309+
1310+ exit (1);
1311+ }
1312+
1313+ /* Initialise the connection to udev */
1314+ nih_assert (udev = udev_new ());
1315+ nih_assert (udev_monitor = udev_monitor_new_from_netlink (udev, "udev"));
1316+ nih_assert (udev_monitor_enable_receiving (udev_monitor) == 0);
1317+ udev_monitor_set_receive_buffer_size(udev_monitor, 128*1024*1024);
1318+
1319+ NIH_MUST (nih_io_add_watch (NULL, udev_monitor_get_fd (udev_monitor),
1320+ NIH_IO_READ,
1321+ (NihIoWatcher)udev_monitor_watcher,
1322+ udev_monitor));
1323+
1324+ /* Become daemon */
1325+ if (daemonise) {
1326+ if (nih_main_daemonise () < 0) {
1327+ NihError *err;
1328+
1329+ err = nih_error_get ();
1330+ nih_fatal ("%s: %s", _("Unable to become daemon"),
1331+ err->message);
1332+ nih_free (err);
1333+
1334+ exit (1);
1335+ }
1336+
1337+ /* Send all logging output to syslog */
1338+ openlog (program_name, LOG_PID, LOG_DAEMON);
1339+ nih_log_set_logger (nih_logger_syslog);
1340+ }
1341+
1342+ /* Handle TERM and INT signals gracefully */
1343+ nih_signal_set_handler (SIGTERM, nih_signal_handler);
1344+ NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL));
1345+
1346+ if (! daemonise) {
1347+ nih_signal_set_handler (SIGINT, nih_signal_handler);
1348+ NIH_MUST (nih_signal_add_handler (NULL, SIGINT, nih_main_term_signal, NULL));
1349+ }
1350+
1351+ ret = nih_main_loop ();
1352+
1353+ return ret;
1354+}
1355+
1356+
1357+static void
1358+udev_monitor_watcher (struct udev_monitor *udev_monitor,
1359+ NihIoWatch * watch,
1360+ NihIoEvents events)
1361+{
1362+ struct udev_device * udev_device;
1363+ const char * subsystem;
1364+ const char * action;
1365+ const char * kernel;
1366+ const char * devpath;
1367+ const char * devname;
1368+ nih_local char * name = NULL;
1369+ nih_local char ** env = NULL;
1370+ size_t env_len = 0;
1371+ DBusPendingCall * pending_call;
1372+
1373+ udev_device = udev_monitor_receive_device (udev_monitor);
1374+ if (! udev_device)
1375+ return;
1376+
1377+ subsystem = udev_device_get_subsystem (udev_device);
1378+ action = udev_device_get_action (udev_device);
1379+ kernel = udev_device_get_sysname (udev_device);
1380+ devpath = udev_device_get_devpath (udev_device);
1381+ devname = udev_device_get_devnode (udev_device);
1382+
1383+ if (! strcmp (action, "add")) {
1384+ name = NIH_MUST (nih_sprintf (NULL, "%s-device-added",
1385+ subsystem));
1386+ } else if (! strcmp (action, "change")) {
1387+ name = NIH_MUST (nih_sprintf (NULL, "%s-device-changed",
1388+ subsystem));
1389+ } else if (! strcmp (action, "remove")) {
1390+ name = NIH_MUST (nih_sprintf (NULL, "%s-device-removed",
1391+ subsystem));
1392+ } else {
1393+ name = NIH_MUST (nih_sprintf (NULL, "%s-device-%s",
1394+ subsystem, action));
1395+ }
1396+
1397+ env = NIH_MUST (nih_str_array_new (NULL));
1398+
1399+ if (kernel) {
1400+ nih_local char *var = NULL;
1401+
1402+ var = NIH_MUST (nih_sprintf (NULL, "KERNEL=%s", kernel));
1403+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1404+ }
1405+
1406+ if (devpath) {
1407+ nih_local char *var = NULL;
1408+
1409+ var = NIH_MUST (nih_sprintf (NULL, "DEVPATH=%s", devpath));
1410+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1411+ }
1412+
1413+ if (devname) {
1414+ nih_local char *var = NULL;
1415+
1416+ var = NIH_MUST (nih_sprintf (NULL, "DEVNAME=%s", devname));
1417+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1418+ }
1419+
1420+ if (subsystem) {
1421+ nih_local char *var = NULL;
1422+
1423+ var = NIH_MUST (nih_sprintf (NULL, "SUBSYSTEM=%s", subsystem));
1424+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1425+ }
1426+
1427+ if (action) {
1428+ nih_local char *var = NULL;
1429+
1430+ var = NIH_MUST (nih_sprintf (NULL, "ACTION=%s", action));
1431+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1432+ }
1433+
1434+ for (struct udev_list_entry *list_entry = udev_device_get_properties_list_entry (udev_device);
1435+ list_entry != NULL;
1436+ list_entry = udev_list_entry_get_next (list_entry)) {
1437+ const char * key;
1438+ nih_local char *var = NULL;
1439+
1440+ key = udev_list_entry_get_name (list_entry);
1441+ if (! strcmp (key, "DEVPATH"))
1442+ continue;
1443+ if (! strcmp (key, "DEVNAME"))
1444+ continue;
1445+ if (! strcmp (key, "SUBSYSTEM"))
1446+ continue;
1447+ if (! strcmp (key, "ACTION"))
1448+ continue;
1449+
1450+ var = NIH_MUST (nih_sprintf (NULL, "%s=%s", key,
1451+ udev_list_entry_get_value (list_entry)));
1452+ NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
1453+ }
1454+
1455+ nih_debug ("%s %s", name, devname);
1456+
1457+ pending_call = NIH_SHOULD (upstart_emit_event (upstart,
1458+ name, env, FALSE,
1459+ NULL, emit_event_error, NULL,
1460+ NIH_DBUS_TIMEOUT_NEVER));
1461+ if (! pending_call) {
1462+ NihError *err;
1463+
1464+ err = nih_error_get ();
1465+ nih_warn ("%s", err->message);
1466+ nih_free (err);
1467+ }
1468+
1469+ dbus_pending_call_unref (pending_call);
1470+
1471+ udev_device_unref (udev_device);
1472+}
1473+
1474+
1475+static void
1476+upstart_disconnected (DBusConnection *connection)
1477+{
1478+ nih_fatal (_("Disconnected from Upstart"));
1479+ nih_main_loop_exit (1);
1480+}
1481+
1482+static void
1483+emit_event_error (void * data,
1484+ NihDBusMessage *message)
1485+{
1486+ NihError *err;
1487+
1488+ err = nih_error_get ();
1489+ nih_warn ("%s", err->message);
1490+ nih_free (err);
1491+}
64106e56
SS		 1492--- upstart-0.6.7.orig/udev/Makefile.am
1493+++ upstart-0.6.7/udev/Makefile.am
1494@@ -0,0 +1,67 @@
1495+## Process this file with automake to produce Makefile.in
1496+
1497+AM_CFLAGS = \
1498+ $(NIH_CFLAGS) \
1499+ $(NIH_DBUS_CFLAGS) \
1500+ $(DBUS_CFLAGS) \
1501+ $(UDEV_CFLAGS)
1502+
1503+AM_CPPFLAGS = \
1504+ -DLOCALEDIR="\"$(localedir)\"" \
1505+ -I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
1506+ -I$(top_srcdir)/intl
1507+
1508+
1509+initdir = $(sysconfdir)/init
1510+dist_init_DATA = \
1511+ conf/upstart-udev-bridge.conf
1512+
1513+
1514+dist_man_MANS = \
1515+ man/upstart-udev-bridge.8
1516+
1517+
1518+sbin_PROGRAMS = \
1519+ upstart-udev-bridge
1520+
1521+upstart_udev_bridge_SOURCES = \
1522+ upstart-udev-bridge.c
1523+nodist_upstart_udev_bridge_SOURCES = \
1524+ $(com_ubuntu_Upstart_OUTPUTS)
1525+upstart_udev_bridge_LDADD = \
1526+ $(LTLIBINTL) \
1527+ $(NIH_LIBS) \
1528+ $(NIH_DBUS_LIBS) \
1529+ $(DBUS_LIBS) \
1530+ $(UDEV_LIBS)
1531+
1532+
1533+com_ubuntu_Upstart_OUTPUTS = \
1534+ com.ubuntu.Upstart.c \
1535+ com.ubuntu.Upstart.h
1536+
1537+com_ubuntu_Upstart_XML = \
1538+ ../dbus/com.ubuntu.Upstart.xml
1539+
1540+$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
1541+ $(AM_V_GEN)$(NIH_DBUS_TOOL) \
1542+ --package=$(PACKAGE) \
1543+ --mode=proxy --prefix=upstart \
1544+ --default-interface=com.ubuntu.Upstart0_6 \
1545+ --output=$@ $<
1546+
1547+
1548+# These have to be built sources because we can't compile object files
1549+# without the header file existing first
1550+BUILT_SOURCES = \
1551+ $(com_ubuntu_Upstart_OUTPUTS)
70b263ba 1552+
64106e56
SS		 1553+CLEANFILES = \
1554+ $(com_ubuntu_Upstart_OUTPUTS)
70b263ba 1555+
70b263ba 1556+
64106e56
SS		 1557+clean-local:
1558+ rm -f *.gcno *.gcda
70b263ba 1559+
64106e56
SS		 1560+maintainer-clean-local:
1561+ rm -f *.gcov
1562--- upstart-0.6.7.orig/udev/conf/upstart-udev-bridge.conf
1563+++ upstart-0.6.7/udev/conf/upstart-udev-bridge.conf
1564@@ -0,0 +1,14 @@
1565+# upstart-udev-bridge - Bridge udev events into upstart
1566+#
1567+# This helper daemon receives udev events from the netlink socket and
1568+# emits equivalent Upstart events.
70b263ba 1569+
64106e56
SS		 1570+description "Bridge udev events into upstart"
1571+
1572+start on starting udev
1573+stop on stopped udev
1574+
1575+expect daemon
1576+respawn
1577+
1578+exec upstart-udev-bridge --daemon
1579--- upstart-0.6.7.orig/udev/man/upstart-udev-bridge.8
1580+++ upstart-0.6.7/udev/man/upstart-udev-bridge.8
1581@@ -0,0 +1,35 @@
1582+.TH upstart-udev-bridge 8 2009-09-07 upstart
1583+.\"
1584+.SH NAME
1585+upstart-udev-bridge \- Bridge between Upstart and udev
1586+.\"
1587+.SH SYNOPSIS
1588+.B upstart-udev-bridge
1589+.RI [ OPTIONS ]...
1590+.\"
1591+.SH DESCRIPTION
1592+.B upstart-udev-bridge
1593+receives information about kernel uevents that
1594+.BR udev (8)
1595+has completed and creates
1596+.BR init (8)
1597+events for them.
1598+
1599+This is a temporary tool until
1600+.BR init (8)
1601+itself gains the functionality to read them directly; you should not
1602+rely on its behaviour.
1603+.\"
1604+.SH AUTHOR
1605+Written by Scott James Remnant
1606+.RB < scott@netsplit.com >
1607+.\"
1608+.SH BUGS
1609+Report bugs at
1610+.RB < https://launchpad.net/ubuntu/+source/upstart/+bugs >
1611+.\"
1612+.SH COPYRIGHT
1613+Copyright \(co 2009 Canonical Ltd.
1614+.PP
1615+This is free software; see the source for copying conditions. There is NO
1616+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1617--- upstart-0.6.7.orig/conf/rc.conf
1618+++ upstart-0.6.7/conf/rc.conf
1619@@ -12,7 +12,9 @@
1620 export RUNLEVEL
1621 export PREVLEVEL
1622
1623+console output
1624+env INIT_VERBOSE
1625+
1626 task
1627
1628-console output
1629 exec /etc/init.d/rc $RUNLEVEL
1630--- upstart-0.6.7.orig/conf/Makefile.in
1631+++ upstart-0.6.7/conf/Makefile.in
1632@@ -205,6 +205,8 @@
1633 SET_MAKE = @SET_MAKE@
1634 SHELL = @SHELL@
1635 STRIP = @STRIP@
70b263ba
SS		 1636+UDEV_CFLAGS = @UDEV_CFLAGS@
1637+UDEV_LIBS = @UDEV_LIBS@
64106e56
SS		 1638 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
1639 USE_NLS = @USE_NLS@
1640 VERSION = @VERSION@
1641--- upstart-0.6.7.orig/conf/rc-sysinit.conf
1642+++ upstart-0.6.7/conf/rc-sysinit.conf
1643@@ -6,7 +6,7 @@
1644 description "System V initialisation compatibility"
1645 author "Scott James Remnant <scott@netsplit.com>"
1646
1647-start on startup
1648+start on filesystem and net-device-up IFACE=lo
1649 stop on runlevel
1650
1651 # Default runlevel, this may be overriden on the kernel command-line
1652@@ -21,9 +21,11 @@
1653 env RUNLEVEL=
1654 env PREVLEVEL=
1655
1656+console output
1657+env INIT_VERBOSE
1658+
1659 task
1660
1661-console owner
1662 script
1663 # Check for default runlevel in /etc/inittab
1664 if [ -r /etc/inittab ]
1665--- upstart-0.6.7.orig/debian/upstart.install
1666+++ upstart-0.6.7/debian/upstart.install
1667@@ -0,0 +1,3 @@
1668+debian/conf/*.conf etc/init/
1669+debian/upstart-job lib/init/
1670+debian/migrate-inittab.pl usr/lib/upstart/
1671--- upstart-0.6.7.orig/debian/control
1672+++ upstart-0.6.7/debian/control
1673@@ -0,0 +1,18 @@
1674+Source: upstart
1675+Section: admin
1676+Priority: required
1677+Maintainer: Scott James Remnant <scott@ubuntu.com>, James Hunt <james.hunt@ubuntu.com>
1678+Standards-Version: 3.8.4.0
1679+Build-Depends: debhelper (>= 7.3.15ubuntu2), pkg-config (>= 0.22), libnih-dev (>= 1.0.2), libnih-dbus-dev (>= 1.0.0), nih-dbus-tool, libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), dbus
1680+Homepage: http://upstart.ubuntu.com/
1681+
1682+Package: upstart
1683+Architecture: any
1684+Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, sysv-rc, initscripts, mountall, ifupdown (>= 0.6.8ubuntu29)
1685+Replaces: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
1686+Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
1687+Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services
1688+Description: event-based init daemon
1689+ upstart is a replacement for the /sbin/init daemon which handles
1690+ starting of tasks and services during boot, stopping them during
1691+ shutdown and supervising them while the system is running.
1692--- upstart-0.6.7.orig/debian/README.Debian
1693+++ upstart-0.6.7/debian/README.Debian
1694@@ -0,0 +1,200 @@
1695+upstart
1696+=======
1697+
1698+Upstart is a replacement for the traditional sysvinit package, and
1699+runs as process #1. Through upstart, we are able to have an
1700+event-driven process, whilst at the same time retaining compatibility
1701+for the original sysvinit behaviour.
1702+
1703+This file documents how to do a few common operations with the new
1704+system.
1705+
1706+
1707+Where are initscripts installed?
1708+--------------------------------
1709+
1710+This has not changed, they are installed in /etc/init.d. See
1711+/etc/init.d/README.
1712+
1713+Important system jobs are no longer shipped as initscripts, but as
1714+upstart jobs. These are installed in /etc/init
1715+
1716+
1717+How are initscripts started and stopped?
1718+----------------------------------------
1719+
1720+This has not changed, symlinks are made from the initscript in the
1721+/etc/init.d directory to the /etc/rc?.d directories. See
1722+/etc/init.d/README and /etc/rc?.d/README.
1723+
1724+
1725+What order are initscripts started and stopped in?
1726+--------------------------------------------------
1727+
1728+This has not changed, the symlinks are named SNNname or KNNname, where
1729+NN is a number from 00 to 99. The K scripts are run first in
1730+numerical order, followed by the S scripts in numerical order.
1731+
1732+
1733+How do I find the current/previous runlevel?
1734+--------------------------------------------
1735+
1736+This has not changed, use the "runlevel" command. See runlevel(8).
1737+
1738+
1739+How do I change the runlevel?
1740+-----------------------------
1741+
1742+This has not changed, use the "telinit" command or just invoke "init"
1743+directly. See telinit(8).
1744+
1745+
1746+How do I change the default runlevel?
1747+-------------------------------------
1748+
1749+If you have an /etc/inittab file, edit it. Locate the following line:
1750+
1751+ id:N:initdefault:
1752+
1753+Where N is the default runlevel, change this to match.
1754+
1755+Most people won't have that file, you can edit /etc/init/rc-sysinit.conf
1756+and change the following line:
1757+
1758+ env DEFAULT_RUNLEVEL=2
1759+
1760+
1761+How do I shutdown the machine?
1762+------------------------------
1763+
1764+This has not changed, use the "shutdown" command provided by the
1765+upstart package; you may also use the "reboot"/"halt"/"poweroff"
1766+commands as a short-cut. See shutdown(8) and reboot(8).
1767+
1768+You can also press Control-Alt-Delete on a console to reboot the
1769+machine.
1770+
1771+
1772+How do I change the behaviour of Control-Alt-Delete?
1773+----------------------------------------------------
1774+
1775+Edit the /etc/init/control-alt-delete.conf file, the line beginning
1776+"exec" is what upstart will run when this key combination is pressed.
1777+
1778+To not do anything, you can simply delete this file.
1779+
1780+
1781+How do I enter single-user mode?
1782+--------------------------------
1783+
1784+This hasn't changed, choose the "(recovery mode)" option from GRUB;
1785+add "-s", "S" or "single" to the kernel command-line; or from a
1786+running machine, run "telinit 1" or "shutdown now".
1787+
1788+
1789+How do I reduce the number of gettys?
1790+-------------------------------------
1791+
1792+Also see "How do I change which runlevels gettys are run in?"
1793+
1794+In /etc/init there is a file named ttyN.conf for each getty that will be
1795+started, where N is numbered 1 to 6. Remove any that you do not
1796+want.
1797+
1798+This will not take immediate effect, however you can run "stop ttyN"
1799+to stop one that is running.
1800+
1801+
1802+How do I change getty parameters?
1803+---------------------------------
1804+
1805+In /etc/init there is a file named ttyN.conf for each getty that will be
1806+started, where N is numbered 1 to 6. Edit these files, the line
1807+beginning "respawn" is what upstart will run.
1808+
1809+This will not take immediate effect, run "stop ttyN" followed by
1810+"start ttyN" or just kill the running getty to respawn with the new
1811+parameters.
1812+
1813+
1814+How do I change which runlevels gettys are run in?
1815+--------------------------------------------------
1816+
1817+In /etc/init there is a file named ttyN.conf for each getty that will be
1818+started, where N is numbered 1 to 6. Edit these files, there are two
1819+lines:
1820+
1821+ start on runlevel [2345]
1822+ stop on runlevel [!2345]
1823+
1824+Change the set of runlevels to match your taste.
1825+
1826+This will not take immediate effect, however you can run "stop ttyN"
1827+to stop one that is running or "start ttyN" to start one that isn't.
1828+
1829+
1830+How do I increase the number of gettys?
1831+---------------------------------------
1832+
1833+In /etc/init there is a file named ttyN.conf for each getty that will be
1834+started, where N is numbered 1 to 6.
1835+
1836+Copy one of these files to a new name, we suggest you simply name it
1837+after the tty, e.g. "ttyS0".
1838+
1839+Edit that file, change the "respawn" line to match your requirements;
1840+in particular you'll need to change the tty the getty should be run
1841+on.
1842+
1843+This will not take immediate effect, however you can run "start ttyN"
1844+to start the getty.
1845+
1846+
1847+How do I add a serial console?
1848+------------------------------
1849+
1850+See "How do I increase the number of gettys?"
1851+
1852+
1853+How can I see boot messages on the console?
1854+-------------------------------------------
1855+
1856+This is nothing to do with upstart, but I'll answer this anyway.
1857+Remove "quiet" from the kernel command-line.
1858+
1859+To make this permanent, edit /boot/grub/menu.lst and edit the line
1860+that begins "# defoptions=" (yes, it looks like a comment).
1861+
1862+This will change both usplash and the LSB init logging.
1863+
1864+
1865+Upstart isn't working, how do I debug it?
1866+-----------------------------------------
1867+
1868+Add "--debug" to the kernel command-line, and be sure to remove "quiet"
1869+and "splash". You'll now see debugging messages as upstart works.
1870+
1871+
1872+Can I query upstart for a list of jobs?
1873+---------------------------------------
1874+
1875+Yes, "initctl list" will list the known jobs and their status.
1876+
1877+
1878+How do I manually start or stop a job?
1879+--------------------------------------
1880+
1881+Use "start JOB" or "stop JOB".
1882+
1883+
1884+How do I find the status of a job?
1885+----------------------------------
1886+
1887+Use "status JOB".
1888+
1889+
1890+Can I emit an event by hand?
1891+----------------------------
1892+
1893+Yes, "initctl emit EVENT" will emit the named event and cause any
1894+jobs waiting for it to be started or stopped as appropriate.
1895--- upstart-0.6.7.orig/debian/migrate-inittab.pl
1896+++ upstart-0.6.7/debian/migrate-inittab.pl
1897@@ -0,0 +1,143 @@
1898+#!/usr/bin/perl
1899+
1900+use strict;
1901+use warnings;
1902+
1903+my %gettys;
1904+my $have_cad = 0;
1905+
1906+
1907+#-----------------------------------------------------------------------------#
1908+# Parse /etc/inittab
1909+#-----------------------------------------------------------------------------#
1910+
1911+open INITTAB, "/etc/inittab"
1912+ or die "Unable to open /etc/inittab: $!";
1913+
1914+while (<INITTAB>) {
1915+ chomp;
1916+ s/^\s*//;
1917+
1918+ next if /^\#/;
1919+ next unless length;
1920+
1921+ my ($id, $rlevel, $action, $process) = split /:/, $_, 4;
1922+
1923+ warn "missing id field" and next
1924+ unless defined $id and length $id;
1925+ warn "missing runlevel field" and next
1926+ unless defined $rlevel;
1927+ warn "missing action field" and next
1928+ unless defined $action and length $action;
1929+ warn "missing process field" and next
1930+ unless defined $process;
1931+
1932+
1933+ $have_cad = 1 if $action eq "ctrlaltdel";
1934+ $gettys{$1} = [ $rlevel, $process ] if $process =~ /getty.*\b(tty\w+)/;
1935+}
1936+
1937+close INITTAB
1938+ or warn "Error while closing /etc/inittab: $!";
1939+
1940+
1941+#-----------------------------------------------------------------------------#
1942+# Alter /etc/event.d
1943+#-----------------------------------------------------------------------------#
1944+
1945+unlink "/etc/init/control-alt-delete.conf"
1946+ unless $have_cad;
1947+
1948+foreach (qw/tty1 tty2 tty3 tty4 tty5 tty6/) {
1949+ unlink "/etc/init/$_.conf"
1950+ unless exists $gettys{$_};
1951+}
1952+
1953+foreach (sort keys %gettys) {
1954+ my ($rlevel, $process) = @{$gettys{$_}};
1955+
1956+ my @job;
1957+ if (-f "/etc/event.d/$_") {
1958+ open JOB, "/etc/event.d/$_"
1959+ or warn "Unable to open /etc/event.d/$_: $!" and next;
1960+ @job = <JOB>;
1961+ chomp @job;
1962+ close JOB
1963+ or warn "Error while closing /etc/event,d/$_: $!" and next;
1964+
1965+ foreach my $rl (qw/2 3 4 5/) {
1966+ my $idx;
1967+ for ($idx = 0; $idx < @job; $idx++) {
1968+ last if $job[$idx] =~ /^\s*(start|stop)\s+on\s+runlevel\s+$rl\b/;
1969+ }
1970+
1971+ if ($idx < @job) {
1972+ if ($rlevel =~ /$rl/) {
1973+ $job[$idx] =~ s/^(\s*)stop(\s+)/$1start$2/;
1974+ } else {
1975+ $job[$idx] =~ s/^(\s*)start(\s+)/$1stop$2/;
1976+ }
1977+ } else {
1978+ if ($rlevel =~ /$rl/) {
1979+ push @job, "start on runlevel $rl";
1980+ } else {
1981+ push @job, "stop on runlevel $rl";
1982+ }
1983+ }
1984+ }
1985+
1986+ my $idx;
1987+ for ($idx = 0; $idx < @job; $idx++) {
1988+ last if $job[$idx] =~ /^\s*respawn\s*/; # match bare 'respawn' too
1989+ }
1990+
1991+ if ($idx < @job) {
1992+ # only match old-style 'respawn process', not bare 'respawn'
1993+ $job[$idx] =~ s/^(\s*respawn\s+).*/$1$process/;
1994+ } else {
1995+ push @job, "respawn";
1996+ push @job, "exec $process";
1997+ }
1998+
1999+ # Try to fix up effects of previous broken migrations
2000+ if (@job and $job[$#job] =~ /.*(.+?)exec (\1)$/) {
2001+ $job[$#job] = "exec $1";
2002+ }
2003+
2004+ } else {
2005+ push @job, "# $_ - getty";
2006+ push @job, "#";
2007+ push @job, "# Converted from /etc/inittab entry";
2008+ push @job, "";
2009+
2010+ foreach my $rl (qw/2 3 4 5/) {
2011+ if ($rlevel =~ /$rl/) {
2012+ push @job, "start on runlevel $rl";
2013+ } else {
2014+ push @job, "stop on runlevel $rl";
2015+ }
2016+ }
2017+ push @job, "";
2018+
2019+ push @job, "stop on shutdown";
2020+ push @job, "";
2021+
2022+ push @job, "respawn";
2023+ push @job, "exec $process";
2024+ }
2025+
2026+ open JOB, ">/etc/event.d/.$_"
2027+ or warn "Unable to write to /etc/event.d/.$_: $!" and next;
2028+ print JOB map { "$_\n" } @job;
2029+ unless (close JOB) {
2030+ warn "Error while closing /etc/event.d/.$_: $!";
2031+ unlink "/etc/event.d/.$_";
2032+ next;
2033+ }
2034+
2035+ unless (rename "/etc/event.d/.$_", "/etc/event.d/$_") {
2036+ warn "Unable to replace /etc/event.d/$_: $!";
2037+ unlink "/etc/event.d/.$_";
2038+ next;
2039+ }
2040+}
2041--- upstart-0.6.7.orig/debian/rules
2042+++ upstart-0.6.7/debian/rules
2043@@ -0,0 +1,25 @@
2044+#!/usr/bin/make -f
2045+%:
2046+ dh $@
2047+
2048+
2049+CFLAGS = -Wall -g -fstack-protector -fPIE
2050+LDFLAGS = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -pie
2051+
2052+# Disable optimisations if noopt found in $DEB_BUILD_OPTIONS
2053+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
2054+ CFLAGS += -O0
2055+ LDFLAGS += -Wl,-O0
2056+else
2057+ CFLAGS += -Os
2058+ LDFLAGS += -Wl,-O1
2059+endif
2060+
2061+override_dh_auto_configure:
2062+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
2063+ --exec-prefix=
2064+
2065+override_dh_fixperms:
2066+ dh_fixperms
2067+ chmod 755 debian/upstart/lib/init/upstart-job
2068+ chmod 755 debian/upstart/usr/lib/upstart/migrate-inittab.pl
2069--- upstart-0.6.7.orig/debian/compat
2070+++ upstart-0.6.7/debian/compat
2071@@ -0,0 +1 @@
2072+7
2073--- upstart-0.6.7.orig/debian/upstart-job
2074+++ upstart-0.6.7/debian/upstart-job
2075@@ -0,0 +1,73 @@
2076+#!/bin/sh -e
2077+# upstart-job
2078+#
2079+# Symlink target for initscripts that have been converted to Upstart.
2080+
2081+set -e
2082+
2083+INITSCRIPT="$(basename "$0")"
2084+JOB="${INITSCRIPT%.sh}"
2085+
2086+if [ "$JOB" = "upstart-job" ]; then
2087+ if [ -z "$1" ]; then
2088+ echo "Usage: upstart-job JOB COMMAND" 1>&2
2089+ exit 1
2090+ fi
2091+
2092+ JOB="$1"
2093+ INITSCRIPT="$1"
2094+ shift
2095+else
2096+ if [ -z "$1" ]; then
2097+ echo "Usage: $0 COMMAND" 1>&2
2098+ exit 1
2099+ fi
2100+fi
2101+
2102+COMMAND="$1"
2103+shift
2104+
2105+
2106+if [ -z "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
2107+ ECHO=echo
2108+else
2109+ ECHO=:
2110+fi
2111+
2112+$ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)"
2113+$ECHO "utility, e.g. service $INITSCRIPT $COMMAND"
2114+
2115+case $COMMAND in
2116+status)
2117+ $ECHO
2118+ $ECHO "Since the script you are attempting to invoke has been converted to an"
2119+ $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
2120+ $COMMAND "$JOB"
2121+ ;;
2122+start|stop|restart)
2123+ $ECHO
2124+ $ECHO "Since the script you are attempting to invoke has been converted to an"
2125+ $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
2126+ PID=$(status "$JOB" 2>/dev/null | awk '/[0-9]$/ { print $NF }')
2127+ if [ -z "$PID" ] && [ "$COMMAND" = "stop" ]; then
2128+ exit 0
2129+ elif [ -n "$PID" ] && [ "$COMMAND" = "start" ]; then
2130+ exit 0
2131+ elif [ -z "$PID" ] && [ "$COMMAND" = "restart" ]; then
2132+ start "$JOB"
2133+ exit 0
2134+ fi
2135+ $COMMAND "$JOB"
2136+ ;;
2137+reload|force-reload)
2138+ $ECHO
2139+ $ECHO "Since the script you are attempting to invoke has been converted to an"
2140+ $ECHO "Upstart job, you may also use the reload(8) utility, e.g. reload $JOB"
2141+ reload "$JOB"
2142+ ;;
2143+*)
2144+ $ECHO
2145+ $ECHO "The script you are attempting to invoke has been converted to an Upstart" 1>&2
2146+ $ECHO "job, but $COMMAND is not supported for Upstart jobs." 1>&2
2147+ exit 1
2148+esac
2149--- upstart-0.6.7.orig/debian/upstart.postinst
2150+++ upstart-0.6.7/debian/upstart.postinst
2151@@ -0,0 +1,62 @@
2152+#!/bin/sh -e
2153+# This script can be called in the following ways:
2154+#
2155+# After the package was installed:
2156+# <postinst> configure <old-version>
2157+#
2158+#
2159+# If prerm fails during upgrade or fails on failed upgrade:
2160+# <old-postinst> abort-upgrade <new-version>
2161+#
2162+# If prerm fails during deconfiguration of a package:
2163+# <postinst> abort-deconfigure in-favour <new-package> <version>
2164+# removing <old-package> <version>
2165+#
2166+# If prerm fails during replacement due to conflict:
2167+# <postinst> abort-remove in-favour <new-package> <version>
2168+
2169+
2170+# Remove a no-longer used conffile
2171+rm_conffile()
2172+{
2173+ CONFFILE="$1"
2174+
2175+ if [ -e "$CONFFILE".dpkg-obsolete ]; then
2176+ echo "Removing obsolete conffile $CONFFILE"
2177+ rm -f "$CONFFILE".dpkg-obsolete
2178+ fi
2179+}
2180+
2181+
2182+case "$1" in
2183+ configure)
2184+ if dpkg --compare-versions "$2" lt-nl 0.6.0; then
2185+ # We're upgrading from a version of Upstart that doesn't use
2186+ # D-Bus for its IPC. We have to tell it to re-exec into one
2187+ # that does. It'll lose all state, but we didn't keep much
2188+ # in those days.
2189+ telinit u
2190+ else
2191+ # Before we shutdown or reboot, we need to re-exec so that we
2192+ # can safely remount the root filesystem; we can't just do that
2193+ # here because we lose state.
2194+ touch /var/run/init.upgraded || :
2195+ fi
2196+
2197+ # Upgrade from karmic development version
2198+ if dpkg --compare-versions "$2" lt-nl 0.6.3-7; then
2199+ rm_conffile /etc/init/dbus-reconnect.conf
2200+ fi
2201+ ;;
2202+
2203+ abort-upgrade|abort-deconfigure|abort-remove)
2204+ ;;
2205+
2206+ *)
2207+ echo "$0 called with unknown argument \`$1'" 1>&2
2208+ exit 1
2209+ ;;
2210+esac
2211+
2212+#DEBHELPER#
2213+exit 0
2214--- upstart-0.6.7.orig/debian/copyright
2215+++ upstart-0.6.7/debian/copyright
2216@@ -0,0 +1,18 @@
2217+This is the Ubuntu package of upstart, the event-based init daemon.
2218+
2219+Copyright © 2009 Canonical Ltd.
2220+Copyright © 2009 Scott James Remnant <scott@netsplit.com>
2221+
2222+Licence:
2223+
2224+This program is free software; you can redistribute it and/or modify
2225+it under the terms of the GNU General Public License version 2, as
2226+published by the Free Software Foundation.
2227+
2228+This program is distributed in the hope that it will be useful, but
2229+WITHOUT ANY WARRANTY; without even the implied warranty of
2230+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2231+General Public License for more details.
2232+
2233+On Ubuntu systems, the complete text of the GNU General Public License
2234+can be found in ‘/usr/share/common-licenses/GPL’.
2235--- upstart-0.6.7.orig/debian/upstart.docs
2236+++ upstart-0.6.7/debian/upstart.docs
2237@@ -0,0 +1,2 @@
2238+AUTHORS
2239+NEWS
2240--- upstart-0.6.7.orig/debian/upstart.postrm
2241+++ upstart-0.6.7/debian/upstart.postrm
2242@@ -0,0 +1,81 @@
2243+#!/bin/sh -e
2244+# This script can be called in the following ways:
2245+#
2246+# After the package was removed:
2247+# <postrm> remove
2248+#
2249+# After the package was purged:
2250+# <postrm> purge
2251+#
2252+# After the package was upgraded:
2253+# <old-postrm> upgrade <new-version>
2254+# if that fails:
2255+# <new-postrm> failed-upgrade <old-version>
2256+#
2257+#
2258+# After all of the packages files have been replaced:
2259+# <postrm> disappear <overwriting-package> <version>
2260+#
2261+#
2262+# If preinst fails during install:
2263+# <new-postrm> abort-install
2264+#
2265+# If preinst fails during upgrade of removed package:
2266+# <new-postrm> abort-install <old-version>
2267+#
2268+# If preinst fails during upgrade:
2269+# <new-postrm> abort-upgrade <old-version>
2270+
2271+
2272+# Undo removal of a no-longer used conffile
2273+undo_rm_conffile()
2274+{
2275+ CONFFILE="$1"
2276+
2277+ if [ ! -e "$CONFFILE" ]; then
2278+ if [ -e "$CONFFILE".dpkg-bak ]; then
2279+ echo "Restoring modified conffile $CONFFILE"
2280+ mv -f "$CONFFILE".dpkg-bak "$CONFFILE"
2281+ elif [ -e "$CONFFILE".dpkg-obsolete ]; then
2282+ mv -f "$CONFFILE".dpkg-obsolete "$CONFFILE"
2283+ fi
2284+ fi
2285+}
2286+
2287+# Finish removal of a no-longer used conffile
2288+finish_rm_conffile()
2289+{
2290+ CONFFILE="$1"
2291+
2292+ if [ -e "$CONFFILE".dpkg-bak ]; then
2293+ rm -f "$CONFFILE".dpkg-bak
2294+ fi
2295+}
2296+
2297+
2298+case "$1" in
2299+ remove)
2300+ ;;
2301+
2302+ purge)
2303+ finish_rm_conffile /etc/init/dbus-reconnect.conf
2304+ ;;
2305+
2306+ upgrade|failed-upgrade|disappear)
2307+ ;;
2308+
2309+ abort-install|abort-upgrade)
2310+ # Abort upgrade from karmic development version
2311+ if dpkg --compare-versions "$2" lt-nl 0.6.3-7; then
2312+ undo_rm_conffile /etc/init/dbus-reconnect.conf
2313+ fi
2314+ ;;
2315+
2316+ *)
2317+ echo "$0 called with unknown argument \`$1'" 1>&2
2318+ exit 1
2319+ ;;
2320+esac
2321+
2322+#DEBHELPER#
2323+exit 0
2324--- upstart-0.6.7.orig/debian/upstart.preinst
2325+++ upstart-0.6.7/debian/upstart.preinst
2326@@ -0,0 +1,54 @@
2327+#!/bin/sh -e
2328+# This script can be called in the following ways:
2329+#
2330+# Before the package is installed:
2331+# <new-preinst> install
2332+#
2333+# Before removed package is upgraded:
2334+# <new-preinst> install <old-version>
2335+#
2336+# Before the package is upgraded:
2337+# <new-preinst> upgrade <old-version>
2338+#
2339+#
2340+# If postrm fails during upgrade or fails on failed upgrade:
2341+# <old-preinst> abort-upgrade <new-version>
2342+
2343+
2344+# Prepare to remove a no-longer used conffile
2345+prep_rm_conffile()
2346+{
2347+ CONFFILE="$1"
2348+
2349+ if [ -e "$CONFFILE" ]; then
2350+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
2351+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`"
2352+ if [ "$md5sum" != "$old_md5sum" ]; then
2353+ echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak"
2354+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
2355+ else
2356+ mv -f "$CONFFILE" "$CONFFILE".dpkg-obsolete
2357+ fi
2358+ fi
2359+}
2360+
2361+
2362+case "$1" in
2363+ install|upgrade)
2364+ # Upgrade from karmic development version
2365+ if dpkg --compare-versions "$2" lt-nl 0.6.3-7; then
2366+ prep_rm_conffile /etc/init/dbus-reconnect.conf
2367+ fi
2368+ ;;
2369+
2370+ abort-upgrade)
2371+ ;;
2372+
2373+ *)
2374+ echo "$0 called with unknown argument \`$1'" 1>&2
2375+ exit 1
2376+ ;;
2377+esac
2378+
2379+#DEBHELPER#
2380+exit 0
2381--- upstart-0.6.7.orig/debian/changelog
2382+++ upstart-0.6.7/debian/changelog
2383@@ -0,0 +1,712 @@
2384+upstart (0.6.7-1) natty; urgency=low
2385+
2386+ * New upstream release:
2387+ - Added manual stanza.
2388+ - Added debug stanza.
2389+ - Added start_on, stop_on and emits properties.
2390+ - Added GoalChanged, StateChanged and Failed signals.
2391+ - Documentation updates.
2392+
2393+ * Added myself as a maintainer.
2394+
2395+ -- James Hunt <james.hunt@ubuntu.com> Tue, 14 Dec 2010 17:15:57 +0000
2396+
2397+upstart (0.6.6-3) maverick; urgency=low
2398+
2399+ * Ubuntu seems to have stopped installing Recommends of Build-Depends,
2400+ add a Build-Depend on dbus. LP: #602130.
2401+
2402+ -- Scott James Remnant <scott@ubuntu.com> Thu, 12 Aug 2010 16:38:05 -0400
2403+
2404+upstart (0.6.6-2) maverick; urgency=low
2405+
2406+ * Apply patch from trunk to use /dev/null when /dev/console is unavailable
2407+ due to kernel bugs. This isn't a fix for those bugs, but it does work
2408+ around it for now. LP: #554172.
2409+
2410+ -- Scott James Remnant <scott@ubuntu.com> Thu, 12 Aug 2010 09:52:07 -0400
2411+
2412+upstart (0.6.6-1ubuntu1) maverick; urgency=low
2413+
2414+ * Try buying with -fPIE/-pie on armel again; we have a shiny new armel
2415+ toolchain and this part of the rules was broken in 0.6.6-1 anyway.
2416+
2417+ -- Loïc Minier <loic.minier@ubuntu.com> Fri, 23 Jul 2010 14:54:11 +0200
2418+
2419+upstart (0.6.6-1) maverick; urgency=low
2420+
2421+ * New upstream release:
2422+ - All changes were previously merged into this package.
2423+
2424+ * debian/upstart-job:
2425+ - Fix output for the force-reload command to only refer to reload(8).
2426+ LP: #532862.
2427+
2428+ * Add debian/source/format with "1.0" to be future compatible.
2429+ * Add missing ${misc:Depends}.
2430+ * Bump standards version.
2431+ * Convert rules to dh7 format.
2432+
2433+ -- Scott James Remnant <scott@ubuntu.com> Tue, 27 Apr 2010 13:41:18 -0700
2434+
2435+upstart (0.6.5-6) lucid; urgency=low
2436+
2437+ * Merge fixes from trunk:
2438+ - double-quoting of NIH_CFLAGS and NIH_DBUS_CFLAGS on --with-local-libnih
2439+ - document "env KEY" behaviour
2440+ * conf/rc.conf, conf/rc-sysinit.conf:
2441+ - enable console output. LP: #548954.
2442+ - pass value of INIT_VERBOSE from kernel command-line.
2443+
2444+ -- Scott James Remnant <scott@ubuntu.com> Thu, 01 Apr 2010 19:25:36 +0100
2445+
2446+upstart (0.6.5-5) lucid; urgency=low
2447+
2448+ * init/main.c:
2449+ - Don't change the settings of the foreground console, this is often
2450+ owned by plymouth and not supposed to be in Canonical Mode; all other
2451+ paths have stty sane settings anyway (which these are not), so there
2452+ really isn't need for init to do this. LP: #540256.
2453+
2454+ -- Scott James Remnant <scott@ubuntu.com> Wed, 17 Mar 2010 22:34:55 +0000
2455+
2456+upstart (0.6.5-4) lucid; urgency=low
2457+
2458+ * debian/control:
2459+ - change Pre-Depends back to Depends, this was a holdover from when we
2460+ attempted to make Upstart Essential to solve early sysvinit→upstart
2461+ upgrade issues, we backed out the Essential bit but never the use of
2462+ Pre-Depends. LP: #527722.
2463+ - add versioned-dependencies on ifupdown for loopback fix that can
2464+ prevent initscripts from being run. LP: #527830.
2465+
2466+ * Merge patches from trunk to use /proc/self/fd instead of /dev/fd, and
2467+ to always mount /proc and /sys on boot.
2468+
2469+ -- Scott James Remnant <scott@ubuntu.com> Fri, 26 Feb 2010 15:40:58 +0000
2470+
2471+upstart (0.6.5-3) lucid; urgency=low
2472+
2473+ * udev/upstart-udev-bridge.c: use right variable name, fixing a build
2474+ failure. (LP: #524484)
2475+
2476+ -- Scott Moser <smoser@ubuntu.com> Fri, 19 Feb 2010 10:21:33 -0500
2477+
2478+upstart (0.6.5-2) lucid; urgency=low
2479+
2480+ * udev/upstart-udev-bridge.c:
2481+ - Increase receiving buffer size for uevents so we don't miss any.
2482+ LP: #504883.
2483+
2484+ -- Scott James Remnant <scott@ubuntu.com> Wed, 17 Feb 2010 15:50:40 +0000
2485+
2486+upstart (0.6.5-1) lucid; urgency=low
2487+
2488+ * New upstream release:
2489+ - libnih has been separated out into its own project.
2490+ - "start on" and "stop on" now support != matches. LP: #513035.
2491+ - Fixed crash in child when unable to spawn job. LP: #451917.
2492+ - No longer holds /dev/console open so SAK won't kill init. LP: #486005.
2493+ - Added missing OPTIONS section to init(8). LP: #449883.
2494+
2495+ [ Scott James Remnant ]
2496+ * Build-depend on libnih-dev, libnih-dbus-dev and nih-dbus-tool to use
2497+ the separated out libnih.
2498+ - This has the fix for LP: #436758.
2499+ - Remove changelog.nih from the doc directory.
2500+ * Bump udev build-dependency to 147 to match upstream.
2501+ * udev/Makefile.am: Update to use external libnih
2502+
2503+ [ Johan Kiviniemi ]
2504+ * udev/upstart-udev-bridge.c: Change -device-remove to -device-removed to
2505+ match -device-added and -device-changed. LP: #516698.
2506+
2507+ -- Scott James Remnant <scott@ubuntu.com> Thu, 04 Feb 2010 16:30:10 -0800
2508+
2509+upstart (0.6.3-11build1) lucid; urgency=low
2510+
2511+ * Rebuild to pick up relaxed dependency on libc6, after checking that
2512+ __abort_msg is available with the same signature in eglibc 2.11.
2513+ LP: #508702.
2514+
2515+ -- Matthias Klose <doko@ubuntu.com> Mon, 18 Jan 2010 16:10:11 +0100
2516+
2517+upstart (0.6.3-11) karmic-proposed; urgency=low
2518+
2519+ * Make rc-sysinit.conf wait on the loopback interface, to ensure that the
2520+ interface is up before we process the scripts in /etc/rc?.d. LP: #461725.
2521+
2522+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 08 Dec 2009 12:58:37 -0800
2523+
2524+upstart (0.6.3-10) karmic; urgency=low
2525+
2526+ * Retain the "telinit u" for the case when we're upgrading from pre-0.6
2527+ (ie. hardy or jaunty). Whups. LP: #451556.
2528+
2529+ -- Scott James Remnant <scott@ubuntu.com> Thu, 15 Oct 2009 17:48:47 +0100
2530+
2531+upstart (0.6.3-9) karmic; urgency=low
2532+
2533+ * Restore the call to sync() in reboot, have been observing some issues
2534+ and it looks like ext4 might not be explicitly flushing the disk when
2535+ remounting read-only.
2536+
2537+ -- Scott James Remnant <scott@ubuntu.com> Wed, 14 Oct 2009 16:40:32 +0100
2538+
2539+upstart (0.6.3-8) karmic; urgency=low
2540+
2541+ * Rather than calling "telinit u" after upgrade, which will lose state,
2542+ have the umountroot initscript take care of it for us by setting a
2543+ flag. LP: #441796.
2544+ * Don't lose the original default runlevel if /etc/inittab exists without
2545+ an initdefault line. LP: #405847.
2546+ * Fix "unhandled error" in shutdown when unable to change runlevel,
2547+ e.g. due to previous Ubiquity bug. LP: #426332.
2548+ * Merge change from trunk that makes it possible to build Upstart using
2549+ a previously built copy of nih-dbus-tool, especially useful when
2550+ cross-compiling. LP: #426740.
2551+ * Merge change from libnih to store our assertion messages in the
2552+ glibc __abort_msg symbol so apport can pick them up. LP: #429411.
2553+ * Merge change from libnih to fix compilation issue with eglibc due
2554+ to changed alphasort() prototype.
2555+
2556+ -- Scott James Remnant <scott@ubuntu.com> Wed, 14 Oct 2009 05:34:13 +0100
2557+
2558+upstart (0.6.3-7) karmic; urgency=low
2559+
2560+ * Ignore initramfs pids that don't exist. LP: #440071.
2561+ - you still need to ensure that the pid's parent is init, there's no
2562+ cheap way to test for that.
2563+ * Remove "console owner" and "console output" from rc scripts.
2564+ * Try harder to remove dbus-reconnect.conf
2565+
2566+ -- Scott James Remnant <scott@ubuntu.com> Fri, 02 Oct 2009 21:09:03 +0100
2567+
2568+upstart (0.6.3-6) karmic; urgency=low
2569+
2570+ * Don't use "telinit q" to reconnect to D-Bus, since that breaks
2571+ lots of things. Invent another secret way instead.
2572+
2573+ [ Steve Langasek ]
2574+ * upstart-job's restart target must also not fail when the service is not
2575+ yet started. LP: #430883.
2576+
2577+ -- Scott James Remnant <scott@ubuntu.com> Thu, 01 Oct 2009 15:26:19 +0100
2578+
2579+upstart (0.6.3-5) karmic; urgency=low
2580+
2581+ * Update autoconf and automake files. LP: #435252.
2582+
2583+ -- Scott James Remnant <scott@ubuntu.com> Wed, 23 Sep 2009 14:16:34 -0700
2584+
2585+upstart (0.6.3-4) karmic; urgency=low
2586+
2587+ [ Scott James Remnant ]
2588+ * Reduce the priority of the stopped by/continued by messages so that
2589+ they are only shown when --verbose on the kernel command-line.
2590+ LP: #401333.
2591+ * Add a hack to look for /dev/.initramfs/*.pid files on startup and
2592+ "fake" start jobs of those names. Basically this means that "status"
2593+ and "stop" work for things like bootchart and usplash.
2594+ * Implement a "reload" command in initctl that retrieves the current pid
2595+ of the job and sends it the HUP signal. LP: #433544.
2596+
2597+ [ Steve Langasek ]
2598+ * debian/upstart-job:
2599+ - give proper policy-compliant behavior of the start command: detect if
2600+ the job is already running using upstart status, and if so return success.
2601+ - same for the stop command: return success if the job is already stopped.
2602+ - when $DPKG_MAINTSCRIPT_PACKAGE is set, don't spit warnings out because
2603+ it's not the user's fault - we're being invoked by a maintainer script.
2604+
2605+ -- Scott James Remnant <scott@ubuntu.com> Tue, 22 Sep 2009 13:56:48 -0700
2606+
2607+upstart (0.6.3-3) karmic; urgency=low
2608+
2609+ * debian/upstart-job:
2610+ - force-reload should only send a HUP signal, since it may not be wise
2611+ to actually restart (cf. dbus)
2612+
2613+ -- Scott James Remnant <scott@ubuntu.com> Wed, 16 Sep 2009 00:10:13 +0100
2614+
2615+upstart (0.6.3-2) karmic; urgency=low
2616+
2617+ FFE LP: #427356.
2618+
2619+ * debian/upstart-job:
2620+ - Remove trailing "s" from file
2621+ - Support direct invocation better.
2622+ * udev/upstart-udev-bridge.c:
2623+ - New tool to capture events from the udev netlink socket and
2624+ convert into upstart events.
2625+ * conf/rc-sysinit.conf:
2626+ - Run once all filesystems are mounted, rather than on startup
2627+ * debian/control:
2628+ - Add dependency on mountall for the filesystem event.
2629+
2630+ -- Scott James Remnant <scott@ubuntu.com> Tue, 15 Sep 2009 03:19:09 +0100
2631+
2632+upstart (0.6.3-1) karmic; urgency=low
2633+
2634+ * New upstream release:
2635+ - Fixed assertion when a job exits while stopping. LP: #406408.
2636+ - Fixed compilation on ia64.
2637+ - nih-dbus-tool(1) manpage no longer installed.
2638+
2639+ -- Scott James Remnant <scott@ubuntu.com> Mon, 03 Aug 2009 23:58:47 +0100
2640+
2641+upstart (0.6.2-1) karmic; urgency=low
2642+
2643+ * New upstream release:
2644+ - Fixed assertion when stopping a job during its starting event.
2645+ - Fixed fork following to not stop on exec() before fork()
2646+ - Fixed missing chdir() in crash handler.
2647+
2648+ -- Scott James Remnant <scott@ubuntu.com> Wed, 22 Jul 2009 10:39:50 +0100
2649+
2650+upstart (0.6.1-1) karmic; urgency=low
2651+
2652+ * New upstream release:
2653+ - Fixed race condition in ptrace() code. LP: #264711.
2654+ - Fixed runlevel to output "unknown" not "N N". LP: #400248.
2655+ - Fixed runlevel to prefix error messages with filename. LP: #400241.
2656+
2657+ * Provide/Conflict/Replace the agreed "upstart-job" meta-package.
2658+ LP: #399799.
2659+ * Bump dpkg dependency to 1.2.16
2660+
2661+ -- Scott James Remnant <scott@ubuntu.com> Thu, 16 Jul 2009 18:26:23 +0100
2662+
2663+upstart (0.6.0-5) karmic; urgency=low
2664+
2665+ * Cherry-pick patch from -r1188 to fix "expect fork" and "expect daemon"
2666+ LP: #264711.
2667+
2668+ -- Scott James Remnant <scott@ubuntu.com> Tue, 14 Jul 2009 15:19:17 +0100
2669+
2670+upstart (0.6.0-4) karmic; urgency=low
2671+
2672+ * Don't build the testsuite with -fPIE on armel; LP: #398403.
2673+
2674+ -- Loïc Minier <lool@dooz.org> Mon, 13 Jul 2009 22:12:34 +0200
2675+
2676+upstart (0.6.0-3) karmic; urgency=low
2677+
2678+ * Add Conflicts on older Upstart packages to make update-manager's
2679+ job easier.
2680+
2681+ -- Scott James Remnant <scott@ubuntu.com> Fri, 10 Jul 2009 10:11:21 +0100
2682+
2683+upstart (0.6.0-2) karmic; urgency=low
2684+
2685+ * Bump D-Bus build dependency to ensure we get the container abandonment
2686+ patches, and the GIT version bump.
2687+ * Actually ship /lib/init/upstart-job
2688+
2689+ -- Scott James Remnant <scott@ubuntu.com> Thu, 09 Jul 2009 17:29:59 +0100
2690+
2691+upstart (0.6.0-1) karmic; urgency=low
2692+
2693+ * New upstream release ("How appropriate, you fight like a cow")
2694+ - my customary changes list since pointless, it's basically a
2695+ complete rewrite.
2696+ - Handles /bin/sh symlink disappearing. LP: #65024.
2697+ - Boot parameters may be passed to init scripts. LP: #74664.
2698+ - reboot implies --force during shutdown. LP: #388738.
2699+ - reboot no longer iterates /proc/ide. LP: #92685.
2700+ - much improved documentation. LP: #60429, #72058, #388715.
2701+
2702+ * Merge the various upstart packages into a single package, it makes
2703+ little sense to have it all spread out.
2704+
2705+ -- Scott James Remnant <scott@ubuntu.com> Wed, 08 Jul 2009 23:12:03 +0100
2706+
2707+upstart (0.3.10-2) karmic; urgency=low
2708+
2709+ * debian/upstart.postinst: Use telinit u to re-exec, rather than
2710+ kill just in case it's not Upstart that's running. LP: #92177.
2711+ * debian/event.d/system-services/tty*: Run getty in 8-bit clean
2712+ mode. LP: #273189.
2713+ * debian/event.d/upstart-compat-sysv/rc-default:
2714+ - Don't use grep -w, instead split on $IFS and iterate. LP: #385911.
2715+ - Check for any valid runlevel, not just S. LP: #85014.
2716+ - Make console owner, since it may spawn sulogin.
2717+ * debian/event.d/upstart-compat-sysv/rcS:
2718+ - Spawn sulogin if given -b or "emergency". LP: #193810.
2719+ * debian/event.d/upstart-compat-sysv/rcS:
2720+ - Make console owner. LP: #211402.
2721+ * debian/event.d/upstart-compat-sysv/rcS-sulogin:
2722+ - Place the telinit code in post-stop, checking $UPSTART_EVENT first so
2723+ we don't change the runlevel if we were stopped due to a runlevel
2724+ change. LP: #66002.
2725+
2726+ -- Scott James Remnant <scott@ubuntu.com> Thu, 18 Jun 2009 16:19:34 +0100
2727+
2728+upstart (0.3.10-1) karmic; urgency=low
2729+
2730+ * Compilation fixes.
2731+ * Fixed assertion caused by the post-start or pre-stop scripts
2732+ exiting after the main process of a respawning job had exited.
2733+ LP: #381048.
2734+
2735+ -- Scott James Remnant <scott@ubuntu.com> Wed, 17 Jun 2009 13:33:40 +0100
2736+
2737+upstart (0.3.9-8) intrepid; urgency=low
2738+
2739+ * Do not attempt to continue communicating with the restarted upstart
2740+ (LP: #273761).
2741+
2742+ -- Kees Cook <kees@ubuntu.com> Mon, 29 Sep 2008 13:35:21 -0700
2743+
2744+upstart (0.3.9-7) intrepid; urgency=low
2745+
2746+ * Implement "telinit u" by just sending Upstart SIGTERM with a slightly
2747+ different patch than Fedora. LP: #188925.
2748+
2749+ -- Scott James Remnant <scott@ubuntu.com> Tue, 23 Sep 2008 09:01:09 -0700
2750+
2751+upstart (0.3.9-6) intrepid; urgency=low
2752+
2753+ * Really fix LP: #237276 properly this time, lost the change while mucking
2754+ around with bzr.
2755+
2756+ -- Scott James Remnant <scott@ubuntu.com> Wed, 04 Jun 2008 22:29:48 +0100
2757+
2758+upstart (0.3.9-5) intrepid; urgency=low
2759+
2760+ * Correct build problem on amd64 and ia64 by only building libnih and
2761+ libupstart statically. The shared objects were unwanted, and conflict
2762+ with -fPIE.
2763+
2764+ -- Scott James Remnant <scott@ubuntu.com> Wed, 04 Jun 2008 17:07:12 +0100
2765+
2766+upstart (0.3.9-4) intrepid; urgency=low
2767+
2768+ * Add missing limits.h, required to build with current libc.
2769+
2770+ -- Scott James Remnant <scott@ubuntu.com> Wed, 04 Jun 2008 13:09:32 +0100
2771+
2772+upstart (0.3.9-3) intrepid; urgency=low
2773+
2774+ * Change dependency from sysvutils to sysvinit-utils. LP: #237276.
2775+ * Compile with stack -fstack-protector, -fPIE, -z relro, -z now and -pie
2776+ (MMmm, pie)
2777+
2778+ -- Scott James Remnant <scott@ubuntu.com> Wed, 04 Jun 2008 12:59:11 +0100
2779+
2780+upstart (0.3.9-2) hardy; urgency=low
2781+
2782+ * Start the getty on tty1 after the rc script has stopped rather then
2783+ at the same time it starts to avoid overwriting by console messages.
2784+ tty2..6 will still be active if you want an early login. LP: #65230.
2785+ * If the recovery menu is available start that instead of sulogin when
2786+ entering single-user-mode.
2787+
2788+ -- Scott James Remnant <scott@ubuntu.com> Fri, 11 Apr 2008 13:38:50 +0100
2789+
2790+upstart (0.3.9-1) hardy; urgency=low
2791+
2792+ * New upstream release:
2793+ - many bug fixes.
2794+
2795+ * Update reference to "edgy" in README.Debian to "hardy". LP: #140037.
2796+
2797+ -- Scott James Remnant <scott@ubuntu.com> Sun, 28 Oct 2007 10:51:59 -0400
2798+
2799+upstart (0.3.8-2) gutsy; urgency=low
2800+
2801+ * Fix broken migration of old-style 'respawn process' stanzas which
2802+ produced corrupted 'exec' stanzas. Try to fix up files previously
2803+ corrupted by this. LP: #95210
2804+
2805+ -- Scott James Remnant <scott@ubuntu.com> Sun, 28 Oct 2007 10:50:36 -0400
2806+
2807+upstart (0.3.8-1) feisty; urgency=low
2808+
2809+ * New upstream release:
2810+ - much improved initctl tool.
2811+
2812+ * Update my standard prep_/undo_/rm_conffile functions to take into account
2813+ current dpkg behaviour wrt obsolete conffiles. The conffile is now moved
2814+ out of the way in preinst and the moved file deleted in postinst, or moved
2815+ back in postrm abort-upgrade. This means it's not there when dpkg
2816+ configures the new version, so the conffile is not left in the list.
2817+ * Purge backups of modified obsolete conffiles when the package is purged.
2818+
2819+ * Update runlevel and respawn rule generated in migrate-inittab.pl
2820+ LP: #89314
2821+
2822+ * Drop 00-libnih-update.patch and 01-libnih-sparc-ftbfs.patch; new upstream
2823+ release includes an up-to-date libnih which contains both patches.
2824+ * Drop 10-cant-stop-execless-job.patch; included upstream.
2825+ * Drop 20-complex-event-config.patch; this is going to be significantly
2826+ changed upstream, and we don't want to ship something strange.
2827+ * Drop 30-fix-warnings.patch; included upstream.
2828+
2829+ -- Scott James Remnant <scott@ubuntu.com> Sun, 11 Mar 2007 19:19:00 +0000
2830+
2831+upstart (0.3.5-2) feisty; urgency=low
2832+
2833+ * Changed "start script" to "pre-start script" in sulogin event, the former
2834+ is no longer recognised.
2835+
2836+ * Applied 01-libnih-sparc-ftbfs.patch; this updates the signal name list
2837+ to exclude signals not available on that architecture, and add one that's
2838+ unique to it.
2839+ * Applied 30-fix-warnings.patch; this corrects a few warnings that spoiled
2840+ an otherwise clean build log.
2841+
2842+ -- Scott James Remnant <scott@ubuntu.com> Tue, 13 Feb 2007 15:56:33 +0000
2843+
2844+upstart (0.3.5-1) feisty; urgency=low
2845+
2846+ * New upstream release:
2847+ - inotify file descriptor leak fixed. LP: #83099.
2848+ - inotify support is no longer required. LP: #68904.
2849+ - new job state machine
2850+ - new event structure, can now include arguments and environment
70b263ba 2851+
64106e56
SS		 2852+ * Applied 00-libnih-update.patch; this updates the libnih library to the
2853+ latest bzr trunk version, required for the complex-event-config patch.
2854+ * Applied 10-cant-stop-execless-job.patch from upstream; this corrects a
2855+ bug where jobs without an "exec" or "script" stanza cannot be stopped.
2856+ * Applied 20-complex-event-config.patch from upstream; this is an
2857+ experimental implementation of the "on" keyword that allows definition
2858+ of complex system states.
70b263ba 2859+
64106e56
SS		 2860+ * System V compatibility jobs updated to match new event names.
2861+ * rcS job now sets PREVLEVEL and RUNLEVEL. LP: #76304.
70b263ba 2862+
64106e56
SS		 2863+ * NOTE: After this upgrade, init will appear to have "forgotten" the
2864+ process ids of your gettys, etc. This is not a critical problem and
2865+ will be fixed before release. Shutdown will still work as normal.
70b263ba 2866+
64106e56 2867+ -- Scott James Remnant <scott@ubuntu.com> Mon, 12 Feb 2007 13:51:40 +0000
70b263ba 2868+
64106e56 2869+upstart (0.3.1-1) feisty; urgency=low
70b263ba 2870+
64106e56
SS		 2871+ * New upstream release:
2872+ - start, stop and status are now symlinks to initctl, not to a
2873+ different, separate utility.
2874+ - initctl completely rewritten to behave properly.
2875+ - some upstart-specific options to shutdown and reboot dropped, as
2876+ these are considered SysV-compat tools.
2877+ - "console none" fixed. LP: #70782.
2878+ - improved documentation. LP: #68805.
70b263ba 2879+
64106e56 2880+ * shutdown and reboot moved to upstart-compat-sysv.
70b263ba 2881+
64106e56
SS		 2882+ * Replace the /usr/share/doc/* directory in upstart-logd,
2883+ upstart-compat-sysv, system-services and startup-tasks with a symlink to
2884+ /usr/share/doc/upstart. This was actually done in a previous package,
2885+ but the migration missed. LP: #70895.
70b263ba 2886+
64106e56 2887+ -- Scott James Remnant <scott@ubuntu.com> Wed, 13 Dec 2006 17:27:37 +0000
70b263ba 2888+
64106e56 2889+upstart (0.2.7-7) edgy; urgency=low
70b263ba 2890+
64106e56 2891+ * Don't abort the postinst if we can't send init SIGTERM. Ubuntu: #64499.
70b263ba 2892+
64106e56 2893+ -- Scott James Remnant <scott@ubuntu.com> Tue, 10 Oct 2006 10:13:05 +0100
70b263ba 2894+
64106e56 2895+upstart (0.2.7-6) edgy; urgency=low
70b263ba 2896+
64106e56
SS		 2897+ * Don't start gettys on tty2 thru tty6 in runlevels 4 and 5 (matches
2898+ our sysvinit configuration).
2899+ * Migrate common changes made to /etc/inittab to /etc/event.d by
2900+ adjusting the installed conffiles. Ubuntu: #61539.
70b263ba 2901+
64106e56
SS		 2902+ * Include missing AUTHORS and NEWS file in the upstart package.
2903+ * Include README.Debian which answers common questions. Ubuntu: #60429.
70b263ba 2904+
64106e56 2905+ -- Scott James Remnant <scott@ubuntu.com> Thu, 5 Oct 2006 16:08:34 +0100
70b263ba 2906+
64106e56 2907+upstart (0.2.7-5) edgy; urgency=low
70b263ba 2908+
64106e56
SS		 2909+ * Don't set the current runlevel in /var/run/utmp to 0 or 6 if it is
2910+ already either of those two values. That way we don't end up with
2911+ either 0 or 6 in the PREVLEVEL variable, which can cause
2912+ /etc/init.d/rc to be "efficient" and not bother doing
2913+ anything. Ubuntu: #63852.
70b263ba 2914+
64106e56 2915+ -- Scott James Remnant <scott@ubuntu.com> Wed, 4 Oct 2006 14:06:18 +0100
70b263ba 2916+
64106e56 2917+upstart (0.2.7-4) edgy; urgency=low
70b263ba 2918+
64106e56
SS		 2919+ * Can't just start rc-default once in single-user mode, because if we
2920+ boot into that, that will just return us back to sulogin again. Copy
2921+ the script out of rc-default into rcS-sulogin to call telinit with the
2922+ right default runlevel. Ubuntu: #62189.
70b263ba 2923+
64106e56
SS		 2924+ * Add Build-Depend on dpkg-dev (>= 1.13.19) due to our use of
2925+ ${binary:Version}. Ubuntu: #61693.
70b263ba 2926+
64106e56 2927+ -- Scott James Remnant <scott@ubuntu.com> Tue, 26 Sep 2006 17:20:42 +0100
70b263ba 2928+
64106e56 2929+upstart (0.2.7-3) edgy; urgency=low
70b263ba 2930+
64106e56
SS		 2931+ * Set the runlevel to "S" when we enter sulogin so that it appears
2932+ in utmp.
70b263ba 2933+
64106e56
SS		 2934+ -- Scott James Remnant <scott@ubuntu.com> Thu, 21 Sep 2006 05:37:25 +0100
2935+
2936+upstart (0.2.7-2) edgy; urgency=low
2937+
2938+ * Ensure that the same version of upstart is installed as the version of
2939+ upstart-compat-sysv and upstart-logd; as the IPC protocol may change
2940+ between releases.
2941+
2942+ * Adjust the rcS-sulogin job so that if sulogin exits the default runlevel
2943+ is entered; but if the job is stopped (e.g. by shutdown) it isn't. The
2944+ solves the regression introduced in the previous release.
70b263ba 2945+
64106e56
SS		 2946+ * Revert upstream logd/"quiet" change in favour of doing it in our
2947+ lsb logging functions instead; seems to work better (fsvo better).
70b263ba 2948+
64106e56 2949+ -- Scott James Remnant <scott@ubuntu.com> Thu, 21 Sep 2006 03:12:33 +0100
70b263ba 2950+
64106e56 2951+upstart (0.2.7-1) edgy; urgency=low
70b263ba 2952+
64106e56
SS		 2953+ * New upstream release:
2954+ - logd now writes to the console unless "quiet" is specified
2955+ - runaway jobs caught when they start rather than respawn. Ubuntu: #59807
70b263ba 2956+
64106e56
SS		 2957+ * Fix failure to shutdown while in single-user mode, however this means
2958+ that for edgy you can't exit the sulogin shell to enter the default
2959+ runlevel; explicitly say what works. Ubuntu: #60626.
2960+ * Drop unnecessary dependency on util-linux.
2961+ * Drop sulogin hack, instead depend on the version of sysvutils that
2962+ includes the real one. Ubuntu: #60965.
70b263ba 2963+
64106e56 2964+ -- Scott James Remnant <scott@ubuntu.com> Wed, 20 Sep 2006 05:39:16 +0100
70b263ba 2965+
64106e56 2966+upstart (0.2.6-1) edgy; urgency=low
70b263ba 2967+
64106e56
SS		 2968+ * New upstream release:
2969+ - fix infinite loop caused by bad waitid() call. Ubuntu: #59459.
2970+ - halt now behaves as "shutdown -h now". Ubuntu: #59720.
70b263ba 2971+
64106e56 2972+ -- Scott James Remnant <scott@ubuntu.com> Wed, 13 Sep 2006 22:16:17 +0100
70b263ba 2973+
64106e56 2974+upstart (0.2.5-1) edgy; urgency=low
70b263ba 2975+
64106e56
SS		 2976+ * New upstream release:
2977+ - no longer spins when no stalled event handler. Ubuntu: #59170.
2978+ - shutdown works when under sysvinit. Ubuntu: #58523;
2979+ - shutdown -k implemented. Ubuntu: #58723.
2980+ - telinit sends shutdown event for 0, 1 and 6. Ubuntu: #58913.
2981+ - basic manual pages included. Ubuntu: #58724.
70b263ba 2982+
64106e56
SS		 2983+ * upstart-compat-sysv Replaces: sysvinit. Ubuntu: #59427.
2984+ * upstart Recommends: upstart-compat-sysv, startup-tasks & system-services.
70b263ba 2985+
64106e56
SS		 2986+ * New upstart-logd package includes the logd daemon that can will log
2987+ output of jobs with "console logged" (the default) in their description
2988+ to /var/log/boot.
70b263ba 2989+
64106e56
SS		 2990+ * Add /etc/event.d/rc0 that is run on the "halt" event (neither -H or -P
2991+ given), and modify rc0-halt to run on "system-halt" (-H given) and
2992+ rc0-poweroff to run on "power-off" (-P given). Ubuntu: #59134.
2993+ * Fix the control-alt-delete job to run on the "ctrlaltdel" event so
2994+ that it's triggered properly. Ubuntu: #59398.
2995+ * Fix single-user mode.
70b263ba 2996+
64106e56 2997+ -- Scott James Remnant <scott@ubuntu.com> Sat, 9 Sep 2006 05:10:12 +0100
70b263ba 2998+
64106e56 2999+upstart (0.2.1-7) edgy; urgency=low
70b263ba 3000+
64106e56
SS		 3001+ * Remove the Essential tags again, they didn't solve the problem we
3002+ hoped they would (dpkg/apt still won't remove sysvinit without
3003+ serious persuasion) and I don't think these packages should be.
70b263ba 3004+
64106e56 3005+ -- Scott James Remnant <scott@ubuntu.com> Thu, 7 Sep 2006 02:42:33 +0100
70b263ba 3006+
64106e56 3007+upstart (0.2.1-6) edgy; urgency=low
70b263ba 3008+
64106e56
SS		 3009+ * Make packages Essential, and change Depends to Pre-Depends so that the
3010+ packages work when unconfigured (nothing interesting is performed in
3011+ postinst). Ubuntu: #59005.
3012+ * Sync priority in debian/control with that in the archive (required)
3013+ * Drop warning of dire consequences if you install upstart, seeing as it's
3014+ installed by default.
70b263ba 3015+
64106e56
SS		 3016+ * Add new startup-tasks and system-services packages which will contain
3017+ the /etc/event.d files themselves (other than the main ones).
3018+ * Move tty definitions into system-services.
3019+ * Modify tty definitions to start when the rcS task has finished. This
3020+ puts them in the "right" place when compared to gdm. Ubuntu: #58630.
70b263ba 3021+
64106e56
SS		 3022+ * Correct rcS compatibility script to ignore any information in utmp so
3023+ that all scripts are always run. Ubuntu: #59203.
3024+ * Make rcS the console owner while it runs, temporary fix for
3025+ Ubuntu: #58609, #58794, #58796
3026+ * Include default control-alt-delete handler that reboots the machine.
70b263ba 3027+
64106e56 3028+ -- Scott James Remnant <scott@ubuntu.com> Wed, 6 Sep 2006 21:52:48 +0100
70b263ba 3029+
64106e56 3030+upstart (0.2.1-5) edgy; urgency=low
70b263ba 3031+
64106e56 3032+ * upstart-compat-sysv Depends: initscripts (closes: Malone #58979).
70b263ba 3033+
64106e56 3034+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 5 Sep 2006 12:22:50 +0100
70b263ba 3035+
64106e56 3036+upstart (0.2.1-4) edgy; urgency=low
70b263ba 3037+
64106e56 3038+ * Add missing #! line to top of postrm
70b263ba 3039+
64106e56 3040+ -- Scott James Remnant <scott@ubuntu.com> Mon, 4 Sep 2006 08:11:16 +0100
70b263ba 3041+
64106e56 3042+upstart (0.2.1-3) edgy; urgency=low
70b263ba 3043+
64106e56
SS		 3044+ * Remove the rc0 configuration file shipped in 0.1.0 that causes all
3045+ reboots to become shutdowns. Ubuntu: #58557.
70b263ba 3046+
64106e56 3047+ -- Scott James Remnant <scott@ubuntu.com> Sun, 3 Sep 2006 23:24:41 +0100
70b263ba 3048+
64106e56 3049+upstart (0.2.1-2) edgy; urgency=low
70b263ba 3050+
64106e56
SS		 3051+ * Don't send the SIGTERM signal unless we're upgrading from a version
3052+ of upstart that supports re-exec; older versions would cause a kernel
3053+ PANIC and change from sysvinit does nothing.
3054+
3055+ -- Scott James Remnant <scott@ubuntu.com> Sat, 2 Sep 2006 17:18:38 +0100
3056+
3057+upstart (0.2.1-1) edgy; urgency=low
3058+
3059+ * New upstream release:
3060+ - compilation fixes.
3061+
3062+ -- Scott James Remnant <scott@ubuntu.com> Fri, 1 Sep 2006 19:51:41 +0100
3063+
3064+upstart (0.2.0-1) edgy; urgency=low
3065+
3066+ * New upstream release:
3067+ - upstart includes shutdown, reboot, halt, poweroff, start, stop, status,
3068+ runlevel and telinit utilities.
3069+ - "initctl list" will list active jobs.
3070+ - Events vastly simplified to just simple strings.
3071+
3072+ * Compatibility tasks for old rc scripts, along with runlevel and telinit
3073+ utilities now shipped in upstart-compat-sysv package.
70b263ba 3074+
64106e56 3075+ -- Scott James Remnant <scott@ubuntu.com> Fri, 1 Sep 2006 02:38:44 +0100
70b263ba 3076+
64106e56 3077+upstart (0.1.1-1) edgy; urgency=low
70b263ba 3078+
64106e56
SS		 3079+ * New upstream release:
3080+ - set PATH and TERM in processes
70b263ba 3081+
64106e56 3082+ -- Scott James Remnant <scott@ubuntu.com> Fri, 25 Aug 2006 16:17:52 +0200
70b263ba 3083+
64106e56 3084+upstart (0.1.0-2) edgy; urgency=low
70b263ba 3085+
64106e56
SS		 3086+ * Oops, rename /sbin/init to /sbin/upstart as documented. Lost this
3087+ while battling bzr.
70b263ba 3088+
64106e56 3089+ -- Scott James Remnant <scott@ubuntu.com> Thu, 24 Aug 2006 16:30:54 +0200
70b263ba 3090+
64106e56
SS		 3091+upstart (0.1.0-1) edgy; urgency=low
3092+
3093+ * Initial release.
3094+
3095+ -- Scott James Remnant <scott@ubuntu.com> Thu, 24 Aug 2006 14:27:47 +0200
3096--- upstart-0.6.7.orig/debian/conf/tty1.conf
3097+++ upstart-0.6.7/debian/conf/tty1.conf
3098@@ -0,0 +1,10 @@
3099+# tty1 - getty
3100+#
3101+# This service maintains a getty on tty1 from the point the system is
3102+# started until it is shut down again.
70b263ba 3103+
64106e56
SS		 3104+start on stopped rc RUNLEVEL=[2345]
3105+stop on runlevel [!2345]
70b263ba 3106+
64106e56
SS		 3107+respawn
3108+exec /sbin/getty -8 38400 tty1
3109--- upstart-0.6.7.orig/debian/conf/tty6.conf
3110+++ upstart-0.6.7/debian/conf/tty6.conf
3111@@ -0,0 +1,10 @@
3112+# tty6 - getty
3113+#
3114+# This service maintains a getty on tty6 from the point the system is
3115+# started until it is shut down again.
70b263ba 3116+
64106e56
SS		 3117+start on runlevel [23]
3118+stop on runlevel [!23]
70b263ba 3119+
64106e56
SS		 3120+respawn
3121+exec /sbin/getty -8 38400 tty6
3122--- upstart-0.6.7.orig/debian/conf/tty5.conf
3123+++ upstart-0.6.7/debian/conf/tty5.conf
3124@@ -0,0 +1,10 @@
3125+# tty5 - getty
3126+#
3127+# This service maintains a getty on tty5 from the point the system is
3128+# started until it is shut down again.
70b263ba 3129+
64106e56
SS		 3130+start on runlevel [23]
3131+stop on runlevel [!23]
70b263ba 3132+
64106e56
SS		 3133+respawn
3134+exec /sbin/getty -8 38400 tty5
3135--- upstart-0.6.7.orig/debian/conf/tty4.conf
3136+++ upstart-0.6.7/debian/conf/tty4.conf
3137@@ -0,0 +1,10 @@
3138+# tty4 - getty
3139+#
3140+# This service maintains a getty on tty4 from the point the system is
3141+# started until it is shut down again.
70b263ba 3142+
64106e56
SS		 3143+start on runlevel [23]
3144+stop on runlevel [!23]
70b263ba 3145+
64106e56
SS		 3146+respawn
3147+exec /sbin/getty -8 38400 tty4
3148--- upstart-0.6.7.orig/debian/conf/tty2.conf
3149+++ upstart-0.6.7/debian/conf/tty2.conf
3150@@ -0,0 +1,10 @@
3151+# tty2 - getty
70b263ba 3152+#
64106e56
SS		 3153+# This service maintains a getty on tty2 from the point the system is
3154+# started until it is shut down again.
70b263ba 3155+
64106e56
SS		 3156+start on runlevel [23]
3157+stop on runlevel [!23]
70b263ba 3158+
70b263ba 3159+respawn
64106e56
SS		 3160+exec /sbin/getty -8 38400 tty2
3161--- upstart-0.6.7.orig/debian/conf/rcS.conf
3162+++ upstart-0.6.7/debian/conf/rcS.conf
3163@@ -0,0 +1,32 @@
3164+# rcS - System V single-user mode compatibility
3165+#
3166+# This task handles the old System V-style single-user mode, this is
3167+# distinct from the other runlevels since running the rc script would
3168+# be bad.
70b263ba 3169+
64106e56
SS		 3170+description "System V single-user mode compatibility"
3171+author "Scott James Remnant <scott@netsplit.com>"
70b263ba 3172+
64106e56
SS		 3173+start on runlevel S
3174+stop on runlevel [!S]
70b263ba 3175+
64106e56
SS		 3176+console owner
3177+script
3178+ if [ -x /usr/share/recovery-mode/recovery-menu ]; then
3179+ exec /usr/share/recovery-mode/recovery-menu
3180+ else
3181+ exec /sbin/sulogin
3182+ fi
3183+end script
3184+
3185+post-stop script
3186+ # Don't switch runlevels if we were stopped by an event, since that
3187+ # means we're already switching runlevels
3188+ if [ -n "${UPSTART_STOP_EVENTS}" ]
3189+ then
3190+ exit 0
3191+ fi
3192+
3193+ # Switch, passing a magic flag
3194+ start --no-wait rc-sysinit FROM_SINGLE_USER_MODE=y
3195+end script
3196--- upstart-0.6.7.orig/debian/conf/tty3.conf
3197+++ upstart-0.6.7/debian/conf/tty3.conf
3198@@ -0,0 +1,10 @@
3199+# tty3 - getty
3200+#
3201+# This service maintains a getty on tty3 from the point the system is
3202+# started until it is shut down again.
3203+
3204+start on runlevel [23]
3205+stop on runlevel [!23]
3206+
3207+respawn
3208+exec /sbin/getty -8 38400 tty3
3209--- upstart-0.6.7.orig/debian/source/format
3210+++ upstart-0.6.7/debian/source/format
3211@@ -0,0 +1 @@
3212+1.0
3213--- upstart-0.6.7.orig/util/Makefile.in
3214+++ upstart-0.6.7/util/Makefile.in
3215@@ -321,6 +321,8 @@
3216 SET_MAKE = @SET_MAKE@
3217 SHELL = @SHELL@
3218 STRIP = @STRIP@
3219+UDEV_CFLAGS = @UDEV_CFLAGS@
3220+UDEV_LIBS = @UDEV_LIBS@
3221 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
3222 USE_NLS = @USE_NLS@
3223 VERSION = @VERSION@
3224--- upstart-0.6.7.orig/contrib/Makefile.in
3225+++ upstart-0.6.7/contrib/Makefile.in
3226@@ -180,6 +180,8 @@
3227 SET_MAKE = @SET_MAKE@
3228 SHELL = @SHELL@
3229 STRIP = @STRIP@
3230+UDEV_CFLAGS = @UDEV_CFLAGS@
3231+UDEV_LIBS = @UDEV_LIBS@
3232 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
3233 USE_NLS = @USE_NLS@
3234 VERSION = @VERSION@
3235--- upstart-0.6.7.orig/dbus/Makefile.in
3236+++ upstart-0.6.7/dbus/Makefile.in
3237@@ -205,6 +205,8 @@
3238 SET_MAKE = @SET_MAKE@
3239 SHELL = @SHELL@
3240 STRIP = @STRIP@
3241+UDEV_CFLAGS = @UDEV_CFLAGS@
3242+UDEV_LIBS = @UDEV_LIBS@
3243 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
3244 USE_NLS = @USE_NLS@
3245 VERSION = @VERSION@
3246--- upstart-0.6.7.orig/doc/Makefile.in
3247+++ upstart-0.6.7/doc/Makefile.in
3248@@ -180,6 +180,8 @@
3249 SET_MAKE = @SET_MAKE@
3250 SHELL = @SHELL@
3251 STRIP = @STRIP@
3252+UDEV_CFLAGS = @UDEV_CFLAGS@
3253+UDEV_LIBS = @UDEV_LIBS@
3254 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
3255 USE_NLS = @USE_NLS@
3256 VERSION = @VERSION@
3257--- upstart-0.6.7.orig/init/Makefile.in
3258+++ upstart-0.6.7/init/Makefile.in
3259@@ -388,6 +388,8 @@
3260 SET_MAKE = @SET_MAKE@
3261 SHELL = @SHELL@
3262 STRIP = @STRIP@
3263+UDEV_CFLAGS = @UDEV_CFLAGS@
3264+UDEV_LIBS = @UDEV_LIBS@
3265 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
3266 USE_NLS = @USE_NLS@
3267 VERSION = @VERSION@
3268--- upstart-0.6.7.orig/init/main.c
3269+++ upstart-0.6.7/init/main.c
70b263ba
SS		 3270@@ -31,6 +31,7 @@
3271
3272 #include <errno.h>
3273 #include <stdio.h>
3274+#include <dirent.h>
3275 #include <signal.h>
3276 #include <stdlib.h>
3277 #include <string.h>
3278@@ -167,12 +168,7 @@
3279 */
3280 setsid ();
3281
3282- /* Set the standard file descriptors to the ordinary console device,
3283- * resetting it to sane defaults unless we're inheriting from another
3284- * init process which we know left it in a sane state.
3285- */
3286- if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
3287- nih_free (nih_error_get ());
3288+ /* Set the standard file descriptors. */
3289 if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
3290 nih_free (nih_error_get ());
3291
64106e56 3292@@ -325,7 +321,68 @@
70b263ba
SS		 3293 * init daemon that exec'd us
3294 */
3295 if (! restart) {
3296+ DIR *piddir;
3297+
3298 NIH_MUST (event_new (NULL, STARTUP_EVENT, NULL));
3299+
3300+ /* Total hack, look for .pid files in /dev/.initramfs -
3301+ * if there's a job config for them pretend that we
3302+ * started it and it has that pid.
3303+ */
3304+ piddir = opendir ("/dev/.initramfs");
3305+ if (piddir) {
3306+ struct dirent *ent;
3307+
3308+ while ((ent = readdir (piddir)) != NULL) {
3309+ char path[PATH_MAX];
3310+ char * ptr;
3311+ FILE * pidfile;
3312+ pid_t pid;
3313+ JobClass *class;
3314+ Job * job;
3315+
3316+ if (ent->d_name[0] == '.')
3317+ continue;
3318+
3319+ strcpy (path, "/dev/.initramfs/");
3320+ strcat (path, ent->d_name);
3321+
3322+ ptr = strrchr (ent->d_name, '.');
3323+ if ((! ptr) || strcmp (ptr, ".pid"))
3324+ continue;
3325+
3326+ *ptr = '\0';
3327+ pidfile = fopen (path, "r");
3328+ if (! pidfile)
3329+ continue;
3330+
3331+ pid = -1;
3332+ if (fscanf (pidfile, "%d", &pid))
3333+ ;
3334+ fclose (pidfile);
3335+
3336+ if ((pid < 0)
3337+ || (kill (pid, 0) < 0))
3338+ continue;
3339+
3340+ class = (JobClass *)nih_hash_lookup (job_classes, ent->d_name);
3341+ if (! class)
3342+ continue;
3343+ if (! class->process[PROCESS_MAIN])
3344+ continue;
3345+ if (strlen (class->instance))
3346+ continue;
3347+
3348+ job = NIH_MUST (job_new (class, ""));
3349+ job->goal = JOB_START;
3350+ job->state = JOB_RUNNING;
3351+ job->pid[PROCESS_MAIN] = pid;
3352+
3353+ nih_debug ("%s inherited from initramfs with pid %d", class->name, pid);
3354+ }
3355+
3356+ closedir (piddir);
3357+ }
3358 } else {
3359 sigset_t mask;
3360
Michael's tree of IPFire 3.x.