Mailinglist Archive: opensuse-commit (1929 mails)
| < Previous | Next > |
commit systemd for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 08 Oct 2011 11:44:38 +0200
- Message-id: <20111008094438.A83A8202C5@hilbert.suse.de>
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory
checked in at Sat Oct 8 11:44:38 CEST 2011.
--------
--- openSUSE:Factory/systemd/systemd-gtk.changes 2011-10-02
11:16:08.000000000 +0200
+++ systemd/systemd-gtk.changes 2011-10-07 17:25:47.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Oct 5 16:18:48 UTC 2011 - fcrozat@xxxxxxxx
+
+- Add logind-warning.patch: fix pam warning (bnc#716384)
+
+-------------------------------------------------------------------
+Fri Sep 30 13:55:31 UTC 2011 - fcrozat@xxxxxxxx
+
+- Update to version 36 :
+ - many bugfixes
+ - systemd now requires socket-activated syslog implementations
+ - After=syslog.target is no longer needed in .service files
+ - X-Interactive is ignored in LSB headers (was not working)
+- Enable back insserv.conf parsing in systemd core and fix added
+ dependencies (bnc#721428).
+- Fix detection of LSB services status when running daemon
+ (bnc#721426).
+- Drop 0001-execute-fix-bus-serialization-for-commands.patch,
+ fix-reload.patch
+
+-------------------------------------------------------------------
systemd.changes: same change
calling whatdependson for head-i586
Old:
----
0001-execute-fix-bus-serialization-for-commands.patch
fix-reload.patch
revert_insserv_conf_parsing.patch
systemd-34.tar.bz2
New:
----
0001-service-Fix-dependencies-added-when-parsing-insserv..patch
0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch
logind-warning.patch
systemd-36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-gtk.spec ++++++
--- /var/tmp/diff_new_pack.OJEGw5/_old 2011-10-08 11:44:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OJEGw5/_new 2011-10-08 11:44:30.000000000 +0200
@@ -20,8 +20,8 @@
Name: systemd-gtk
Url: http://www.freedesktop.org/wiki/Software/systemd
-Version: 34
-Release: 5
+Version: 36
+Release: 1
License: GPLv2+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.OJEGw5/_old 2011-10-08 11:44:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OJEGw5/_new 2011-10-08 11:44:30.000000000 +0200
@@ -21,8 +21,8 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
-Version: 34
-Release: 5
+Version: 36
+Release: 1
License: GPLv2+
Group: System/Base
Summary: A System and Session Manager
@@ -63,16 +63,15 @@
Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch
# don't start getty on tty1 until all password request are done
Patch8: tty1.patch
-Patch10: revert_insserv_conf_parsing.patch
+Patch10: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch
+Patch13: 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch
# Upstream First - Policy:
# Never add any patches to this package without the upstream commit id
# in the patch. Any patches added here without a very good reason to make
# an exception will be silently removed with the next version update.
-Patch9: 0001-execute-fix-bus-serialization-for-commands.patch
-# PATCH-FIX-UPSTREAM fix-reload.patch fcrozat@xxxxxxxx bnc#719221 -- Fix
daemon-reload and conditions when service is starting
-Patch11: fix-reload.patch
Patch12: detect-non-running.patch
+Patch14: logind-warning.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -125,10 +124,10 @@
%patch1 -p1
%patch6 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
-%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
%build
autoreconf -fiv
@@ -151,7 +150,8 @@
find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
mkdir -p
%{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated}
%{buildroot}/lib/systemd/{system.preset,user.preset}
install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
-install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators
+# do not install, code has been fixed, might be useful in the future
+#install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators
install -m755 %{S:7} %{buildroot}/lib/systemd/
install -m644 %{S:8} %{S:9} %{S:10} %{buildroot}/lib/systemd/system/
ln -s ../bootsplash-startup.service
%{buildroot}/lib/systemd/system/basic.target.wants/
++++++ 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch ++++++
--- /var/tmp/diff_new_pack.OJEGw5/_old 2011-10-08 11:44:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OJEGw5/_new 2011-10-08 11:44:30.000000000 +0200
@@ -1,4 +1,4 @@
-From 07f0fb4424105c0e90e2add79efe48109b6c9fd1 Mon Sep 17 00:00:00 2001
+From 5c894bc1e45f7c34bf7fc4ca0d20bf1c3b679bef Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@xxxxxxxx>
Date: Thu, 18 Aug 2011 18:28:01 +0200
Subject: [PATCH] handle disable_caplock and compose_table and kbd_rate
@@ -8,18 +8,18 @@
1 files changed, 121 insertions(+), 3 deletions(-)
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
-index 4347a20..af558ef 100644
+index c5f3628..6603a75 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
-@@ -39,6 +39,7 @@
- #include "util.h"
+@@ -40,6 +40,7 @@
#include "log.h"
#include "macro.h"
+ #include "virt.h"
+#include "strv.h"
static bool is_vconsole(int fd) {
unsigned char data[1];
-@@ -78,8 +79,8 @@ static int disable_utf8(int fd) {
+@@ -79,8 +80,8 @@ static int disable_utf8(int fd) {
return r;
}
@@ -30,7 +30,7 @@
int i = 0;
pid_t pid;
-@@ -98,6 +99,8 @@ static int load_keymap(const char *vc, const char *map,
const char *map_toggle,
+@@ -99,6 +100,8 @@ static int load_keymap(const char *vc, const char *map,
const char *map_toggle,
args[i++] = map;
if (map_toggle)
args[i++] = map_toggle;
@@ -39,7 +39,7 @@
args[i++] = NULL;
if ((pid = fork()) < 0) {
-@@ -149,6 +152,96 @@ static int load_font(const char *vc, const char *font,
const char *map, const ch
+@@ -150,6 +153,96 @@ static int load_font(const char *vc, const char *font,
const char *map, const ch
return 0;
}
@@ -136,7 +136,7 @@
int main(int argc, char **argv) {
const char *vc;
char *vc_keymap = NULL;
-@@ -162,8 +255,16 @@ int main(int argc, char **argv) {
+@@ -163,8 +256,16 @@ int main(int argc, char **argv) {
#ifdef TARGET_MANDRIVA
char *vc_keytable = NULL;
#endif
@@ -153,7 +153,7 @@
int r = EXIT_FAILURE;
pid_t font_pid = 0, keymap_pid = 0;
-@@ -268,6 +369,10 @@ int main(int argc, char **argv) {
+@@ -265,6 +366,10 @@ int main(int argc, char **argv) {
#elif defined(TARGET_SUSE)
if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
"KEYTABLE", &vc_keymap,
@@ -164,7 +164,7 @@
NULL)) < 0) {
if (r != -ENOENT)
-@@ -283,6 +388,7 @@ int main(int argc, char **argv) {
+@@ -280,6 +385,7 @@ int main(int argc, char **argv) {
if (r != -ENOENT)
log_warning("Failed to read
/etc/sysconfig/console: %s", strerror(-r));
}
@@ -172,7 +172,7 @@
#elif defined(TARGET_ARCH)
if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
-@@ -439,7 +545,11 @@ int main(int argc, char **argv) {
+@@ -436,7 +542,11 @@ int main(int argc, char **argv) {
if (!utf8)
disable_utf8(fd);
@@ -185,7 +185,7 @@
load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >=
0)
r = EXIT_SUCCESS;
-@@ -447,6 +557,14 @@ finish:
+@@ -444,6 +554,14 @@ finish:
if (keymap_pid > 0)
wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
++++++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch ++++++
From 6620bceb7233a830be3635a4f7a7dc75c13a9c8e Mon Sep 17 00:00:00 2001From: Frederic Crozat <fcrozat@xxxxxxxx>
Date: Fri, 30 Sep 2011 14:12:45 +0200
Subject: [PATCH] service: Fix dependencies added when parsing insserv.conf
---
src/service.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/service.c b/src/service.c
index c2053ce..4abc7e7 100644
--- a/src/service.c
+++ b/src/service.c
@@ -3031,18 +3031,20 @@ static void sysv_facility_in_insserv_conf(Manager *mgr)
{
char *dep = NULL, *name, **j;
STRV_FOREACH (j, parsed+1) {
- if (*j[0]=='+') {
- e = UNIT_WANTS;
+ if (*j[0]=='+')
name = *j+1;
- }
- else {
- e = UNIT_REQUIRES;
+ else
name = *j;
- }
+ if (streq(name, "boot.localfs") ||
+ streq(name, "boot.crypto"))
+ continue;
+
if (sysv_translate_facility(name,
NULL, &dep) < 0)
continue;
- r =
unit_add_two_dependencies_by_name(u, UNIT_BEFORE, e, dep, NULL, true);
+ r =
unit_add_dependency_by_name_inverse(u, UNIT_BEFORE, dep, NULL, true);
+ if (*j[0]!='+')
+ r =
unit_add_dependency_by_name(u, UNIT_REQUIRES, dep, NULL, true);
free(dep);
}
}
--
1.7.3.4
++++++ 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch ++++++
From 700b1261115a67392014ff2c887a9cffc28108ab Mon Sep 17 00:00:00 2001From: Frederic Crozat <fcrozat@xxxxxxxx>
Date: Fri, 30 Sep 2011 12:58:17 +0200
Subject: [PATCH] service: flags sysv service with detected pid as
RemainAfterExit=false
LSB header doesn't give pidfile, so all LSB initscripts have
RemainAfterExit=false, causing daemon termination to not be reported as
such by systemd. Checking at startup if daemon is still running for
sysv initscript to disable RemainAfterExit helps a lot.
Fixes https://bugzilla.novell.com/show_bug.cgi?id=721426
---
src/service.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/service.c b/src/service.c
index 6b7064a..eb2699c 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2012,9 +2012,15 @@ static void service_enter_running(Service *s, bool
success) {
main_pid_ok = main_pid_good(s);
cgroup_ok = cgroup_good(s);
+
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
- (s->bus_name_good || s->type != SERVICE_DBUS))
+ (s->bus_name_good || s->type != SERVICE_DBUS)) {
+#ifdef HAVE_SYSV_COMPAT
+ if (s->sysv_enabled && !s->pid_file)
+ s->remain_after_exit = false;
+#endif
service_set_state(s, SERVICE_RUNNING);
+ }
else if (s->remain_after_exit)
service_set_state(s, SERVICE_EXITED);
else
--
1.7.3.4
++++++ logind-warning.patch ++++++
From 3887b5abcb3870db9ed53de3875a465c230ddd3f Mon Sep 17 00:00:00 2001From: Lennart Poettering <lennart@xxxxxxxxxxxxxx>
Date: Tue, 4 Oct 2011 01:38:13 +0200
Subject: [PATCH] logind: properly generate session creation response on dbus
This fixes the various reported issues with dbus message parsing when
running su.
---
src/logind-dbus.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/logind-dbus.c b/src/logind-dbus.c
index b33a096..bc1e49d 100644
--- a/src/logind-dbus.c
+++ b/src/logind-dbus.c
@@ -405,12 +405,16 @@ static int bus_manager_create_session(Manager *m,
DBusMessage *message, DBusMess
goto fail;
}
+ seat = session->seat ? session->seat->id : "";
+ vtnr = session->vtnr;
b = dbus_message_append_args(
reply,
DBUS_TYPE_STRING, &session->id,
DBUS_TYPE_OBJECT_PATH, &p,
DBUS_TYPE_STRING,
&session->user->runtime_path,
DBUS_TYPE_UNIX_FD, &fifo_fd,
+ DBUS_TYPE_STRING, &seat,
+ DBUS_TYPE_UINT32, &vtnr,
DBUS_TYPE_INVALID);
free(p);
--
1.7.3.4
++++++ systemd-34.tar.bz2 -> systemd-36.tar.bz2 ++++++
++++ 20764 lines of diff (skipped)
++++++ systemd-insserv_conf ++++++
--- /var/tmp/diff_new_pack.OJEGw5/_old 2011-10-08 11:44:31.000000000 +0200
+++ /var/tmp/diff_new_pack.OJEGw5/_new 2011-10-08 11:44:31.000000000 +0200
@@ -25,7 +25,7 @@
stripped_dep=${dep/boot./}
case "$stripped_dep" in
+*) ln -s -f
/lib/systemd/system/${facilities[${stripped_dep:2}]:-${stripped_dep:1}.service}
$1/$target.wants/ ;;
- *) ln -s -f
/lib/systemd/system/${facilities[${stripped_dep:1}]:-${stripped_dep}.service}
$1/$target.wants/ ;;
+ *) ln -s -f
/lib/systemd/system/${facilities[${stripped_dep:1}]:-${stripped_dep}.service}
$1/$target.requires/ ;;
esac
done
;;
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |