rpms/usermode
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to usermode-1.114

Browse Source 
Resolves: #1938893
This commit is contained in:
Jiri Kucera 2021-05-14 14:54:27 +02:00
parent eaeddfba01
commit 388e723a81
6 changed files with 30 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ usermode-1.105.tar.xz
/usermode-1.111.tar.xz
/usermode-1.112.tar.xz
/usermode-1.112.autotoolized.tar.xz
/usermode-1.114.tar.xz

396
fsfaddr.patch
View File

@ -1,396 +0,0 @@
diff --git a/consolehelper-gtk.8 b/consolehelper-gtk.8
index d964ffa..a0937cf 100644
--- a/consolehelper-gtk.8
+++ b/consolehelper-gtk.8
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH CONSOLEHELPER-GTK 8 "2009-10-05" "Red Hat"
.SH NAME
diff --git a/consolehelper.8.in b/consolehelper.8.in
index d771da7..e6ad431 100644
--- a/consolehelper.8.in
+++ b/consolehelper.8.in
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH CONSOLEHELPER 8 "18 March 1999" "Red Hat Software"
.SH NAME
diff --git a/consolehelper.c b/consolehelper.c
index d4ee6f9..064ccb3 100644
--- a/consolehelper.c
+++ b/consolehelper.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/dummy.h b/dummy.h
index 24f8277..b6d38d3 100644
--- a/dummy.h
+++ b/dummy.h
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
/* Just a dummy file for gettext, containing messages emmitted by various
diff --git a/gsmclient.c b/gsmclient.c
index 85a3dea..6d67e91 100644
--- a/gsmclient.c
+++ b/gsmclient.c
@@ -17,8 +17,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
diff --git a/gsmclient.h b/gsmclient.h
index a4e94b0..66d97c7 100644
--- a/gsmclient.h
+++ b/gsmclient.h
@@ -17,8 +17,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef GSM_CLIENT_H
diff --git a/pam-panel-icon.1 b/pam-panel-icon.1
index f92f57a..5f891dc 100644
--- a/pam-panel-icon.1
+++ b/pam-panel-icon.1
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.\" Red Hat author: Miloslav Trmač <mitr@redhat.com>
.TH PAM-PANEL-ICON 1 "2009-10-05" "Red Hat"
diff --git a/pam-panel-icon.c b/pam-panel-icon.c
index d2e93fa..c4e038c 100644
--- a/pam-panel-icon.c
+++ b/pam-panel-icon.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/props.c b/props.c
index 04eaeb6..3f37fd5 100644
--- a/props.c
+++ b/props.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "props.h"
diff --git a/props.h b/props.h
index c309450..aaa491c 100644
--- a/props.h
+++ b/props.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#ifndef MSM_PROPS_H
diff --git a/shvar.c b/shvar.c
index 114b7fc..7dd3651 100644
--- a/shvar.c
+++ b/shvar.c
@@ -24,7 +24,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*
*/
diff --git a/shvar.h b/shvar.h
index debc1ee..81cff6f 100644
--- a/shvar.h
+++ b/shvar.h
@@ -24,7 +24,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*
*/
#ifndef _SHVAR_H
diff --git a/test-userdialog.c b/test-userdialog.c
index 4ace42e..d3dd34f 100644
--- a/test-userdialog.c
+++ b/test-userdialog.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/userdialogs.c b/userdialogs.c
index af44607..04f450a 100644
--- a/userdialogs.c
+++ b/userdialogs.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*
*/
diff --git a/userdialogs.h b/userdialogs.h
index 44b464a..3ea2f01 100644
--- a/userdialogs.h
+++ b/userdialogs.h
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#ifndef __USERDIALOGS_H__
diff --git a/userhelper-messages.c b/userhelper-messages.c
index 5c73cc0..7b8e37c 100644
--- a/userhelper-messages.c
+++ b/userhelper-messages.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/userhelper-messages.h b/userhelper-messages.h
index 69825f5..ec507d3 100644
--- a/userhelper-messages.h
+++ b/userhelper-messages.h
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#ifndef USERHELPER_MESSAGES_H__
diff --git a/userhelper-wrap.c b/userhelper-wrap.c
index cd35cd6..1e631f7 100644
--- a/userhelper-wrap.c
+++ b/userhelper-wrap.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/userhelper-wrap.h b/userhelper-wrap.h
index 2fb77c0..e4fea41 100644
--- a/userhelper-wrap.h
+++ b/userhelper-wrap.h
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#ifndef __USERHELPER_WRAP_H__
diff --git a/userhelper.8.in b/userhelper.8.in
index 4e7aff1..ce90528 100644
--- a/userhelper.8.in
+++ b/userhelper.8.in
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH USERHELPER 8 "January 8 2008" "Red Hat, Inc."
.SH NAME
diff --git a/userhelper.c b/userhelper.c
index 287aa4d..fa5395d 100644
--- a/userhelper.c
+++ b/userhelper.c
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"
diff --git a/userhelper.h b/userhelper.h
index 50e6ed9..32c29d6 100644
--- a/userhelper.h
+++ b/userhelper.h
@@ -13,7 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#ifndef __USERHELPER_H__
diff --git a/userinfo.1 b/userinfo.1
index 8701bda..292aa4b 100644
--- a/userinfo.1
+++ b/userinfo.1
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH USERINFO 1 "6 October 1997" "Red Hat Software"
.SH NAME
diff --git a/userinfo.c b/userinfo.c
index 5139b13..4c0ea9b 100644
--- a/userinfo.c
+++ b/userinfo.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
/* Things to remember...
diff --git a/usermount.1 b/usermount.1
index eb864c8..1af6122 100644
--- a/usermount.1
+++ b/usermount.1
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH USERMOUNT 1 "March 13 2007" "Red Hat"
.SH NAME
diff --git a/usermount.c b/usermount.c
index 5875c09..1fc627b 100644
--- a/usermount.c
+++ b/usermount.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
/* TODO notes.
diff --git a/userpasswd.1 b/userpasswd.1
index 3f11f7a..6e2ab14 100644
--- a/userpasswd.1
+++ b/userpasswd.1
@@ -12,7 +12,8 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+.\" MA 02110-1301, USA.
.\"
.TH USERPASSWD 1 "17 October 1997" "Red Hat Software"
.SH NAME
diff --git a/userpasswd.c b/userpasswd.c
index 42c6705..fad128f 100644
--- a/userpasswd.c
+++ b/userpasswd.c
@@ -14,7 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
*/
#include "config.h"

49
selinux_deprecated.patch
View File

@ -1,49 +0,0 @@
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 <selinux/selinux.h>
-#include <selinux/flask.h>
-#include <selinux/av_permissions.h>
#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) {

2
sources
View File

@ -1 +1 @@
SHA512 (usermode-1.112.autotoolized.tar.xz) = b1e6fc846b074d99409eb57347eabc2816bbba075af10bc14f396e09d0b0f89bde7b80546a647ed6e30e958a449138ec04708896c9406359504750bcd05ed819
SHA512 (usermode-1.114.tar.xz) = 703eb218704c7a11cdce25a71f4fc91bf4f042a8b185f79f3954699081c0db8a6234ad6f11738d8b2fe6a492a03d029cbe01762a47869edc473e4fbaa6e0ee32

12
sysmacros.patch
View File

@ -1,12 +0,0 @@
diff --git a/usermount.c b/usermount.c
index 3aafadd..5875c09 100644
--- a/usermount.c
+++ b/usermount.c
@@ -40,6 +40,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <errno.h>
#include <glob.h>
#include <libintl.h>

48
usermode.spec
View File

@ -1,32 +1,31 @@
# Add `--without gtk' option (enable gtk by default):
%bcond_without gtk
Summary: Tools for certain user account management tasks
Name: usermode
Version: 1.112
Release: 11%{?dist}
Version: 1.114
Release: 1%{?dist}
License: GPLv2+
URL: https://pagure.io/usermode/
Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz
URL: https://pagure.io/%{name}/
Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz
Source1: config-util
# Backport of c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18
# - inclusion of <sys/sysmacros.h> from <sys/types.h> is now deprecated
Patch0: sysmacros.patch
# Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4
# - bad FSF address fix
Patch1: fsfaddr.patch
# Backport of 48c4085004caad1ec928fa103b7f3e3fe684c826
# - <selinux/flask.h> and <selinux/av_permissions.h> are now deprecated
Patch2: selinux_deprecated.patch
Requires: pam, passwd, util-linux
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/
BuildRequires: make
BuildRequires: gcc
BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
BuildRequires: gettext, glib2-devel, intltool
%if %{with gtk}
BuildRequires: desktop-file-utils, gtk2-devel, startup-notification-devel, libSM-devel
%endif
BuildRequires: libblkid-devel, libselinux-devel, libuser-devel
BuildRequires: pam-devel, perl-XML-Parser
BuildRequires: util-linux
%if %{with gtk}
%package gtk
Summary: Graphical tools for certain user account management tasks
Requires: %{name} = %{version}-%{release}
%endif
%global _hardened_build 1
@ -35,6 +34,7 @@ The usermode package contains the userhelper program, which can be
used to allow configured programs to be run with superuser privileges
by ordinary users.
%if %{with gtk}
%description gtk
The usermode-gtk package contains several graphical tools for users:
userinfo, usermount and userpasswd. Userinfo allows users to change
@ -44,29 +44,30 @@ passwords.
Install the usermode-gtk package if you would like to provide users with
graphical tools for certain account management tasks.
%endif
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --with-selinux
%configure --with-selinux %{!?with_gtk:--without-gtk}
%make_build
%install
%make_install INSTALL='install -p'
%if %{with gtk}
# make userformat symlink to usermount
ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
%endif
mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT/etc/security/console.apps/config-util
%if %{with gtk}
for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
redhat-usermount.desktop; do
echo 'NotShowIn=GNOME;KDE;' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
@ -74,6 +75,7 @@ for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/$i
done
%endif
%find_lang %{name}
@ -86,6 +88,7 @@ done
%{_mandir}/man8/consolehelper.8*
%config(noreplace) /etc/security/console.apps/config-util
%if %{with gtk}
%files gtk
%{_bindir}/usermount
%{_mandir}/man1/usermount.1*
@ -102,8 +105,13 @@ done
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%endif
%changelog
* Fri May 14 2021 Jiri Kucera <jkucera@redhat.com> - 1.114-1
- Update to usermode-1.114
Resolves: #1938893
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.112-11
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937