From ceb0a2dc823688e0c723b39a8924367a2e67ec3e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:04:15 +0000
Subject: import cryptsetup-1.7.2-1.el7


---

diff --git a/.cryptsetup.metadata b/.cryptsetup.metadata
index 6324de1..834901d 100644
--- a/.cryptsetup.metadata
+++ b/.cryptsetup.metadata
@@ -1 +1 @@
-7cb02f1e23ee18cd26391fd856f7644195b4544e SOURCES/cryptsetup-1.6.7.tar.xz
+1b7005c0f8ad286a7f3d65e99cb555597666605c SOURCES/cryptsetup-1.7.2.tar.xz
diff --git a/.gitignore b/.gitignore
index d5122fe..6adbac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cryptsetup-1.6.7.tar.xz
+SOURCES/cryptsetup-1.7.2.tar.xz
diff --git a/SOURCES/cryptsetup-avoid-rh-kernel-bug.patch b/SOURCES/cryptsetup-avoid-rh-kernel-bug.patch
index 0cc7c5a..c0ca3b2 100644
--- a/SOURCES/cryptsetup-avoid-rh-kernel-bug.patch
+++ b/SOURCES/cryptsetup-avoid-rh-kernel-bug.patch
@@ -8,8 +8,8 @@
  
  #ifndef AF_ALG
  #define AF_ALG 38
-@@ -113,6 +114,35 @@ int crypt_kernel_socket_init(struct sockaddr_alg *sa, int *tfmfd, int *opfd)
- 	return 0;
+@@ -88,6 +89,35 @@ int crypt_cipher_blocksize(const char *n
+ 	return ca ? ca->blocksize : -EINVAL;
  }
  
 +static size_t pagesize(size_t defsize)
@@ -42,18 +42,15 @@
 +}
 +
  /*
-  *ciphers
+  * ciphers
   *
-@@ -130,6 +160,9 @@ int crypt_cipher_init(struct crypt_cipher **ctx, const char *name,
+@@ -104,6 +134,9 @@ int crypt_cipher_init(struct crypt_ciphe
+ 		.salg_type = "skcipher",
  	};
- 	int r;
  
-+	if ((r = check_rh_kernel_version()))
-+		return r;
++	if (check_rh_kernel_version())
++		return -ENOTSUP;
 +
  	h = malloc(sizeof(*h));
  	if (!h)
  		return -ENOMEM;
--- 
-2.4.3
-
diff --git a/SPECS/cryptsetup.spec b/SPECS/cryptsetup.spec
index 89a0db7..fa837ad 100644
--- a/SPECS/cryptsetup.spec
+++ b/SPECS/cryptsetup.spec
@@ -4,11 +4,11 @@
 
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.6.7
+Version: 1.7.2
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
-URL: http://cryptsetup.googlecode.com/
+URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
 BuildRequires: libselinux-devel, python-devel, libpwquality-devel
@@ -205,6 +205,10 @@ install -m755 misc/dracut_90reencrypt/reencrypt.sh %{buildroot}/%{dracutmodulesd
 %clean
 
 %changelog
+* Tue Jun  7 2016 Ondrej Kozina <okozina@redhat.com> - 1.7.2-1
+- Update to cryptsetup 1.7.2.
+- Resolves: #1302022 #1070825
+
 * Thu Jun 18 2015 Ondrej Kozina <okozina@redhat.com> - 1.6.7-1
 - Update to cryptsetup 1.6.7.
 - patch: avoid use of kernel crypto API socket which is known