up to 2.10.0; sub[ug]ids added

diff --git a/setup-iana-etc.patch b/setup-iana-etc.patch
index 982bd2e3986d1d9ae2c42d1e469587563765c70a..e1070d9ed1e7cad5e5cd5c08f293c455e65f339c 100644 (file)
--- a/setup-iana-etc.patch
+++ b/setup-iana-etc.patch
@@ -1,5 +1,5 @@
---- setup-2.4.11/iana-etc-2.30/Makefile.orig   2006-11-14 18:53:41.000000000 +0100
-+++ setup-2.4.11/iana-etc-2.30/Makefile        2007-11-25 15:16:05.825164209 +0100
+--- setup-2.4.11/iana-etc/Makefile.orig        2006-11-14 18:53:41.000000000 +0100
++++ setup-2.4.11/iana-etc/Makefile     2007-11-25 15:16:05.825164209 +0100
 @@ -65,10 +65,10 @@
  
  protocols: protocol-numbers protocols.gawk
@@ -13,8 +13,8 @@
  
  dist: clean
        rm -vrf ../iana-etc-`cat VERSION`
---- setup-2.4.11/iana-etc-2.30/port-aliases.orig       2006-11-14 17:01:10.000000000 +0100
-+++ setup-2.4.11/iana-etc-2.30/port-aliases    2007-11-25 15:59:09.044373483 +0100
+--- setup-2.4.11/iana-etc/port-aliases.orig    2006-11-14 17:01:10.000000000 +0100
++++ setup-2.4.11/iana-etc/port-aliases 2007-11-25 15:59:09.044373483 +0100
 @@ -12,3 +12,44 @@
  
  nicname whois

diff --git a/setup-input_group.patch b/setup-input_group.patch
deleted file mode 100644 (file)
index c14c175..0000000
--- a/setup-input_group.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 4818b45f81169087ead208bc1e06a90d6aac4ab7 (HEAD, origin/master, origin/HEAD, master)
-Author: Jacek Konieczny <j.konieczny@eggsoft.pl>
-Date:   Mon Apr 20 08:23:01 2015 +0200
-
-    'input' group added
-    
-    introduced by udev 218
-
-diff --git a/etc/group b/etc/group
-index 916db81..49fc5a8 100644
---- a/etc/group
-+++ b/etc/group
-@@ -35,6 +35,7 @@ fuse::84:
- nobody::99:
- stats::123:
- logs::124:stats
-+input::182:
- fileshare::138:
- users::1000:
- tpexec::65500:

diff --git a/setup.spec b/setup.spec
index 38cbc121740ab5a6da37338aced745647ab23f13..0b601236921a149b6564295290634c3acc9cb0f1 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -13,12 +13,12 @@ Summary(pl.UTF-8):  Podstawowe pliki systemu Linux
 Summary(pt_BR.UTF-8):  Vários arquivos básicos de configuração
 Summary(tr.UTF-8):     Basit kurulum dosyaları
 Name:          setup
-Version:       2.9.0
-Release:       5
+Version:       2.10.0
+Release:       1
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 2b5c3c03a77f8963ee1c4c269f0edfed
+# Source0-md5: 1ecb6d9865ce3300881fa466d0c97583
 # http://sethwklein.net/iana-etc
 Source1:       http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8
@@ -30,7 +30,6 @@ Patch0:               %{name}-iana-etc.patch
 # This is source of non-iana changes in services file
 Patch1:                %{name}-services.patch
 Patch2:                protocols-fmt.patch
-Patch3:                %{name}-input_group.patch
 %if %{with diet}
 BuildRequires: dietlibc-static
 %else
@@ -93,13 +92,12 @@ dosyalarını içerir.
 
 %prep
 %setup -q -a1
-%patch0 -p1
 mv iana-etc{-%{iana_etc_ver},}
+%patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
-cp -a %{SOURCE2} iana-etc/protocol-numbers.iana
-cp -a %{SOURCE3} iana-etc/port-numbers.iana
+cp -p %{SOURCE2} iana-etc/protocol-numbers.iana
+cp -p %{SOURCE3} iana-etc/port-numbers.iana
 
 %build
 %{__make} -C iana-etc
@@ -126,9 +124,6 @@ cp -p iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir}
 # not packaged
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/{netgroup,suid_profile}
 
-mv $RPM_BUILD_ROOT/etc/profile.d/{,00-}tmp-dir.sh
-mv $RPM_BUILD_ROOT/etc/profile.d/{,00-}tmp-dir.csh
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -178,6 +173,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/profile
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/protocols
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/subgid
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/subuid
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/securetty
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/services
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/filesystems
@@ -186,3 +183,5 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{_sysconfdir}/shells
 # symlink to /proc/self/mounts
 %{_sysconfdir}/mtab
+
+