diff --git a/_service b/_service
deleted file mode 100644
index a057b56..0000000
--- a/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- git
- https://github.com/libyal/libfvde
- 19317d6de408a8e125088928ee4f9113cd6f1e1c
-
- 20210425
-
-
- *.tar
- xz
-
-
-
diff --git a/libfvde-20210425.tar.xz b/libfvde-20210425.tar.xz
deleted file mode 100644
index 7a83975..0000000
--- a/libfvde-20210425.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef8493f2520af9824ff228a4f59754ff2bb14c1e72be16a31e9ec347b19cbf81
-size 205228
diff --git a/libfvde-experimental-20220121.tar.gz b/libfvde-experimental-20220121.tar.gz
new file mode 100644
index 0000000..b3fa2fa
--- /dev/null
+++ b/libfvde-experimental-20220121.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f353288a2a5df7fe272747648d3486c1c220b680f3ad263a343143a4da27251
+size 3273521
diff --git a/libfvde-experimental-20220121.tar.gz.asc b/libfvde-experimental-20220121.tar.gz.asc
new file mode 100644
index 0000000..a4b5634
--- /dev/null
+++ b/libfvde-experimental-20220121.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHqXW8ACgkQ2WJeXXrQ
+F3633wgAt8FS3dZToJYkkszckdp/DvMRBNz7lT/Pf5IhWXd5JM+BXrwNYW+aN/Eq
+0/xfZzMQOX60v5ThImnns6ygLoQ9hAQwPThhkH0B3BPTFC8tphTJKtnKh9SIp70o
+cO7jbjY/DmVclfYsDbhsa3lsy/PO1LoJJ8wXzi3HTsmVC60d8cGxPhF0dwAlGlMI
+7UI4Q4Wb5Zf++uxb1xYDmg9rqAPMqKT/EbpIH79ZCW0CMqgeTpcFzqbSKPQRprLp
+gYvq1peTXOKvRW62Avdz2DJZXheuGgJZfNxKIJxUIwN1xct6b8stAI+KIQHxH2Se
+wLvCVfjnZGllOvSsZvtuH8ylFAKXOA==
+=GCgM
+-----END PGP SIGNATURE-----
diff --git a/libfvde.changes b/libfvde.changes
index 219e3da..4aa1757 100644
--- a/libfvde.changes
+++ b/libfvde.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan 21 08:05:42 UTC 2022 - Jan Engelhardt
+
+- Update to release 20220121
+ * Updates to fuzzing and Python bindings.
+
+-------------------------------------------------------------------
+Thu Jan 20 10:48:59 UTC 2022 - Jan Engelhardt
+
+- Update to release 20220120
+ * Updated Python bindings, format support, tools and
+ documentation.
+
-------------------------------------------------------------------
Fri May 14 22:47:42 UTC 2021 - Jan Engelhardt
diff --git a/libfvde.keyring b/libfvde.keyring
new file mode 100644
index 0000000..da327a1
--- /dev/null
+++ b/libfvde.keyring
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq
+SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg
+fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+
+L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB
+683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5
+TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8
+am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC
+AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU
+FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb
+PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP
+UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I
+3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R
+PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv
+siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD
+lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+
+SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L
+U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw
+uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw
+Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf
+2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ
+RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM
+5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5
+3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL
+cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4
+VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg==
+=fRjn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libfvde.spec b/libfvde.spec
index 12b50b4..79ebc94 100644
--- a/libfvde.spec
+++ b/libfvde.spec
@@ -1,7 +1,7 @@
#
# spec file for package libfvde
#
-# 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
@@ -17,41 +17,45 @@
%define lname libfvde1
-%define timestamp 20191221
Name: libfvde
-Version: 20210425
+Version: 20220121
Release: 0
Summary: Library to access the File Vault Drive Encryption format
License: GFDL-1.3-or-later AND LGPL-3.0-or-later
Group: Productivity/File utilities
URL: https://github.com/libyal/libfvde/
-Source: %name-%version.tar.xz
+Source: https://github.com/libyal/libfvde/releases/download/%version/libfvde-experimental-%version.tar.gz
+Source2: https://github.com/libyal/libfvde/releases/download/%version/libfvde-experimental-%version.tar.gz.asc
+Source9: %name.keyring
Patch1: system-libs.patch
+BuildRequires: %{python_module devel}
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config
+BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(fuse)
-BuildRequires: pkgconfig(libbfio) >= 20201229
-BuildRequires: pkgconfig(libcaes) >= 20201012
-BuildRequires: pkgconfig(libcdata) >= 20200509
-BuildRequires: pkgconfig(libcerror) >= 20201121
+BuildRequires: pkgconfig(libbfio) >= 20220111
+BuildRequires: pkgconfig(libcaes) >= 20210522
+BuildRequires: pkgconfig(libcdata) >= 20220115
+BuildRequires: pkgconfig(libcerror) >= 20220101
BuildRequires: pkgconfig(libcfile) >= 20201229
-BuildRequires: pkgconfig(libclocale) >= 20200913
-BuildRequires: pkgconfig(libcnotify) >= 20200913
-BuildRequires: pkgconfig(libcpath) >= 20200623
-BuildRequires: pkgconfig(libcsplit) >= 20200703
+BuildRequires: pkgconfig(libclocale) >= 20220107
+BuildRequires: pkgconfig(libcnotify) >= 20220108
+BuildRequires: pkgconfig(libcpath) >= 20220108
+BuildRequires: pkgconfig(libcsplit) >= 20220109
BuildRequires: pkgconfig(libcthreads) >= 20200508
-BuildRequires: pkgconfig(libfcache) >= 20200708
-BuildRequires: pkgconfig(libfdata) >= 20201129
-BuildRequires: pkgconfig(libfguid) >= 20180724
-BuildRequires: pkgconfig(libfplist) >= 20210404
-BuildRequires: pkgconfig(libfvalue) >= 20210510
+BuildRequires: pkgconfig(libfcache) >= 20220110
+BuildRequires: pkgconfig(libfdata) >= 20211023
+BuildRequires: pkgconfig(libfguid) >= 20220113
+BuildRequires: pkgconfig(libfplist) >= 20220116
+BuildRequires: pkgconfig(libfvalue) >= 20220120
BuildRequires: pkgconfig(libhmac) >= 20200104
-BuildRequires: pkgconfig(libuna) >= 20201204
+BuildRequires: pkgconfig(libuna) >= 20220102
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(zlib)
+%python_subpackages
%description
libfvde is a library to access the File Vault Drive Encryption format.
@@ -89,24 +93,22 @@ See libfvde for additional details.
This package contains libraries and header files for developing
applications that want to make use of libfvde.
-%package -n python3-%{name}
-Summary: Python 3 bindings for libfvde
-License: LGPL-3.0-or-later
-Group: Development/Libraries/Python
-
-%description -n python3-%{name}
-This packinge provides Python 3 bindings for libfvde
-
%prep
%autosetup -p1
%build
-if [ ! -e configure ]; then ./autogen.sh; fi
-%configure --disable-static --enable-wide-character-type --enable-python3
+autoreconf -fi
+# OOT builds are presently broken, so we have to install
+# within each python iteration now, not in %%install.
+%{python_expand #
+%configure --disable-static --enable-wide-character-type --enable-python PYTHON_VERSION="%{$python_bin_suffix}"
%make_build
+%make_install DESTDIR="%_builddir/rt"
+%make_build clean
+}
%install
-%make_install
+mv %_builddir/rt/* %buildroot/
find %{buildroot} -type f -name "*.la" -delete -print
%check
@@ -119,12 +121,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
%license COPYING*
%{_libdir}/libfvde.so.*
-%files tools
+%files -n %name-tools
%license COPYING*
%{_bindir}/fvde*
%{_mandir}/man1/fvde*.1*
-%files devel
+%files -n %name-devel
%license COPYING*
%{_includedir}/libfvde.h
%{_includedir}/libfvde/
@@ -132,8 +134,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/libfvde.pc
%{_mandir}/man3/libfvde.3*
-%files -n python3-%{name}
+%files %python_files
%license COPYING*
-%{python3_sitearch}/pyfvde.so
+%{python_sitearch}/pyfvde.so
%changelog