Merge branch '3.6' into 3.7

4 files changed, 43 insertions, 11 deletions

diff --git a/iana-etc/.signature b/iana-etc/.signature
index 0e88fb17..2392813e 100644
--- a/iana-etc/.signature
+++ b/iana-etc/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqjMCQOpmXQddjg3194JSkQYqxl4oc7oFFeqxGrbDc4YAre5Mo7fQzwy08wnEUtSMjl49S3nYLItwMcjlVHshAgI=
-SHA256 (Pkgfile) = b10a1fe86468c792df3b4535d0b0901e5c33f00caadb268452c6eed162e17b85
+RWRJc1FUaeVeqkIeDy3pY7RmTwhLafxGqYw7kwJAjXNenE36xNZBk6Uft4zn8CMJTfW+0R7Y0FBH9Cat8KG1n1bz6wwr6Q7rnQI=
+SHA256 (Pkgfile) = 0c81c31c1e0b06338bfd20717e6df5a70c74bc863c087584840c05989c617ccb
 SHA256 (.footprint) = 20bee9bdc0754167b76a54dd3f5b32a38ac4075bb7d0936188d78809f9056c8b
-SHA256 (services) = 26683692f3ffad528fd6bbe2b58314f09ae1a6971f4011fd46265e9d36645cca
-SHA256 (protocols) = c2d39ab1a99fa2cbc02b3cbdd129d661a3bff55d93d09fe04fb256bcb6d5e6d6
+SHA256 (services) = 21e85da4210fc30ec4919ef1f355d19f139e71e288307a1007bc63f46d68e9e9
+SHA256 (protocols) = 41ded622bde48b6fe93abc19c9250f0ff05204eb12f315fe44fdd6a81eccc03c
 SHA256 (update.sh) = c0177c49b9ac29c4f8d89d5f26ca4dc8b1ca358c4e71efca562e61f71f9f3df0
diff --git a/iana-etc/Pkgfile b/iana-etc/Pkgfile
index d3f70b0e..e709b98d 100644
--- a/iana-etc/Pkgfile
+++ b/iana-etc/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 
 name=iana-etc
-version=20220414
+version=20220719
 release=1
 source=(services protocols update.sh)
 
diff --git a/iana-etc/protocols b/iana-etc/protocols
index 232bde23..3c77285a 100644
--- a/iana-etc/protocols
+++ b/iana-etc/protocols
@@ -1,4 +1,4 @@
-# /etc/protocols, created 2022-04-20T10:03:23+0200
+# /etc/protocols, created 2022-07-24T11:59:17+0200
 # Source: https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
 hopopt         0 HOPOPT
 icmp           1 ICMP
diff --git a/iana-etc/services b/iana-etc/services
index 8659e3c6..e5feb558 100644
--- a/iana-etc/services
+++ b/iana-etc/services
@@ -1,4 +1,4 @@
-# /etc/services, created 2022-04-20T10:03:23+0200
+# /etc/services, created 2022-07-24T11:59:17+0200
 # Source: https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml
 tcpmux              1/tcp
 tcpmux              1/udp
@@ -5901,6 +5901,8 @@ deskview         3298/udp
 pdrncs           3299/tcp
 pdrncs           3299/udp
 ceph             3300/tcp
+tarantool        3301/tcp
+tarantool        3301/udp
 mcs-fastmail     3302/tcp
 mcs-fastmail     3302/udp
 opsession-clnt   3303/tcp
@@ -8084,6 +8086,8 @@ xmcp             4788/tcp
 vxlan            4789/udp
 vxlan-gpe        4790/udp
 roce             4791/udp
+unified-bus      4792/tcp
+unified-bus      4792/udp
 iims             4800/tcp
 iims             4800/udp
 iwec             4801/tcp
@@ -8450,6 +8454,8 @@ padl2sim         5236/tcp
 padl2sim         5236/udp
 mnet-discovery   5237/tcp
 mnet-discovery   5237/udp
+attune           5242/tcp
+xycstatus        5243/tcp
 downtools        5245/tcp
 downtools-disc   5245/udp
 capwap-control   5246/udp
@@ -8890,6 +8896,7 @@ icmpd            5813/tcp
 icmpd            5813/udp
 spt-automation   5814/tcp
 spt-automation   5814/udp
+autopassdaemon   5820/tcp
 shiprush-d-ch    5841/tcp
 reversion        5842/tcp
 wherehoo         5859/tcp
@@ -8901,6 +8908,27 @@ diameters        5868/sctp
 jute             5883/tcp
 rfb              5900/tcp
 rfb              5900/udp
+ff-ice           5903/tcp
+ff-ice           5903/udp
+ff-ice           5903/sctp
+ag-swim          5904/tcp
+ag-swim          5904/udp
+ag-swim          5904/sctp
+asmgcs           5905/tcp
+asmgcs           5905/udp
+asmgcs           5905/sctp
+rpas-c2          5906/tcp
+rpas-c2          5906/udp
+rpas-c2          5906/sctp
+dsd              5907/tcp
+dsd              5907/udp
+dsd              5907/sctp
+ipsma            5908/tcp
+ipsma            5908/udp
+ipsma            5908/sctp
+agma             5909/tcp
+agma             5909/udp
+agma             5909/sctp
 cm               5910/tcp
 cm               5910/udp
 cm               5910/sctp
@@ -9365,6 +9393,7 @@ acmsoda          6969/tcp
 acmsoda          6969/udp
 conductor        6970/tcp
 conductor-mpx    6970/sctp
+qolyester        6980/udp
 MobilitySrv      6997/tcp
 MobilitySrv      6997/udp
 iatp-highpri     6998/tcp
@@ -9640,12 +9669,13 @@ imqbrokerd       7676/tcp
 imqbrokerd       7676/udp
 sun-user-https   7677/tcp
 sun-user-https   7677/udp
-pando-pub        7680/tcp
-pando-pub        7680/udp
+ms-do            7680/tcp
+ms-do            7680/udp
 dmt              7683/tcp
 bolt             7687/tcp
 collaber         7689/tcp
 collaber         7689/udp
+sovd             7690/tcp
 klio             7697/tcp
 klio             7697/udp
 em7-secom        7700/tcp
@@ -9923,8 +9953,8 @@ synapse-nhttps   8243/tcp
 synapse-nhttps   8243/udp
 espeasy-p2p      8266/udp
 robot-remote     8270/tcp
-pando-sec        8276/tcp
-pando-sec        8276/udp
+ms-mcc           8276/tcp
+ms-mcc           8276/udp
 synapse-nhttp    8280/tcp
 synapse-nhttp    8280/udp
 libelle          8282/tcp
@@ -10818,6 +10848,7 @@ amt-redir-tls   16995/tcp
 amt-redir-tls   16995/udp
 isode-dua       17007/tcp
 isode-dua       17007/udp
+ncpu            17010/tcp
 vestasdlp       17184/tcp
 soundsvirtual   17185/tcp
 soundsvirtual   17185/udp
@@ -10971,6 +11002,7 @@ vofr-gateway    21590/tcp
 vofr-gateway    21590/udp
 tvpm            21800/tcp
 tvpm            21800/udp
+sal             21801/tcp
 webphone        21845/tcp
 webphone        21845/udp
 netspeak-is     21846/tcp