From 270f310bd05fe6f65b26be720e82d013abdbd5ad Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 04:51:48 +0000
Subject: import setup-2.8.71-10.el7


---

diff --git a/SOURCES/setup-2.8.71-protocolscrudp.patch b/SOURCES/setup-2.8.71-protocolscrudp.patch
new file mode 100644
index 0000000..fdcc65d
--- /dev/null
+++ b/SOURCES/setup-2.8.71-protocolscrudp.patch
@@ -0,0 +1,12 @@
+diff -urNp setup-2.8.71-orig/protocols setup-2.8.71/protocols
+--- setup-2.8.71-orig/protocols	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/protocols	2018-06-21 13:05:21.507242494 +0200
+@@ -140,7 +140,7 @@ ptp	123	PTP		# Performance Transparency
+ isis	124	ISIS		# ISIS over IPv4
+ fire	125	FIRE
+ crtp	126	CRTP		# Combat Radio Transport Protocol
+-crdup	127	CRUDP		# Combat Radio User Datagram
++crudp	127	CRUDP		# Combat Radio User Datagram
+ sscopmce	128	SSCOPMCE
+ iplt	129	IPLT
+ sps	130	SPS		# Secure Packet Shield
diff --git a/SOURCES/setup-2.8.71-shellsnologin.patch b/SOURCES/setup-2.8.71-shellsnologin.patch
new file mode 100644
index 0000000..097aa8e
--- /dev/null
+++ b/SOURCES/setup-2.8.71-shellsnologin.patch
@@ -0,0 +1,10 @@
+diff -urNp setup-2.8.71-orig/shells setup-2.8.71/shells
+--- setup-2.8.71-orig/shells	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/shells	2018-06-21 13:09:40.352389479 +0200
+@@ -1,6 +1,4 @@
+ /bin/sh
+ /bin/bash
+-/sbin/nologin
+ /usr/bin/sh
+ /usr/bin/bash
+-/usr/sbin/nologin
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 317132b..0e243e2 100644
--- a/SPECS/setup.spec
+++ b/SPECS/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.71
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -20,6 +20,8 @@ Patch4: setup-2.8.71-filesystems.patch
 Patch5: setup-2.8.71-fullpath.patch
 Patch6: setup-2.8.71-tapeid.patch
 Patch7: setup-2.8.71-shlocal.patch
+Patch8: setup-2.8.71-protocolscrudp.patch
+Patch9: setup-2.8.71-shellsnologin.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -35,6 +37,8 @@ setup files, such as passwd, group, and profile.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 ./shadowconvert.sh
 
@@ -123,6 +127,11 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Thu Jun 21 2018 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-10
+- fix crudp name in /etc/protocols (#1566469)
+- do not list /sbin/nologin and /usr/sbin/nologin in /etc/shells
+  (#1571104)
+
 * Wed Nov 22 2017 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-9
 - change the URL of the upstream (#1502427)