[systemd/f18] Rebase to new upstream release.
Michal Schmidt
michich at fedoraproject.org
Fri Jan 11 23:34:50 UTC 2013
commit 38eaaea79e8064c30271f17d3a9347a05eb994c7
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Fri Jan 11 21:54:40 2013 +0100
Rebase to new upstream release.
...on-t-always-use-sulogin-in-rescue.service.patch | 28 +
...-add-Belarussian-mapping-simple-by-and-by.patch | 21 -
...rules-Remove-HP-iLO-from-USB-HID-PM-rules.patch | 46 -
...t-enable-persistent-network-device-naming.patch | 22 +
...dian-xlayout-is-just-ca-not-ca-fr-any-mor.patch | 26 -
...ecursion-into-transaction-code-from-job-c.patch | 46 -
0003-F18-re-add-http-daemon.target.patch | 86 +
0003-add-Hebrew-Israel-simple-il-il.patch | 21 -
0003-sysctl-parse-all-keys-in-a-config-file.patch | 24 -
0004-F18-bring-back-single.service.patch | 24 +
0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch | 21 -
...ix-parsing-of-monotonic-kernel-timestamps.patch | 42 -
0005-add-Lithuanian-keyboard-mapping-lt-lt.patch | 21 -
...not-seal-the-kernel-s-time-warp-call-from.patch | 65 -
...edonian-keyboard-mapping-X-layout-is-mk-n.patch | 26 -
0006-units-agetty-overrides-TERM.patch | 45 -
...ystemd-daemon-check-for-empty-strings-in-.patch | 93 -
...-do-not-always-accept-numbers-in-string-l.patch | 405 ---
...in-the-string-number-conversion-is-meant-.patch | 24 -
0010-strv-cleanup-error-path-loops.patch | 236 --
...s-store-journald-code-in-a-noinst-library.patch | 3330 --------------------
...r-fix-a-fatal-dbus-abort-in-bus_manager_m.patch | 30 -
...wn-readd-explicit-sync-when-shutting-down.patch | 47 -
...h-root-try-pivot_root-before-overmounting.patch | 79 -
...ys-remount-read-only-before-unmounting-in.patch | 93 -
...s-systemd-cgls-shows-n-a-when-piping-outp.patch | 35 -
...-fragment-fix-potential-bad-memory-access.patch | 46 -
0018-journald-fix-bad-memory-access.patch | 24 -
...d-always-send-SYSLOG_IDENTIFIER-if-we-hav.patch | 63 -
0020-revert-udev-killing.patch | 124 -
...fix-dbus-call-arguments-in-set_x11_keymap.patch | 25 -
systemd.spec | 61 +-
32 files changed, 182 insertions(+), 5097 deletions(-)
---
diff --git a/0001-F18-units-don-t-always-use-sulogin-in-rescue.service.patch b/0001-F18-units-don-t-always-use-sulogin-in-rescue.service.patch
new file mode 100644
index 0000000..5c0adbc
--- /dev/null
+++ b/0001-F18-units-don-t-always-use-sulogin-in-rescue.service.patch
@@ -0,0 +1,28 @@
+From e08e3216df4db1f082fa667d559c0e5a17c3b4fb Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Fri, 11 Jan 2013 22:36:06 +0100
+Subject: [PATCH] (F18) units: don't always use sulogin in rescue.service
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Undo commit 7f0086f8c9307a9a62f31a4aa5c8d3de74abd06b. I don't want this
+changed within a Fedora release.
+---
+ units/rescue.service.m4.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
+index 269797a..dde5271 100644
+--- a/units/rescue.service.m4.in
++++ b/units/rescue.service.m4.in
+@@ -18,7 +18,8 @@ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+-ExecStart=-/sbin/sulogin
++EnvironmentFile=/etc/sysconfig/init
++ExecStart=-/bin/bash -c "exec ${SINGLE}"
+ ExecStopPost=- at SYSTEMCTL@ --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
diff --git a/0002-F18-do-not-enable-persistent-network-device-naming.patch b/0002-F18-do-not-enable-persistent-network-device-naming.patch
new file mode 100644
index 0000000..aeb2902
--- /dev/null
+++ b/0002-F18-do-not-enable-persistent-network-device-naming.patch
@@ -0,0 +1,22 @@
+From f0f366a01ee4ba8261a5ee8f3a73d49834ff0141 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Fri, 11 Jan 2013 22:43:16 +0100
+Subject: [PATCH] (F18) do not enable persistent network device naming
+
+Not within a Fedora release.
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 474110a..004945f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1840,7 +1840,6 @@ dist_udevrules_DATA += \
+ rules/75-net-description.rules \
+ rules/75-tty-description.rules \
+ rules/78-sound-card.rules \
+- rules/80-net-name-slot.rules \
+ rules/95-udev-late.rules
+
+ if HAVE_KMOD
diff --git a/0003-F18-re-add-http-daemon.target.patch b/0003-F18-re-add-http-daemon.target.patch
new file mode 100644
index 0000000..09875c1
--- /dev/null
+++ b/0003-F18-re-add-http-daemon.target.patch
@@ -0,0 +1,86 @@
+From fdc3644c14c5c3ace8fac22c87a2a3dcc0da5a64 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Fri, 11 Jan 2013 23:22:49 +0100
+Subject: [PATCH] (F18) re-add http-daemon.target
+
+Partial revert of 669b04a492e33601e6c34a40bc96ad9ffa11c5a2.
+In case someone uses the odd facility names in F18. Who knows.
+---
+ Makefile.am | 1 +
+ man/systemd.special.xml | 1 +
+ src/core/service.c | 5 +++++
+ src/core/special.h | 1 +
+ units/http-daemon.target | 12 ++++++++++++
+ 5 files changed, 20 insertions(+)
+ create mode 100644 units/http-daemon.target
+
+diff --git a/Makefile.am b/Makefile.am
+index 004945f..26d4672 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -262,6 +262,7 @@ dist_systemunit_DATA = \
+ units/mail-transfer-agent.target \
+ units/hibernate.target \
+ units/hybrid-sleep.target \
++ units/http-daemon.target \
+ units/poweroff.target \
+ units/reboot.target \
+ units/rescue.target \
+diff --git a/man/systemd.special.xml b/man/systemd.special.xml
+index 9ea288e..d3b6181 100644
+--- a/man/systemd.special.xml
++++ b/man/systemd.special.xml
+@@ -63,6 +63,7 @@
+ <filename>graphical.target</filename>,
+ <filename>halt.target</filename>,
+ <filename>hibernate.target</filename>,
++ <filename>http-daemon.target</filename>,
+ <filename>hybrid-sleep.target</filename>,
+ <filename>kbrequest.target</filename>,
+ <filename>kexec.target</filename>,
+diff --git a/src/core/service.c b/src/core/service.c
+index 2a4e691..5db72b8 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -366,6 +366,11 @@ static int sysv_translate_facility(const char *name, const char *filename, char
+ "null", NULL,
+ "mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+ "smtp", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
++
++ /* re-added these for F18 */
++ "MTA", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
++ "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
++ "httpd", SPECIAL_HTTP_DAEMON_TARGET,
+ };
+
+ unsigned i;
+diff --git a/src/core/special.h b/src/core/special.h
+index ef72260..15aa6ca 100644
+--- a/src/core/special.h
++++ b/src/core/special.h
+@@ -87,6 +87,7 @@
+ * of a kind. .target units can be used to support multiple
+ * implementations that can run side-by-side.
+ */
++#define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target"
+
+ /* Magic early boot services */
+ #define SPECIAL_FSCK_SERVICE "systemd-fsck at .service"
+diff --git a/units/http-daemon.target b/units/http-daemon.target
+new file mode 100644
+index 0000000..8d018cb
+--- /dev/null
++++ b/units/http-daemon.target
+@@ -0,0 +1,12 @@
++# This file is part of systemd.
++#
++# systemd is free software; you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published by
++# the Free Software Foundation; either version 2.1 of the License, or
++# (at your option) any later version.
++
++# This exists mostly for compatibility with SysV/LSB units, and
++# implementations lacking socket/bus activation.
++
++[Unit]
++Description=Web Server
diff --git a/0004-F18-bring-back-single.service.patch b/0004-F18-bring-back-single.service.patch
new file mode 100644
index 0000000..d0dbe2d
--- /dev/null
+++ b/0004-F18-bring-back-single.service.patch
@@ -0,0 +1,24 @@
+From 644f61739799fa3c4b9a0e7d56b48bc386705138 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Fri, 11 Jan 2013 23:47:11 +0100
+Subject: [PATCH] (F18) bring back single.service
+
+---
+ Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 26d4672..28d8d44 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4080,6 +4080,10 @@ if HAVE_KMOD
+ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
+ endif
+
++ ( cd $(DESTDIR)$(systemunitdir) && \
++ rm -f single.service && \
++ $(LN_S) rescue.service single.service )
++
+ install-exec-hook: $(INSTALL_EXEC_HOOKS)
+
+ uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
diff --git a/systemd.spec b/systemd.spec
index 179206b..d9249e0 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -13,8 +13,8 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
-Version: 195
-Release: 15%{?gitcommit:.git%{gitcommit}}%{?dist}
+Version: 197
+Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -76,38 +76,11 @@ Source4: listen.conf
# Prevent accidental removal of the systemd package
Source6: yum-protect-systemd.conf
-Patch0001: 0001-rules-Remove-HP-iLO-from-USB-HID-PM-rules.patch
-Patch0002: 0002-job-avoid-recursion-into-transaction-code-from-job-c.patch
-Patch0003: 0003-sysctl-parse-all-keys-in-a-config-file.patch
-Patch0004: 0004-journal-fix-parsing-of-monotonic-kernel-timestamps.patch
-Patch0005: 0005-hwclock-do-not-seal-the-kernel-s-time-warp-call-from.patch
-Patch0006: 0006-units-agetty-overrides-TERM.patch
-Patch0007: 0007-shared-libsystemd-daemon-check-for-empty-strings-in-.patch
-Patch0008: 0008-shared-core-do-not-always-accept-numbers-in-string-l.patch
-Patch0009: 0009-shared-max-in-the-string-number-conversion-is-meant-.patch
-Patch0010: 0010-strv-cleanup-error-path-loops.patch
-Patch0011: 0011-build-sys-store-journald-code-in-a-noinst-library.patch
-Patch0012: 0012-dbus-manager-fix-a-fatal-dbus-abort-in-bus_manager_m.patch
-Patch0013: 0013-shutdown-readd-explicit-sync-when-shutting-down.patch
-Patch0014: 0014-switch-root-try-pivot_root-before-overmounting.patch
-Patch0015: 0015-umount-always-remount-read-only-before-unmounting-in.patch
-Patch0016: 0016-shared-utils-systemd-cgls-shows-n-a-when-piping-outp.patch
-Patch0017: 0017-core-load-fragment-fix-potential-bad-memory-access.patch
-Patch0018: 0018-journald-fix-bad-memory-access.patch
-Patch0019: 0019-journal-send-always-send-SYSLOG_IDENTIFIER-if-we-hav.patch
-# F18Beta blocker workaround: https://bugzilla.redhat.com/show_bug.cgi?id=873576
-# mdadm-3.2.6-2 contains the patch to escape from udev's cgroup,
-# but is not in updates yet (2012-12-05).
-Patch0020: 0020-revert-udev-killing.patch
-# F18 NTH https://bugzilla.redhat.com/show_bug.cgi?id=882212
-Patch0021: 0021-localectl-fix-dbus-call-arguments-in-set_x11_keymap.patch
-# F18: https://bugs.freedesktop.org/show_bug.cgi?id=59000 https://bugzilla.redhat.com/show_bug.cgi?id=889562
-Patch0022: 0001-add-Belarussian-mapping-simple-by-and-by.patch
-Patch0023: 0002-French-Canadian-xlayout-is-just-ca-not-ca-fr-any-mor.patch
-Patch0024: 0003-add-Hebrew-Israel-simple-il-il.patch
-Patch0025: 0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch
-Patch0026: 0005-add-Lithuanian-keyboard-mapping-lt-lt.patch
-Patch0027: 0006-correct-Macedonian-keyboard-mapping-X-layout-is-mk-n.patch
+# Revert potentially incompatible changes in v195..v197.
+Patch0001: 0001-F18-units-don-t-always-use-sulogin-in-rescue.service.patch
+Patch0002: 0002-F18-do-not-enable-persistent-network-device-naming.patch
+Patch0003: 0003-F18-re-add-http-daemon.target.patch
+Patch0004: 0004-F18-bring-back-single.service.patch
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -226,10 +199,12 @@ git am %{patches}
%{?gitcommit: ./autogen.sh }
autoreconf -i
%configure \
- --with-distro=fedora \
--libexecdir=%{_prefix}/lib \
--enable-gtk-doc \
- --disable-static
+ --disable-static \
+ --with-sysvinit-path=/etc/rc.d/init.d \
+ --with-rc-local-script-path-start=/etc/rc.d/rc.local \
+ --disable-myhostname
/usr/bin/make %{?_smp_mflags} V=1
%install
@@ -372,10 +347,12 @@ migrate_ntp()
return 0
%post
-/usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-/usr/lib/systemd/systemd-random-seed save > /dev/null 2>&1 || :
-/usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
+/usr/bin/systemd-machine-id-setup >/dev/null 2>&1 || :
+/usr/lib/systemd/systemd-random-seed save >/dev/null 2>&1 || :
+/usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
/usr/bin/systemctl start systemd-udevd.service >/dev/null 2>&1 || :
+/usr/bin/udevadm hwdb --update >/dev/null 2>&1 || :
+/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || :
# Stop-gap until rsyslog.rpm does this on its own. (This is supposed
# to fail when the link already exists)
@@ -570,6 +547,8 @@ fi
%dir %{_prefix}/lib/systemd/user-preset
%dir %{_prefix}/lib/systemd/system-shutdown
%dir %{_prefix}/lib/systemd/system-sleep
+%dir %{_prefix}/lib/systemd/catalog
+%dir %{_prefix}/lib/systemd/ntp-units.d
%dir %{_prefix}/lib/tmpfiles.d
%dir %{_prefix}/lib/sysctl.d
%dir %{_prefix}/lib/modules-load.d
@@ -642,6 +621,7 @@ fi
%{_prefix}/lib/tmpfiles.d/tmp.conf
%{_prefix}/lib/systemd/system-preset/90-default.preset
%{_prefix}/lib/systemd/system-preset/90-display-manager.preset
+%{_prefix}/lib/systemd/catalog/systemd.catalog
%{_sbindir}/init
%{_sbindir}/reboot
%{_sbindir}/halt
@@ -741,6 +721,9 @@ fi
%{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Fri Jan 11 2013 Michal Schmidt <mschmidt at redhat.com> - 197-1
+- Rebase to new upstream release.
+
* Thu Jan 3 2013 Lennart Poettering <lpoetter at redhat.com> - 195-15
- https://bugs.freedesktop.org/show_bug.cgi?id=59000
More information about the scm-commits
mailing list