diff --git a/Do-not-use-deprecated-flask.h-and-av_permissions.patch b/Do-not-use-deprecated-flask.h-and-av_permissions.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7885bca792fa3ddc83a214473c88dfeb7c1b2ce --- /dev/null +++ b/Do-not-use-deprecated-flask.h-and-av_permissions.patch @@ -0,0 +1,58 @@ +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/Include-sys-sysmacros.h-manually.patch b/Include-sys-sysmacros.h-manually.patch deleted file mode 100644 index 16e72c58b0eceecd920a89a0ba48a97deaeb3a9c..0000000000000000000000000000000000000000 --- a/Include-sys-sysmacros.h-manually.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera -Date: Aug 07 2018 14:10:07 +0000 -Subject: Include manually - - -Inclusion of from -is now deprecated - ---- - -diff --git a/usermount.c b/usermount.c -index 3aafadd..5875c09 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include - diff --git a/usermode-1.112.autotoolized.tar.xz b/usermode-1.112.autotoolized.tar.xz deleted file mode 100644 index 4d76d4dec928df802a7162905b16c327aa2f8526..0000000000000000000000000000000000000000 Binary files a/usermode-1.112.autotoolized.tar.xz and /dev/null differ diff --git a/usermode-1.113.tar.xz b/usermode-1.113.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..bf800e7c95b18ee81a81ed947e139ab0ed8523fe Binary files /dev/null and b/usermode-1.113.tar.xz differ diff --git a/usermode.spec b/usermode.spec index 7a0286b101778be786e54952f9cb4fa847081451..4c483357b148e41715cceb24a4574105cceb2256 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,13 +1,14 @@ Name: usermode -Version: 1.112 -Release: 8 +Version: 1.113 +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}.autotoolized.tar.xz +Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz Source1: config-util -Patch0000: Include-sys-sysmacros.h-manually.patch +Patch0: Do-not-use-deprecated-flask.h-and-av_permissions.patch + Requires: pam passwd util-linux BuildRequires: desktop-file-utils gettext intltool perl-XML-Parser util-linux BuildRequires: glib2-devel gtk2-devel libblkid-devel libSM-devel libselinux-devel libuser-devel @@ -71,6 +72,9 @@ done %{_mandir}/man8/* %changelog +* Wed Aug 26 2020 Hugel - 1.113-1 +- update to 1.113 + * Tue Mar 17 2020 openEuler Buildteam - 1.112-8 - Add Source1