[systemd/f16] add upstream patch for bugzilla 744415, encrypted filesystem passphrases fail on runtime systems in
Karsten Hopp
karsten at fedoraproject.org
Fri Dec 2 17:25:36 UTC 2011
commit d2963bf492deac9837a333c8700b4f2dda15a1d5
Author: Karsten Hopp <karsten at redhat.com>
Date: Fri Dec 2 18:26:31 2011 +0100
add upstream patch for bugzilla 744415, encrypted filesystem passphrases
fail on runtime systems in hvc consoles
systemd-37-bug744415.patch | 11 +++++++++++
systemd.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/systemd-37-bug744415.patch b/systemd-37-bug744415.patch
new file mode 100644
index 0000000..218847f
--- /dev/null
+++ b/systemd-37-bug744415.patch
@@ -0,0 +1,11 @@
+diff -up systemd-37/src/tty-ask-password-agent.c.744415 systemd-37/src/tty-ask-password-agent.c
+--- systemd-37/src/tty-ask-password-agent.c.744415 2011-11-03 17:01:25.000000000 +0100
++++ systemd-37/src/tty-ask-password-agent.c 2011-11-03 17:02:18.000000000 +0100
+@@ -206,6 +206,7 @@ static int ask_password_plymouth(
+ continue;
+
+ memcpy(&size, buffer+1, sizeof(size));
++ size = le32toh(size);
+ if (size+5 > sizeof(buffer)) {
+ r = -EIO;
+ goto finish;
diff --git a/systemd.spec b/systemd.spec
index 919f3a0..3bddd03 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -2,7 +2,7 @@ Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Version: 37
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: System Environment/Base
Summary: A System and Service Manager
@@ -52,6 +52,7 @@ Patch1: 0002-manager-fix-a-crash-in-isolating.patch
Patch2: 0005-systemctl-completion-always-invoke-with-no-legend.patch
Patch3: 0001-mount-order-remote-mounts-after-both-network.target-.patch
Patch4: 0001-units-drop-Install-section-from-remote-fs-pre.target.patch
+Patch5: systemd-37-bug744415.patch
# For sysvinit tools
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
@@ -119,6 +120,7 @@ SysV compatibility tools for systemd
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%configure --with-rootdir= --with-distro=fedora --with-rootlibdir=/%{_lib}
@@ -367,6 +369,10 @@ fi
%{_bindir}/systemd-sysv-convert
%changelog
+* Thu Dec 02 2011 Karsten Hopp <karsten at redhat.com> 37-5
+- add upstream patch for bugzilla 744415, encrypted filesystem passphrases
+ fail on runtime systems in hvc consoles
+
* Tue Nov 15 2011 Michal Schmidt <mschmidt at redhat.com> - 37-4
- Run authconfig if /etc/pam.d/system-auth is not a symlink.
- Resolves: #753160
More information about the scm-commits
mailing list