Merge remote-tracking branch 'origin/master' into f16

This commit is contained in:
Peter Vrabec 2011-11-18 12:08:00 +01:00
commit b73c7f35fb
2 changed files with 21 additions and 1 deletions

View file

@ -0,0 +1,15 @@
diff -up shadow-4.1.4.3/lib/commonio.c.selinux shadow-4.1.4.3/lib/commonio.c
--- shadow-4.1.4.3/lib/commonio.c.selinux 2011-02-13 18:58:23.000000000 +0100
+++ shadow-4.1.4.3/lib/commonio.c 2011-11-16 17:09:46.615837659 +0100
@@ -921,10 +921,10 @@ int commonio_close (struct commonio_db *
#ifdef WITH_SELINUX
if (db->scontext != NULL) {
- if (NULL != old_context) {
if (setfscreatecon (old_context) < 0) {
errors++;
}
+ if (NULL != old_context) {
freecon (old_context);
old_context = NULL;
}

View file

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.1.4.3
Release: 10%{?dist}
Release: 11%{?dist}
Epoch: 2
URL: http://pkg-shadow.alioth.debian.org/
Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2
@ -23,6 +23,7 @@ Patch11: shadow-4.1.4.3-IDs.patch
Patch12: shadow-4.1.4.3-man.patch
#749205
Patch13: shadow-4.1.4.3-libsemanage.patch
Patch14: shadow-4.1.4.3-selinux.patch
License: BSD and GPLv2+
Group: System Environment/Base
BuildRequires: libselinux-devel >= 1.25.2-1
@ -65,6 +66,7 @@ are used for managing group accounts.
%patch11 -p1 -b .IDs
%patch12 -p1 -b .man
%patch13 -p1 -b .libsemanage
%patch14 -p1 -b .selinux
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
cp -f doc/HOWTO.utf8 doc/HOWTO
@ -226,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/vigr.8*
%changelog
* Wed Nov 16 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-11
- free memory associated with SELinux security contexts
* Wed Nov 09 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-10
- replace semanage call by library call
- useradd man page (#739147)