Compare commits

..

1 Commits

Author SHA1 Message Date
Jesse Keating d90062babc - Rebuilt for gcc bug 634757 2010-10-05 20:34:11 -07:00
5 changed files with 37 additions and 114 deletions
-5
View File
@@ -1,8 +1,3 @@
usermode-1.105.tar.xz
/usermode-1.106.tar.xz
/usermode-1.106.1.tar.xz
/usermode-1.107.tar.xz
/usermode-1.108.tar.xz
/usermode-1.109.tar.xz
/usermode-1.110.tar.xz
/usermode-1.111.tar.xz
-2
View File
@@ -1,2 +0,0 @@
USER=root
UGROUPS=wheel
+1 -1
View File
@@ -1 +1 @@
28ba510fbd8da9f4e86e57d6c31cff29 usermode-1.111.tar.xz
e687f847bc050b669c9dc76915349853 usermode-1.106.1.tar.xz
-21
View File
@@ -1,21 +0,0 @@
commit b562472980ecd903d13e69279a31fcf77fac57bc
Author: Miloslav Trmač <mitr@redhat.com>
Date: Mon Apr 24 21:58:56 2017 +0200
Don't unnecessarily use g_strdup_printf()
This avoids a build failure with Werror=format-security.
diff --git a/userhelper.c b/userhelper.c
index 15d2c5e..287aa4d 100644
--- a/userhelper.c
+++ b/userhelper.c
@@ -583,7 +583,7 @@ converse_console(int num_msg, const struct pam_message **msg,
if (banner == 0) {
if ((data->banner != NULL) && (data->domain != NULL)) {
- text = g_strdup_printf(dgettext(data->domain, data->banner));
+ text = g_strdup (dgettext(data->domain, data->banner));
} else {
if ((service != NULL) && (strlen(service) > 0)) {
if (data->fallback_allowed) {
+36 -85
View File
@@ -1,14 +1,11 @@
Summary: Tools for certain user account management tasks
Name: usermode
Version: 1.111
Release: 10%{?dist}
Version: 1.106.1
Release: 1%{?dist}.1
License: GPLv2+
Group: Applications/System
URL: https://pagure.io/usermode/
Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz
Source1: config-util
# Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc
Patch0: usermode-1.111-format-security.patch
URL: https://fedorahosted.org/usermode/
Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz
Requires: pam, passwd, util-linux
BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
@@ -20,8 +17,6 @@ Summary: Graphical tools for certain user account management tasks
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%global _hardened_build 1
%description
The usermode package contains the userhelper program, which can be
used to allow configured programs to be run with superuser privileges
@@ -40,8 +35,6 @@ graphical tools for certain account management tasks.
%prep
%setup -q
%patch0 -p1 -b .format-security
%build
%configure --with-selinux
@@ -54,9 +47,16 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT/etc/security/console.apps/config-util
# We set up the shutdown programs to be wrapped in this package. Other
# packages are on their own....
mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
for wrappedapp in halt reboot poweroff ; do
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
install -p -m644 $wrappedapp \
$RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
done
echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util
for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
redhat-usermount.desktop; do
@@ -68,15 +68,31 @@ done
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS README
%attr(4711,root,root) /usr/sbin/userhelper
%{_bindir}/consolehelper
%{_mandir}/man8/userhelper.8*
%{_mandir}/man8/consolehelper.8*
# PAM console wrappers
%{_bindir}/halt
%{_bindir}/reboot
%{_bindir}/poweroff
%exclude %{_bindir}/shutdown
%config(noreplace) /etc/pam.d/halt
%config(noreplace) /etc/pam.d/reboot
%config(noreplace) /etc/pam.d/poweroff
%config(noreplace) /etc/security/console.apps/config-util
%config(noreplace) /etc/security/console.apps/halt
%config(noreplace) /etc/security/console.apps/reboot
%config(noreplace) /etc/security/console.apps/poweroff
%files gtk
%defattr(-,root,root,-)
%{_bindir}/usermount
%{_mandir}/man1/usermount.1*
%{_bindir}/userformat
@@ -94,72 +110,7 @@ done
%{_datadir}/applications/*
%changelog
* Mon Apr 24 2017 Miloslav Trmač <mitr@redhat.com> - 1.111-10
- Fix a FBFS with -Werror=format-security
Resolves #1444750
- Fix inconsistent dates in %%changelog
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue May 21 2013 Miloslav Trmač <mitr@redhat.com> - 1.111-3
- Enable hardened build
Resolves: #965471
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Sep 22 2012 Miloslav Trmač <mitr@redhat.com> - 1.111-1
- Update to usermode-1.111
* Tue Aug 21 2012 Miloslav Trmač <mitr@redhat.com> - 1.110-2
- Drop no longer necessary %%clean and %%defattr commands.
* Mon Aug 20 2012 Miloslav Trmač <mitr@redhat.com> - 1.110-1
- Update to usermode-1.110.
Note that this drops halt/poweroff/reboot helpers, the respective
implementations in systemd now include PolicyKit support. Spec file change
based on a patch by Lennart Poettering <lpoetter@redhat.com>.
Resolves: #804088, #849208
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.109-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Mar 3 2012 Miloslav Trmač <mitr@redhat.com> - 1.109-1
- Update to usermode-1.109
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.108-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Oct 3 2011 Miloslav Trmač <mitr@redhat.com> - 1.108-1
- Update to usermode-1.108
Resolves: #622813, #716524
* Thu Mar 31 2011 Miloslav Trmač <mitr@redhat.com> - 1.107-1
- Update to usermode-1.107
Resolves: #668731
- Add UGROUPS=wheel to config-util
Resolves: #688690
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.106.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Sep 29 2010 jkeating - 1.106.1-2
* Tue Oct 05 2010 jkeating - 1.106.1-1.1
- Rebuilt for gcc bug 634757
* Tue Sep 14 2010 Miloslav Trmač <mitr@redhat.com> - 1.106.1-1
@@ -480,10 +431,10 @@ done
- Add getenforce checks
- Add root_passwd check
* Thu Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
- More fixes to make targeted policy work correctly
* Thu Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-5
* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-5
- Fix to use root if user not defined
* Tue May 25 2004 Dan Walsh <dwalsh@redhat.com> 1.70-4
@@ -652,7 +603,7 @@ done
- remove the pixmap we don't use any more (we use stock pixmaps now)
- update translations
* Tue Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
* Thu Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
- suppress even error messages from Xlib when consolehelper calls
gtk_init_check() to see if the display is available
@@ -729,7 +680,7 @@ done
* Fri Nov 2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.45-1
- propagate environment variables from libpam to applications
* Wed Oct 3 2001 Nalin Dahyabhai <nalin@redhat.com> 1.44-1
* Fri Oct 3 2001 Nalin Dahyabhai <nalin@redhat.com> 1.44-1
- only try to call gtk_main_quit() if we've got a loop to get out of (#54109)
- obey RPM_OPT_FLAGS, obey
@@ -869,7 +820,7 @@ done
* Tue Mar 07 2000 Nalin Dahyabhai <nalin@redhat.com>
- queue notice messages until we get prompts in userhelper to fix bug #8745
* Thu Feb 03 2000 Nalin Dahyabhai <nalin@redhat.com>
* Fri Feb 03 2000 Nalin Dahyabhai <nalin@redhat.com>
- free trip through the build system
* Tue Jan 11 2000 Nalin Dahyabhai <nalin@redhat.com>