[rpms/setup] update_services: verify md5sum/size/mtime in the case of /etc/hosts.allow and

[rpms/setup] update_services: verify md5sum/size/mtime in the case of /etc/hosts.allow and

[Ondrej Vasik]

        A new commit has been pushed.

        Repo   : rpms/setup
        Branch : update_services
        Commit : cc16e59ad2794ca1835968d8c455e569decf0f5f
        Author : Ondrej Vasik <ovasik@fedoraproject.org>
        Date   : 2010-03-31T11:04:39+00:00
        Stats  : +15/-24 in 4 file(s)
        URL    : https://src.fedoraproject.org/rpms/setup/c/cc16e59ad2794ca1835968d8c455e569decf0f5f?branch=update_services

        Log:
        verify md5sum/size/mtime in the case of /etc/hosts.allow and
/etc/hosts.deny (#578263), the same for /etc/services and
/etc/protocols

---
diff --git a/.cvsignore b/.cvsignore
index 4d3e9b6..32111ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setup-2.8.16.tar.bz2
+setup-2.8.17.tar.bz2

diff --git a/setup-cshpath.patch b/setup-cshpath.patch
deleted file mode 100644
index 07e9658..0000000
--- a/setup-cshpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp setup-2.8.16-orig/csh.login setup-2.8.16/csh.login
---- setup-2.8.16-orig/csh.login	2010-03-26 13:10:06.000000000 +0100
-+++ setup-2.8.16/csh.login	2010-03-26 17:04:02.000000000 +0100
-@@ -2,7 +2,9 @@
- 
- # System wide environment and startup programs, for login setup
- 
--if ($?PATH) then
-+if ( $?PATH ) then
-+	#do not override user specified PATH
-+else
- 	if ( $uid == 0 ) then
- 		setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
- 	else

diff --git a/setup.spec b/setup.spec
index eab2cd2..3f419dc 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,12 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.16
-Release: 3%{?dist}
+Version: 2.8.17
+Release: 1%{?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-cshpath.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -18,7 +17,6 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
-%patch1 -p1
 ./shadowconvert.sh
 
 %build
@@ -66,21 +64,21 @@ end
 %verify(not md5 size mtime) %config(noreplace) /etc/group
 %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow
 %verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/gshadow
-%verify(not md5 size mtime) %config(noreplace) /etc/services
+%config(noreplace) /etc/services
 %verify(not md5 size mtime) %config(noreplace) /etc/exports
 %config(noreplace) /etc/aliases
 %config(noreplace) /etc/environment
 %config(noreplace) /etc/filesystems
 %config(noreplace) /etc/host.conf
 %verify(not md5 size mtime) %config(noreplace) /etc/hosts
-%verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow
-%verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny
+%config(noreplace) /etc/hosts.allow
+%config(noreplace) /etc/hosts.deny
 %verify(not md5 size mtime) %config(noreplace) /etc/motd
 %config(noreplace) /etc/printcap
 %verify(not md5 size mtime) %config(noreplace) /etc/inputrc
 %config(noreplace) /etc/bashrc
 %config(noreplace) /etc/profile
-%verify(not md5 size mtime) %config(noreplace) /etc/protocols
+%config(noreplace) /etc/protocols
 %attr(0600,root,root) %config(noreplace,missingok) /etc/securetty
 %config(noreplace) /etc/csh.login
 %config(noreplace) /etc/csh.cshrc
@@ -91,6 +89,13 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Mar 31 2010 Ondrej Vasik <ovasik@redhat.com> 2.8.17-1
+- verify md5sum/size/mtime in the case of /etc/hosts.allow
+  and /etc/hosts.deny (#578263)
+- do the same for /etc/services and /etc/protocols, we
+  provide (almost) complete IANA set, so no reason to modify
+  it in most cases outside of setup package
+
 * Fri Mar 26 2010 Ondrej Vasik <ovasik@redhat.com> 2.8.16-3
 - bad ugly double-thirteen friday(fix previous badfix)
 

diff --git a/sources b/sources
index 866c543..873135c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34478b34c0c6c5ae87cf7f8d9dd8bbb7  setup-2.8.16.tar.bz2
+a062e8fdf5784e1d57bef2cb42766154  setup-2.8.17.tar.bz2