[packages/upstart] up to 1.11, need subpackages, not tested
glen
glen at pld-linux.org
Fri Feb 14 14:00:24 CET 2014
commit c23ffb3a51a76fa587903ea2a105903cbab17462
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Feb 14 15:00:21 2014 +0200
up to 1.11, need subpackages, not tested
upstart-tests.patch | 349 ----------------------------------------------------
upstart.spec | 52 ++++++--
2 files changed, 42 insertions(+), 359 deletions(-)
---
diff --git a/upstart.spec b/upstart.spec
index 58dced6..caf5d21 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -1,6 +1,6 @@
-#
# TODO:
# - some tests still fail on builders
+# - subpackage for monitor?
#
# Conditional build:
%bcond_with tests # perform "make check"
@@ -9,15 +9,14 @@ 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.3
-Release: 8
+Version: 1.11
+Release: 0.1
License: GPL v2
Group: Base
-Source0: http://launchpad.net/upstart/1.x/1.3/+download/%{name}-%{version}.tar.gz
-# Source0-md5: 7820797b64878c27115fff6a7398a6a9
-URL: http://upstart.at/
+Source0: http://upstart.ubuntu.com/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e42aa0aa1c82bf583b2ce94a008443ed
+URL: http://upstart.ubuntu.com/
Patch0: pldize.patch
-Patch1: %{name}-tests.patch
Source1: start-ttys.conf
Source2: tty.conf
Source3: %{name}.sysconfig
@@ -69,7 +68,6 @@ podczas wyłączania systemu, a także nadzorowaniem ich pracy.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
cp -p %{SOURCE1} conf
cp -p %{SOURCE2} conf
@@ -144,10 +142,15 @@ fi
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog HACKING NEWS TODO
/etc/dbus-1/system.d/Upstart.conf
+%attr(640,root,root) /etc/logrotate.d/sysvinit
+%ghost %{_sysconfdir}/initrunlvl
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%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-dbus-bridge.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/upstart-event-bridge.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/upstart-file-bridge.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
@@ -163,6 +166,11 @@ fi
%attr(755,root,root) %{_sbindir}/status
%attr(755,root,root) %{_sbindir}/stop
%attr(755,root,root) %{_sbindir}/telinit
+%attr(755,root,root) %{_sbindir}/upstart-dbus-bridge
+%attr(755,root,root) %{_sbindir}/upstart-dconf-bridge
+%attr(755,root,root) %{_sbindir}/upstart-event-bridge
+%attr(755,root,root) %{_sbindir}/upstart-file-bridge
+%attr(755,root,root) %{_sbindir}/upstart-local-bridge
%attr(755,root,root) %{_sbindir}/upstart-socket-bridge
%attr(755,root,root) %{_sbindir}/upstart-udev-bridge
%attr(755,root,root) %{_bindir}/init-checkconf
@@ -172,11 +180,35 @@ fi
%{_mandir}/man7/*.7*
%{_mandir}/man8/*.8*
-%attr(640,root,root) /etc/logrotate.d/sysvinit
-%ghost %{_sysconfdir}/initrunlvl
+%dir %{_datadir}/upstart
+%dir %{_datadir}/upstart/sessions
+%{_datadir}/upstart/sessions/re-exec.conf
+%{_datadir}/upstart/sessions/upstart-dbus-session-bridge.conf
+%{_datadir}/upstart/sessions/upstart-dbus-system-bridge.conf
+%{_datadir}/upstart/sessions/upstart-dconf-bridge.conf
+%{_datadir}/upstart/sessions/upstart-event-bridge.conf
+%{_datadir}/upstart/sessions/upstart-file-bridge.conf
+
%ghost /var/run/initrunlvl
%attr(600,root,root) %ghost %{_sysconfdir}/ioctl.save
%attr(640,root,root) %ghost /var/log/faillog
%attr(660,root,utmp) %ghost /var/log/lastlog
%attr(664,root,utmp) %ghost /var/log/wtmpx
%attr(640,root,root) %ghost /var/log/btmpx
+
+# -libs
+%ghost %{_libdir}/libupstart.so.1
+%attr(755,root,root) %{_libdir}/libupstart.so.*.*.*
+
+# monitor
+%attr(755,root,root) %{_bindir}/upstart-monitor
+%{_desktopdir}/upstart-monitor.desktop
+%{_iconsdir}/hicolor/scalable/apps/upstart-monitor.svg
+%dir %{_datadir}/upstart/icons
+%{_datadir}/upstart/icons/upstart-monitor.svg
+
+# devel
+/usr/lib/pkgconfig/libupstart.pc
+
+# static
+%{_libdir}/libupstart.a
diff --git a/upstart-tests.patch b/upstart-tests.patch
deleted file mode 100644
index a03e9bb..0000000
--- a/upstart-tests.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-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;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/upstart.git/commitdiff/c23ffb3a51a76fa587903ea2a105903cbab17462
More information about the pld-cvs-commit
mailing list