From 2996fdc6799c9dd30cb2ec6051b0c71cfb02fc6be0d139f66bc9125a604cadce Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 28 Dec 2022 23:48:16 +0000 Subject: [PATCH 1/2] - Update to release 20221228 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfcrypto?expand=0&rev=5 --- _service | 14 -------------- libfcrypto-20210415.tar.xz | 3 --- libfcrypto-alpha-20221228.tar.gz | 3 +++ libfcrypto-alpha-20221228.tar.gz.asc | 11 +++++++++++ libfcrypto.changes | 6 ++++++ libfcrypto.spec | 9 +++++---- system-libs.patch | 24 ++++++++++++------------ 7 files changed, 37 insertions(+), 33 deletions(-) delete mode 100644 _service delete mode 100644 libfcrypto-20210415.tar.xz create mode 100644 libfcrypto-alpha-20221228.tar.gz create mode 100644 libfcrypto-alpha-20221228.tar.gz.asc diff --git a/_service b/_service deleted file mode 100644 index 09acc57..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - git - https://github.com/libyal/libfcrypto - b240d99e66c2ac57cee58dab5308c9a3a70abd34 - - 20210415 - - - *.tar - xz - - - diff --git a/libfcrypto-20210415.tar.xz b/libfcrypto-20210415.tar.xz deleted file mode 100644 index 9bed29e..0000000 --- a/libfcrypto-20210415.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c1c4bbfab326a285451519b7b26e11c7b08947b39086d9b7a41cf0d06f62651 -size 66748 diff --git a/libfcrypto-alpha-20221228.tar.gz b/libfcrypto-alpha-20221228.tar.gz new file mode 100644 index 0000000..d430e47 --- /dev/null +++ b/libfcrypto-alpha-20221228.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbb1d821bef63322f45591e1fa4475a3777943a36995a813409ab6b499ee3358 +size 618668 diff --git a/libfcrypto-alpha-20221228.tar.gz.asc b/libfcrypto-alpha-20221228.tar.gz.asc new file mode 100644 index 0000000..1e98be2 --- /dev/null +++ b/libfcrypto-alpha-20221228.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmOsdjwACgkQ2WJeXXrQ +F34AcQf+OJ7J6m/knEqfnj0fqbWKtYNhIYamj3D5/tU9xtsiExzEOnUJlqV/5gdi +4ks5nIK9rbPeePk82BDM5VEbGQ+h3OkmW3CgH4bPVvA/+Gk2Ps4XXVqwgHg/Pcwc +3xXtaKRguv8U2E4iAUZHdx/uPwa/KOmQoKSeS+GrhyW5pjDuzHIXaf41JjY/voh+ +SLZ4WA8vtOpGhimUPCjtWeUjJgxRaL3z+4y/MSyi9WOl4COHJJw5EX9GkCKJPc8I +eJkw07S3lyCIGHPFDdxEz2roCvP2bIHD/dv49FoSx9/FYOsQTHVxt98mpLXv3JOh +fFhvlt00JEzsJeBC8ldCRCCFNvXM5g== +=RrmE +-----END PGP SIGNATURE----- diff --git a/libfcrypto.changes b/libfcrypto.changes index 6c75910..c3c313c 100644 --- a/libfcrypto.changes +++ b/libfcrypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 28 22:38:47 UTC 2022 - Jan Engelhardt + +- Update to release 20221228 + * Python bindings were updated + ------------------------------------------------------------------- Mon Aug 8 11:37:44 UTC 2022 - Jan Engelhardt diff --git a/libfcrypto.spec b/libfcrypto.spec index f64656c..4d3e185 100644 --- a/libfcrypto.spec +++ b/libfcrypto.spec @@ -18,19 +18,20 @@ Name: libfcrypto %define lname libfcrypto1 -Version: 20210415 +Version: 20221228 Release: 0 Summary: Library for encryption formats License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://github.com/libyal/libfcrypto -Source: %name-%version.tar.xz +Source: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz +Source2: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz.asc Patch1: system-libs.patch BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: gettext-tools >= 0.21 BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcerror) >= 20220101 %description libfcrypto is a library for encryption formats. diff --git a/system-libs.patch b/system-libs.patch index c1e117b..c4306d2 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -9,19 +9,19 @@ them as system libs. configure.ac | 1 - 2 files changed, 3 deletions(-) -Index: libfcrypto/Makefile.am +Index: libfcrypto-20221228/Makefile.am =================================================================== ---- libfcrypto.orig/Makefile.am -+++ libfcrypto/Makefile.am +--- libfcrypto-20221228.orig/Makefile.am ++++ libfcrypto-20221228/Makefile.am @@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ include \ common \ - libcerror \ libfcrypto \ - po \ - manuals \ -@@ -53,7 +52,6 @@ lib: library + pyfcrypto \ + pyfcrypto-python2 \ +@@ -61,7 +60,6 @@ lib: library library: (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) @@ -29,15 +29,15 @@ Index: libfcrypto/Makefile.am (cd $(srcdir)/libfcrypto && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -Index: libfcrypto/configure.ac +Index: libfcrypto-20221228/configure.ac =================================================================== ---- libfcrypto.orig/configure.ac -+++ libfcrypto/configure.ac -@@ -91,7 +91,6 @@ dnl Generate Makefiles +--- libfcrypto-20221228.orig/configure.ac ++++ libfcrypto-20221228/configure.ac +@@ -108,7 +108,6 @@ dnl Generate Makefiles AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([common/Makefile]) -AC_CONFIG_FILES([libcerror/Makefile]) AC_CONFIG_FILES([libfcrypto/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars]) + AC_CONFIG_FILES([pyfcrypto/Makefile]) + AC_CONFIG_FILES([pyfcrypto-python2/Makefile]) From 1944e1e29b95db89a74141036fa409985d4c9014b093140fc6204dddf19c0f28 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 28 Dec 2022 23:52:34 +0000 Subject: [PATCH 2/2] +keyring OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfcrypto?expand=0&rev=6 --- libfcrypto.keyring | 29 +++++++++++++++++++++++++++++ libfcrypto.spec | 1 + 2 files changed, 30 insertions(+) create mode 100644 libfcrypto.keyring diff --git a/libfcrypto.keyring b/libfcrypto.keyring new file mode 100644 index 0000000..da327a1 --- /dev/null +++ b/libfcrypto.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/libfcrypto.spec b/libfcrypto.spec index 4d3e185..6049e0e 100644 --- a/libfcrypto.spec +++ b/libfcrypto.spec @@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/libyal/libfcrypto Source: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz Source2: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz.asc +Source9: %name.keyring Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21