[setup/f16] - reserve 160:160 for swift (openstack-swift) - #732442, reserve 161:161 for glance (openstack-glanc

[Ondrej Vasik]

commit b8ae6c4868602c145f56eb096e717a6827b8dce7
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Tue Aug 23 10:50:42 2011 +0200

    - reserve 160:160 for swift (openstack-swift) - #732442, reserve 161:161 for glance (openstack-glance) - #732442, reserve 162:162 for nova (openstack-nova) - #732442, comment out 0/tcp spr-itunes /etc/services entry (#710185), add hvc[01], xvc0, hvsi[012] to /etc/securetty (#728030)

 setup-2.8.36-changes.patch |   38 ++++++++++++++++++++++++++++++++++++++
 setup.spec                 |   11 ++++++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/setup-2.8.36-changes.patch b/setup-2.8.36-changes.patch
new file mode 100644
index 0000000..a104bc9
--- /dev/null
+++ b/setup-2.8.36-changes.patch
@@ -0,0 +1,38 @@
+diff -urNp setup-2.8.36-orig/securetty setup-2.8.36/securetty
+--- setup-2.8.36-orig/securetty	2011-08-16 15:13:43.000000000 +0200
++++ setup-2.8.36/securetty	2011-08-23 10:02:37.816742508 +0200
+@@ -21,3 +21,9 @@ tty8
+ tty9
+ tty10
+ tty11
++hvc0
++hvc1
++hvsi0
++hvsi1
++hvsi2
++xvc0
+diff -urNp setup-2.8.36-orig/services setup-2.8.36/services
+--- setup-2.8.36-orig/services	2011-08-16 15:13:43.000000000 +0200
++++ setup-2.8.36/services	2011-08-23 09:51:08.588818354 +0200
+@@ -584,7 +584,7 @@ fido            60179/udp               
+ 
+ 
+ # Updated additional list from IANA with all missing services 04/07/2008
+-spr-itunes      0/tcp   spl-itunes      # Shirt Pocket netTunes
++#spr-itunes      0/tcp   spl-itunes      # Shirt Pocket netTunes - no port allocated
+ compressnet     2/tcp                   # Management Utility
+ compressnet     2/udp                   # Management Utility
+ #compressnet    3/tcp                   # Compression Process
+diff -urNp setup-2.8.36-orig/uidgid setup-2.8.36/uidgid
+--- setup-2.8.36-orig/uidgid	2011-08-16 15:13:43.000000000 +0200
++++ setup-2.8.36/uidgid	2011-08-23 09:42:12.335693907 +0200
+@@ -119,6 +119,9 @@ bacula	133	133	/var/spool/bacula		/sbin/
+ ricci	140	140	/var/lib/ricci		/sbin/nologin	ricci
+ luci	141	141	/var/lib/luci		/sbin/nologin	luci
+ stap-server	155	155	/var/lib/stap-server		/sbin/nologin	systemtap
++swift	160	160	/var/lib/swift		/sbin/nologin	openstack-swift
++glance	161	161	/var/lib/glance		/sbin/nologin	openstack-glance
++nova	162	162	/var/lib/nova		/sbin/nologin	openstack-nova
+ avahi-autoipd	170	170	/var/lib/avahi-autoipd		/sbin/nologin	avahi
+ pulse	171	171	/var/run/pulse		/sbin/nologin	pulseaudio
+ rtkit	172	172	/proc		/sbin/nologin	rtkit
diff --git a/setup.spec b/setup.spec
index 14b50ef..c889691 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.36
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
+Patch1: setup-2.8.36-changes.patch
 BuildArch: noarch
 BuildRequires: bash tcsh perl
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
@@ -16,6 +17,7 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+%patch1 -p1
 ./shadowconvert.sh
 
 %build
@@ -89,6 +91,13 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Tue Aug 23 2011 Ondrej Vasik <ovasik at redhat.com> 2.8.36-2
+- reserve 160:160 for swift (openstack-swift) - #732442
+- reserve 161:161 for glance (openstack-glance) - #732442
+- reserve 162:162 for nova (openstack-nova) - #732442
+- comment out 0/tcp spr-itunes /etc/services entry (#710185)
+- add hvc[01], xvc0, hvsi[012] to /etc/securetty (#728030)
+
 * Tue Aug 16 2011 Ondrej Vasik <ovasik at redhat.com> 2.8.36-1
 - dropped suplemental root's groups(#722529)