Changeset 1878 for branches/fc15-dev/server/fedora/specs

Timestamp:

Jun 7, 2011, 12:58:14 PM (14 years ago)

Author:

achernya

Message:

Merge r1803-1877 from trunk to branches/fc15-dev

Location:

branches/fc15-dev

Files:

• . (modified) (1 prop)
• server/fedora/specs/athena-aclocal.spec (copied) (copied from trunk/server/fedora/specs/athena-aclocal.spec)
• server/fedora/specs/discuss.spec (copied) (copied from trunk/server/fedora/specs/discuss.spec)
• server/fedora/specs/nss_nonlocal.spec (modified) (4 diffs)

branches/fc15-dev/server/fedora/specs/nss_nonlocal.spec

@@ -2 +2 @@
 Group: System Environment/Libraries
 Name: nss_nonlocal
-Version: 1.11
+Version: 2.0
 Release: 1
 URL: http://debathena.mit.edu/nss_nonlocal/
@@ -11 +11 @@
 Source: %{name}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(pre): shadow-utils
 
 %description
@@ -47 +48 @@
 
 %pre
-groupadd -r nss-local-users || :
-groupadd -r nss-nonlocal-users || :
+getent passwd nss-nonlocal-users >/dev/null || \
+    useradd -r -g nobody -d / -s /sbin/nologin \
+    -c 'Magic user for local group whitelist' nss-nonlocal-users
+getent group nss-local-users || groupadd -r nss-local-users
+getent group nss-nonlocal-users || groupadd -r nss-nonlocal-users
+exit 0
 
 %post
@@ -57 +62 @@
 
 %changelog
+
+* Tue Mar 29 2011 Anders Kaseorg <andersk@mit.edu> 2.0-1
+- New upstream version.
 
 * Sun May  2 2010 Anders Kaseorg <andersk@mit.edu> 1.11-1