packages: systemd/kmsg-to-syslog.patch, systemd/systemd.spec, systemd/targe...

Fri Jul 6 12:32:58 CEST 2012

Author: baggins                      Date: Fri Jul  6 10:32:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 186
- removed patches applied upstream

---- Files affected:
packages/systemd:
   kmsg-to-syslog.patch (1.3 -> 1.4) , systemd.spec (1.192 -> 1.193) , target-pld.patch (1.9 -> 1.10) , systemd-udev-service.patch (1.2 -> NONE)  (REMOVED), udevlibexecdir.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/systemd/kmsg-to-syslog.patch
diff -u packages/systemd/kmsg-to-syslog.patch:1.3 packages/systemd/kmsg-to-syslog.patch:1.4

--- packages/systemd/kmsg-to-syslog.patch:1.3	Tue Jun  5 08:18:56 2012
+++ packages/systemd/kmsg-to-syslog.patch	Fri Jul  6 12:32:53 2012
@@ -4,7 +4,7 @@
  #ForwardToSyslog=yes
  #ForwardToKMsg=no
  #ForwardToConsole=no
--#ImportKernel=yes
+-#ImportKernel=no
 +ImportKernel=no
  #TTYPath=/dev/console
  #MaxLevelStore=debug

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.192 packages/systemd/systemd.spec:1.193
--- packages/systemd/systemd.spec:1.192	Tue Jul  3 22:41:26 2012
+++ packages/systemd/systemd.spec	Fri Jul  6 12:32:53 2012
@@ -3,6 +3,7 @@
 # - pldize vconsole setup:
 # 	http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
 # - udev initrd needs love (is probably completly unusable in current form)
+# - replace our rpm macros with systemd provided?
 #
 # Conditional build:
 %bcond_without	audit		# without audit support
@@ -38,13 +39,13 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:	185
-Release:	3
+Version:	186
+Release:	0.1
 Epoch:		1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5:	a7dbbf05986eb0d2c164ec8e570eb78f
+# Source0-md5:	17eff1d31e6e49bf82e129fe57efd59b
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	network.service
@@ -77,9 +78,7 @@
 Patch6:		udev-so.patch
 Patch7:		udev-uClibc.patch
 Patch8:		udev-ploop-rules.patch
-Patch9:		udevlibexecdir.patch
 Patch10:	static-udev.patch
-Patch11:	systemd-udev-service.patch
 Patch12:	udevadm-in-sbin.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
@@ -563,8 +562,6 @@
 %patch7 -p1
 %endif
 %patch8 -p1
-%patch9 -p1
-%patch11 -p1
 %patch12 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
@@ -973,8 +970,7 @@
 %attr(755,root,root) /lib/systemd/systemd-multi-seat-x
 %attr(755,root,root) /lib/systemd/systemd-quotacheck
 %attr(755,root,root) /lib/systemd/systemd-random-seed
-%attr(755,root,root) /lib/systemd/systemd-readahead-collect
-%attr(755,root,root) /lib/systemd/systemd-readahead-replay
+%attr(755,root,root) /lib/systemd/systemd-readahead
 %attr(755,root,root) /lib/systemd/systemd-remount-fs
 %attr(755,root,root) /lib/systemd/systemd-reply-password
 %attr(755,root,root) /lib/systemd/systemd-shutdown
@@ -1031,7 +1027,10 @@
 %{_mandir}/man1/systemd-machine-id-setup.1*
 %{_mandir}/man1/systemd-notify.1*
 %{_mandir}/man1/systemd-nspawn.1*
+%{_mandir}/man1/systemd-tty-ask-password-agent.1*
 %{_mandir}/man5/binfmt.d.5*
+# cfl with rc-scripts
+#%{_mandir}/man5/crypttab.5*
 %{_mandir}/man5/hostname.5*
 %{_mandir}/man5/journald.conf.5*
 %{_mandir}/man5/locale.conf.5*
@@ -1044,23 +1043,38 @@
 %{_mandir}/man5/systemd.*.5*
 %{_mandir}/man5/timezone.5*
 %{_mandir}/man5/vconsole.conf.5*
+%{_mandir}/man7/bootup.7*
 %{_mandir}/man7/daemon.7*
+%{_mandir}/man7/kernel-command-line.7*
 %{_mandir}/man7/sd-daemon.7*
 %{_mandir}/man7/sd-login.7*
 %{_mandir}/man7/sd-readahead.7*
-%{_mandir}/man7/systemd.special.7*
 %{_mandir}/man7/systemd.journal-fields.7*
+%{_mandir}/man7/systemd.special.7*
 %{_mandir}/man8/systemd-binfmt.8*
-%{_mandir}/man8/systemd-binfmt.service.8*
+%{_mandir}/man8/systemd-cryptsetup-generator.8*
+%{_mandir}/man8/systemd-fstab-generator.8*
+%{_mandir}/man8/systemd-getty-generator.8*
+%{_mandir}/man8/systemd-hostnamed.8*
+%{_mandir}/man8/systemd-initctl.8*
 %{_mandir}/man8/systemd-journald.8*
-%{_mandir}/man8/systemd-journald.service.8*
+%{_mandir}/man8/systemd-localed.8*
 %{_mandir}/man8/systemd-logind.8*
-%{_mandir}/man8/systemd-logind.service.8*
 %{_mandir}/man8/systemd-modules-load.8*
-%{_mandir}/man8/systemd-modules-load.service.8*
+%{_mandir}/man8/systemd-quotacheck.8*
+%{_mandir}/man8/systemd-random-seed.8*
+%{_mandir}/man8/systemd-readahead.8*
+%{_mandir}/man8/systemd-remount-fs.8*
+%{_mandir}/man8/systemd-shutdown.8*
+%{_mandir}/man8/systemd-shutdownd.8*
+%{_mandir}/man8/systemd-sleep.8*
 %{_mandir}/man8/systemd-sysctl.8*
-%{_mandir}/man8/systemd-sysctl.service.8*
+%{_mandir}/man8/systemd-system-update-generator.8*
+%{_mandir}/man8/systemd-timedated.8*
 %{_mandir}/man8/systemd-udevd.8*
+%{_mandir}/man8/systemd-update-utmp.8*
+%{_mandir}/man8/systemd-user-sessions.8*
+%{_mandir}/man8/systemd-vconsole-setup.8*
 %dir /var/lib/%{name}
 %dir /var/lib/%{name}/coredump
 %attr(640,root,root) %ghost /var/log/btmp
@@ -1153,6 +1167,49 @@
 %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
 %{systemdunitdir}/sysinit.target.wants/sys-*.mount
 %{systemdunitdir}/sysinit.target.wants/systemd-*
+%{_mandir}/man8/systemd-ask-password-console.path.8*
+%{_mandir}/man8/systemd-ask-password-console.service.8*
+%{_mandir}/man8/systemd-ask-password-wall.path.8*
+%{_mandir}/man8/systemd-ask-password-wall.service.8*
+%{_mandir}/man8/systemd-binfmt.service.8*
+%{_mandir}/man8/systemd-cryptsetup.8*
+%{_mandir}/man8/systemd-cryptsetup at .service.8*
+%{_mandir}/man8/systemd-fsck-root.service.8*
+%{_mandir}/man8/systemd-fsck at .service.8*
+%{_mandir}/man8/systemd-halt.service.8*
+%{_mandir}/man8/systemd-hibernate.service.8*
+%{_mandir}/man8/systemd-hostnamed.service.8*
+%{_mandir}/man8/systemd-initctl.service.8*
+%{_mandir}/man8/systemd-initctl.socket.8*
+%{_mandir}/man8/systemd-journald.service.8*
+%{_mandir}/man8/systemd-journald.socket.8*
+%{_mandir}/man8/systemd-kexec.service.8*
+%{_mandir}/man8/systemd-localed.service.8*
+%{_mandir}/man8/systemd-logind.service.8*
+%{_mandir}/man8/systemd-modules-load.service.8*
+%{_mandir}/man8/systemd-poweroff.service.8*
+%{_mandir}/man8/systemd-quotacheck.service.8*
+%{_mandir}/man8/systemd-random-seed-load.service.8*
+%{_mandir}/man8/systemd-random-seed-save.service.8*
+%{_mandir}/man8/systemd-readahead-collect.service.8*
+%{_mandir}/man8/systemd-readahead-done.service.8*
+%{_mandir}/man8/systemd-readahead-done.timer.8*
+%{_mandir}/man8/systemd-readahead-replay.service.8*
+%{_mandir}/man8/systemd-reboot.service.8*
+%{_mandir}/man8/systemd-remount-fs.service.8*
+%{_mandir}/man8/systemd-shutdownd.service.8*
+%{_mandir}/man8/systemd-shutdownd.socket.8*
+%{_mandir}/man8/systemd-suspend.service.8*
+%{_mandir}/man8/systemd-sysctl.service.8*
+%{_mandir}/man8/systemd-timedated.service.8*
+%{_mandir}/man8/systemd-tmpfiles-clean.service.8*
+%{_mandir}/man8/systemd-tmpfiles-clean.timer.8*
+%{_mandir}/man8/systemd-tmpfiles-setup.service.8*
+%{_mandir}/man8/systemd-udevd.service.8*
+%{_mandir}/man8/systemd-update-utmp-runlevel.service.8*
+%{_mandir}/man8/systemd-update-utmp-shutdown.service.8*
+%{_mandir}/man8/systemd-user-sessions.service.8*
+%{_mandir}/man8/systemd-vconsole-setup.service.8*
 
 %files inetd
 %defattr(644,root,root,755)
@@ -1162,6 +1219,7 @@
 %files analyze
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/systemd-analyze
+%{_mandir}/man1/systemd-analyze.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -1235,11 +1293,6 @@
 
 /usr/lib/udev
 
-# /lib/udev/devices/ are not read anymore; systemd-tmpfiles
-# should be used to create dead device nodes as workarounds for broken
-# subsystems.
-%dir /lib/udev/devices
-
 %attr(755,root,root) /lib/udev/collect
 
 %attr(755,root,root) /lib/udev/keyboard-force-release.sh
@@ -1362,6 +1415,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2012/07/06 10:32:53  baggins
+- updated to 186
+- removed patches applied upstream
+
 Revision 1.192  2012/07/03 20:41:26  arekm
 - move O: udev-compat from udev to udev-core subpackage
 

================================================================
Index: packages/systemd/target-pld.patch
diff -u packages/systemd/target-pld.patch:1.9 packages/systemd/target-pld.patch:1.10
--- packages/systemd/target-pld.patch:1.9	Mon May 28 11:25:13 2012
+++ packages/systemd/target-pld.patch	Fri Jul  6 12:32:53 2012
@@ -93,8 +93,8 @@
 +++ b/src/fsck/fsck.c
 @@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
                          arg_skip = true;
-                 else if (startswith(w, "fsck.mode"))
-                         log_warning("Invalid fsck.mode= parameter. Ignoring.");
+                 else if (startswith(w, "fsck"))
+                         log_warning("Invalid fsck parameter. Ignoring.");
 -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
 +#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
                  else if (strneq(w, "fastboot", l))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/systemd/kmsg-to-syslog.patch?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.192&r2=1.193
    http://cvs.pld-linux.org/packages/systemd/target-pld.patch?r1=1.9&r2=1.10

