From: Karol Lewandowski <k.lewandowsk@samsung.com>
Date: Thu, 16 Feb 2023 15:20:54 +0000 (+0100)
Subject: Merge branch 'upstream' into tizen
X-Git-Tag: accepted/tizen/7.0/unified/20230223.015628^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fcryptsetup.git;a=commitdiff_plain;h=0b3fd9f5cb35951953ebcff15cc0af7c50858ca9

Merge branch 'upstream' into tizen

This commit upgrades cryptsetup to v2.3.7, which fixes CVE-2021-4122.

Change-Id: I6713b388b25475e6f796368eca7ceadd600acccb
---

0b3fd9f5cb35951953ebcff15cc0af7c50858ca9
diff --cc packaging/cryptsetup.spec
index 3662a88,0000000..0ebeaea
mode 100644,000000..100644
--- a/packaging/cryptsetup.spec
+++ b/packaging/cryptsetup.spec
@@@ -1,122 -1,0 +1,122 @@@
 +Name:     cryptsetup
 +Summary:  The cryptsetup
- Version:  2.3.3
++Version:  2.3.7
 +Release:  1
 +License:  GPL-2.0+
 +Group:    Base/Device Management
 +URL:      http://code.google.com/p/cryptsetup/
 +Source0:  %{name}-%{version}.tar.xz
 +Source1:  cryptsetup.manifest
 +
 +BuildRequires: linux-kernel-headers
 +BuildRequires: device-mapper-devel
 +BuildRequires: libgpg-error-devel
 +BuildRequires: libgcrypt-devel
 +BuildRequires: libuuid-devel
 +BuildRequires: util-linux
 +BuildRequires: popt-devel
 +BuildRequires: automake
 +BuildRequires: gettext
 +BuildRequires: pkgconfig(json-c)
 +BuildRequires: pkgconfig(libssl1.1)
 +BuildRequires: pkgconfig(blkid)
 +
 +Requires:      libgpg-error
 +Requires:      device-mapper
 +Requires:      libgcrypt
 +
 +%description
 +setup cryptographic volumes for dm-crypt (including LUKS extension)
 +
 +%package devel
 +Summary:    The cryptsetup development package
 +Group:      Development/Libraries
 +License:    GPL-2.0+
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +cryptsetup development package
 +
 +%package locale
 +License:    GPL-2.0+
 +Summary:    The cryptsetup locale package
 +Group:      Base/Device Management
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description locale
 +locale package for cryptsetup
 +
 +%package doc 
 +License:    GPL-2.0+
 +Summary:    The cryptsetup doc package
 +Group:      Base/Device Management
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description doc
 +doc package for cryptsetup
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1} ./%{name}.manifest
 +
 +%build
 +cp %{SOURCE1} .
 +
 +chmod +x ./autogen.sh
 +./autogen.sh --prefix=%{_prefix} -localedir=%{_datarootdir}/locale -libdir=%{_libdir} \
 +             --disable-cryptsetup-reencrypt --disable-integritysetup
 +
 +make %{?jobs:-j%jobs}
 +
 +%install
 +rm -rf %{buildroot}
 +%make_install
 +
 +%clean
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%license COPYING.GPL-2.0+
 +%{_libdir}/libcryptsetup.so.*
 +%{_prefix}/lib/tmpfiles.d/cryptsetup.conf
 +%{_sbindir}/cryptsetup
 +%{_sbindir}/veritysetup
 +
 +%files devel
 +%manifest %{name}.manifest
 +%license COPYING.GPL-2.0+
 +%{_includedir}/libcryptsetup.h
 +%{_libdir}/libcryptsetup.so
 +%{_libdir}/pkgconfig/libcryptsetup.pc
 +
 +%files locale
 +%manifest %{name}.manifest
 +%license COPYING.GPL-2.0+
 +%{_datarootdir}/locale/cs/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/da/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/de/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/es/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/fi/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/fr/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/id/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/it/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/ja/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/nl/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/pl/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/pt_BR/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/ru/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/sr/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/sv/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/uk/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/vi/LC_MESSAGES/cryptsetup.mo
 +%{_datarootdir}/locale/zh_CN/LC_MESSAGES/cryptsetup.mo
 +
 +%files doc
 +%manifest %{name}.manifest
 +%license COPYING.GPL-2.0+
 +%{_mandir}/man8/cryptsetup.8.gz
 +%{_mandir}/man8/veritysetup.8.gz