From 8ee3e0941a5a15572e36fb868b1b6d6cef6c3c07a2fe072fd7e14f21d1261217 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Aug 2022 15:32:36 +0000 Subject: [PATCH 1/4] - Update to release 20220807 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libluksde?expand=0&rev=11 --- libluksde-experimental-20220121.tar.gz | 3 --- libluksde-experimental-20220807.tar.gz | 3 +++ libluksde-experimental-20220807.tar.gz.asc | 11 +++++++++ libluksde.changes | 6 +++++ libluksde.spec | 8 +++++-- system-libs.patch | 27 ++++++++++------------ 6 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 libluksde-experimental-20220121.tar.gz create mode 100644 libluksde-experimental-20220807.tar.gz create mode 100644 libluksde-experimental-20220807.tar.gz.asc diff --git a/libluksde-experimental-20220121.tar.gz b/libluksde-experimental-20220121.tar.gz deleted file mode 100644 index 4cee3c2..0000000 --- a/libluksde-experimental-20220121.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52ea8af9fda58c2cf163f35605257f549a4e7fbfe3d0245766beb4517c986197 -size 1649266 diff --git a/libluksde-experimental-20220807.tar.gz b/libluksde-experimental-20220807.tar.gz new file mode 100644 index 0000000..b18da69 --- /dev/null +++ b/libluksde-experimental-20220807.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14aade256bec579cac5832478cbf07866dc199164d4ac81980227e83a2679bbb +size 1606406 diff --git a/libluksde-experimental-20220807.tar.gz.asc b/libluksde-experimental-20220807.tar.gz.asc new file mode 100644 index 0000000..39341b7 --- /dev/null +++ b/libluksde-experimental-20220807.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmLwFuUACgkQ2WJeXXrQ +F34qywf9EITMiAm9hVb1U8951Gbi6CICTYYBh8PENKasYQ2a8V/+E7ZROSCL1wGl +TWh9AcSdbSVgUN3/FGny7NdqSXCLoyNKxcbQB/NWtS2IcDLVcyNLQXVmQpuNZVMD +NAXIj4WCu/arCBRZGRfSslLXYkpUJfHmqb8vfJ4v53NfJezFXVzGkF+EBasOfCZ+ +1ao7k6EyRWl/dDIb4shwQ2cs5lmvmkVBKs1qaFnYPPC22PhIBr89wZZdPVRShV9m +JlqTKu4llhfyLaYMMff989Z/LO2zBzE0+56DXMljqiFl21r7/KpfwFJmx9moUcbi +XSMefeB3tUgFvv0yjFeLsCtHJVrGiA== +=D7f/ +-----END PGP SIGNATURE----- diff --git a/libluksde.changes b/libluksde.changes index 3b6b68f..70ba8ff 100644 --- a/libluksde.changes +++ b/libluksde.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 15:20:29 UTC 2022 - Jan Engelhardt + +- Update to release 20220807 + * No changelog was provided + ------------------------------------------------------------------- Fri Jan 21 13:08:28 UTC 2022 - Jan Engelhardt diff --git a/libluksde.spec b/libluksde.spec index c0c9e81..0fe9032 100644 --- a/libluksde.spec +++ b/libluksde.spec @@ -18,7 +18,7 @@ %define lname libluksde1 Name: libluksde -Version: 20220121 +Version: 20220807 Release: 0 Summary: Library and tools to access LUKS Disk Encryption encrypted files License: GFDL-1.3-or-later AND LGPL-3.0-or-later @@ -95,7 +95,11 @@ 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}" +# see libcdata for version-sc +echo "V_%version { global: *; };" >v.sym +%configure --disable-static --enable-wide-character-type --enable-python \ + PYTHON_VERSION="%{$python_bin_suffix}" \ + LDFLAGS="-Wl,--version-script=$PWD/v.sym" %make_build %make_install DESTDIR="%_builddir/rt" %make_build clean diff --git a/system-libs.patch b/system-libs.patch index 53234ac..69b0893 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -5,15 +5,15 @@ Some dirs are not present in snapshots directly generated from git (nor are they marked as a submodule). Patch it out, since we have them as system libs. --- - Makefile.am | 33 --------------------------------- - configure.ac | 16 ---------------- - 2 files changed, 49 deletions(-) + Makefile.am | 31 ------------------------------- + configure.ac | 15 --------------- + 2 files changed, 46 deletions(-) -Index: libluksde/Makefile.am +Index: libluksde-20220807/Makefile.am =================================================================== ---- libluksde.orig/Makefile.am -+++ libluksde/Makefile.am -@@ -3,22 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 +--- libluksde-20220807.orig/Makefile.am ++++ libluksde-20220807/Makefile.am +@@ -3,21 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ @@ -28,7 +28,6 @@ Index: libluksde/Makefile.am - libcpath \ - libbfio \ - libfcache \ -- libfdata \ - libfguid \ - libhmac \ - libcaes \ @@ -36,7 +35,7 @@ Index: libluksde/Makefile.am libluksde \ luksdetools \ pyluksde \ -@@ -80,23 +64,6 @@ lib: library +@@ -78,22 +63,6 @@ lib: library library: (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) @@ -51,7 +50,6 @@ Index: libluksde/Makefile.am - (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) @@ -60,11 +58,11 @@ Index: libluksde/Makefile.am (cd $(srcdir)/libluksde && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libluksde/configure.ac +Index: libluksde-20220807/configure.ac =================================================================== ---- libluksde.orig/configure.ac -+++ libluksde/configure.ac -@@ -179,22 +179,6 @@ dnl Generate Makefiles +--- libluksde-20220807.orig/configure.ac ++++ libluksde-20220807/configure.ac +@@ -175,21 +175,6 @@ dnl Generate Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([common/Makefile]) @@ -79,7 +77,6 @@ Index: libluksde/configure.ac -AC_CONFIG_FILES([libcpath/Makefile]) -AC_CONFIG_FILES([libbfio/Makefile]) -AC_CONFIG_FILES([libfcache/Makefile]) --AC_CONFIG_FILES([libfdata/Makefile]) -AC_CONFIG_FILES([libfguid/Makefile]) -AC_CONFIG_FILES([libhmac/Makefile]) -AC_CONFIG_FILES([libcaes/Makefile]) From a61fc11a78e084f42c6e347837df37fddef070bb596bffc53279417dde8d1fae Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Aug 2022 15:35:06 +0000 Subject: [PATCH 2/4] update deps OBS-URL: https://build.opensuse.org/package/show/security:forensics/libluksde?expand=0&rev=12 --- libluksde.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libluksde.spec b/libluksde.spec index 0fe9032..f64fae3 100644 --- a/libluksde.spec +++ b/libluksde.spec @@ -30,27 +30,27 @@ Source9: %name.keyring Patch1: system-libs.patch BuildRequires: %python_module devel BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: gettext-tools >= 0.21 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libbfio) >= 20220120 -BuildRequires: pkgconfig(libcaes) >= 20210522 +BuildRequires: pkgconfig(libcaes) >= 20220529 BuildRequires: pkgconfig(libcdata) >= 20220115 BuildRequires: pkgconfig(libcerror) >= 20220101 -BuildRequires: pkgconfig(libcfile) >= 20201229 +BuildRequires: pkgconfig(libcfile) >= 20210409 BuildRequires: pkgconfig(libclocale) >= 20220107 BuildRequires: pkgconfig(libcnotify) >= 20220108 BuildRequires: pkgconfig(libcpath) >= 20220108 BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfcache) >= 20220110 -BuildRequires: pkgconfig(libfcrypto) >= 20200104 +BuildRequires: pkgconfig(libfcrypto) >= 20210415 BuildRequires: pkgconfig(libfdata) >= 20211023 BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 -BuildRequires: pkgconfig(libhmac) >= 20200104 -BuildRequires: pkgconfig(libuna) >= 20220102 +BuildRequires: pkgconfig(libhmac) >= 20220425 +BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(python3) %python_subpackages From 5689dcc01856f4f27f5d5b9649b35039bb2d1cd44eb93f53a035a26b82654c22 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 8 Aug 2022 15:39:25 +0000 Subject: [PATCH 3/4] remove dep on fdata OBS-URL: https://build.opensuse.org/package/show/security:forensics/libluksde?expand=0&rev=13 --- libluksde.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libluksde.spec b/libluksde.spec index f64fae3..8a58ec4 100644 --- a/libluksde.spec +++ b/libluksde.spec @@ -46,7 +46,6 @@ BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfcache) >= 20220110 BuildRequires: pkgconfig(libfcrypto) >= 20210415 -BuildRequires: pkgconfig(libfdata) >= 20211023 BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libhmac) >= 20220425 From 705358c11f3d94d7d2ef7663fd5a0b864198ee926d794f9d70f05d57a7e66d30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Aug 2022 09:53:12 +0000 Subject: [PATCH 4/4] delete excess file OBS-URL: https://build.opensuse.org/package/show/security:forensics/libluksde?expand=0&rev=14 --- libluksde-experimental-20220121.tar.gz.asc | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 libluksde-experimental-20220121.tar.gz.asc diff --git a/libluksde-experimental-20220121.tar.gz.asc b/libluksde-experimental-20220121.tar.gz.asc deleted file mode 100644 index 00cc369..0000000 --- a/libluksde-experimental-20220121.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHqlu4ACgkQ2WJeXXrQ -F35gsgf+ITJTLtodixBnDrM3mHl5evsIPtNmpeN/E1nn+JmmYZYD/AfBQ4Lp8E9c -3C5ZET3xT3h3ktDAxxwWt94MPQTbVi4C9JnSWeS2cg+kjouQqFgDB/ou83GxE8hx -sig/LIwptL3iEzss/1a3eDfMINpMWQmjapSqeF6GCBiGg6vufRyHD9WHG3vSZtg5 -sO8ONUW/GKvRLxRytJjG3/fv4WoRwfyxPJfqwsoXDuJXAsHzq9zQAvZgExICVTSM -SY9Nm7Zeay1yg6OHitMIqWkddtE2IZbZQlUVyuff8VefFTWMQ4QmbVUjk3TYS18m -PDI/6ygAw4ufbzYYAqIzZ/Bi3Lr8hw== -=qDlA ------END PGP SIGNATURE-----