diff --git a/netcfg.changes b/netcfg.changes index 02496b2..e48ea45 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 5 10:09:05 UTC 2016 - tchvatal@suse.com + +- Repack services.bz2 with latest from upstream and adjust the script + to not add all the names+emails at the bottom bnc#959693 + ------------------------------------------------------------------- Tue Aug 25 09:41:17 UTC 2015 - tchvatal@suse.com diff --git a/netcfg.spec b/netcfg.spec index 1374ee0..4ddd2ec 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/services-create.pl b/services-create.pl index 7375610..01f48fa 100644 --- a/services-create.pl +++ b/services-create.pl @@ -138,12 +138,12 @@ sub processNode } elsif ($reader->name eq 'people' and $reader->nodeType == 1) { - print SERVICESNEW "#\n"; - print SERVICESNEW "# PEOPLE\n"; - print SERVICESNEW "#\n"; - printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ('ID', 'Name', 'Organization', 'Contact'); - printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ('--', '----', '------------', '-------'); - print SERVICESNEW "#\n"; + #print SERVICESNEW "#\n"; + #print SERVICESNEW "# PEOPLE\n"; + #print SERVICESNEW "#\n"; + #printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ('ID', 'Name', 'Organization', 'Contact'); + #printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ('--', '----', '------------', '-------'); + #print SERVICESNEW "#\n"; } elsif ($reader->name eq 'person') { @@ -165,7 +165,7 @@ sub processNode $reader->read; } - printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ($xref, $name, $org, $uri); + #printf SERVICESNEW "# %-25s%-25s%-25s%s\n", ($xref, $name, $org, $uri); } } diff --git a/services-suse.diff b/services-suse.diff index 547952a..39fd071 100644 --- a/services-suse.diff +++ b/services-suse.diff @@ -1,5 +1,5 @@ ---- services.orig 2011-12-05 09:46:23.098105498 +0100 -+++ services 2011-12-05 09:51:10.178127048 +0100 +--- services.old 2016-01-05 10:57:51.955599939 +0100 ++++ services 2016-01-05 11:03:07.600728374 +0100 @@ -1,4 +1,16 @@ # +# Network services, Internet style @@ -16,8 +16,8 @@ +# # SERVICE NAME AND TRANSPORT PROTOCOL PORT NUMBER REGISTRY # - # (last updated on 2011-11-23) -@@ -137,8 +149,8 @@ + # (last updated on 2015-12-28) +@@ -133,8 +145,8 @@ name 42/udp # Host Name Server nameserver 42/tcp # Host Name Server nameserver 42/udp # Host Name Server @@ -28,7 +28,7 @@ mpm-flags 44/tcp # MPM FLAGS Protocol mpm-flags 44/udp # MPM FLAGS Protocol mpm 45/tcp # Message Processing Module [recv] -@@ -281,8 +293,8 @@ +@@ -274,8 +286,8 @@ pop2 109/udp # Post Office Protocol - Version 2 [Joyce_K_Reynolds] pop3 110/tcp # Post Office Protocol - Version 3 [Marshall_Rose] pop3 110/udp # Post Office Protocol - Version 3 [Marshall_Rose] @@ -39,7 +39,7 @@ mcidas 112/tcp # McIDAS Data Transmission Protocol [Glenn_Davis] mcidas 112/udp # McIDAS Data Transmission Protocol [Glenn_Davis] ident 113/tcp -@@ -1472,6 +1484,7 @@ +@@ -1475,6 +1487,7 @@ cddbp 888/tcp # CD Database Protocol [Steve_Scherf] omginitialrefs 900/tcp # OMG Initial Refs [Christian_Callsen] omginitialrefs 900/udp # OMG Initial Refs [Christian_Callsen] @@ -47,7 +47,7 @@ smpnameres 901/tcp # SMPNAMERES [Leif_Ekblad] smpnameres 901/udp # SMPNAMERES [Leif_Ekblad] ideafarm-door 902/tcp # self documenting Telnet Door -@@ -3504,6 +3517,9 @@ +@@ -3505,6 +3518,9 @@ x25-svc-port 1998/udp # cisco X.25 service (XOT) tcp-id-port 1999/tcp # cisco identification port tcp-id-port 1999/udp # cisco identification port @@ -57,7 +57,7 @@ cisco-sccp 2000/tcp # Cisco SCCP [Dan_Wing] cisco-sccp 2000/udp # Cisco SCCp [Dan_Wing] dc 2001/tcp -@@ -3603,8 +3619,8 @@ +@@ -3604,8 +3620,8 @@ dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp @@ -68,7 +68,7 @@ nfs 2049/tcp # Network File System - Sun Microsystems [Brent_Callaghan] nfs 2049/udp # Network File System - Sun Microsystems [Brent_Callaghan] nfs 2049/sctp # Network File System [RFC5665] -@@ -6088,8 +6104,8 @@ +@@ -6104,8 +6120,8 @@ sysopt 3281/udp # SYSOPT [Tony_Hoffman] datusorb 3282/tcp # Datusorb [Thomas_Martin] datusorb 3282/udp # Datusorb [Thomas_Martin] @@ -79,7 +79,7 @@ 4talk 3284/tcp # 4Talk [Tony_Bushnell] 4talk 3284/udp # 4Talk [Tony_Bushnell] plato 3285/tcp # Plato [Jim_Battin] -@@ -6857,8 +6873,8 @@ +@@ -6877,8 +6893,8 @@ roverlog 3677/udp # RoverLog IPC [Tom_Mayo] ipr-dglt 3678/tcp # DataGuardianLT [Bruce_Carlson] ipr-dglt 3678/udp # DataGuardianLT [Bruce_Carlson] @@ -90,15 +90,15 @@ npds-tracker 3680/tcp # NPDS Tracker [Paul_Guyot] npds-tracker 3680/udp # NPDS Tracker [Paul_Guyot] bts-x73 3681/tcp # BTS X73 Port [Todd_Cooper] -@@ -8961,6 +8977,7 @@ - quailnet 5464/udp # Quail Networks Object Broker [Craig_N_Bissell] - netops-broker 5465/tcp # NETOPS-BROKER [John_R_Deuel] - netops-broker 5465/udp # NETOPS-BROKER [John_R_Deuel] +@@ -9097,6 +9113,7 @@ + # 5474/tcp Reserved + apsolab-data 5475/tcp # The Apsolab company's data retrieval protocol [Apsolab_Inc] [Jean-Francois_Gauthier] + # 5475/udp Reserved +axnet 5492/tcp # OFFICIAL NOT ASSIGNED fcp-addr-srvr1 5500/tcp # fcp-addr-srvr1 [Ken_Wittmer] fcp-addr-srvr1 5500/udp # fcp-addr-srvr1 [Ken_Wittmer] fcp-addr-srvr2 5501/tcp # fcp-addr-srvr2 [Ken_Wittmer] -@@ -8979,6 +8996,7 @@ +@@ -9117,6 +9134,7 @@ sgi-eventmond 5553/udp # SGI Eventmond Port [Andrei_Vilkotski] sgi-esphttp 5554/tcp # SGI ESP HTTP [Vladimir_Legalov] sgi-esphttp 5554/udp # SGI ESP HTTP [Vladimir_Legalov] @@ -106,17 +106,17 @@ personal-agent 5555/tcp # Personal Agent [Jackie_Wu] personal-agent 5555/udp # Personal Agent [Jackie_Wu] freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] -@@ -9053,6 +9071,7 @@ - # 5637/udp Reserved +@@ -9201,6 +9219,7 @@ + # 5639/udp Reserved vfmobile 5646/tcp # Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder] # 5646/udp Reserved +nrpe 5666/tcp # nagios nrpe + filemq 5670/tcp # ZeroMQ file publish-subscribe protocol (updated 2013-02-25) [Pieter_Hintjens2] + zre-disc 5670/udp # Local area discovery and messaging over ZeroMQ [Pieter_Hintjens_3] amqps 5671/tcp # amqp protocol over TLS/SSL [Ted_Ross_2] - amqps 5671/udp # amqp protocol over TLS/SSL [Ted_Ross_2] - amqp 5672/tcp # AMQP [Pieter_Hintjens] -@@ -9192,8 +9211,8 @@ - ppsuitemsg 5863/tcp # PlanetPress Suite Messeng [Yannick_Fortin] - ppsuitemsg 5863/udp # PlanetPress Suite Messeng [Yannick_Fortin] +@@ -9351,8 +9370,8 @@ + # 5868/udp Reserved + diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC6733] jute 5883/tcp # Javascript Unit Test Environment [Mark_Ethan_Trostler] -rfb 5900/tcp # Remote Framebuffer [Tristan_Richardson] [RFC6143] -rfb 5900/udp # Remote Framebuffer [Tristan_Richardson] [RFC6143] @@ -125,23 +125,24 @@ cm 5910/tcp # Context Management [Eivan_Cerasi] cm 5910/udp # Context Management [Eivan_Cerasi] cm 5910/sctp # Context Management [Justin_Yu] -@@ -11111,6 +11130,12 @@ +@@ -11519,7 +11538,12 @@ hde-lcesrvr-2 14937/udp # hde-lcesrvr-2 [Horizon_Digital_Ente] hydap 15000/tcp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu] hydap 15000/udp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu] +-onep-tls 15002/tcp # Open Network Environment TLS [Cisco_3] [Andrew_Thurber] +# The following entries are invalid, but needed +pbs 15001/tcp # pbs server (pbs_server) +pbs_mom 15002/tcp # mom to/from server +pbs_resmom 15003/tcp # mom resource management requests +pbs_resmom 15003/udp # mom resource management requests +pbs_sched 15004/tcp # scheduler + # 15002/udp Reserved # 15118/tcp Reserved v2g-secc 15118/udp # v2g Supply Equipment Communication Controller Discovery Protocol [Holger_Lochner] - xpilot 15345/tcp # XPilot Contact Port [Bert_Gijsbers] -@@ -11344,6 +11369,13 @@ - # 22125/udp Reserved - gsidcap 22128/tcp # GSI dCache Access Protocol [Christoph_Anton_Mitt] +@@ -11784,6 +11808,13 @@ # 22128/udp Reserved + easyengine 22222/tcp # EasyEngine is CLI tool to manage WordPress Sites on Nginx server [rtCamp_Solutions_Private_Limited] [Rahul_Bansal] + # 22222/udp Reserved +# wnn4_* are used illegal and are not OFFICIAL ASSIGNED! +wnn4_Cn 22289/tcp +wnn4_Cn 22289/udp @@ -152,10 +153,10 @@ wnn6 22273/tcp # wnn6 [Yasunari_Gon_Yamasit] wnn6 22273/udp # wnn6 [Yasunari_Gon_Yamasit] cis 22305/tcp # CompactIS Tunnel [Justin_Paupore] -@@ -11738,6 +11770,17 @@ +@@ -12305,3 +12336,13 @@ + robotraconteur 48653/udp # Robot Raconteur transport [Wason_Technology_LLC] [John_Wason] matahari 49000/tcp # Matahari Broker [Matahari_Project] [Zane_Bitter] # 49000/udp Reserved - # +# The mrt entry is temporary until a official number is registerd +mrt 50000/tcp # telnet interface of mrt programs +mrt 50000/udp # telnet interface of mrt programs @@ -166,7 +167,3 @@ +nbp 2/ddp # Name Binding Protocol +echo 4/ddp # AppleTalk Echo Protocol +zip 6/ddp # Zone Information Protocol -+# - # PEOPLE - # - # ID Name Organization Contact diff --git a/services.bz2 b/services.bz2 index 7598ba8..0e00f57 100644 --- a/services.bz2 +++ b/services.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1d3a0a3822b94adb28a7b0bac03b006e19a977ed8586709c78a745d210d764f -size 257476 +oid sha256:de4cd5b8ae60f2f9417f7794b47a60864bbb634332b105d51b46a43396288e07 +size 172335 diff --git a/services_UPDATING b/services_UPDATING index 8985816..131e02a 100644 --- a/services_UPDATING +++ b/services_UPDATING @@ -2,9 +2,9 @@ bunzip2 services.bz2 perl services-create.pl # creates services.new perl services-compare.pl > services.report # changes (more reader friendly) bash services-compare.sh > services.diff # differences (more precise) -... review services.diff and/or services.report +#... review services.diff and/or services.report rm services.report services.diff mv services.new services -... adjust services-suse.diff +#... adjust services-suse.diff bzip2 services