[shadow-utils] fixing semanage issue (#701355)

[Peter Vrabec]

commit 3a495606883d27c9eec932c477b13c69b583caba
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Tue Aug 2 13:07:03 2011 +0200

    fixing semanage issue (#701355)

 shadow-4.1.4.3-semange.patch |   25 +++++++++----------------
 shadow-utils.spec            |    5 ++++-
 2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/shadow-4.1.4.3-semange.patch b/shadow-4.1.4.3-semange.patch
index 6a8a4f6..63e1b49 100644
--- a/shadow-4.1.4.3-semange.patch
+++ b/shadow-4.1.4.3-semange.patch
@@ -1,6 +1,6 @@
 diff -up shadow-4.1.4.3/man/useradd.8.semange shadow-4.1.4.3/man/useradd.8
---- shadow-4.1.4.3/man/useradd.8.semange	2011-06-28 16:17:06.385374734 +0200
-+++ shadow-4.1.4.3/man/useradd.8	2011-06-28 16:18:19.657899439 +0200
+--- shadow-4.1.4.3/man/useradd.8.semange	2011-08-02 12:57:47.971838218 +0200
++++ shadow-4.1.4.3/man/useradd.8	2011-08-02 12:57:47.985838145 +0200
 @@ -640,6 +640,11 @@ can\*(Aqt create home directory
  .RS 4
  can\*(Aqt create mail spool
@@ -15,7 +15,7 @@ diff -up shadow-4.1.4.3/man/useradd.8.semange shadow-4.1.4.3/man/useradd.8
  
 diff -up shadow-4.1.4.3/man/userdel.8.semange shadow-4.1.4.3/man/userdel.8
 --- shadow-4.1.4.3/man/userdel.8.semange	2011-02-16 00:14:13.000000000 +0100
-+++ shadow-4.1.4.3/man/userdel.8	2011-06-28 16:18:19.657899439 +0200
++++ shadow-4.1.4.3/man/userdel.8	2011-08-02 12:57:47.985838145 +0200
 @@ -76,6 +76,11 @@ variable in the
  login\&.defs
  file\&.
@@ -29,8 +29,8 @@ diff -up shadow-4.1.4.3/man/userdel.8.semange shadow-4.1.4.3/man/userdel.8
  .PP
  The following configuration variables in
 diff -up shadow-4.1.4.3/src/useradd.c.semange shadow-4.1.4.3/src/useradd.c
---- shadow-4.1.4.3/src/useradd.c.semange	2011-06-28 16:17:06.381374760 +0200
-+++ shadow-4.1.4.3/src/useradd.c	2011-06-28 16:18:19.658899432 +0200
+--- shadow-4.1.4.3/src/useradd.c.semange	2011-08-02 12:57:47.968838234 +0200
++++ shadow-4.1.4.3/src/useradd.c	2011-08-02 12:58:17.626684439 +0200
 @@ -164,6 +164,7 @@ static bool home_added = false;
  #define E_GRP_UPDATE	10	/* can't update group file */
  #define E_HOMEDIR	12	/* can't create home directory */
@@ -82,12 +82,9 @@ diff -up shadow-4.1.4.3/src/useradd.c.semange shadow-4.1.4.3/src/useradd.c
  /*
   * create_home - create the user's home directory
   *
-@@ -2022,12 +1994,35 @@ int main (int argc, char **argv)
- 		create_mail ();
- 	}
+@@ -2025,7 +1997,30 @@ int main (int argc, char **argv)
+ 	close_files ();
  
--	close_files ();
--
  #ifdef WITH_SELINUX
 -	selinux_update_mapping ();
 +	if (Zflg && *user_selinux) {
@@ -116,14 +113,10 @@ diff -up shadow-4.1.4.3/src/useradd.c.semange shadow-4.1.4.3/src/useradd.c
 +	}
  #endif
  
-+	close_files ();
-+
  	nscd_flush_cache ("passwd");
- 	nscd_flush_cache ("group");
- 
 diff -up shadow-4.1.4.3/src/userdel.c.semange shadow-4.1.4.3/src/userdel.c
 --- shadow-4.1.4.3/src/userdel.c.semange	2011-02-13 18:58:16.000000000 +0100
-+++ shadow-4.1.4.3/src/userdel.c	2011-06-28 16:18:19.659899426 +0200
++++ shadow-4.1.4.3/src/userdel.c	2011-08-02 12:57:47.988838130 +0200
 @@ -82,6 +82,7 @@ static char *user_home;
  
  static bool fflg = false;
@@ -208,7 +201,7 @@ diff -up shadow-4.1.4.3/src/userdel.c.semange shadow-4.1.4.3/src/userdel.c
  
 diff -up shadow-4.1.4.3/src/usermod.c.semange shadow-4.1.4.3/src/usermod.c
 --- shadow-4.1.4.3/src/usermod.c.semange	2011-02-13 18:58:16.000000000 +0100
-+++ shadow-4.1.4.3/src/usermod.c	2011-06-28 16:18:19.661899414 +0200
++++ shadow-4.1.4.3/src/usermod.c	2011-08-02 12:57:47.989838125 +0200
 @@ -82,6 +82,9 @@
  #define E_GRP_UPDATE	10	/* can't update group file */
  /* #define E_NOSPACE	11	   insufficient space to move home dir */
diff --git a/shadow-utils.spec b/shadow-utils.spec
index d0a3c7f..4c87c96 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.4.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2
@@ -221,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Tue Aug 02 2011 Peter Vrabec <pvrabec at redhat.com> - 2:4.1.4.3-8
+- fixing semanage issue (#701355)
+
 * Fri Jul 22 2011 Miloslav Trmač <mitr at redhat.com> - 2:4.1.4.3-7
 - Make sure /etc/login.defs is not changed on upgrades from Fedora 1[345].