diff --git a/Do-not-use-deprecated-flask.h-and-av_permissions.patch b/Do-not-use-deprecated-flask.h-and-av_permissions.patch deleted file mode 100644 index a7885bca792fa3ddc83a214473c88dfeb7c1b2ce..0000000000000000000000000000000000000000 --- a/Do-not-use-deprecated-flask.h-and-av_permissions.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1efff28faef83a620fd7f6eaac3fe64ee6691a33 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera -Date: Apr 10 2020 09:18:42 +0000 -Subject: Merge #7 `Do not use deprecated flask.h and av_permissions.h` - - ---- - -diff --git a/userhelper.c b/userhelper.c -index 4177c89..f2afde7 100644 ---- a/userhelper.c -+++ b/userhelper.c -@@ -48,8 +48,6 @@ - - #ifdef WITH_SELINUX - #include --#include --#include - #endif - - #include "shvar.h" -@@ -111,7 +109,7 @@ static int checkAccess(unsigned int selaccess) { - struct av_decision avd; - int retval = security_compute_av(user_context, - user_context, -- SECCLASS_PASSWD, -+ string_to_security_class("passwd"), - selaccess, - &avd); - -@@ -2267,7 +2265,8 @@ main(int argc, char **argv) - const char *new_home_phone; - const char *new_shell; - #ifdef WITH_SELINUX -- unsigned perm; -+ security_class_t class; -+ access_vector_t perm; - #endif - - /* State variable we pass around. */ -@@ -2426,12 +2425,13 @@ main(int argc, char **argv) - user_name = g_strdup(argv[optind]); - - #ifdef WITH_SELINUX -+ class = string_to_security_class("passwd"); - if (c_flag) -- perm = PASSWD__PASSWD; -+ perm = string_to_av_perm(class, "passwd"); - else if (s_flag) -- perm = PASSWD__CHSH; -+ perm = string_to_av_perm(class, "chsh"); - else -- perm = PASSWD__CHFN; -+ perm = string_to_av_perm(class, "chfn"); - - if (is_selinux_enabled() > 0 && - checkAccess(perm)!= 0) { - diff --git a/usermode-1.113.tar.xz b/usermode-1.113.tar.xz deleted file mode 100644 index bf800e7c95b18ee81a81ed947e139ab0ed8523fe..0000000000000000000000000000000000000000 Binary files a/usermode-1.113.tar.xz and /dev/null differ diff --git a/usermode-1.114.tar.xz b/usermode-1.114.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f5871ad8157af8cb8c7d592cd60a91de1d132815 Binary files /dev/null and b/usermode-1.114.tar.xz differ diff --git a/usermode.spec b/usermode.spec index 33f677c519f03739c5ee5941b4314167688c48e1..c3525adebee204728109c21b9d7bbe9ae3027c43 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,12 @@ Name: usermode -Version: 1.113 -Release: 3 +Version: 1.114 +Release: 1 Summary: Tools for certain user account management tasks License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz Source1: config-util -Patch0: Do-not-use-deprecated-flask.h-and-av_permissions.patch - Requires: pam passwd util-linux BuildRequires: gcc BuildRequires: desktop-file-utils gettext intltool perl-XML-Parser util-linux @@ -73,6 +71,12 @@ done %{_mandir}/man8/* %changelog +* Tue Nov 30 2021 wangjie - 1.114-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:Update usermode to 1.114 + * Thu May 27 2021 panxiaohe - 1.113-3 - Add gcc to BuildRequires