commit 1ce5308bdd401ace5903b03c8bc715cf610bf31e
Author: Jan Palus <[email protected]>
Date: Wed Jan 24 12:27:28 2024 +0100
up to 2.7.0
cryptsetup-sh.patch | 25 -------------------------
cryptsetup.spec | 9 ++++-----
2 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b6d8a52..e9289f2 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -10,15 +10,14 @@
Summary: LUKS for dm-crypt implemented in cryptsetup
Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup
Name: cryptsetup
-Version: 2.6.1
+Version: 2.7.0
Release: 1
License: GPL v2
Group: Base
-Source0:
https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/%{name}-%{version}.tar.xz
-# Source0-md5: f9451ea928dc600eb34dd9f4d9ca34e5
+Source0:
https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/%{name}-%{version}.tar.xz
+# Source0-md5: 7210d45a19703bca547e8ba190278cb0
Patch0: diet.patch
Patch1: no_pty_tests.patch
-Patch2: %{name}-sh.patch
URL: https://gitlab.com/cryptsetup/cryptsetup
BuildRequires: autoconf >= 2.67
BuildRequires: automake >= 1:1.12
@@ -35,6 +34,7 @@ BuildRequires: libsepol-devel
BuildRequires: libssh-devel
BuildRequires: libtool >= 2:2.0
BuildRequires: libuuid-devel
+BuildRequires: linux-libc-headers >= 7:6.4
%{!?with_gcrypt:BuildRequires: openssl-devel >= 0.9.8}
%{?with_passwdqc:BuildRequires: passwdqc-devel}
BuildRequires: pkgconfig
@@ -165,7 +165,6 @@ cryptsetup - wersję statycznie zlinkowaną dla initrd.
%setup -q
%{?with_diet:%patch0 -p1}
%patch1 -p1
-%patch2 -p1
%{__rm} po/stamp-po
diff --git a/cryptsetup-sh.patch b/cryptsetup-sh.patch
deleted file mode 100644
index 60b1e0d..0000000
--- a/cryptsetup-sh.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- cryptsetup-2.6.0/configure.ac.orig 2022-11-29 17:56:55.636600523 +0100
-+++ cryptsetup-2.6.0/configure.ac 2022-11-29 18:02:49.904681288 +0100
-@@ -634,16 +634,16 @@ dnl Set Requires.private for libcryptset
- dnl pwquality is used only by tools
- PKGMODULES="uuid devmapper json-c"
- case $with_crypto_backend in
-- gcrypt) PKGMODULES+=" libgcrypt" ;;
-- openssl) PKGMODULES+=" openssl" ;;
-- nss) PKGMODULES+=" nss" ;;
-- nettle) PKGMODULES+=" nettle" ;;
-+ gcrypt) PKGMODULES="$PKGMODULES libgcrypt" ;;
-+ openssl) PKGMODULES="$PKGMODULES openssl" ;;
-+ nss) PKGMODULES="$PKGMODULES nss" ;;
-+ nettle) PKGMODULES="$PKGMODULES nettle" ;;
- esac
- if test "x$enable_libargon2" = "xyes"; then
-- PKGMODULES+=" libargon2"
-+ PKGMODULES="$PKGMODULES libargon2"
- fi
- if test "x$enable_blkid" = "xyes"; then
-- PKGMODULES+=" blkid"
-+ PKGMODULES="$PKGMODULES blkid"
- fi
- AC_SUBST([PKGMODULES])
- dnl ==========================================================================
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cryptsetup.git/commitdiff/92620a6e31ccdf582da45b0fb605dec78cd67661
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
