diff --git a/fix-kmod-build.patch b/fix-kmod-build.patch deleted file mode 100644 index e7666cfa..00000000 --- a/fix-kmod-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0bb96d9971975a42c102d87036c858e1347d6bc5 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat -Date: Thu, 9 Feb 2012 14:12:10 +0100 -Subject: [PATCH] kmod-setup: fix build with libkmod - ---- - Makefile.am | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fbf2358..c5b819e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -546,7 +546,8 @@ libsystemd_core_la_CFLAGS = \ - $(UDEV_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ - $(PAM_CFLAGS) \ -- $(AUDIT_CFLAGS) -+ $(AUDIT_CFLAGS) \ -+ $(KMOD_CFLAGS) - - libsystemd_core_la_LIBADD = \ - libsystemd-basic.la \ -@@ -555,7 +556,8 @@ libsystemd_core_la_LIBADD = \ - $(LIBWRAP_LIBS) \ - $(PAM_LIBS) \ - $(AUDIT_LIBS) \ -- $(CAP_LIBS) -+ $(CAP_LIBS) \ -+ $(KMOD_LIBS) - - # This is needed because automake is buggy in how it generates the - # rules for C programs, but not Vala programs. We therefore can't -@@ -728,12 +730,10 @@ systemd_SOURCES = \ - systemd_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ -- $(UDEV_CFLAGS) \ -- $(KMOD_CFLAGS) -+ $(UDEV_CFLAGS) - - systemd_LDADD = \ -- libsystemd-core.la \ -- $(KMOD_LIBS) -+ libsystemd-core.la - - test_engine_SOURCES = \ - src/test-engine.c --- -1.7.7 - diff --git a/fix-message-after-chkconfig.patch b/fix-message-after-chkconfig.patch deleted file mode 100644 index 617dbe81..00000000 --- a/fix-message-after-chkconfig.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ab5919fa1af147c2632fdae7bed4504c898a60af Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Thu, 9 Feb 2012 10:05:15 +0100 -Subject: [PATCH] systemctl: check for no more work after chkconfig - -Avoid a bogus message from 'systemctl enable ...' when all units given -are SysV services: - Warning: unit files do not carry install information. No operation - executed. - -https://bugzilla.redhat.com/show_bug.cgi?id=787407 ---- - src/systemctl.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/systemctl.c b/src/systemctl.c -index 12264f8..ab6d126 100644 ---- a/src/systemctl.c -+++ b/src/systemctl.c -@@ -3662,12 +3662,15 @@ static int enable_unit(DBusConnection *bus, char **args) { - int r; - DBusError error; - -- dbus_error_init(&error); -- - r = enable_sysv_units(args); - if (r < 0) - return r; - -+ if (!args[1]) -+ return 0; -+ -+ dbus_error_init(&error); -+ - if (!bus || avoid_bus()) { - if (streq(verb, "enable")) { - r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes); --- -1.7.7 - diff --git a/is-enabled-non-existing-service.patch b/is-enabled-non-existing-service.patch deleted file mode 100644 index 0368b4db..00000000 --- a/is-enabled-non-existing-service.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81006b8ad8cfdbfdb418fc99918ee5c33eb5b35a Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Thu, 9 Feb 2012 10:36:56 +0100 -Subject: [PATCH] install: fix incorrect 'Access denied' message with a - non-existent unit - -With "systemctl is-enabled non-existent.service" -_UNIT_FILE_STATE_INVALID (-1) was wrongly interpreted as -errno. -Return -ENOENT in this case. - -https://bugzilla.redhat.com/show_bug.cgi?id=766579 ---- - src/install.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/install.c b/src/install.c -index 1fb1f9d..174d79b 100644 ---- a/src/install.c -+++ b/src/install.c -@@ -1571,10 +1571,10 @@ UnitFileState unit_file_get_state( - } - - if (lstat(path, &st) < 0) { -+ r = -errno; - if (errno == ENOENT) - continue; - -- r = -errno; - goto finish; - } - --- -1.7.7 - diff --git a/systemd-41.tar.xz b/systemd-41.tar.xz deleted file mode 100644 index 31c906ae..00000000 --- a/systemd-41.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edeb6d2fc9d55cf3ec0c09817e736238c224c615887ff23e8f314b52abe0468d -size 881864 diff --git a/systemd-42.tar.xz b/systemd-42.tar.xz new file mode 100644 index 00000000..b54e5fff --- /dev/null +++ b/systemd-42.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dc107d488d823eb2203b6f1567096749ea37c1cf9022a6b0507ec07691e0ec2 +size 854808 diff --git a/systemd-gtk.changes b/systemd-gtk.changes index aebc88c9..e1d0ade6 100644 --- a/systemd-gtk.changes +++ b/systemd-gtk.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com + +- Update to version 42: + + Various bug fixes + + Watchdog support for supervising services is now usable + + Service start rate limiting is now configurable and can be + turned off per service. + + New CanReboot(), CanPowerOff() bus calls in systemd-logind +- Dropped fix-kmod-build.patch, fix-message-after-chkconfig.patch, + is-enabled-non-existing-service.patch (merged upstream) +- Add libxslt1 / docbook-xsl-stylesheets as BuildRequires for + manpage generation + ------------------------------------------------------------------- Thu Feb 9 16:19:38 UTC 2012 - fcrozat@suse.com diff --git a/systemd-gtk.spec b/systemd-gtk.spec index fb02db3b..217ce042 100644 --- a/systemd-gtk.spec +++ b/systemd-gtk.spec @@ -18,7 +18,7 @@ Name: systemd-gtk Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 41 +Version: 42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel diff --git a/systemd.changes b/systemd.changes index aebc88c9..e1d0ade6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com + +- Update to version 42: + + Various bug fixes + + Watchdog support for supervising services is now usable + + Service start rate limiting is now configurable and can be + turned off per service. + + New CanReboot(), CanPowerOff() bus calls in systemd-logind +- Dropped fix-kmod-build.patch, fix-message-after-chkconfig.patch, + is-enabled-non-existing-service.patch (merged upstream) +- Add libxslt1 / docbook-xsl-stylesheets as BuildRequires for + manpage generation + ------------------------------------------------------------------- Thu Feb 9 16:19:38 UTC 2012 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index b0064cc3..58d5f026 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 41 +Version: 42 Release: 0 Summary: A System and Session Manager License: GPL-2.0+ @@ -30,6 +30,7 @@ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel BuildRequires: dbus-1-devel +BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gperf BuildRequires: intltool @@ -41,6 +42,7 @@ BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: libudev-devel +BuildRequires: libxslt1 BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: tcpd-devel @@ -92,9 +94,6 @@ Patch38: dm-lvm-after-local-fs-pre-target.patch # 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. Patch21: no-tmpfs-fsck.patch -Patch37: fix-kmod-build.patch -Patch39: fix-message-after-chkconfig.patch -Patch40: is-enabled-non-existing-service.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -155,10 +154,7 @@ Plymouth integration for systemd %patch31 -p1 %patch33 -p1 %patch36 -p1 -%patch37 -p1 %patch38 -p1 -%patch39 -p1 -%patch40 -p1 %build autoreconf -fiv @@ -171,6 +167,7 @@ export V=1 --docdir=%{_docdir}/systemd \ --with-rootprefix= \ --with-pamlibdir=/%{_lib}/security \ + --disable-split-usr \ --disable-gtk \ CFLAGS="%{optflags}" make %{?_smp_mflags}