From d35495692ea69e7c6bf494e8287e057eec65ed3f1893a9f6211023f31480ea88 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2024 12:39:01 +0000 Subject: [PATCH 1/2] Accepting request 1149238 from home:dimstar:rpm4.20:e Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1149238 OBS-URL: https://build.opensuse.org/package/show/security/ecryptfs-utils?expand=0&rev=93 --- ecryptfs-utils.changes | 6 ++++++ ecryptfs-utils.spec | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index 68f4f81..6afc278 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 22 11:29:42 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + ------------------------------------------------------------------- Tue Dec 27 10:35:17 UTC 2022 - Ludwig Nussel diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 3d8906a..8c9beda 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -81,11 +81,7 @@ Requires: %{lname} = %{version} A stacked cryptographic filesystem for Linux. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 +%autosetup -p1 %build export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" From 4b5317d0d0454adbd5293c4e60a5711a18f51ccce018989b3ffc69e1669068cc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 22 Feb 2024 13:19:10 +0000 Subject: [PATCH 2/2] Accepting request 1149369 from home:dimstar:Factory Fixup previous messup OBS-URL: https://build.opensuse.org/request/show/1149369 OBS-URL: https://build.opensuse.org/package/show/security/ecryptfs-utils?expand=0&rev=94 --- ecryptfs-utils-openssl11.patch | 8 ++++---- ecryptfs-utils.changes | 2 ++ ecryptfs-utils.spec | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ecryptfs-utils-openssl11.patch b/ecryptfs-utils-openssl11.patch index cf0b46b..bb490a4 100644 --- a/ecryptfs-utils-openssl11.patch +++ b/ecryptfs-utils-openssl11.patch @@ -1,6 +1,6 @@ === modified file 'src/key_mod/ecryptfs_key_mod_openssl.c' ---- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000 -+++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-06-02 18:27:28 +0000 +--- a/src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000 ++++ a/src/key_mod/ecryptfs_key_mod_openssl.c 2017-06-02 18:27:28 +0000 @@ -41,6 +41,7 @@ #include #include @@ -81,8 +81,8 @@ ENGINE_load_builtin_engines(); === modified file 'src/key_mod/ecryptfs_key_mod_pkcs11_helper.c' ---- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2013-10-25 19:45:09 +0000 -+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2017-06-02 18:27:28 +0000 +--- a/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2013-10-25 19:45:09 +0000 ++++ a/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c 2017-06-02 18:27:28 +0000 @@ -41,6 +41,7 @@ #include #include diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index 6afc278..5b0eb3d 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -3,6 +3,8 @@ Thu Feb 22 11:29:42 UTC 2024 - Dominique Leuenberger - Use %autosetup macro. Allows to eliminate the usage of deprecated %patchN +- Rebase ecryptfs-utils-openssl11.patch: make it apply with patch + -p1 like all the others. ------------------------------------------------------------------- Tue Dec 27 10:35:17 UTC 2022 - Ludwig Nussel diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 8c9beda..885fd47 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package ecryptfs-utils # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed