rpms/fedora-usermgmt/devel macros.fedora-usermgmt, 1.3, 1.4 fedora-usermgmt.spec, 1.20, 1.21 fedora-usermgmt-wrapper, 1.6, 1.7

[ensc]

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16453

Modified Files:
	macros.fedora-usermgmt fedora-usermgmt.spec 
	fedora-usermgmt-wrapper 
Log Message:
- obey packaging rules and made user/groupdel noops
- added sanity checks for proper baseuid/basegid setup



Index: macros.fedora-usermgmt
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/macros.fedora-usermgmt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- macros.fedora-usermgmt	23 Nov 2009 09:00:38 -0000	1.3
+++ macros.fedora-usermgmt	3 Mar 2010 14:48:19 -0000	1.4
@@ -16,10 +16,12 @@
 
 
 %__fe_useradd		%{?with_fedora:/usr/sbin/fedora-useradd}%{!?with_fedora:__useradd() { shift; /usr/sbin/useradd "$@"; }; __useradd}
-%__fe_userdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-userdel}%{!?with_fedora:/usr/sbin/userdel}
+%___fe_userdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-userdel}%{!?with_fedora:/usr/sbin/userdel}
+%__fe_userdel		%{?with_fedora_userdel:%___fe_userdel}%{!?with_fedora_userdel::}
 
 %__fe_groupadd		%{?with_fedora:/usr/sbin/fedora-groupadd}%{!?with_fedora:__groupadd() { shift; /usr/sbin/groupadd "$@"; }; __groupadd}
-%__fe_groupdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-groupdel}%{!?with_fedora:/usr/sbin/groupdel}
+%___fe_groupdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-groupdel}%{!?with_fedora:/usr/sbin/groupdel}
+%__fe_groupdel		%{?with_fedora_userdel:%___fe_groupdel}%{!?with_fedora_userdel::}
 
 %FE_USERADD_REQ	\
 Requires(pre):		%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fedora-usermgmt.spec	23 Nov 2009 09:01:18 -0000	1.20
+++ fedora-usermgmt.spec	3 Mar 2010 14:48:19 -0000	1.21
@@ -6,8 +6,8 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.10
-Release:	%release_func 1300
+Version:	0.11
+Release:	%release_func 1405
 
 License:	GPLv2
 BuildArch:	noarch
@@ -187,6 +187,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar  3 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.11-1405
+- obey packaging rules and made user/groupdel noops
+- added sanity checks for proper baseuid/basegid setup
+
 * Mon Nov 23 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.10-1300
 - require coreutils + util-linux-ng (#540352)
 


Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt-wrapper,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fedora-usermgmt-wrapper	23 Nov 2009 09:00:38 -0000	1.6
+++ fedora-usermgmt-wrapper	3 Mar 2010 14:48:19 -0000	1.7
@@ -60,6 +60,9 @@ function validateHint {
     test $tmp -ge 0 || \
 	panic $"Hint '$3' evaluates to a negative value ($tmp)"
 
+    test $tmp -ge 100 || \
+	panic $"Hint '$2 + $3' evaluates to a static id; adjust $BASE_DIR/baseuid resp. $BASE_DIR/basegid"
+
     eval $1=\$tmp
 }