packages: setup/setup-services.patch, setup/setup.spec, setup/protocols-fmt...

[glen]

Author: glen                         Date: Tue Nov 17 08:13:08 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/setup:
   setup-services.patch (1.4 -> 1.5) , setup.spec (1.155 -> 1.156) , protocols-fmt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/setup/setup-services.patch
diff -u packages/setup/setup-services.patch:1.4 packages/setup/setup-services.patch:1.5
--- packages/setup/setup-services.patch:1.4	Mon Jun  8 08:41:37 2009
+++ packages/setup/setup-services.patch	Tue Nov 17 09:13:03 2009
@@ -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

================================================================
Index: packages/setup/setup.spec
diff -u packages/setup/setup.spec:1.155 packages/setup/setup.spec:1.156
--- packages/setup/setup.spec:1.155	Mon Jun  8 08:43:05 2009
+++ packages/setup/setup.spec	Tue Nov 17 09:13:03 2009
@@ -15,17 +15,23 @@
 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
@@ -77,13 +83,17 @@
 %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}" \
@@ -97,7 +107,7 @@
 %{__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}
@@ -150,6 +160,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2009/11/17 08:13:03  glen
+- 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
+
 Revision 1.155  2009/06/08 06:43:05  amateja
 - updated iana_etc to 2.30
 - release 2

================================================================
Index: packages/setup/protocols-fmt.patch
diff -u /dev/null packages/setup/protocols-fmt.patch:1.1
--- /dev/null	Tue Nov 17 09:13:08 2009
+++ packages/setup/protocols-fmt.patch	Tue Nov 17 09:13:03 2009
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup-services.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup.spec?r1=1.155&r2=1.156&f=u