Author: jajcus Date: Wed Jun 15 10:27:59 2011 GMT Module: packages Tag: HEAD ---- Log message: - Version: 1.3 - -script_fd patch dropped (fixed upstream) - -state_save patch dropped (discontinued) - with_tests bcond fixed (configure all test jobs with nice=19, set $TERM expected by some tests, do not run initctl tests which require DBus session bus)
---- Files affected: packages/upstart: upstart.spec (1.64 -> 1.65) , upstart-tests.patch (NONE -> 1.1) (NEW), upstart-script_fd.patch (1.1 -> NONE) (REMOVED), upstart-state_save.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/upstart/upstart.spec diff -u packages/upstart/upstart.spec:1.64 packages/upstart/upstart.spec:1.65 --- packages/upstart/upstart.spec:1.64 Tue Apr 12 10:09:31 2011 +++ packages/upstart/upstart.spec Wed Jun 15 12:27:54 2011 @@ -1,26 +1,21 @@ # $Revision$, $Date$ -# TODO -# - 4 of 13 tests failed (3 with 'permission denied') # # Conditional build: -%bcond_with statesave # state-save experimental patch -%bcond_with tests # don't perform "make check" +%bcond_without tests # don't perform "make check" Summary: Event-based init daemon Summary(hu.UTF-8): Esemény-vezérelt init démon Summary(pl.UTF-8): Oparty na zdarzeniach demon init Name: upstart -Version: 1.2 -Release: 2 +Version: 1.3 +Release: 1 License: GPL v2 Group: Base -Source0: http://launchpad.net/upstart/1.x/1.2/+download/%{name}-%{version}.tar.gz -# Source0-md5: c1b1bab5c1c1ed2595081d8178542b37 +Source0: http://launchpad.net/upstart/1.x/1.3/+download/%{name}-%{version}.tar.gz +# Source0-md5: 7820797b64878c27115fff6a7398a6a9 URL: http://upstart.at/ Patch0: pldize.patch -# https://code.launchpad.net/~jajcus-jajcus/upstart/state-save-stable/+merge/27053/+preview-diff/+files/preview.diff -Patch1: %{name}-state_save.patch -Patch2: %{name}-script_fd.patch +Patch1: %{name}-tests.patch Source1: start-ttys.conf Source2: tty.conf Source3: %{name}.sysconfig @@ -31,7 +26,7 @@ BuildRequires: gcc >= 5:4.0 BuildRequires: gettext >= 0.14.5 BuildRequires: glibc-headers >= 6:2.4.0 -BuildRequires: libnih-devel >= 1.0.2 +BuildRequires: libnih-devel >= 1.0.3 BuildRequires: libtool >= 2:1.5.22 BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.402 @@ -65,8 +60,7 @@ %prep %setup -q %patch0 -p1 -%{?with_statesave:%patch1 -p0} -%patch2 -p1 +%patch1 -p1 cp -a %{SOURCE1} conf cp -a %{SOURCE2} conf @@ -78,7 +72,7 @@ --disable-silent-rules %{__make} -%{?with_tests:%{__make} check} +%{?with_tests:TERM=linux %{__make} check} %install rm -rf $RPM_BUILD_ROOT @@ -119,6 +113,8 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/control-alt-delete.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/start-ttys.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/tty.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/upstart-socket-bridge.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/upstart-udev-bridge.conf %attr(755,root,root) %{_sbindir}/halt %attr(755,root,root) %{_sbindir}/init %attr(755,root,root) %{_sbindir}/initctl @@ -132,6 +128,10 @@ %attr(755,root,root) %{_sbindir}/status %attr(755,root,root) %{_sbindir}/stop %attr(755,root,root) %{_sbindir}/telinit +%attr(755,root,root) %{_sbindir}/upstart-socket-bridge +%attr(755,root,root) %{_sbindir}/upstart-udev-bridge +%attr(755,root,root) %{_bindir}/init-checkconf +%attr(755,root,root) %{_bindir}/initctl2dot %dir /lib/init %{_mandir}/man5/*.5* %{_mandir}/man7/*.7* @@ -143,6 +143,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.65 2011/06/15 10:27:54 jajcus +- Version: 1.3 +- -script_fd patch dropped (fixed upstream) +- -state_save patch dropped (discontinued) +- with_tests bcond fixed (configure all test jobs with nice=19, set $TERM expected by some + tests, do not run initctl tests which require DBus session bus) + Revision 1.64 2011/04/12 08:09:31 jajcus - pdksh compatibility fix (https://bugs.launchpad.net/upstart/+bug/757244) - Release: 2 ================================================================ Index: packages/upstart/upstart-tests.patch diff -u /dev/null packages/upstart/upstart-tests.patch:1.1 --- /dev/null Wed Jun 15 12:27:59 2011 +++ packages/upstart/upstart-tests.patch Wed Jun 15 12:27:54 2011 @@ -0,0 +1,349 @@ +diff -dur upstart-1.3.orig/init/tests/test_event.c upstart-1.3/init/tests/test_event.c +--- upstart-1.3.orig/init/tests/test_event.c 2011-06-09 12:21:04.000000000 +0200 ++++ upstart-1.3/init/tests/test_event.c 2011-06-15 12:07:24.000000000 +0200 +@@ -234,6 +234,7 @@ + event = event_new (NULL, "test", NULL); + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + class->task = TRUE; + class->process[PROCESS_MAIN] = process_new (class->process); + class->process[PROCESS_MAIN]->command = "echo"; +@@ -1129,6 +1130,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1177,6 +1179,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1252,6 +1255,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1331,6 +1335,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1441,6 +1446,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1529,6 +1535,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->task = TRUE; ++ class->nice = 19; + + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; +@@ -1660,6 +1667,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_MAIN] = process_new (class->process); + class->process[PROCESS_MAIN]->command = "echo"; ++ class->nice = 19; + + class->start_on = event_operator_new ( + class, EVENT_MATCH, "test/failed", NULL); +@@ -1702,6 +1710,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_MAIN] = process_new (class->process); + class->process[PROCESS_MAIN]->command = "echo"; ++ class->nice = 19; + + class->start_on = event_operator_new ( + class, EVENT_OR, NULL, NULL); +@@ -1892,6 +1901,7 @@ + class = job_class_new (NULL, "foo", NULL); + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_STOP; +@@ -1937,6 +1947,7 @@ + class = job_class_new (NULL, "foo", NULL); + class->process[PROCESS_PRE_START] = process_new (class); + class->process[PROCESS_PRE_START]->command = "echo"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +diff -dur upstart-1.3.orig/init/tests/test_job.c upstart-1.3/init/tests/test_job.c +--- upstart-1.3.orig/init/tests/test_job.c 2011-06-09 12:21:04.000000000 +0200 ++++ upstart-1.3/init/tests/test_job.c 2011-06-15 12:07:24.000000000 +0200 +@@ -392,6 +392,7 @@ + class->process[PROCESS_PRE_START]->command = "echo"; + class->process[PROCESS_POST_STOP] = process_new (class); + class->process[PROCESS_POST_STOP]->command = "echo"; ++ class->nice = 19; + + dbus_error_init (&dbus_error); + +@@ -705,6 +706,7 @@ + "wibble", NULL); + class->stop_on = event_operator_new (class, EVENT_MATCH, + "wibble", NULL); ++ class->nice = 19; + + fail = process_new (class); + fail->command = nih_sprintf (fail, "%s/no/such/file", dirname); +@@ -3957,6 +3959,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "echo"; ++ class->nice = 19; + + job = job_new (class, ""); + +diff -dur upstart-1.3.orig/init/tests/test_job_process.c upstart-1.3/init/tests/test_job_process.c +--- upstart-1.3.orig/init/tests/test_job_process.c 2011-06-09 12:21:04.000000000 +0200 ++++ upstart-1.3/init/tests/test_job_process.c 2011-06-15 12:07:24.000000000 +0200 +@@ -152,6 +152,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "touch %s", filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -184,6 +185,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "echo $$ > %s\n", filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -222,6 +224,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "echo $0 $@ > %s\n", filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -259,6 +262,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "echo $0 $@ > %s\n\n\n", filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -297,6 +301,7 @@ + class->process[PROCESS_MAIN], + "test -d %s > %s\n", + filename, filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -332,6 +337,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "%s %d %s", argv0, TEST_ENVIRONMENT, filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -381,6 +387,7 @@ + class->process[PROCESS_MAIN]->command = nih_sprintf ( + class->process[PROCESS_MAIN], + "%s %d %s", argv0, TEST_ENVIRONMENT, filename); ++ class->nice = 19; + + job = job_new (class, "foo"); + job->goal = JOB_START; +@@ -431,6 +438,7 @@ + class->process[PROCESS_PRE_STOP]->command = nih_sprintf ( + class->process[PROCESS_PRE_STOP], + "%s %d %s", argv0, TEST_ENVIRONMENT, filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_STOP; +@@ -482,6 +490,7 @@ + class->process[PROCESS_POST_STOP]->command = nih_sprintf ( + class->process[PROCESS_POST_STOP], + "%s %d %s", argv0, TEST_ENVIRONMENT, filename); ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_STOP; +@@ -533,6 +542,7 @@ + class->process[PROCESS_MAIN]->script = TRUE; + class->process[PROCESS_MAIN]->command = nih_alloc ( + class->process[PROCESS_MAIN], 4096); ++ class->nice = 19; + sprintf (class->process[PROCESS_MAIN]->command, + "exec > %s\necho $0\necho $@\n", filename); + +@@ -596,6 +606,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "true"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -632,6 +643,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_PRE_START] = process_new (class); + class->process[PROCESS_PRE_START]->command = "true"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -670,6 +682,7 @@ + class->expect = EXPECT_DAEMON; + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "true"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -717,6 +730,7 @@ + class->expect = EXPECT_FORK; + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "true"; ++ class->nice = 19; + + job = job_new (class, ""); + job->goal = JOB_START; +@@ -765,6 +779,7 @@ + class = job_class_new (NULL, "test", NULL); + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = filename; ++ class->nice = 19; + + job = job_new (class, "foo"); + job->goal = JOB_START; +@@ -820,6 +835,7 @@ + sprintf (function, "%d", TEST_PIDS); + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); +@@ -858,6 +874,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->console = CONSOLE_NONE; ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); +@@ -884,6 +901,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->chdir = "/tmp"; ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); +@@ -912,6 +930,7 @@ + env[2] = NULL; + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + + pid = job_process_spawn (class, args, env, FALSE, -1); + TEST_GT (pid, 0); +@@ -937,6 +956,7 @@ + sprintf (function, "%d", TEST_SIMPLE); + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_GT (pid, 0); +@@ -957,6 +977,7 @@ + sprintf (function, "%d", TEST_SIMPLE); + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, TRUE, -1); + TEST_GT (pid, 0); +@@ -986,6 +1007,7 @@ + args[2] = NULL; + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + + pid = job_process_spawn (class, args, NULL, FALSE, -1); + TEST_LT (pid, 0); +@@ -1006,6 +1028,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->debug = TRUE; ++ class->nice = 19; + + sprintf (function, "%s", "/bin/true"); + args[0] = function; +@@ -1052,6 +1075,7 @@ + + class = job_class_new (NULL, "test", NULL); + class->kill_timeout = 1000; ++ class->nice = 19; + + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = nih_strdup ( +@@ -1205,6 +1229,7 @@ + source = conf_source_new (NULL, "/tmp", CONF_JOB_DIR); + file = conf_file_new (source, "/tmp/test"); + file->job = class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "echo"; + +@@ -4503,6 +4528,7 @@ + program_name = "test"; + + class = job_class_new (NULL, "test", NULL); ++ class->nice = 19; + class->process[PROCESS_MAIN] = process_new (class); + class->process[PROCESS_MAIN]->command = "echo"; + +diff -dur upstart-1.3.orig/util/tests/test_initctl.c upstart-1.3/util/tests/test_initctl.c +--- upstart-1.3.orig/util/tests/test_initctl.c 2011-06-09 12:21:04.000000000 +0200 ++++ upstart-1.3/util/tests/test_initctl.c 2011-06-15 12:07:44.000000000 +0200 +@@ -14459,16 +14459,5 @@ + test_version_action (); + test_log_priority_action (); + +- if (in_chroot () && !dbus_configured ()) { +- fprintf(stderr, "\n\n" +- "WARNING: not running show-config " +- "and check-config tests within chroot " +- "as no D-Bus, or D-Bus not configured (lp:#728988)" +- "\n\n"); +- } else { +- test_show_config (); +- test_check_config (); +- } +- + return 0; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/upstart.spec?r1=1.64&r2=1.65&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
