Author: amateja Date: Mon Jun 8 06:41:43 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted for release 2
---- Files affected:
packages/setup:
setup-services.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/setup/setup-services.patch
diff -u packages/setup/setup-services.patch:1.3
packages/setup/setup-services.patch:1.4
--- packages/setup/setup-services.patch:1.3 Sun Nov 25 17:24:57 2007
+++ packages/setup/setup-services.patch Mon Jun 8 08:41:37 2009
@@ -1,100 +1,102 @@
---- setup-2.4.11/iana-etc-2.20/services.generated 2007-11-25
16:10:46.900142000 +0100
-+++ setup-2.4.11/iana-etc-2.20/services 2007-11-25 16:59:22.466290662
+0100
-@@ -170,8 +170,6 @@
+--- 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
+@@ -196,8 +196,6 @@
graphics 41/udp # Graphics
- name 42/tcp nameserver # Host Name Server
- name 42/udp nameserver # Host Name Server
+ name 42/tcp # Host Name Server
+ name 42/udp # Host Name Server
-nameserver 42/tcp # Host Name Server
-nameserver 42/udp # Host Name Server
nicname 43/tcp whois # Who Is
nicname 43/udp whois # Who Is
mpm-flags 44/tcp # MPM FLAGS Protocol
-@@ -276,10 +274,6 @@
- # David Zimmerman <d...@rutgers.edu>
- http 80/tcp www www-http # World Wide Web HTTP
- http 80/udp www www-http # World Wide Web HTTP
+@@ -302,10 +300,6 @@
+ # David Zimmerman <dpz&RUTGERS.EDU>
+ http 80/tcp # World Wide Web HTTP
+ http 80/udp # World Wide Web HTTP
-www 80/tcp # World Wide Web HTTP
-www 80/udp # World Wide Web HTTP
-www-http 80/tcp # World Wide Web HTTP
-www-http 80/udp # World Wide Web HTTP
- # Tim Berners-Lee <ti...@w3.org>
- hosts2-ns 81/tcp # HOSTS2 Name Server
- hosts2-ns 81/udp # HOSTS2 Name Server
-@@ -299,8 +293,8 @@
+ # Tim Berners-Lee <timbl&W3.org>
+ http 80/sctp # HTTP
+ # IETF TSVWG
+@@ -327,8 +321,8 @@
mfcobol 86/tcp # Micro Focus Cobol
mfcobol 86/udp # Micro Focus Cobol
# Simon Edwards <--none--->
-# 87/tcp any private terminal link
-# 87/udp any private terminal link
-+ttylink 87/tcp # any private terminal link
-+ttylink 87/udp # any private terminal link
- # Jon Postel <pos...@isi.edu>
- kerberos 88/tcp krb5 kerberos5 # Kerberos
- kerberos 88/udp krb5 kerberos5 # Kerberos
-@@ -354,10 +348,7 @@
++ttylink 87/tcp any private terminal link
++ttylink 87/udp any private terminal link
+ # Jon Postel <postel&isi.edu>
+ kerberos 88/tcp # Kerberos
+ kerberos 88/udp # Kerberos
+@@ -382,10 +376,7 @@
# Patrick McNamee <--none--->
- cso 105/tcp csnet-ns cso-ns # CCSO name server protocol
- cso 105/udp csnet-ns cso-ns # CCSO name server protocol
--# Martin Hamilton <mar...@mrrl.lut.as.uk>
+ cso 105/tcp # CCSO name server protocol
+ cso 105/udp # CCSO name server protocol
+-# Martin Hamilton <martin&mrrl.lut.as.uk>
-csnet-ns 105/tcp # Mailbox Name Nameserver
-csnet-ns 105/udp # Mailbox Name Nameserver
--# Marvin Solomon <solo...@cs.wisc.edu>
-+# Martin Hamilton <mar...@mrrl.lut.as.uk>, Marvin
Solomon <solo...@cs.wisc.edu>
+-# Marvin Solomon <solomon&CS.WISC.EDU>
++# Martin Hamilton <martin&mrrl.lut.as.uk>, Marvin
Solomon <solo...@cs.wisc.edu>
3com-tsmux 106/tcp # 3COM-TSMUX
3com-tsmux 106/udp # 3COM-TSMUX
- # Jeremy Siegel <j...@nsd.3com.com>
-@@ -380,8 +371,7 @@
+ # Jeremy Siegel <jzs&NSD.3Com.COM>
+@@ -408,9 +399,9 @@
mcidas 112/tcp # McIDAS Data Transmission Protocol
mcidas 112/udp # McIDAS Data Transmission Protocol
- # Glenn Davis <supp...@unidata.ucar.edu>
+ # Glenn Davis <support&unidata.ucar.edu>
-ident 113/tcp #
--auth 113/tcp tap # Authentication Service
+ auth 113/tcp # Authentication Service
+ auth 113/udp # Authentication Service
+auth 113/tcp tap ident # Authentication Service
- auth 113/udp tap # Authentication Service
- # Mike St. Johns <stjo...@arpa.mil>
+ # Mike St. Johns <stjohns&arpa.mil>
# 114 Deprecated June 2004
-@@ -1177,6 +1167,7 @@
+ sftp 115/tcp # Simple File Transfer Protocol
+@@ -1215,6 +1206,7 @@
kpasswd 464/tcp # kpasswd
kpasswd 464/udp # kpasswd
- # Theodore Ts'o <ty...@mit.edu>
-+smtps 465/tcp ssmtp # (not in IANA!)
+ # Theodore Ts'o <tytso&MIT.EDU>
++smtps 465/tcp ssmtp # (not in IANA!)
urd 465/tcp # URL Rendesvous Directory for SSM
igmpv3lite 465/udp # IGMP over UDP for SSM
- # Toerless Eckert <eck...@cisco.com>
-@@ -1322,7 +1313,6 @@
+ # Toerless Eckert <eckert&cisco.com>
+@@ -1360,7 +1352,6 @@
exec 512/tcp # remote process execution;
# authentication performed using
# passwords and UNIX login names
-comsat 512/udp
- biff 512/udp comsat # used by mail system to notify users
+ biff 512/udp # used by mail system to notify users
# of new mail received; currently
# receives messages only from
-@@ -2050,6 +2040,7 @@
+@@ -2100,6 +2091,7 @@
omginitialrefs 900/tcp # OMG Initial Refs
omginitialrefs 900/udp # OMG Initial Refs
- # Christian Callsen <christian.call...@eng.sun.com>
-+swat 901/tcp # (not in IANA!) Samba Web Administration Tool
+ # Christian Callsen <Christian.Callsen&eng.sun.com>
++swat 901/tcp # (not in IANA!) Samba Web Administration Tool
smpnameres 901/tcp # SMPNAMERES
smpnameres 901/udp # SMPNAMERES
- # Leif Ekblad <l...@rdos.net>
-@@ -4918,13 +4909,15 @@
+ # Leif Ekblad <leif&rdos.net>
+@@ -4972,7 +4964,8 @@
tcp-id-port 1999/tcp # cisco identification port
tcp-id-port 1999/udp # cisco identification port
#
-cisco-sccp 2000/tcp # Cisco SCCP
+cisco-sccp 2000/tcp sieve # Cisco SCCP
-+ # sieve used by cyrus-imapd timsieved daemon
++ # sieve used by cyrus-imapd timsieved daemon
cisco-sccp 2000/udp # Cisco SCCp
- # Dan Wing <dw...@cisco.com> November 2003
+ # Dan Wing <dwing&cisco.com> November 2003
dc 2001/tcp
- wizard 2001/udp # curry
+@@ -4980,6 +4973,7 @@
globe 2002/tcp
globe 2002/udp
-+cfinger 2003/tcp # (not in IANA!) GNU Finger
- mailbox 2004/tcp
- emce 2004/udp # CCWS mm conf
- berknet 2005/tcp
-@@ -5024,10 +5017,10 @@
+ #
++cfinger 2003/tcp # (not in IANA!) GNU Finger
+ brutus 2003/tcp # Brutus Server
+ brutus 2003/udp # Brutus Server
+ # Johannes Skov Frandsen <joe&42tools.com> 28 February
2008
+@@ -5082,10 +5076,10 @@
dls-monitor 2048/tcp
dls-monitor 2048/udp
# <== NOTE Conflict on 2049 !
@@ -104,98 +106,94 @@
nfs 2049/udp # Network File System - Sun Microsystems
+shilp 2049/tcp
+shilp 2049/udp
- # Brent Callaghan <br...@terra.eng.sun.com>
+ # Brent Callaghan <brent&terra.eng.sun.com>
av-emb-config 2050/tcp # Avaya EMB Config Port
av-emb-config 2050/udp # Avaya EMB Config Port
-@@ -12085,6 +12078,7 @@
- # Mark Miller <mmil...@microsoft.com>
+@@ -12356,6 +12350,7 @@
+ # Mark Miller <mmiller&MICROSOFT.com>
auriga-router 5680/tcp # Auriga Router Service
auriga-router 5680/udp # Auriga Router Service
-+canna 5680/tcp # (not in IANA!) cannaserver
- # Vincent Gaudeul <techni...@auriga.fr> February 2006
++canna 5680/tcp # (not in IANA!) cannaserver
+ # Vincent Gaudeul <technique&auriga.fr> February 2006
ncxcp 5681/tcp # Net-coneX Control Protocol
ncxcp 5681/udp # Net-coneX Control Protocol
-@@ -12715,11 +12709,13 @@
+@@ -12900,6 +12895,14 @@
# 6632-6664 Unassigned
ircu 6665/tcp # IRCU
- ircu 6666/tcp # IRCU
-+ircu 6665/udp # IRCU
+ ircu 6665/udp # IRCU
++ircu 6666/tcp # IRCU
+ircu 6666/udp # IRCU
-+ircd 6667/tcp # Internet Relay Chat
-+ircd 6667/udp # Internet Relay Chat
- ircu 6667/tcp # IRCU
- ircu 6668/tcp # IRCU
- ircu 6669/tcp # IRCU
--ircu 6665/udp # IRCU
--ircu 6666/udp # IRCU
- ircu 6667/udp # IRCU
- ircu 6668/udp # IRCU
- ircu 6669/udp # IRCU
-@@ -13660,7 +13656,7 @@
- cddbp-alt 8880/udp # CDDBP
- # Steve Scherf <st...@moonsoft.com>
- # 8881-8887 Unassigned
++ircu 6667/tcp # IRCU
++ircu 6667/udp # IRCU
++ircu 6668/tcp # IRCU
++ircu 6668/udp # IRCU
++ircu 6669/tcp # IRCU
++ircu 6669/udp # IRCU
+ # Brian Tackett <cym&acrux.net>
+ vocaltec-gold 6670/tcp # Vocaltec Global Online Directory
+ vocaltec-gold 6670/udp # Vocaltec Global Online Directory
+@@ -13826,7 +13829,7 @@
+ secure-mqtt 8883/udp # Secure MQTT
+ # Arthur Barr <arthur.barr&uk.ibm.com> 27 February
2008
+ # 8884-8887 Unassigned
-ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1)
-+ddi-tcp-1 8888/tcp irr_rpsl_submit # NewsEDGE server TCP (TCP 1)
++ddi-tcp-1 8888/tcp irr_rpsl_submit # NewsEDGE server TCP (TCP 1)
ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1)
ddi-tcp-2 8889/tcp # Desktop Data TCP 1
ddi-udp-2 8889/udp # NewsEDGE server broadcast
-@@ -14105,6 +14101,10 @@
+@@ -14318,6 +14321,10 @@
+ # <amanda-core&amanda.org>
famdc 10081/tcp # FAM Archive Server
famdc 10081/udp # FAM Archive Server
- # Frode Randers <frode.rand...@tietoenator.com>
January 2006
-+kamanda 10081/tcp # (not in IANA) amanda backup services
(Kerberos)
-+kamanda 10081/udp # (not in IANA) amanda backup services
(Kerberos)
-+amandaidx 10082/tcp # (not in IANA) amanda backup services
-+amidxtape 10083/tcp # (not in IANA) amanda backup services
++kamanda 10081/tcp # (not in IANA) amanda backup services
(Kerberos)
++kamanda 10081/udp # (not in IANA) amanda backup services
(Kerberos)
++amandaidx 10082/tcp # (not in IANA) amanda backup services
++amidxtape 10083/tcp # (not in IANA) amanda backup services
+ # Frode Randers <Frode.Randers&tietoenator.com>
January 2006
# 10082-10099 Unassigned
itap-ddtp 10100/tcp # VERITAS ITAP DDTP
- itap-ddtp 10100/udp # VERITAS ITAP DDTP
-@@ -14305,6 +14305,8 @@
+@@ -14534,6 +14541,8 @@
tsaf 12753/udp # tsaf port
- # Andreas Fehr <andr...@mrs.ch>
+ # Andreas Fehr <andreas&mrs.ch>
# 12754-13159 Unassigned
-+netserver 12865/tcp # Netperf Server
-+netserver 12865/udp # Netperf Server
++netserver 12865/tcp # Netperf Server
++netserver 12865/udp # Netperf Server
i-zipqd 13160/tcp # I-ZIPQD
i-zipqd 13160/udp # I-ZIPQD
- # Chuck Runquist <crunqu...@quarterdeck.com>
-@@ -14655,6 +14657,9 @@
+ # Chuck Runquist <crunquist&quarterdeck.com>
+@@ -14901,6 +14910,9 @@
wnn6 22273/tcp # wnn6
wnn6 22273/udp # wnn6
- # Yasunari Gon Yamasita <yamas...@omronsoft.co.jp>
-+wnn4_Cn 22289/tcp # (not in IANA!) cWnn (Chinese input
system/China)
-+wnn4_Kr 22305/tcp # (not in IANA!) kWnn (Korean input
system)
-+wnn4_Tw 22321/tcp # (not in IANA!) tWnn (Chinese input
system/Taiwan)
- # 22274-22554 Unassigned
- vocaltec-wconf 22555/tcp # Vocaltec Web Conference
- vocaltec-phone 22555/udp # Vocaltec Internet Phone
-@@ -14870,6 +14875,7 @@
+ # Yasunari Gon Yamasita <yamasita&omronsoft.co.jp>
++wnn4_Cn 22289/tcp # (not in IANA!) cWnn (Chinese input
system/China)
++wnn4_Kr 22305/tcp # (not in IANA!) kWnn (Korean input system)
++wnn4_Tw 22321/tcp # (not in IANA!) tWnn (Chinese input
system/Taiwan)
+ # 22274-22304 Unassigned
+ cis 22305/tcp # CompactIS Tunnel
+ cis 22305/udp # CompactIS Tunnel
+@@ -15127,6 +15139,7 @@
# Balduin Mueller-Platz
- # <balduin.mueller-pl...@pago.de> March 2002
+ # <balduin.mueller-platz&pago.de> March 2002
# 30003-30998 Unassigned
+csync2 30865/tcp # Cluster sync (not in IANA)
- ovobs 30999/tcp # OpenView Object Server
- ovobs 30999/udp # OpenView Object Server
- # Bob Wernsman <bob.werns...@hp.com> May 2006
-@@ -15121,6 +15127,20 @@
- # Bjorn de Bonnenfant <b...@iqobject.com> November
2003
+ ovobs 30999/tcp # OpenView Service Desk Client
+ ovobs 30999/udp # OpenView Service Desk Client
+ # Service Desk Product Manager <info&hp.com> May 2006
+@@ -15403,6 +15416,17 @@
+ # Bjorn de Bonnenfant <bdeb&iqobject.com> November
2003
# 48620-49150 Unassigned
# 49151 IANA Reserved
-+
-+tfido 60177/tcp # (not in IANA) Ifmail
-+tfido 60177/udp # (not in IANA) Ifmail
-+fido 60179/tcp # (not in IANA) Ifmail
-+fido 60179/udp # (not in IANA) Ifmail
-+
++tfido 60177/tcp # (not in IANA) Ifmail
++tfido 60177/udp # (not in IANA) Ifmail
++fido 60179/tcp # (not in IANA) Ifmail
++fido 60179/udp # (not in IANA) Ifmail
+#
+# Datagram Delivery Protocol services (not in IANA)
+#
-+rtmp 1/ddp # Routing Table Maintenance Protocol
-+nbp 2/ddp # Name Binding Protocol
-+echo 4/ddp # AppleTalk Echo Protocol
-+zip 6/ddp # Zone Information Protocol
-+
++rtmp 1/ddp # Routing Table Maintenance Protocol
++nbp 2/ddp # Name Binding Protocol
++echo 4/ddp # AppleTalk Echo Protocol
++zip 6/ddp # Zone Information Protocol
#
# DYNAMIC AND/OR PRIVATE PORTS
#
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup-services.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
