From c7b38a27ca45c5c9d3004ff4b1dfffd645d25ed47e8432612d66699c09b294b0 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 28 Jan 2008 15:01:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/netcfg?expand=0&rev=2

---
 netcfg.changes     |   6 +
 netcfg.spec        | 283 +++++++++++++++++++++++----------------------
 services-suse.diff | 163 +++-----------------------
 services.bz2       |   4 +-
 4 files changed, 170 insertions(+), 286 deletions(-)

diff --git a/netcfg.changes b/netcfg.changes
index 0dc5d67..34745bf 100644
--- a/netcfg.changes
+++ b/netcfg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 28 14:06:22 CET 2008 - kukuk@suse.de
+
+- Update services file from IANA [bnc#352665]
+- Fix PreReqs
+
 -------------------------------------------------------------------
 Wed Oct  4 14:22:39 CEST 2006 - kukuk@suse.de
 
diff --git a/netcfg.spec b/netcfg.spec
index e4bb6fe..afabfcc 100644
--- a/netcfg.spec
+++ b/netcfg.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package netcfg (Version 10.2)
+# spec file for package netcfg (Version 11.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,14 +11,14 @@
 # norootforbuild
 
 Name:           netcfg
-License:        GPL, Other License(s), see package
+License:        GPL v2 or later
 Group:          System/Base
-Autoreqprov:    on
-PreReq:         /bin/rm aaa_base
+AutoReqProv:    on
+PreReq:         coreutils aaa_base
 Summary:        Network Configuration Files in /etc
-Version:        10.2
-Release:        7
-BuildArchitectures: noarch
+Version:        11.0
+Release:        10
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        defaultdomain
 Source1:        exports
@@ -47,9 +47,11 @@ must be installed for all network programs.
 
 
 
+%prep
+
+%build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
 for i in HOSTNAME aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do
   install $RPM_SOURCE_DIR/$i $RPM_BUILD_ROOT/etc
@@ -94,288 +96,291 @@ exit 0
 %config            /etc/protocols
 %config            /etc/services
 
-%changelog -n netcfg
-* Wed Oct 04 2006 - kukuk@suse.de
+%changelog
+* Mon Jan 28 2008 kukuk@suse.de
+- Update services file from IANA [bnc#352665]
+- Fix PreReqs
+* Wed Oct 04 2006 kukuk@suse.de
 - Update services file from IANA
-* Tue May 23 2006 - kukuk@suse.de
+* Tue May 23 2006 kukuk@suse.de
 - Update protocols and services files from IANA
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Dec 14 2005 - kukuk@suse.de
+* Wed Dec 14 2005 kukuk@suse.de
 - Update services file
-* Tue Sep 13 2005 - mmj@suse.de
+* Tue Sep 13 2005 mmj@suse.de
 - Readd the correct services file to patch
-* Mon Sep 12 2005 - mmj@suse.de
+* Mon Sep 12 2005 mmj@suse.de
 - Add IANA official git port (9418) to services
-* Thu Jul 07 2005 - kukuk@suse.de
+* Thu Jul 07 2005 kukuk@suse.de
 - Update services file
-* Tue Mar 08 2005 - kukuk@suse.de
+* Tue Mar 08 2005 kukuk@suse.de
 - Change comments to make peopleusing file wrongly happy [#71247]
-* Wed Feb 23 2005 - kukuk@suse.de
+* Wed Feb 23 2005 kukuk@suse.de
 - Update /etc/services from IANA
-* Tue May 11 2004 - mmj@suse.de
+* Tue May 11 2004 mmj@suse.de
 - Add example for mlmmj list in /etc/aliases
-* Fri Apr 16 2004 - kukuk@suse.de
+* Fri Apr 16 2004 kukuk@suse.de
 - Add smtps back again, got lost with last update
-* Fri Apr 02 2004 - kukuk@suse.de
+* Fri Apr 02 2004 kukuk@suse.de
 - Use linux.site instead of linux.local [Bug #36949]
-* Wed Mar 31 2004 - mls@suse.de
+* Wed Mar 31 2004 mls@suse.de
 - add link-local network
-* Mon Mar 29 2004 - kukuk@suse.de
+* Mon Mar 29 2004 kukuk@suse.de
 - Comment out shilp entry to make reading tcpdump output easier
   [Bug #37359]
-* Sun Feb 15 2004 - kukuk@suse.de
+* Sun Feb 15 2004 kukuk@suse.de
 - Update etc/services file with IANA version
-* Mon Dec 01 2003 - kukuk@suse.de
+* Mon Dec 01 2003 kukuk@suse.de
 - Add etc/netgroup (moved from aaa_base)
-* Thu Nov 13 2003 - adrian@suse.de
+* Fri Nov 14 2003 adrian@suse.de
 - add registered services to service file
   ( sane, distcc, svn )
-* Mon Sep 01 2003 - draht@suse.de
+* Mon Sep 01 2003 draht@suse.de
 - added apcupsd daemons to /etc/hosts.allow (#29646)
-* Fri Aug 15 2003 - kukuk@suse.de
+* Fri Aug 15 2003 kukuk@suse.de
 - Make rpm -V quiet
-* Tue May 13 2003 - kukuk@suse.de
+* Tue May 13 2003 kukuk@suse.de
 - Remove inetd.conf, is now part of inetd package
-* Thu Apr 24 2003 - olh@suse.de
+* Thu Apr 24 2003 olh@suse.de
 - run tftp via tcpd, not in.tftpd
-* Tue Apr 15 2003 - ro@suse.de
+* Tue Apr 15 2003 ro@suse.de
 - change version numbering
-* Tue Apr 15 2003 - arvin@suse.de
+* Tue Apr 15 2003 arvin@suse.de
 - added pop3s and imaps services to inetd.conf (bug #26281)
-* Tue Mar 11 2003 - kukuk@suse.de
+* Tue Mar 11 2003 kukuk@suse.de
 - Add aaa_base to PreReq. to fix update problems [Bug #25102]
-* Thu Feb 13 2003 - meissner@suse.de
+* Thu Feb 13 2003 meissner@suse.de
 - Add VNC httpd and 2 VNC display ports, which start Xvnc on demand.
-* Mon Jan 27 2003 - kukuk@suse.de
+* Mon Jan 27 2003 kukuk@suse.de
 - Add etc/ethers [Bug #23016]
-* Thu Oct 24 2002 - kukuk@suse.de
+* Thu Oct 24 2002 kukuk@suse.de
 - etc/services: Add lotusnotes alias to lotusnote [Bug #21145]
-* Tue Sep 17 2002 - ro@suse.de
+* Tue Sep 17 2002 ro@suse.de
 - removed bogus self-provides
-* Wed Sep 04 2002 - kukuk@suse.de
+* Wed Sep 04 2002 kukuk@suse.de
 - etc/services: Add ports for sieve and smtps
-* Mon Aug 26 2002 - kukuk@suse.de
+* Mon Aug 26 2002 kukuk@suse.de
 - etc/services: add mrt entry in temporary area
-* Fri Aug 23 2002 - kukuk@suse.de
+* Fri Aug 23 2002 kukuk@suse.de
 - Fix pop2 daemon name, add imap pop3 daemon [Bug #14474]
-* Thu Aug 15 2002 - kukuk@suse.de
+* Thu Aug 15 2002 kukuk@suse.de
 - Add PreRequires [Bug #17899]
-* Sat Aug 03 2002 - kukuk@suse.de
+* Sat Aug 03 2002 kukuk@suse.de
 - etc/services: add rpcbind alias to sunrpc entry
-* Tue Jul 30 2002 - kukuk@suse.de
+* Tue Jul 30 2002 kukuk@suse.de
 - Fix get_version_number.sh
-* Mon Jul 22 2002 - adrian@suse.de
+* Mon Jul 22 2002 adrian@suse.de
 - add disabled fam daemon line to inetd.conf
 - remove KDE 2 talk daemon lines
   (not anymore support due to security issues)
-* Wed Jul 17 2002 - kukuk@suse.de
+* Wed Jul 17 2002 kukuk@suse.de
 - Remove etc/defaultdomian.rpmnew if empty in postinstall script
-* Fri Jul 12 2002 - kukuk@suse.de
+* Fri Jul 12 2002 kukuk@suse.de
 - Add /etc/aliases as config(noreplace).
-* Fri Jul 05 2002 - kukuk@suse.de
+* Fri Jul 05 2002 kukuk@suse.de
 - Update /etc/services (add new, official ports)
-* Tue Jul 02 2002 - kukuk@suse.de
+* Tue Jul 02 2002 kukuk@suse.de
 - fix typo in /etc/services [Bug #16478]
-* Thu Jun 13 2002 - draht@suse.de
+* Thu Jun 13 2002 draht@suse.de
 - removed lprold from the comments in /etc/hosts.allow.
-* Thu Jun 13 2002 - draht@suse.de
+* Thu Jun 13 2002 draht@suse.de
 - redo change from Tue Feb  5 18:38:44 MET 2002 - draht@suse.de
   commented out services time, telnet, login, finger from default
   /etc/inetd.conf. No services are configured by default.
-* Wed May 15 2002 - kssingvo@suse.de
+* Wed May 15 2002 kssingvo@suse.de
 - Add cups-lpd entry to inetd.conf (commented out)
-* Wed Mar 13 2002 - kukuk@suse.de
+* Wed Mar 13 2002 kukuk@suse.de
 - Remove not supported entries [Bug #14932]
-* Tue Mar 05 2002 - kukuk@suse.de
+* Tue Mar 05 2002 kukuk@suse.de
 - Add inofficial entries for pbs to etc/services [Bug #14450]
-* Fri Mar 01 2002 - kukuk@suse.de
+* Fri Mar 01 2002 kukuk@suse.de
 - Add sap db entries back to etc/services
-* Wed Feb 13 2002 - werner@suse.de
+* Wed Feb 13 2002 werner@suse.de
 - Add the options '-L sendmail' and '-Am' to be sure that
   sendmail does work as server not as msp client
-* Tue Feb 05 2002 - draht@suse.de
+* Tue Feb 05 2002 draht@suse.de
 - revert changes in /etc/inetd.conf
-* Tue Feb 05 2002 - draht@suse.de
+* Tue Feb 05 2002 draht@suse.de
 - more descriptive comment in /etc/exports.
-* Tue Feb 05 2002 - draht@suse.de
+* Tue Feb 05 2002 draht@suse.de
 - Added users db4web dpbox ingres mail oracle perforce pop sapdb
   squid vscan wnn wwwrun and zope to /etc/ftpusers.
   No users removed, legacy users stay.
-* Tue Feb 05 2002 - draht@suse.de
+* Tue Feb 05 2002 draht@suse.de
 - commented out services telnet, login and finger from default
   /etc/inetd.conf file.
-* Tue Feb 05 2002 - draht@suse.de
+* Tue Feb 05 2002 draht@suse.de
 - add list of wrapped services and examples to /etc/hosts.allow
 - changed comment on /etc/hosts.deny
-* Tue Feb 05 2002 - kukuk@suse.de
+* Tue Feb 05 2002 kukuk@suse.de
 - Fix x11 entry in etc/services
-* Fri Feb 01 2002 - draht@suse.de
+* Fri Feb 01 2002 draht@suse.de
 - removed ^m characters from etc/services
-* Tue Jan 22 2002 - kukuk@suse.de
+* Tue Jan 22 2002 kukuk@suse.de
 - Sync protocols with official list [Bug #12870]
 - Sync services with official list
-* Fri Jan 18 2002 - kukuk@suse.de
+* Fri Jan 18 2002 kukuk@suse.de
 - disable talk, not in wide use today
 - amindexd and amidxtaped should run as user amanda [Bug #12619]
-* Thu Jan 17 2002 - ro@suse.de
+* Thu Jan 17 2002 ro@suse.de
 - fixed filelist
-* Wed Jan 16 2002 - kukuk@suse.de
+* Wed Jan 16 2002 kukuk@suse.de
 - Remove /var/adm/setup, diphost and add defaultdomain and HOSTNAME
-* Mon Oct 22 2001 - mmj@suse.de
+* Mon Oct 22 2001 mmj@suse.de
 - Change inetd.conf to have vsftpd support
-* Mon Jul 30 2001 - kukuk@suse.de
+* Mon Jul 30 2001 kukuk@suse.de
 - Fix typo in hosts.equiv [Bug #9420]
-* Tue Jul 10 2001 - kukuk@suse.de
+* Tue Jul 10 2001 kukuk@suse.de
 - Change inetd.conf entry for tftp to match new version
-* Fri Jul 06 2001 - kukuk@suse.de
+* Fri Jul 06 2001 kukuk@suse.de
 - Fix path to initscript in comment
-* Tue Jun 05 2001 - kukuk@suse.de
+* Tue Jun 05 2001 kukuk@suse.de
 - services: Add ksysguard
-* Wed May 09 2001 - kukuk@suse.de
+* Wed May 09 2001 kukuk@suse.de
 - Don't send wrong email about changed ftp server
 - Fix english comment in inetd.conf [Bug #7913]
-* Mon Apr 30 2001 - ro@suse.de
+* Mon Apr 30 2001 ro@suse.de
 - added sql6 as 7210/tcp to etc/services
-* Fri Apr 20 2001 - kukuk@suse.de
+* Fri Apr 20 2001 kukuk@suse.de
 - Add comments for use of ktalkd [Bug #6566]
-* Wed Apr 11 2001 - kukuk@suse.de
+* Wed Apr 11 2001 kukuk@suse.de
 - Revert some of the last changes [Bug #6957]
-* Mon Mar 26 2001 - kukuk@suse.de
+* Mon Mar 26 2001 kukuk@suse.de
 - Update etc/protocols from official iana list [Bug #4183]
-* Sat Mar 24 2001 - kukuk@suse.de
+* Sat Mar 24 2001 kukuk@suse.de
 - etc/services: Add canna entry
-* Thu Mar 22 2001 - kukuk@suse.de
+* Thu Mar 22 2001 kukuk@suse.de
 - Fix example in hosts.allow
 - etc/inetd.conf: Only enable time, telnet, rlogin and talk.
-* Fri Feb 09 2001 - schwab@suse.de
+* Fri Feb 09 2001 schwab@suse.de
 - Fix cvs pserver example (#6293).
-* Thu Dec 14 2000 - ro@suse.de
+* Thu Dec 14 2000 ro@suse.de
 - removed lines db2cdb2inst1 and db2idb2inst1 from etc/services (#4461)
-* Sat Nov 18 2000 - kukuk@suse.de
+* Sat Nov 18 2000 kukuk@suse.de
 - Add dqs entries for nashif@suse.de
-* Wed Sep 27 2000 - kukuk@suse.de
+* Wed Sep 27 2000 kukuk@suse.de
 - Add more Wnn* entries to etc/services
-* Fri Jul 28 2000 - kukuk@suse.de
+* Fri Jul 28 2000 kukuk@suse.de
 - Fix rsync example
-* Mon Jun 19 2000 - kukuk@suse.de
+* Mon Jun 19 2000 kukuk@suse.de
 - Compress tar archive
-* Mon Jun 19 2000 - kukuk@suse.de
+* Mon Jun 19 2000 kukuk@suse.de
 - Enable swat in etc/inetd.conf
-* Fri May 26 2000 - kukuk@suse.de
+* Fri May 26 2000 kukuk@suse.de
 - Fix tar archive
-* Thu May 25 2000 - kukuk@suse.de
+* Thu May 25 2000 kukuk@suse.de
 - Add etc/host.conf
-* Mon May 15 2000 - kukuk@suse.de
+* Mon May 15 2000 kukuk@suse.de
 - Remove ypserv entries from hosts.allow/hosts.deny
-* Mon May 15 2000 - ro@suse.de
+* Mon May 15 2000 ro@suse.de
 - removed duplicate line for opalis-rdv
-* Mon May 15 2000 - kukuk@suse.de
+* Mon May 15 2000 kukuk@suse.de
 - etc/services: Add procstatd entry
 - etc/inetd.conf: Likewise.
-* Tue May 09 2000 - ro@suse.de
+* Tue May 09 2000 ro@suse.de
 - added services entry for codine_commd
   (inofficial 536/tcp)
-* Mon Apr 17 2000 - kukuk@suse.de
+* Mon Apr 17 2000 kukuk@suse.de
 - etc/inetd.conf: Change tftpd default configuration to make a
   chroot into tftpboot directory
-* Wed Apr 05 2000 - kukuk@suse.de
+* Wed Apr 05 2000 kukuk@suse.de
 - etc/services: Add more entries
-* Wed Apr 05 2000 - kukuk@suse.de
+* Wed Apr 05 2000 kukuk@suse.de
 - etc/inetd.conf: service name is imap, not imap2 [Bug 2607]
-* Mon Mar 13 2000 - kukuk@suse.de
+* Mon Mar 13 2000 kukuk@suse.de
 - etc/services: Now really fix axnet entry [Bug 2080]
-* Fri Feb 25 2000 - garloff@suse.de
+* Fri Feb 25 2000 garloff@suse.de
 - cvs entry fixed: path to cvs added.
-* Fri Feb 25 2000 - kukuk@suse.de
+* Fri Feb 25 2000 kukuk@suse.de
 - etc/services: Add more entries [Bug 2080]
-* Mon Feb 21 2000 - garloff@suse.de
+* Mon Feb 21 2000 garloff@suse.de
 - added commented entry for cvs-pserver to inet.conf
-* Wed Feb 16 2000 - kukuk@suse.de
+* Wed Feb 16 2000 kukuk@suse.de
 - etc/services: Add pbs entries
-* Tue Feb 15 2000 - kukuk@suse.de
+* Tue Feb 15 2000 kukuk@suse.de
 - etc/inetd.conf: fix some typos
-* Thu Jan 20 2000 - kukuk@suse.de
+* Thu Jan 20 2000 kukuk@suse.de
 - Add missing amanda client entry to etc/inetd.conf
-* Wed Jan 19 2000 - kukuk@suse.de
+* Wed Jan 19 2000 kukuk@suse.de
 - Add missing amanda idx entries to etc/services
-* Thu Jan 13 2000 - kukuk@suse.de
+* Thu Jan 13 2000 kukuk@suse.de
 - etc/ftpusers: Add more systemuser from /etc/passwd
-* Thu Jan 13 2000 - kukuk@suse.de
+* Thu Jan 13 2000 kukuk@suse.de
 - Add IPv6 addresses to etc/hosts
-* Tue Jan 11 2000 - kukuk@suse.de
+* Tue Jan 11 2000 kukuk@suse.de
 - etc/services: Add db2 and http-rman entries
-* Mon Jan 03 2000 - kukuk@suse.de
+* Mon Jan 03 2000 kukuk@suse.de
 - etc/inetd.conf: Remove RPC entries
 - etc/protocols: Add IPv6
 - etc/services: Add all known services
 - etc/rpc: Removed, is in shlibs
-* Thu Oct 21 1999 - kukuk@suse.de
+* Thu Oct 21 1999 kukuk@suse.de
 - etc/inetd.conf: fix comments, disable btx and rplay
 - etc/ftpusers: Add more system users
 - etc/services: Add more official assinged numbers
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Sat Sep 11 1999 - kukuk@suse.de
+* Sat Sep 11 1999 kukuk@suse.de
 - Make in.ftpd default ftp daemon (fixes bug #268)
-* Thu Sep 02 1999 - kukuk@suse.de
+* Thu Sep 02 1999 kukuk@suse.de
 - Don't start identd from inetd
-* Mon Jul 12 1999 - bs@suse.de
+* Mon Jul 12 1999 bs@suse.de
 - fixed buglet in %%post (create var/adm/notify/messages)
-* Mon Jul 12 1999 - ro@suse.de
+* Mon Jul 12 1999 ro@suse.de
 - updated etc/services (added https, ftp, data)
-* Tue May 25 1999 - uli@suse.de
+* Tue May 25 1999 uli@suse.de
 - added services/inetd.conf entries for Mimer
-* Tue Mar 30 1999 - bs@suse.de
+* Tue Mar 30 1999 bs@suse.de
 - enabled time services in /etc/inetd.conf
-* Mon Mar 22 1999 - bs@suse.de
+* Mon Mar 22 1999 bs@suse.de
 - added "bin" and "daemon" to /etc/ftpusers
-* Tue Mar 09 1999 - ro@suse.de
+* Tue Mar 09 1999 ro@suse.de
 - /etc/services: added entries for IBM DB2 Database
-* Tue Mar 02 1999 - ro@suse.de
+* Tue Mar 02 1999 ro@suse.de
 - glibc is libc.so.6.1 on alpha: no etc/rpc there
-* Wed Jan 13 1999 - bs@suse.de
+* Wed Jan 13 1999 bs@suse.de
 - added some entries for samba to inetd.conf and services
-* Sat Dec 05 1998 - bs@suse.de
+* Sat Dec 05 1998 bs@suse.de
 - added netplan to /etc/services
 - marked /etc/inetd.conf as noreplace
-* Sat Nov 28 1998 - bs@suse.de
+* Sat Nov 28 1998 bs@suse.de
 - added rsync to etc/services and etc/inetd.conf
-* Wed Nov 18 1998 - bs@suse.de
+* Wed Nov 18 1998 bs@suse.de
 - disabled vbox in inetd.conf
-* Tue Nov 17 1998 - bs@suse.de
+* Tue Nov 17 1998 bs@suse.de
 - hosts.equiv: typo fix
 - etc/services:  added afpovertcp, mysql
 - etc/inetd.conf:  added leafnode, vboxd
   removed in.nntpd
-* Fri Aug 21 1998 - bs@suse.de
+* Fri Aug 21 1998 bs@suse.de
 - added some entries to /etc/services to be friendly for netatalk
-* Mon Aug 17 1998 - bs@suse.de
+* Mon Aug 17 1998 bs@suse.de
 - changed entry for rplayd in inetd.conf
-* Tue Jul 28 1998 - bs@suse.de
+* Tue Jul 28 1998 bs@suse.de
 - changed comment headers in /etc/hosts and /etc/hosts.lpd
 - added "noreplace" feature.
-* Mon Jul 13 1998 - bs@suse.de
+* Mon Jul 13 1998 bs@suse.de
 - inetd.conf
-- added new entry for rplay
-- added entry for proftpd
+  - added new entry for rplay
+  - added entry for proftpd
 - services:
-- added aliases for imap2 (imap, imap4)
-* Thu May 28 1998 - bs@suse.de
+  - added aliases for imap2 (imap, imap4)
+* Thu May 28 1998 bs@suse.de
 - disabled imap2 in /etc/inetd.conf
-* Tue Mar 03 1998 - ro@suse.de
+* Tue Mar 03 1998 ro@suse.de
 - etc/services     - changed entry for http-rman to nowait.10000
-* Sat Feb 28 1998 - ro@suse.de
+* Sat Feb 28 1998 ro@suse.de
 - etc/services     - added entried for radius
-* Mon Feb 09 1998 - bs@suse.de
+* Mon Feb 09 1998 bs@suse.de
 - etc/services:    - added entries for amanda
-- added entries for ssh
+                   - added entries for ssh
 - etc/inetd.conf:  - added entries for amanda
-- added "-e" to /usr/sbin/in.identd
-- added comment for "keep-alive"
-* Wed Jan 28 1998 - ro@suse.de
+                   - added "-e" to /usr/sbin/in.identd
+                   - added comment for "keep-alive"
+* Wed Jan 28 1998 ro@suse.de
 - changed ftpd from in.ftpd to wu.ftpd in /etc/inetd.conf
   (in case of update with existing in.ftpd and nonexisting
   wu.ftpd, the administrator is notified of the change)
-* Mon Jan 26 1998 - ro@suse.de
+* Mon Jan 26 1998 ro@suse.de
 - added entries for hp eloquence software 8010,8100,8102,8104
diff --git a/services-suse.diff b/services-suse.diff
index 8887342..f9f309b 100644
--- a/services-suse.diff
+++ b/services-suse.diff
@@ -1,5 +1,5 @@
 --- services
-+++ services	2006/10/04 12:21:31
++++ services	2008/01/28 12:45:26
 @@ -1,3 +1,13 @@
 +#
 +# Network services, Internet style
@@ -14,117 +14,7 @@
  # See also: services(5), http://www.sethwklein.net/projects/iana-etc/
  #
  # PORT NUMBERS
-@@ -77,8 +87,8 @@
- #                          Jon Postel <postel@isi.edu>
- #                 6/tcp    # Unassigned
- #                 6/udp    # Unassigned
--echo              7/tcp    # Echo
--echo              7/udp    # Echo
-+echo              7/tcp    Echo
-+echo              7/udp    Echo
- #                          Jon Postel <postel@isi.edu>
- #                 8/tcp    # Unassigned
- #                 8/udp    # Unassigned
-@@ -89,8 +99,8 @@
- #                          IETF dccp WG, Eddie Kohler <kohler@cs.ucla.edu>, [RFC4340]
- #                10/tcp    # Unassigned
- #                10/udp    # Unassigned
--systat           11/tcp    # Active Users
--systat           11/udp    # Active Users
-+systat           11/tcp    users	# Active Users
-+systat           11/udp    users	# Active Users
- #                          Jon Postel <postel@isi.edu>
- #                12/tcp    # Unassigned
- #                12/udp    # Unassigned
-@@ -99,12 +109,12 @@
- #                          Jon Postel <postel@isi.edu>
- #                14/tcp    # Unassigned
- #                14/udp    # Unassigned
--#                15/tcp    # Unassigned [was netstat]
-+netstat          15/tcp    # Unassigned [was netstat]
- #                15/udp    # Unassigned
- #                16/tcp    # Unassigned
- #                16/udp    # Unassigned
--qotd             17/tcp    # Quote of the Day
--qotd             17/udp    # Quote of the Day
-+qotd             17/tcp    quote	# Quote of the Day
-+qotd             17/udp    quote	# Quote of the Day
- #                          Jon Postel <postel@isi.edu>
- msp              18/tcp    # Message Send Protocol
- msp              18/udp    # Message Send Protocol
-@@ -114,7 +124,7 @@
- ftp-data         20/tcp    # File Transfer [Default Data]
- ftp-data         20/udp    # File Transfer [Default Data]
- ftp              21/tcp    # File Transfer [Control]
--ftp              21/udp    # File Transfer [Control]
-+fsp              21/udp    # File Transfer [Control]
- #                          Jon Postel <postel@isi.edu>
- ssh              22/tcp    # SSH Remote Login Protocol
- ssh              22/udp    # SSH Remote Login Protocol
-@@ -125,8 +135,8 @@
- #                24/tcp    any private mail system
- #                24/udp    any private mail system
- #                          Rick Adams <rick@UUNET.UU.NET>
--smtp             25/tcp    # Simple Mail Transfer
--smtp             25/udp    # Simple Mail Transfer
-+smtp             25/tcp    mail		# Simple Mail Transfer
-+smtp             25/udp    mail		# Simple Mail Transfer
- #                          Jon Postel <postel@isi.edu>
- #                26/tcp    # Unassigned
- #                26/udp    # Unassigned
-@@ -374,8 +384,8 @@
- pop3            110/tcp    # Post Office Protocol - Version 3
- pop3            110/udp    # Post Office Protocol - Version 3
- #                          Marshall Rose <mrose@dbc.mtview.ca.us>
--sunrpc          111/tcp    # SUN Remote Procedure Call
--sunrpc          111/udp    # SUN Remote Procedure Call
-+sunrpc          111/tcp    rpcbind	# SUN Remote Procedure Call
-+sunrpc          111/udp    rpcbind	# SUN Remote Procedure Call
- #                          Chuck McManis <cmcmanis@freegate.net>
- mcidas          112/tcp    # McIDAS Data Transmission Protocol
- mcidas          112/udp    # McIDAS Data Transmission Protocol
-@@ -467,8 +477,8 @@
- bl-idm          142/tcp    # Britton-Lee IDM           
- bl-idm          142/udp    # Britton-Lee IDM           
- #                          Susie Snitzer <---none--->
--imap            143/tcp    # Internet Message Access Protocol
--imap            143/udp    # Internet Message Access Protocol
-+imap            143/tcp    imap2	# Internet Message Access Protocol
-+imap            143/udp    imap2	# Internet Message Access Protocol
- #                          Mark Crispin <MRC@CAC.Washington.EDU>
- uma 		144/tcp    # Universal Management Architecture
- uma		144/udp    # Universal Management Architecture
-@@ -1177,7 +1187,9 @@
- kpasswd         464/tcp    # kpasswd
- kpasswd         464/udp    # kpasswd
- #                          Theodore Ts'o <tytso@MIT.EDU>
--urd             465/tcp    # URL Rendesvous Directory for SSM
-+# 465 is illegal used by eMail Server
-+smtps           465/tcp    # eMail Server
-+#urd		465/tcp    # URL Rendesvous Directory for SSM
- igmpv3lite      465/udp    # IGMP over UDP for SSM 
- #                          Toerless Eckert <eckert@cisco.com>
- digital-vrc     466/tcp    # digital-vrc
-@@ -2050,6 +2062,7 @@
- omginitialrefs  900/tcp    # OMG Initial Refs
- omginitialrefs  900/udp    # OMG Initial Refs
- #			   Christian Callsen <Christian.Callsen@eng.sun.com>
-+swat		901/tcp	   # CONFLICT, not official assigned!
- smpnameres      901/tcp    # SMPNAMERES
- smpnameres      901/udp    # SMPNAMERES
- #                          Leif Ekblad <leif@rdos.net>
-@@ -3083,8 +3096,8 @@
- equationbuilder 1351/tcp   # Digital Tool Works (MIT)            
- equationbuilder 1351/udp   # Digital Tool Works (MIT)            
- #                          Terrence J. Talbot <lexcube!tjt@bu.edu>
--lotusnote       1352/tcp   # Lotus Note                          
--lotusnote       1352/udp   # Lotus Note                          
-+lotusnote       1352/tcp   lotusnotes # Lotus Note                          
-+lotusnote       1352/udp   lotusnotes # Lotus Note                          
- #                          Greg Pflaum <iris.com!Greg_Pflaum@uunet.uu.net> (July 1992)
- relief          1353/tcp   # Relief Consulting                   
- relief          1353/udp   # Relief Consulting                   
-@@ -4917,6 +4930,9 @@
+@@ -4973,6 +4983,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
@@ -134,7 +24,7 @@
  #
  cisco-sccp      2000/tcp   # Cisco SCCP
  cisco-sccp      2000/udp   # Cisco SCCp
-@@ -5024,8 +5040,8 @@
+@@ -5081,8 +5094,8 @@
  dls-monitor	2048/tcp
  dls-monitor	2048/udp
  #                         <== NOTE Conflict on 2049 !
@@ -144,43 +34,26 @@
 +#shilp		2049/udp
  nfs             2049/tcp   # Network File System - Sun Microsystems
  nfs             2049/udp   # Network File System - Sun Microsystems
- #                          Brent Callaghan <brent@terra.eng.sun.com>
-@@ -11714,6 +11730,7 @@
+ #                          Brent Callaghan <brent&terra.eng.sun.com>
+@@ -14790,6 +14803,7 @@
  netops-broker   5465/udp   # NETOPS-BROKER
- #                          John R. Deuel <kink@netops.com>
+ #                          John R. Deuel <kink&netops.com>
  #		5466-5499  Unassigned
 +axnet           5492/tcp   # OFFICIAL NOT ASSIGNED
  fcp-addr-srvr1  5500/tcp   # fcp-addr-srvr1
  fcp-addr-srvr1  5500/udp   # fcp-addr-srvr1
- fcp-addr-srvr2  5501/tcp   # fcp-addr-srvr2
-@@ -11733,6 +11750,7 @@
+ fcp-addr-srvr1  5500/udp   # fcp-addr-srvr1
+@@ -14828,6 +14842,7 @@
  sgi-esphttp     5554/udp   # SGI ESP HTTP
- #                          Vladimir Legalov <legalov@sgi.com>
+ #                          Vladimir Legalov <legalov&sgi.com>
  ############Port 5555 also used by HP Omniback#####################
 +rplay           5555/udp   # and by rplay :-(
  personal-agent  5555/tcp   # Personal Agent
  personal-agent  5555/udp   # Personal Agent
- #			               Jackie Wu <jackiew@infoseek.com>
-@@ -11829,6 +11847,7 @@
- #                          Mark Miller <mmiller@MICROSOFT.com>
- auriga-router   5680/tcp   # Auriga Router Service
- auriga-router   5680/udp   # Auriga Router Service
-+canna           5680/tcp   # NOT OFFICIAL ASSIGNED, illegal usage
- #			   Vincent Gaudeul <technique@auriga.fr> February 2006
- ncxcp 		5681/tcp   # Net-coneX Control Protocol
- ncxcp 		5681/udp   # Net-coneX Control Protocol
-@@ -13564,6 +13583,8 @@
- #               10052-10079 Unassigned
- amanda          10080/tcp  # Amanda 
- amanda          10080/udp  # Amanda 
-+amandaidx       10082/tcp  # Amanda
-+amidxtape       10083/tcp  # Amanda
- #                          John Jackson <jrj@gandalf.cc.purdue.edu>
- #                          <amanda-core@amanda.org>
- famdc		10081/tcp  # FAM Archive Server
-@@ -13862,6 +13883,12 @@
+ personal-agent  5555/udp   # Personal Agent
+@@ -19043,6 +19058,12 @@
  hydap           15000/udp  # Hypack Data Aquisition
- #                          Mircea Neacsu <mircea@videotron.ca>  
+ #                          Mircea Neacsu <mircea&videotron.ca>  
  #               15001-15344 Unassigned
 +#  The following entries are invalid, but needed
 +pbs             15001/tcp  # pbs server (pbs_server)
@@ -190,10 +63,10 @@
 +pbs_sched       15004/tcp  # scheduler
  xpilot          15345/tcp  # XPilot Contact Port
  xpilot          15345/udp  # XPilot Contact Port
- #                          Bert Gijsbers <bert@xpilot.org> 
-@@ -14116,6 +14143,13 @@
+ xpilot          15345/udp  # XPilot Contact Port
+@@ -19459,6 +19480,13 @@
  optohost004	22005/udp  # Opto Host Port 5
- #			   Doug Leany <DLEANY@Opto22.com> September 2006
+ #			   Doug Leany <DLEANY&Opto22.com> September 2006
  #               22006-22272 Unassigned
 +# wnn4_* are used illegal and are not OFFICIAL ASSIGNED!
 +wnn4_Cn         22289/tcp
@@ -204,8 +77,8 @@
 +wnn4_Tw         22321/udp
  wnn6            22273/tcp  # wnn6
  wnn6            22273/udp  # wnn6
- #                          Yasunari Gon Yamasita <yamasita@omronsoft.co.jp>
-@@ -14554,6 +14588,18 @@
+ wnn6            22273/udp  # wnn6
+@@ -20279,6 +20307,18 @@
  # 
  # The Dynamic and/or Private Ports are those from 49152 through 65535
  # 
@@ -223,4 +96,4 @@
 +#
  # 
  # REFERENCES
- # 
+ # ----------
diff --git a/services.bz2 b/services.bz2
index ef619b3..1b29db5 100644
--- a/services.bz2
+++ b/services.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a43ce96618670ea5f2a836a007722bef372a5ff9f754b0ba59f3bcbc9a1eb4c0
-size 177332
+oid sha256:34e49e4f5a92daea6c764f4238e0bd0153e59d35d3cb75a992da0e6f1796d9ee
+size 187894