diff options
| author | Jan Palus | 2024-01-24 11:27:28 (GMT) |
|---|---|---|
| committer | Jan Palus | 2024-01-24 11:27:28 (GMT) |
| commit | 1ce5308bdd401ace5903b03c8bc715cf610bf31e (patch) | |
| tree | fa23d04d97d505e9ec9e75e854e42e1db40c6a58 | |
| parent | 2cbcb55cb5edaeed8784de3d3b9710ada4ffc578 (diff) | |
| download | cryptsetup-1ce5308bdd401ace5903b03c8bc715cf610bf31e.zip cryptsetup-1ce5308bdd401ace5903b03c8bc715cf610bf31e.tar.gz | |
up to 2.7.0
| -rw-r--r-- | cryptsetup-sh.patch | 25 | ||||
| -rw-r--r-- | cryptsetup.spec | 9 |
2 files changed, 4 insertions, 30 deletions
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 ========================================================================== 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 |