[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fc6dde1b2688c5c47a192f4b00bb34b753042d6e - IPFire-SCM

27 Feb 2023

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  fc6dde1b2688c5c47a192f4b00bb34b753042d6e (commit)
       via  bec6c06b4292574a0626c0ab9c6970ce4334c0a3 (commit)
       via  faba01b7ec73569ca41cb9ce4e43eeae0d55e1ea (commit)
       via  c07dc4897dc9b9de519a7582ac2f87482fa68e5a (commit)
       via  64e12cd80f313fee585486ca4eb0a920f2617c91 (commit)
       via  39a49de8176360df8fc3ff60a7b8a38189d93047 (commit)
       via  04548a24a71ed479916d08da80142ad84bbdb52e (commit)
       via  860ec8126e3435a16558bb38ea3cb939de61a17c (commit)
       via  3e54c61523254617e41608f2ff903f30d606fbf5 (commit)
       via  6498abdfa9dbea9cdee373c41f5ea01283450499 (commit)
       via  8e3ecbd961eda5cdbe4cd5626bf68dda4bbf7ffe (commit)
       via  2d0e2d4408a62c229730263cce04f8ea5336d06d (commit)
       via  09a15e603ae6d1afb91fcb11e2b0edcfe430b667 (commit)
       via  e46113aa90d77df1bd44d853cedb4ee2b7634791 (commit)
       via  e8ddf6762b8deee17f23f5b718f7bbf42147c74e (commit)
       via  fcd6608da254acea34c611e849b25f4e36a84710 (commit)
       via  03be1032f1cb4b6b1ce4dfc04dab9472b6aa1f5f (commit)
       via  8ec58cde07d6dadf05a450e184de39ce1c4662f4 (commit)
       via  79c21bd79921dadc81272d09e4db61c0bee40f3f (commit)
       via  cbf71b690198c429ccb7ef4807c8e1e8fb935a2d (commit)
       via  6d3995d101496b2ed934937405808311a7c035e5 (commit)
       via  28a15510abbe91ea0a6987c2dfd65e5ed259b8d5 (commit)
       via  c1de5a4b0d736cb1e7e9002ee93e7ac0fae95b65 (commit)
       via  5ddd2088820bc389471c65e82410b3fed123976e (commit)
      from  0c0e24b351c5cefaae7296629e3445743a9206c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fc6dde1b2688c5c47a192f4b00bb34b753042d6e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Feb 27 13:22:48 2023 +0000
perl-IO-Socket-SSL: Disable network tests
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bec6c06b4292574a0626c0ab9c6970ce4334c0a3
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:22:41 2023 +0100
perl: Move DynaLoader subpackage back into main
Fixes a lot of dependency issues with a certain
    perl modules.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit faba01b7ec73569ca41cb9ce4e43eeae0d55e1ea
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:19:04 2023 +0100
perl-Net-SSLeay: Update to 1.85
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c07dc4897dc9b9de519a7582ac2f87482fa68e5a
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:19:03 2023 +0100
perl-Net-SMTP-SSL: Requires perl(Net::SMTP) to build
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 64e12cd80f313fee585486ca4eb0a920f2617c91
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:19:02 2023 +0100
perl-IO-Socket-SSL: Disable non working testsuite.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 39a49de8176360df8fc3ff60a7b8a38189d93047
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:19:01 2023 +0100
perl-Authen-SASL: Update build requirements.
* Disable non working testsuite.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 04548a24a71ed479916d08da80142ad84bbdb52e
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:19:00 2023 +0100
perl-YAML-Tiny: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 860ec8126e3435a16558bb38ea3cb939de61a17c
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:18:59 2023 +0100
perl-File-Remove: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3e54c61523254617e41608f2ff903f30d606fbf5
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:18:58 2023 +0100
perl-Module-Install: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6498abdfa9dbea9cdee373c41f5ea01283450499
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 20:05:41 2023 +0100
git: Shrink package
* Drop daemon, gitweb, SVN, CVS and p4 sub-packages.
    * Drop git daemon related systemd files.
    * Drop gitweb related config files.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8e3ecbd961eda5cdbe4cd5626bf68dda4bbf7ffe
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Feb 27 12:46:37 2023 +0000
popt: Fix build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2d0e2d4408a62c229730263cce04f8ea5336d06d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 14:28:38 2023 +0100
docbook-xsl: Add patch to fix problematic recursed strings.
This fixes the following error messages:
    xsltApplySequenceConstructor: A potential infinite template recursion was detected.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 09a15e603ae6d1afb91fcb11e2b0edcfe430b667
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:21:41 2023 +0100
popt: Update to 1.19
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e46113aa90d77df1bd44d853cedb4ee2b7634791
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:20:57 2023 +0100
tree: Install files into correct location
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e8ddf6762b8deee17f23f5b718f7bbf42147c74e
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:19:58 2023 +0100
asciidoc: Update to 10.20.0
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fcd6608da254acea34c611e849b25f4e36a84710
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:19:05 2023 +0100
linux-atm: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 03be1032f1cb4b6b1ce4dfc04dab9472b6aa1f5f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:19:04 2023 +0100
ppp: Do not longer depend on linux-atm
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8ec58cde07d6dadf05a450e184de39ce1c4662f4
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:19:03 2023 +0100
ppp: Fix build dependencies.
* Requires libxcrypt for crypt.h file.
    * systemd-units does not longer exist.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 79c21bd79921dadc81272d09e4db61c0bee40f3f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 13:19:02 2023 +0100
iproute2: Do not depend on linux-atm.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cbf71b690198c429ccb7ef4807c8e1e8fb935a2d
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Feb 26 10:05:22 2023 +0100
autoconf: Add build and runtime dependencies.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6d3995d101496b2ed934937405808311a7c035e5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 25 12:52:08 2023 +0000
libxml2: Disable building against Python 2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 28a15510abbe91ea0a6987c2dfd65e5ed259b8d5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 25 12:43:44 2023 +0000
lzo: Update to 2.10
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c1de5a4b0d736cb1e7e9002ee93e7ac0fae95b65
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Feb 25 09:54:59 2023 +0100
man-db: Update to 2.11.2
* Create man user/group for the man cache manager
    * Drop systemd files in favour of the project ones
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5ddd2088820bc389471c65e82410b3fed123976e
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sat Feb 25 09:44:50 2023 +0100
setup: Sync with upstream
This patch brings various imporatant
    system files like the uid / gid files,
    the files for known ports, protocols, services
    etc up to date.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 asciidoc/asciidoc.nm                               |  26 +-
 autoconf/autoconf.nm                               |  11 +-
 docbook-xsl/docbook-xsl.nm                         |   2 +-
 .../765567_non-recursive_string_subst.patch2       |  32 +
 git/git.conf.httpd                                 |   7 -
 git/git.nm                                         | 161 +----
 git/gitweb.conf                                    |  53 --
 git/systemd/git.socket                             |   9 -
 git/systemd/git@.service                           |   8 -
 iproute2/iproute2.nm                               |   3 +-
 libxml2/libxml2.nm                                 |   5 +-
 linux-atm/linux-atm.nm                             |  55 --
 linux-atm/patches/linux-arm-gcc43.patch            |  11 -
 .../patches/linux-atm-2.5.0-disable-ilmidiag.patch |  11 -
 linux-atm/patches/linux-atm-2.5.0-open-macro.patch |  11 -
 linux-atm/patches/man-pages.patch                  |  45 --
 lzo/lzo.nm                                         |  16 +-
 man-db/man-db.nm                                   |  23 +-
 ...-man-and-root-in-init-systemd-man-db.conf.patch |  19 -
 man-db/systemd/man-db.service                      |  10 -
 man-db/systemd/man-db.timer                        |  10 -
 perl-Authen-SASL/perl-Authen-SASL.nm               |  10 +-
 .../perl-File-Remove.nm                            |  28 +-
 perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm           |  11 +-
 .../perl-Module-Install.nm                         |  33 +-
 perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm             |   3 +-
 perl-Net-SSLeay/perl-Net-SSLeay.nm                 |  12 +-
 .../perl-YAML-Tiny.nm                              |  22 +-
 perl/perl.nm                                       |  27 +-
 popt/popt.nm                                       |  17 +-
 ppp/ppp.nm                                         |   6 +-
 setup/aliases                                      |   3 +-
 setup/bashrc                                       |  93 ++-
 setup/ethertypes                                   |  39 ++
 setup/filesystems                                  |   2 +
 setup/group                                        |  27 +-
 setup/passwd                                       |  22 +-
 setup/profile                                      |  40 +-
 setup/protocols                                    |  11 +-
 setup/services                                     | 756 +++++++++++++++++----
 setup/setup.nm                                     |  32 +-
 setup/shells                                       |   3 +-
 setup/uidgid                                       | 198 +++---
 tree/tree.nm                                       |   8 +-
 44 files changed, 1131 insertions(+), 800 deletions(-)
 create mode 100644 docbook-xsl/patches/765567_non-recursive_string_subst.patch2
 delete mode 100644 git/git.conf.httpd
 delete mode 100644 git/gitweb.conf
 delete mode 100644 git/systemd/git.socket
 delete mode 100644 git/systemd/git@.service
 delete mode 100644 linux-atm/linux-atm.nm
 delete mode 100644 linux-atm/patches/linux-arm-gcc43.patch
 delete mode 100644 linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
 delete mode 100644 linux-atm/patches/linux-atm-2.5.0-open-macro.patch
 delete mode 100644 linux-atm/patches/man-pages.patch
 delete mode 100644 man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch
 delete mode 100644 man-db/systemd/man-db.service
 delete mode 100644 man-db/systemd/man-db.timer
 copy perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm => perl-File-Remove/perl-File-Remove.nm (50%)
 copy perl-Parse-Yapp/perl-Parse-Yapp.nm => perl-Module-Install/perl-Module-Install.nm (50%)
 copy perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm => perl-YAML-Tiny/perl-YAML-Tiny.nm (56%)
 create mode 100644 setup/ethertypes
Difference in files:

diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm
index a8220579d..e2691b956 100644
--- a/asciidoc/asciidoc.nm
+++ b/asciidoc/asciidoc.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = asciidoc
-version    = 8.6.9
-release    = 2
+version    = 10.2.0
+release    = 1
 thisapp    = %{name}-py-%{version}
 arch       = noarch
@@ -25,22 +25,32 @@ source_dl  = https://github.com/%%7Bname%7D-py/asciidoc-py/archive/%%7Bversion%7D/
 build
    requires
    	autoconf
-		automake
    	docbook-dsssl
    	docbook-xsl
    	libxslt
    	python3-devel
+		python3-setuptools
    end
prepare_cmds
-		autoreconf -vfi
+		autoconf
+	end
+
+	build_cmds
+		# Build asciidoc
+		%{python3} setup.py build
    end
-	make_install_targets += docs
+	install
+		# Install asciidoc
+		%{python3} setup.py install \
+			--root=%{BUILDROOT}
+
+		# Create directory layout for manpages
+		mkdir -pv %{BUILDROOT}%{mandir}/man1
-	install_cmds
-		# Broken symlink to an example that is not being installed
-		rm -vf %{BUILDROOT}%{datadir}/doc/asciidoc/examples/website/asciidoc-graphviz-sample.txt
+		# Install manpages
+		install -Dm0644 -t "%{BUILDROOT}%{mandir}/man1/" doc/*.1
    end
 end
diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm
index 3acdc127e..3f6bec327 100644
--- a/autoconf/autoconf.nm
+++ b/autoconf/autoconf.nm
@@ -5,7 +5,7 @@
name       = autoconf
 version    = 2.71
-release    = 1
+release    = 2
 arch       = noarch
groups     = Development/Tools
@@ -27,13 +27,20 @@ build
    requires
    	m4
    	perl
+		perl(File::Compare)
+		perl(File::Copy)
    	perl(Data::Dumper)
    end
 end
packages
    package %{name}
-		requires = m4
+		requires
+			m4
+
+			# Does not get autodetected correctly
+			perl(File::Compare)
+		end
filter_requires
    		perl>=[0-9]:.*
diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm
index f3a7a11b2..c1c5caf3c 100644
--- a/docbook-xsl/docbook-xsl.nm
+++ b/docbook-xsl/docbook-xsl.nm
@@ -5,7 +5,7 @@
name       = docbook-xsl
 version    = 1.79.2
-release    = 1
+release    = 2
 arch       = noarch
groups     = Applications/Text
diff --git a/docbook-xsl/patches/765567_non-recursive_string_subst.patch2 b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2
new file mode 100644
index 000000000..ae845ad00
--- /dev/null
+++ b/docbook-xsl/patches/765567_non-recursive_string_subst.patch2
@@ -0,0 +1,32 @@
+Description: use EXSLT "replace" function when available
+ A recursive implementation  of string.subst is problematic,
+ long strings with many matches will cause stack overflows.
+Author: Peter De Wachter pdewacht@gmail.com
+Bug-Debian: https://bugs.debian.org/750593
+
+--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
++++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
+@@ -6,7 +6,11 @@
+ 
+      This module implements DTD-independent functions
+ 
+-     ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++     ******************************************************************** -->
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:str="http://exslt.org/strings"
++                exclude-result-prefixes="str"
++                version="1.0">
+ 
+ <xsl:template name="dot.count">
+   <!-- Returns the number of "." characters in a string -->
+@@ -52,6 +56,9 @@
+   <xsl:param name="replacement"/>
+ 
+   xsl:choose
++    <xsl:when test="function-available('str:replace')">
++      <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++    </xsl:when>
+     <xsl:when test="contains($string, $target)">
+       <xsl:variable name="rest">
+         <xsl:call-template name="string.subst">
+
diff --git a/git/git.conf.httpd b/git/git.conf.httpd
deleted file mode 100644
index 4f4eac7c7..000000000
--- a/git/git.conf.httpd
+++ /dev/null
@@ -1,7 +0,0 @@
-Alias /git /var/www/git
-
-<Directory /var/www/git>
-  Options +ExecCGI
-  AddHandler cgi-script .cgi
-  DirectoryIndex gitweb.cgi
-</Directory>
diff --git a/git/git.nm b/git/git.nm
index c9919af74..b3b5f789b 100644
--- a/git/git.nm
+++ b/git/git.nm
@@ -5,7 +5,7 @@
name       = git
 version    = 2.38.1
-release    = 2
+release    = 3
groups     = Development/Tools
 url        = http://git-scm.com/
@@ -46,14 +46,13 @@ build
    	ETC_GITCONFIG = %{sysconfdir}/gitconfig
    	DESTDIR = %{BUILDROOT}
    	INSTALL = install -p
-		GITWEB_PROJECTROOT = %{localstatedir}/git
    	GNU_ROFF = 1
    	NO_CROSS_DIRECTORY_HARDLINKS = 1
    	PYTHON_PATH = %{python3}
    	prefix = %{prefix}
    	gitexecdir = lib/git-core
    	htmldir = %{datadir}/doc
-		gitwebdir = %{localstatedir}/www/git
+		NO_GITWEB=1
    	EOF
# Remove shebang from bash-completion script.
@@ -75,132 +74,42 @@ build
    	install -v -m 644 contrib/completion/git-completion.bash \
    		%{BUILDROOT}%{sysconfdir}/bash_completion.d/git
-		# Create folder for git-daemon.
-		mkdir -pv %{BUILDROOT}%{sharedstatedir}/git
-
-		# Create folder for gitweb.
-		mkdir -pv %{BUILDROOT}%{sysconfdir}/httpd/conf.d
-
-		# Install config files for gitweb.
-		install -pm 0664 %{DIR_SOURCE}/gitweb.conf \
-			%{BUILDROOT}%{sysconfdir}/gitweb.conf
-
-		install -pm 0644 %{DIR_SOURCE}/git.conf.httpd \
-			%{BUILDROOT}%{sysconfdir}/httpd/conf.d/git.conf
+		# Remove git-daemon related files
+		rm -rvf %{BUILDROOT}/usr/lib/git-core/git-daemon
+		rm -rvf %{BUILDROOT}%{mandir}/man1/git-daemon*
+
+		# Remove SVN related files
+		rm -rvf %{BUILDROOT}/usr/lib/git-core/git-svn
+		rm -rvf %{BUILDROOT}%{mandir}/man1/git-svn*
+		rm -rvf %{BUILDROOT}%{perl_vendorlib}/Git/SVN*.pm
+		rm -rvf %{BUILDROOT}%{perl_vendorlib}/Git/SVN/
+		rm -rvf %{BUILDROOT}%{datadir}/perl5/Git/SVN/
+		rm -rvf %{BUILDROOT}%{datadir}/perl5/Git/SVN*.pm
+
+		# Remove CVS related files
+		rm -rvf %{BUILDROOT}%{bindir}/git-cvsserver
+		rm -rvf %{BUILDROOT}/usr/lib/git-core/*cvs*
+		rm -rvf %{BUILDROOT}%{mandir}/man1/*cvs*
+		rm -rvf %{BUILDROOT}%{mandir}/man7/*cvs*
+
+		# Remove Perforce depots related files.
+		rm -rvf %{BUILDROOT}/usr/lib/git-core/*p4*
+		rm -rvf %{BUILDROOT}/usr/lib/git-core/mergetools/p4*
+		rm -rvf %{BUILDROOT}%{mandir}/man1/*p4*
    end
 end
packages
-	# Define %{gitcoredir} to have a more handy name.
-	gitcoredir = %{prefix}/lib/git-core
-
    package %{name}
    	requires
    		less
    		openssh-clients
-			rsync
    		/usr/bin/vi
    	end
recommends
    		%{name}-email
-		end
-	end
-
-	package %{name}-daemon
-		summary = Git protocol daemon.
-		description
-			The git daemon for supporting git:// access to git repositories.
-		end
-
-		requires
-			git=%{thisver}
-		end
-
-		files
-			%{gitcoredir}/git-daemon
-			%{mandir}/man1/git-daemon*
-			%{sharedstatedir}/git
-			%{unitdir}/git@.service
-			%{unitdir}/git.socket
-		end
-
-		script postin
-			systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script preun
-			systemctl --no-reload disable git.socket >/dev/null 2>&1 || :
-			systemctl stop git.socket >/dev/null 2>&1 || :
-			systemctl stop git@.service >/dev/null 2>&1 || :
-		end
-
-		script postun
-			systemctl daemon-reload >/dev/null 2>&1 || :
-		end
-
-		script postup
-			systemctl daemon-reload >/dev/null 2>&1 || :
-			systemctl try-restart git.socket >/dev/null 2>&1 || :
-		end
-	end
-
-	package %{name}-gitweb
-		arch = noarch
-
-		summary = Simple web interface to git repositories.
-		description
-			Simple web interface to track changes in git repositories
-		end
-
-		requires
-			git=%{thisver}
-		end
-
-		configfiles
-			%{sysconfdir}/gitweb.conf
-			%{sysconfdir}/httpd/conf.d/git.conf
-		end
-
-		files
-			%{sysconfdir}/gitweb.conf
-			%{sysconfdir}/httpd/conf.d/git.conf
-			%{mandir}/man1/gitweb*
-			%{mandir}/man5/gitweb*
-			%{localstatedir}/www/git
-		end
-	end
-
-	package %{name}-cvs
-		summary = Git tools for importing CVS repositories.
-		description = %{summary}
-
-		requires
-			git=%{thisver}
-		end
-
-		files
-			%{bindir}/git-cvsserver
-			%{gitcoredir}/*cvs*
-			%{mandir}/man1/*cvs*
-			%{mandir}/man7/*cvs*
-		end
-	end
-
-	package %{name}-p4
-		arch = noarch
-
-		summary = Git tools for working with Perforce depots.
-		description = %{summary}
-
-		requires
-			git=%{thisver}
-		end
-
-		files
-			%{gitcoredir}/*p4*
-			%{gitcoredir}mergetools/p4merge
-			%{mandir}/man1/*p4*
+			rsync
    	end
    end
@@ -216,7 +125,7 @@ packages
    	end
files
-			%{gitcoredir}/git-send-email
+			/usr/lib/git-core/git-send-email
    		%{mandir}/man1/git-send-email*
    	end
    end
@@ -236,23 +145,7 @@ packages
    		%{perl_archlib}
    		%{perl_vendorlib}/*.pm
    		%{perl_vendorlib}/Git/*.pm
-		end
-	end
-
-	package perl-Git-SVN
-		arch = noarch
-
-		summary = Perl interface to Git::SVN.
-		description = %{summary}
-
-		requires
-			git=%{thisver}
-		end
-
-		files
-			%{mandir}/man3/Git::SVN*
-			%{perl_vendorlib}/Git/SVN*.pm
-			%{perl_vendorlib}/Git/SVN/
+			%{datadir}/perl5/
    	end
    end
diff --git a/git/gitweb.conf b/git/gitweb.conf
deleted file mode 100644
index fe6ede43b..000000000
--- a/git/gitweb.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# The gitweb config file is a fragment of perl code. You can set variables
-# using "our $variable = value"; text from "#" character until the end of a
-# line is ignored. See perlsyn(1) man page for details.
-#
-# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for
-# more details and available configuration variables.
-
-# Set the path to git projects.  This is an absolute filesystem path which will
-# be prepended to the project path.
-#our $projectroot = "/var/lib/git";
-
-# Set the list of git base URLs used for URL to where fetch project from, i.e.
-# the full URL is "$git_base_url/$project". By default this is empty
-#our @git_base_url_list = qw(git://git.example.com
-#                            ssh://git.example.com@PROJECTROOT@);
-
-# Enable the 'blame' blob view, showing the last commit that modified
-# each line in the file. This can be very CPU-intensive. Disabled by default
-#$feature{'blame'}{'default'} = [1];
-#
-# Allow projects to override the default setting via git config file.
-# Example: gitweb.blame = 0|1;
-#$feature{'blame'}{'override'} = 1;
-
-# Disable the 'snapshot' link, providing a compressed archive of any tree. This
-# can potentially generate high traffic if you have large project. Enabled for
-# .tar.gz snapshots by default.
-#
-# Value is a list of formats defined in %known_snapshot_formats that you wish
-# to offer.
-#$feature{'snapshot'}{'default'} = [];
-#
-# Allow projects to override the default setting via git config file.
-# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable)
-#$feature{'snapshot'}{'override'} = 1;
-
-# Disable grep search, which will list the files in currently selected tree
-# containing the given string. This can be potentially CPU-intensive, of
-# course. Enabled by default.
-#$feature{'grep'}{'default'} = [0];
-#
-# Allow projects to override the default setting via git config file.
-# Example: gitweb.grep = 0|1;
-#$feature{'grep'}{'override'} = 1;
-
-# Disable the pickaxe search, which will list the commits that modified a given
-# string in a file. This can be practical and quite faster alternative to
-# 'blame', but still potentially CPU-intensive. Enabled by default.
-#$feature{'pickaxe'}{'default'} = [0];
-#
-# Allow projects to override the default setting via git config file.
-# Example: gitweb.pickaxe = 0|1;
-#$feature{'pickaxe'}{'override'} = 1;
diff --git a/git/systemd/git.socket b/git/systemd/git.socket
deleted file mode 100644
index 3dec01d21..000000000
--- a/git/systemd/git.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Git Activation Socket
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
diff --git a/git/systemd/git@.service b/git/systemd/git@.service
deleted file mode 100644
index 185ff2569..000000000
--- a/git/systemd/git@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Git Repositories Server Daemon
-Documentation=man:git-daemon(1)
-
-[Service]
-User=nobody
-ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose
-StandardInput=socket
diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index 12764f296..965d1cf3f 100644
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -5,7 +5,7 @@
name       = iproute2
 version    = 6.0.0
-release    = 2
+release    = 3
groups     = Networking/Tools
 url        = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
@@ -30,7 +30,6 @@ build
    	libmnl-devel
    	libnl-devel
    	libtirpc-devel
-		linux-atm-devel >= 2.5.1
    end
export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index b4bc822f7..24d27aa13 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -6,7 +6,7 @@
 name       = libxml2
 version    = %{ver_maj}.3
 ver_maj    = 2.10
-release    = 1
+release    = 2
groups     = System/Libraries
 url        = https://xmlsoft.org/
@@ -33,6 +33,9 @@ build
    	pkg-config
    	zlib-devel
    end
+
+	configure_options += \
+		--without-python
 end
packages
diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm
deleted file mode 100644
index 4b3ac47ba..000000000
--- a/linux-atm/linux-atm.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team info@ipfire.org                   #
-###############################################################################
-
-name       = linux-atm
-version    = 2.5.1
-release    = 2
-
-groups     = System/Daemons
-url        = http://linux-atm.sourceforge.net/
-license    = BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT
-summary    = Tools to support ATM networking under Linux.
-
-description
-	This package contains header files and libraries for development \
-	using theLinux ATM API.
-end
-
-sources    = %{thisapp}.tgz
-source_dl  = http://downloads.sf.net/%%7Bname%7D/
-
-build
-	requires
-		bison
-		flex
-		flex-devel
-		kernel-headers
-		perl
-	end
-
-	prepare_cmds
-		sed -e "s/-lfl/&_pic/g" -i src/*{,/*}/Makefile.in
-	end
-
-	PARALLELISMFLAGS =
-end
-
-packages
-	package %{name}
-
-	package %{name}-libs
-		template LIBS
-	end
-
-	package %{name}-devel
-		template DEVEL
-
-		requires += %{name}-libs = %{thisver}
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/linux-atm/patches/linux-arm-gcc43.patch b/linux-atm/patches/linux-arm-gcc43.patch
deleted file mode 100644
index 9d9c5cd0e..000000000
--- a/linux-atm/patches/linux-arm-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rNu linux-atm-2.5.0/src/led/main.c linux-atm-2.5.0-atomix/src/led/main.c
---- linux-atm-2.5.0/src/led/main.c	2005-10-06 19:27:50.000000000 +0200
-+++ linux-atm-2.5.0-atomix/src/led/main.c	2008-04-18 12:14:21.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <sys/time.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <limits.h>
- #include <ctype.h>
- #include <string.h>
- #include <getopt.h>
diff --git a/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch b/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
deleted file mode 100644
index c420be9c5..000000000
--- a/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm/src/ilmid/Makefile.am~	2007-07-11 17:07:57.000000000 +0100
-+++ linux-atm/src/ilmid/Makefile.am	2007-08-23 09:22:45.000000000 +0100
-@@ -2,7 +2,7 @@ SUBDIRS = asn1
- 
- INCLUDES = -I$(srcdir)/../ilmid/asn1
- 
--sbin_PROGRAMS = ilmid ilmidiag
-+sbin_PROGRAMS = ilmid
- 
- ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \
- 			util.c util.h io.c io.h message.c message.h \
diff --git a/linux-atm/patches/linux-atm-2.5.0-open-macro.patch b/linux-atm/patches/linux-atm-2.5.0-open-macro.patch
deleted file mode 100644
index 928222fa2..000000000
--- a/linux-atm/patches/linux-atm-2.5.0-open-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-atm/src/maint/atmtcp.c~	2007-08-22 14:59:21.000000000 +0100
-+++ linux-atm/src/maint/atmtcp.c	2007-08-22 18:27:24.000000000 +0100
-@@ -109,7 +109,7 @@ static void control(int in_link,struct a
- 	switch (msg->type) {
- 	    case ATMTCP_CTRL_OPEN:
- 		if (out->ops->open)
--		    changed += out->ops->open(out,in_link,msg);
-+		    changed += (out->ops->open)(out,in_link,msg);
- 		break;
- 	    case ATMTCP_CTRL_CLOSE:
- 		if (out->ops->close)
diff --git a/linux-atm/patches/man-pages.patch b/linux-atm/patches/man-pages.patch
deleted file mode 100644
index c504cfe87..000000000
--- a/linux-atm/patches/man-pages.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8
---- linux-atm-2.5.1/src/led/zeppelin.8.fixman	2003-05-02 19:35:04.000000000 +0200
-+++ linux-atm-2.5.1/src/led/zeppelin.8	2010-10-13 12:58:18.000000000 +0200
-@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
- recommended. Token Ring support has received less testing than its
- Ethernet counterpart.
- .SH FILES
--.IP \fI/var/run/lec[interface number].pid\fP
-+\fI/var/run/lec[interface number].pid\fP
- The file containing the process id of zeppelin.
- .SH BUGS
- John Bonham died 1980 and Led Zeppelin broke.
-diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8
---- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman	2001-10-10 00:33:07.000000000 +0200
-+++ linux-atm-2.5.1/src/mpoad/mpcd.8	2010-10-13 12:59:14.000000000 +0200
-@@ -28,7 +28,7 @@ mpcd - ATM MPOA (Multi-Protocol Over A
- .B ]]
- .SH DESCRIPTION
- MPOA client
--.SM(MPC) is responsible for creating and receiving
-+.SM (MPC) is responsible for creating and receiving
- internetwork layer shortcuts. Using these shortcuts MPCs forward
- unicast internetwork layer packets effectively over ATM without need
- for routing protocols.
-@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
- shortcuts is done with the help of
- .SM MPOA
- server
--.SM(MPS).
-+.SM (MPS).
- .PP
- Just as the Linux
- .SM LAN
-diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4
---- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman	2001-10-10 00:33:07.000000000 +0200
-+++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4	2010-10-13 12:58:49.000000000 +0200
-@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
- .P
- If an option is specified in \fBatmsigd.conf\fP and on the command
- line, the command line has priority.
--.COMPATIBILITY
-+.SH COMPATIBILITY
- Certain options used by past versions of \fBatmsigd\fP but no longer documented
- on the man page are still recognized and supported, but they also yield a
- warning message. Future versions of \fBatmsigd\fP will not recognize those
diff --git a/lzo/lzo.nm b/lzo/lzo.nm
index 7bd25afac..d0230bdbf 100644
--- a/lzo/lzo.nm
+++ b/lzo/lzo.nm
@@ -4,23 +4,23 @@
 ###############################################################################
name       = lzo
-version    = 2.09
+version    = 2.10
 release    = 1
groups     = Applications/Compression
-url        = http://www.oberhumer.com/opensource/lzo/
+url        = https://www.oberhumer.com/opensource/lzo/
 license    = GPLv2+
-summary    = Data compression library with very fast (de)compression.
+summary    = Data compression library with very fast (de)compression
description
-	LZO is a portable lossless data compression library written in ANSI C. \
-	It offers pretty fast compression and very fast decompression. \
-	Decompression requires no memory. In addition there are slower \
-	compression levels achieving a quite competitive compression ratio \
+	LZO is a portable lossless data compression library written in ANSI C.
+	It offers pretty fast compression and very fast decompression.
+	Decompression requires no memory. In addition there are slower
+	compression levels achieving a quite competitive compression ratio
    while still decompressing at this very high speed.
 end
-source_dl  = http://www.oberhumer.com/opensource/lzo/download/
+source_dl  = https://www.oberhumer.com/opensource/lzo/download/
build
    requires
diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index 590349e9a..5d3240537 100644
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = man-db
-version    = 2.7.1
-release    = 3
+version    = 2.11.2
+release    = 1
groups     = Documentation
 url        = http://savannah.nongnu.org/projects/man-db
@@ -27,11 +27,15 @@ build
    	gdbm-devel
    	groff
    	less
-		libpipeline-devel >= 1.4.0
+		libpipeline-devel >= 1.5.0
    	systemd-devel
    	zlib-devel
    end
+	prepare_cmds
+		%{create_user}
+	end
+
    configure_options += \
    	--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
    	--disable-setuid \
@@ -48,9 +52,18 @@ build
# Create cache directory.
    	mkdir -pv %{BUILDROOT}/var/cache/man
+
+		# Own the cache directory to the man user/group.
+		chown man:man %{BUILDROOT}/var/cache/man
    end
 end
+create_user
+	getent group man >/dev/null || groupadd -r -g 15 man
+	getent passwd man >/dev/null || useradd -r -g 15 \
+		-c "Manpage cache user" -d /var/cache/man -s /sbin/nologin man
+end
+
 packages
    package %{name}
    	groups += Base
@@ -70,6 +83,10 @@ packages
    		man
    	end
+		script prein
+			%{create_user}
+		end
+
    	script posttransin
    		# Update the database right now.
    		rm -rf /var/cache/man/*
diff --git a/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch b/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch
deleted file mode 100644
index b91e6d01a..000000000
--- a/man-db/patches/1151558-switch-man-and-root-in-init-systemd-man-db.conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 1d523a44a5ad360c83bff362a625cc68cbe7f296 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka jchaloup@redhat.com
-Date: Wed, 15 Oct 2014 09:46:56 +0200
-Subject: [PATCH] switch man and root in init/systemd/man-db.conf
-
----
- init/systemd/man-db.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init/systemd/man-db.conf b/init/systemd/man-db.conf
-index 10b27b4..43dd2ad 100644
---- a/init/systemd/man-db.conf
-+++ b/init/systemd/man-db.conf
-@@ -1 +1 @@
--d /var/cache/man 2755 man root 1w
-+d /var/cache/man 2755 root man 1w
--- 
-1.9.3
-
diff --git a/man-db/systemd/man-db.service b/man-db/systemd/man-db.service
deleted file mode 100644
index 4adc29792..000000000
--- a/man-db/systemd/man-db.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Update man-db cache
-RequiresMountsFor=/var/cache/man
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/mandb --quiet
-Nice=19
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
diff --git a/man-db/systemd/man-db.timer b/man-db/systemd/man-db.timer
deleted file mode 100644
index ce43df175..000000000
--- a/man-db/systemd/man-db.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Daily man-db cache update
-
-[Timer]
-OnCalendar=daily
-AccuracySec=12h
-Persistent=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/perl-Authen-SASL/perl-Authen-SASL.nm b/perl-Authen-SASL/perl-Authen-SASL.nm
index b14f1741e..9415808a1 100644
--- a/perl-Authen-SASL/perl-Authen-SASL.nm
+++ b/perl-Authen-SASL/perl-Authen-SASL.nm
@@ -5,7 +5,7 @@
name       = perl-Authen-SASL
 version    = 2.16
-release    = 1
+release    = 2
 arch       = noarch
 thisapp    = Authen-SASL-%{version}
@@ -24,17 +24,25 @@ source_dl  = http://www.cpan.org/authors/id/G/GB/GBARR/
build
    requires
+		perl(FindBin)
    	perl(Digest::HMAC)
    	perl(Digest::MD5)
    	perl(ExtUtils::MakeMaker)
    	perl(File::Path)
    	perl(GSSAPI)
+		perl(Module::Install)
    end
build
    	perl Makefile.PL INSTALLDIRS=vendor
    	make %{PARALLELISMFLAGS}
    end
+
+	# Testsuite is unable to load its own module
+	# and therefore broken.
+	#test
+	#	make test
+	#end
 end
packages
diff --git a/perl-File-Remove/perl-File-Remove.nm b/perl-File-Remove/perl-File-Remove.nm
new file mode 100644
index 000000000..f3717c2cc
--- /dev/null
+++ b/perl-File-Remove/perl-File-Remove.nm
@@ -0,0 +1,47 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = perl-File-Remove
+version    = 1.61
+release    = 1
+arch       = noarch
+thisapp    = File-Remove-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/File-Remove/
+license    = GPL+
+summary    = A perl module to Remove files and directories.
+
+description
+	File::Remove::remove removes files and directories. It acts like /bin/rm,
+	for the most part. Although unlink can be given a list of files, it will
+	not remove directories; this module remedies that.
+
+	It also accepts wildcards, * and ?, as arguments for filenames.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/
+
+build
+	requires
+		perl(blib)
+		perl(IPC::Open3)
+		perl(ExtUtils::MakeMaker)
+		perl(Test::More)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
+	end
+end
+
+packages
+	package %{name}
+end
diff --git a/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
index dd8585d65..e5f438697 100644
--- a/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
+++ b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
@@ -5,7 +5,7 @@
name       = perl-IO-Socket-SSL
 version    = 2.016
-release    = 1
+release    = 2.1
 arch       = noarch
 thisapp    = IO-Socket-SSL-%{version}
@@ -31,13 +31,14 @@ build
    end
build
-		perl Makefile.PL INSTALLDIRS=vendor
+		NO_NETWORK_TESTING=1 perl Makefile.PL INSTALLDIRS=vendor
    	make %{PARALLELISMFLAGS}
    end
-	test
-		make test
-	end
+	# Disable testsuite, requires the external perl(MOZILLA::CA) module.
+	#test
+	#	make test
+	#end
 end
packages
diff --git a/perl-Module-Install/perl-Module-Install.nm b/perl-Module-Install/perl-Module-Install.nm
new file mode 100644
index 000000000..f3313e5fc
--- /dev/null
+++ b/perl-Module-Install/perl-Module-Install.nm
@@ -0,0 +1,57 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = perl-Module-Install
+version    = 1.19
+release    = 1
+arch       = noarch
+
+groups     = Development/Libratries
+url        = http://search.cpan.org/dist/Module-Install/
+license    = GPL+ or Artistic
+summary    = Standalone, extensible Perl module installer.
+
+description
+	Module::Install is a package for writing installers for CPAN (or CPAN-like)
+	distributions that are clean, simple, minimalist, act in a strictly correct
+	manner with ExtUtils::MakeMaker, and will run on any Perl installation
+	version 5.005 or newer.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
+
+thisapp    = Module-Install-%{version}
+
+build
+	requires
+		perl(autodie)
+		perl(CPAN::Meta::YAML)
+		perl(Devel::PPPort)
+		perl(File::Remove)
+		perl(FindBin)
+		perl(ExtUtils::MakeMaker)
+		perl(Module::CoreList)
+		perl(Parse::CPAN::Meta)
+		perl(Test::More)
+		perl(YAML::Tiny)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}"
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
+	end
+end
+
+packages
+	package %{name}
+		requires
+			perl(:MODULE_COMPAT_%{perl_version})
+		end
+	end
+end
diff --git a/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
index 47b7224f6..9dc8d5809 100644
--- a/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
+++ b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
@@ -5,7 +5,7 @@
name       = perl-Net-SMTP-SSL
 version    = 1.04
-release    = 1
+release    = 2
 arch       = noarch
 thisapp    = Net-SMTP-SSL-%{version}
@@ -24,6 +24,7 @@ build
    requires
    	perl(ExtUtils::MakeMaker)
    	perl(IO::Socket::SSL)
+		perl(Net::SMTP)
    	perl(Test::More) >= 0.47
    end
diff --git a/perl-Net-SSLeay/perl-Net-SSLeay.nm b/perl-Net-SSLeay/perl-Net-SSLeay.nm
index 8485c2d49..3083b1eac 100644
--- a/perl-Net-SSLeay/perl-Net-SSLeay.nm
+++ b/perl-Net-SSLeay/perl-Net-SSLeay.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = perl-Net-SSLeay
-version    = 1.78
+version    = 1.85
 release    = 1
 thisapp    = Net-SSLeay-%{version}
@@ -22,7 +22,10 @@ source_dl  = http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/
 build
    requires
    	openssl-devel
+		perl(AutoLoader)
+		perl(FindBin)
    	perl(ExtUtils::MakeMaker)
+		perl(Module::Install)
    	perl(Test::More) >= 0.47
    	zlib-devel
    end
@@ -33,9 +36,10 @@ build
    	make %{PARALLELISMFLAGS}
    end
-	test
-		make test
-	end
+	# Testsuite starts but freezes after a few tests.
+	#test
+	#	make test
+	#end
 end
packages
diff --git a/perl-YAML-Tiny/perl-YAML-Tiny.nm b/perl-YAML-Tiny/perl-YAML-Tiny.nm
new file mode 100644
index 000000000..cb153b461
--- /dev/null
+++ b/perl-YAML-Tiny/perl-YAML-Tiny.nm
@@ -0,0 +1,46 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = perl-YAML-Tiny
+version    = 1.73
+release    = 1
+arch       = noarch
+thisapp    = YAML-Tiny-%{version}
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/YAML-Tiny/
+license    = GPL+ or Artistic
+summary    = Read/Write YAML files with as little code as possible.
+
+description
+	YAML::Tiny is a perl class for reading and writing YAML-style files,
+	written with as little code as possible, reducing load time and memory
+	overhead.
+end
+
+source_dl  = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
+
+build
+	requires
+		perl(autodie)
+		perl(B)
+		perl(ExtUtils::MakeMaker)
+		perl(JSON::PP)
+		perl(Test::More)
+	end
+
+	build
+		perl Makefile.PL INSTALLDIRS=vendor
+		make %{PARALLELISMFLAGS}
+	end
+
+	test
+		make test
+	end
+end
+
+packages
+	package %{name}
+end
diff --git a/perl/perl.nm b/perl/perl.nm
index 5233b652a..949dc9b31 100644
--- a/perl/perl.nm
+++ b/perl/perl.nm
@@ -10,7 +10,7 @@ ver_plevel = 0
 version    = %{ver_major}.%{ver_minor}.%{ver_plevel}
# Never reset release in this package, just increase.
-release    = 1
+release    = 2
thisver    = %{version}-%{_release}
@@ -152,9 +152,6 @@ packages
    package perl
    	requires
    		perl-libs = %{version}-%{_release}
-
-			# XSLoader requires DynaLoader
-			perl(DynaLoader)
    	end
conflicts
@@ -1036,28 +1033,6 @@ packages
    	end
    end
-	package perl-DynaLoader
-		version = 1.52
-
-		summary = Dynamically load C libraries into Perl code
-		description
-			The DynaLoader module defines a standard generic interface to the dynamic
-			linking mechanisms available on many platforms. Its primary purpose is to
-			implement automatic dynamic loading of Perl modules. For a simpler interface,
-			see XSLoader module.
-		end
-
-		requires
-			perl = %{perl_version}
-			perl(Carp)
-		end
-
-		files
-			%{libdir}/perl5/DynaLoader.pm
-			%{mandir}/man3/DynaLoader.3*
-		end
-	end
-
    package perl-doc
    	version = %{perl_version}
    	arch = noarch
diff --git a/popt/popt.nm b/popt/popt.nm
index 56eb33cee..9043a125c 100644
--- a/popt/popt.nm
+++ b/popt/popt.nm
@@ -4,11 +4,11 @@
 ###############################################################################
name       = popt
-version    = 1.16
-release    = 1
+version    = 1.19
+release    = 1.1
groups     = System/Libraries
-url        = http://www.rpm5.org/
+url        = https://github.com/rpm-software-management/popt
 license    = MIT
 summary    = C library for parsing command line parameters.
@@ -18,17 +18,20 @@ description
    it improves on them by allowing more powerful argument expansion.
 end
-source_dl  = http://rpm5.org/files/popt/
+source_dl  = https://github.com/rpm-software-management/popt/archive/refs/tags/
+sources    = %{thisapp}-release.tar.gz
build
+	DIR_APP = %{DIR_SRC}/popt-popt-%{version}-release
+
    requires
+		autoconf
    	automake
+		gettext-devel
    end
prepare_cmds
-		for i in $(find . -name config.guess -or -name config.sub); do
-			cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
-		done
+		./autogen.sh
    end
 end
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 6ccfcecc9..50af895b6 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
name       = ppp
 version    = 2.4.9
-release    = 1
+release    = 3
groups     = System/Daemons
 url        = https://ppp.samba.org/
@@ -26,10 +26,10 @@ build
    requires
    	libpcap-devel
    	libudev-devel
-		linux-atm-devel
+		libxcrypt-devel
    	openssl-devel
    	pam-devel
-		systemd-units
+		systemd-devel
    end
prepare_cmds
diff --git a/setup/aliases b/setup/aliases
index 1069e99e5..5d7b9e2a6 100644
--- a/setup/aliases
+++ b/setup/aliases
@@ -43,7 +43,7 @@ fax:		root
 quagga:		root
 radvd:		root
 pvm:		root
-amanda:		root
+amandabackup:		root
 privoxy:	root
 ident:		root
 named:		root
@@ -63,6 +63,7 @@ desktop:	root
 rpcuser:	root
 rpc:		root
 nfsnobody:	root
+pcp:		root
ingres:		root
 system:		root
diff --git a/setup/bashrc b/setup/bashrc
index 901f5d57f..a4021d98b 100644
--- a/setup/bashrc
+++ b/setup/bashrc
@@ -8,46 +8,49 @@
 # /etc/profile.d/ to make custom changes to your environment, as this
 # will prevent the need for merging in future updates.
-# are we an interactive shell?
-if [ "$PS1" ]; then
-  if [ -z "$PROMPT_COMMAND" ]; then
-    case $TERM in
-    xterm*)
-      if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
-          PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
-      else
-          PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-      fi
-      ;;
-    screen)
-      if [ -e /etc/sysconfig/bash-prompt-screen ]; then
-          PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
-      else
-          PROMPT_COMMAND='printf "\033]0;%s@%s:%s\033\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-      fi
-      ;;
-    *)
-      [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default
-      ;;
-    esac
+# Prevent doublesourcing
+if [ -z "$BASHRCSOURCED" ]; then
+  BASHRCSOURCED="Y"
+
+  # are we an interactive shell?
+  if [ "$PS1" ]; then
+    if [ -z "$PROMPT_COMMAND" ]; then
+      case $TERM in
+      xterm*)
+        if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
+            PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
+        else
+            PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+        fi
+        ;;
+      screen*)
+        if [ -e /etc/sysconfig/bash-prompt-screen ]; then
+            PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
+        else
+            PROMPT_COMMAND='printf "\033k%s@%s:%s\033\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+        fi
+        ;;
+      *)
+        [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default
+        ;;
+      esac
+    fi
+    # Turn on parallel history
+    shopt -s histappend
+    # Turn on checkwinsize
+    shopt -s checkwinsize
+    [ "$PS1" = "\s-\v\$ " ] && PS1="[\u@\h \W]\$ "
+    # You might want to have e.g. tty in prompt (e.g. more virtual machines)
+    # and console windows
+    # If you want to do so, just add e.g.
+    # if [ "$PS1" ]; then
+    #   PS1="[\u@\h:\l \W]\$ "
+    # fi
+    # to your custom modification shell script in /etc/profile.d/ directory
   fi
-  # Turn on parallel history
-  shopt -s histappend
-  history -a
-  # Turn on checkwinsize
-  shopt -s checkwinsize
-  [ "$PS1" = "\s-\v\$ " ] && PS1="[\u@\h \W]\$ "
-  # You might want to have e.g. tty in prompt (e.g. more virtual machines)
-  # and console windows
-  # If you want to do so, just add e.g.
-  # if [ "$PS1" ]; then
-  #   PS1="[\u@\h:\l \W]\$ "
-  # fi
-  # to your custom modification shell script in /etc/profile.d/ directory
-fi
-if ! shopt -q login_shell ; then # We're not a login shell
-    # Need to redefine pathmunge, it get's undefined at the end of /etc/profile
+  if ! shopt -q login_shell ; then # We're not a login shell
+    # Need to redefine pathmunge, it gets undefined at the end of /etc/profile
     pathmunge () {
         case ":${PATH}:" in
             *:"$1":*)
@@ -61,16 +64,10 @@ if ! shopt -q login_shell ; then # We're not a login shell
         esac
     }
-    # By default, we want umask to get set. This sets it for non-login shell.
-    # Current threshold for system reserved uid/gids is 200
-    # You could check uidgid reservation validity in
-    # /usr/share/doc/setup-*/uidgid file
-    if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
-       umask 002
-    else
-       umask 022
-    fi
+    # Set default umask for non-login shell only if it is set to 0
+    [ `umask` -eq 0 ] && umask 022
+    SHELL=/bin/bash
     # Only display echos from profile.d scripts if we are no login shell
     # and interactive - otherwise just process them to set envvars
     for i in /etc/profile.d/*.sh; do
@@ -85,5 +82,7 @@ if ! shopt -q login_shell ; then # We're not a login shell
unset i
     unset -f pathmunge
+  fi
+
 fi
 # vim:ts=4:sw=4
diff --git a/setup/ethertypes b/setup/ethertypes
new file mode 100644
index 000000000..813177b74
--- /dev/null
+++ b/setup/ethertypes
@@ -0,0 +1,39 @@
+#
+# Ethernet frame types
+#		This file describes some of the various Ethernet
+#		protocol types that are used on Ethernet networks.
+#
+# This list could be found on:
+#         http://www.iana.org/assignments/ethernet-numbers
+#         http://www.iana.org/assignments/ieee-802-numbers
+#
+# <name>    <hexnumber> <alias1>...<alias35> #Comment
+#
+IPv4	 	0800  	ip ip4 		# Internet IP (IPv4)
+X25		0805
+ARP		0806	ether-arp	#
+FR_ARP		0808    		# Frame Relay ARP        [RFC1701]
+BPQ		08FF			# G8BPQ AX.25 Ethernet Packet
+DEC		6000			# DEC Assigned proto
+DNA_DL		6001			# DEC DNA Dump/Load
+DNA_RC		6002			# DEC DNA Remote Console
+DNA_RT		6003			# DEC DNA Routing
+LAT		6004			# DEC LAT
+DIAG		6005			# DEC Diagnostics
+CUST		6006			# DEC Customer use
+SCA		6007			# DEC Systems Comms Arch
+TEB		6558			# Trans Ether Bridging   [RFC1701]
+RAW_FR  	6559			# Raw Frame Relay        [RFC1701]
+RARP		8035			# Reverse ARP            [RFC903]
+AARP		80F3			# Appletalk AARP
+ATALK		809B			# Appletalk
+802_1Q		8100	8021q 1q 802.1q	dot1q # 802.1Q Virtual LAN tagged frame
+IPX		8137			# Novell IPX
+NetBEUI		8191			# NetBEUI
+IPv6		86DD	ip6 		# IP version 6
+PPP		880B			# PPP
+ATMMPOA		884C			# MultiProtocol over ATM
+PPP_DISC	8863			# PPPoE discovery messages
+PPP_SES		8864			# PPPoE session messages
+ATMFATE		8884			# Frame-based ATM Transport over Ethernet
+LOOP		9000	loopback 	# loop proto
diff --git a/setup/filesystems b/setup/filesystems
index e31fe90fb..45bdb1c34 100644
--- a/setup/filesystems
+++ b/setup/filesystems
@@ -1,3 +1,4 @@
+ext4
 ext3
 ext2
 nodev proc
@@ -6,3 +7,4 @@ iso9660
 vfat
 hfs
 hfsplus
+*
diff --git a/setup/group b/setup/group
index 4330b8dd4..13a62767a 100644
--- a/setup/group
+++ b/setup/group
@@ -1,23 +1,24 @@
-root::0:root
-bin::1:root,bin,daemon
-daemon::2:root,bin,daemon
-sys::3:root,bin,adm
-adm::4:root,adm,daemon
+root::0:
+bin::1:
+daemon::2:
+sys::3:
+adm::4:
 tty::5:
-disk::6:root
-lp::7:daemon,lp
+disk::6:
+lp::7:
 mem::8:
 kmem::9:
-wheel::10:root
-mail::12:mail
-uucp::14:uucp
+wheel::10:
+cdrom::11:
+mail::12:
 man::15:
+dialout::18:
+floppy::19:
 games::20:
-gopher::30:
+tape::33:
 video::39:
-dip::40:
 ftp::50:
 lock::54:
 audio::63:
-nobody::99:
 users::100:
+nobody::65534:
diff --git a/setup/passwd b/setup/passwd
index d8b0737c1..b4d19ae46 100644
--- a/setup/passwd
+++ b/setup/passwd
@@ -1,15 +1,13 @@
-root:*:0:0:root:/root:/bin/bash
-bin:*:1:1:bin:/bin:/sbin/nologin
-daemon:*:2:2:daemon:/sbin:/sbin/nologin
-adm:*:3:4:adm:/var/adm:/sbin/nologin
-lp:*:4:7:lp:/var/spool/lpd:/sbin/nologin
+root:*:0:0:Super User:/root:/bin/bash
+bin:*:1:1:bin:/bin:/usr/sbin/nologin
+daemon:*:2:2:daemon:/sbin:/usr/sbin/nologin
+adm:*:3:4:adm:/var/adm:/usr/sbin/nologin
+lp:*:4:7:lp:/var/spool/lpd:/usr/sbin/nologin
 sync:*:5:0:sync:/sbin:/bin/sync
 shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown
 halt:*:7:0:halt:/sbin:/sbin/halt
-mail:*:8:12:mail:/var/spool/mail:/sbin/nologin
-uucp:*:10:14:uucp:/var/spool/uucp:/sbin/nologin
-operator:*:11:0:operator:/root:/sbin/nologin
-games:*:12:100:games:/usr/games:/sbin/nologin
-gopher:*:13:30:gopher:/var/gopher:/sbin/nologin
-ftp:*:14:50:FTP User:/var/ftp:/sbin/nologin
-nobody:*:99:99:Nobody:/:/sbin/nologin
+mail:*:8:12:mail:/var/spool/mail:/usr/sbin/nologin
+operator:*:11:0:operator:/root:/usr/sbin/nologin
+games:*:12:100:games:/usr/games:/usr/sbin/nologin
+ftp:*:14:50:FTP User:/var/ftp:/usr/sbin/nologin
+nobody:*:65534:65534:Kernel Overflow User:/:/usr/sbin/nologin
diff --git a/setup/profile b/setup/profile
index cc638788a..542add4d6 100644
--- a/setup/profile
+++ b/setup/profile
@@ -25,10 +25,10 @@ pathmunge () {
 if [ -x /usr/bin/id ]; then
     if [ -z "$EUID" ]; then
         # ksh workaround
-        EUID=`id -u`
-        UID=`id -ru`
+        EUID=`/usr/bin/id -u`
+        UID=`/usr/bin/id -ru`
     fi
-    USER="`id -un`"
+    USER="`/usr/bin/id -un`"
     LOGNAME=$USER
     MAIL="/var/spool/mail/$USER"
 fi
@@ -42,7 +42,10 @@ else
     pathmunge /usr/sbin after
 fi
-HOSTNAME=`/usr/bin/hostname 2>/dev/null`
+HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/hostname 2>/dev/null) || \
+HOSTNAME=$(/usr/bin/uname -n)
+
 HISTSIZE=1000
 if [ "$HISTCONTROL" = "ignorespace" ] ; then
     export HISTCONTROL=ignoreboth
@@ -52,25 +55,28 @@ fi
export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL
-# By default, we want umask to get set. This sets it for login shell
-# Current threshold for system reserved uid/gids is 200
-# You could check uidgid reservation validity in
-# /usr/share/doc/setup-*/uidgid file
-if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
-    umask 002
-else
-    umask 022
-fi
-
-for i in /etc/profile.d/*.sh ; do
+for i in /etc/profile.d/*.sh /etc/profile.d/sh.local ; do
     if [ -r "$i" ]; then
         if [ "${-#*i}" != "$-" ]; then 
             . "$i"
         else
-            . "$i" >/dev/null 2>&1
+            . "$i" >/dev/null
         fi
     fi
 done
unset i
-unset pathmunge
+unset -f pathmunge
+
+# Source global bash config, when interactive but not posix or sh mode
+if test "$BASH" &&\
+   test -z "$POSIXLY_CORRECT" &&\
+   test "${0#-}" != sh &&\
+   test -r /etc/bashrc
+then
+   # Bash login shells run only /etc/profile
+   # Bash non-login shells run only /etc/bashrc
+   # Check for double sourcing is done in /etc/bashrc.
+   . /etc/bashrc
+fi
+
diff --git a/setup/protocols b/setup/protocols
index 560997385..f5b950fa4 100644
--- a/setup/protocols
+++ b/setup/protocols
@@ -1,5 +1,5 @@
 # /etc/protocols:
-# $Id: protocols,v 1.11 2011/05/03 14:45:40 ovasik Exp $
+# $Id: protocols,v 1.12 2016/07/08 12:27 ovasik Exp $
 #
 # Internet (IP) protocols
 #
@@ -24,7 +24,7 @@ igp	9	IGP		# any private interior gateway (Cisco: for IGRP)
 bbn-rcc	10	BBN-RCC-MON		# BBN RCC Monitoring
 nvp	11	NVP-II		# Network Voice Protocol
 pup	12	PUP		# PARC universal packet protocol
-argus	13	ARGUS		# ARGUS
+argus	13	ARGUS		# ARGUS (deprecated)
 emcon	14	EMCON		# EMCON
 xnet	15	XNET		# Cross Net Debugger
 chaos	16	CHAOS		# Chaos
@@ -135,12 +135,12 @@ stp	118	STP		# Schedule Transfer
 srp	119	SRP		# SpectraLink Radio Protocol
 uti	120	UTI		# UTI
 smp	121	SMP		# Simple Message Protocol
-sm	122	SM		# SM
+sm	122	SM		# SM (deprecated)
 ptp	123	PTP		# Performance Transparency Protocol
 isis	124	ISIS		# ISIS over IPv4
 fire	125	FIRE
 crtp	126	CRTP		# Combat Radio Transport Protocol
-crdup	127	CRUDP		# Combat Radio User Datagram
+crudp	127	CRUDP		# Combat Radio User Datagram
 sscopmce	128	SSCOPMCE
 iplt	129	IPLT
 sps	130	SPS		# Secure Packet Shield
@@ -160,3 +160,6 @@ rohc	142	ROHC		# Robust Header Compression
 #   253     Use for experimentation and testing           [RFC3692]
 #   254     Use for experimentation and testing           [RFC3692]
 #   255                 Reserved                             [IANA]
+# The following entries have not been assigned by IANA but are used
+# internally by the Linux kernel.
+mptcp	262	MPTCP		# Multipath TCP connection
diff --git a/setup/services b/setup/services
index 9d92aca6a..0e7050a4b 100644
--- a/setup/services
+++ b/setup/services
@@ -1,8 +1,8 @@
 # /etc/services:
-# $Id: services,v 1.54 2012/09/19 ovasik Exp $
+# $Id: services,v 1.49 2017/08/18 12:43:23 ovasik Exp $
 #
 # Network services, Internet style
-# IANA services version: last updated 2012-08-21
+# IANA services version: last updated 2021-01-19
 #
 # Note that it is presently the policy of IANA to assign a single well-known
 # port number for both TCP and UDP; hence, most entries here have two entries
@@ -34,8 +34,6 @@ daytime         13/tcp
 daytime         13/udp
 qotd            17/tcp          quote
 qotd            17/udp          quote
-msp             18/tcp                          # message send protocol (historic)
-msp             18/udp                          # message send protocol (historic)
 chargen         19/tcp          ttytst source
 chargen         19/udp          ttytst source
 ftp-data        20/tcp
@@ -54,6 +52,8 @@ smtp            25/tcp          mail
 smtp            25/udp          mail
 time            37/tcp          timserver
 time            37/udp          timserver
+#rap             38/tcp                          # Route Access Protocol
+#rap             38/udp                          # Route Access Protocol
 rlp             39/tcp          resource        # resource location
 rlp             39/udp          resource        # resource location
 nameserver      42/tcp          name            # IEN 116
@@ -188,8 +188,8 @@ ldap            389/tcp
 ldap            389/udp
 osb-sd          400/tcp                         # Oracle Secure Backup
 osb-sd          400/udp                         # Oracle Secure Backup
-svrloc          427/tcp                         # Server Location Protocl
-svrloc          427/udp                         # Server Location Protocl
+svrloc          427/tcp                         # Server Location
+svrloc          427/udp                         # Server Location
 mobileip-agent  434/tcp
 mobileip-agent  434/udp
 mobilip-mn      435/tcp
@@ -290,6 +290,8 @@ courier         530/tcp         rpc
 conference      531/tcp         chat
 netnews         532/tcp
 netwall         533/udp                         # -for emergency broadcasts
+#nmsp            537/tcp                         # Networked Media Streaming Protocol
+#nmsp            537/udp                         # Networked Media Streaming Protocol
 uucp            540/tcp         uucpd           # uucp daemon
 klogin          543/tcp                         # Kerberized `rlogin' (v5)
 kshell          544/tcp         krcmd           # Kerberized `rsh' (v5)
@@ -297,6 +299,12 @@ afpovertcp      548/tcp                         # AFP over TCP
 afpovertcp      548/udp                         # AFP over TCP
 remotefs        556/tcp         rfs_server rfs  # Brunhoff remote filesystem
+## FileMaker Inc
+# http-alt        591/tcp                         # FileMaker, Inc. - HTTP Alternate (see Port 80)
+# http-alt        591/udp                         # FileMaker, Inc. - HTTP Alternate (see Port 80)
+#epp             700/tcp                         # Extensible Provisioning Protocol
+#epp             700/udp                         # Extensible Provisioning Protocol
+
 #
 # From ``PORT NUMBERS'':
 #
@@ -324,16 +332,22 @@ socks           1080/udp                        # socks proxy server
 bvcontrol       1236/tcp        rmtcfg          # Daniel J. Walsh, Gracilis Packeten remote config server
 bvcontrol       1236/udp                        # Daniel J. Walsh
-h323hostcallsc  1300/tcp                        # H323 Host Call Secure
-h323hostcallsc  1300/udp                        # H323 Host Call Secure
+h323hostcallsc  1300/tcp                        # H.323 Secure Call Control
+h323hostcallsc  1300/udp                        # H.323 Secure Call Control
 ms-sql-s        1433/tcp                        # Microsoft-SQL-Server
 ms-sql-s        1433/udp                        # Microsoft-SQL-Server
 ms-sql-m        1434/tcp                        # Microsoft-SQL-Monitor
 ms-sql-m        1434/udp                        # Microsoft-SQL-Monitor
+#csdmbase        1467/tcp                        # CSDMBASE
+#csdmbase        1467/udp                        # CSDMBASE
+#csdm            1468/tcp                        # CSDM
+#csdm            1468/udp                        # CSDM
 ica             1494/tcp                        # Citrix ICA Client
 ica             1494/udp                        # Citrix ICA Client
 wins            1512/tcp                        # Microsoft's Windows Internet Name Service
 wins            1512/udp                        # Microsoft's Windows Internet Name Service
+#ricardo-lm      1522/tcp                        # Ricardo North America License Manager
+#ricardo-lm      1522/udp                        # Ricardo North America License Manager
 ingreslock      1524/tcp
 ingreslock      1524/udp
 prospero-np     1525/tcp        orasrv          # Prospero non-privileged/oracle
@@ -352,9 +366,11 @@ h323gatestat    1719/tcp
 h323gatestat    1719/udp
 h323hostcall    1720/tcp
 h323hostcall    1720/udp
+h323hostcall    1720/sctp                       # H.323 Call Control
 tftp-mcast      1758/tcp
 tftp-mcast      1758/udp
 mtftp           1759/udp        spss-lm
+vdab            1775/tcp                        # data interchange between visual processing containers
 hello           1789/tcp
 hello           1789/udp
 radius          1812/tcp                        # Radius
@@ -371,6 +387,7 @@ gdp-port        1997/tcp                        # Cisco Gateway Discovery Protoc
 gdp-port        1997/udp                        # Cisco Gateway Discovery Protocol
 sieve-filter    2000/tcp        cisco-sccp      # Sieve Mail Filter Daemon
 sieve-filter    2000/udp        cisco-sccp      # Sieve Mail Filter Daemon
+#raid-cd         2006/udp                        # raid
 nfs             2049/tcp        nfsd shilp      # Network File System
 nfs             2049/udp        nfsd shilp      # Network File System
 nfs             2049/sctp       nfsd shilp      # Network File System
@@ -380,6 +397,9 @@ zephyr-clt      2103/tcp                        # Zephyr serv-hm connection
 zephyr-clt      2103/udp                        # Zephyr serv-hm connection
 zephyr-hm       2104/tcp                        # Zephyr hostmanager
 zephyr-hm       2104/udp                        # Zephyr hostmanager
+#nvd             2184/tcp                        # NVD User
+#nvd             2184/udp                        # NVD User
+dali            2378/udp                        # DALI lighting control
 cvspserver      2401/tcp                        # CVS client/server operations
 cvspserver      2401/udp                        # CVS client/server operations
 venus           2430/tcp                        # codacon port
@@ -390,6 +410,9 @@ codasrv         2432/tcp                        # not used
 codasrv         2432/udp                        # server port
 codasrv-se      2433/tcp                        # tcp side effects
 codasrv-se      2433/udp                        # udp sftp side effectQ
+#unicontrol      2437/tcp                        # UniControl
+#unicontrol      2437/udp                        # UniControl
+
# Ports numbered 2600 through 2606 are used by the zebra package without
 # being registred.  The primary names are the registered names, and the
@@ -411,25 +434,50 @@ netmon          2606/udp                        # Dell Netmon
 dict            2628/tcp                        # RFC 2229
 dict            2628/udp                        # RFC 2229
 corbaloc        2809/tcp                        # CORBA naming service locator
+#nmsigport       2817/tcp                        # NMSig Port
+#nmsigport       2817/udp                        # NMSig Port
 icpv2           3130/tcp                        # Internet Cache Protocol V2 (Squid)
 icpv2           3130/udp                        # Internet Cache Protocol V2 (Squid)
+#ceph            3300/tcp                        # Ceph monitor
 mysql           3306/tcp                        # MySQL
 mysql           3306/udp                        # MySQL
 trnsprntproxy   3346/tcp                        # Trnsprnt Proxy
 trnsprntproxy   3346/udp                        # Trnsprnt Proxy
 pxe             4011/udp        altserviceboot  # PXE server
+minirem         4120/tcp                        # MiniRem Remote Telemetry and Control
+aws-wsp         4195/tcp                        # AWS protocol for cloud remoting solution
+aws-wsp         4195/udp                        # AWS protocol for cloud remoting solution
+aws-wsp         4195/sctp                       # AWS protocol for cloud remoting solution
+aws-wsp         4195/dccp                       # AWS protocol for cloud remoting solution
 fud             4201/udp                        # Cyrus IMAP FUD Daemon
+opentelemetry   4317/tcp                        # OpenTelemetry Protocol
 rwhois          4321/tcp                        # Remote Who Is
 rwhois          4321/udp                        # Remote Who Is
+getty-focus     4332/tcp                        # Getty Images FOCUS service
 krb524          4444/tcp        nv-video        # Kerberos 5 to 4 ticket xlator
 krb524          4444/udp        nv-video        # Kerberos 5 to 4 ticket xlator
+ntske           4460/tcp                        # Network Time Security Key Establishment
+sixid           4606/tcp                        # Secure ID to IP registration and lookup
+dots-signal     4646/tcp                        # DOTS Signal Channel Protocol.
+dots-signal     4646/udp                        # DOTS Signal Channel Protocol.
+xcap-portal     4888/tcp                        # xcap code analysis portal public user access
+xcap-control    4889/tcp                        # xcap code analysis portal cluster control and administration
+burp            4971/tcp                        # BackUp and Restore Program
 rfe             5002/tcp                        # Radio Free Ethernet
 rfe             5002/udp                        # Actually uses UDP only
 cfengine        5308/tcp                        # CFengine
 cfengine        5308/udp                        # CFengine
+
+coap            5683/tcp                        # Constrained Application Protocol (CoAP)
+coaps           5684/tcp                        # Constrained Application Protocol (CoAP)
 cvsup           5999/tcp        CVSup           # CVSup file transfer/John Polstra/FreeBSD
 cvsup           5999/udp        CVSup           # CVSup file transfer/John Polstra/FreeBSD
 x11             6000/tcp        X               # the X Window System
+heliosd         6440/tcp                        # heliosd daemon
+checkmk-agent   6556/tcp                        # Checkmk Monitoring Agent
+babel-dtls      6699/udp                        # Babel Routing Protocol over DTLS
+split-ping      6924/tcp                        # Ping with RX/TX latency/loss split
+split-ping      6924/udp                        # Ping with RX/TX latency/loss split
 afs3-fileserver 7000/tcp                        # file server itself
 afs3-fileserver 7000/udp                        # file server itself
 afs3-callback   7001/tcp                        # callbacks to cache managers
@@ -450,14 +498,59 @@ afs3-update     7008/tcp                        # server-to-server updater
 afs3-update     7008/udp                        # server-to-server updater
 afs3-rmtsys     7009/tcp                        # remote cache manager service
 afs3-rmtsys     7009/udp                        # remote cache manager service
+loreji-panel    7026/tcp                        # Loreji Webhosting Panel
+iba-cfg         7072/tcp                        # iba Device Configuration Protocol
+iba-cfg-disc    7072/udp                        # iba Device Configuration Protocol
+asa-gateways    7234/tcp                        # Traffic forwarding for Okta cloud infra
+ipluminary      7420/udp                        # Multichannel real-time lighting control
+rome            7663/tcp                        # Proprietary immutable distributed data storage
+rome            7663/udp                        # Proprietary immutable distributed data storage
+p2pevolvenet    8004/tcp                        # Opensource Evolv Enterprise Platform P2P Network Node Connection Prot
+warppipe        8007/tcp                        # I/O oriented cluster computing software
+warppipe        8007/udp                        # I/O oriented cluster computing software
+nvme-disc       8009/tcp                        # NVMe over Fabrics Discovery Service
+cfg-cloud       8015/tcp                        # Configuration Cloud Service
+ads-s           8016/tcp                        # Beckhoff Automation Device Specification
+arca-api        8023/tcp                        # ARCATrust vault API
+arca-api        8023/udp                        # ARCATrust vault API
+papachi-p2p-srv 8027/tcp                        # peer tracker and data relay service
+papachi-p2p-srv 8027/udp                        # peer tracker and data relay service
+enguity-xccetp  8041/tcp                        # Xcorpeon ASIC Carrier Ethernet Transport
+enguity-xccetp  8041/udp                        # Xcorpeon ASIC Carrier Ethernet Transport
+websnp          8084/tcp                        # Snarl Network Protocol over HTTP
+skynetflow      8111/udp                        # Skynetflow network services
+aruba-papi      8211/udp                        # Aruba Networks AP management
+espeasy-p2p     8266/udp                        # ESPeasy peer-2-peer communication
+semi-grpc       8710/tcp                        # gRPC for SEMI Standards implementations
+core-of-source  8767/tcp                        # Online mobile multiplayer game
+sandpolis       8768/tcp                        # Sandpolis Server
+oktaauthenticat 8769/tcp                        # Okta MultiPlatform Access Mgmt for Cloud Svcs
+pfcp            8805/udp                        # Destination Port number for PFCP
+hes-clip        8807/udp                        # HES-CLIP Interoperability protocol
+3gpp-monp       8809/udp                        # MCPTT Off-Network Protocol (MONP)
+dpp             8908/tcp                        # WFA Device Provisioning Protocol
+
+d-star          9011/udp                        # D-Star Routing digital voice+data for amateur radio
+cisco-aqos      9081/udp                        # Required for Adaptive Quality of Service
+hexxorecore     9111/tcp                        # Multiple Purpose, Distributed Message Bus
+hexxorecore     9111/udp                        # Multiple Purpose, Distributed Message Bus
+sapms           9310/tcp                        # SAP Message Server
+gnmi-gnoi       9339/tcp                        # gRPC Network Mgmt/Operations Interface
+p4runtime       9559/tcp                        # P4Runtime gRPC Service
+x510            9877/tcp                        # The X.510 wrapper protocol
+visweather      9979/tcp                        # Valley Information Systems Weather station data
 amanda          10080/tcp                       # amanda backup services
 amanda          10080/udp                       # amanda backup services
+cimple          10125/tcp                       # HotLink CIMple REST API
+cirrossp        10443/tcp                       # CirrosSP Workstation Communication
+xcompute        11235/tcp                       # numerical systems messaging
+xcompute        11235/sctp                      # numerical systems messaging
 pgpkeyserver    11371/tcp       hkp             # PGP/GPG public keyserver
 pgpkeyserver    11371/udp       hkp             # PGP/GPG public keyserver
 asgcypresstcps  11489/tcp                       # ASG Cypress Secure Only
-h323callsigalt  11720/tcp                       # H323 Call Signal Alternate
-h323callsigalt  11720/udp                       # H323 Call Signal Alternate
-
+h323callsigalt  11720/tcp 323callsigalt         # H323 Call Signal Alternate
+h323callsigalt  11720/udp 323callsigalt         # H323 Call Signal Alternate
+tibsd           11971/tcp                       # TiBS Service
 bprd            13720/tcp                       # BPRD (VERITAS NetBackup)
 bprd            13720/udp                       # BPRD (VERITAS NetBackup)
 bpdbm           13721/tcp                       # BPDBM (VERITAS NetBackup)
@@ -471,18 +564,53 @@ bpcd            13782/udp                       # VERITAS NetBackup
 vopied          13783/tcp                       # VOPIED Protocol
 vopied          13783/udp                       # VOPIED Protocol
+heythings       18516/udp                       # HeyThings Device communicate service
+faircom-db      19790/tcp                       # FairCom Database
+trinket-agent   21212/tcp                       # Distributed artificial intelligence
+cohesity-agent  21213/tcp                       # Cohesity backup agents
+
+
+
 # This port is registered as wnn6, but also used under the unregistered name
 # "wnn4" by the FreeWnn package.
 wnn6            22273/tcp       wnn4
 wnn6            22273/udp       wnn4
+showcockpit-net  22333/tcp                      # ShowCockpit Networking
+showcockpit-net  22333/udp                      # ShowCockpit Networking
+vrmg-ip          24323/tcp                      # Verimag mobile class protocol over TCP
+
+
 quake           26000/tcp
 quake           26000/udp
 wnn6-ds         26208/tcp
 wnn6-ds         26208/udp
+flex-lmadmin    27010/tcp                       # A protocol for managing license services
+mongodb         27017/tcp                       # Mongo database system
+gruber-cashreg  28010/tcp                       # Gruber cash registry protocol
+saltd-licensing  29000/tcp                      # Siemens Licensing Server
+gs-realtime     30400/tcp                       # GroundStar RealTime System
+wg-endpt-comms  33000/tcp                       # WatchGuard Endpoint Communications
+
 traceroute      33434/tcp
 traceroute      33434/udp
+mtrace          33435/udp                       # IP Multicast Traceroute
+
+digilent-adept  33890/tcp                       # Adept IP protocol
+3gpp-w1ap       37472/sctp                      # W1 signalling transport
+ng-control      38412/sctp                      # NG Control Plane (3GPP)
+xn-control      38422/sctp                      # Xn Control Plane (3GPP)
+e1-interface    38462/sctp                      # E1 signalling transport (3GPP)
+f1-control      38472/sctp                      # F1 Control Plane (3GPP)
+hmip-routing    43438/udp                       # HmIP LAN Routing
+acronis-backup  44445/tcp                       # Acronis Backup Gateway service port
+juka            48048/tcp                       # Juliar Programming Language Protocol
+inspider        49150/tcp                       # InSpider System
+
+
+
+
 #
 # Datagram Delivery Protocol services
 #
@@ -552,6 +680,7 @@ canna           5680/tcp        auriga-router
 x11-ssh-offset  6010/tcp                        # SSH X11 forwarding offset
 xfs             7100/tcp        font-service    # X font server
 tircproxy       7666/tcp                        # Tircproxy
+# IANA claims 8008 for http-alt
 webcache        8080/tcp        http-alt        # WWW caching service
 webcache        8080/udp        http-alt        # WWW caching service
 tproxy          8081/tcp        sunproxyadmin   # Transparent Proxy
@@ -569,6 +698,7 @@ wnn4_Cn         22289/tcp                       # used by the cWnn package
 wnn4_Tw         22321/tcp                       # used by the tWnn package
 binkp           24554/tcp                       # Binkley
 binkp           24554/udp                       # Binkley
+sdtvwcam        24666/tcp                       # Service used by SmarDTV to communicate between a CAM and second screen application
 canditv         24676/tcp                       # Canditv Message Service
 canditv         24676/udp                       # Canditv Message Service
 asp             27374/tcp                       # Address Search Protocol
@@ -579,7 +709,7 @@ fido            60179/tcp                       # Ifmail
 fido            60179/udp                       # Ifmail
-# Updated additional list from IANA with all missing services 04/07/2008
+# Updated additional list from IANA with all missing services 10/04/2015
 #spr-itunes      0/tcp   spl-itunes      # Shirt Pocket netTunes - no port allocated
 compressnet     2/tcp                   # Management Utility
 compressnet     2/udp                   # Management Utility
@@ -598,8 +728,6 @@ msg-auth        31/tcp                  # MSG Authentication
 msg-auth        31/udp                  # MSG Authentication
 dsp             33/tcp                  # Display Support Protocol
 dsp             33/udp                  # Display Support Protocol
-rap             38/tcp                  # Route Access Protocol
-rap             38/udp                  # Route Access Protocol
 graphics        41/tcp                  # Graphics
 graphics        41/udp                  # Graphics
 mpm-flags       44/tcp                  # MPM FLAGS Protocol
@@ -640,8 +768,6 @@ vettcp          78/tcp                  # vettcp
 vettcp          78/udp                  # vettcp
 xfer            82/tcp                  # XFER Utility
 xfer            82/udp                  # XFER Utility
-mit-ml-dev      83/tcp                  # MIT ML Device
-mit-ml-dev      83/udp                  # MIT ML Device
 ctf             84/tcp                  # Common Trace Facility
 ctf             84/udp                  # Common Trace Facility
 mfcobol         86/tcp                  # Micro Focus Cobol
@@ -652,8 +778,8 @@ dnsix           90/tcp                  # DNSIX Securit Attribute Token Map
 dnsix           90/udp                  # DNSIX Securit Attribute Token Map
 mit-dov         91/tcp                  # MIT Dover Spooler
 mit-dov         91/udp                  # MIT Dover Spooler
-npp             92/tcp                  # Network Printing Protocol
-npp             92/udp                  # Network Printing Protocol
+#npp             92/tcp                  # Network Printing Protocol
+#npp             92/udp                  # Network Printing Protocol
 dcp             93/tcp                  # Device Control Protocol
 dcp             93/udp                  # Device Control Protocol
 objcall         94/tcp                  # Tivoli Object Dispatcher
@@ -718,8 +844,6 @@ emfis-cntl      141/tcp                 # EMFIS Control Service
 emfis-cntl      141/udp                 # EMFIS Control Service
 bl-idm          142/tcp                 # Britton-Lee IDM
 bl-idm          142/udp                 # Britton-Lee IDM
-uma             144/tcp                 # Universal Management Architecture
-uma             144/udp                 # Universal Management Architecture
 uaac            145/tcp                 # UAAC Protocol
 uaac            145/udp                 # UAAC Protocol
 iso-tp0         146/tcp                 # ISO-IP0
@@ -804,8 +928,6 @@ dn6-nlm-aud     195/tcp                 # DNSIX Network Level Module Audit
 dn6-nlm-aud     195/udp                 # DNSIX Network Level Module Audit
 dn6-smm-red     196/tcp                 # DNSIX Session Mgt Module Audit Redir
 dn6-smm-red     196/udp                 # DNSIX Session Mgt Module Audit Redir
-dls             197/tcp                 # Directory Location Service
-dls             197/udp                 # Directory Location Service
 dls-mon         198/tcp                 # Directory Location Service Monitor
 dls-mon         198/udp                 # Directory Location Service Monitor
 src             200/tcp                 # IBM System Resource Controller
@@ -888,8 +1010,6 @@ rescap          283/tcp                 # rescap
 rescap          283/udp                 # rescap
 corerjd         284/tcp                 # corerjd
 corerjd         284/udp                 # corerjd
-fxp             286/tcp                 # FXP Communication
-fxp             286/udp                 # FXP Communication
 k-block         287/tcp                 # K-BLOCK
 k-block         287/udp                 # K-BLOCK
 novastorbakcup  308/tcp                 # Novastor Backup
@@ -918,8 +1038,6 @@ ptp-event       319/tcp                 # PTP Event
 ptp-event       319/udp                 # PTP Event
 ptp-general     320/tcp                 # PTP General
 ptp-general     320/udp                 # PTP General
-pip             321/tcp                 # PIP
-pip             321/udp                 # PIP
 rtsps           322/tcp                 # RTSPS
 rtsps           322/udp                 # RTSPS
 rpki-rtr        323/tcp                 # Resource PKI to Router
@@ -934,8 +1052,6 @@ zserv           346/tcp                 # Zebra server
 zserv           346/udp                 # Zebra server
 csi-sgwp        348/tcp                 # Cabletron Management Protocol
 csi-sgwp        348/udp                 # Cabletron Management Protocol
-mftp            349/tcp                 # mftp
-mftp            349/udp                 # mftp
 matip-type-a    350/tcp                 # MATIP Type A
 matip-type-a    350/udp                 # MATIP Type A
 matip-type-b    351/tcp bhoetty         # MATIP Type B / bhoetty (added 5/21/97)
@@ -1076,10 +1192,10 @@ icad-el         425/tcp                 # ICAD
 icad-el         425/udp                 # ICAD
 smartsdp        426/tcp                 # smartsdp
 smartsdp        426/udp                 # smartsdp
-ocs_cmu         428/tcp                 # OCS_CMU
-ocs_cmu         428/udp                 # OCS_CMU
-ocs_amu         429/tcp                 # OCS_AMU
-ocs_amu         429/udp                 # OCS_AMU
+ocs_cmu         428/tcp ocs-cmu         # OCS_CMU
+ocs_cmu         428/udp ocs-cmu         # OCS_CMU
+ocs_amu         429/tcp ocs-amu         # OCS_AMU
+ocs_amu         429/udp ocs-amu         # OCS_AMU
 utmpsd          430/tcp                 # UTMPSD
 utmpsd          430/udp                 # UTMPSD
 utmpcd          431/tcp                 # UTMPCD
@@ -1100,8 +1216,8 @@ sgcp            440/tcp                 # sgcp
 sgcp            440/udp                 # sgcp
 decvms-sysmgt   441/tcp                 # decvms-sysmgt
 decvms-sysmgt   441/udp                 # decvms-sysmgt
-cvc_hostd       442/tcp                 # cvc_hostd
-cvc_hostd       442/udp                 # cvc_hostd
+cvc_hostd       442/tcp cvc-hostd       # cvc_hostd
+cvc_hostd       442/udp cvc-hostd       # cvc_hostd
 ddm-rdb         446/tcp                 # DDM-Remote Relational Database Access
 ddm-rdb         446/udp                 # DDM-Remote Relational Database Access
 ddm-dfm         447/tcp                 # DDM-Distributed File Management
@@ -1116,12 +1232,6 @@ sfs-smp-net     451/tcp                 # Cray Network Semaphore server
 sfs-smp-net     451/udp                 # Cray Network Semaphore server
 sfs-config      452/tcp                 # Cray SFS config server
 sfs-config      452/udp                 # Cray SFS config server
-creativeserver  453/tcp                 # CreativeServer
-creativeserver  453/udp                 # CreativeServer
-contentserver   454/tcp                 # ContentServer
-contentserver   454/udp                 # ContentServer
-creativepartnr  455/tcp                 # CreativePartnr
-creativepartnr  455/udp                 # CreativePartnr
 macon-tcp       456/tcp                 # macon-tcp
 macon-udp       456/udp                 # macon-udp
 scohelp         457/tcp                 # scohelp
@@ -1202,8 +1312,8 @@ iso-ill         499/tcp                 # ISO ILL Protocol
 iso-ill         499/udp                 # ISO ILL Protocol
 stmf            501/tcp                 # STMF
 stmf            501/udp                 # STMF
-asa-appl-proto  502/tcp                 # asa-appl-proto
-asa-appl-proto  502/udp                 # asa-appl-proto
+mbap            502/tcp                 # Modbus Application Protocol
+mbap            502/udp                 # Modbus Application Protocol
 intrinsa        503/tcp                 # Intrinsa
 intrinsa        503/udp                 # Intrinsa
 citadel         504/tcp                 # citadel
@@ -1247,8 +1357,6 @@ windream        534/tcp                 # windream Admin
 windream        534/udp                 # windream Admin
 opalis-rdv      536/tcp                 # opalis-rdv
 opalis-rdv      536/udp                 # opalis-rdv
-nmsp            537/tcp                 # Networked Media Streaming Protocol
-nmsp            537/udp                 # Networked Media Streaming Protocol
 apertus-ldp     539/tcp                 # Apertus Technologies Load Determination
 apertus-ldp     539/udp                 # Apertus Technologies Load Determination
 uucp            540/udp                 # uucpd
@@ -1295,8 +1403,8 @@ ms-shuttle      568/tcp                 # microsoft shuttle
 ms-shuttle      568/udp                 # microsoft shuttle
 ms-rome         569/tcp                 # microsoft rome
 ms-rome         569/udp                 # microsoft rome
-meter           570/tcp                 # demon
-meter           570/udp                 # demon
+#meter           570/tcp                         # demon
+#meter           570/udp                         # demon
 #meter          571/tcp                 # udemon
 #meter          571/udp                 # udemon
 sonar           572/tcp                 # sonar
@@ -1515,8 +1623,8 @@ realm-rusd      688/tcp                 # ApplianceWare managment protocol
 realm-rusd      688/udp                 # ApplianceWare managment protocol
 nmap            689/tcp                 # NMAP
 nmap            689/udp                 # NMAP
-vatp            690/tcp                 # Velazquez Application Transfer Protocol
-vatp            690/udp                 # Velazquez Application Transfer Protocol
+vatp            690/tcp                 # Velneo Application Transfer Protocol
+vatp            690/udp                 # Velneo Application Transfer Protocol
 msexch-routing  691/tcp                 # MS Exchange Routing
 msexch-routing  691/udp                 # MS Exchange Routing
 hyperwave-isp   692/tcp                 # Hyperwave-ISP
@@ -1533,8 +1641,8 @@ olsr            698/tcp                 # OLSR
 olsr            698/udp                 # OLSR
 accessnetwork   699/tcp                 # Access Network
 accessnetwork   699/udp                 # Access Network
-epp             700/tcp                 # Extensible Provisioning Protocol
-epp             700/udp                 # Extensible Provisioning Protocol
+#epp            700/tcp                 # Extensible Provisioning Protocol
+#epp            700/udp                 # Extensible Provisioning Protocol
 lmp             701/tcp                 # Link Management Protocol (LMP)
 lmp             701/udp                 # Link Management Protocol (LMP)
 iris-beep       702/tcp                 # IRIS over BEEP
@@ -1619,6 +1727,8 @@ mdbs_daemon     800/tcp    mdbs-daemon  #
 mdbs_daemon     800/udp    mdbs-daemon  #
 device          801/tcp                 #
 device          801/udp                 #
+mbap-s          802/tcp                 # Modbus Application Protocol Secure
+mbap-s          802/udp                 # Modbus Application Protocol Secure
 fcp-udp         810/tcp                 # FCP
 fcp-udp         810/udp                 # FCP Datagram
 itm-mcell-s     828/tcp                 # itm-mcell-s
@@ -1637,6 +1747,8 @@ dhcp-failover2  847/tcp                 # dhcp-failover 2
 dhcp-failover2  847/udp                 # dhcp-failover 2
 gdoi            848/tcp                 # GDOI
 gdoi            848/udp                 # GDOI
+domain-s        853/tcp                 # DNS query-response protocol
+domain-s        853/udp                 # DNS query-response protocol
 iscsi           860/tcp                 # iSCSI
 iscsi           860/udp                 # iSCSI
 owamp-control   861/tcp                 # OWAMP-Control
@@ -1700,12 +1812,6 @@ cap             1026/udp                # Calendar Access Protocol
 6a44            1027/udp                # IPv6 Behind NAT44 CPEs
 solid-mux       1029/tcp                # Solid Mux Server
 solid-mux       1029/udp                # Solid Mux Server
-iad1            1030/tcp                # BBN IAD
-iad1            1030/udp                # BBN IAD
-iad2            1031/tcp                # BBN IAD
-iad2            1031/udp                # BBN IAD
-iad3            1032/tcp                # BBN IAD
-iad3            1032/udp                # BBN IAD
 netinfo-local   1033/tcp                # local netinfo port
 netinfo-local   1033/udp                # local netinfo port
 activesync      1034/tcp                # ActiveSync Notifications
@@ -1864,6 +1970,7 @@ icp             1112/tcp                # Intelligent Communication Protocol
 icp             1112/udp                # Intelligent Communication Protocol
 ltp-deepspace   1113/tcp                # Licklider Transmission Protocol
 ltp-deepspace   1113/udp                # Licklider Transmission Protocol
+ltp-deepspace   1113/dccp               # Licklider Transmission Protocol
 mini-sql        1114/tcp                # Mini SQL
 mini-sql        1114/udp                # Mini SQL
 ardus-trns      1115/tcp                # ARDUS Transfer
@@ -1933,8 +2040,8 @@ capioverlan     1147/tcp                # CAPIoverLAN
 capioverlan     1147/udp                # CAPIoverLAN
 elfiq-repl      1148/tcp                # Elfiq Replication Service
 elfiq-repl      1148/udp                # Elfiq Replication Service
-bvtsonar        1149/tcp                # BVT Sonar Service
-bvtsonar        1149/udp                # BVT Sonar Service
+bvtsonar        1149/tcp                # BlueView Sonar Service
+bvtsonar        1149/udp                # BlueView Sonar Service
 blaze           1150/tcp                # Blaze File Server
 blaze           1150/udp                # Blaze File Server
 unizensus       1151/tcp                # Unizensus Login Server
@@ -2099,6 +2206,8 @@ periscope       1230/tcp                # Periscope
 periscope       1230/udp                # Periscope
 menandmice-lpm  1231/tcp                # menandmice-lpm
 menandmice-lpm  1231/udp                # menandmice-lpm
+first-defense   1232/tcp                # Remote systems monitoring
+first-defense   1232/udp                # Remote systems monitoring
 univ-appserver  1233/tcp                # Universal App Server
 univ-appserver  1233/udp                # Universal App Server
 search-agent    1234/tcp                # Infoseek Search Agent
@@ -2183,8 +2292,6 @@ t1distproc      1274/tcp                # t1distproc
 t1distproc      1274/udp                # t1distproc
 ivcollector     1275/tcp                # ivcollector
 ivcollector     1275/udp                # ivcollector
-ivmanager       1276/tcp                # ivmanager
-ivmanager       1276/udp                # ivmanager
 miva-mqs        1277/tcp                # mqs
 miva-mqs        1277/udp                # mqs
 dellwebadmin-1  1278/tcp                # Dell Web Admin 1
@@ -2390,8 +2497,8 @@ telesis-licman  1380/tcp                # Telesis Network License Manager
 telesis-licman  1380/udp                # Telesis Network License Manager
 apple-licman    1381/tcp                # Apple Network License Manager
 apple-licman    1381/udp                # Apple Network License Manager
-udt_os          1382/tcp    udt-os      # udt_os
-udt_os          1382/udp    udt-os      # udt_os
+udt_os          1382/tcp                # udt_os
+udt_os          1382/udp                # udt_os
 gwha            1383/tcp                # GW Hannaway Network License Manager
 gwha            1383/udp                # GW Hannaway Network License Manager
 os-licman       1384/tcp                # Objective Solutions License Manager
@@ -2440,8 +2547,7 @@ ibm-res         1405/tcp                # IBM Remote Execution Starter
 ibm-res         1405/udp                # IBM Remote Execution Starter
 netlabs-lm      1406/tcp                # NetLabs License Manager
 netlabs-lm      1406/udp                # NetLabs License Manager
-dbsa-lm         1407/tcp                # DBSA License Manager
-dbsa-lm         1407/udp                # DBSA License Manager
+tibet-server    1407/tcp                # TIBET Data Server
 sophia-lm       1408/tcp                # Sophia License Manager
 sophia-lm       1408/udp                # Sophia License Manager
 here-lm         1409/tcp                # Here License Manager
@@ -2556,10 +2662,6 @@ pipes           1465/tcp                # Pipes Platform
 pipes           1465/udp                # Pipes Platform
 oceansoft-lm    1466/tcp                # Ocean Software License Manager
 oceansoft-lm    1466/udp                # Ocean Software License Manager
-csdmbase        1467/tcp                # CSDMBASE
-csdmbase        1467/udp                # CSDMBASE
-csdm            1468/tcp                # CSDM
-csdm            1468/udp                # CSDM
 aal-lm          1469/tcp                # Active Analysis Limited License Manager
 aal-lm          1469/udp                # Active Analysis Limited License Manager
 uaiact          1470/tcp                # Universal Analytics
@@ -2656,8 +2758,6 @@ atm-zip-office  1520/tcp                # atm zip office
 atm-zip-office  1520/udp                # atm zip office
 ncube-lm        1521/tcp                # nCube License Manager
 ncube-lm        1521/udp                # nCube License Manager
-ricardo-lm      1522/tcp                # Ricardo North America License Manager
-ricardo-lm      1522/udp                # Ricardo North America License Manager
 cichild-lm      1523/tcp                # cichild
 cichild-lm      1523/udp                # cichild
 pdap-np         1526/tcp                # Prospero Data Access Prot non-priv
@@ -3339,8 +3439,8 @@ ibm-mqseries2   1881/tcp                # IBM WebSphere MQ Everyplace
 ibm-mqseries2   1881/udp                # IBM WebSphere MQ Everyplace
 ecsqdmn         1882/tcp                # CA eTrust Common Services
 ecsqdmn         1882/udp                # CA eTrust Common Services
-ibm-mqisdp      1883/tcp                # IBM MQSeries SCADA
-ibm-mqisdp      1883/udp                # IBM MQSeries SCADA
+mqtt            1883/tcp                # Message Queuing Telemetry
+mqtt            1883/udp                # Message Queuing Telemetry
 idmaps          1884/tcp                # Internet Distance Map Svc
 idmaps          1884/udp                # Internet Distance Map Svc
 vrtstrapserver  1885/tcp                # Veritas Trap Server
@@ -3577,7 +3677,6 @@ emce            2004/udp                # CCWS mm conf
 berknet         2005/tcp     csync      # csync for cyrus-imapd
 oracle          2005/udp     csync      # csync for cyrus-imapd
 invokator       2006/tcp                #
-raid-cd         2006/udp                # raid
 dectalk         2007/tcp                #
 raid-am         2007/udp                #
 conf            2008/tcp                #
@@ -3723,7 +3822,7 @@ autodesk-nlm    2080/udp                # Autodesk NLM (FLEXlm)
 kme-trap-port   2081/tcp                # KME PRINTER TRAP PORT
 kme-trap-port   2081/udp                # KME PRINTER TRAP PORT
 infowave        2082/tcp                # Infowave Mobility Server
-infowave        2082/udp                # Infowave Mobiltiy Server
+infowave        2082/udp                # Infowave Mobility Server
 radsec          2083/tcp                # Secure Radius Service
 radsec          2083/udp                # Secure Radius Service
 sunclustergeo   2084/tcp                # SunCluster Geographic
@@ -3917,8 +4016,6 @@ cgn-stat        2182/tcp                # CGN status
 cgn-stat        2182/udp                # CGN status
 cgn-config      2183/tcp                # Code Green configuration
 cgn-config      2183/udp                # Code Green configuration
-nvd             2184/tcp                # NVD User
-nvd             2184/udp                # NVD User
 onbase-dds      2185/tcp                # OnBase Distributed Disk Services
 onbase-dds      2185/udp                # OnBase Distributed Disk Services
 gtaua           2186/tcp                # Guy-Tek Automated Update Applications
@@ -3983,8 +4080,8 @@ netiq-ncap      2219/tcp                # NetIQ NCAP Protocol
 netiq-ncap      2219/udp                # NetIQ NCAP Protocol
 netiq           2220/tcp                # NetIQ End2End
 netiq           2220/udp                # NetIQ End2End
-rockwell-csp1   2221/tcp                # Rockwell CSP1
-rockwell-csp1   2221/udp                # Rockwell CSP1
+ethernet-ip-s   2221/tcp                # EtherNet/IP over TLS
+ethernet-ip-s   2221/udp                # EtherNet/IP over DTLS
 EtherNet/IP-1   2222/tcp  EtherNet-IP-1 # EtherNet/IP I/O
 EtherNet/IP-1   2222/udp  EtherNet-IP-1 # EtherNet/IP I/O
 rockwell-csp2   2223/tcp                # Rockwell CSP2
@@ -4277,11 +4374,14 @@ opentable       2368/tcp                # OpenTable
 opentable       2368/udp                # OpenTable
 l3-hbmon        2370/tcp                # L3-HBMon
 l3-hbmon        2370/udp                # L3-HBMon
-worldwire       2371/tcp                # Compaq WorldWire Port
-worldwire       2371/udp                # Compaq WorldWire Port
+hp-rda          2371/tcp                # HP Remote Device Access
 lanmessenger    2372/tcp                # LanMessenger
 lanmessenger    2372/udp                # LanMessenger
 remographlm     2373/tcp                # Remograph License Manager
+docker          2375/tcp                # Docker REST API (plain text)
+docker-s        2376/tcp                # Docker REST API (ssl)
+etcd-client     2379/tcp                # etcd client communication
+etcd-server     2380/tcp                # etcd server to server communication
 hydra           2374/tcp                # Hydra RPC
 compaq-https    2381/tcp                # Compaq HTTPS
 compaq-https    2381/udp                # Compaq HTTPS
@@ -4370,6 +4470,8 @@ kofax-svr       2424/tcp                # KOFAX-SVR
 kofax-svr       2424/udp                # KOFAX-SVR
 fjitsuappmgr    2425/tcp                # Fujitsu App Manager
 fjitsuappmgr    2425/udp                # Fujitsu App Manager
+vcmp            2426/tcp                # VeloCloud MultiPath Protocol
+vcmp            2426/udp                # VeloCloud MultiPath Protocol
 mgcp-gateway    2427/tcp                # Media Gateway Control Protocol Gateway
 mgcp-gateway    2427/udp                # Media Gateway Control Protocol Gateway
 ott             2428/tcp                # One Way Trip Time
@@ -4382,8 +4484,6 @@ optilogic       2435/tcp                # OptiLogic
 optilogic       2435/udp                # OptiLogic
 topx            2436/tcp                # TOP/X
 topx            2436/udp                # TOP/X
-unicontrol      2437/tcp                # UniControl
-unicontrol      2437/udp                # UniControl
 sybasedbsynch   2439/tcp                # SybaseDBSynch
 sybasedbsynch   2439/udp                # SybaseDBSynch
 spearway        2440/tcp                # Spearway Lockers
@@ -4768,8 +4868,8 @@ sybaseanywhere  2638/tcp                # Sybase Anywhere
 sybaseanywhere  2638/udp                # Sybase Anywhere
 aminet          2639/tcp                # AMInet
 aminet          2639/udp                # AMInet
-sai_sentlm      2640/tcp  sai-sentlm    # Sabbagh Associates Licence Manager
-sai_sentlm      2640/udp  sai-sentlm    # Sabbagh Associates Licence Manager
+ami-control     2640/tcp                # Alcorn McBride Inc protocol
+ami-control     2640/udp                # Alcorn McBride Inc protocol
 hdl-srv         2641/tcp                # HDL Server
 hdl-srv         2641/udp                # HDL Server
 tragic          2642/tcp                # Tragic
@@ -5115,8 +5215,6 @@ lbc-measure     2815/tcp                # LBC Measurement
 lbc-measure     2815/udp                # LBC Measurement
 lbc-watchdog    2816/tcp                # LBC Watchdog
 lbc-watchdog    2816/udp                # LBC Watchdog
-nmsigport       2817/tcp                # NMSig Port
-nmsigport       2817/udp                # NMSig Port
 rmlnk           2818/tcp                # rmlnk
 rmlnk           2818/udp                # rmlnk
 fc-faultnotify  2819/tcp                # FC Fault Notification
@@ -5186,7 +5284,6 @@ ispipes         2853/udp                # ISPipes
 infomover       2854/tcp                # InfoMover
 infomover       2854/udp                # InfoMover
 msrp            2855/tcp                # MSRP over TCP
-msrp            2855/udp                # MSRP
 cesdinv         2856/tcp                # cesdinv
 cesdinv         2856/udp                # cesdinv
 simctlp         2857/tcp                # SimCtIP
@@ -5472,10 +5569,11 @@ realsecure      2998/tcp                # Real Secure
 realsecure      2998/udp                # Real Secure
 remoteware-un   2999/tcp                # RemoteWare Unassigned
 remoteware-un   2999/udp                # RemoteWare Unassigned
-hbci            3000/tcp                # HBCI
+hbci            3000/tcp   ceph         # HBCI or CEPH monitor
 hbci            3000/udp                # HBCI
 #remoteware-cl  3000/tcp                # RemoteWare Client
 #remoteware-cl  3000/udp                # RemoteWare Client
+origo-native    3001/tcp                # OrigoDB Server Native
 exlm-agent      3002/tcp                # EXLM Agent
 exlm-agent      3002/udp                # EXLM Agent
 #remoteware-srv 3002/tcp                # RemoteWare Server
@@ -5711,6 +5809,7 @@ d2000kernel     3119/tcp                # D2000 Kernel Port
 d2000kernel     3119/udp                # D2000 Kernel Port
 d2000webserver  3120/tcp                # D2000 Webserver Port
 d2000webserver  3120/udp                # D2000 Webserver Port
+pcmk-remote     3121/tcp                # pacemaker remote service
 vtr-emulator    3122/tcp                # MTI VTR Emulator port
 vtr-emulator    3122/udp                # MTI VTR Emulator port
 edix            3123/tcp                # EDI Translation Protocol
@@ -6380,8 +6479,8 @@ nppmp           3476/tcp                # NVIDIA Mgmt Protocol
 nppmp           3476/udp                # NVIDIA Mgmt Protocol
 ecomm           3477/tcp                # eComm link port
 ecomm           3477/udp                # eComm link port
-stun            3478/tcp      turn      # Session Traversal Utilities for NAT (STUN) port, TURN over TCP
-stun            3478/udp      turn      # Session Traversal Utilities for NAT (STUN) port, TURN over UDP
+stun            3478/tcp stun-behavior turn # Session Traversal Utilities for NAT (STUN) port, TURN over TCP
+stun            3478/udp stun-behavior turn # Session Traversal Utilities for NAT (STUN) port, TURN over UDP
 twrpc           3479/tcp                # 2Wire RPC
 twrpc           3479/udp                # 2Wire RPC
 plethora        3480/tcp                # Secure Virtual Workspace
@@ -6555,10 +6654,10 @@ esimport        3564/udp                # Electromed SIM port
 m2pa            3565/tcp                # M2PA
 m2pa            3565/sctp               # M2PA
 quest-data-hub  3566/tcp                # Quest Data Hub
-oap             3567/tcp                # Object Access Protocol
-oap             3567/udp                # Object Access Protocol
-oap-s           3568/tcp                # Object Access Protocol over SSL
-oap-s           3568/udp                # Object Access Protocol over SSL
+dof-eps         3567/tcp                # DOF protocol stack
+dof-eps         3567/udp                # DOF protocol stack
+dof-tunnel-sec  3568/tcp                # DOF secure tunnel
+dof-tunnel-sec  3568/udp                # DOF secure tunnel
 mbg-ctrl        3569/tcp                # Meinberg Control Service
 mbg-ctrl        3569/udp                # Meinberg Control Service
 mccwebsvr-port  3570/tcp                # MCC Web Server Port
@@ -6804,6 +6903,7 @@ magaya-network  3691/tcp                # Magaya Network Port
 magaya-network  3691/udp                # Magaya Network Port
 intelsync       3692/tcp                # Brimstone IntelSync
 intelsync       3692/udp                # Brimstone IntelSync
+easl            3693/tcp                # Emergency Automatic
 bmc-data-coll   3695/tcp                # BMC Data Collection
 bmc-data-coll   3695/udp                # BMC Data Collection
 telnetcpcd      3696/tcp                # Telnet Com Port Control
@@ -6945,6 +7045,7 @@ mni-prot-rout   3764/tcp                # MNI Protected Routing
 mni-prot-rout   3764/udp                # MNI Protected Routing
 rtraceroute     3765/tcp                # Remote Traceroute
 rtraceroute     3765/udp                # Remote Traceroute
+sitewatch-s     3766/tcp                # SSL e-watch sitewatch server
 listmgr-port    3767/tcp                # ListMGR Port
 listmgr-port    3767/udp                # ListMGR Port
 rblcheckd       3768/tcp                # rblcheckd server daemon
@@ -7093,8 +7194,7 @@ amx-rms         3839/tcp                # AMX Resource Management Suite
 amx-rms         3839/udp                # AMX Resource Management Suite
 flirtmitmir     3840/tcp                # www.FlirtMitMir.de
 flirtmitmir     3840/udp                # www.FlirtMitMir.de
-zfirm-shiprush3 3841/tcp                # Z-Firm ShipRush v3
-zfirm-shiprush3 3841/udp                # Z-Firm ShipRush v3
+shiprush-db-svr 3841/tcp                # ShipRush Database Server
 nhci            3842/tcp                # NHCI status port
 nhci            3842/udp                # NHCI status port
 quest-agent     3843/tcp                # Quest Common Agent
@@ -7363,8 +7463,8 @@ citysearch      3974/tcp                # Remote Applicant Tracking Service
 citysearch      3974/udp                # Remote Applicant Tracking Service
 airshot         3975/tcp                # Air Shot
 airshot         3975/udp                # Air Shot
-opswagent       3976/tcp                # Opsware Agent
-opswagent       3976/udp                # Opsware Agent
+opswagent       3976/tcp                # Server Automation Agent
+opswagent       3976/udp                # Server Automation Agent
 opswmanager     3977/tcp                # Opsware Manager
 opswmanager     3977/udp                # Opsware Manager
 secure-cfg-svr  3978/tcp                # Secured Configuration Server
@@ -7560,6 +7660,8 @@ seraph          4076/tcp                # Seraph DCS
 seraph          4076/udp                # Seraph DCS
 ascomalarm      4077/udp                # Ascom IP Alarming
 cssp            4078/tcp                # Coordinated Security Service Protocol
+santools        4079/tcp                # SANtools Diagnostic Server
+santools        4079/udp                # SANtools Diagnostic Server
 lorica-in       4080/tcp                # Lorica inside facing
 lorica-in       4080/udp                # Lorica inside facing
 lorica-in-sec   4081/tcp                # Lorica inside facing (SSL)
@@ -7752,8 +7854,8 @@ macbak          4181/tcp                # MacBak
 macbak          4181/udp                # MacBak
 pcptcpservice   4182/tcp                # Production Company Pro TCP Service
 pcptcpservice   4182/udp                # Production Company Pro TCP Service
-gmmp            4183/tcp                # General Metaverse Messaging Protocol
-gmmp            4183/udp                # General Metaverse Messaging Protocol
+cyborgnet       4183/tcp                # CyborgNet communications
+cyborgnet       4183/udp                # CyborgNet communications
 universe_suite  4184/tcp   universe-suite  # UNIVERSE SUITE MESSAGE SERVICE
 universe_suite  4184/udp   universe-suite  # UNIVERSE SUITE MESSAGE SERVICE
 wcpp            4185/tcp                # Woven Control Plane Protocol
@@ -7795,14 +7897,14 @@ mirrtex         4310/udp                # Mir-RT exchange service
 p6ssmc          4311/tcp                # P6R Secure Server Management Console
 pscl-mgt        4312/tcp                # Parascale Membership Manager
 perrla          4313/tcp                # PERRLA User Services
+choiceview-agt  4314/tcp                # ChoiceView Agent
+choiceview-clt  4316/tcp                # ChoiceView Client
 fdt-rcatp       4320/tcp                # FDT Remote Categorization Protocol
 fdt-rcatp       4320/udp                # FDT Remote Categorization Protocol
 trim-event      4322/tcp                # TRIM Event Service
 trim-event      4322/udp                # TRIM Event Service
 trim-ice        4323/tcp                # TRIM ICE Service
 trim-ice        4323/udp                # TRIM ICE Service
-balour          4324/tcp                # Balour Game Server
-balour          4324/udp                # Balour Game Server
 geognosisman    4325/tcp                # Cadcorp GeognoSIS Manager Service
 geognosisman    4325/udp                # Cadcorp GeognoSIS Manager Service
 geognosis       4326/tcp                # Cadcorp GeognoSIS Service
@@ -7812,12 +7914,20 @@ jaxer-web       4327/udp                # Jaxer Web Protocol
 jaxer-manager   4328/tcp                # Jaxer Manager Command Protocol
 jaxer-manager   4328/udp                # Jaxer Manager Command Protocol
 publiqare-sync  4329/tcp                # PubliQare Distributed Environment Synchronisation Engine
+dey-sapi        4330/tcp                # DEY Storage Administration
+ktickets-rest   4331/tcp                # ktickets REST API for event management and ticketing systems
+ahsp            4333/tcp                # ArrowHead Service Protocol
+ahsp            4333/udp                # ArrowHead Service Protocol
+ahsp            4333/sctp               # ArrowHead Service Protocol
+netconf-ch-ssh  4334/tcp                # NETCONF Call Home (SSH)
+netconf-ch-tls  4335/tcp                # NETCONF Call Home (TLS)
+restconf-ch-tls 4336/tcp                # RESTCONF Call Home (TLS)
 gaia            4340/tcp                # Gaia Connector Protocol
 gaia            4340/udp                # Gaia Connector Protocol
 lisp-data       4341/tcp                # LISP Data Packets
 lisp-data       4341/udp                # LISP Data Packets
 lisp-cons       4342/tcp                # LISP-CONS Control
-lisp-control    4342/udp                # LISP Data-Triggered Control
+lisp-control    4342/udp                # LISP Control Packets
 unicall         4343/tcp                # UNICALL
 unicall         4343/udp                # UNICALL
 vinainstall     4344/tcp                # VinaInstall
@@ -7855,6 +7965,7 @@ omabcastltkm    4359/udp                # OMA BCAST Long-Term Key Messages
 matrix_vnet     4360/tcp   matrix-vnet  # Matrix VNet Communication Protocol
 nacnl           4361/udp                # Navcom Discovery and Control Port
 afore-vdp-disc  4362/udp                # AFORE vNode Discovery protocol
+shadowstream    4366/udp                # ShadowStream System
 wxbrief         4368/tcp                # WeatherBrief Direct
 wxbrief         4368/udp                # WeatherBrief Direct
 epmd            4369/tcp                # Erlang Port Mapper Daemon
@@ -7909,6 +8020,21 @@ slscc           4408/tcp                # SLS Technology Control Centre
 netcabinet-com  4409/tcp                # Net-Cabinet comunication
 itwo-server     4410/tcp                # RIB iTWO Application Server
 found           4411/tcp                # Found Messaging Protocol
+smallchat       4412/udp                # SmallChat
+avi-nms         4413/tcp                # AVI Systems NMS
+avi-nms-disc    4413/udp                # AVI Systems NMS
+updog           4414/tcp                # Updog Monitoring and Status
+brcd-vr-req     4415/tcp                # Brocade Virtual Router
+pjj-player      4416/tcp                # PJJ Media Player
+pjj-player-disc 4416/udp                # PJJ Media Player discovery
+workflowdir     4417/tcp                # Workflow Director
+axysbridge      4418/udp                # AXYS communication protocol
+cbp             4419/tcp                # Colnod Binary Protocol
+nvm-express     4420/tcp                # NVM Express over Fabrics
+nvm-express     4420/udp                # NVM Express over Fabrics
+scaleft         4421/tcp                # Management for Cloud
+tsepisp         4422/tcp                # TSEP Installation Service
+thingkit        4423/tcp                # thingkit secure mesh
 netrockey6      4425/tcp                # NetROCKEY6 SMART Plus Service
 netrockey6      4425/udp                # NetROCKEY6 SMART Plus Service
 beacon-port-2   4426/tcp                # SMARTS Beacon Port
@@ -7966,6 +8092,7 @@ awacs-ice       4488/udp                # Apple Wide Area Connectivity Service I
 ipsec-nat-t     4500/tcp                # IPsec NAT-Traversal
 ipsec-nat-t     4500/udp                # IPsec NAT-Traversal
 a25-fap-fgw     4502/sctp               # A25 (FAP-FGW)
+armagetronad    4534/udp                # Armagetron Advanced Game
 ehs             4535/tcp                # Event Heap Server
 ehs             4535/udp                # Event Heap Server
 ehs-ssl         4536/tcp                # Event Heap Server SSL
@@ -7995,11 +8122,13 @@ msfrs           4554/tcp                # MS FRS Replication
 msfrs           4554/udp                # MS FRS Replication
 rsip            4555/tcp                # RSIP Port
 rsip            4555/udp                # RSIP Port
-dtn-bundle-tcp  4556/tcp                # DTN Bundle TCP CL Protocol
-dtn-bundle-udp  4556/udp                # DTN Bundle UDP CL Protocol
+dtn-bundle      4556/tcp                # DTN Bundle TCP CL Protocol
+dtn-bundle      4556/udp                # DTN Bundle UDP CL Protocol
+dtn-bundle      4556/dccp               # DTN Bundle DCCP CL Protocol
 mtcevrunqss     4557/udp                # Marathon everRun Quorum Service Server
 mtcevrunqman    4558/udp                # Marathon everRun Quorum Service Manager
 hylafax         4559/udp                # HylaFAX
+amahi-anywhere  4563/tcp                # Amahi Anywhere
 kwtc            4566/tcp                # Kids Watch Time Control Service
 kwtc            4566/udp                # Kids Watch Time Control Service
 tram            4567/tcp                # TRAM
@@ -8008,6 +8137,8 @@ bmc-reporting   4568/tcp                # BMC Reporting
 bmc-reporting   4568/udp                # BMC Reporting
 iax             4569/tcp                # Inter-Asterisk eXchange
 iax             4569/udp                # Inter-Asterisk eXchange
+deploymentmap   4570/tcp                # site deployment information for Oracle Communications Suite
+cardifftec-back 4573/tcp                # CardiffTec server/client communication
 rid             4590/tcp                # RID over HTTP/TLS
 l3t-at-an       4591/tcp                # HRPD L3T (AT-AN)
 l3t-at-an       4591/udp                # HRPD L3T (AT-AN)
@@ -8032,6 +8163,9 @@ piranha2        4601/tcp                # Piranha2
 piranha2        4601/udp                # Piranha2
 mtsserver       4602/tcp                # EAX MTS Server
 menandmice-upg  4603/tcp                # Men & Mice Upgrade Agent
+irp             4604/tcp                # Identity Registration Protocol
+sixchat         4605/tcp                # Direct End to End Secure
+ventoso         4621/udp                # remote radio VOIP
 playsta2-app    4658/tcp                # PlayStation2 App Port
 playsta2-app    4658/udp                # PlayStation2 App Port
 playsta2-lob    4659/tcp                # PlayStation2 Lobby Port
@@ -8145,6 +8279,7 @@ ifsp            4744/tcp                # Internet File Synchronization Protocol
 ifsp            4744/udp                # Internet File Synchronization Protocol
 fmp             4745/tcp                # Funambol Mobile Push
 fmp             4745/udp                # Funambol Mobile Push
+buschtrommel    4747/udp                # peer-to-peer file exchange
 profilemac      4749/tcp                # Profile for Mac
 profilemac      4749/udp                # Profile for Mac
 ssad            4750/tcp                # Simple Service Auto Discovery
@@ -8161,6 +8296,9 @@ cncp            4785/udp                # Cisco Nexus Control Protocol
 smart-install   4786/tcp                # Smart Install Service
 sia-ctrl-plane  4787/tcp                # Service Insertion Architecture (SIA) Control-Plane
 xmcp            4788/tcp                # eXtensible Messaging Client Protocol
+vxlan           4789/udp                # Virtual eXtensible Local area network
+vxlan-gpe       4790/udp                # Generic Protocol Extension for vxlan
+roce            4791/udp                # IP Routable RocE
 iims            4800/tcp                # Icona Instant Messenging System
 iims            4800/udp                # Icona Instant Messenging System
 iwec            4801/tcp                # Icona Web Embedded Chat
@@ -8239,6 +8377,7 @@ lutcp           4913/tcp                # LUTher Control Protocol
 bones           4914/tcp                # Bones Remote Control
 bones           4914/udp                # Bones Remote Control
 frcs            4915/tcp                # Fibics Remote Control Service
+an-signaling    4936/udp                # Signal protocol port for autonomic networking
 atsc-mh-ssc     4937/udp                # ATSC-M/H Service Signaling Channel
 eq-office-4940  4940/tcp                # Equitrac Office
 eq-office-4940  4940/udp                # Equitrac Office
@@ -8260,6 +8399,7 @@ ccss-qmm        4969/tcp                # CCSS QMessageMonitor
 ccss-qmm        4969/udp                # CCSS QMessageMonitor
 ccss-qsm        4970/tcp                # CCSS QSystemMonitor
 ccss-qsm        4970/udp                # CCSS QSystemMonitor
+ctxs-vpp        4980/udp                # Citrix Virtual Path
 webyast         4984/tcp                # WebYast
 gerhcs          4985/tcp                # GER HC Standard
 mrip            4986/tcp                # Model Railway Interface Program
@@ -8329,6 +8469,8 @@ surfpass        5030/tcp                # SurfPass
 surfpass        5030/udp                # SurfPass
 dmp             5031/udp                # Direct Message Protocol
 signacert-agent 5032/tcp                # SignaCert Enterprise Trust Server Agent
+jtnetd-server   5033/tcp                # Janstor Secure Data
+jtnetd-status   5034/tcp                # Janstor Status
 asnaacceler8db  5042/tcp                # asnaacceler8db
 asnaacceler8db  5042/udp                # asnaacceler8db
 swxadmin        5043/tcp                # ShopWorX Administration
@@ -8348,6 +8490,7 @@ ita-agent       5051/udp                # ITA Agent
 ita-manager     5052/tcp                # ITA Manager
 ita-manager     5052/udp                # ITA Manager
 rlm             5053/tcp                # RLM License Server
+rlm-disc        5053/udp                # RLM Discovery Server
 rlm-admin       5054/tcp                # RLM administrative interface
 unot            5055/tcp                # UNOT
 unot            5055/udp                # UNOT
@@ -8360,8 +8503,10 @@ sds             5059/tcp                # SIP Directory Services
 sds             5059/udp                # SIP Directory Services
 sip             5060/tcp                # SIP
 sip             5060/udp                # SIP
-sip-tls         5061/tcp                # SIP-TLS
-sip-tls         5061/udp                # SIP-TLS
+sip             5060/sctp               # SIP
+sips            5061/tcp                # SIP-TLS
+sips            5061/udp                # SIP-TLS
+sips            5061/sctp               # SIP-TLS
 na-localise     5062/tcp                # Localisation access
 na-localise     5062/udp                # Localisation access
 csrpc           5063/tcp                # centrify secure RPC
@@ -8387,6 +8532,7 @@ tag-pm          5073/udp                # Advantage Group Port Mgr
 alesquery       5074/tcp                # ALES Query
 alesquery       5074/udp                # ALES Query
 pvaccess        5075/tcp                # Experimental Physics and Industrial Control System
+pixelpusher     5078/udp                # PixelPusher pixel data
 cp-spxrpts      5079/udp                # Cambridge Pixel SPx Reports
 onscreen        5080/tcp                # OnScreen Data Collection Service
 onscreen        5080/udp                # OnScreen Data Collection Service
@@ -8401,6 +8547,7 @@ llrp            5084/udp                # EPCglobal Low-Level Reader Protocol
 encrypted-llrp  5085/tcp                # EPCglobal Encrypted LLRP
 encrypted-llrp  5085/udp                # EPCglobal Encrypted LLRP
 aprigo-cs       5086/tcp                # Aprigo Collection Service
+biotic          5087/tcp                # Binary Internet of Things Interoperable Communication
 car             5090/sctp               # Candidate AR
 cxtp            5091/sctp               # Context Transfer Protocol
 magpie          5092/udp                # Magpie Binary
@@ -8419,6 +8566,8 @@ oms-nonsecure   5102/udp                # Oracle OMS non-secure
 actifio-c2c     5103/tcp                # Actifio C2C
 tinymessage     5104/udp                # TinyMessage
 hughes-ap       5105/udp                # Hughes Association Protocol
+actifioudsagent 5106/tcp                # Actifio UDS Agent
+actifioreplic   5107/tcp                # Disk to Disk replication
 taep-as-svc     5111/tcp                # TAEP AS service
 taep-as-svc     5111/udp                # TAEP AS service
 pm-cmdsvr       5112/tcp                # PeerMe Msg Cmd Service
@@ -8427,6 +8576,8 @@ ev-services     5114/tcp                # Enterprise Vault Services
 autobuild       5115/tcp                # Symantec Autobuild Service
 emb-proj-cmd    5116/udp                # EPSON Projecter Image Transfer
 gradecam        5117/tcp                # GradeCam Image Processing
+barracuda-bbs   5120/tcp                # Barracuda Backup Protocol
+barracuda-bbs   5120/udp                # Barracuda Backup Protocol
 nbt-pc          5133/tcp                # Policy Commander
 nbt-pc          5133/udp                # Policy Commander
 ppactivation    5134/tcp                # PP ActivationServer
@@ -8463,6 +8614,7 @@ scte104         5167/tcp                # SCTE104 Connection
 scte104         5167/udp                # SCTE104 Connection
 scte30          5168/tcp                # SCTE30 Connection
 scte30          5168/udp                # SCTE30 Connection
+pcoip-mgmt      5172/tcp                # PC over IP Endpoint Management
 aol             5190/tcp                # America-Online
 aol             5190/udp                # America-Online
 aol-1           5191/tcp                # AmericaOnline1
@@ -8474,6 +8626,7 @@ aol-3           5193/udp                # AmericaOnline3
 cpscomm         5194/tcp                # CipherPoint Config Service
 ampl-lic        5195/tcp                # AMPL_Optimization - program licenses
 ampl-tableproxy 5196/tcp                # AMPL_Optimization - table data
+tunstall-lwp    5197/tcp                # Tunstall Lone worker device
 targus-getdata  5200/tcp                # TARGUS GetData
 targus-getdata  5200/udp                # TARGUS GetData
 targus-getdata1 5201/tcp                # TARGUS GetData 1
@@ -8483,6 +8636,8 @@ targus-getdata2 5202/udp                # TARGUS GetData 2
 targus-getdata3 5203/tcp                # TARGUS GetData 3
 targus-getdata3 5203/udp                # TARGUS GetData 3
 nomad           5209/tcp                # Nomad Device Video Transfer
+noteza          5215/tcp                # NOTEZA Data Safety Service
+noteza          5215/sctp               # NOTEZA Data Safety Service
 3exmp           5221/tcp                # 3eTI Extensible Management Protocol for OAMP
 xmpp-client     5222/tcp                # XMPP Client Connection
 hpvirtgrp       5223/tcp                # HP Virtual Machine Group Management
@@ -8496,6 +8651,9 @@ hp-status       5226/udp                # HP Status
 perfd           5227/tcp                # HP System Performance Metric Service
 perfd           5227/udp                # HP System Performance Metric Service
 hpvroom         5228/tcp                # HP Virtual Room Service
+jaxflow         5229/tcp                # Collector and Forwarder Management
+jaxflow-data    5230/tcp                # JaxMP RealFlow application and protocol data
+crusecontrol    5231/tcp                # Remote Control of Scan Software for Cruse Scanners
 enfs            5233/tcp                # Etinnae Network File Service
 eenet           5234/tcp                # EEnet communications
 eenet           5234/udp                # EEnet communications
@@ -8520,6 +8678,7 @@ caevms          5251/udp                # CA eTrust VM Service
 movaz-ssc       5252/tcp                # Movaz SSC
 movaz-ssc       5252/udp                # Movaz SSC
 kpdp            5253/tcp                # Kohler Power Device Protocol
+logcabin        5254/tcp                # LogCabin storage service
 3com-njack-1    5264/tcp                # 3Com Network Jack Port 1
 3com-njack-1    5264/udp                # 3Com Network Jack Port 1
 3com-njack-2    5265/tcp                # 3Com Network Jack Port 2
@@ -8576,12 +8735,11 @@ kfserver        5343/tcp                # Sculptor Database Server
 kfserver        5343/udp                # Sculptor Database Server
 xkotodrcp       5344/tcp                # xkoto DRCP
 xkotodrcp       5344/udp                # xkoto DRCP
-stuns           5349/tcp     turns      # STUN over TLS, TURN over TLS
-stuns           5349/udp     turns      # Reserved for a future enhancement of STUN, Reserved for a future enhancement of TURN
-nat-pmp-status  5350/tcp                # NAT-PMP Status Announcements
-nat-pmp-status  5350/udp                # NAT-PMP Status Announcements
-nat-pmp         5351/tcp                # NAT Port Mapping Protocol
-nat-pmp         5351/udp                # NAT Port Mapping Protocol
+stuns           5349/tcp stun-behaviors turns # STUN over TLS, TURN over TLS
+stuns           5349/udp stun-behaviors turns # Reserved for a future enhancement of STUN, Reserved for a future enhancement of TURN
+pcp-multicast   5350/tcp                # Port Control Protocol
+pcp             5350/udp                # Port Control Protocol
+#pcp             5351/udp                        # Port Control Protocol
 dns-llq         5352/tcp                # DNS Long-Lived Queries
 dns-llq         5352/udp                # DNS Long-Lived Queries
 mdns            5353/tcp                # Multicast DNS
@@ -8604,6 +8762,7 @@ serverwsd2      5362/tcp                # Microsoft Windows Server WSD2 Service
 serverwsd2      5362/udp                # Microsoft Windows Server WSD2 Service
 net-projection  5363/tcp                # Windows Network Projection
 net-projection  5363/udp                # Windows Network Projection
+kdnet           5364/udp                # Microsoft Kernel Debugger
 stresstester    5397/tcp                # StressTester(tm) Injector
 stresstester    5397/udp                # StressTester(tm) Injector
 elektron-admin  5398/tcp                # Elektron Administration
@@ -8683,7 +8842,9 @@ pmip6-data      5437/udp                # pmip6-data
 spss            5443/tcp                # Pearson HTTPS
 spss            5443/udp                # Pearson HTTPS
 smbdirect       5445/tcp                # Server Message Block over Remote Direct Memory Access
-smbdirect       5445/sctp                # Server Message Block over Remote Direct Memory Access
+smbdirect       5445/sctp               # Server Message Block over Remote Direct Memory Access
+tiepie          5450/tcp                # TiePie engineering data
+tiepie-disc     5450/udp                # TiePie engineering data (discovery)
 surebox         5453/tcp                # SureBox
 surebox         5453/udp                # SureBox
 apc-5454        5454/tcp                # APC 5454
@@ -8702,6 +8863,12 @@ quailnet        5464/tcp                # Quail Networks Object Broker
 quailnet        5464/udp                # Quail Networks Object Broker
 netops-broker   5465/tcp                # NETOPS-BROKER
 netops-broker   5465/udp                # NETOPS-BROKER
+absolab-col     5470/tcp                # The Apsolab company's data collection protocol
+absolab-cols    5471/tcp                # The Apsolab company's secure data collection protocol
+absolab-tag     5472/tcp                # The Apsolab company's dynamic tag protocol
+absolab-tags    5473/tcp                # The Apsolab company's secure dynamic tag protocol
+absolab-rpc     5474/udp                # The Apsolab company's status query protocol
+absolab-data    5475/tcp                # The Apsolab company's data retrieval protocol
 fcp-addr-srvr1  5500/tcp                # fcp-addr-srvr1
 fcp-addr-srvr1  5500/udp                # fcp-addr-srvr1
 fcp-addr-srvr2  5501/tcp                # fcp-addr-srvr2
@@ -8716,6 +8883,7 @@ checkoutdb      5505/tcp                # Checkout Database
 checkoutdb      5505/udp                # Checkout Database
 amc             5506/tcp                # Amcom Mobile Connect
 amc             5506/udp                # Amcom Mobile Connect
+psl-management  5507/tcp                # PowerSysLab Electrical
 sgi-eventmond   5553/tcp                # SGI Eventmond Port
 sgi-eventmond   5553/udp                # SGI Eventmond Port
 sgi-esphttp     5554/tcp                # SGI ESP HTTP
@@ -8725,9 +8893,10 @@ personal-agent  5555/udp                # Personal Agent
 freeciv         5556/tcp                # Freeciv gameplay
 freeciv         5556/udp                # Freeciv gameplay
 farenet         5557/tcp                # Sandlab FARENET
+hpe-dp-bura     5565/tcp                # HPE Advanced BURA
 westec-connect  5566/tcp                # Westec Connect
-m-oap           5567/tcp                # Multicast Object Access Protocol
-m-oap           5567/udp                # Multicast Object Access Protocol
+dof-dps-mc-sec  5567/tcp                # DOF protocol stack
+dof-dps-mc-sec  5567/udp                # DOF protocol stack
 sdt             5568/tcp                # Session Data Transport Multicast
 sdt             5568/udp                # Session Data Transport Multicast
 rdmnet-ctrl     5569/tcp                # Management (RDM) controller status notifications
@@ -8749,6 +8918,7 @@ bis-web         5584/tcp                # BeInSync-Web
 bis-web         5584/udp                # BeInSync-Web
 bis-sync        5585/tcp                # BeInSync-sync
 bis-sync        5585/udp                # BeInSync-sync
+att-mt-sms      5586/tcp                # mobile terminated SMS, not visible to client(ATT)
 ininmessaging   5597/tcp                # inin secure messaging
 ininmessaging   5597/udp                # inin secure messaging
 mctfeed         5598/tcp                # MCT Market Data Feed
@@ -8767,6 +8937,7 @@ a3-sdunode      5604/tcp                # A3-SDUNode
 a3-sdunode      5604/udp                # A3-SDUNode
 a4-sdunode      5605/tcp                # A4-SDUNode
 a4-sdunode      5605/udp                # A4-SDUNode
+efr             5618/tcp                # Fiscal Registering Protocol
 ninaf           5627/tcp                # Node Initiated Network Association Forma
 ninaf           5627/udp                # Node Initiated Network Association Forma
 htrust          5628/tcp                # HTrust API
@@ -8789,7 +8960,9 @@ cssc            5637/tcp                # Symantec CSSC
 flcrs           5638/tcp                # Symantec Fingerprint Lookup and Container Reference
 ics             5639/tcp                # Symantec Integrity Checking
 vfmobile        5646/tcp                # Ventureforth Mobile
-###UNAUTHORIZED USE: Port 5666 used by SAIC NRPE############
+nrpe            5666/tcp                # Nagios Remote Plugin Executor
+filemq          5670/tcp                # ZeroMQ file
+zre-disc        5670/udp                # Local area discovery and msging over ZeroMQ
 amqps           5671/tcp                # amqp protocol over TLS/SSL
 amqps           5671/udp                # amqp protocol over TLS/SSL
 amqp            5672/tcp                # AMQP
@@ -8815,12 +8988,15 @@ ncxcp           5681/tcp                # Net-coneX Control Protocol
 ncxcp           5681/udp                # Net-coneX Control Protocol
 brightcore      5682/udp                # BrightCore control & data transfer exchange
 coap            5683/udp                # Constrained Application Protocol
+coaps           5684/udp                # DTLS-secured CoAP
+gog-multiplayer 5687/udp                # GOG multiplayer game protocol
 ggz             5688/tcp                # GGZ Gaming Zone
 ggz             5688/udp                # GGZ Gaming Zone
 qmvideo         5689/tcp                # QM video network management protocol
 qmvideo         5689/udp                # QM video network management protocol
 rbsystem        5693/tcp                # Robert Bosch Data Transfer
 kmip            5696/tcp                # Key Management Interoperability Protocol
+supportassist   5700/tcp                # Dell SupportAssist data
 proshareaudio   5713/tcp                # proshare conf audio
 proshareaudio   5713/udp                # proshare conf audio
 prosharevideo   5714/tcp                # proshare conf video
@@ -8909,6 +9085,7 @@ icmpd           5813/tcp                # ICMPD
 icmpd           5813/udp                # ICMPD
 spt-automation  5814/tcp                # Support Automation
 spt-automation  5814/udp                # Support Automation
+shiprush-d-ch   5841/tcp                # Z-firm ShipRush interface for web access and bidirectional data
 reversion       5842/tcp                # Reversion Backup/Restore
 wherehoo        5859/tcp                # WHEREHOO
 wherehoo        5859/udp                # WHEREHOO
@@ -8955,6 +9132,7 @@ nuxsl           5991/tcp                # NUXSL
 nuxsl           5991/udp                # NUXSL
 consul-insight  5992/tcp                # Consul InSight Security
 consul-insight  5992/udp                # Consul InSight Security
+cim-rs          5993/tcp                # DMTF WBEM CIM REST
 ndl-ahp-svc     6064/tcp                # NDL-AHP-SVC
 ndl-ahp-svc     6064/udp                # NDL-AHP-SVC
 winpharaoh      6065/tcp                # WinPharaoh
@@ -8976,9 +9154,12 @@ max             6074/tcp                # Microsoft Max
 max             6074/udp                # Microsoft Max
 dpm-acm         6075/tcp                # Microsoft DPM Access Control Manager
 msft-dpm-cert   6076/tcp                # Microsoft DPM WCF Certificates
+iconstructsrv   6077/tcp                # iConstruct Server
+gue             6080/udp                # Generic UDP Encapsulation
+geneve          6081/udp                # Generic Network Virtualization Encapsulation
 p25cai          6082/udp                # APCO Project 25 Common Air Interface
 miami-bcast     6083/udp                # telecomsoftware miami broadcast
-p2p-sip         6084/tcp                # Peer to Peer Infrastructure Protocol
+reload-config   6084/tcp                # Peer to Peer Infrastructure Protocol
 konspire2b      6085/tcp                # konspire2b p2p network
 konspire2b      6085/udp                # konspire2b p2p network
 pdtp            6086/tcp                # PDTP P2P
@@ -9027,6 +9208,7 @@ backup-express  6123/tcp                # Backup Express
 backup-express  6123/udp                # Backup Express
 pnbs            6124/tcp                # Phlexible Network Backup Service
 pnbs            6124/udp                # Phlexible Network Backup Service
+damewaremobgtwy 6130/tcp                # The DameWare Mobile Gateway Service
 nbt-wol         6133/tcp                # New Boundary Tech WOL
 nbt-wol         6133/udp                # New Boundary Tech WOL
 pulsonixnls     6140/tcp                # Pulsonix Network License Service
@@ -9059,6 +9241,8 @@ pscribe         6163/udp                # Precision Scribe Cnx Port
 lm-x            6200/tcp                # LM-X License Manager by X-Formation
 lm-x            6200/udp                # LM-X License Manager by X-Formation
 thermo-calc     6201/udp                # Thermo-Calc_Software
+qmtps           6209/tcp                # QMTP over TLS
+qmtps           6209/udp                # QMTP over TLS
 radmind         6222/tcp                # Radmind Access Protocol
 radmind         6222/udp                # Radmind Access Protocol
 jeol-nsdtp-1    6241/tcp                # JEOL Network Services Data Transport Protocol 1
@@ -9090,6 +9274,8 @@ scup            6315/tcp                # Sensor Control Unit Protocol
 scup-disc       6315/udp                # Sensor Control Unit Protocol Discovery Protocol
 abb-escp        6316/tcp                # Ethernet Sensor Communications Protocol
 abb-escp        6316/udp                # Ethernet Sensor Communications Protocol
+nav-data-cmd    6317/tcp                # Navtech Radar Sensor Data command
+nav-data        6317/udp                # Navtech Radar Sensor Data
 repsvc          6320/tcp                # Double-Take Replication Service
 repsvc          6320/udp                # Double-Take Replication Service
 emp-server1     6321/tcp                # Empress Software Connectivity Server 1
@@ -9099,8 +9285,10 @@ emp-server2     6322/udp                # Empress Software Connectivity Server 2
 hrd-ncs         6324/tcp                # HR Device Network
 hrd-ns-disc     6324/udp                # HR Device Network service
 dt-mgmtsvc      6325/tcp                # Double-Take Management Service
+dt-vra          6326/tcp                # Double-Take Virtual Recovery
 sflow           6343/tcp                # sFlow traffic monitoring
 sflow           6343/udp                # sFlow traffic monitoring
+streletz        6344/tcp                # Argus-Spectr security and fire-prevention systems service
 gnutella-svc    6346/tcp                # gnutella-svc
 gnutella-svc    6346/udp                # gnutella-svc
 gnutella-rtr    6347/tcp                # gnutella-rtr
@@ -9111,8 +9299,10 @@ pmcs            6355/tcp                # PMCS applications
 pmcs            6355/udp                # PMCS applications
 metaedit-mu     6360/tcp                # MetaEdit+ Multi-User
 metaedit-mu     6360/udp                # MetaEdit+ Multi-User
+ndn             6363/udp                # Named Data Networking
 metaedit-se     6370/tcp                # MetaEdit+ Server Administration
 metaedit-se     6370/udp                # MetaEdit+ Server Administration
+redis           6379/tcp                # An advanced key-value cache and store
 metatude-mds    6382/tcp                # Metatude Dialogue Server
 metatude-mds    6382/udp                # Metatude Dialogue Server
 clariion-evr01  6389/tcp                # clariion-evr01
@@ -9145,11 +9335,13 @@ faxcomservice   6417/tcp                # Faxcom Message Service
 faxcomservice   6417/udp                # Faxcom Message Service
 syserverremote  6418/tcp                # SYserver remote commands
 svdrp           6419/tcp                # Simple VDR Protocol
+svdrp-disc      6419/udp                # Simple VDR Protocol Discovery
 nim-vdrshell    6420/tcp                # NIM_VDRShell
 nim-vdrshell    6420/udp                # NIM_VDRShell
 nim-wan         6421/tcp                # NIM_WAN
 nim-wan         6421/udp                # NIM_WAN
 pgbouncer       6432/tcp                # PgBouncer
+tarp            6442/tcp                # Transitory Application Request Protocol
 sun-sr-https    6443/tcp                # Service Registry Default HTTPS Domain
 sun-sr-https    6443/udp                # Service Registry Default HTTPS Domain
 sge_qmaster     6444/tcp  sge-qmaster   # Grid Engine Qmaster Service
@@ -9264,19 +9456,25 @@ afesc-mc        6628/tcp                # AFE Stock Channel M/C
 afesc-mc        6628/udp                # AFE Stock Channel M/C
 mxodbc-connect  6632/tcp                # eGenix mxODBC Connect
 cisco-vpath-tun 6633/udp                # Cisco vPath Services Overlay
+mpls-pm         6634/udp                # MPLS Performance Measurement out-of-band response
+mpls-udp        6635/udp                # Encapsulate MPLS packets in UDP tunnels
+mpls-udp-dtls   6636/udp                # Encapsulate MPLS packets in UDP tunnels with DTLS
+ovsdb           6640/tcp                # Open vSwitch Database
+openflow        6653/tcp                # OpenFlow
+openflow        6653/udp                # OpenFlow
 pcs-sf-ui-man   6655/tcp                # PC SOFT - Software factory UI/manager
 emgmsg          6656/tcp                # Emergency Message Control Service
 palcom-disc     6657/udp                # PalCom Discovery
 ircu            6665/tcp                # IRCU
 ircu            6665/udp                # IRCU
-ircu-2          6666/tcp                # IRCU
-ircu-2          6666/udp                # IRCU
-ircu-3          6667/tcp        ircd    # IRCU
-ircu-3          6667/udp        ircd    # IRCU
-ircu-4          6668/tcp                # IRCU
-ircu-4          6668/udp                # IRCU
-ircu-5          6669/tcp                # IRCU
-ircu-5          6669/udp                # IRCU
+ircu-2          6666/tcp        ircu2   # IRCU
+ircu-2          6666/udp        ircu2   # IRCU
+ircu-3          6667/tcp        ircd ircu3    # IRCU
+ircu-3          6667/udp        ircd ircu3    # IRCU
+ircu-4          6668/tcp        ircu4        # IRCU
+ircu-4          6668/udp        ircu4        # IRCU
+ircu-5          6669/tcp        ircu5        # IRCU
+ircu-5          6669/udp        ircu5        # IRCU
 vocaltec-gold   6670/tcp                # Vocaltec Global Online Directory
 vocaltec-gold   6670/udp                # Vocaltec Global Online Directory
 p4p-portal      6671/tcp                # P4P Portal Service
@@ -9293,7 +9491,9 @@ clever-ctrace   6687/tcp                # CleverView for cTrace Message Service
 clever-tcpip    6688/tcp                # CleverView for TCP/IP Message Service
 tsa             6689/tcp                # Tofino Security Appliance
 tsa             6689/udp                # Tofino Security Appliance
+cleverdetect    6690/tcp                # CLEVERDetect Message Service
 babel           6696/udp                # Babel Routing Protocol
+ircs-u          6697/tcp                # Internet Relay Chat via TLS/SSL
 kti-icad-srvr   6701/tcp                # KTI/ICAD Nameserver
 kti-icad-srvr   6701/udp                # KTI/ICAD Nameserver
 e-design-net    6702/tcp                # e-Design network
@@ -9307,6 +9507,7 @@ ibprotocol      6714/tcp                # Internet Backplane Protocol
 ibprotocol      6714/udp                # Internet Backplane Protocol
 fibotrader-com  6715/tcp                # Fibotrader Communications
 fibotrader-com  6715/udp                # Fibotrader Communications
+princity-agent  6716/tcp                # Princity Agent
 bmc-perf-agent  6767/tcp                # BMC PERFORM AGENT
 bmc-perf-agent  6767/udp                # BMC PERFORM AGENT
 bmc-perf-mgrd   6768/tcp                # BMC PERFORM MGRD
@@ -9317,6 +9518,9 @@ plysrv-http     6770/tcp                # PolyServe http
 plysrv-http     6770/udp                # PolyServe http
 plysrv-https    6771/tcp                # PolyServe https
 plysrv-https    6771/udp                # PolyServe https
+ntz-tracker     6777/tcp                # netTsunami Tracker
+ntz-p2p-storage 6778/tcp                # netTsunami p2p storage
+bfd-lag         6784/udp                # Bidirectional Forwarding Detection on LAG
 dgpf-exchg      6785/tcp                # DGPF Individual Exchange
 dgpf-exchg      6785/udp                # DGPF Individual Exchange
 smc-jmx         6786/tcp                # Sun Java Web Console JMX
@@ -9369,6 +9573,8 @@ swispol         6966/tcp                # swispol
 swispol         6966/udp                # swispol
 acmsoda         6969/tcp                # acmsoda
 acmsoda         6969/udp                # acmsoda
+conductor       6970/tcp                # Conductor test coordination
+conductor-mpx   6970/sctp               # conductor for multiplex
 MobilitySrv     6997/tcp                # Mobility XE Protocol
 MobilitySrv     6997/udp                # Mobility XE Protocol
 iatp-highpri    6998/tcp                # IATP-highPri
@@ -9404,19 +9610,24 @@ vmsvc-2         7025/tcp                # Vormetric Service II
 vmsvc-2         7025/udp                # Vormetric Service II
 op-probe        7030/tcp                # ObjectPlanet probe
 op-probe        7030/udp                # ObjectPlanet probe
+iposplanet      7031/tcp                # IPOSPLANET retailing multi devices protocol
 quest-disc      7040/udp                # Quest application level network service discovery
 arcp            7070/tcp                # ARCP
 arcp            7070/udp                # ARCP
 iwg1            7071/tcp                # IWGADTS Aircraft Housekeeping Message
 iwg1            7071/udp                # IWGADTS Aircraft Housekeeping Message
+martalk         7073/tcp                # MarTalk protocol
 empowerid       7080/tcp                # EmpowerID Communication
 empowerid       7080/udp                # EmpowerID Communication
+zixi-transport  7088/udp                # Zixi live video transport
+jdp-disc        7095/udp                # Java Discovery Protocol
 lazy-ptop       7099/tcp                # lazy-ptop
 lazy-ptop       7099/udp                # lazy-ptop
 font-service    7100/udp                # X Font Service
 elcn            7101/tcp                # Embedded Light Control Network
 elcn            7101/udp                # Embedded Light Control Network
 aes-x170        7107/udp                # AES-X170
+rothaga         7117/tcp                # Encrypted chat and file transfer service
 virprot-lm      7121/tcp                # Virtual Prototypes License Manager
 virprot-lm      7121/udp                # Virtual Prototypes License Manager
 scenidm         7128/tcp                # intelligent data manager
@@ -9443,19 +9654,26 @@ nsrp            7170/tcp                # Adaptive Name/Service Resolution
 nsrp            7170/udp                # Adaptive Name/Service Resolution
 drm-production  7171/tcp                # Discovery and Retention Mgt Production
 drm-production  7171/udp                # Discovery and Retention Mgt Production
+metalbend       7172/tcp                # MetalBend programmable interface
 zsecure         7173/tcp                # zSecure Server
 clutild         7174/tcp                # Clutild
 clutild         7174/udp                # Clutild
+janus-disc      7181/udp                # Janus Guidewire Enterprise Discovery Service Bus
 fodms           7200/tcp                # FODMS FLIP
 fodms           7200/udp                # FODMS FLIP
 dlip            7201/tcp                # DLIP
 dlip            7201/udp                # DLIP
+PS-Server       7215/tcp                # PaperStream Server services
+PS-Capture-Pro  7216/tcp                # PaperStream Capture Professional
 ramp            7227/tcp                # Registry A & M Protocol
 ramp            7227/udp                # Registry A $ M Protocol
 citrixupp       7228/tcp                # Citrix Universal Printing Port
 citrixuppg      7229/tcp                # Citrix UPP Gateway
+aspcoordination 7235/udp                # ASP Coordination Protocol
 display         7236/tcp                # Wi-Fi Alliance Wi-Fi Display Protocol
 pads            7237/tcp                # PADS (Public Area Display System) Server
+frc-hicp        7244/tcp                # FrontRow Calypso Human Interface Control Protocol
+frc-hicp-disc   7244/udp                # FrontRow Calypso Human Interface Control Protocol
 cnap            7262/tcp                # Calypso Network Access Protocol
 cnap            7262/udp                # Calypso Network Access Protocol
 watchme-7272    7272/tcp                # WatchMe Monitoring 7272
@@ -9503,6 +9721,8 @@ rtps-dd-mt      7402/tcp                # RTPS Data-Distribution Meta-Traffic
 rtps-dd-mt      7402/udp                # RTPS Data-Distribution Meta-Traffic
 ionixnetmon     7410/tcp                # Ionix Network Monitor
 ionixnetmon     7410/udp                # Ionix Network Monitor
+daqstream       7411/tcp                # Streaming of measurement
+daqstream       7411/udp                # Streaming of measurement
 mtportmon       7421/tcp                # Matisse Port Monitor
 mtportmon       7421/udp                # Matisse Port Monitor
 pmdmgr          7426/tcp                # OpenView DM Postmaster Manager
@@ -9521,8 +9741,10 @@ faximum         7437/tcp                # Faximum
 faximum         7437/udp                # Faximum
 oracleas-https  7443/tcp                # Oracle Application Server HTTPS
 oracleas-https  7443/udp                # Oracle Application Server HTTPS
+sttunnel        7471/tcp                # Stateless Transport Tunneling Protocol
 rise            7473/tcp                # Rise: The Vieneo Province
 rise            7473/udp                # Rise: The Vieneo Province
+neo4j           7474/tcp                # Neo4j Graph Database
 telops-lmd      7491/tcp                # telops-lmd
 telops-lmd      7491/udp                # telops-lmd
 silhouette      7500/tcp                # Silhouette User
@@ -9552,6 +9774,7 @@ tidp            7548/udp                # Threat Information Distribution Protoc
 nls-tl          7549/tcp                # Network Layer Signaling Transport Layer
 nls-tl          7549/udp                # Network Layer Signaling Transport Layer
 cloudsignaling  7550/udp                # Cloud Signaling Service
+controlone-con  7551/tcp                # ControlONE Console signaling
 sncp            7560/tcp                # Sniffer Command Protocol
 sncp            7560/udp                # Sniffer Command Protocol
 cfw             7563/tcp                # Control Framework
@@ -9560,8 +9783,11 @@ vsi-omega       7566/udp                # VSI Omega
 dell-eql-asm    7569/tcp                # Dell EqualLogic Host Group Management
 aries-kfinder   7570/tcp                # Aries Kfinder
 aries-kfinder   7570/udp                # Aries Kfinder
+coherence       7574/tcp                # Oracle Coherence Cluster Service
 sun-lm          7588/tcp                # Sun License Manager
 sun-lm          7588/udp                # Sun License Manager
+mipi-debug      7606/tcp                # MIPI Alliance Debug
+mipi-debug      7606/udp                # MIPI Alliance Debug
 indi            7624/tcp                # Instrument Neutral Distributed Interface
 indi            7624/udp                # Instrument Neutral Distributed Interface
 simco           7626/tcp                # SImple Middlebox COnfiguration (SIMCO) Server
@@ -9590,6 +9816,7 @@ sun-user-https  7677/tcp                # Sun App Server - HTTPS
 sun-user-https  7677/udp                # Sun App Server - HTTPS
 pando-pub       7680/tcp                # Pando Media Public Distribution
 pando-pub       7680/udp                # Pando Media Public Distribution
+dmt             7683/tcp                # Cleondris DMT
 collaber        7689/tcp                # Collaber Network Service
 collaber        7689/udp                # Collaber Network Service
 klio            7697/tcp                # KLIO communications
@@ -9609,6 +9836,9 @@ freezexservice  7726/tcp                # FreezeX Console Service
 freezexservice  7726/udp                # FreezeX Console Service
 trident-data    7727/tcp                # Trident Systems Data
 trident-data    7727/udp                # Trident Systems Data
+osvr            7728/tcp                # Open-Source Virtual Reality
+osvr            7728/udp                # Open-Source Virtual Reality
+osvr            7728/sctp               # Open-Source Virtual Reality
 smip            7734/tcp                # Smith Protocol over IP
 smip            7734/udp                # Smith Protocol over IP
 aiagent         7738/tcp                # HP Enterprise Discovery Agent
@@ -9622,6 +9852,7 @@ raqmon-pdu      7744/tcp                # RAQMON PDU
 raqmon-pdu      7744/udp                # RAQMON PDU
 prgp            7747/tcp                # Put/Run/Get Protocol
 prgp            7747/udp                # Put/Run/Get Protocol
+inetfs          7775/tcp                # File System using TLS over WAN
 cbt             7777/tcp                # cbt
 cbt             7777/udp                # cbt
 interwise       7778/tcp                # Interwise
@@ -9630,6 +9861,7 @@ vstat           7779/tcp                # VSTAT
 vstat           7779/udp                # VSTAT
 accu-lmgr       7781/tcp                # accu-lmgr
 accu-lmgr       7781/udp                # accu-lmgr
+s-bfd           7784/udp                # Seamless Bidirectional Forwarding Detection
 minivend        7786/tcp                # MINIVEND
 minivend        7786/udp                # MINIVEND
 popup-reminders 7787/tcp                # Popup Reminders Receive
@@ -9648,16 +9880,19 @@ asr             7800/tcp                # Apple Software Restore
 asr             7800/udp                # Apple Software Restore
 ssp-client      7801/tcp                # Secure Server Protocol - client
 ssp-client      7801/udp                # Secure Server Protocol - client
+vns-tp          7802/udp                # Virtualized Network Services tunnel protocol
 rbt-wanopt      7810/tcp                # Riverbed WAN Optimization Protocol
 rbt-wanopt      7810/udp                # Riverbed WAN Optimization Protocol
 apc-7845        7845/tcp                # APC 7845
 apc-7845        7845/udp                # APC 7845
 apc-7846        7846/tcp                # APC 7846
 apc-7846        7846/udp                # APC 7846
+csoauth         7847/tcp                # A product key authentication by CSO
 mobileanalyzer  7869/tcp                # MobileAnalyzer& MobileMonitor
 rbt-smc         7870/tcp                # Riverbed Steelhead Mobile Service
 mdm             7871/tcp                # Mobile Device Management
 mipv6tls        7872/udp                # TLS-based Mobile IPv6 Security
+owms            7878/tcp                # Opswise Message Service
 pss             7880/tcp                # Pearson
 pss             7880/udp                # Pearson
 ubroker         7887/tcp                # Universal Broker
@@ -9676,6 +9911,8 @@ t2-drm          7932/tcp                # Tier 2 Data Resource Manager
 t2-drm          7932/udp                # Tier 2 Data Resource Manager
 t2-brm          7933/tcp                # Tier 2 Business Rules Manager
 t2-brm          7933/udp                # Tier 2 Business Rules Manager
+generalsync     7962/tcp                # general-purpose synchronization protocol
+generalsync     7962/udp                # general-purpose synchronization protocol
 supercell       7967/tcp                # Supercell
 supercell       7967/udp                # Supercell
 micromuse-ncps  7979/tcp                # Micromuse-ncps
@@ -9740,6 +9977,8 @@ senomix07       8058/udp                # Senomix Timesheets Client [1 year assi
 senomix08       8059/tcp                # Senomix Timesheets Client [1 year assignment]
 senomix08       8059/udp                # Senomix Timesheets Client [1 year assignment]
 aero            8060/udp                # Asymmetric Extended Route Optimization (AERO)
+toad-bi-appsrvr 8066/tcp                # Toad BI Application Server
+infi-async      8067/tcp                # Infinidat async replication
 gadugadu        8074/tcp                # Gadu-Gadu
 gadugadu        8074/udp                # Gadu-Gadu
 us-cli          8082/tcp                # Utilistor (Client)
@@ -9758,10 +9997,12 @@ sac             8097/udp                # SAC Port Id
 xprint-server   8100/tcp                # Xprint Server
 xprint-server   8100/udp                # Xprint Server
 ldoms-migr      8101/tcp                # Logical Domains Migration
+kz-migr         8102/tcp                # Oracle Kernel zones migration server
 mtl8000-matrix  8115/tcp                # MTL8000 Matrix
 mtl8000-matrix  8115/udp                # MTL8000 Matrix
 cp-cluster      8116/tcp                # Check Point Clustering
 cp-cluster      8116/udp                # Check Point Clustering
+purityrpc       8117/tcp                # Purity replication clustering and remote management
 privoxy         8118/tcp                # Privoxy HTTP proxy
 privoxy         8118/udp                # Privoxy HTTP proxy
 apollo-data     8121/tcp                # Apollo Data Port
@@ -9778,19 +10019,24 @@ indigo-vbcp     8131/tcp                # INDIGO-VBCP
 indigo-vbcp     8131/udp                # INDIGO-VBCP
 dbabble         8132/tcp                # dbabble
 dbabble         8132/udp                # dbabble
+puppet          8140/tcp                # The Puppet master service
 isdd            8148/tcp                # i-SDD file transfer
 isdd            8148/udp                # i-SDD file transfer
 eor-game        8149/udp                # Edge of Reality game data
+quantastor      8153/tcp                # QuantaStor Management interface
 patrol          8160/tcp                # Patrol
 patrol          8160/udp                # Patrol
 patrol-snmp     8161/tcp                # Patrol SNMP
 patrol-snmp     8161/udp                # Patrol SNMP
+lpar2rrd        8162/tcp                # LPAR2RRD client server communication
 intermapper     8181/tcp                # Intermapper network management system
 vmware-fdm      8182/tcp                # VMware Fault Domain Manager
 vmware-fdm      8182/udp                # VMware Fault Domain Manager
 proremote       8183/tcp                # ProRemote
 itach           8184/tcp                # Remote iTach Connection
 itach           8184/udp                # Remote iTach Connection
+gcp-rphy        8190/tcp                # Generic control plane for RPHY
+limnerpressure  8191/tcp                # Limner Pressure
 spytechphone    8192/tcp                # SpyTech Phone Service
 spytechphone    8192/udp                # SpyTech Phone Service
 blp1            8194/tcp                # Bloomberg data API
@@ -9816,12 +10062,16 @@ lm-webwatcher   8208/tcp                # LM Webwatcher
 lm-webwatcher   8208/udp                # LM Webwatcher
 rexecj          8230/tcp                # RexecJ Server
 rexecj          8230/udp                # RexecJ Server
+hncp-udp-port   8231/udp                # HNCP
+hncp-dtls-port  8232/udp                # HNCP over DTLS
 synapse-nhttps  8243/tcp                # Synapse Non Blocking HTTPS
 synapse-nhttps  8243/udp                # Synapse Non Blocking HTTPS
 pando-sec       8276/tcp                # Pando Media Controlled Distribution
 pando-sec       8276/udp                # Pando Media Controlled Distribution
 synapse-nhttp   8280/tcp                # Synapse Non Blocking HTTP
 synapse-nhttp   8280/udp                # Synapse Non Blocking HTTP
+libelle         8282/tcp                # Libelle EnterpriseBus
+libelle-disc    8282/udp                # Libelle EnterpriseBus Discovery
 blp3            8292/tcp                # Bloomberg professional
 blp3            8292/udp                # Bloomberg professional
 blp4            8294/tcp                # Bloomberg intelligent client
@@ -9836,6 +10086,8 @@ tnp-discover    8320/tcp                # Thin(ium) Network Protocol
 tnp-discover    8320/udp                # Thin(ium) Network Protocol
 tnp             8321/tcp                # Thin(ium) Network Protocol
 tnp             8321/udp                # Thin(ium) Network Protocol
+garmin-marine   8322/tcp                # Garmin Marine
+garmin-marine   8322/udp                # Garmin Marine
 server-find     8351/tcp                # Server Find
 server-find     8351/udp                # Server Find
 cruise-enum     8376/tcp                # Cruise ENUM
@@ -9850,6 +10102,7 @@ cruise-update   8380/tcp                # Cruise UPDATE
 cruise-update   8380/udp                # Cruise UPDATE
 m2mservices     8383/tcp                # M2m Services
 m2mservices     8383/udp                # M2m Services
+marathontp      8384/udp                # Marathon Transport Protocol
 cvd             8400/tcp                # cvd
 cvd             8400/udp                # cvd
 sabarsd         8401/tcp                # sabarsd
@@ -9860,6 +10113,7 @@ admind2         8403/tcp                # admind
 admind2         8403/udp                # admind
 svcloud         8404/tcp                # SuperVault Cloud
 svbackup        8405/tcp                # SuperVault Backup
+dlpx-sp         8415/tcp                # Delphix Session Protocol
 espeech         8416/tcp                # eSpeech Session Protocol
 espeech         8416/udp                # eSpeech Session Protocol
 espeech-rtp     8417/tcp                # eSpeech RTP Protocol
@@ -9870,8 +10124,11 @@ pcsync-https    8443/tcp                # PCsync HTTPS
 pcsync-https    8443/udp                # PCsync HTTPS
 pcsync-http     8444/tcp                # PCsync HTTP
 pcsync-http     8444/udp                # PCsync HTTP
+copy            8445/tcp                # Port for copy per sync feature
+copy-disc       8445/udp                # Port for copy discovery
 npmp            8450/tcp                # npmp
 npmp            8450/udp                # npmp
+nexentamv       8457/tcp                # Nexenta Management GUI
 cisco-avp       8470/tcp                # Cisco Address Validation Protocol
 pim-port        8471/tcp                # PIM over Reliable Transport
 pim-port        8471/sctp               # PIM over Reliable Transport
@@ -9885,12 +10142,14 @@ fmtp            8500/tcp                # Flight Message Transfer Protocol
 fmtp            8500/udp                # Flight Message Transfer Protocol
 cmtp-mgt        8501/tcp                # CYTEL Message Transfer Management
 cmtp-av         8501/udp                # CYTEL Message Transfer Audio and Video
+ftnmtp          8502/tcp                # FTN Message Transfer
+lsp-self-ping   8503/udp                # MPLS LSP Self-Ping
 rtsp-alt        8554/tcp                # RTSP Alternate (see port 554)
 rtsp-alt        8554/udp                # RTSP Alternate (see port 554)
 d-fence         8555/tcp                # SYMAX D-FENCE
 d-fence         8555/udp                # SYMAX D-FENCE
-oap-admin       8567/tcp                # Object Access Protocol Administration
-oap-admin       8567/udp                # Object Access Protocol Administration
+dof-tunnel      8567/tcp                # DOF tunneling protocol
+dof-tunnel      8567/udp                # DOF tunneling protocol
 asterix         8600/tcp                # Surveillance Data
 asterix         8600/udp                # Surveillance Data
 canon-cpp-disc  8609/udp                # Canon Compact Printer Protocol Discovery
@@ -9905,23 +10164,31 @@ canon-bjnp3     8613/udp                # Canon BJNP Port 3
 canon-bjnp4     8614/tcp                # Canon BJNP Port 4
 canon-bjnp4     8614/udp                # Canon BJNP Port 4
 imink           8615/tcp                # Imink Service Control
+monetra         8665/tcp                # Monetra
+monetra-admin   8666/tcp                # Monetra Administrative
 msi-cps-rm      8675/tcp                # Programming Software for Radio Management Motorola Solutions Customer
 msi-cps-rm-disc 8675/udp                # Programming Software for Radio Management Discovery
 sun-as-jmxrmi   8686/tcp                # Sun App Server - JMX/RMI
 sun-as-jmxrmi   8686/udp                # Sun App Server - JMX/RMI
+openremote-ctrl 8688/tcp                # OpenRemote Controller
 vnyx            8699/tcp                # VNYX Primary Port
 vnyx            8699/udp                # VNYX Primary Port
+nvc             8711/tcp                # Nuance Voice Control
 dtp-net         8732/udp                # DASGIP Net Services
 ibus            8733/tcp                # iBus
 ibus            8733/udp                # iBus
+dey-keyneg      8750/tcp                # DEY Storage Key Negotiation
 mc-appserver    8763/tcp                # MC-APPSERVER
 mc-appserver    8763/udp                # MC-APPSERVER
 openqueue       8764/tcp                # OPENQUEUE
 openqueue       8764/udp                # OPENQUEUE
 ultraseek-http  8765/tcp                # Ultraseek HTTP
 ultraseek-http  8765/udp                # Ultraseek HTTP
+amcs            8766/tcp                # Agilent Connectivity Service
+amcs            8766/udp                # Agilent Connectivity Service
 dpap            8770/tcp                # Digital Photo Access Protocol
 dpap            8770/udp                # Digital Photo Access Protocol
+uec             8778/tcp                # Stonebranch Universal Enterprise Controller
 msgclnt         8786/tcp                # Message Client
 msgclnt         8786/udp                # Message Client
 msgsrvr         8787/tcp                # Message Server
@@ -9953,6 +10220,8 @@ ddi-tcp-6       8893/tcp                # Desktop Data TCP 5: NewsEDGE/Web appli
 ddi-udp-6       8893/udp                # Desktop Data UDP 5: NewsEDGE/Web application
 ddi-tcp-7       8894/tcp                # Desktop Data TCP 6: COAL application
 ddi-udp-7       8894/udp                # Desktop Data UDP 6: COAL application
+canto-roboflow  8898/tcp                # Canto RoboFlow Control
+#canto-roboflow  8998/tcp                        # Canto RoboFlow Control
 ospf-lite       8899/tcp                # ospf-lite
 ospf-lite       8899/udp                # ospf-lite
 jmb-cds1        8900/tcp                # JMB-CDS 1
@@ -9971,12 +10240,16 @@ twds            8937/tcp                # Transaction Warehouse Data Service
 ub-dns-control  8953/tcp                # unbound dns nameserver control
 cumulus-admin   8954/tcp                # Cumulus Admin Port
 cumulus-admin   8954/udp                # Cumulus Admin Port
+nod-provider    8980/tcp                # Network of Devices Provider
+nod-provider    8980/udp                # Network of Devices Provider
+nod-client      8981/udp                # Network of Devices Client
 sunwebadmins    8989/tcp                # Sun Web Server SSL Admin Service
 sunwebadmins    8989/udp                # Sun Web Server SSL Admin Service
 http-wmap       8990/tcp                # webmail HTTP service
 http-wmap       8990/udp                # webmail HTTP service
 https-wmap      8991/tcp                # webmail HTTPS service
 https-wmap      8991/udp                # webmail HTTPS service
+oracle-ms-ens   8997/tcp                # Oracle Messaging Server Event Notification Service
 bctp            8999/tcp                # Brodos Crypto Trade Protocol
 bctp            8999/udp                # Brodos Crypto Trade Protocol
 cslistener      9000/tcp                # CSlistener
@@ -9985,6 +10258,7 @@ etlservicemgr   9001/tcp                # ETL Service Manager
 etlservicemgr   9001/udp                # ETL Service Manager
 dynamid         9002/tcp                # DynamID authentication
 dynamid         9002/udp                # DynamID authentication
+golem           9005/tcp                # Golem Inter-System RPC
 ogs-client      9007/udp                # Open Grid Services Client
 ogs-server      9008/tcp                # Open Grid Services Server
 pichat          9009/tcp                # Pichat Server
@@ -10046,6 +10320,8 @@ astergate-disc  9106/udp                # Astergate Discovery Service
 astergatefax    9107/tcp                # AstergateFax Control Service
 mxit            9119/tcp                # MXit Instant Messaging
 mxit            9119/udp                # MXit Instant Messaging
+grcmp           9122/tcp                # Global Relay compliant mobile IM protocol
+grcp            9123/tcp                # Global Relay compliant IM protocol
 dddp            9131/tcp                # Dynamic Device Discovery
 dddp            9131/udp                # Dynamic Device Discovery
 apani1          9160/tcp                # apani1
@@ -10100,6 +10376,7 @@ teamcoherence   9222/tcp                # QSC Team Coherence
 teamcoherence   9222/udp                # QSC Team Coherence
 Mon             9255/tcp                # Manager On Network
 Mon             9255/udp                # Manager On Network
+traingpsdata    9277/udp                # GPS Data transmition from train to ground network
 pegasus         9278/tcp                # Pegasus GPS Platform
 pegasus         9278/udp                # Pegasus GPS Platform
 pegasus-ctl     9279/tcp                # Pegaus GPS System Control Interface
@@ -10139,6 +10416,7 @@ mpidcmgr        9343/tcp                # MpIdcMgr
 mpidcmgr        9343/udp                # MpIdcMgr
 mphlpdmc        9344/tcp                # Mphlpdmc
 mphlpdmc        9344/udp                # Mphlpdmc
+rancher         9345/tcp                # Rancher Agent
 ctechlicensing  9346/tcp                # C Tech Licensing
 ctechlicensing  9346/udp                # C Tech Licensing
 fjdmimgr        9374/tcp                # fjdmimgr
@@ -10210,6 +10488,7 @@ peoctlr         9630/tcp                # Peovica Controller
 peocoll         9631/tcp                # Peovica Collector
 mc-comm         9632/udp                # Mobile-C Communications
 pqsflows        9640/tcp                # ProQueSys Flows Service
+zoomcp          9666/tcp                # Zoom Control Panel Game Server Management
 xmms2           9667/tcp                # Cross-platform Music Multiplexing System
 xmms2           9667/udp                # Cross-platform Music Multiplexing System
 tec5-sdctp      9668/tcp                # tec5 Spectral Device Control Protocol
@@ -10244,7 +10523,6 @@ gt-proxy        9889/tcp                # Port for Cable network related data pr
 gt-proxy        9889/udp                # Port for Cable network related data proxy or repeater
 monkeycom       9898/tcp                # MonkeyCom
 monkeycom       9898/udp                # MonkeyCom
-sctp-tunneling  9899/tcp                # SCTP TUNNELING
 sctp-tunneling  9899/udp                # SCTP TUNNELING
 iua             9900/tcp                # IUA
 iua             9900/udp                # IUA
@@ -10258,6 +10536,7 @@ domaintime      9909/tcp                # domaintime
 domaintime      9909/udp                # domaintime
 sype-transport  9911/tcp                # SYPECom Transport Protocol
 sype-transport  9911/udp                # SYPECom Transport Protocol
+xybrid-cloud    9925/tcp                # XYBRID Cloud
 apc-9950        9950/tcp                # APC 9950
 apc-9950        9950/udp                # APC 9950
 apc-9951        9951/tcp                # APC 9951
@@ -10272,6 +10551,7 @@ alljoyn-mcm     9955/udp                # multiplexed constrained messaging
 alljoyn         9956/udp                # Alljoyn Name Service
 odnsp           9966/tcp                # OKI Data Network Setting Protocol
 odnsp           9966/udp                # OKI Data Network Setting Protocol
+xybrid-rt       9978/tcp                # XYBRID RT Server
 dsm-scm-target  9987/tcp                # DSM/SCM Target Interface
 dsm-scm-target  9987/udp                # DSM/SCM Target Interface
 nsesrvr         9988/tcp                # Software Essentials Secure HTTP server
@@ -10305,6 +10585,7 @@ documentum_s    10003/tcp  documentum-s  # EMC-Documentum Content Server Product
 documentum_s    10003/udp  documentum-s  # EMC-Documentum Content Server Product
 emcrmirccd      10004/tcp               # EMC Replication Manager Client
 emcrmird        10005/tcp               # EMC Replication Manager Server
+netapp-sync     10006/tcp               # Sync replication protocol among different NetApp platforms
 mvs-capacity    10007/tcp               # MVS Capacity
 mvs-capacity    10007/udp               # MVS Capacity
 octopus         10008/tcp               # Octopus Multiplexer
@@ -10312,6 +10593,7 @@ octopus         10008/udp               # Octopus Multiplexer
 swdtp-sv        10009/tcp               # Systemwalker Desktop Patrol
 swdtp-sv        10009/udp               # Systemwalker Desktop Patrol
 rxapi           10010/tcp               # ooRexx rxapi services
+cefdvmp         10023/udp               # Comtech EF-Data's Vipersat Management Protocol (likely typo in IANA reservation)
 zabbix-agent    10050/tcp               # Zabbix Agent
 zabbix-agent    10050/udp               # Zabbix Agent
 zabbix-trapper  10051/tcp               # Zabbix Trapper
@@ -10342,6 +10624,7 @@ netiq-voipa     10116/tcp               # NetIQ VoIP Assessor
 netiq-voipa     10116/udp               # NetIQ VoIP Assessor
 iqrm            10117/tcp               # NetIQ IQCResource Managament Svc
 iqrm            10117/udp               # NetIQ IQCResource Managament Svc
+cimple          10125/udp               # HotLink CIMple REST API
 bmc-perf-sd     10128/tcp               # BMC-PERFORM-SERVICE DAEMON
 bmc-perf-sd     10128/udp               # BMC-PERFORM-SERVICE DAEMON
 bmc-gms         10129/tcp               # BMC General Manager Server
@@ -10357,11 +10640,13 @@ rsms            10201/tcp               # Remote Server Management Service
 rscs            10201/udp               # Remote Server Control and Test Service
 apollo-relay    10252/tcp               # Apollo Relay Port
 apollo-relay    10252/udp               # Apollo Relay Port
+eapol-relay     10253/udp               # Relay of EAPOL frames
 axis-wimp-port  10260/tcp               # Axis WIMP Port
 axis-wimp-port  10260/udp               # Axis WIMP Port
 blocks          10288/tcp               # Blocks
 blocks          10288/udp               # Blocks
 cosir           10321/tcp               # Computer Op System Information Report
+bngsync         10439/udp               # BalanceNG session table synchronization protocol
 hip-nat-t       10500/udp               # HIP NAT-traversal
 MOS-lower       10540/tcp               # MOS Media Object Metadata Port
 MOS-lower       10540/udp               # MOS Media Object Metadata Port
@@ -10373,6 +10658,7 @@ MOS-soap        10543/tcp               # MOS SOAP Default Port
 MOS-soap        10543/udp               # MOS SOAP Default Port
 MOS-soap-opt    10544/tcp               # MOS SOAP Optional Port
 MOS-soap-opt    10544/udp               # MOS SOAP Optional Port
+serverdocs      10548/tcp               # Apple Document Sharing
 printopia       10631/tcp               # administration and control of "Printopia"
 gap             10800/tcp               # Gestor de Acaparamiento para Pocket PCs
 gap             10800/udp               # Gestor de Acaparamiento para Pocket PCs
@@ -10382,16 +10668,26 @@ nbd             10809/tcp               # Linux Network Block Device
 nmc-disc        10810/udp               # Nuance Mobile Care Discovery
 helix           10860/tcp               # Helix Client/Server
 helix           10860/udp               # Helix Client/Server
+bveapi          10880/tcp               # BVEssentials HTTP API
+bveapi          10880/udp               # BVEssentials HTTP API
+octopustentacle 10933/tcp               # Octopus Deploy Tentacle
 rmiaux          10990/tcp               # Auxiliary RMI Port
 rmiaux          10990/udp               # Auxiliary RMI Port
 irisa           11000/tcp               # IRISA
 irisa           11000/udp               # IRISA
 metasys         11001/tcp               # Metasys
 metasys         11001/udp               # Metasys
+cefd-vmp        11023/udp               # Comtech EF-Data's Vipersat Management Protocol (is listed as 10023 in IANA)
+weave           11095/tcp               # Nest device-to-device and device-to-service application protocol
+weave           11095/udp               # Nest device-to-device and device-to-service application protocol
+origo-sync      11103/tcp               # OrigoDB Server Sync
 netapp-icmgmt   11104/tcp               # NetApp Intercluster Management
 netapp-icdata   11105/tcp               # NetApp Intercluster Data
 sgi-lk          11106/tcp               # SGI LK Licensing service
 sgi-lk          11106/udp               # SGI LK Licensing service
+myq-termlink    11108/udp               # Hardware Terminals Discovery protocol
+sgi-dmfmgr      11109/tcp               # Data migration facility manager
+sgi-soap        11110/tcp               # Data migration facility SOAP
 vce             11111/tcp               # Viral Computing Environment (VCE)
 vce             11111/udp               # Viral Computing Environment (VCE)
 dicom           11112/tcp               # DICOM
@@ -10426,8 +10722,12 @@ arena-server    11321/tcp               # Arena Server Listen
 arena-server    11321/udp               # Arena Server Listen
 atm-uhas        11367/tcp               # ATM UHAS
 atm-uhas        11367/udp               # ATM UHAS
+lsdp            11430/udp               # Lenbrook Service Discovery Protocol
 tempest-port    11600/tcp               # Tempest Protocol Port
 tempest-port    11600/udp               # Tempest Protocol Port
+emc-xsw-dconfig 11623/tcp               # EMC XtremSW distributed config
+emc-xsw-dcache  11723/tcp               # EMC XtremSW distributed cache
+emc-xsw-dcache  11723/udp               # EMC XtremSW distributed cache
 intrepid-ssl    11751/tcp               # Intrepid SSL
 intrepid-ssl    11751/udp               # Intrepid SSL
 lanschool       11796/tcp               # LanSchool
@@ -10483,6 +10783,7 @@ italk           12345/tcp               # Italk Chat System
 italk           12345/udp               # Italk Chat System
 tsaf            12753/tcp               # tsaf port
 tsaf            12753/udp               # tsaf port
+netperf         12865/tcp               # control port for netperf benchmark
 i-zipqd         13160/tcp               # I-ZIPQD
 i-zipqd         13160/udp               # I-ZIPQD
 bcslogc         13216/tcp               # Black Crow Software application logging
@@ -10522,6 +10823,7 @@ scotty-ft       14000/udp               # SCOTTY High-Speed Filetransfer
 sua             14001/tcp               # SUA
 sua             14001/udp               # De-Registered (2001 June 06)
 sua             14001/sctp              # SUA
+scotty-disc     14002/udp               # Discovery of a SCOTTY hardware codec board
 sage-best-com1  14033/tcp               # sage Best! Config Server 1
 sage-best-com1  14033/udp               # sage Best! Config Server 1
 sage-best-com2  14034/tcp               # sage Best! Config Server 2
@@ -10530,6 +10832,7 @@ vcs-app         14141/tcp               # VCS Application
 vcs-app         14141/udp               # VCS Application
 icpp            14142/tcp               # IceWall Cert Protocol
 icpp            14142/udp               # IceWall Cert Protocol
+icpps           14143/tcp               # IceWall Cert Protocol over TLS
 gcm-app         14145/tcp               # GCM Application
 gcm-app         14145/udp               # GCM Application
 vrts-tdd        14149/tcp               # Veritas Traffic Director
@@ -10547,6 +10850,8 @@ hde-lcesrvr-2   14937/tcp               # hde-lcesrvr-2
 hde-lcesrvr-2   14937/udp               # hde-lcesrvr-2
 hydap           15000/tcp               # Hypack Data Aquisition
 hydap           15000/udp               # Hypack Data Aquisition
+onep-tls        15001/tcp               # Open Network Environment TLS
+# onep-tls        15002/tcp                       # Open Network Environment TLS
 v2g-secc        15118/udp               # v2g Supply Equipment Communication Controller Discovery Protocol
 xpilot          15345/tcp               # XPilot Contact Port
 xpilot          15345/udp               # XPilot Contact Port
@@ -10585,8 +10890,11 @@ netserialext4   16368/tcp               # Network Serial Extension Ports Four
 netserialext4   16368/udp               # Network Serial Extension Ports Four
 connected       16384/tcp               # Connected Corp
 connected       16384/udp               # Connected Corp
+rdgs            16385/tcp               # Reliable Datagram Sockets
 xoms            16619/tcp               # X509 Objects Management Service
+axon-tunnel     16665/tcp               # Reliable multipath data transport for high latencies
 vtp             16666/udp               # Vidder Tunnel Protocol
+cadsisvr        16789/tcp               # mainframe External Security Managers
 newbay-snc-mc   16900/tcp               # Newbay Mobile Client Update Service
 newbay-snc-mc   16900/udp               # Newbay Mobile Client Update Service
 sgcip           16950/tcp               # Simple Generic Client Interface Protocol
@@ -10603,19 +10911,27 @@ amt-redir-tls   16995/tcp               # Intel(R) AMT Redirection/TLS
 amt-redir-tls   16995/udp               # Intel(R) AMT Redirection/TLS
 isode-dua       17007/tcp               #
 isode-dua       17007/udp               #
+vestasdlp       17184/tcp               # Vestas Data Layer Protocol
 soundsvirtual   17185/tcp               # Sounds Virtual
 soundsvirtual   17185/udp               # Sounds Virtual
 chipper         17219/tcp               # Chipper
 chipper         17219/udp               # Chipper
+avtp            17220/tcp               # IEEE 1722 Transport Protocol for Time Sensitive Applications
+avtp            17220/udp               # IEEE 1722 Transport Protocol for Time Sensitive Applications
 avdecc          17221/tcp               # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control
 avdecc          17221/udp               # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control
 cpsp            17222/udp               # Control Plane Synchronization Protocol
+isa100-gci      17223/tcp               # ISA100 Wireless gateway to client
+trdp-pd         17224/udp               # Train Realtime Data Protocol
+trdp-md         17225/tcp               # Train Realtime Data Protocol
+trdp-md         17225/udp               # Train Realtime Data Protocol
 integrius-stp   17234/tcp               # Integrius Secure Tunnel Protocol
 integrius-stp   17234/udp               # Integrius Secure Tunnel Protocol
 ssh-mgmt        17235/tcp               # SSH Tectia Manager
 ssh-mgmt        17235/udp               # SSH Tectia Manager
 db-lsp          17500/tcp               # Dropbox LanSync Protocol
 db-lsp-disc     17500/udp               # Dropbox LanSync Discovery
+ailith          17555/tcp               # Ailith management of routers
 ea              17729/tcp               # Eclipse Aviation
 ea              17729/udp               # Eclipse Aviation
 zep             17754/tcp               # Encap. ZigBee Packets
@@ -10663,6 +10979,8 @@ apc-necmp       18888/tcp               # APCNECMP
 apc-necmp       18888/udp               # APCNECMP
 igrid           19000/tcp               # iGrid Server
 igrid           19000/udp               # iGrid Server
+scintilla       19007/tcp               # Scintilla protocol for device services
+scintilla       19007/udp               # Scintilla protocol for device services
 j-link          19020/tcp               # J-Link TCP/IP Protocol
 opsec-uaa       19191/tcp               # OPSEC UAA
 opsec-uaa       19191/udp               # OPSEC UAA
@@ -10686,6 +11004,7 @@ sxuptp          19540/tcp               # SXUPTP
 sxuptp          19540/udp               # SXUPTP
 jcp             19541/tcp               # JCP Client
 jcp             19541/udp               # JCP Client
+mle             19788/udp               # Mesh Link Establishment
 iec-104-sec     19998/tcp               # IEC 60870-5-104 process control - secure
 dnp-sec         19999/tcp               # Distributed Network Protocol - Secure
 dnp-sec         19999/udp               # Distributed Network Protocol - Secure
@@ -10712,6 +11031,7 @@ mountd          20048/udp               # NFS mount protocol
 nfsrdma         20049/tcp               # Network File System (NFS) over RDMA
 nfsrdma         20049/udp               # Network File System (NFS) over RDMA
 nfsrdma         20049/sctp              # Network File System (NFS) over RDMA
+avesterra       20057/tcp               # AvesTerra Hypergraph Transfer Protocol (HGTP)
 tolfab          20167/tcp               # TOLfab Data Change
 tolfab          20167/udp               # TOLfab Data Change
 ipdtp-port      20202/tcp               # IPD Tunneling Port
@@ -10726,6 +11046,7 @@ athand-mmp      20999/tcp               # At Hand MMP
 athand-mmp      20999/udp               # AT Hand MMP
 irtrans         21000/tcp               # IRTrans Control
 irtrans         21000/udp               # IRTrans Control
+notezilla-lan   21010/tcp               # Notezilla.Lan Server
 rdm-tfs         21553/tcp               # Raima RDM TFS
 dfserver        21554/tcp               # MineScape Design File Server
 dfserver        21554/udp               # MineScape Design File Server
@@ -10757,13 +11078,17 @@ optohost005     22005/tcp               # Opto Host Port 5
 optohost005     22005/udp               # Opto Host Port 5
 dcap            22125/tcp               # dCache Access Protocol
 gsidcap         22128/tcp               # GSI dCache Access Protocol
+easyengine      22222/tcp               # EasyEngine is CLI tool to manage WordPress Sites on Nginx server
 cis             22305/udp               # CompactIS Tunnel
+shrewd-control  22335/tcp               # Initium Labs Security and Automation Control
+shrewd-stream   22335/udp               # Initium Labs Security and Automation Streaming
 cis-secure      22343/tcp               # CompactIS Secure Tunnel
 cis-secure      22343/udp               # CompactIS Secure Tunnel
 WibuKey         22347/tcp               # WibuKey Standard WkLan
 WibuKey         22347/udp               # WibuKey Standard WkLan
 CodeMeter       22350/tcp               # CodeMeter Standard
 CodeMeter       22350/udp               # CodeMeter Standard
+codemeter-cmwan 22351/tcp               # requests of copy protection software
 caldsoft-backup 22537/tcp               # CaldSoft Backup server file transfer
 vocaltec-wconf  22555/tcp               # Vocaltec Web Conference
 vocaltec-phone  22555/udp               # Vocaltec Internet Phone
@@ -10787,6 +11112,8 @@ inovaport6      23005/tcp               # Inova LightLink Server Type 6
 inovaport6      23005/udp               # Inova LightLink Server Type 6
 gntp            23053/tcp               # Generic Notification Transport Protocol
 s102            23272/udp               # S102 application
+5afe-dir        23294/tcp               # 5AFE SDN Directory
+5afe-disc       23294/udp               # 5AFE SDN Directory discovery
 elxmgmt         23333/tcp               # Emulex HBAnyware Remote Management
 elxmgmt         23333/udp               # Emulex HBAnyware Remote Management
 novar-dbase     23400/tcp               # Novar Data
@@ -10818,10 +11145,13 @@ vista-4gl       24249/tcp               # Vista 4GL
 vista-4gl       24249/udp               # Vista 4GL
 ild             24321/tcp               # Isolv Local Directory
 ild             24321/udp               # Isolv Local Directory
+hid             24322/udp               # Human Interface Device data streams transport
 intel_rci       24386/tcp  intel-rci    # Intel RCI
 intel_rci       24386/udp  intel-rci    # Intel RCI
 tonidods        24465/tcp               # Tonido Domain Server
 tonidods        24465/udp               # Tonido Domain Server
+bilobit         24577/tcp               # bilobit Service
+bilobit-update  24577/udp               # bilobit Service Update
 flashfiler      24677/tcp               # FlashFiler
 flashfiler      24677/udp               # FlashFiler
 proactivate     24678/tcp               # Turbopower Proactivate
@@ -10869,6 +11199,7 @@ bf-game         25954/udp               # Bitfighter game server
 bf-master       25955/udp               # Bitfighter master server
 scscp           26133/tcp               # Symbolic Computation Software Composability Protocol
 scscp           26133/udp               # Symbolic Computation Software Composability Protocol
+cockroach       26257/tcp               # CockroachDB
 ezproxy         26260/tcp               # eZproxy
 ezproxy         26260/udp               # eZproxy
 ezmeeting       26261/tcp               # eZmeeting
@@ -10891,29 +11222,42 @@ kopek-httphead  27504/tcp               # Kopek HTTP Head Port
 kopek-httphead  27504/udp               # Kopek HTTP Head Port
 ars-vista       27782/tcp               # ARS VISTA Application
 ars-vista       27782/udp               # ARS VISTA Application
+astrolink       27876/tcp               # Astrolink Protocol
 tw-auth-key     27999/tcp               # TW Authentication/Key Distribution and
 tw-auth-key     27999/udp               # Attribute Certificate Services
 nxlmd           28000/tcp               # NX License Manager
 nxlmd           28000/udp               # NX License Manager
 pqsp            28001/tcp               # PQ Service
+a27-ran-ran     28119/udp               # A27 cdma2000 RAN Management
+voxelstorm      28200/tcp               # VoxelStorm game server
+voxelstorm      28200/udp               # VoxelStorm game server
 siemensgsm      28240/tcp               # Siemens GSM
 siemensgsm      28240/udp               # Siemens GSM
+bosswave        28589/tcp               # Building operating system services wide area verified exchange
 sgsap           29118/sctp              # SGsAP in 3GPP
-a27-ran-ran     28119/udp               # A27 cdma2000 RAN Management
 otmp            29167/tcp               # ObTools Message Protocol
 otmp            29167/udp               # ObTools Message Protocol
 sbcap           29168/sctp              # SBcAP in 3GPP
 iuhsctpassoc    29169/sctp              # HNBAP and RUA Common Association
+bingbang        29999/tcp               # data exchange protocol for IEC61850 inn wind power plants
+ndmps           30000/tcp               # Secure Network Data Management Protocol
 pago-services1  30001/tcp               # Pago Services 1
 pago-services1  30001/udp               # Pago Services 1
 pago-services2  30002/tcp               # Pago Services 2
 pago-services2  30002/udp               # Pago Services 2
+amicon-fpsu-ra  30003/tcp               # Amicon FPSU-IP Remote Administration
+amicon-fpsu-ra  30003/udp               # Amicon FPSU-IP Remote Administration
+amicon-fpsu-s   30004/udp               # Amicon FPSU-IP VPN
+rwp             30100/tcp               # Remote Window Protocol
+rwp             30100/sctp              # Remote Window Protocol
 kingdomsonline  30260/tcp               # Kingdoms Online (CraigAvenue)
 kingdomsonline  30260/udp               # Kingdoms Online (CraigAvenue)
+samsung-disc    30832/udp               # Samsung Convergence Discovery Protocol
 ovobs           30999/tcp               # OpenView Service Desk Client
 ovobs           30999/udp               # OpenView Service Desk Client
 autotrac-acp    31020/tcp               # Autotrac ACP 245
 yawn            31029/udp               # YaWN - Yet Another Windows Notifie
+pace-licensed   31400/tcp               # PACE license server
 xqosd           31416/tcp               # XQoS network monitor
 xqosd           31416/udp               # XQoS network monitor
 tetrinet        31457/tcp               # TetriNET Protocol
@@ -10931,6 +11275,7 @@ iracinghelper   32034/tcp               # iRacing helper service
 iracinghelper   32034/udp               # iRacing helper service
 t1distproc60    32249/tcp               # T1 Distributed Processor
 t1distproc60    32249/udp               # T1 Distributed Processor
+plex            32400/tcp               # Plex multimedia
 apm-link        32483/tcp               # Access Point Manager Link
 apm-link        32483/udp               # Access Point Manager Link
 sec-ntb-clnt    32635/tcp               # SecureNotebook-CLNT
@@ -10964,6 +11309,7 @@ mlsn            32801/udp               # Multiple Listing Service Network
 retp            32811/tcp               # Real Estate Transport Protocol
 idmgratm        32896/tcp               # Attachmate ID Manager
 idmgratm        32896/udp               # Attachmate ID Manager
+mysqlx          33060/tcp               # MySQL Database Extended Interface
 aurora-balaena  33123/tcp               # Aurora (Balaena Ltd)
 aurora-balaena  33123/udp               # Aurora (Balaena Ltd)
 diamondport     33331/tcp               # DiamondCentral Interface
@@ -10988,6 +11334,15 @@ profinet-cm     34964/tcp               # PROFInet Context Manager
 profinet-cm     34964/udp               # PROFInet Context Manager
 ethercat        34980/tcp               # EtherCAT Port
 ethercat        34980/udp               # EhterCAT Port
+heathview       35000/tcp               # HeathView
+rt-viewer       35001/tcp               # ReadyTech Viewer
+rt-viewer       35001/udp               # ReadyTech Viewer
+rt-sound        35002/tcp               # ReadyTech Sound Server
+rt-devicemapper 35003/tcp               # ReadyTech DeviceMapper
+rt-classmanager 35004/tcp               # ReadyTech ClassManager
+rt-classmanager 35004/udp               # ReadyTech ClassManager
+rt-labtracker   35005/tcp               # ReadyTech LabTracker
+rt-helper       35006/tcp               # ReadyTech Helper Service
 kitim           35354/tcp               # KIT Messenger
 altova-lm       35355/tcp               # Altova License Management
 altova-lm-disc  35355/udp               # Altova License Management Discovery
@@ -10995,17 +11350,29 @@ guttersnex      35356/tcp               # Gutters Note Exchange
 openstack-id    35357/tcp               # OpenStack ID Service
 allpeers        36001/tcp               # AllPeers Network
 allpeers        36001/udp               # AllPeers Network
+wlcp            36411/udp               # Wireless LAN Control plane Protocol (WLCP)
 s1-control      36412/sctp              # S1-Control Plane (3GPP)
 x2-control      36422/sctp              # X2-Control Plane (3GPP)
+slmap           36423/sctp              # SLm Interface Application protocol
+nq-ap           36424/sctp              # Nq and Nq' Application protocol
 m2ap            36443/sctp              # M2 Application Part
 m3ap            36444/sctp              # M3 Application Part
+xw-control      36462/sctp              # Xw-Control Plane (3GPP)
 febooti-aw      36524/tcp               # Febooti Automation Workshop
+observium-agent 36602/tcp               # Observium statistics collection agent
 kastenxpipe     36865/tcp               # KastenX Pipe
 kastenxpipe     36865/udp               # KastenX Pipe
+mapx            36700/tcp               # MapX communication
 neckar          37475/tcp               # science + computing's Venus Administration Port
 neckar          37475/udp               # science + computing's Venus Administration Port
+eftp            37601/tcp               # Epipole File Transfer
 unisys-eportal  37654/tcp               # Unisys ClearPath ePortal
 unisys-eportal  37654/udp               # Unisys ClearPath ePortal
+gdrive-sync     37483/tcp               # Google Drive Sync
+ivs-database    38000/tcp               # InfoVista Server Database
+ivs-insertion   38001/tcp               # InfoVista Server Insertion
+cresco-control  38002/tcp               # Cresco Controller
+crescoctrl-disc 38002/udp               # Cresco Controller Discovery
 galaxy7-data    38201/tcp               # Galaxy7 Data Tunnel
 galaxy7-data    38201/udp               # Galaxy7 Data Tunnel
 fairview        38202/tcp               # Fairview Message Service
@@ -11018,6 +11385,10 @@ turbonote-1     39681/tcp               # TurboNote Default Port
 turbonote-1     39681/udp               # TurboNote Default Port
 safetynetp      40000/tcp               # SafetyNET p
 safetynetp      40000/udp               # SafetyNET p
+k-patentssensor 40023/udp               # K-PatentsSensorInformation
+z-wave-s        41230/tcp               # Z-Wave Protocol over SSL/TLS
+z-wave-s        41230/udp               # Z-Wave Protocol over DTLS
+sptx            40404/tcp               # Simplify Printing TX
 cscp            40841/tcp               # CSCP
 cscp            40841/udp               # CSCP
 csccredir       40842/tcp               # CSCCREDIR
@@ -11040,6 +11411,8 @@ candrp          42509/tcp               # CA discovery response
 candrp          42509/udp               # CA discovery response
 caerpc          42510/tcp               # CA eTrust RPC
 caerpc          42510/udp               # CA eTrust RPC
+recvr-rc        43000/tcp               # Receiver Remote Control
+recvr-rc-disc   43000/udp               # Receiver Remote Control Discovery
 reachout        43188/tcp               # REACHOUT
 reachout        43188/udp               # REACHOUT
 ndm-agent-port  43189/tcp               # NDM-AGENT-PORT
@@ -11055,21 +11428,26 @@ ew-mgmt         43440/tcp               # Cisco EnergyWise Management
 ew-disc-cmd     43440/udp               # Cisco EnergyWise Discovery and Command Flooding
 ciscocsdb       43441/tcp               # Cisco NetMgmt DB Ports
 ciscocsdb       43441/udp               # Cisco NetMgmt DB Ports
+z-wave-tunnel   44123/tcp               # Z-Wave Secure Tunnel
 pmcd            44321/tcp               # PCP server (pmcd)
 pmcd            44321/udp               # PCP server (pmcd)
 pmcdproxy       44322/tcp               # PCP server (pmcd) proxy
 pmcdproxy       44322/udp               # PCP server (pmcd) proxy
-pcp             44323/udp               # Port Control Protocol
 cognex-dataman  44444/tcp               # Cognex DataMan Management
 ### UNAUTHORIZED USE: Ports 44515 & 44516 used by NI Device Protocol############
 domiq           44544/udp               # DOMIQ Building Automation
 rbr-debug       44553/tcp               # REALbasic Remote Debug
 rbr-debug       44553/udp               # REALbasic Remote Debug
+asihpi          44600/udp                # AudioScience HPI
 EtherNet/IP-2   44818/tcp EtherNet-IP-2  # EtherNet/IP messaging
 EtherNet/IP-2   44818/udp EtherNet-IP-2  # EtherNet/IP messaging
+m3da            44900/tcp               # M3DA (efficient machine-to-machine communication)
+m3da-disc       44900/udp               # M3DA Discovery (efficient machine-to-machine communication)
 asmp            45000/tcp               # NSi AutoStore Status Monitoring Protocol data transfer
 asmp-mon        45000/udp               # NSi AutoStore Status Monitoring Protocol device monitoring
 asmps           45001/tcp               # NSi AutoStore Status Monitoring Protocol secure data transfer
+rs-status       45002/tcp               # Redspeed Status Monitor
+synctest        45045/tcp               # Remote application control
 invision-ag     45054/tcp               # InVision AG
 invision-ag     45054/udp               # InVision AG
 eba             45678/tcp               # EBA PRISE
@@ -11079,12 +11457,13 @@ qdb2service     45825/tcp               # Qpuncture Data Access Service
 qdb2service     45825/udp               # Qpuncture Data Access Service
 ssr-servermgr   45966/tcp               # SSRServerMgr
 ssr-servermgr   45966/udp               # SSRServerMgr
-sp-remotetablet 46998/tcp               # connection between computer and a signature tablet
+inedo           46336/tcp               # Listen port used for Inedo agent
 mediabox        46999/tcp               # MediaBox Server
 mediabox        46999/udp               # MediaBox Server
 mbus            47000/tcp               # Message Bus
 mbus            47000/udp               # Message Bus
 winrm           47001/tcp               # Windows Remote Management Service
+jvl-mactalk     47100/udp               # Configuration of motors conneced to industrial ethernet
 dbbrowse        47557/tcp               # Databeam Corporation
 dbbrowse        47557/udp               # Databeam Corporation
 directplaysrvr  47624/tcp               # Direct Play Server
@@ -11093,6 +11472,7 @@ ap              47806/tcp               # ALC Protocol
 ap              47806/udp               # ALC Protocol
 bacnet          47808/tcp               # Building Automation and Control Networks
 bacnet          47808/udp               # Building Automation and Control Networks
+presonus-ucnet  47809/udp               # PreSonus Universal Control Network protocol
 nimcontroller   48000/tcp               # Nimbus Controller
 nimcontroller   48000/udp               # Nimbus Controller
 nimspooler      48001/tcp               # Nimbus Spooler
@@ -11104,6 +11484,7 @@ nimgtw          48003/udp               # Nimbus Gateway
 nimbusdb        48004/tcp               # NimbusDB Connector
 nimbusdbctrl    48005/tcp               # NimbusDB Control
 3gpp-cbsp       48049/tcp               # 3GPP Cell Broadcast Service Protocol
+weandsf         48050/tcp               # WeFi Access Network Discovery and Selection
 isnetserv       48128/tcp               # Image Systems Network Services
 isnetserv       48128/udp               # Image Systems Network Services
 blp5            48129/tcp               # Bloomberg locator
@@ -11112,4 +11493,115 @@ com-bardac-dw   48556/tcp               # com-bardac-dw
 com-bardac-dw   48556/udp               # com-bardac-dw
 iqobject        48619/tcp               # iqobject
 iqobject        48619/udp               # iqobject
+robotraconteur  48653/tcp               # Robot Raconteur transport
+robotraconteur  48653/udp               # Robot Raconteur transport
 matahari        49000/tcp               # Matahari Broker
+nusrp           49001/tcp               # Nuance Unity Service Request Protocol
+nusdp-disc      49001/udp               # Nuance Unity Service Discovery Protocol
+# Updated additional list from IANA with all missing services 05/05/2017 done by Karl Vogel
+mit-ml-dev      85/tcp                  # MIT ML Device
+mit-ml-dev      85/udp                  # MIT ML Device
+rap             256/tcp                 # Route Access Protocol
+rap             256/udp                 # Route Access Protocol
+pt-tls          271/tcp                 # IETF Network Endpoint Assessment (PT-TLS)
+meter           571/tcp                 # udemon
+meter           571/udp                 # udemon
+dlep            854/tcp                 # Dynamic Link Exchange Protocol (DLEP)
+dlep            854/udp                 # Dynamic Link Exchange Protocol (DLEP)
+accessbuilder   888/udp                 # AccessBuilder
+webpush         1001/tcp                # HTTP Web Push
+pip             1321/tcp                # PIP
+pip             1321/udp                # PIP
+csdmbase        1471/tcp                # csdmbase
+csdmbase        1471/udp                # csdmbase
+csdm            1472/tcp                # csdm
+csdm            1472/udp                # csdm
+ngr-t           1528/udp                # NGR transport for mobile ad-hoc networks
+nmsp            1790/tcp                # Narrative Media Streaming Protocol
+nmsp            1790/udp                # Narrative Media Streaming Protocol
+uma             1797/tcp                # Universal Management Architecture
+uma             1797/udp                # Universal Management Architecture
+raid-cd         2013/udp                # raid
+dls             2047/tcp                #
+dls             2047/udp                #
+nvd             2329/tcp                # NVD User
+nvd             2329/udp                # NVD User
+swarm           2377/tcp                # RPC interface for Docker Swarm
+msp             2438/tcp                # Message send protocol?
+msp             2438/udp                # Message send protocol?
+unicontrol      2499/tcp                # UniControl
+unicontrol      2499/udp                # UniControl
+nmsigport       2839/tcp                # NMSigPort
+nmsigport       2839/udp                # NMSigPort
+fxp             2849/tcp                # FXP Communication
+fxp             2849/udp                # FXP Communication
+epp             3044/tcp                # EndPoint Protocol
+epp             3044/udp                # EndPoint Protocol
+creativeserver  3364/tcp                # Creative Server
+creativeserver  3364/udp                # Creative Server
+contentserver   3365/tcp                # Content Server
+contentserver   3365/udp                # Content Server
+creativepartnr  3366/tcp                # Creative Partner
+creativepartnr  3366/udp                # Creative Partner
+udt-os          3900/tcp                # Unidata UDT OS
+udt-os          3900/udp                # Unidata UDT OS
+npp             4045/tcp                # Network Paging Protocol
+npp             4045/udp                # Network Paging Protocol
+hctl            4197/tcp                # Harman HControl Protocol
+hctl            4197/udp                # Harman HControl Protocol
+trinity-dist    4711/sctp               # Trinity Trust Network Node Communication
+trinity-dist    4711/tcp                # Trinity Trust Network Node Communication
+trinity-dist    4711/udp                # Trinity Trust Network Node Communication
+intelliadm-disc 4746/udp                # IntelliAdmin Discovery
+gre-in-udp      4754/udp                # GRE-in-UDP Encapsulation
+gre-udp-dtls    4755/udp                # GRE-in-UDP Encapsulation with DTLS
+RDCenter        4756/tcp                # Reticle Decision Center
+converge        4774/tcp                # Converge RPC
+mftp            5402/tcp                # OmniCast MFTP
+mftp            5402/udp                # OmniCast MFTP
+cbus            5550/tcp                # Model Railway control using CBUS protocol
+storageos       5705/tcp                # StorageOS REST API
+ricardo-lm      6148/tcp                # Ricardo North America License Manager
+ricardo-lm      6148/udp                # Ricardo North America License Manager
+ieee11073-20701 6464/tcp                # Medical device communication
+ieee11073-20701 6464/udp                # Medical device communication
+nexgen-aux      6629/tcp                #
+nexgen-aux      6629/udp                #
+rtimeviewer     6900/tcp                # R*TIME Viewer Data Interface
+spg             7016/tcp                # SPG Controls Carrier
+spg             7016/udp                # SPG Controls Carrier
+grasp           7017/tcp                # GeneRic Autonomic Signaling Protocol
+grasp           7017/udp                # GeneRic Autonomic Signaling Protocol
+pon-ictp        7202/tcp                # Inter-Channel Termination Protocol (ICTP)
+openit          7478/tcp                # IT Asset Management
+coherence-disc  7574/udp                # Oracle Coherence Cluster discovery service
+bolt            7687/tcp                # Bolt database connection
+nfapi           7701/sctp               # SCF nFAPI defining MAC/PHY split
+wpl-analytics   8006/tcp                # World Programming analytics
+wpl-disc        8006/udp                # World Programming analytics discovery
+ucs-isc         8070/tcp                # Oracle Communication Indexed Search Converter
+mles            8077/tcp                # Client-server data distribution
+opsmessaging    8090/tcp                # Vehicle to station messaging
+robot-remote    8270/tcp                # Robot Framework Remote Library Interface
+aritts          8423/tcp                # Aristech text-to-speech server
+ssports-bcast   8808/udp                # STATSports Broadcast Service
+CardWeb-IO      9060/tcp                # CardWeb request-response I/O exchange
+CardWeb-RT      9060/udp                # CardWeb realtime device data
+pumpkindb       9981/tcp                # Event sourcing database engine/language
+abb-hw          10020/tcp               # Hardware configuration and maintenance
+tile-ml         10261/tcp               # Tile remote machine learning
+xpra            14500/tcp               # xpra network protocol
+vdmmesh-disc    18668/udp               # Manufacturing Execution Systems Mesh Comm
+vdmmesh         18668/tcp               # Manufacturing Execution Systems Mesh Comm
+cora-disc       19220/udp               # Discovery for Client Connection ... Service
+cora            19220/tcp               # Client Connection Mgmt/Data Exchange Service
+aigairserver    21221/tcp               # Services for Air Server
+ka-kdp          31016/udp               # Kollective Agent Kollective Delivery
+ka-sddp         31016/tcp               # Kollective Agent Secure Distributed Delivery
+edi_service     34567/udp               # dhanalakshmi.org EDI Service
+axio-disc       35100/tcp               # Axiomatic discovery protocol
+axio-disc       35100/udp               # Axiomatic discovery protocol
+pmwebapi        44323/tcp               # Performance Co-Pilot client HTTP API
+cloudcheck-ping 45514/udp               # ASSIA CloudCheck WiFi Management keepalive
+cloudcheck      45514/tcp               # ASSIA CloudCheck WiFi Management System
+spremotetablet  46998/tcp               # Capture handwritten signatures
diff --git a/setup/setup.nm b/setup/setup.nm
index 4b91d646c..3b41b2d3f 100644
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -5,7 +5,7 @@
name       = setup
 version    = 3.0
-release    = 16
+release    = 17
 arch       = noarch
groups     = Base Build System/Base
@@ -37,17 +37,39 @@ build
    end
install
+		# Create missing folders.
    	mkdir -pv %{BUILDROOT}/etc/profile.d %{BUILDROOT}/var/log
-		for i in aliases bashrc exports filesystems group gshadow host.conf \
-			hosts hosts.allow hosts.deny inputrc motd passwd printcap \
-			profile protocols securetty services shadow shells; do \
+		# Install our config files.
+		for i in aliases bashrc ethertypes exports filesystems group gshadow \
+			host.conf hosts hosts.allow hosts.deny inputrc motd passwd \
+			printcap profile protocols securetty services shadow shells; do \
    		cp -vf %{DIR_APP}/${i} %{BUILDROOT}/etc || exit 1; \
    	done
+		# Create envvar overwrite file for bash.
+		echo "#Add any required envvar overrides to this file, \
+			it is sourced from /etc/profile" > %{BUILDROOT}%{sysconfdir}/profile.d/sh.local
+
    	touch %{BUILDROOT}%{sysconfdir}/fstab
    	chmod -v 0400 %{BUILDROOT}%{sysconfdir}/{,g}shadow
+		# Create empty environment config file.
+		touch %{BUILDROOT}%{sysconfdir}/environment
+		chmod 0644 %{BUILDROOT}%{sysconfdir}/environment
+
+		# Create MOTD (message of the day) folder layout.	
+		mkdir -p %{BUILDROOT}/etc/motd.d
+		mkdir -p %{BUILDROOT}/run/motd.d
+		mkdir -p %{BUILDROOT}/usr/lib/motd.d
+		touch %{BUILDROOT}/usr/lib/motd
+	
+		# Create a tmpfiles file, needed for files in /run
+		mkdir -p %{BUILDROOT}%{tmpfilesdir}	
+		echo "f /run/motd 0644 root root -" > %{BUILDROOT}%{tmpfilesdir}/%{name}.conf
+		echo "d /run/motd.d 0755 root root -" >> %{BUILDROOT}%{tmpfilesdir}/%{name}.conf
+		chmod 0644 %{BUILDROOT}%{tmpfilesdir}/%{name}.conf
+
    	mkdir -pv %{BUILDROOT}%{sysconfdir}/sysctl.d
    	install -m 644 %{DIR_APP}/sysctl/printk.conf \
    		%{BUILDROOT}%{sysconfdir}/sysctl.d/printk.conf
@@ -74,6 +96,8 @@ packages
configfiles
    		/etc/aliases
+			/etc/environment
+			/etc/ethertypes
    		/etc/exports
    		/etc/fstab
    		/etc/group
diff --git a/setup/shells b/setup/shells
index e9214ad6f..b52774295 100644
--- a/setup/shells
+++ b/setup/shells
@@ -1,3 +1,4 @@
 /bin/sh
 /bin/bash
-/sbin/nologin
+/usr/bin/sh
+/usr/bin/bash
diff --git a/setup/uidgid b/setup/uidgid
index 7bdb249a8..c895738bb 100644
--- a/setup/uidgid
+++ b/setup/uidgid
@@ -1,31 +1,32 @@
-NAME	UID	GID	HOME		SHELL	PACKAGES
+#NAME	UID	GID	HOME		SHELL	PACKAGES
 root	0	0	/root		/bin/bash	setup
-bin	1	1	/bin		/sbin/nologin	setup
-daemon	2	2	/sbin		/sbin/nologin	setup
+bin	1	1	/bin		/usr/sbin/nologin	setup
+daemon	2	2	/sbin		/usr/sbin/nologin	setup
 sys	-	3	-		-	setup
 adm	3	4	/var/adm		/bin/bash	setup
 tty	-	5	-		-	setup
 disk	-	6	-		-	setup
-lp	4	7	/var/spool/lpd		/sbin/nologin	setup
+lp	4	7	/var/spool/lpd		/usr/sbin/nologin	setup
 mem	-	8	-		-	setup
 kmem	-	9	-		-	setup
 wheel	-	10	-		-	setup
-cdrom	-	11	-		-	udev,MAKEDEV
+cdrom	-	11	-		-	setup
 sync	5	(0)	/sbin		/bin/sync	setup
 shutdown	6	(0)	/sbin		/sbin/shutdown	setup
 halt	7	(0)	/sbin		/sbin/halt	setup
-mail	8	12	/var/spool/mail		/sbin/nologin	setup
-news	9	13	/var/spool/news		/sbin/nologin	setup
-uucp	10	14	/var/spool/uucp		/sbin/nologin	setup
-operator	11	(0)	/root		/sbin/nologin	setup
-games	12	(100)	/usr/games		/sbin/nologin	setup
-gopher	13	30	/usr/lib/gopher-data		/sbin/nologin	setup
-ftp	14	50	/var/ftp		/sbin/nologin	setup
+mail	8	12	/var/spool/mail		/usr/sbin/nologin	setup
+news	9	13	/var/spool/news		/usr/sbin/nologin	inn
+uucp	10	14	/var/spool/uucp		/usr/sbin/nologin	uucp
+operator	11	(0)	/root		/usr/sbin/nologin	setup
+games	12	(100)	/usr/games		/usr/sbin/nologin	setup
+# Not created by default anymore.
+gopher	13	30	/var/gopher		/usr/sbin/nologin	-
+ftp	14	50	/var/ftp		/usr/sbin/nologin	setup
 man	-	15	-		-	setup
-oprofile	16	16	/home/oprofile		/sbin/nologin	oprofile
-pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
-dialout	-	18	-		-	udev,MAKEDEV
-floppy	-	19	-		-	dev,MAKEDEV
+oprofile	16	16	/var/lib/oprofile		/usr/sbin/nologin	oprofile
+pkiuser	17	17	/usr/share/pki		/usr/sbin/nologin	pki-ca,rhpki-ca
+dialout	-	18	-		-	setup
+floppy	-	19	-		-	setup
 games	-	20	-		-	setup
 slocate	-	21	-		-	slocate
 utmp	-	22	-		-	initscripts,libutempter
@@ -37,93 +38,138 @@ mysql	27	27	/var/lib/mysql		/bin/bash	mysql
 nscd	28	28	/		/bin/false	nscd
 rpcuser	29	29	/var/lib/nfs		/bin/false	nfs-utils
 console	-	31	-		-	dev
-rpc	32	32	/		/bin/false	portmap
-amanda	33	(6)	/var/lib/amanda		/bin/false	amanda
-tape	-	33	-		-	udev,MAKEDEV
+rpc	32	32	/var/lib/rpcbind		/usr/sbin/nologin	portmap
+amandabackup	33	(6)	/var/lib/amanda		/bin/false	amanda
+tape	-	33	-		-	setup
 netdump	34	34	/var/crash		/bin/bash	netdump-client, netdump-server
 utempter	-	35	-		-	libutempter
-vdsm	36	-	/		/bin/bash	kvm, vdsm
 kvm	-	36	-		-	kvm, vdsm, libvirt
+vdsm	36	(36)	/		/bin/bash	kvm, vdsm
 rpm	37	37	/var/lib/rpm		/bin/bash	rpm
-ntp	38	38	/etc/ntp		/sbin/nologin	ntp
+ntp	38	38	/etc/ntp		/usr/sbin/nologin	ntp
 video	-	39	-		-	setup
-dip	-	40	-		-	setup
-mailman	41	41	/var/mailman		/bin/false	mailman
-gdm	42	42	/var/gdm		/bin/bash	gdm
+dip	-	40	-		-	ppp
+mailman	41	41	/usr/lib/mailman		/usr/sbin/nologin	mailman
+gdm	42	42	/var/lib/gdm		/usr/sbin/nologin	gdm
 xfs	43	43	/etc/X11/fs		/bin/false	XFree86-xfs
 pppusers	-	44	-		-	linuxconf
 popusers	-	45	-		-	linuxconf
 slipusers	-	46	-		-	linuxconf
 mailnull	47	47	/var/spool/mqueue		/dev/null	sendmail
-apache	48	48	/var/www		/bin/false	apache
-wnn	49	49	/home/wnn		/bin/bash	FreeWnn
+apache	48	48	/usr/share/httpd		/bin/false	httpd
+wnn	49	49	/var/lib/wnn		/usr/sbin/nologin	FreeWnn
 smmsp	51	51	/var/spool/mqueue		/dev/null	sendmail
-puppet	52	52	/var/lib/puppet		/sbin/nologin	puppet
-tomcat	53	53	/var/lib/tomcat		/sbin/nologin	tomcat
-lock	-	54	-		-	lockdev
+puppet	52	52	/var/lib/puppet		/usr/sbin/nologin	puppet
+tomcat	53	53	/var/lib/tomcat		/usr/sbin/nologin	tomcat
+lock	-	54	-		-	setup
 ldap	55	55	/var/lib/ldap		/bin/false	openldap-servers
 frontpage	56	56	/var/www		/bin/false	mod_frontpage
 nut	57	57	/var/lib/ups		/bin/false	nut
 beagleindex	58	58	/var/cache/beagle		/bin/false	beagle
-tss	59	59	-		/sbin/nologin	trousers
+tss	59	59	-		/usr/sbin/nologin	trousers
 piranha	60	60	/etc/sysconfig/ha		/dev/null	piranha
-prelude-manager	61	61	-		/sbin/nologin	prelude-manager
-snortd	62	62	-		/sbin/nologin	snortd
+prelude-manager	61	61	-		/usr/sbin/nologin	prelude-manager
+snortd	62	62	-		/usr/sbin/nologin	snortd
 audio	-	63	-		-	setup
-condor	64	64	/var/lib/condor		/sbin/nologin	condord
-nslcd	65	(55)	/		/sbin/nologin	nslcd
+condor	64	64	/var/lib/condor		/usr/sbin/nologin	condord
+nslcd	65	(55)	/		/usr/sbin/nologin	nslcd
 wine	-	66	-		-	wine
-pegasus	66	65	/var/lib/Pegasus		/sbin/nologin	tog-pegasus
-webalizer	67	67	/var/www/html/usage		/sbin/nologin	webalizer
-haldaemon	68	68	/		/sbin/nologin	hal
-vcsa	69	69	-		/sbin/nologin	dev,MAKEDEV
-avahi	70	70	/var/run/avahi-daemon		/sbin/nologin	avahi
+pegasus	66	65	/var/lib/Pegasus		/usr/sbin/nologin	tog-pegasus
+webalizer	67	67	/var/www/usage		/usr/sbin/nologin	webalizer
+haldaemon	68	68	/		/usr/sbin/nologin	hal
+vcsa	69	69	-		/usr/sbin/nologin	dev,MAKEDEV
+avahi	70	70	/var/run/avahi-daemon		/usr/sbin/nologin	avahi
 realtime	-	71	-		-	-
-tcpdump	72	72	/		/sbin/nologin	tcpdump
+tcpdump	72	72	/		/usr/sbin/nologin	tcpdump
 privoxy	73	73	/etc/privoxy		/bin/bash	privoxy
-sshd	74	74	/var/empty/sshd		/sbin/nologin	openssh-server
+sshd	74	74	/var/empty/sshd		/usr/sbin/nologin	openssh-server
 radvd	75	75	/		/bin/false	radvd
 cyrus	76	(12)	/var/imap		/bin/bash	cyrus-imapd
-saslauth	-	76	-		-	cyrus-imapd
-arpwatch	77	77	/var/lib/arpwatch		/sbin/nologin	arpwatch
-fax	78	78	/var/spool/fax		/sbin/nologin	mgetty
+saslauth	-	76	-		-	cyrus-sasl, cyrus-imap
+arpwatch	77	77	/var/lib/arpwatch		/usr/sbin/nologin	arpwatch
+fax	78	78	/var/spool/fax		/usr/sbin/nologin	mgetty
 nocpulse	79	79	/etc/sysconfig/nocpulse		/bin/bash	nocpulse
-desktop	80	80	-		/sbin/nologin	desktop-file-utils
-dbus	81	81	/		/sbin/nologin	dbus
-jonas	82	82	/var/lib/jonas		/sbin/nologin	jonas
-clamav	83	83	/tmp		/sbin/nologin	clamav
+desktop	80	80	-		/usr/sbin/nologin	desktop-file-utils
+dbus	81	81	/		/usr/sbin/nologin	dbus
+jonas	82	82	/var/lib/jonas		/usr/sbin/nologin	jonas
+clamav	83	83	/tmp		/usr/sbin/nologin	clamav
 screen	-	84	-		-	screen
-sabayon	86	86	-		/sbin/nologin	sabayon
-polkituser	87	87	/		/sbin/nologin	PolicyKit
+quaggavt	-	85	-		-	quagga
+sabayon	86	86	-		/usr/sbin/nologin	sabayon
+polkituser	87	87	/		/usr/sbin/nologin	PolicyKit
 wbpriv	-	88	-		-	samba-common
 postfix	89	89	/var/spool/postfix		/bin/true	postfix
 postdrop	-	90	-		-	postfix
 majordomo	91	91	/usr/lib/majordomo		/bin/bash	majordomo
-quagga	92	92	/		/sbin/nologin	quagga
-exim	93	93	/var/spool/exim		/sbin/nologin	exim
-distcache	94	94	/		/sbin/nologin	distcache
+quagga	92	92	/		/usr/sbin/nologin	quagga
+exim	93	93	/var/spool/exim		/usr/sbin/nologin	exim
+distcache	94	94	/		/usr/sbin/nologin	distcache
 radiusd	95	95	/		/bin/false	freeradius
-hsqldb	96	96	/var/lib/hsqldb		/sbin/nologin	hsqldb
-dovecot	97	97	/usr/libexec/dovecot		/sbin/nologin	dovecot
-ident	98	98	/		/sbin/nologin	ident
-nobody	99	99	/		/sbin/nologin	setup
+hsqldb	96	96	/var/lib/hsqldb		/usr/sbin/nologin	hsqldb
+dovecot	97	97	/usr/libexec/dovecot		/usr/sbin/nologin	dovecot
+ident	98	98	/		/usr/sbin/nologin	ident
+# Note: 99 used to be the old uid for nobody, now moved to 65534, do not reuse
 users	-	100	-		-	setup
-qemu	107	107	/		/sbin/nologin	libvirt
-ovirt	108	108	/		/sbin/nologin	libvirt
-rhevm	109	109	/home/rhevm		/sbin/nologin	vdsm-reg
-saned	111	111	/		/sbin/nologin	sane-backends
-vhostmd	112	112	/usr/share/vhostmd		/sbin/nologin	vhostmd
-usbmuxd	113	113	/		/sbin/nologin	usbmuxd
-bacula	133	133	/var/spool/bacula		/sbin/nologin	bacula
-ricci	140	140	/var/lib/ricci		/sbin/nologin	ricci
-luci	141	141	/var/lib/luci		/sbin/nologin	luci
-stap-server	155	155	/var/lib/stap-server		/sbin/nologin	systemtap
-avahi-autoipd	170	170	/var/lib/avahi-autoipd		/sbin/nologin	avahi
-pulse	171	171	/var/run/pulse		/sbin/nologin	pulseaudio
-rtkit	172	172	/proc		/sbin/nologin	rtkit
-abrt	173	173	/etc/abrt		/sbin/nologin	abrt
-gnats	?	?	?		?	gnats, gnats-db
-listar	?	?	?		?	listar
-nfsnobody	65534	65534	/var/lib/nfs		/sbin/nologin	nfs-utils
-
-# Note: nfsnobdy is 4294967294 on 64-bit platforms (-2)
+ssh_keys	-	101	-		-	openssh
+input	-	104	-		-	systemd
+render	-	105	-		-	systemd
+sgx	-	106	-		-	systemd
+qemu	107	107	/		/usr/sbin/nologin	libvirt
+ovirt	108	108	/		/usr/sbin/nologin	libvirt
+rhevm	109	109	/home/rhevm		/usr/sbin/nologin	vdsm-reg
+jetty	110	110	/usr/share/jetty		/usr/sbin/nologin	jetty
+saned	111	111	/		/usr/sbin/nologin	sane-backends
+vhostmd	112	112	/usr/share/vhostmd		/usr/sbin/nologin	vhostmd
+usbmuxd	113	113	/		/usr/sbin/nologin	usbmuxd
+polkitd	114	114	/		/usr/sbin/nologin	polkit
+bacula	133	133	/var/spool/bacula		/usr/sbin/nologin	bacula
+cimsrvr	134	134	/		/usr/sbin/nologin	tog-pegasus-libs
+mock	-	135	/		-	mock
+ricci	140	140	/var/lib/ricci		/usr/sbin/nologin	ricci
+luci	141	141	/var/lib/luci		/usr/sbin/nologin	luci
+activemq	142	142	/usr/share/activemq		/usr/sbin/nologin	activemq
+cassandra	143	143	/var/lib/cassandra		/usr/sbin/nologin	cassandra
+stap-server	155	155	/var/lib/stap-server		/usr/sbin/nologin	systemtap
+stapusr	-	156	/		-	systemtap-runtime
+stapsys	-	157	/		-	systemtap-runtime
+stapdev	-	158	/		-	systemtap-runtime
+swift	160	160	/var/lib/swift		/usr/sbin/nologin	openstack-swift
+glance	161	161	/var/lib/glance		/usr/sbin/nologin	openstack-glance
+nova	162	162	/var/lib/nova		/usr/sbin/nologin	openstack-nova
+keystone	163	163	/var/lib/keystone		/usr/sbin/nologin	openstack-keystone
+quantum	164	164	/var/lib/quantum		/usr/sbin/nologin	openstack-quantum
+cinder	165	165	/var/lib/cinder		/usr/sbin/nologin	openstack-cinder
+ceilometer	166	166	/var/lib/ceilometer		/usr/sbin/nologin	openstack-ceilometer
+ceph	167	167	/var/lib/ceph		/usr/sbin/nologin	ceph-common
+avahi-autoipd	170	170	/var/lib/avahi-autoipd		/usr/sbin/nologin	avahi
+pulse	171	171	/var/run/pulse		/usr/sbin/nologin	pulseaudio
+rtkit	172	172	/proc		/usr/sbin/nologin	rtkit
+abrt	173	173	/etc/abrt		/usr/sbin/nologin	abrt
+retrace	174	174	/usr/share/retrace-server		/usr/sbin/nologin	retrace-server
+ovirtagent	175	175	/		/usr/sbin/nologin	ovirt-guest-agent
+ats	176	176	/		/usr/sbin/nologin	trafficserver
+dhcpd	177	177	/		/usr/sbin/nologin	dhcp
+myproxy	178	178	/var/lib/myproxy		/usr/sbin/nologin	myproxy-server
+sanlock	179	179	/var/run/sanlock		/usr/sbin/nologin	sanlock
+aeolus	180	180	/var/aeolus		/usr/sbin/nologin	aeolus-configure
+wallaby	181	181	/var/lib/wallaby		/usr/sbin/nologin	wallaby
+# Not used anymore, removed Jun2021, can be freed if necessary later
+#katello	182	182	/usr/share/katello		/usr/sbin/nologin	katello-common
+elasticsearch	183	183	/usr/share/java/elasticsearch		/usr/sbin/nologin	elasticsearch
+mongodb	184	184	/var/lib/mongodb		/usr/sbin/nologin	mongodb
+# Previously provided by the 'jboss-as' package.
+wildfly	185	185	/usr/share/wildfly		/usr/sbin/nologin	wildfly
+jbosson	-	186	-		-	jboss-on-agent
+jbosson-agent	186	(186)	/		/usr/sbin/nologin	jboss-on-agent
+heat	187	187	/var/lib/heat		/usr/sbin/nologin	heat
+haproxy	188	188	/var/lib/haproxy		/usr/sbin/nologin	haproxy
+haclient	-	189	-		-	pacemaker
+hacluster	189	(189)	/		/usr/sbin/nologin	pacemaker
+systemd-journal	-	190	-		-	systemd
+# Dynamic on new systems, removed Dec2014, can be freed if necessary later
+#systemd-journal-gateway	191	191	/		/usr/sbin/nologin	systemd
+systemd-network	192	192	/		/usr/sbin/nologin	systemd
+systemd-resolve	193	193	/		/usr/sbin/nologin	systemd
+#gnats	?	?	?		?	gnats, gnats-db
+#listar	?	?	?		?	listar
+nobody	65534	65534	/		/usr/sbin/nologin	setup
diff --git a/tree/tree.nm b/tree/tree.nm
index 5c3cb32b1..895948bc4 100644
--- a/tree/tree.nm
+++ b/tree/tree.nm
@@ -5,7 +5,7 @@
name       = tree
 version    = 2.1.0
-release    = 1
+release    = 2
groups     = Applications/File
 url        = https://mama.indstate.edu/users/ice/tree/
@@ -27,8 +27,10 @@ build
    	LDFLAGS="%{LDFLAGS}"
install
-		make install BINDIR=%{BUILDROOT}%{bindir} \
-			MANDIR=%{BUILDROOT}%{mandir}/man1
+		make install \
+			PREFIX=%{BUILDROOT}%{prefix} \
+			BINDIR=%{BUILDROOT}%{bindir} \
+			MANDIR=%{BUILDROOT}%{mandir} 
    end
 end
hooks/post-receive
--
IPFire 3.x development tree

    