[rpms/cryptobone] f44: Update to version 2.2

[Ralf Senderek <fedora@senderek.ie>]

A new commit has been pushed.

Repo   : rpms/cryptobone
Branch : f44
Commit : 6c2a0fa13df85b54e4746d48dab119357b2a23cd
Author : Ralf Senderek <fedora@senderek.ie>
Date   : 2026-08-14T16:08:43+02:00
Stats  : +19/-73 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/cryptobone/c/6c2a0fa13df85b54e4746d48dab119357b2a23cd?branch=f44

Log:
Update to version 2.2

---
diff --git a/.gitignore b/.gitignore
index 4e89158..9d277c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 /cryptobone-1.7.tar.gz.asc
 /cryptobone-2.0.tar.gz
 /cryptobone-2.0.tar.gz.asc
+/cryptobone-2.2.tar.gz
+/cryptobone-2.2.tar.gz.asc

diff --git a/COPYING b/COPYING
deleted file mode 100644
index efaaae9..0000000
--- a/COPYING
+++ /dev/null
@@ -1,60 +0,0 @@
-This file contains the usage terms for cryptlib.  The full details of cryptlib
-usage are provided on the cryptlib home page; although this file and the
-information on the web page should be identical, in case of any dispute the
-web page takes precedence.  This file is included because some distributions
-require the presence of a COPYING file.
-
-cryptlib is distributed under a dual license that allows free, open-source use
-under a GPL-compatible license and closed-source use under a standard
-commercial license.  The GPL-compatible license (a.k.a. the Sleepycat license)
-is given below.  Further details on this license are available from the
-cryptlib home page.
-
-  Copyright 1992-2016 Peter Gutmann. All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice, this
-     list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-
-  3. Redistributions in any form must be accompanied by information on how to
-     obtain complete source code for the cryptlib software and any accompanying
-     software that uses the cryptlib software.  The source code must either be
-     included in the distribution or be available for no more than the cost of
-     distribution, and must be freely redistributable under reasonable
-     conditions.  For an executable file, complete source code means the source
-     code for all modules it contains or uses.  It does not include source code
-     for modules or files that typically accompany the major components of the
-     operating system on which the executable file runs.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO
-  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-  OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  OF SUCH DAMAGE.
-
-Note that decoupling the software from the user, for example by running in a
-SaaS configuration, does not exempt you from these requirements.
-
-If you're unable to comply with the above license then the following,
-alternate usage conditions apply:
-
-  Any large-scale commercial use of cryptlib requires a license.  "Large-scale
-  commercial use" means any revenue-generating purpose such as use for
-  company-internal purposes, or use of cryptlib in an application or product,
-  with a total gross revenue of over US$5,000.  This allows cryptlib to be
-  used in freeware and shareware applications, for evaluation and research
-  purposes, and for non-revenue-generating or personal use without charge.  In
-  addition the author reserves the right to grant free licenses for commercial
-  use in special cases (for example where there is a general benefit to the
-  public), contact the author for details if you think you qualify.

diff --git a/cryptobone.spec b/cryptobone.spec
index b94ff23..878d957 100644
--- a/cryptobone.spec
+++ b/cryptobone.spec
@@ -2,16 +2,15 @@
 %global _hardened_build 1
 
 Name:       cryptobone
-Version:    2.0   
-Release:    8%{?dist}
+Version:    2.2
+Release:    1%{?dist}
 Summary:    Secure Communication Under Your Control      
 
 License:    BSD-3-Clause and Sleepycat and OpenSSL
-URL:        https://crypto-bone.com      
-Source0:    https://crypto-bone.com/release/source/cryptobone-%{version}.tar.gz       
+URL:        https://crypto-bone.com
+Source0:    https://crypto-bone.com/release/source/cryptobone-%{version}.tar.gz
 Source1:    https://crypto-bone.com/release/source/cryptobone-%{version}.tar.gz.asc
 Source2:    gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
-Source3:    https://crypto-bone.com/release/source/safewebdrop-2.2.tar.gz
 
 ExclusiveArch: x86_64 ppc64le aarch64 riscv64
 
@@ -71,10 +70,6 @@ make %{?_smp_mflags} ADDFLAGS="%{optflags}"
 %install
 %make_install
 
-# update safewebdrop server 2.2
-cd %{buildroot}%{cryptobonedir}/src
-tar xzf %{SOURCE3}
-
 mkdir -p %{buildroot}%{_datadir}/icons/default
 cp %{buildroot}%{cryptobonedir}/GUI/cryptobone.png %{buildroot}%{_datadir}/icons/default
 cp %{buildroot}%{cryptobonedir}/GUI/cryptobone-safewebdrop.png %{buildroot}%{_datadir}/icons/default
@@ -115,22 +110,27 @@ if [ $1 -eq 0 ] ; then
      systemctl disable cryptobone-fetch.timer
      systemctl stop cryptobone-fetch.timer
      umount %{cryptobonedir}/keys 2> /dev/null
-     rm -f /etc/sudoers.d/cbcontrol
+     rm -f /etc/sudoers.d/cbcontrol 2> /dev/null
      if [ -f %{cryptobonedir}/bootswitch ] ; then
           chattr -i %{cryptobonedir}/bootswitch
      fi
      rm -rf /dev/shm/RAM 2>/dev/null
      rm -rf /dev/shm/EXRAM 2>/dev/null
-     /usr/sbin/userdel cryptobone
+     /usr/sbin/userdel cryptobone 2> /dev/null
      # delete all config files in main cryptobone directory
      rm -rf %{cryptobonedir}/keys/* 2> /dev/null
      rm -rf %{cryptobonedir}/cryptobone/* 2> /dev/null
+     rm -rf %{cryptobonedir}/ext/cryptobone/* 2> /dev/null
+     rm -rf %{cryptobonedir}/ext/cltls/* 2> /dev/null
+     rm -rf %{cryptobonedir}/cltls 2> /dev/null
      rm -f %{cryptobonedir}/database* 2> /dev/null
      rm -f %{cryptobonedir}/cbb.config 2> /dev/null
      rm -f %{cryptobonedir}/bootswitch 2> /dev/null
      rm -f %{cryptobonedir}/keys.tgz 2> /dev/null
      rm -f %{cryptobonedir}/masterkey 2> /dev/null
      rm -f %{cryptobonedir}/pinghost 2> /dev/null
+     rm -f %{cryptobonedir}/ext/*.hash 2> /dev/null
+     rm -f %{cryptobonedir}/ext/safewebdrop/p* 2> /dev/null
 fi
 
 %postun
@@ -196,10 +196,14 @@ fi
 %{_mandir}/man8/cbcontrol.8.gz
 
 %license   %{_datadir}/licenses/%{name}/COPYING
+%license   %{_datadir}/licenses/%{name}/COPYING-cryptlib
 %doc       %{_docdir}/%{name}/README
 %doc       %{_docdir}/%{name}/README-cryptlib
 
 %changelog
+* Fri Aug 14 2026 Ralf Senderek <innovation@senderek.ie> - 2.2-1
+- Update to version 2.2
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index a1de083..70ce543 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cryptobone-2.0.tar.gz) = 031aa488f818bc8193e0fba63fb108282ec5c3fae32c327e1abeb9ee7aa3db923ee4e14021b53c9425b0e0c8e633b5a416f100ef7018f7d336ac485513583f43
-SHA512 (cryptobone-2.0.tar.gz.asc) = 6e812de3fd71652600e6c80c6b1cee0541b6f33d500dae780bfb9e8babfa01a3946a23a1b95c00b768342ebb29c7379ec5ebcac6747f682bce1b399350fe0397
+SHA512 (cryptobone-2.2.tar.gz) = a45cac3c284ad40a5ff777137cd1b237be73ebb539f2d535d03ee0d82c829006c88030bc225d0a949b048bd6d6d1dd948cf7aa1168de721fc73664979e4a6659
+SHA512 (cryptobone-2.2.tar.gz.asc) = 9a933ebe018a260a0f0917925df5c8d1bf16ad0050bdcccd62f10bb165c376d4cc163c2aa07fb59baaa64f3bd5f05bccc4437c28ba2f759608586a23c3ee9b7b