diff --git a/ecryptfs-utils-93-fixcrypto.patch b/ecryptfs-utils-93-fixcrypto.patch new file mode 100644 index 0000000..9e1dba0 --- /dev/null +++ b/ecryptfs-utils-93-fixcrypto.patch @@ -0,0 +1,13 @@ +diff -up ecryptfs-utils-93/src/libecryptfs/cipher_list.c.fixcrypto ecryptfs-utils-93/src/libecryptfs/cipher_list.c +--- ecryptfs-utils-93/src/libecryptfs/cipher_list.c.fixcrypto 2012-02-09 16:30:26.131507587 +0100 ++++ ecryptfs-utils-93/src/libecryptfs/cipher_list.c 2012-02-09 16:33:53.483525760 +0100 +@@ -339,7 +339,9 @@ static struct cipher_name_module_map { + {"xeta", "tea.ko", 8, 16, 16, 9, 0}, + {"xtea", "tea.ko", 8, 16, 16, 8, 0}, + {"blowfish", "blowfish.ko", 16, 16, 56, 2, 1}, ++ {"blowfish", "blowfish_generic.ko", 16, 16, 56, 2, 1}, + {"twofish", "twofish.ko", 16, 16, 32, 4, 1}, ++ {"twofish", "twofish_generic.ko", 16, 16, 32, 4, 1}, + {"khazad", "khazad.ko", 8, 16, 16, 11, 0}, + {"cast5", "cast5.ko", 8, 5, 16, 14, 1}, + {"cast6", "cast6.ko", 16, 16, 32, 5, 1}, diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 3f71933..a8ab623 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -5,7 +5,7 @@ Name: ecryptfs-utils Version: 95 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -60,6 +60,8 @@ Patch18: ecryptfs-utils-87-fixconst.patch Patch19: ecryptfs-utils-87-syslog.patch +Patch20: ecryptfs-utils-93-fixcrypto.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils, cryptsetup-luks, util-linux, gettext BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel @@ -113,6 +115,7 @@ the interface supplied by the ecryptfs-utils library. %patch17 -p1 -b .pamdata %patch18 -p1 -b .fixconst %patch19 -p1 -b .syslog +%patch20 -p1 -b .fixcrypto %build export CFLAGS="$RPM_OPT_FLAGS -Werror -Wtype-limits" @@ -252,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Mon Feb 13 2012 Michal Hlavinka - 95-3 +- blowfish and twofish support check did not work with on 3.2.x kernels (#785036) + * Fri Jan 13 2012 Fedora Release Engineering - 95-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild