- v2.7.1

- update protocols from iana (last updated 2009-06-18)
- update services from iana (last updated 2009-11-16)
- actually install iana generated services

Changed files:
    protocols-fmt.patch -> 1.1
    setup-services.patch -> 1.5
    setup.spec -> 1.156

diff --git a/protocols-fmt.patch b/protocols-fmt.patch
new file mode 100644 (file)
index 0000000..aebaa2b
--- /dev/null
+++ b/protocols-fmt.patch
@@ -0,0 +1,11 @@
+--- setup-2.7/iana-etc/protocols.gawk~ 2009-11-17 10:07:35.388548841 +0200
++++ setup-2.7/iana-etc/protocols.gawk  2009-11-17 10:07:37.361241248 +0200
+@@ -20,7 +20,7 @@
+     }
+ }
+ { sub(/\r/, "") }
+-match($0, /^[ \t]+([0-9]+)[ \t]{1,5}([^ \t]+)(.*)/, f) {
++match($0, /^[ \t]*([0-9]+)[ \t]{6,8}([^ \t]+)(.*)/, f) && !/Reserved/ {
+     if ( ! header_printed) {
+       printf format, "# protocol", "num", "aliases", "comments"
+       header_printed = 1;

diff --git a/setup-services.patch b/setup-services.patch
index 6e8a3d0007c04f6c69ea16609680408a1220e83a..cc047ed532880e4e7830c1af13ca7597c08e62cc 100644 (file)
--- a/setup-services.patch
+++ b/setup-services.patch
@@ -1,5 +1,5 @@
---- setup-2.6.2/iana-etc-2.30/services.orig    2009-06-05 16:50:34.899063942 +0200
-+++ setup-2.6.2/iana-etc-2.30/services 2009-06-05 17:41:34.072264525 +0200
+--- setup-2.6.2/iana-etc/services~     2009-11-17 09:24:45.201520053 +0200
++++ setup-2.6.2/iana-etc/services      2009-11-17 09:25:17.102361782 +0200
 @@ -196,8 +196,6 @@
  graphics       41/udp    # Graphics
  name           42/tcp    # Host Name Server
@@ -171,10 +171,10 @@
  #             22274-22304 Unassigned
  cis           22305/tcp  # CompactIS Tunnel
  cis           22305/udp  # CompactIS Tunnel
-@@ -15127,6 +15139,7 @@
- #                         Balduin Mueller-Platz 
- #                         <balduin.mueller-platz&pago.de> March 2002
- #             30003-30998 Unassigned
+@@ -16011,6 +16011,7 @@
+ kingdomsonline        30260/udp   # Kingdoms Online (CraigAvenue)
+ #                         Drake Bankston <IANA.KingdomsOnline&gmail.com> 18 August 2009
+ #             30261-30998 Unassigned
 +csync2                30865/tcp   # Cluster sync (not in IANA)
  ovobs         30999/tcp   # OpenView Service Desk Client
  ovobs         30999/udp   # OpenView Service Desk Client

diff --git a/setup.spec b/setup.spec
index c6cb4bd3b8eab5ce0bd7d497318013f5997704a0..e235475627ab7a01a5cd67eeda74bb172bee99ba 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -14,17 +14,23 @@ 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.7
-Release:       2
+Version:       2.7.1
+Release:       1
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       %{name}-2.6.2.tar.bz2
 # Source0-md5: ebd20f3ea4d766cfe16d2abf253224ac
+# http://sethwklein.net/iana-etc
 Source1:       http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8
+Source2:       http://www.iana.org/assignments/protocol-numbers/index.txt
+# Source2-md5: 33440b7d913303a6051ae64290f0ab21
+Source3:       http://www.iana.org/assignments/port-numbers
+# Source3-md5: 8e19a2c7cf60baabf919de1cc89a1cbb
 Patch0:                %{name}-iana-etc.patch
 # This is source of non-iana changes in services file
 Patch1:                %{name}-services.patch
+Patch2:                protocols-fmt.patch
 BuildRequires: dietlibc-static
 BuildRequires: gawk
 Requires:      FHS >= 2.3-24.1
@@ -76,13 +82,17 @@ dosyalarını içerir.
 %setup -q -n %{name}-2.6.2 -a1
 %patch0 -p1
 mv iana-etc{-%{iana_etc_ver},}
+%patch2 -p1
+
+cp -a %{SOURCE2} iana-etc/protocol-numbers.iana
+cp -a %{SOURCE3} iana-etc/port-numbers.iana
 
 %build
 %{__make} -C iana-etc
 %{__patch} iana-etc/services %{PATCH1}
 
 # kill trailing spaces/tabs
-%{__sed} -i -e 's,[ \t]\+$,,' iana-etc/services
+%{__sed} -i -e 's,[ \t]\+$,,' iana-etc/{services,protocols}
 
 %{__make} \
        CC="diet %{__cc}" \
@@ -96,7 +106,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -a iana-etc/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
+cp -a iana-etc/{services,protocols} $RPM_BUILD_ROOT%{_sysconfdir}
 
 # not packaged
 rm $RPM_BUILD_ROOT%{_sysconfdir}/{mtab,netgroup,suid_profile}