From d4ed5ca3d104e40814e190c3864e062349a3c629 Mon Sep 17 00:00:00 2001
From: msmeissn <>
Date: May 16 2022 16:41:35 +0000
Subject: Update cryptctl to version 2.4 / rev 12 via SR 977474


https://build.opensuse.org/request/show/977474
by user msmeissn + dimstar_suse

---

diff --git a/.files b/.files
index b067047..6c5a4cc 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index c03b2a3..06a61a1 100644
--- a/.rev
+++ b/.rev
@@ -194,4 +194,12 @@ Index: cryptctl.changes
   Implement fate#320367. (forwarded request 907570 from pperego)</comment>
     <requestid>907695</requestid>
   </revision>
+  <revision rev="12" vrev="1">
+    <srcmd5>9da6571981774e33c20cff5c5b1f40be</srcmd5>
+    <version>2.4</version>
+    <time>1652717324</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>977474</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
new file mode 100644
index 0000000..cb67d97
--- /dev/null
+++ b/.servicemark
@@ -0,0 +1 @@
+07d1fcc2eed35f59e26126c3db6bb8df
diff --git a/_service b/_service
new file mode 100644
index 0000000..bfb3791
--- /dev/null
+++ b/_service
@@ -0,0 +1,17 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">git://github.com/SUSE/cryptctl.git</param>
+    <param name="scm">git</param>
+    <param name="exclude">.git</param>
+    <param name="filename">cryptctl</param>
+    <param name="version"></param>
+    <param name="revision">master</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+
+  <service name="recompress" mode="disabled">
+    <param name="file">cryptctl*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..943200f
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">git://github.com/SUSE/cryptctl.git</param>
+              <param name="changesrevision">123f0e2355a453b61b03ade4892e61fdaedbecfc</param></service></servicedata>
\ No newline at end of file
diff --git a/cryptctl-2.3.tgz b/cryptctl-2.3.tgz
deleted file mode 120000
index 4401641..0000000
--- a/cryptctl-2.3.tgz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreiglh6mb3u2vhjqk7nl2r24ygpw32hyzprwkfpyytf4aez7ildzgei
\ No newline at end of file
diff --git a/cryptctl.changes b/cryptctl.changes
index 216b307..a5673fe 100644
--- a/cryptctl.changes
+++ b/cryptctl.changes
@@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Mon May  9 16:55:47 UTC 2022 - Peter Varkoly <varkoly@suse.com>
+
+- Update to version 2.4:
+  * (bsc#1186226) - (CVE-2019-18906) client side password hashing is equivalent to clear text password storage
+  * Fix authentication on all places.
+  * Fix sysconfig variable name.
+  * First step to use plain text password instead of hashed password.
+  * Move repository into the SUSE github organization
+  * decorate readme with more usage instructions
+  * in RPC server, if client comes from localhost, remember its ipv4 localhost address instead of ipv6 address
+  * Test clear expired commands in TestDB_UpdateSeenFlag
+  * tell a record to clear expired pending commands upon saving a command result; introduce pending commands RPC test case
+  * avoid hard coding 127.0.0.1 in host ID of alive message test; let system administrator mount and unmount disks by issuing these two commands on key server. 
+
+-------------------------------------------------------------------
 Wed Jul 21 16:02:08 UTC 2021 - Paolo Perego <paolo.perego@suse.com>
 
 - Fixed build errors adding a "go mod init"
diff --git a/cryptctl.spec b/cryptctl.spec
index 9223025..eb83f7e 100644
--- a/cryptctl.spec
+++ b/cryptctl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cryptctl
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,13 +22,13 @@
 %endif
 
 Name:           cryptctl
-Version:        2.3
+Version:        2.4
 Release:        0
 Summary:        A utility for setting up LUKS-based disk encryption
 License:        GPL-3.0-only
 Group:          System/Management
 URL:            https://www.suse.com/products/sles-for-sap
-Source0:        %{name}-%{version}.tgz
+Source0:        %{name}.tar.xz
 Source1:        %{name}-rpmlintrc
 BuildRequires:  go
 BuildRequires:  pkgconfig(systemd)
@@ -42,8 +42,7 @@ Requires:       xfsprogs
 ExclusiveArch:  x86_64 ppc64le
 %{?systemd_requires}
 
-%define GONS github.com/HouzuoGuo
-%define SRCDIR  src/%{GONS}/%{name}
+%define SRCDIR  src/github.com/SUSE
 
 %description
 A disk encryption utility that helps setting up LUKS-based disk encryption using
@@ -56,13 +55,13 @@ tar xf %{S:0}
 
 %build
 export GOPATH=$(pwd)
-cd %{SRCDIR}
+cd %{SRCDIR}/%{name}
 gzip ospackage/man/cryptctl.8
 go mod init
 go build -buildmode=pie
 
 %install
-cd %{SRCDIR}
+cd %{SRCDIR}/%{name}
 mkdir -p %{buildroot}/%{_sbindir}
 install -m 0755 %{name} %{buildroot}/%{_sbindir}/
 
@@ -119,6 +118,6 @@ install -d -m 0700 %{buildroot}/%{_sysconfdir}/%{name}/servertls
 %{_unitdir}/cryptctl-client.service
 %{_unitdir}/cryptctl-auto-unlock@.service
 %{_udevrulesdir}/99-cryptctl-auto-unlock.rules
-%doc %{SRCDIR}/LICENSE
+%doc %{SRCDIR}/%{name}/LICENSE
 
 %changelog
diff --git a/cryptctl.tar.xz b/cryptctl.tar.xz
new file mode 120000
index 0000000..f550262
--- /dev/null
+++ b/cryptctl.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreiclhhwlhoialudjntztsl3nprlqjnjdxpskctqkztgah5mcnlotve
\ No newline at end of file