Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2013-05-27 10:03:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-05-15
16:10:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2013-05-27 10:03:20.000000000 +0200
@@ -1,0 +2,13 @@
+Fri May 17 15:53:33 UTC 2013 - fcro...@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 - fcro...@suse.com
+
+- Add sysctl-handle-boot-sysctl.conf-kernel_release.patch: ensure
+ /boot/sysctl.conf-<kernel_release> is handled (bnc#809420).
+
+-------------------------------------------------------------------
systemd.changes: same change
New:
----
sysctl-handle-boot-sysctl.conf-kernel_release.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.J33ECm/_old 2013-05-27 10:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.J33ECm/_new 2013-05-27 10:03:22.000000000 +0200
@@ -113,11 +113,10 @@
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
lnus...@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
lnus...@suse.com -- optionally warn if nss-myhostname is called
+# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch
lnus...@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
@@ -153,8 +152,10 @@
Patch27: apply-ACL-for-nvidia-device-nodes.patch
# PATCH-FIX-OPENSUSE
Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
fcro...@suse.com -- handle boot.* initscripts
Patch37:
Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
-# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch -- FATE#314974
m...@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from
tmp direcorie.
+# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch FATE#314974 m...@suse.de
-- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
Patch39: systemd-tmp-safe-defaults.patch
+# PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch
bnc#809420 fcro...@suse.com -- handle /boot/sysctl.conf-<kernel_release> file
+Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch
# Upstream First - Policy:
# Never add any patches to this package without the upstream commit id
@@ -401,6 +402,7 @@
%patch37 -p1
%patch38 -p1
%patch39 -p1
+%patch40 -p1
%build
autoreconf -fiv
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.J33ECm/_old 2013-05-27 10:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.J33ECm/_new 2013-05-27 10:03:22.000000000 +0200
@@ -108,11 +108,10 @@
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
lnus...@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
lnus...@suse.com -- optionally warn if nss-myhostname is called
+# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch
lnus...@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
@@ -148,8 +147,10 @@
Patch27: apply-ACL-for-nvidia-device-nodes.patch
# PATCH-FIX-OPENSUSE
Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
fcro...@suse.com -- handle boot.* initscripts
Patch37:
Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
-# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch -- FATE#314974
m...@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from
tmp direcorie.
+# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch FATE#314974 m...@suse.de
-- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
Patch39: systemd-tmp-safe-defaults.patch
+# PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch
bnc#809420 fcro...@suse.com -- handle /boot/sysctl.conf-<kernel_release> file
+Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch
# Upstream First - Policy:
# Never add any patches to this package without the upstream commit id
@@ -396,6 +397,7 @@
%patch37 -p1
%patch38 -p1
%patch39 -p1
+%patch40 -p1
%build
autoreconf -fiv
++++++ parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch ++++++
--- /var/tmp/diff_new_pack.J33ECm/_old 2013-05-27 10:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.J33ECm/_new 2013-05-27 10:03:22.000000000 +0200
@@ -1,17 +1,18 @@
+From 0d4db3c514f1fe3fe13acb7a34a5a517db9ccb2d Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcro...@suse.com>
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 @@
+ 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 @@
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 @@
finish:
for (i = 0; i < ELEMENTSOF(rcnd_table); i++)
+--
+1.8.1.4
+
++++++ sysctl-handle-boot-sysctl.conf-kernel_release.patch ++++++
>From 752a4370ecb5643a432ad73b1e22c80cd304948f Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcro...@suse.com>
Date: Fri, 17 May 2013 13:31:46 +0200
Subject: [PATCH] sysctl: handle /boot/sysctl.conf-<kernel_release>
Add support for kernel release sysctl.conf files (for per-flavor
configuration), needed by openSUSE (bnc#809420).
---
src/sysctl/sysctl.c | 8 ++++++++
units/systemd-sysctl.service.in | 1 +
2 files changed, 9 insertions(+)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index db18dd9..aa10b79 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <limits.h>
#include <getopt.h>
+#include <sys/utsname.h>
#include "log.h"
#include "strv.h"
@@ -297,6 +298,13 @@ int main(int argc, char *argv[]) {
} else {
_cleanup_strv_free_ char **files = NULL;
char **f;
+ char kernel_sysctl[PATH_MAX];
+ struct utsname uts;
+
+ assert_se(uname(&uts) >= 0);
+
+ snprintf(kernel_sysctl, sizeof(kernel_sysctl),
"/boot/sysctl.conf-%s", uts.release);
+ r = parse_file(sysctl_options, kernel_sysctl, true);
r = conf_files_list_nulstr(&files, ".conf", NULL,
conf_file_dirs);
if (r < 0) {
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index 45e1ceb..61d13c9 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -19,6 +19,7 @@ ConditionDirectoryNotEmpty=|/usr/lib/sysctl.d
ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d
ConditionDirectoryNotEmpty=|/etc/sysctl.d
ConditionDirectoryNotEmpty=|/run/sysctl.d
+ConditionPathExistsGlob=|/boot/sysctl.conf-*
[Service]
Type=oneshot
--
1.8.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
