Merge branch 'upstream' into tizen

This commit upgrades cryptsetup to v2.6.1, which uses openssl v3

Change-Id: I3d78b2485ebf215ff90bb4b8bfb5e512a3513c5f
Signed-off-by: Stanislaw Wadas <s.wadas@samsung.com>

diff --cc Makefile.am
index a5ccaa8,fb7cb18..16c0a4d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -11,11 -11,18 +11,18 @@@ AM_CPPFLAGS = 
          -DLIBDIR=\""$(libdir)"\"                \
          -DPREFIX=\""$(prefix)"\"                \
          -DSYSCONFDIR=\""$(sysconfdir)"\"        \
-         -DVERSION=\""$(VERSION)"\"
+         -DVERSION=\""$(VERSION)"\"              \
+         -DEXTERNAL_LUKS2_TOKENS_PATH=\"${EXTERNAL_LUKS2_TOKENS_PATH}\"
 -AM_CFLAGS = -Wall
 +AM_CFLAGS = -Wall -fPIE
+ AM_CXXFLAGS = -Wall
 -AM_LDFLAGS =
 +AM_LDFLAGS = -pie
  
- LDADD = $(LTLIBINTL) -lm
+ if ENABLE_FUZZ_TARGETS
+ AM_CFLAGS += -fsanitize=fuzzer-no-link
+ AM_CXXFLAGS += -fsanitize=fuzzer-no-link
+ endif
+ 
+ LDADD = $(LTLIBINTL)
  
  tmpfilesddir = @DEFAULT_TMPFILESDIR@
  

diff --cc configure.ac
Simple merge

diff --cc lib/utils_loop.c
index b5394de,9b31603..6e67a6a
--- 1/lib/utils_loop.c
--- 2/lib/utils_loop.c
+++ b/lib/utils_loop.c
@@@ -31,13 -31,11 +31,14 @@@
  #ifdef HAVE_SYS_SYSMACROS_H
  # include <sys/sysmacros.h>     /* for major, minor */
  #endif
+ #include <linux/types.h>
  #include <linux/loop.h>
 +#ifdef HAVE_SYS_SYSMACROS_H
 +#include <sys/sysmacros.h>     /* for major, minor */
 +#endif
  
  #include "utils_loop.h"
+ #include "libcryptsetup_macros.h"
  
  #define LOOP_DEV_MAJOR 7