From 389a31709771a3eb197778919a2f161257f9d52bf691776ef83ba316684c4d3c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 May 2013 09:16:19 +0000 Subject: [PATCH] - Rebase parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch to fix memory corruption (thanks to Michal Vyskocil) (bnc#820454). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=383 --- ...nf-and-adds-dependencies-accordingly.patch | 27 ++++++++++++------- systemd-mini.changes | 7 +++++ systemd-mini.spec | 3 +-- systemd.changes | 7 +++++ systemd.spec | 3 +-- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch b/parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch index f3e12f2..e1f7405 100644 --- a/parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch +++ b/parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch @@ -1,17 +1,18 @@ +From 0d4db3c514f1fe3fe13acb7a34a5a517db9ccb2d Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Fri, 30 Sep 2011 13:55:31 +0000 -Subject: parse /etc/insserv.conf and adds dependencies accordingly +Subject: [PATCH] parse /etc/insserv.conf and adds dependencies accordingly (bnc#721428) --- - src/core/service.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 101 insertions(+) + src/core/service.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 104 insertions(+) diff --git a/src/core/service.c b/src/core/service.c -index cf0bbe0..08fc97c 100644 +index cf0bbe0..471ce8d 100644 --- a/src/core/service.c +++ b/src/core/service.c -@@ -3440,6 +3440,105 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { +@@ -3440,6 +3440,108 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { } #ifdef HAVE_SYSV_COMPAT @@ -52,11 +53,14 @@ index cf0bbe0..08fc97c 100644 + if (streq(facility, SPECIAL_REMOTE_FS_TARGET)) { + /* insert also a Wants dependency from remote-fs-pre on remote-fs */ + u = manager_get_unit(mgr, SPECIAL_REMOTE_FS_TARGET); -+ unit_add_dependency_by_name(u, UNIT_WANTS, SPECIAL_REMOTE_FS_PRE_TARGET, NULL, true); -+ free (facility); -+ facility=strdup(SPECIAL_REMOTE_FS_PRE_TARGET); ++ if (u) { ++ unit_add_dependency_by_name(u, UNIT_WANTS, SPECIAL_REMOTE_FS_PRE_TARGET, NULL, true); ++ free (facility); ++ facility=strdup(SPECIAL_REMOTE_FS_PRE_TARGET); ++ } + } -+ if ((u = manager_get_unit(mgr, facility)) && (u->type == UNIT_TARGET)) { ++ u = manager_get_unit(mgr, facility); ++ if (u && (u->type == UNIT_TARGET)) { + char *dep = NULL, *name, **j; + + STRV_FOREACH (j, parsed+1) { @@ -117,7 +121,7 @@ index cf0bbe0..08fc97c 100644 static int service_enumerate(Manager *m) { char **p; -@@ -3600,6 +3699,8 @@ static int service_enumerate(Manager *m) { +@@ -3600,6 +3702,8 @@ static int service_enumerate(Manager *m) { r = 0; @@ -126,3 +130,6 @@ index cf0bbe0..08fc97c 100644 finish: for (i = 0; i < ELEMENTSOF(rcnd_table); i++) +-- +1.8.1.4 + diff --git a/systemd-mini.changes b/systemd-mini.changes index fc7cfcf..a92519a 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 17 15:53:33 UTC 2013 - fcrozat@suse.com + +- Rebase + parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch to + fix memory corruption (thanks to Michal Vyskocil) (bnc#820454). + ------------------------------------------------------------------- Fri May 17 11:46:02 UTC 2013 - fcrozat@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 86dbc1f..999bce1 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -113,11 +113,10 @@ Source9: nss-myhostname-config Source1060: boot.udev Source1061: write_dev_root_rule Source1062: systemd-udev-root-symlink -# Patches auto-generated by git-buildpackage: # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch -# PATCH-FIX-UPSTREAM ptionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called +# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings diff --git a/systemd.changes b/systemd.changes index fc7cfcf..a92519a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 17 15:53:33 UTC 2013 - fcrozat@suse.com + +- Rebase + parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch to + fix memory corruption (thanks to Michal Vyskocil) (bnc#820454). + ------------------------------------------------------------------- Fri May 17 11:46:02 UTC 2013 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 94cff34..ff03d45 100644 --- a/systemd.spec +++ b/systemd.spec @@ -108,11 +108,10 @@ Source9: nss-myhostname-config Source1060: boot.udev Source1061: write_dev_root_rule Source1062: systemd-udev-root-symlink -# Patches auto-generated by git-buildpackage: # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch -# PATCH-FIX-UPSTREAM ptionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called +# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings