[git.ipfire.org] IPFire 3.x development tree branch, master, updated. adfe8977aed3b0816d9fd107402128753fe4f510
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 adfe8977aed3b0816d9fd107402128753fe4f510 (commit)
via 0897b92ca6b6481155f4e6df8a68d2cb32840630 (commit)
via 418f550baedc081f04b2668de6b01e8bbed9fa9e (commit)
via 4704797f6205f55772f13b792f1ae97192631bee (commit)
via d0d758e19f54be96d21ed68fa8a57b80708f536c (commit)
via f0103f6acb0e4de2202916b74449b30378180445 (commit)
via 0c361451ca20cc65b60fe9918d71422792e38b05 (commit)
via e92c488ead69cac605882cdbcfa16c7735a4306b (commit)
via 8d32419ac0bee698f685a08515e32d9803e4893b (commit)
via af3514d0f7351cb67b30e548dcfa6e540ecde093 (commit)
via 0b6ddf60fb16095b3d9ddb3e2d6ef84114c73d86 (commit)
via fd83b39371962e1031e6a491ad83eed6abfbd33a (commit)
via 7aa9388cb06b16bf2733d4681c894e8b3a70c979 (commit)
via d05006f4a0b4b60b584c603d17ad811be422ebb7 (commit)
via c57f113c700d412527dfaacfaefb1f7109be8d2a (commit)
from 57fb3e8c1a9532f6e883c39415f6feb974511556 (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 adfe8977aed3b0816d9fd107402128753fe4f510
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:42:59 2023 +0000
libtevent: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0897b92ca6b6481155f4e6df8a68d2cb32840630
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:42:45 2023 +0000
libtdb: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 418f550baedc081f04b2668de6b01e8bbed9fa9e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:39:35 2023 +0000
libtalloc: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4704797f6205f55772f13b792f1ae97192631bee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:36:55 2023 +0000
libpng: Disable building static libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d0d758e19f54be96d21ed68fa8a57b80708f536c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:33:09 2023 +0000
liboping: Fix some string formatting errors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f0103f6acb0e4de2202916b74449b30378180445
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:31:58 2023 +0000
libpciaccess: Don't depend xorg-x11-util-macros
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0c361451ca20cc65b60fe9918d71422792e38b05
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:28:09 2023 +0000
libunwind: Disable building static libraries
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e92c488ead69cac605882cdbcfa16c7735a4306b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:27:28 2023 +0000
libnftnl: Drop dependency on autogen
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d32419ac0bee698f685a08515e32d9803e4893b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:24:59 2023 +0000
libldb: Add libxcrypt as missing build dependency
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit af3514d0f7351cb67b30e548dcfa6e540ecde093
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 13:59:54 2023 +0000
libunwind: Remove brocken symlink
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0b6ddf60fb16095b3d9ddb3e2d6ef84114c73d86
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:12:30 2023 +0000
ldapvi: Link against libxcrypt
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fd83b39371962e1031e6a491ad83eed6abfbd33a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:12:06 2023 +0000
openldap: Drop dependencies on libdb < 6 and pth-devel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7aa9388cb06b16bf2733d4681c894e8b3a70c979
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:11:39 2023 +0000
gnome-doc-utils: Fix build with Python 3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d05006f4a0b4b60b584c603d17ad811be422ebb7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:11:03 2023 +0000
libxml2: Build Python 3 module
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c57f113c700d412527dfaacfaefb1f7109be8d2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 14:05:03 2023 +0000
libdrm: Drop dependency on libxcb
This no longer exists.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
gnome-doc-utils/gnome-doc-utils.nm | 4 +-
.../patches/gnome-doc-utils-0.20.10-python3.patch | 540 +++++++++++++++++++++
ldapvi/ldapvi.nm | 7 +-
libdrm/libdrm.nm | 3 +-
libldb/libldb.nm | 3 +-
libnftnl/libnftnl.nm | 3 +-
liboping/liboping.nm | 2 +-
liboping/patches/liboping-1.10.0-ncurses-6.3.patch | 51 ++
liboping/patches/liboping-1.10.0-no-werror.patch | 22 +
libpciaccess/libpciaccess.nm | 10 +-
libpng/libpng.nm | 10 +-
libtalloc/libtalloc.nm | 3 +-
libtdb/libtdb.nm | 3 +-
libtevent/libtevent.nm | 3 +-
libunwind/libunwind.nm | 14 +-
libxml2/libxml2.nm | 9 +-
openldap/openldap.nm | 9 +-
17 files changed, 653 insertions(+), 43 deletions(-)
create mode 100644 gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
create mode 100644 liboping/patches/liboping-1.10.0-ncurses-6.3.patch
create mode 100644 liboping/patches/liboping-1.10.0-no-werror.patch
Difference in files:
diff --git a/gnome-doc-utils/gnome-doc-utils.nm b/gnome-doc-utils/gnome-doc-utils.nm
index 4246ce13b..e6c64ba95 100644
--- a/gnome-doc-utils/gnome-doc-utils.nm
+++ b/gnome-doc-utils/gnome-doc-utils.nm
@@ -7,7 +7,7 @@ name = gnome-doc-utils
ver_major = 0.20
ver_minor = 10
version = %{ver_major}.%{ver_minor}
-release = 1
+release = 2
groups = Development/Tools
url = http://www.gnome.org/
@@ -26,6 +26,8 @@ sources = %{thisapp}.tar.xz
build
requires
perl(XML::Parser)
+ python3
+ python3-libxml2
intltool >= 0.35.0
libxml2-devel >= 2.6.12
libxslt-devel >= 1.1.8
diff --git a/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch b/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
new file mode 100644
index 000000000..bf9614feb
--- /dev/null
+++ b/gnome-doc-utils/patches/gnome-doc-utils-0.20.10-python3.patch
@@ -0,0 +1,540 @@
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500
+@@ -86,14 +86,14 @@
+ self.messages.append(t)
+ if spacepreserve:
+ self.nowrap[t] = True
+- if t in self.linenos.keys():
++ if t in list(self.linenos.keys()):
+ self.linenos[t].append((self.filename, tag, lineno))
+ else:
+ self.linenos[t] = [ (self.filename, tag, lineno) ]
+ if (not self.do_translations) and comment and not t in self.comments:
+ self.comments[t] = comment
+ else:
+- if t in self.linenos.keys():
++ if t in list(self.linenos.keys()):
+ self.linenos[t].append((self.filename, tag, lineno))
+ else:
+ self.linenos[t] = [ (self.filename, tag, lineno) ]
+@@ -166,7 +166,7 @@
+ elif node.isText():
+ if node.isBlankNode():
+ if self.app.options.get('expand_entities') or \
+- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
++ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
+ #print >>sys.stderr, "BLANK"
+ node.setContent('')
+ else:
+@@ -176,7 +176,7 @@
+ child = node.children
+ while child:
+ self.normalizeNode(child)
+- child = child.next
++ child = child.__next__
+
+ def normalizeString(self, text, spacepreserve = False):
+ """Normalizes string to be used as key for gettext lookup.
+@@ -200,7 +200,7 @@
+ tree = ctxt.doc()
+ newnode = tree.getRootElement()
+ except:
+- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
++ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
+ return text
+
+ self.normalizeNode(newnode)
+@@ -209,7 +209,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.next
++ child = child.__next__
+
+ result = re.sub('^ ','', result)
+ result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+ ctxt.parseDocument()
+ tree = ctxt.doc()
+ if next:
+- newnode = tree.children.next
++ newnode = tree.children.__next__
+ else:
+ newnode = tree.children
+
+@@ -243,7 +243,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.next
++ child = child.__next__
+ tree.freeDoc()
+ return result
+
+@@ -262,7 +262,7 @@
+ result += child.content.decode('utf-8')
+ else:
+ result += self.myAttributeSerialize(child)
+- child = child.next
++ child = child.__next__
+ else:
+ result = node.serialize('utf-8')
+ return result
+@@ -338,7 +338,7 @@
+ pass
+
+ if not newnode:
+- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
++ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
+ return
+
+ newelem = newnode.getRootElement()
+@@ -346,13 +346,13 @@
+ if newelem and newelem.children:
+ free = node.children
+ while free:
+- next = free.next
++ next = free.__next__
+ free.unlinkNode()
+ free = next
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.next
++ next = node.__next__
+ node.replaceNode(newelem.copyNodeList())
+ node.next = next
+
+@@ -378,7 +378,7 @@
+ if child.type in ['text'] and child.content.strip()!='':
+ final = True
+ break
+- child = child.next
++ child = child.__next__
+
+ node.__autofinal__ = final
+ return final
+@@ -457,7 +457,7 @@
+ outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+ else:
+ outtxt += self.doSerialize(child)
+- child = child.next
++ child = child.__next__
+
+ if self.app.operation == 'merge':
+ norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+ outtxt = ''
+ while child:
+ outtxt += self.doSerialize(child)
+- child = child.next
++ child = child.__next__
+ return outtxt
+
+ def xml_error_handler(arg, ctxt):
+@@ -577,8 +577,8 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
++ except Exception as e:
++ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
+ sys.exit(1)
+ self.current_mode.preProcessXml(doc.doc, self.msg)
+ doc.generate_messages()
+@@ -590,14 +590,14 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+
+ try:
+ mfile = open(mofile, "rb")
+ except:
+- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
++ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
+ self.gt = gettext.GNUTranslations(mfile)
+ self.gt.add_fallback(NoneTranslations())
+ # Has preProcessXml use cases for merge?
+@@ -619,16 +619,16 @@
+ raise IOError("Unable to read file '%s'" % xmlfile)
+ try:
+ doc = XMLDocument(xmlfile, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+ doc.generate_messages()
+
+ self.msg.translationsFollow()
+ try:
+ doc = XMLDocument(origxml, self)
+- except Exception, e:
+- print >> sys.stderr, str(e)
++ except Exception as e:
++ print(str(e), file=sys.stderr)
+ sys.exit(1)
+ doc.generate_messages()
+ self.output_po()
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500
+@@ -43,7 +43,7 @@
+ except ImportError:
+ from md5 import new as md5_new
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class docbookXmlMode(basicXmlMode):
+ """Class for special handling of DocBook document types.
+@@ -131,7 +131,7 @@
+ hash = self._md5_for_file(fullpath)
+ else:
+ hash = "THIS FILE DOESN'T EXIST"
+- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+
+ msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+ "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+@@ -198,10 +198,10 @@
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+ test = docbookXmlMode()
+- print "Ignored tags : " + repr(test.getIgnoredTags())
+- print "Final tags : " + repr(test.getFinalTags())
+- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
++ print("Ignored tags : " + repr(test.getIgnoredTags()))
++ print("Final tags : " + repr(test.getFinalTags()))
++ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
+
+- print "Credits from string: '%s'" % test.getStringForTranslators()
+- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
++ print("Credits from string: '%s'" % test.getStringForTranslators())
++ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
+
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500
+@@ -20,7 +20,7 @@
+ # Special case Gnome Summary
+ #
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class gsXmlMode(basicXmlMode):
+ """Abstract class for special handling of document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500
+@@ -39,7 +39,7 @@
+ except ImportError:
+ from md5 import new as md5_new
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class mallardXmlMode(basicXmlMode):
+ """Class for special handling of Mallard document types."""
+@@ -112,7 +112,7 @@
+ hash = self._md5_for_file(fullpath)
+ else:
+ hash = "THIS FILE DOESN'T EXIST"
+- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+
+ msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+ "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500
+@@ -2,7 +2,7 @@
+
+ import libxml2
+
+-from docbook import docbookXmlMode
++from .docbook import docbookXmlMode
+
+ class ubuntuXmlMode (docbookXmlMode):
+ """Special-casing Ubuntu DocBook website documentation."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500
+@@ -21,7 +21,7 @@
+ # This implements special instructions for handling XHTML documents
+ # in a better way, particularly to extract some attributes in HTML tags
+
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+
+ class xhtmlXmlMode(basicXmlMode):
+ """Class for special handling of XHTML document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500
+@@ -41,9 +41,9 @@
+ if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
+
+ def usage (with_help = False):
+- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
++ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
+ if with_help:
+- print >> sys.stderr, """
++ print("""
+ OPTIONS may be some of:
+ -a --automatic-tags Automatically decides if tags are to be considered
+ "final" or not
+@@ -72,7 +72,7 @@
+ using -p option for each XML file:
+ %(command)s -p de.po chapter1.xml > chapter1.de.xml
+ %(command)s -p de.po chapter2.xml > chapter2.de.xml
+-""" % {'command': sys.argv[0]}
++""" % {'command': sys.argv[0]}, file=sys.stderr)
+
+
+ def main(argv):
+@@ -82,7 +82,7 @@
+
+ name = os.path.join(os.path.dirname(__file__), '..')
+ if os.path.exists(os.path.join(name, 'tests')):
+- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
++ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
+ sys.path.insert(0, name)
+
+ from xml2po import Main
+@@ -142,14 +142,14 @@
+ elif opt in ('-o', '--output'):
+ output = arg
+ elif opt in ('-v', '--version'):
+- print VERSION
++ print(VERSION)
+ sys.exit(0)
+ elif opt in ('-h', '--help'):
+ usage(True)
+ sys.exit(0)
+
+ if operation == 'update' and output != "-":
+- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
++ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
+
+ # Treat remaining arguments as XML files
+ filenames = []
+@@ -159,16 +159,16 @@
+ try:
+ xml2po_main = Main(default_mode, operation, output, options)
+ except IOError:
+- print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
++ print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
+ sys.exit(5)
+
+ if operation == 'merge':
+ if len(filenames) > 1:
+- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
++ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
+ sys.exit(2)
+
+ if not mofile:
+- print >> sys.stderr, "Error: You must specify MO file when merging translations."
++ print("Error: You must specify MO file when merging translations.", file=sys.stderr)
+ sys.exit(3)
+
+ xml2po_main.merge(mofile, filenames[0])
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500
+@@ -166,7 +166,7 @@
+ elif node.isText():
+ if node.isBlankNode():
+ if self.app.options.get('expand_entities') or \
+- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
++ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
+ #print >>sys.stderr, "BLANK"
+ node.setContent('')
+ else:
+@@ -176,7 +176,7 @@
+ child = node.children
+ while child:
+ self.normalizeNode(child)
+- child = child.__next__
++ child = child.next
+
+ def normalizeString(self, text, spacepreserve = False):
+ """Normalizes string to be used as key for gettext lookup.
+@@ -209,7 +209,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.__next__
++ child = child.next
+
+ result = re.sub('^ ','', result)
+ result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+ ctxt.parseDocument()
+ tree = ctxt.doc()
+ if next:
+- newnode = tree.children.__next__
++ newnode = tree.children.next
+ else:
+ newnode = tree.children
+
+@@ -243,7 +243,7 @@
+ child = newnode.children
+ while child:
+ result += child.serialize('utf-8')
+- child = child.__next__
++ child = child.next
+ tree.freeDoc()
+ return result
+
+@@ -262,7 +262,7 @@
+ result += child.content.decode('utf-8')
+ else:
+ result += self.myAttributeSerialize(child)
+- child = child.__next__
++ child = child.next
+ else:
+ result = node.serialize('utf-8')
+ return result
+@@ -346,13 +346,13 @@
+ if newelem and newelem.children:
+ free = node.children
+ while free:
+- next = free.__next__
++ next = free.next
+ free.unlinkNode()
+ free = next
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.__next__
++ next = node.next
+ node.replaceNode(newelem.copyNodeList())
+ node.next = next
+
+@@ -378,7 +378,7 @@
+ if child.type in ['text'] and child.content.strip()!='':
+ final = True
+ break
+- child = child.__next__
++ child = child.next
+
+ node.__autofinal__ = final
+ return final
+@@ -457,7 +457,7 @@
+ outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+ else:
+ outtxt += self.doSerialize(child)
+- child = child.__next__
++ child = child.next
+
+ if self.app.operation == 'merge':
+ norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+ outtxt = ''
+ while child:
+ outtxt += self.doSerialize(child)
+- child = child.__next__
++ child = child.next
+ return outtxt
+
+ def xml_error_handler(arg, ctxt):
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500
+@@ -326,7 +326,7 @@
+ pass
+
+ content = '<%s>%s</%s>' % (starttag, text, endtag)
+- tmp = tmp + content.encode('utf-8')
++ tmp = tmp + content
+
+ newnode = None
+ try:
+@@ -663,7 +663,7 @@
+ if not text or text.strip() == '':
+ return text
+ if self.gt:
+- res = self.gt.ugettext(text.decode('utf-8'))
++ res = self.gt.gettext(text)
+ return res
+
+ return text
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500
+@@ -352,9 +352,10 @@
+
+ if node:
+ copy = newelem.copyNodeList()
+- next = node.next
++ #next = node.next
+ node.replaceNode(newelem.copyNodeList())
+- node.next = next
++ #print(type(next))
++ #node.next = next
+
+ else:
+ # In practice, this happens with tags such as "<para> </para>" (only whitespace in between)
+@@ -470,7 +471,7 @@
+
+ worth = self.worthOutputting(node)
+ if not translation:
+- translation = outtxt.decode('utf-8')
++ translation = outtxt
+ if worth and self.app.options.get('mark_untranslated'):
+ node.setLang('C')
+
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500
+@@ -184,7 +184,7 @@
+ else:
+ ai.addChild(copy)
+ if match.group(3):
+- copy.newChild(None, "year", match.group(3).encode('utf-8'))
++ copy.newChild(None, "year", match.group(3))
+ if match.group(1) and match.group(2):
+ holder = match.group(1)+"(%s)" % match.group(2)
+ elif match.group(1):
+@@ -193,7 +193,7 @@
+ holder = match.group(2)
+ else:
+ holder = "???"
+- copy.newChild(None, "holder", holder.encode('utf-8'))
++ copy.newChild(None, "holder", holder)
+
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -u
++#!/usr/bin/python3 -u
+ # -*- encoding: utf-8 -*-
+ # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo(a)gnome.org>.
+ # Copyright (c) 2009 Claude Paroz <claude(a)2xlibre.net>.
+--- gnome-doc-utils-0.20.10.old/xml2po/xml2po/__init__.py 2021-10-14 16:54:33.332661817 +0900
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2021-10-14 17:06:31.006607987 +0900
+@@ -504,7 +504,7 @@
+ # !!! This is not very nice thing to do, but I don't know if
+ # raising an exception is any better
+ return False
+- return tmpstr.find('EXTERNAL_GENERAL_PARSED_ENTITY') != -1
++ return tmpstr.find(b'EXTERNAL_GENERAL_PARSED_ENTITY') != -1
+
+ def doSerialize(self, node):
+ """Serializes a node and its children, emitting PO messages along the way.
+@@ -556,7 +556,7 @@
+ elif output == '-':
+ self.out = sys.stdout
+ else:
+- self.out = file(output, 'w')
++ self.out = open(output, 'w')
+
+ def load_mode(self, modename):
+ try:
diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
index fb0ff9c8b..f1b939b0f 100644
--- a/ldapvi/ldapvi.nm
+++ b/ldapvi/ldapvi.nm
@@ -5,12 +5,12 @@
name = ldapvi
version = 1.7
-release = 2
+release = 3
groups = Applications/Editors
url = http://www.lichteblau.com/ldapvi/
license = GPLv2+
-summary = An interactive LDAP client.
+summary = An interactive LDAP client
description
ldapvi is an interactive LDAP client for Unix terminals. Using it, you can \
@@ -18,11 +18,12 @@ description
it as vipw(1) for LDAP.
end
-source_dl =
+source_dl = https://www.lichteblau.com/download/
build
requires
glib2-devel
+ libxcrypt-devel
ncurses-devel
openldap-devel
openssl-devel
diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm
index c806a13cc..d0ab91680 100644
--- a/libdrm/libdrm.nm
+++ b/libdrm/libdrm.nm
@@ -5,7 +5,7 @@
name = libdrm
version = 2.4.114
-release = 1
+release = 1.1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = X/Libraries
@@ -27,7 +27,6 @@ build
cairo-devel
libpciaccess-devel
libtool
- libxcb-devel
meson
pkg-config
libudev-devel
diff --git a/libldb/libldb.nm b/libldb/libldb.nm
index a0c184a14..8567546a8 100644
--- a/libldb/libldb.nm
+++ b/libldb/libldb.nm
@@ -5,7 +5,7 @@
name = libldb
version = 2.6.1
-release = 1
+release = 1.1
thisapp = ldb-%{version}
groups = System/Libraries
@@ -30,6 +30,7 @@ build
libtdb-devel >= 1.3.8
libtevent-devel >= 0.9.27
libtirpc-devel
+ libxcrypt-devel
lmdb-devel >= 0.9.16
popt-devel
python3-devel
diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm
index 6c3523627..547bbc090 100644
--- a/libnftnl/libnftnl.nm
+++ b/libnftnl/libnftnl.nm
@@ -5,7 +5,7 @@
name = libnftnl
version = 1.2.4
-release = 1
+release = 1.1
groups = Networking/Tools
url = https://netfilter.org/projects/libnftnl
@@ -23,7 +23,6 @@ sources = %{thisapp}.tar.bz2
build
requires
autoconf
- autogen
automake
libmnl-devel
libtool
diff --git a/liboping/liboping.nm b/liboping/liboping.nm
index e775143a7..8f2296e7f 100644
--- a/liboping/liboping.nm
+++ b/liboping/liboping.nm
@@ -5,7 +5,7 @@
name = liboping
version = 1.10.0
-release = 3
+release = 4
groups = Development/Tools
url = https://noping.cc/
diff --git a/liboping/patches/liboping-1.10.0-ncurses-6.3.patch b/liboping/patches/liboping-1.10.0-ncurses-6.3.patch
new file mode 100644
index 000000000..d29afab6a
--- /dev/null
+++ b/liboping/patches/liboping-1.10.0-ncurses-6.3.patch
@@ -0,0 +1,51 @@
+From 609559aa3b257a5eb627717d870dfce336f941ec Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich(a)gmail.com>
+Date: Mon, 15 Nov 2021 08:05:43 +0000
+Subject: [PATCH] src/oping.c: always use "%s"-style format for printf()-style
+ functions
+
+`ncuses-6.3` added printf-style function attributes and now makes
+it easier to catch cases when user input is used in palce of format
+string when built with CFLAGS=-Werror=format-security:
+
+ oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security]
+ 1265 | hist_symbols_utf8[index]);
+ | ^~~~~~~~~~~~~~~~~
+
+Let's wrap all the missing places with "%s" format.
+---
+ src/oping.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/oping.c b/src/oping.c
+index c087c80..af4a0cb 100644
+--- a/src/oping.c
++++ b/src/oping.c
+@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
+ wattron (ctx->window, COLOR_PAIR(color));
+
+ if (has_utf8())
+- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
+
+@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
+ else if (has_utf8 ())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
+- hist_symbols_utf8[index]);
++ "%s", hist_symbols_utf8[index]);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
+ hist_symbols_acs[index] | A_ALTCHARSET);
+@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
+
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
+ data_len, context->host, context->addr,
+- sequence, recv_ttl,
+- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
++ sequence, recv_ttl);
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
diff --git a/liboping/patches/liboping-1.10.0-no-werror.patch b/liboping/patches/liboping-1.10.0-no-werror.patch
new file mode 100644
index 000000000..56a70a533
--- /dev/null
+++ b/liboping/patches/liboping-1.10.0-no-werror.patch
@@ -0,0 +1,22 @@
+--- liboping-1.10.0/src/Makefile.am 2017-05-11 00:32:27.000000000 -0700
++++ liboping-1.10.0/src/Makefile.am.new 2018-07-24 14:29:43.400661398 -0700
+@@ -3,7 +3,7 @@
+ SUBDIRS = mans
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ include_HEADERS = oping.h
+--- liboping-1.10.0/src/Makefile.in 2018-07-24 14:30:52.192553951 -0700
++++ liboping-1.10.0/src/Makefile.in.new 2018-07-24 14:30:57.281546003 -0700
+@@ -388,7 +388,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ SUBDIRS = mans
+-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
+ include_HEADERS = oping.h
+ lib_LTLIBRARIES = liboping.la
+
diff --git a/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm
index e02131b5c..4d8ca9aa0 100644
--- a/libpciaccess/libpciaccess.nm
+++ b/libpciaccess/libpciaccess.nm
@@ -5,12 +5,12 @@
name = libpciaccess
version = 0.17
-release = 1
+release = 2
groups = Applications/Virtualization
url = https://cgit.freedesktop.org/xorg/lib/libpciaccess/
license = LGPLv2.1+
-summary = Generic PCI access library.
+summary = Generic PCI access library
description
A toolkit to interact with the virtualization capabilities of recent
@@ -19,12 +19,6 @@ end
source_dl = https://www.x.org/archive/individual/lib/
-build
- requires
- xorg-x11-util-macros
- end
-end
-
packages
package %{name}
diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 8b6b9e71c..9c478eb9d 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -5,7 +5,7 @@
name = libpng
version = 1.6.39
-release = 1
+release = 2
groups = System/Libraries
url = http://www.libpng.org/pub/png/
@@ -27,6 +27,14 @@ build
pkg-config
zlib-devel
end
+
+ configure_options += \
+ --disable-static
+
+ install_cmds
+ # Remove libtool archives manually as they are installed incorrectly
+ rm -vf %{BUILDROOT}%{libdir}/*.la
+ end
end
packages
diff --git a/libtalloc/libtalloc.nm b/libtalloc/libtalloc.nm
index c0800da22..fc079ea6b 100644
--- a/libtalloc/libtalloc.nm
+++ b/libtalloc/libtalloc.nm
@@ -5,7 +5,7 @@
name = libtalloc
version = 2.3.4
-release = 1
+release = 2
thisapp = talloc-%{version}
groups = System/Libraries
@@ -23,6 +23,7 @@ build
requires
docbook-utils
docbook-xsl
+ libxcrypt-devel
python3-devel
end
diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm
index 970442a3a..b85fb53cf 100644
--- a/libtdb/libtdb.nm
+++ b/libtdb/libtdb.nm
@@ -5,7 +5,7 @@
name = libtdb
version = 1.4.7
-release = 1
+release = 2
thisapp = tdb-%{version}
groups = System/Libraries
@@ -23,6 +23,7 @@ build
requires
docbook-utils
docbook-xsl
+ libxcrypt-devel
python3-devel
end
diff --git a/libtevent/libtevent.nm b/libtevent/libtevent.nm
index e2d625874..d179133d2 100644
--- a/libtevent/libtevent.nm
+++ b/libtevent/libtevent.nm
@@ -5,7 +5,7 @@
name = libtevent
version = 0.13.0
-release = 1
+release = 2
thisapp = tevent-%{version}
groups = System/Libraries
@@ -27,6 +27,7 @@ build
docbook-utils
docbook-xsl
libtalloc-devel >= 2.3.4
+ libxcrypt-devel
python3-devel
end
diff --git a/libunwind/libunwind.nm b/libunwind/libunwind.nm
index 80e5851b4..707feb22a 100644
--- a/libunwind/libunwind.nm
+++ b/libunwind/libunwind.nm
@@ -5,7 +5,7 @@
name = libunwind
version = 1.4.0
-release = 1
+release = 2
groups = Development/Debuggers
url = https://savannah.nongnu.org/projects/libunwind
@@ -19,22 +19,14 @@ end
source_dl = https://download.savannah.gnu.org/releases/libunwind/
build
- requires
- autoconf
- automake
- libtool
- end
-
CFLAGS += -fcommon
- export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
-
configure_options += \
- --enable-static \
+ --disable-static \
--enable-shared
test
- make check || :
+ make check LD_LIBRARY_PATH=%{DIR_APP}/src/.libs || :
end
end
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm
index 24d27aa13..c284d5a47 100644
--- a/libxml2/libxml2.nm
+++ b/libxml2/libxml2.nm
@@ -6,7 +6,7 @@
name = libxml2
version = %{ver_maj}.3
ver_maj = 2.10
-release = 2
+release = 3
groups = System/Libraries
url = https://xmlsoft.org/
@@ -31,11 +31,12 @@ sources = %{thisapp}.tar.xz
build
requires
pkg-config
+ python3-devel
zlib-devel
end
configure_options += \
- --without-python
+ PYTHON=%{python3}
end
packages
@@ -45,6 +46,10 @@ packages
template DEVEL
end
+ package python3-%{name}
+ template PYTHON3
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index d00727c8d..847d13fc4 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,7 +4,7 @@
###############################################################################
name = openldap
-version = 2.6.3
+version = 2.6.4
release = 1.1
groups = System/Daemons
@@ -29,14 +29,10 @@ build
automake
cyrus-sasl-devel
groff
- # Cannot be built with libdb 6 and above
- # because of an incompatibility with AGPL
- libdb-devel < 6
libtool
libtool-devel
libxcrypt-devel
openssl-devel
- pth-devel
shadow-utils
end
@@ -52,9 +48,6 @@ build
--enable-backends=mod \
--enable-overlays=mod \
--enable-sql=no \
- --enable-ndb=no \
- --enable-hdb=yes \
- --enable-monitor=yes \
--disable-static
prepare_cmds
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace
by Peter Müller 04 Mar '23
by Peter Müller 04 Mar '23
04 Mar '23
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 2.x development tree".
The branch, next has been updated
via 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace (commit)
via 14b2f93fbfe4f78c56c01b73c0d76c3e74718a4b (commit)
via 7902b83cca725eb8252ed9225a7baf27e1c49687 (commit)
via cabd9441e854a36632640e2a3bb0b6181f97370d (commit)
via 9a86a1b89e7b22469126c953b99c788a31504933 (commit)
via c151ca241bfea1ea84b92269cd824971aabea732 (commit)
via 670981e64870b43981617560ce96b41db3a462fb (commit)
via d8827c30ee1a28c41f0b7d9d4b066f31307352be (commit)
via 0407daeeb628ef4d415fb94e370c494fba627608 (commit)
via 8818834d0f38b6a2b45e833888b0cf7da489fc9c (commit)
via 284ebca0577fe41ee914e70c72865794be705c01 (commit)
via 3ceda453ca320b31f281062e114b67ac14ac7abc (commit)
via 66a5ad1e88836fcfead7745eedbd8e0f753a22ee (commit)
via 1b6047b3eed9446347f94d43e7e3f9e84826c717 (commit)
via 2a9688211ea8930d0a3b9f7ac5ef7a18dbabe296 (commit)
via e2bdd79782eb26fc0e0b8d7ec7039afc3e94b223 (commit)
via f4b849cb3fb839d8eec6fb8a682f85cabd2f7d71 (commit)
via 4b8fef1371ea21ff3768486b27cb1243158dcdf3 (commit)
via 5a58f29fe95de72282bc99ae7d36c8dc26c1194e (commit)
via 7d4ff74e352cc21acc6d348431b262d0673d5b0c (commit)
via fa56777218a44df865502adc3f926ced618fe37e (commit)
via b5185d54fdbcb357843b81bec391f5981b62b9a3 (commit)
via b52a84ddc77f9db7e4ad7b129f21fbf528c6f990 (commit)
via de4dea96aa9a45785e7bb64aadf14f97cfc1a359 (commit)
via fb7fed2a6dae7465475497ae8d212b8f07a3d38e (commit)
via ab04951428b4a3d4818072f23e806300f73de3ed (commit)
from 313403043c5f0f5f053f8fe179b1ec7089cb31a1 (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 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Feb 6 17:20:43 2023 +0100
epson-inkjet-printer-escpr: Update to version 1.7.23
- Update from version 1.6.12 to 1.7.23
- Update of rootfile
- Changelog
Most changes are related to additional printers except for
1.7.10
* Fixed the problem that epson-escpr-wrapper filter would crash
when cupsRasterReadHeader failed.
1.7.7.2
* Supported new model.
* Fixed an issue of filter crash when FIFO I/O was closed.
1.7.0
* Supported new models.
* Applied Privacy Statement.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 14b2f93fbfe4f78c56c01b73c0d76c3e74718a4b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Feb 6 17:20:44 2023 +0100
fetchmail: Update to version 6.4.36
- Update from version 6.4.34 to 6.4.36
- Update of rootfile nor required
- Changelog
fetchmail-6.4.36 (released 2023-01-28, 31710 LoC):
(in alphabetical order of language codes):
* cs: Petr Pisar [Czech]
* es: Cristian Othón Martínez Vera [Spanish]
* fr: Frédéric Marchal [French]
* ja: Takeshi Hamasaki [Japanese]
* pl: Jakub Bogusz [Polish]
* ro: Remus-Gabriel Chelu [Romanian]
* sq: Besnik Bleta [Albanian]
* sv: Göran Uddeborg [Swedish]
fetchmail-6.4.35 (released 2023-01-04, 31707 LoC):
* Fetchmail now warns about OpenSSL before 1.1.1s or 3.0.7,
and rejects wolfSSL older than 5.5.1.
(in reverse alphabetical order of language codes so as not to prefer people):
* sv: Göran Uddeborg [Swedish]
* eo: Keith Bowes [Esperanto]
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 7902b83cca725eb8252ed9225a7baf27e1c49687
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 14:07:29 2023 +0000
Core Update 174: Ship tzdata
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit cabd9441e854a36632640e2a3bb0b6181f97370d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Feb 6 17:20:46 2023 +0100
tzdata: Update to version 2022g
- Update from version 2022e to 2022g
- Update of rootfile
- Changelog is too large to include here. See the NEWS file in the source tarball.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 9a86a1b89e7b22469126c953b99c788a31504933
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 14:06:14 2023 +0000
Core Update 174: Ship mail.cgi
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit c151ca241bfea1ea84b92269cd824971aabea732
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Feb 20 17:30:02 2023 +0100
wio-lib.pl: Fixes bug#13040 - Change multipart/mixed to multipart/alternative
- Thunderbird and Roundcube mail clients presume that any mail with Content Type of
multipart/mixed has an attachment included rather than actually checking for
disposition attachment. This means that any mail with multipart/mixed gets the
attachment icon marked up even though there is no attachment.
- Although this is a problem of the clients involved, in this case the simplest solution
is to change multipart/mixed to multipart/alternative as WIO Mail only sends text
without any attachment or other part to indicate that a client is active or inactive.
- Confirmed on my vm testbed
Fixes: Bug#13040
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 670981e64870b43981617560ce96b41db3a462fb
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Mon Feb 20 17:30:01 2023 +0100
mail.cgi: Fixes bug#13040 - Change multipart/mixed to multipart/alternative
- Thunderbird and Roundcube mail clients presume that any mail with Content Type of
multipart/mixed has an attachment included rather than actually checking for
disposition attachment. This means that any mail with multipart/mixed gets the
attachment icon marked up even though there is no attachment.
- Although this is a problem of the clients involved, in this case the simplest solution
is to change multipart/mixed to multipart/alternative as the Mail Service test mail only
sends text without any attachment or other part.
- Confirmed on my vm testbed
Fixes: Bug#13040
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit d8827c30ee1a28c41f0b7d9d4b066f31307352be
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 14:05:00 2023 +0000
wio: Bump package version
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 0407daeeb628ef4d415fb94e370c494fba627608
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 21 13:50:11 2023 +0100
wio.cgi: Fixes bug#13039 - Input boxes extend outside of WUI boundary with some browsers
- Original poster found this effect with using Vivaldi at 100% zoom.
- I tested it with Vivaldi and Firefox on Arch Linux and was not able to show the effect but
running SeaMonkey and changing the zoom from 100% to lower or higher caused the input
boxes to go outside of the WUI boundary as described by the bug reporter.
- It looks like the effect is dependent on the browser, the zoom setting and the OS
Distribution.
- In all cases the similar three input boxes in a row in the dhcp.cgi code for entering a
fixed lease stayed fixed in ratrio to the WUI page whatever zoom or browser was used.
- This patch changes the wio code for those three input boxes to use the approach from the
dhcp.cgi code.
- Tested on my vm testbed and change confirmed to fix the size of the input boxes
irrespective of the browser or zoom setting.
Fixes: Bug#13039
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 8818834d0f38b6a2b45e833888b0cf7da489fc9c
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 14:04:05 2023 +0000
Core Update 174: Ship log.dat
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 284ebca0577fe41ee914e70c72865794be705c01
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Feb 21 14:55:17 2023 +0100
log.dat: Fixes bug#12950 - adding apcupsd to system logs list
- Patch tested out on my production system that has apcupsd running on it. APCUPS was
in the list of options in the system logs and entries from apcupsd were extracted
correctly in the wui.
Fixes: Bug#12950
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3ceda453ca320b31f281062e114b67ac14ac7abc
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 14:03:06 2023 +0000
Core Update 174: Ship efivar
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 66a5ad1e88836fcfead7745eedbd8e0f753a22ee
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 28 19:45:15 2023 +0100
efivar: fix build for correct cpu
the makefile add --march=native which optimize the code to the
cpu of the buildhost which can result in unsupported instructions on
other machines.
commit 1b6047b3eed9446347f94d43e7e3f9e84826c717
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 28 19:55:17 2023 +0100
riscv64: enable EFI support and tools for riscv64
grub is still buggy! grub-install fails with an error:
Relocation 0x13 is not implented!
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2a9688211ea8930d0a3b9f7ac5ef7a18dbabe296
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 28 19:55:16 2023 +0100
checkrootfiles: add riscv64 checks
commit e2bdd79782eb26fc0e0b8d7ec7039afc3e94b223
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Feb 5 19:06:27 2023 +0100
initscripts: Remove rngd from the core package initscripts
- rngd removed from initscripts lfs and rootfiles due to change of rng-tools to addon
Fixes: Bug#12900
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit f4b849cb3fb839d8eec6fb8a682f85cabd2f7d71
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Sun Feb 5 19:06:26 2023 +0100
rng-tools: Move from core package to addon - fixes bug 12900
- This patch is to move the rng-tools package from a core package to an addon. With the
kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy.
- The results from HRNG's via rngd are used with an XOR after the entropy is
collected by the kernel. So the HWRNG output is used to dilute the kernel random number
data, which is already merged from several sources.
- Based on the above and @Paul's request in the bug report to have rng-tools kept as an
addon this patch set is submitted for consideration to keep rng-tools but as an addon.
- move rng-tools rootfile from common to packages
- Modify rng-tools lfs from core package to addon package
- Create rng-tools pak to install and uninstall - creating rc.d links for start & stop.
- Move rngd initscript from system to packages directory.
- Installed into my vm testbed and confirmed that it works. No rngd daemon installed
from iso install. After addon install rngd is present and running. Added various files
to be able to test the services wui page. rngd shows up and can be turned off and on
Fixes: Bug#12900
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit 4b8fef1371ea21ff3768486b27cb1243158dcdf3
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Jan 30 20:47:49 2023 +0100
rust: Update to 1.67.0
For details see:
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1670-2023…
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
commit 5a58f29fe95de72282bc99ae7d36c8dc26c1194e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 13:54:15 2023 +0000
Core Update 174: Ship lsof
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 7d4ff74e352cc21acc6d348431b262d0673d5b0c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Feb 5 12:27:06 2023 +0100
lsof: Update to 4.98.0
For details see:
https://github.com/lsof-org/lsof/blob/master/00DIST#L5471
"4.98.0 January 22, 2023
Fix two potential null pointer access bug when gethostbyname2()
returns an empty address list
Add support for older automake versions (on e.g. CentOS 7)
Migrate testing scripts and programs to autotools
Extend CI to build on more Linux distros
[linux] Fix handling of empty command name, closing #246.
Add test from #246, where lsof returns stale command name when the
command name is empty. If getting command name failed, return
NULL instead of empty string
Add --with/without-libtirpc option to autotools-based build
system and automatically detect libtirpc by default
Add -H switch to print human readable size, e.g. 123.4K (#260)
[linux] Fix implicit declaration error when HASPTYEPT is undefined
Add support for musl libc-based Linux distros
Add --enable-security argument to configure to allow only the
root user to list all open files
Add --enable-no-sock-security argument to configure to allow
anyone to list anyone else's socket files when combined with
--enable-security
[linux] Always enable 64 bit off_t in configure.ac
[netbsd] Import patches from pkgsrc and port autotools-based build system to NetBSD
[netbsd] Fix lock status reading"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit fa56777218a44df865502adc3f926ced618fe37e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Feb 5 08:21:07 2023 +0100
htop: Update to 3.2.2
For details see:
https://github.com/htop-dev/htop/blob/main/ChangeLog
"What's new in version 3.2.2
* CPUMeter now can show frequency in text mode
* Add option to render distribution path prefixes shadowed
* DiskIOMeter converts to bytes per second (not per interval)
* DiskIOMeter uses complete units, including missing "iB/s"
* DiskIOMeter indicates read and write in meter mode
* NetworkIOMeter converts to packets per second, shows packet rate
* Allow continued process following when changing display settings
* Update the panel header when changing to another tab
* Drop margin around the header if there are no meters
* Use Unicode replacement character for non-printable characters
* Default color preset uses bold blue for better visibility
* Update the Panel header on sort order inversions ('I')
* Toggle the header meters with pound key
* Fix ScreenPanel to handle quitting the panel while renaming
* Add fallback for HOME environment variable using passwd database
* Replace meaningless ID column with FD column in lock screen
* Use device format in the lock screen matching the files screen
* On Linux, improvements to file-descriptor lock detection
* On Linux, further distinguish systemd states in the SystemdMeter
* On Linux, improvements to cgroup and container identification
* On Linux, support openat(2) without readlinkat(2) platforms
* On Darwin, fix current process buffer handling for busy systems
* On DragonFly BSD, fix incorrect processor time of processes
* On FreeBSD, fix an issue with the memory graph not showing correctly
* On FreeBSD, add support for displaying shared memory usage
* On PCP, use pmLookupDescs(3) if available for efficiency
* On PCP, normalize generic columns values for consistent display
* On PCP, changes preparing for configurable, dynamic screens
* Handle invalid process columns from the configuration file
* Avoid undefined behaviour with deeply nested processes
* Fix crash when removing the currently active screen
* Prevent possible crash on a very early error path
* Include automake for Debian/Ubuntu
* Restore non-mouse support
* Reject unsupported command line arguments
* Document idle process state
* Clarify M_TRS/M_DRS columns"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b5185d54fdbcb357843b81bec391f5981b62b9a3
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 13:43:19 2023 +0000
Core Update 174: Ship all changes related to bug #10629
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit b52a84ddc77f9db7e4ad7b129f21fbf528c6f990
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 15:11:23 2023 +0100
dhcp.cgi: Fix bug#10629 - Highlight fixed IP's in dynamic range in red
- This v2 patch has moved the extraHead variable into header.pl
- This patch marks all IP's that are in the Fixed list but are also in the dynamic range
that has been defined, in red.
- Additional function created to check if an ip address is in a defined range.
- Added an additional key item under the Fixed Leases table for Fixed IP in dynamic range
- Added line to English Language file for this key item.
- ./make lang run before commit.
- Tested in vm testbed and confirmed that any ip address in the Fixed Leases table that
is in the defined dynamic range is highlighted in red
- This uses the css background-color appoach from the first patch in this set.
- This patch only highlights those IP's that overlap in red but does nothing more. So a
user can still create new ones if they want but they will all show up in red.
- This patch flags up if people are doing things that they shouldn't be doing but allows
them to continue doing so without changing anything if they don't want to and so will
not break existing setups.
Fixes: Bug#10629
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit de4dea96aa9a45785e7bb64aadf14f97cfc1a359
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 2 15:11:22 2023 +0100
dhcp.cgi: Fix for bug#10629 - update bgcolor to css
- This v2 version moves the extraHead variable to header.pl as many of the css values
will be used in many other WUI cgi pages so makes sense to not define anew in every
location using the bgcolor or other colour variables.
- I will submit patches to follow the same approach in all other WUI cgi pages once this
has been submitted into next
- bgcolor was deprecated in HTML 4.01 and is not supported by HTML 5
- The orange colour for IP's that are outside the IPFire green and blue subnets does not
work on any browser I am using.
- I used the CSS approach that @Leo used in the Zone Configuration cgi page
- This patch changes all existing bgcolor entries to the css based background-color
- Tested on my vm testbed and confirmed to work. The Orange colour for IP's outside of
the subnet now shows up.
Fixes: Bug#10629
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
commit fb7fed2a6dae7465475497ae8d212b8f07a3d38e
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Sat Mar 4 13:40:45 2023 +0000
Core Update 174: Ship and restart Squid
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit ab04951428b4a3d4818072f23e806300f73de3ed
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Mar 4 13:37:23 2023 +0100
squid: Update to 5.8
For details see:
https://github.com/squid-cache/squid/commits/v5
Please note:
Updating 'squid' to 5.8 required some lfs adjustments, as the translations are no longer
included in the source code.
I had to integrate the 'squid-langpack' file.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/header.pl | 20 +
config/cfgroot/network-functions.pl | 24 +
config/rootfiles/common/aarch64/initscripts | 2 -
config/rootfiles/common/riscv64/dmidecode | 13 -
config/rootfiles/common/riscv64/grub | 1597 ++++++--------------
config/rootfiles/common/riscv64/hyperscan | 18 -
config/rootfiles/common/riscv64/initscripts | 2 -
config/rootfiles/common/riscv64/intel-microcode | 139 --
config/rootfiles/common/riscv64/ipfire-netboot | 3 -
config/rootfiles/common/riscv64/lm_sensors | 2 -
config/rootfiles/common/riscv64/syslinux | 351 -----
config/rootfiles/common/tzdata | 3 +
config/rootfiles/common/x86_64/initscripts | 2 -
config/rootfiles/common/x86_64/rust | 65 +-
.../124 => core/174}/filelists/aarch64/efivar | 0
config/rootfiles/core/174/filelists/files | 5 +
.../{oldcore/170 => core/174}/filelists/lsof | 0
.../{oldcore/100 => core/174}/filelists/squid | 0
.../{oldcore/100 => core/174}/filelists/tzdata | 0
.../124 => core/174}/filelists/x86_64/efivar | 0
config/rootfiles/core/174/update.sh | 6 +-
.../rootfiles/packages/epson-inkjet-printer-escpr | 100 +-
config/rootfiles/{common => packages}/rng-tools | 2 +
doc/language_issues.de | 2 +-
doc/language_issues.en | 2 +-
doc/language_issues.es | 2 +
doc/language_issues.fr | 15 +-
doc/language_issues.it | 2 +-
doc/language_issues.nl | 2 +-
doc/language_issues.pl | 2 +-
doc/language_issues.ru | 2 +-
doc/language_issues.tr | 2 +-
doc/language_missings | 15 +-
html/cgi-bin/dhcp.cgi | 50 +-
html/cgi-bin/logs.cgi/log.dat | 2 +
html/cgi-bin/mail.cgi | 11 +-
langs/en/cgi-bin/en.pl | 1 +
lfs/Config | 10 +-
lfs/efibootmgr | 3 +-
lfs/efivar | 4 +-
lfs/epson-inkjet-printer-escpr | 8 +-
lfs/fetchmail | 8 +-
lfs/grub | 5 +-
lfs/htop | 8 +-
lfs/initscripts | 1 -
lfs/lsof | 12 +-
lfs/rng-tools | 14 +-
lfs/rust | 12 +-
lfs/squid | 15 +-
lfs/tzdata | 8 +-
lfs/wio | 4 +-
src/initscripts/{system => packages}/rngd | 0
src/paks/{apcupsd => rng-tools}/install.sh | 8 +-
src/paks/{borgbackup => rng-tools}/uninstall.sh | 7 +-
src/paks/{nqptp => rng-tools}/update.sh | 2 +-
src/patches/efivar-38_remove_march=native.patch | 18 +
src/patches/grub/grub-Use-zifencei-on-riscv.patch | 47 +
src/wio/wio-lib.pl | 2 +-
src/wio/wio.cgi | 12 +-
tools/checkrootfiles | 10 +-
60 files changed, 881 insertions(+), 1801 deletions(-)
delete mode 100644 config/rootfiles/common/riscv64/dmidecode
delete mode 100644 config/rootfiles/common/riscv64/hyperscan
delete mode 100644 config/rootfiles/common/riscv64/intel-microcode
delete mode 100644 config/rootfiles/common/riscv64/ipfire-netboot
delete mode 100644 config/rootfiles/common/riscv64/syslinux
copy config/rootfiles/{oldcore/124 => core/174}/filelists/aarch64/efivar (100%)
copy config/rootfiles/{oldcore/170 => core/174}/filelists/lsof (100%)
copy config/rootfiles/{oldcore/100 => core/174}/filelists/squid (100%)
copy config/rootfiles/{oldcore/100 => core/174}/filelists/tzdata (100%)
copy config/rootfiles/{oldcore/124 => core/174}/filelists/x86_64/efivar (100%)
rename config/rootfiles/{common => packages}/rng-tools (69%)
rename src/initscripts/{system => packages}/rngd (100%)
copy src/paks/{apcupsd => rng-tools}/install.sh (85%)
copy src/paks/{borgbackup => rng-tools}/uninstall.sh (91%)
copy src/paks/{nqptp => rng-tools}/update.sh (96%)
create mode 100644 src/patches/efivar-38_remove_march=native.patch
create mode 100644 src/patches/grub/grub-Use-zifencei-on-riscv.patch
Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3956d80a1..cd56e574f 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -41,6 +41,26 @@ $Header::colourvpn = '#990099';
$Header::colourerr = '#FF0000';
$Header::viewsize = 150;
$Header::errormessage = '';
+$Header::extraHead = <<END
+<style>
+ .row-color20 {
+ background-color: $color{'color20'};
+ }
+ .row-color22 {
+ background-color: $color{'color22'};
+ }
+ .row-colouryellow {
+ background-color: $Header::colouryellow;
+ }
+ .cell-orange {
+ background-color: orange;
+ }
+ .cell-red {
+ background-color: red;
+ }
+</style>
+END
+;
my %menuhash = ();
my $menu = \%menuhash;
%settings = ();
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 4ac6d8670..7b38cfac7 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -307,6 +307,24 @@ sub ip_address_in_network($$) {
return (($address_bin >= $network_bin) && ($address_bin <= $broadcast_bin));
}
+# Returns True if $ipaddress is within $ipstart and $ipend range.
+sub ip_address_in_range($$) {
+ my $ipaddress = shift;
+ my $ipstart = shift;
+ my $ipend = shift;
+
+ my $ipaddress_bin = &ip2bin($ipaddress);
+ return undef unless (defined $ipaddress_bin);
+
+ my $ipstart_bin = &ip2bin($ipstart);
+ return undef unless (defined $ipstart_bin);
+
+ my $ipend_bin = &ip2bin($ipend);
+ return undef unless (defined $ipend_bin);
+
+ return (($ipaddress_bin >= $ipstart_bin) && ($ipaddress_bin <= $ipend_bin));
+}
+
sub setup_upstream_proxy() {
my %proxysettings = ();
&General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
@@ -666,6 +684,12 @@ sub testsuite() {
$result = &ip_address_in_network("192.168.30.11", "0.0.0.0/8");
assert('ip_address_in_network("192.168.30.11", "0.0.0.0/8")', !$result);
+ $result = &ip_address_in_range("192.168.30.11", "192.168.30.10", "192.168.30.20");
+ assert('ip_address_in_range("192.168.30.11", "192.168.30.10", "192.168.30.20")', $result);
+
+ $result = &ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168.30.20");
+ assert('ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168.30.20")', !$result);
+
print "Testsuite completed successfully!\n";
return 0;
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index d0c01c006..dc6c0fd24 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/config/rootfiles/common/riscv64/dmidecode b/config/rootfiles/common/riscv64/dmidecode
deleted file mode 100644
index 5b2ba45ed..000000000
--- a/config/rootfiles/common/riscv64/dmidecode
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/sbin/biosdecode
-usr/sbin/dmidecode
-usr/sbin/ownership
-usr/sbin/vpddecode
-#usr/share/doc/dmidecode
-#usr/share/doc/dmidecode/AUTHORS
-#usr/share/doc/dmidecode/CHANGELOG
-#usr/share/doc/dmidecode/NEWS
-#usr/share/doc/dmidecode/README
-#usr/share/man/man8/biosdecode.8
-#usr/share/man/man8/dmidecode.8
-#usr/share/man/man8/ownership.8
-#usr/share/man/man8/vpddecode.8
diff --git a/config/rootfiles/common/riscv64/grub b/config/rootfiles/common/riscv64/grub
index 35a026391..be2fed0a5 100644
--- a/config/rootfiles/common/riscv64/grub
+++ b/config/rootfiles/common/riscv64/grub
@@ -1,5 +1,4 @@
#boot/grub
-boot/grub/grub.cfg
boot/grub/splash.png
#etc/bash_completion.d
#etc/bash_completion.d/grub
@@ -33,1126 +32,454 @@ usr/bin/grub-render-label
usr/bin/grub-script-check
usr/bin/grub-syslinux2cfg
#usr/lib/grub
-#usr/lib/grub/i386-pc
-usr/lib/grub/i386-pc/acpi.mod
-usr/lib/grub/i386-pc/acpi.module
-usr/lib/grub/i386-pc/adler32.mod
-usr/lib/grub/i386-pc/adler32.module
-usr/lib/grub/i386-pc/affs.mod
-usr/lib/grub/i386-pc/affs.module
-usr/lib/grub/i386-pc/afs.mod
-usr/lib/grub/i386-pc/afs.module
-usr/lib/grub/i386-pc/afsplitter.mod
-usr/lib/grub/i386-pc/afsplitter.module
-usr/lib/grub/i386-pc/ahci.mod
-usr/lib/grub/i386-pc/ahci.module
-usr/lib/grub/i386-pc/all_video.mod
-usr/lib/grub/i386-pc/all_video.module
-usr/lib/grub/i386-pc/aout.mod
-usr/lib/grub/i386-pc/aout.module
-usr/lib/grub/i386-pc/archelp.mod
-usr/lib/grub/i386-pc/archelp.module
-usr/lib/grub/i386-pc/at_keyboard.mod
-usr/lib/grub/i386-pc/at_keyboard.module
-usr/lib/grub/i386-pc/ata.mod
-usr/lib/grub/i386-pc/ata.module
-usr/lib/grub/i386-pc/backtrace.mod
-usr/lib/grub/i386-pc/backtrace.module
-usr/lib/grub/i386-pc/bfs.mod
-usr/lib/grub/i386-pc/bfs.module
-usr/lib/grub/i386-pc/biosdisk.mod
-usr/lib/grub/i386-pc/biosdisk.module
-usr/lib/grub/i386-pc/bitmap.mod
-usr/lib/grub/i386-pc/bitmap.module
-usr/lib/grub/i386-pc/bitmap_scale.mod
-usr/lib/grub/i386-pc/bitmap_scale.module
-usr/lib/grub/i386-pc/blocklist.mod
-usr/lib/grub/i386-pc/blocklist.module
-usr/lib/grub/i386-pc/boot.image
-usr/lib/grub/i386-pc/boot.img
-usr/lib/grub/i386-pc/boot.mod
-usr/lib/grub/i386-pc/boot.module
-usr/lib/grub/i386-pc/boot_hybrid.image
-usr/lib/grub/i386-pc/boot_hybrid.img
-usr/lib/grub/i386-pc/bsd.mod
-usr/lib/grub/i386-pc/bsd.module
-usr/lib/grub/i386-pc/bswap_test.mod
-usr/lib/grub/i386-pc/bswap_test.module
-usr/lib/grub/i386-pc/btrfs.mod
-usr/lib/grub/i386-pc/btrfs.module
-usr/lib/grub/i386-pc/bufio.mod
-usr/lib/grub/i386-pc/bufio.module
-usr/lib/grub/i386-pc/cat.mod
-usr/lib/grub/i386-pc/cat.module
-usr/lib/grub/i386-pc/cbfs.mod
-usr/lib/grub/i386-pc/cbfs.module
-usr/lib/grub/i386-pc/cbls.mod
-usr/lib/grub/i386-pc/cbls.module
-usr/lib/grub/i386-pc/cbmemc.mod
-usr/lib/grub/i386-pc/cbmemc.module
-usr/lib/grub/i386-pc/cbtable.mod
-usr/lib/grub/i386-pc/cbtable.module
-usr/lib/grub/i386-pc/cbtime.mod
-usr/lib/grub/i386-pc/cbtime.module
-usr/lib/grub/i386-pc/cdboot.image
-usr/lib/grub/i386-pc/cdboot.img
-usr/lib/grub/i386-pc/chain.mod
-usr/lib/grub/i386-pc/chain.module
-usr/lib/grub/i386-pc/cmdline_cat_test.mod
-usr/lib/grub/i386-pc/cmdline_cat_test.module
-usr/lib/grub/i386-pc/cmosdump.mod
-usr/lib/grub/i386-pc/cmosdump.module
-usr/lib/grub/i386-pc/cmostest.mod
-usr/lib/grub/i386-pc/cmostest.module
-usr/lib/grub/i386-pc/cmp.mod
-usr/lib/grub/i386-pc/cmp.module
-usr/lib/grub/i386-pc/cmp_test.mod
-usr/lib/grub/i386-pc/cmp_test.module
-usr/lib/grub/i386-pc/command.lst
-usr/lib/grub/i386-pc/config.h
-usr/lib/grub/i386-pc/configfile.mod
-usr/lib/grub/i386-pc/configfile.module
-usr/lib/grub/i386-pc/cpio.mod
-usr/lib/grub/i386-pc/cpio.module
-usr/lib/grub/i386-pc/cpio_be.mod
-usr/lib/grub/i386-pc/cpio_be.module
-usr/lib/grub/i386-pc/cpuid.mod
-usr/lib/grub/i386-pc/cpuid.module
-usr/lib/grub/i386-pc/crc64.mod
-usr/lib/grub/i386-pc/crc64.module
-usr/lib/grub/i386-pc/crypto.lst
-usr/lib/grub/i386-pc/crypto.mod
-usr/lib/grub/i386-pc/crypto.module
-usr/lib/grub/i386-pc/cryptodisk.mod
-usr/lib/grub/i386-pc/cryptodisk.module
-usr/lib/grub/i386-pc/cs5536.mod
-usr/lib/grub/i386-pc/cs5536.module
-usr/lib/grub/i386-pc/ctz_test.mod
-usr/lib/grub/i386-pc/ctz_test.module
-usr/lib/grub/i386-pc/date.mod
-usr/lib/grub/i386-pc/date.module
-usr/lib/grub/i386-pc/datehook.mod
-usr/lib/grub/i386-pc/datehook.module
-usr/lib/grub/i386-pc/datetime.mod
-usr/lib/grub/i386-pc/datetime.module
-usr/lib/grub/i386-pc/disk.mod
-usr/lib/grub/i386-pc/disk.module
-usr/lib/grub/i386-pc/diskboot.image
-usr/lib/grub/i386-pc/diskboot.img
-usr/lib/grub/i386-pc/diskfilter.mod
-usr/lib/grub/i386-pc/diskfilter.module
-usr/lib/grub/i386-pc/div.mod
-usr/lib/grub/i386-pc/div.module
-usr/lib/grub/i386-pc/div_test.mod
-usr/lib/grub/i386-pc/div_test.module
-usr/lib/grub/i386-pc/dm_nv.mod
-usr/lib/grub/i386-pc/dm_nv.module
-usr/lib/grub/i386-pc/drivemap.mod
-usr/lib/grub/i386-pc/drivemap.module
-usr/lib/grub/i386-pc/echo.mod
-usr/lib/grub/i386-pc/echo.module
-usr/lib/grub/i386-pc/efiemu.mod
-usr/lib/grub/i386-pc/efiemu.module
-usr/lib/grub/i386-pc/ehci.mod
-usr/lib/grub/i386-pc/ehci.module
-usr/lib/grub/i386-pc/elf.mod
-usr/lib/grub/i386-pc/elf.module
-usr/lib/grub/i386-pc/eval.mod
-usr/lib/grub/i386-pc/eval.module
-usr/lib/grub/i386-pc/exfat.mod
-usr/lib/grub/i386-pc/exfat.module
-usr/lib/grub/i386-pc/exfctest.mod
-usr/lib/grub/i386-pc/exfctest.module
-usr/lib/grub/i386-pc/ext2.mod
-usr/lib/grub/i386-pc/ext2.module
-usr/lib/grub/i386-pc/extcmd.mod
-usr/lib/grub/i386-pc/extcmd.module
-usr/lib/grub/i386-pc/f2fs.mod
-usr/lib/grub/i386-pc/f2fs.module
-usr/lib/grub/i386-pc/fat.mod
-usr/lib/grub/i386-pc/fat.module
-usr/lib/grub/i386-pc/fdt.lst
-usr/lib/grub/i386-pc/file.mod
-usr/lib/grub/i386-pc/file.module
-usr/lib/grub/i386-pc/font.mod
-usr/lib/grub/i386-pc/font.module
-usr/lib/grub/i386-pc/freedos.mod
-usr/lib/grub/i386-pc/freedos.module
-usr/lib/grub/i386-pc/fs.lst
-usr/lib/grub/i386-pc/fshelp.mod
-usr/lib/grub/i386-pc/fshelp.module
-usr/lib/grub/i386-pc/functional_test.mod
-usr/lib/grub/i386-pc/functional_test.module
-usr/lib/grub/i386-pc/gcry_arcfour.mod
-usr/lib/grub/i386-pc/gcry_arcfour.module
-usr/lib/grub/i386-pc/gcry_blowfish.mod
-usr/lib/grub/i386-pc/gcry_blowfish.module
-usr/lib/grub/i386-pc/gcry_camellia.mod
-usr/lib/grub/i386-pc/gcry_camellia.module
-usr/lib/grub/i386-pc/gcry_cast5.mod
-usr/lib/grub/i386-pc/gcry_cast5.module
-usr/lib/grub/i386-pc/gcry_crc.mod
-usr/lib/grub/i386-pc/gcry_crc.module
-usr/lib/grub/i386-pc/gcry_des.mod
-usr/lib/grub/i386-pc/gcry_des.module
-usr/lib/grub/i386-pc/gcry_dsa.mod
-usr/lib/grub/i386-pc/gcry_dsa.module
-usr/lib/grub/i386-pc/gcry_idea.mod
-usr/lib/grub/i386-pc/gcry_idea.module
-usr/lib/grub/i386-pc/gcry_md4.mod
-usr/lib/grub/i386-pc/gcry_md4.module
-usr/lib/grub/i386-pc/gcry_md5.mod
-usr/lib/grub/i386-pc/gcry_md5.module
-usr/lib/grub/i386-pc/gcry_rfc2268.mod
-usr/lib/grub/i386-pc/gcry_rfc2268.module
-usr/lib/grub/i386-pc/gcry_rijndael.mod
-usr/lib/grub/i386-pc/gcry_rijndael.module
-usr/lib/grub/i386-pc/gcry_rmd160.mod
-usr/lib/grub/i386-pc/gcry_rmd160.module
-usr/lib/grub/i386-pc/gcry_rsa.mod
-usr/lib/grub/i386-pc/gcry_rsa.module
-usr/lib/grub/i386-pc/gcry_seed.mod
-usr/lib/grub/i386-pc/gcry_seed.module
-usr/lib/grub/i386-pc/gcry_serpent.mod
-usr/lib/grub/i386-pc/gcry_serpent.module
-usr/lib/grub/i386-pc/gcry_sha1.mod
-usr/lib/grub/i386-pc/gcry_sha1.module
-usr/lib/grub/i386-pc/gcry_sha256.mod
-usr/lib/grub/i386-pc/gcry_sha256.module
-usr/lib/grub/i386-pc/gcry_sha512.mod
-usr/lib/grub/i386-pc/gcry_sha512.module
-usr/lib/grub/i386-pc/gcry_tiger.mod
-usr/lib/grub/i386-pc/gcry_tiger.module
-usr/lib/grub/i386-pc/gcry_twofish.mod
-usr/lib/grub/i386-pc/gcry_twofish.module
-usr/lib/grub/i386-pc/gcry_whirlpool.mod
-usr/lib/grub/i386-pc/gcry_whirlpool.module
-usr/lib/grub/i386-pc/gdb.mod
-usr/lib/grub/i386-pc/gdb.module
-usr/lib/grub/i386-pc/gdb_grub
-usr/lib/grub/i386-pc/geli.mod
-usr/lib/grub/i386-pc/geli.module
-usr/lib/grub/i386-pc/gettext.mod
-usr/lib/grub/i386-pc/gettext.module
-usr/lib/grub/i386-pc/gfxmenu.mod
-usr/lib/grub/i386-pc/gfxmenu.module
-usr/lib/grub/i386-pc/gfxterm.mod
-usr/lib/grub/i386-pc/gfxterm.module
-usr/lib/grub/i386-pc/gfxterm_background.mod
-usr/lib/grub/i386-pc/gfxterm_background.module
-usr/lib/grub/i386-pc/gfxterm_menu.mod
-usr/lib/grub/i386-pc/gfxterm_menu.module
-usr/lib/grub/i386-pc/gmodule.pl
-usr/lib/grub/i386-pc/gptsync.mod
-usr/lib/grub/i386-pc/gptsync.module
-usr/lib/grub/i386-pc/gzio.mod
-usr/lib/grub/i386-pc/gzio.module
-usr/lib/grub/i386-pc/halt.mod
-usr/lib/grub/i386-pc/halt.module
-usr/lib/grub/i386-pc/hashsum.mod
-usr/lib/grub/i386-pc/hashsum.module
-usr/lib/grub/i386-pc/hdparm.mod
-usr/lib/grub/i386-pc/hdparm.module
-usr/lib/grub/i386-pc/hello.mod
-usr/lib/grub/i386-pc/hello.module
-usr/lib/grub/i386-pc/help.mod
-usr/lib/grub/i386-pc/help.module
-usr/lib/grub/i386-pc/hexdump.mod
-usr/lib/grub/i386-pc/hexdump.module
-usr/lib/grub/i386-pc/hfs.mod
-usr/lib/grub/i386-pc/hfs.module
-usr/lib/grub/i386-pc/hfsplus.mod
-usr/lib/grub/i386-pc/hfsplus.module
-usr/lib/grub/i386-pc/hfspluscomp.mod
-usr/lib/grub/i386-pc/hfspluscomp.module
-usr/lib/grub/i386-pc/http.mod
-usr/lib/grub/i386-pc/http.module
-usr/lib/grub/i386-pc/iorw.mod
-usr/lib/grub/i386-pc/iorw.module
-usr/lib/grub/i386-pc/iso9660.mod
-usr/lib/grub/i386-pc/iso9660.module
-usr/lib/grub/i386-pc/jfs.mod
-usr/lib/grub/i386-pc/jfs.module
-usr/lib/grub/i386-pc/jpeg.mod
-usr/lib/grub/i386-pc/jpeg.module
-usr/lib/grub/i386-pc/json.mod
-usr/lib/grub/i386-pc/json.module
-usr/lib/grub/i386-pc/kernel.exec
-usr/lib/grub/i386-pc/kernel.img
-usr/lib/grub/i386-pc/keylayouts.mod
-usr/lib/grub/i386-pc/keylayouts.module
-usr/lib/grub/i386-pc/keystatus.mod
-usr/lib/grub/i386-pc/keystatus.module
-usr/lib/grub/i386-pc/ldm.mod
-usr/lib/grub/i386-pc/ldm.module
-usr/lib/grub/i386-pc/legacy_password_test.mod
-usr/lib/grub/i386-pc/legacy_password_test.module
-usr/lib/grub/i386-pc/legacycfg.mod
-usr/lib/grub/i386-pc/legacycfg.module
-usr/lib/grub/i386-pc/linux.mod
-usr/lib/grub/i386-pc/linux.module
-usr/lib/grub/i386-pc/linux16.mod
-usr/lib/grub/i386-pc/linux16.module
-usr/lib/grub/i386-pc/lnxboot.image
-usr/lib/grub/i386-pc/lnxboot.img
-usr/lib/grub/i386-pc/loadenv.mod
-usr/lib/grub/i386-pc/loadenv.module
-usr/lib/grub/i386-pc/loopback.mod
-usr/lib/grub/i386-pc/loopback.module
-usr/lib/grub/i386-pc/ls.mod
-usr/lib/grub/i386-pc/ls.module
-usr/lib/grub/i386-pc/lsacpi.mod
-usr/lib/grub/i386-pc/lsacpi.module
-usr/lib/grub/i386-pc/lsapm.mod
-usr/lib/grub/i386-pc/lsapm.module
-usr/lib/grub/i386-pc/lsmmap.mod
-usr/lib/grub/i386-pc/lsmmap.module
-usr/lib/grub/i386-pc/lspci.mod
-usr/lib/grub/i386-pc/lspci.module
-usr/lib/grub/i386-pc/luks.mod
-usr/lib/grub/i386-pc/luks.module
-usr/lib/grub/i386-pc/luks2.mod
-usr/lib/grub/i386-pc/luks2.module
-usr/lib/grub/i386-pc/lvm.mod
-usr/lib/grub/i386-pc/lvm.module
-usr/lib/grub/i386-pc/lzma_decompress.image
-usr/lib/grub/i386-pc/lzma_decompress.img
-usr/lib/grub/i386-pc/lzopio.mod
-usr/lib/grub/i386-pc/lzopio.module
-usr/lib/grub/i386-pc/macbless.mod
-usr/lib/grub/i386-pc/macbless.module
-usr/lib/grub/i386-pc/macho.mod
-usr/lib/grub/i386-pc/macho.module
-usr/lib/grub/i386-pc/mda_text.mod
-usr/lib/grub/i386-pc/mda_text.module
-usr/lib/grub/i386-pc/mdraid09.mod
-usr/lib/grub/i386-pc/mdraid09.module
-usr/lib/grub/i386-pc/mdraid09_be.mod
-usr/lib/grub/i386-pc/mdraid09_be.module
-usr/lib/grub/i386-pc/mdraid1x.mod
-usr/lib/grub/i386-pc/mdraid1x.module
-usr/lib/grub/i386-pc/memdisk.mod
-usr/lib/grub/i386-pc/memdisk.module
-usr/lib/grub/i386-pc/memrw.mod
-usr/lib/grub/i386-pc/memrw.module
-usr/lib/grub/i386-pc/minicmd.mod
-usr/lib/grub/i386-pc/minicmd.module
-usr/lib/grub/i386-pc/minix.mod
-usr/lib/grub/i386-pc/minix.module
-usr/lib/grub/i386-pc/minix2.mod
-usr/lib/grub/i386-pc/minix2.module
-usr/lib/grub/i386-pc/minix2_be.mod
-usr/lib/grub/i386-pc/minix2_be.module
-usr/lib/grub/i386-pc/minix3.mod
-usr/lib/grub/i386-pc/minix3.module
-usr/lib/grub/i386-pc/minix3_be.mod
-usr/lib/grub/i386-pc/minix3_be.module
-usr/lib/grub/i386-pc/minix_be.mod
-usr/lib/grub/i386-pc/minix_be.module
-usr/lib/grub/i386-pc/mmap.mod
-usr/lib/grub/i386-pc/mmap.module
-usr/lib/grub/i386-pc/moddep.lst
-usr/lib/grub/i386-pc/modinfo.sh
-usr/lib/grub/i386-pc/morse.mod
-usr/lib/grub/i386-pc/morse.module
-usr/lib/grub/i386-pc/mpi.mod
-usr/lib/grub/i386-pc/mpi.module
-usr/lib/grub/i386-pc/msdospart.mod
-usr/lib/grub/i386-pc/msdospart.module
-usr/lib/grub/i386-pc/mul_test.mod
-usr/lib/grub/i386-pc/mul_test.module
-usr/lib/grub/i386-pc/multiboot.mod
-usr/lib/grub/i386-pc/multiboot.module
-usr/lib/grub/i386-pc/multiboot2.mod
-usr/lib/grub/i386-pc/multiboot2.module
-usr/lib/grub/i386-pc/nativedisk.mod
-usr/lib/grub/i386-pc/nativedisk.module
-usr/lib/grub/i386-pc/net.mod
-usr/lib/grub/i386-pc/net.module
-usr/lib/grub/i386-pc/newc.mod
-usr/lib/grub/i386-pc/newc.module
-usr/lib/grub/i386-pc/nilfs2.mod
-usr/lib/grub/i386-pc/nilfs2.module
-usr/lib/grub/i386-pc/normal.mod
-usr/lib/grub/i386-pc/normal.module
-usr/lib/grub/i386-pc/ntfs.mod
-usr/lib/grub/i386-pc/ntfs.module
-usr/lib/grub/i386-pc/ntfscomp.mod
-usr/lib/grub/i386-pc/ntfscomp.module
-usr/lib/grub/i386-pc/ntldr.mod
-usr/lib/grub/i386-pc/ntldr.module
-usr/lib/grub/i386-pc/odc.mod
-usr/lib/grub/i386-pc/odc.module
-usr/lib/grub/i386-pc/offsetio.mod
-usr/lib/grub/i386-pc/offsetio.module
-usr/lib/grub/i386-pc/ohci.mod
-usr/lib/grub/i386-pc/ohci.module
-usr/lib/grub/i386-pc/part_acorn.mod
-usr/lib/grub/i386-pc/part_acorn.module
-usr/lib/grub/i386-pc/part_amiga.mod
-usr/lib/grub/i386-pc/part_amiga.module
-usr/lib/grub/i386-pc/part_apple.mod
-usr/lib/grub/i386-pc/part_apple.module
-usr/lib/grub/i386-pc/part_bsd.mod
-usr/lib/grub/i386-pc/part_bsd.module
-usr/lib/grub/i386-pc/part_dfly.mod
-usr/lib/grub/i386-pc/part_dfly.module
-usr/lib/grub/i386-pc/part_dvh.mod
-usr/lib/grub/i386-pc/part_dvh.module
-usr/lib/grub/i386-pc/part_gpt.mod
-usr/lib/grub/i386-pc/part_gpt.module
-usr/lib/grub/i386-pc/part_msdos.mod
-usr/lib/grub/i386-pc/part_msdos.module
-usr/lib/grub/i386-pc/part_plan.mod
-usr/lib/grub/i386-pc/part_plan.module
-usr/lib/grub/i386-pc/part_sun.mod
-usr/lib/grub/i386-pc/part_sun.module
-usr/lib/grub/i386-pc/part_sunpc.mod
-usr/lib/grub/i386-pc/part_sunpc.module
-usr/lib/grub/i386-pc/partmap.lst
-usr/lib/grub/i386-pc/parttool.lst
-usr/lib/grub/i386-pc/parttool.mod
-usr/lib/grub/i386-pc/parttool.module
-usr/lib/grub/i386-pc/password.mod
-usr/lib/grub/i386-pc/password.module
-usr/lib/grub/i386-pc/password_pbkdf2.mod
-usr/lib/grub/i386-pc/password_pbkdf2.module
-usr/lib/grub/i386-pc/pata.mod
-usr/lib/grub/i386-pc/pata.module
-usr/lib/grub/i386-pc/pbkdf2.mod
-usr/lib/grub/i386-pc/pbkdf2.module
-usr/lib/grub/i386-pc/pbkdf2_test.mod
-usr/lib/grub/i386-pc/pbkdf2_test.module
-usr/lib/grub/i386-pc/pci.mod
-usr/lib/grub/i386-pc/pci.module
-usr/lib/grub/i386-pc/pcidump.mod
-usr/lib/grub/i386-pc/pcidump.module
-usr/lib/grub/i386-pc/pgp.mod
-usr/lib/grub/i386-pc/pgp.module
-usr/lib/grub/i386-pc/plan9.mod
-usr/lib/grub/i386-pc/plan9.module
-usr/lib/grub/i386-pc/play.mod
-usr/lib/grub/i386-pc/play.module
-usr/lib/grub/i386-pc/png.mod
-usr/lib/grub/i386-pc/png.module
-usr/lib/grub/i386-pc/priority_queue.mod
-usr/lib/grub/i386-pc/priority_queue.module
-usr/lib/grub/i386-pc/probe.mod
-usr/lib/grub/i386-pc/probe.module
-usr/lib/grub/i386-pc/procfs.mod
-usr/lib/grub/i386-pc/procfs.module
-usr/lib/grub/i386-pc/progress.mod
-usr/lib/grub/i386-pc/progress.module
-usr/lib/grub/i386-pc/pxe.mod
-usr/lib/grub/i386-pc/pxe.module
-usr/lib/grub/i386-pc/pxeboot.image
-usr/lib/grub/i386-pc/pxeboot.img
-usr/lib/grub/i386-pc/pxechain.mod
-usr/lib/grub/i386-pc/pxechain.module
-usr/lib/grub/i386-pc/raid5rec.mod
-usr/lib/grub/i386-pc/raid5rec.module
-usr/lib/grub/i386-pc/raid6rec.mod
-usr/lib/grub/i386-pc/raid6rec.module
-usr/lib/grub/i386-pc/random.mod
-usr/lib/grub/i386-pc/random.module
-usr/lib/grub/i386-pc/rdmsr.mod
-usr/lib/grub/i386-pc/rdmsr.module
-usr/lib/grub/i386-pc/read.mod
-usr/lib/grub/i386-pc/read.module
-usr/lib/grub/i386-pc/reboot.mod
-usr/lib/grub/i386-pc/reboot.module
-usr/lib/grub/i386-pc/regexp.mod
-usr/lib/grub/i386-pc/regexp.module
-usr/lib/grub/i386-pc/reiserfs.mod
-usr/lib/grub/i386-pc/reiserfs.module
-usr/lib/grub/i386-pc/relocator.mod
-usr/lib/grub/i386-pc/relocator.module
-usr/lib/grub/i386-pc/romfs.mod
-usr/lib/grub/i386-pc/romfs.module
-usr/lib/grub/i386-pc/scsi.mod
-usr/lib/grub/i386-pc/scsi.module
-usr/lib/grub/i386-pc/search.mod
-usr/lib/grub/i386-pc/search.module
-usr/lib/grub/i386-pc/search_fs_file.mod
-usr/lib/grub/i386-pc/search_fs_file.module
-usr/lib/grub/i386-pc/search_fs_uuid.mod
-usr/lib/grub/i386-pc/search_fs_uuid.module
-usr/lib/grub/i386-pc/search_label.mod
-usr/lib/grub/i386-pc/search_label.module
-usr/lib/grub/i386-pc/sendkey.mod
-usr/lib/grub/i386-pc/sendkey.module
-usr/lib/grub/i386-pc/serial.mod
-usr/lib/grub/i386-pc/serial.module
-usr/lib/grub/i386-pc/setjmp.mod
-usr/lib/grub/i386-pc/setjmp.module
-usr/lib/grub/i386-pc/setjmp_test.mod
-usr/lib/grub/i386-pc/setjmp_test.module
-usr/lib/grub/i386-pc/setpci.mod
-usr/lib/grub/i386-pc/setpci.module
-usr/lib/grub/i386-pc/sfs.mod
-usr/lib/grub/i386-pc/sfs.module
-usr/lib/grub/i386-pc/shift_test.mod
-usr/lib/grub/i386-pc/shift_test.module
-usr/lib/grub/i386-pc/signature_test.mod
-usr/lib/grub/i386-pc/signature_test.module
-usr/lib/grub/i386-pc/sleep.mod
-usr/lib/grub/i386-pc/sleep.module
-usr/lib/grub/i386-pc/sleep_test.mod
-usr/lib/grub/i386-pc/sleep_test.module
-usr/lib/grub/i386-pc/smbios.mod
-usr/lib/grub/i386-pc/smbios.module
-usr/lib/grub/i386-pc/spkmodem.mod
-usr/lib/grub/i386-pc/spkmodem.module
-usr/lib/grub/i386-pc/squash4.mod
-usr/lib/grub/i386-pc/squash4.module
-usr/lib/grub/i386-pc/strtoull_test.mod
-usr/lib/grub/i386-pc/strtoull_test.module
-usr/lib/grub/i386-pc/syslinuxcfg.mod
-usr/lib/grub/i386-pc/syslinuxcfg.module
-usr/lib/grub/i386-pc/tar.mod
-usr/lib/grub/i386-pc/tar.module
-usr/lib/grub/i386-pc/terminal.lst
-usr/lib/grub/i386-pc/terminal.mod
-usr/lib/grub/i386-pc/terminal.module
-usr/lib/grub/i386-pc/terminfo.mod
-usr/lib/grub/i386-pc/terminfo.module
-usr/lib/grub/i386-pc/test.mod
-usr/lib/grub/i386-pc/test.module
-usr/lib/grub/i386-pc/test_blockarg.mod
-usr/lib/grub/i386-pc/test_blockarg.module
-usr/lib/grub/i386-pc/testload.mod
-usr/lib/grub/i386-pc/testload.module
-usr/lib/grub/i386-pc/testspeed.mod
-usr/lib/grub/i386-pc/testspeed.module
-usr/lib/grub/i386-pc/tftp.mod
-usr/lib/grub/i386-pc/tftp.module
-usr/lib/grub/i386-pc/tga.mod
-usr/lib/grub/i386-pc/tga.module
-usr/lib/grub/i386-pc/time.mod
-usr/lib/grub/i386-pc/time.module
-usr/lib/grub/i386-pc/tr.mod
-usr/lib/grub/i386-pc/tr.module
-usr/lib/grub/i386-pc/trig.mod
-usr/lib/grub/i386-pc/trig.module
-usr/lib/grub/i386-pc/true.mod
-usr/lib/grub/i386-pc/true.module
-usr/lib/grub/i386-pc/truecrypt.mod
-usr/lib/grub/i386-pc/truecrypt.module
-usr/lib/grub/i386-pc/udf.mod
-usr/lib/grub/i386-pc/udf.module
-usr/lib/grub/i386-pc/ufs1.mod
-usr/lib/grub/i386-pc/ufs1.module
-usr/lib/grub/i386-pc/ufs1_be.mod
-usr/lib/grub/i386-pc/ufs1_be.module
-usr/lib/grub/i386-pc/ufs2.mod
-usr/lib/grub/i386-pc/ufs2.module
-usr/lib/grub/i386-pc/uhci.mod
-usr/lib/grub/i386-pc/uhci.module
-usr/lib/grub/i386-pc/usb.mod
-usr/lib/grub/i386-pc/usb.module
-usr/lib/grub/i386-pc/usb_keyboard.mod
-usr/lib/grub/i386-pc/usb_keyboard.module
-usr/lib/grub/i386-pc/usbms.mod
-usr/lib/grub/i386-pc/usbms.module
-usr/lib/grub/i386-pc/usbserial_common.mod
-usr/lib/grub/i386-pc/usbserial_common.module
-usr/lib/grub/i386-pc/usbserial_ftdi.mod
-usr/lib/grub/i386-pc/usbserial_ftdi.module
-usr/lib/grub/i386-pc/usbserial_pl2303.mod
-usr/lib/grub/i386-pc/usbserial_pl2303.module
-usr/lib/grub/i386-pc/usbserial_usbdebug.mod
-usr/lib/grub/i386-pc/usbserial_usbdebug.module
-usr/lib/grub/i386-pc/usbtest.mod
-usr/lib/grub/i386-pc/usbtest.module
-usr/lib/grub/i386-pc/vbe.mod
-usr/lib/grub/i386-pc/vbe.module
-usr/lib/grub/i386-pc/vga.mod
-usr/lib/grub/i386-pc/vga.module
-usr/lib/grub/i386-pc/vga_text.mod
-usr/lib/grub/i386-pc/vga_text.module
-usr/lib/grub/i386-pc/video.lst
-usr/lib/grub/i386-pc/video.mod
-usr/lib/grub/i386-pc/video.module
-usr/lib/grub/i386-pc/video_bochs.mod
-usr/lib/grub/i386-pc/video_bochs.module
-usr/lib/grub/i386-pc/video_cirrus.mod
-usr/lib/grub/i386-pc/video_cirrus.module
-usr/lib/grub/i386-pc/video_colors.mod
-usr/lib/grub/i386-pc/video_colors.module
-usr/lib/grub/i386-pc/video_fb.mod
-usr/lib/grub/i386-pc/video_fb.module
-usr/lib/grub/i386-pc/videoinfo.mod
-usr/lib/grub/i386-pc/videoinfo.module
-usr/lib/grub/i386-pc/videotest.mod
-usr/lib/grub/i386-pc/videotest.module
-usr/lib/grub/i386-pc/videotest_checksum.mod
-usr/lib/grub/i386-pc/videotest_checksum.module
-usr/lib/grub/i386-pc/wrmsr.mod
-usr/lib/grub/i386-pc/wrmsr.module
-usr/lib/grub/i386-pc/xfs.mod
-usr/lib/grub/i386-pc/xfs.module
-usr/lib/grub/i386-pc/xnu.mod
-usr/lib/grub/i386-pc/xnu.module
-usr/lib/grub/i386-pc/xnu_uuid.mod
-usr/lib/grub/i386-pc/xnu_uuid.module
-usr/lib/grub/i386-pc/xnu_uuid_test.mod
-usr/lib/grub/i386-pc/xnu_uuid_test.module
-usr/lib/grub/i386-pc/xzio.mod
-usr/lib/grub/i386-pc/xzio.module
-usr/lib/grub/i386-pc/zfs.mod
-usr/lib/grub/i386-pc/zfs.module
-usr/lib/grub/i386-pc/zfscrypt.mod
-usr/lib/grub/i386-pc/zfscrypt.module
-usr/lib/grub/i386-pc/zfsinfo.mod
-usr/lib/grub/i386-pc/zfsinfo.module
-usr/lib/grub/i386-pc/zstd.mod
-usr/lib/grub/i386-pc/zstd.module
-#usr/lib/grub/x86_64-efi
-usr/lib/grub/x86_64-efi/acpi.mod
-usr/lib/grub/x86_64-efi/acpi.module
-usr/lib/grub/x86_64-efi/adler32.mod
-usr/lib/grub/x86_64-efi/adler32.module
-usr/lib/grub/x86_64-efi/affs.mod
-usr/lib/grub/x86_64-efi/affs.module
-usr/lib/grub/x86_64-efi/afs.mod
-usr/lib/grub/x86_64-efi/afs.module
-usr/lib/grub/x86_64-efi/afsplitter.mod
-usr/lib/grub/x86_64-efi/afsplitter.module
-usr/lib/grub/x86_64-efi/ahci.mod
-usr/lib/grub/x86_64-efi/ahci.module
-usr/lib/grub/x86_64-efi/all_video.mod
-usr/lib/grub/x86_64-efi/all_video.module
-usr/lib/grub/x86_64-efi/aout.mod
-usr/lib/grub/x86_64-efi/aout.module
-usr/lib/grub/x86_64-efi/appleldr.mod
-usr/lib/grub/x86_64-efi/appleldr.module
-usr/lib/grub/x86_64-efi/archelp.mod
-usr/lib/grub/x86_64-efi/archelp.module
-usr/lib/grub/x86_64-efi/at_keyboard.mod
-usr/lib/grub/x86_64-efi/at_keyboard.module
-usr/lib/grub/x86_64-efi/ata.mod
-usr/lib/grub/x86_64-efi/ata.module
-usr/lib/grub/x86_64-efi/backtrace.mod
-usr/lib/grub/x86_64-efi/backtrace.module
-usr/lib/grub/x86_64-efi/bfs.mod
-usr/lib/grub/x86_64-efi/bfs.module
-usr/lib/grub/x86_64-efi/bitmap.mod
-usr/lib/grub/x86_64-efi/bitmap.module
-usr/lib/grub/x86_64-efi/bitmap_scale.mod
-usr/lib/grub/x86_64-efi/bitmap_scale.module
-usr/lib/grub/x86_64-efi/blocklist.mod
-usr/lib/grub/x86_64-efi/blocklist.module
-usr/lib/grub/x86_64-efi/boot.mod
-usr/lib/grub/x86_64-efi/boot.module
-usr/lib/grub/x86_64-efi/bsd.mod
-usr/lib/grub/x86_64-efi/bsd.module
-usr/lib/grub/x86_64-efi/bswap_test.mod
-usr/lib/grub/x86_64-efi/bswap_test.module
-usr/lib/grub/x86_64-efi/btrfs.mod
-usr/lib/grub/x86_64-efi/btrfs.module
-usr/lib/grub/x86_64-efi/bufio.mod
-usr/lib/grub/x86_64-efi/bufio.module
-usr/lib/grub/x86_64-efi/cat.mod
-usr/lib/grub/x86_64-efi/cat.module
-usr/lib/grub/x86_64-efi/cbfs.mod
-usr/lib/grub/x86_64-efi/cbfs.module
-usr/lib/grub/x86_64-efi/cbls.mod
-usr/lib/grub/x86_64-efi/cbls.module
-usr/lib/grub/x86_64-efi/cbmemc.mod
-usr/lib/grub/x86_64-efi/cbmemc.module
-usr/lib/grub/x86_64-efi/cbtable.mod
-usr/lib/grub/x86_64-efi/cbtable.module
-usr/lib/grub/x86_64-efi/cbtime.mod
-usr/lib/grub/x86_64-efi/cbtime.module
-usr/lib/grub/x86_64-efi/chain.mod
-usr/lib/grub/x86_64-efi/chain.module
-usr/lib/grub/x86_64-efi/cmdline_cat_test.mod
-usr/lib/grub/x86_64-efi/cmdline_cat_test.module
-usr/lib/grub/x86_64-efi/cmp.mod
-usr/lib/grub/x86_64-efi/cmp.module
-usr/lib/grub/x86_64-efi/cmp_test.mod
-usr/lib/grub/x86_64-efi/cmp_test.module
-usr/lib/grub/x86_64-efi/command.lst
-usr/lib/grub/x86_64-efi/config.h
-usr/lib/grub/x86_64-efi/configfile.mod
-usr/lib/grub/x86_64-efi/configfile.module
-usr/lib/grub/x86_64-efi/cpio.mod
-usr/lib/grub/x86_64-efi/cpio.module
-usr/lib/grub/x86_64-efi/cpio_be.mod
-usr/lib/grub/x86_64-efi/cpio_be.module
-usr/lib/grub/x86_64-efi/cpuid.mod
-usr/lib/grub/x86_64-efi/cpuid.module
-usr/lib/grub/x86_64-efi/crc64.mod
-usr/lib/grub/x86_64-efi/crc64.module
-usr/lib/grub/x86_64-efi/crypto.lst
-usr/lib/grub/x86_64-efi/crypto.mod
-usr/lib/grub/x86_64-efi/crypto.module
-usr/lib/grub/x86_64-efi/cryptodisk.mod
-usr/lib/grub/x86_64-efi/cryptodisk.module
-usr/lib/grub/x86_64-efi/cs5536.mod
-usr/lib/grub/x86_64-efi/cs5536.module
-usr/lib/grub/x86_64-efi/ctz_test.mod
-usr/lib/grub/x86_64-efi/ctz_test.module
-usr/lib/grub/x86_64-efi/date.mod
-usr/lib/grub/x86_64-efi/date.module
-usr/lib/grub/x86_64-efi/datehook.mod
-usr/lib/grub/x86_64-efi/datehook.module
-usr/lib/grub/x86_64-efi/datetime.mod
-usr/lib/grub/x86_64-efi/datetime.module
-usr/lib/grub/x86_64-efi/disk.mod
-usr/lib/grub/x86_64-efi/disk.module
-usr/lib/grub/x86_64-efi/diskfilter.mod
-usr/lib/grub/x86_64-efi/diskfilter.module
-usr/lib/grub/x86_64-efi/div.mod
-usr/lib/grub/x86_64-efi/div.module
-usr/lib/grub/x86_64-efi/div_test.mod
-usr/lib/grub/x86_64-efi/div_test.module
-usr/lib/grub/x86_64-efi/dm_nv.mod
-usr/lib/grub/x86_64-efi/dm_nv.module
-usr/lib/grub/x86_64-efi/echo.mod
-usr/lib/grub/x86_64-efi/echo.module
-usr/lib/grub/x86_64-efi/efi_gop.mod
-usr/lib/grub/x86_64-efi/efi_gop.module
-usr/lib/grub/x86_64-efi/efi_uga.mod
-usr/lib/grub/x86_64-efi/efi_uga.module
-usr/lib/grub/x86_64-efi/efifwsetup.mod
-usr/lib/grub/x86_64-efi/efifwsetup.module
-usr/lib/grub/x86_64-efi/efinet.mod
-usr/lib/grub/x86_64-efi/efinet.module
-usr/lib/grub/x86_64-efi/ehci.mod
-usr/lib/grub/x86_64-efi/ehci.module
-usr/lib/grub/x86_64-efi/elf.mod
-usr/lib/grub/x86_64-efi/elf.module
-usr/lib/grub/x86_64-efi/eval.mod
-usr/lib/grub/x86_64-efi/eval.module
-usr/lib/grub/x86_64-efi/exfat.mod
-usr/lib/grub/x86_64-efi/exfat.module
-usr/lib/grub/x86_64-efi/exfctest.mod
-usr/lib/grub/x86_64-efi/exfctest.module
-usr/lib/grub/x86_64-efi/ext2.mod
-usr/lib/grub/x86_64-efi/ext2.module
-usr/lib/grub/x86_64-efi/extcmd.mod
-usr/lib/grub/x86_64-efi/extcmd.module
-usr/lib/grub/x86_64-efi/f2fs.mod
-usr/lib/grub/x86_64-efi/f2fs.module
-usr/lib/grub/x86_64-efi/fat.mod
-usr/lib/grub/x86_64-efi/fat.module
-usr/lib/grub/x86_64-efi/fdt.lst
-usr/lib/grub/x86_64-efi/file.mod
-usr/lib/grub/x86_64-efi/file.module
-usr/lib/grub/x86_64-efi/fixvideo.mod
-usr/lib/grub/x86_64-efi/fixvideo.module
-usr/lib/grub/x86_64-efi/font.mod
-usr/lib/grub/x86_64-efi/font.module
-usr/lib/grub/x86_64-efi/fs.lst
-usr/lib/grub/x86_64-efi/fshelp.mod
-usr/lib/grub/x86_64-efi/fshelp.module
-usr/lib/grub/x86_64-efi/functional_test.mod
-usr/lib/grub/x86_64-efi/functional_test.module
-usr/lib/grub/x86_64-efi/gcry_arcfour.mod
-usr/lib/grub/x86_64-efi/gcry_arcfour.module
-usr/lib/grub/x86_64-efi/gcry_blowfish.mod
-usr/lib/grub/x86_64-efi/gcry_blowfish.module
-usr/lib/grub/x86_64-efi/gcry_camellia.mod
-usr/lib/grub/x86_64-efi/gcry_camellia.module
-usr/lib/grub/x86_64-efi/gcry_cast5.mod
-usr/lib/grub/x86_64-efi/gcry_cast5.module
-usr/lib/grub/x86_64-efi/gcry_crc.mod
-usr/lib/grub/x86_64-efi/gcry_crc.module
-usr/lib/grub/x86_64-efi/gcry_des.mod
-usr/lib/grub/x86_64-efi/gcry_des.module
-usr/lib/grub/x86_64-efi/gcry_dsa.mod
-usr/lib/grub/x86_64-efi/gcry_dsa.module
-usr/lib/grub/x86_64-efi/gcry_idea.mod
-usr/lib/grub/x86_64-efi/gcry_idea.module
-usr/lib/grub/x86_64-efi/gcry_md4.mod
-usr/lib/grub/x86_64-efi/gcry_md4.module
-usr/lib/grub/x86_64-efi/gcry_md5.mod
-usr/lib/grub/x86_64-efi/gcry_md5.module
-usr/lib/grub/x86_64-efi/gcry_rfc2268.mod
-usr/lib/grub/x86_64-efi/gcry_rfc2268.module
-usr/lib/grub/x86_64-efi/gcry_rijndael.mod
-usr/lib/grub/x86_64-efi/gcry_rijndael.module
-usr/lib/grub/x86_64-efi/gcry_rmd160.mod
-usr/lib/grub/x86_64-efi/gcry_rmd160.module
-usr/lib/grub/x86_64-efi/gcry_rsa.mod
-usr/lib/grub/x86_64-efi/gcry_rsa.module
-usr/lib/grub/x86_64-efi/gcry_seed.mod
-usr/lib/grub/x86_64-efi/gcry_seed.module
-usr/lib/grub/x86_64-efi/gcry_serpent.mod
-usr/lib/grub/x86_64-efi/gcry_serpent.module
-usr/lib/grub/x86_64-efi/gcry_sha1.mod
-usr/lib/grub/x86_64-efi/gcry_sha1.module
-usr/lib/grub/x86_64-efi/gcry_sha256.mod
-usr/lib/grub/x86_64-efi/gcry_sha256.module
-usr/lib/grub/x86_64-efi/gcry_sha512.mod
-usr/lib/grub/x86_64-efi/gcry_sha512.module
-usr/lib/grub/x86_64-efi/gcry_tiger.mod
-usr/lib/grub/x86_64-efi/gcry_tiger.module
-usr/lib/grub/x86_64-efi/gcry_twofish.mod
-usr/lib/grub/x86_64-efi/gcry_twofish.module
-usr/lib/grub/x86_64-efi/gcry_whirlpool.mod
-usr/lib/grub/x86_64-efi/gcry_whirlpool.module
-usr/lib/grub/x86_64-efi/gdb_grub
-usr/lib/grub/x86_64-efi/geli.mod
-usr/lib/grub/x86_64-efi/geli.module
-usr/lib/grub/x86_64-efi/gettext.mod
-usr/lib/grub/x86_64-efi/gettext.module
-usr/lib/grub/x86_64-efi/gfxmenu.mod
-usr/lib/grub/x86_64-efi/gfxmenu.module
-usr/lib/grub/x86_64-efi/gfxterm.mod
-usr/lib/grub/x86_64-efi/gfxterm.module
-usr/lib/grub/x86_64-efi/gfxterm_background.mod
-usr/lib/grub/x86_64-efi/gfxterm_background.module
-usr/lib/grub/x86_64-efi/gfxterm_menu.mod
-usr/lib/grub/x86_64-efi/gfxterm_menu.module
-usr/lib/grub/x86_64-efi/gmodule.pl
-usr/lib/grub/x86_64-efi/gptsync.mod
-usr/lib/grub/x86_64-efi/gptsync.module
-usr/lib/grub/x86_64-efi/gzio.mod
-usr/lib/grub/x86_64-efi/gzio.module
-usr/lib/grub/x86_64-efi/halt.mod
-usr/lib/grub/x86_64-efi/halt.module
-usr/lib/grub/x86_64-efi/hashsum.mod
-usr/lib/grub/x86_64-efi/hashsum.module
-usr/lib/grub/x86_64-efi/hdparm.mod
-usr/lib/grub/x86_64-efi/hdparm.module
-usr/lib/grub/x86_64-efi/hello.mod
-usr/lib/grub/x86_64-efi/hello.module
-usr/lib/grub/x86_64-efi/help.mod
-usr/lib/grub/x86_64-efi/help.module
-usr/lib/grub/x86_64-efi/hexdump.mod
-usr/lib/grub/x86_64-efi/hexdump.module
-usr/lib/grub/x86_64-efi/hfs.mod
-usr/lib/grub/x86_64-efi/hfs.module
-usr/lib/grub/x86_64-efi/hfsplus.mod
-usr/lib/grub/x86_64-efi/hfsplus.module
-usr/lib/grub/x86_64-efi/hfspluscomp.mod
-usr/lib/grub/x86_64-efi/hfspluscomp.module
-usr/lib/grub/x86_64-efi/http.mod
-usr/lib/grub/x86_64-efi/http.module
-usr/lib/grub/x86_64-efi/iorw.mod
-usr/lib/grub/x86_64-efi/iorw.module
-usr/lib/grub/x86_64-efi/iso9660.mod
-usr/lib/grub/x86_64-efi/iso9660.module
-usr/lib/grub/x86_64-efi/jfs.mod
-usr/lib/grub/x86_64-efi/jfs.module
-usr/lib/grub/x86_64-efi/jpeg.mod
-usr/lib/grub/x86_64-efi/jpeg.module
-usr/lib/grub/x86_64-efi/json.mod
-usr/lib/grub/x86_64-efi/json.module
-usr/lib/grub/x86_64-efi/kernel.exec
-usr/lib/grub/x86_64-efi/kernel.img
-usr/lib/grub/x86_64-efi/keylayouts.mod
-usr/lib/grub/x86_64-efi/keylayouts.module
-usr/lib/grub/x86_64-efi/keystatus.mod
-usr/lib/grub/x86_64-efi/keystatus.module
-usr/lib/grub/x86_64-efi/ldm.mod
-usr/lib/grub/x86_64-efi/ldm.module
-usr/lib/grub/x86_64-efi/legacy_password_test.mod
-usr/lib/grub/x86_64-efi/legacy_password_test.module
-usr/lib/grub/x86_64-efi/legacycfg.mod
-usr/lib/grub/x86_64-efi/legacycfg.module
-usr/lib/grub/x86_64-efi/linux.mod
-usr/lib/grub/x86_64-efi/linux.module
-usr/lib/grub/x86_64-efi/linux16.mod
-usr/lib/grub/x86_64-efi/linux16.module
-usr/lib/grub/x86_64-efi/loadbios.mod
-usr/lib/grub/x86_64-efi/loadbios.module
-usr/lib/grub/x86_64-efi/loadenv.mod
-usr/lib/grub/x86_64-efi/loadenv.module
-usr/lib/grub/x86_64-efi/loopback.mod
-usr/lib/grub/x86_64-efi/loopback.module
-usr/lib/grub/x86_64-efi/ls.mod
-usr/lib/grub/x86_64-efi/ls.module
-usr/lib/grub/x86_64-efi/lsacpi.mod
-usr/lib/grub/x86_64-efi/lsacpi.module
-usr/lib/grub/x86_64-efi/lsefi.mod
-usr/lib/grub/x86_64-efi/lsefi.module
-usr/lib/grub/x86_64-efi/lsefimmap.mod
-usr/lib/grub/x86_64-efi/lsefimmap.module
-usr/lib/grub/x86_64-efi/lsefisystab.mod
-usr/lib/grub/x86_64-efi/lsefisystab.module
-usr/lib/grub/x86_64-efi/lsmmap.mod
-usr/lib/grub/x86_64-efi/lsmmap.module
-usr/lib/grub/x86_64-efi/lspci.mod
-usr/lib/grub/x86_64-efi/lspci.module
-usr/lib/grub/x86_64-efi/lssal.mod
-usr/lib/grub/x86_64-efi/lssal.module
-usr/lib/grub/x86_64-efi/luks.mod
-usr/lib/grub/x86_64-efi/luks.module
-usr/lib/grub/x86_64-efi/luks2.mod
-usr/lib/grub/x86_64-efi/luks2.module
-usr/lib/grub/x86_64-efi/lvm.mod
-usr/lib/grub/x86_64-efi/lvm.module
-usr/lib/grub/x86_64-efi/lzopio.mod
-usr/lib/grub/x86_64-efi/lzopio.module
-usr/lib/grub/x86_64-efi/macbless.mod
-usr/lib/grub/x86_64-efi/macbless.module
-usr/lib/grub/x86_64-efi/macho.mod
-usr/lib/grub/x86_64-efi/macho.module
-usr/lib/grub/x86_64-efi/mdraid09.mod
-usr/lib/grub/x86_64-efi/mdraid09.module
-usr/lib/grub/x86_64-efi/mdraid09_be.mod
-usr/lib/grub/x86_64-efi/mdraid09_be.module
-usr/lib/grub/x86_64-efi/mdraid1x.mod
-usr/lib/grub/x86_64-efi/mdraid1x.module
-usr/lib/grub/x86_64-efi/memdisk.mod
-usr/lib/grub/x86_64-efi/memdisk.module
-usr/lib/grub/x86_64-efi/memrw.mod
-usr/lib/grub/x86_64-efi/memrw.module
-usr/lib/grub/x86_64-efi/minicmd.mod
-usr/lib/grub/x86_64-efi/minicmd.module
-usr/lib/grub/x86_64-efi/minix.mod
-usr/lib/grub/x86_64-efi/minix.module
-usr/lib/grub/x86_64-efi/minix2.mod
-usr/lib/grub/x86_64-efi/minix2.module
-usr/lib/grub/x86_64-efi/minix2_be.mod
-usr/lib/grub/x86_64-efi/minix2_be.module
-usr/lib/grub/x86_64-efi/minix3.mod
-usr/lib/grub/x86_64-efi/minix3.module
-usr/lib/grub/x86_64-efi/minix3_be.mod
-usr/lib/grub/x86_64-efi/minix3_be.module
-usr/lib/grub/x86_64-efi/minix_be.mod
-usr/lib/grub/x86_64-efi/minix_be.module
-usr/lib/grub/x86_64-efi/mmap.mod
-usr/lib/grub/x86_64-efi/mmap.module
-usr/lib/grub/x86_64-efi/moddep.lst
-usr/lib/grub/x86_64-efi/modinfo.sh
-usr/lib/grub/x86_64-efi/morse.mod
-usr/lib/grub/x86_64-efi/morse.module
-usr/lib/grub/x86_64-efi/mpi.mod
-usr/lib/grub/x86_64-efi/mpi.module
-usr/lib/grub/x86_64-efi/msdospart.mod
-usr/lib/grub/x86_64-efi/msdospart.module
-usr/lib/grub/x86_64-efi/mul_test.mod
-usr/lib/grub/x86_64-efi/mul_test.module
-usr/lib/grub/x86_64-efi/multiboot.mod
-usr/lib/grub/x86_64-efi/multiboot.module
-usr/lib/grub/x86_64-efi/multiboot2.mod
-usr/lib/grub/x86_64-efi/multiboot2.module
-usr/lib/grub/x86_64-efi/nativedisk.mod
-usr/lib/grub/x86_64-efi/nativedisk.module
-usr/lib/grub/x86_64-efi/net.mod
-usr/lib/grub/x86_64-efi/net.module
-usr/lib/grub/x86_64-efi/newc.mod
-usr/lib/grub/x86_64-efi/newc.module
-usr/lib/grub/x86_64-efi/nilfs2.mod
-usr/lib/grub/x86_64-efi/nilfs2.module
-usr/lib/grub/x86_64-efi/normal.mod
-usr/lib/grub/x86_64-efi/normal.module
-usr/lib/grub/x86_64-efi/ntfs.mod
-usr/lib/grub/x86_64-efi/ntfs.module
-usr/lib/grub/x86_64-efi/ntfscomp.mod
-usr/lib/grub/x86_64-efi/ntfscomp.module
-usr/lib/grub/x86_64-efi/odc.mod
-usr/lib/grub/x86_64-efi/odc.module
-usr/lib/grub/x86_64-efi/offsetio.mod
-usr/lib/grub/x86_64-efi/offsetio.module
-usr/lib/grub/x86_64-efi/ohci.mod
-usr/lib/grub/x86_64-efi/ohci.module
-usr/lib/grub/x86_64-efi/part_acorn.mod
-usr/lib/grub/x86_64-efi/part_acorn.module
-usr/lib/grub/x86_64-efi/part_amiga.mod
-usr/lib/grub/x86_64-efi/part_amiga.module
-usr/lib/grub/x86_64-efi/part_apple.mod
-usr/lib/grub/x86_64-efi/part_apple.module
-usr/lib/grub/x86_64-efi/part_bsd.mod
-usr/lib/grub/x86_64-efi/part_bsd.module
-usr/lib/grub/x86_64-efi/part_dfly.mod
-usr/lib/grub/x86_64-efi/part_dfly.module
-usr/lib/grub/x86_64-efi/part_dvh.mod
-usr/lib/grub/x86_64-efi/part_dvh.module
-usr/lib/grub/x86_64-efi/part_gpt.mod
-usr/lib/grub/x86_64-efi/part_gpt.module
-usr/lib/grub/x86_64-efi/part_msdos.mod
-usr/lib/grub/x86_64-efi/part_msdos.module
-usr/lib/grub/x86_64-efi/part_plan.mod
-usr/lib/grub/x86_64-efi/part_plan.module
-usr/lib/grub/x86_64-efi/part_sun.mod
-usr/lib/grub/x86_64-efi/part_sun.module
-usr/lib/grub/x86_64-efi/part_sunpc.mod
-usr/lib/grub/x86_64-efi/part_sunpc.module
-usr/lib/grub/x86_64-efi/partmap.lst
-usr/lib/grub/x86_64-efi/parttool.lst
-usr/lib/grub/x86_64-efi/parttool.mod
-usr/lib/grub/x86_64-efi/parttool.module
-usr/lib/grub/x86_64-efi/password.mod
-usr/lib/grub/x86_64-efi/password.module
-usr/lib/grub/x86_64-efi/password_pbkdf2.mod
-usr/lib/grub/x86_64-efi/password_pbkdf2.module
-usr/lib/grub/x86_64-efi/pata.mod
-usr/lib/grub/x86_64-efi/pata.module
-usr/lib/grub/x86_64-efi/pbkdf2.mod
-usr/lib/grub/x86_64-efi/pbkdf2.module
-usr/lib/grub/x86_64-efi/pbkdf2_test.mod
-usr/lib/grub/x86_64-efi/pbkdf2_test.module
-usr/lib/grub/x86_64-efi/pcidump.mod
-usr/lib/grub/x86_64-efi/pcidump.module
-usr/lib/grub/x86_64-efi/pgp.mod
-usr/lib/grub/x86_64-efi/pgp.module
-usr/lib/grub/x86_64-efi/play.mod
-usr/lib/grub/x86_64-efi/play.module
-usr/lib/grub/x86_64-efi/png.mod
-usr/lib/grub/x86_64-efi/png.module
-usr/lib/grub/x86_64-efi/priority_queue.mod
-usr/lib/grub/x86_64-efi/priority_queue.module
-usr/lib/grub/x86_64-efi/probe.mod
-usr/lib/grub/x86_64-efi/probe.module
-usr/lib/grub/x86_64-efi/procfs.mod
-usr/lib/grub/x86_64-efi/procfs.module
-usr/lib/grub/x86_64-efi/progress.mod
-usr/lib/grub/x86_64-efi/progress.module
-usr/lib/grub/x86_64-efi/raid5rec.mod
-usr/lib/grub/x86_64-efi/raid5rec.module
-usr/lib/grub/x86_64-efi/raid6rec.mod
-usr/lib/grub/x86_64-efi/raid6rec.module
-usr/lib/grub/x86_64-efi/random.mod
-usr/lib/grub/x86_64-efi/random.module
-usr/lib/grub/x86_64-efi/rdmsr.mod
-usr/lib/grub/x86_64-efi/rdmsr.module
-usr/lib/grub/x86_64-efi/read.mod
-usr/lib/grub/x86_64-efi/read.module
-usr/lib/grub/x86_64-efi/reboot.mod
-usr/lib/grub/x86_64-efi/reboot.module
-usr/lib/grub/x86_64-efi/regexp.mod
-usr/lib/grub/x86_64-efi/regexp.module
-usr/lib/grub/x86_64-efi/reiserfs.mod
-usr/lib/grub/x86_64-efi/reiserfs.module
-usr/lib/grub/x86_64-efi/relocator.mod
-usr/lib/grub/x86_64-efi/relocator.module
-usr/lib/grub/x86_64-efi/romfs.mod
-usr/lib/grub/x86_64-efi/romfs.module
-usr/lib/grub/x86_64-efi/scsi.mod
-usr/lib/grub/x86_64-efi/scsi.module
-usr/lib/grub/x86_64-efi/search.mod
-usr/lib/grub/x86_64-efi/search.module
-usr/lib/grub/x86_64-efi/search_fs_file.mod
-usr/lib/grub/x86_64-efi/search_fs_file.module
-usr/lib/grub/x86_64-efi/search_fs_uuid.mod
-usr/lib/grub/x86_64-efi/search_fs_uuid.module
-usr/lib/grub/x86_64-efi/search_label.mod
-usr/lib/grub/x86_64-efi/search_label.module
-usr/lib/grub/x86_64-efi/serial.mod
-usr/lib/grub/x86_64-efi/serial.module
-usr/lib/grub/x86_64-efi/setjmp.mod
-usr/lib/grub/x86_64-efi/setjmp.module
-usr/lib/grub/x86_64-efi/setjmp_test.mod
-usr/lib/grub/x86_64-efi/setjmp_test.module
-usr/lib/grub/x86_64-efi/setpci.mod
-usr/lib/grub/x86_64-efi/setpci.module
-usr/lib/grub/x86_64-efi/sfs.mod
-usr/lib/grub/x86_64-efi/sfs.module
-usr/lib/grub/x86_64-efi/shift_test.mod
-usr/lib/grub/x86_64-efi/shift_test.module
-usr/lib/grub/x86_64-efi/signature_test.mod
-usr/lib/grub/x86_64-efi/signature_test.module
-usr/lib/grub/x86_64-efi/sleep.mod
-usr/lib/grub/x86_64-efi/sleep.module
-usr/lib/grub/x86_64-efi/sleep_test.mod
-usr/lib/grub/x86_64-efi/sleep_test.module
-usr/lib/grub/x86_64-efi/smbios.mod
-usr/lib/grub/x86_64-efi/smbios.module
-usr/lib/grub/x86_64-efi/spkmodem.mod
-usr/lib/grub/x86_64-efi/spkmodem.module
-usr/lib/grub/x86_64-efi/squash4.mod
-usr/lib/grub/x86_64-efi/squash4.module
-usr/lib/grub/x86_64-efi/strtoull_test.mod
-usr/lib/grub/x86_64-efi/strtoull_test.module
-usr/lib/grub/x86_64-efi/syslinuxcfg.mod
-usr/lib/grub/x86_64-efi/syslinuxcfg.module
-usr/lib/grub/x86_64-efi/tar.mod
-usr/lib/grub/x86_64-efi/tar.module
-usr/lib/grub/x86_64-efi/terminal.lst
-usr/lib/grub/x86_64-efi/terminal.mod
-usr/lib/grub/x86_64-efi/terminal.module
-usr/lib/grub/x86_64-efi/terminfo.mod
-usr/lib/grub/x86_64-efi/terminfo.module
-usr/lib/grub/x86_64-efi/test.mod
-usr/lib/grub/x86_64-efi/test.module
-usr/lib/grub/x86_64-efi/test_blockarg.mod
-usr/lib/grub/x86_64-efi/test_blockarg.module
-usr/lib/grub/x86_64-efi/testload.mod
-usr/lib/grub/x86_64-efi/testload.module
-usr/lib/grub/x86_64-efi/testspeed.mod
-usr/lib/grub/x86_64-efi/testspeed.module
-usr/lib/grub/x86_64-efi/tftp.mod
-usr/lib/grub/x86_64-efi/tftp.module
-usr/lib/grub/x86_64-efi/tga.mod
-usr/lib/grub/x86_64-efi/tga.module
-usr/lib/grub/x86_64-efi/time.mod
-usr/lib/grub/x86_64-efi/time.module
-usr/lib/grub/x86_64-efi/tpm.mod
-usr/lib/grub/x86_64-efi/tpm.module
-usr/lib/grub/x86_64-efi/tr.mod
-usr/lib/grub/x86_64-efi/tr.module
-usr/lib/grub/x86_64-efi/trig.mod
-usr/lib/grub/x86_64-efi/trig.module
-usr/lib/grub/x86_64-efi/true.mod
-usr/lib/grub/x86_64-efi/true.module
-usr/lib/grub/x86_64-efi/udf.mod
-usr/lib/grub/x86_64-efi/udf.module
-usr/lib/grub/x86_64-efi/ufs1.mod
-usr/lib/grub/x86_64-efi/ufs1.module
-usr/lib/grub/x86_64-efi/ufs1_be.mod
-usr/lib/grub/x86_64-efi/ufs1_be.module
-usr/lib/grub/x86_64-efi/ufs2.mod
-usr/lib/grub/x86_64-efi/ufs2.module
-usr/lib/grub/x86_64-efi/uhci.mod
-usr/lib/grub/x86_64-efi/uhci.module
-usr/lib/grub/x86_64-efi/usb.mod
-usr/lib/grub/x86_64-efi/usb.module
-usr/lib/grub/x86_64-efi/usb_keyboard.mod
-usr/lib/grub/x86_64-efi/usb_keyboard.module
-usr/lib/grub/x86_64-efi/usbms.mod
-usr/lib/grub/x86_64-efi/usbms.module
-usr/lib/grub/x86_64-efi/usbserial_common.mod
-usr/lib/grub/x86_64-efi/usbserial_common.module
-usr/lib/grub/x86_64-efi/usbserial_ftdi.mod
-usr/lib/grub/x86_64-efi/usbserial_ftdi.module
-usr/lib/grub/x86_64-efi/usbserial_pl2303.mod
-usr/lib/grub/x86_64-efi/usbserial_pl2303.module
-usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod
-usr/lib/grub/x86_64-efi/usbserial_usbdebug.module
-usr/lib/grub/x86_64-efi/usbtest.mod
-usr/lib/grub/x86_64-efi/usbtest.module
-usr/lib/grub/x86_64-efi/video.lst
-usr/lib/grub/x86_64-efi/video.mod
-usr/lib/grub/x86_64-efi/video.module
-usr/lib/grub/x86_64-efi/video_bochs.mod
-usr/lib/grub/x86_64-efi/video_bochs.module
-usr/lib/grub/x86_64-efi/video_cirrus.mod
-usr/lib/grub/x86_64-efi/video_cirrus.module
-usr/lib/grub/x86_64-efi/video_colors.mod
-usr/lib/grub/x86_64-efi/video_colors.module
-usr/lib/grub/x86_64-efi/video_fb.mod
-usr/lib/grub/x86_64-efi/video_fb.module
-usr/lib/grub/x86_64-efi/videoinfo.mod
-usr/lib/grub/x86_64-efi/videoinfo.module
-usr/lib/grub/x86_64-efi/videotest.mod
-usr/lib/grub/x86_64-efi/videotest.module
-usr/lib/grub/x86_64-efi/videotest_checksum.mod
-usr/lib/grub/x86_64-efi/videotest_checksum.module
-usr/lib/grub/x86_64-efi/wrmsr.mod
-usr/lib/grub/x86_64-efi/wrmsr.module
-usr/lib/grub/x86_64-efi/xfs.mod
-usr/lib/grub/x86_64-efi/xfs.module
-usr/lib/grub/x86_64-efi/xnu.mod
-usr/lib/grub/x86_64-efi/xnu.module
-usr/lib/grub/x86_64-efi/xnu_uuid.mod
-usr/lib/grub/x86_64-efi/xnu_uuid.module
-usr/lib/grub/x86_64-efi/xnu_uuid_test.mod
-usr/lib/grub/x86_64-efi/xnu_uuid_test.module
-usr/lib/grub/x86_64-efi/xzio.mod
-usr/lib/grub/x86_64-efi/xzio.module
-usr/lib/grub/x86_64-efi/zfs.mod
-usr/lib/grub/x86_64-efi/zfs.module
-usr/lib/grub/x86_64-efi/zfscrypt.mod
-usr/lib/grub/x86_64-efi/zfscrypt.module
-usr/lib/grub/x86_64-efi/zfsinfo.mod
-usr/lib/grub/x86_64-efi/zfsinfo.module
-usr/lib/grub/x86_64-efi/zstd.mod
-usr/lib/grub/x86_64-efi/zstd.module
+#usr/lib/grub/riscv64-efi
+usr/lib/grub/riscv64-efi/acpi.mod
+usr/lib/grub/riscv64-efi/acpi.module
+usr/lib/grub/riscv64-efi/adler32.mod
+usr/lib/grub/riscv64-efi/adler32.module
+usr/lib/grub/riscv64-efi/affs.mod
+usr/lib/grub/riscv64-efi/affs.module
+usr/lib/grub/riscv64-efi/afs.mod
+usr/lib/grub/riscv64-efi/afs.module
+usr/lib/grub/riscv64-efi/afsplitter.mod
+usr/lib/grub/riscv64-efi/afsplitter.module
+usr/lib/grub/riscv64-efi/all_video.mod
+usr/lib/grub/riscv64-efi/all_video.module
+usr/lib/grub/riscv64-efi/archelp.mod
+usr/lib/grub/riscv64-efi/archelp.module
+usr/lib/grub/riscv64-efi/bfs.mod
+usr/lib/grub/riscv64-efi/bfs.module
+usr/lib/grub/riscv64-efi/bitmap.mod
+usr/lib/grub/riscv64-efi/bitmap.module
+usr/lib/grub/riscv64-efi/bitmap_scale.mod
+usr/lib/grub/riscv64-efi/bitmap_scale.module
+usr/lib/grub/riscv64-efi/blocklist.mod
+usr/lib/grub/riscv64-efi/blocklist.module
+usr/lib/grub/riscv64-efi/boot.mod
+usr/lib/grub/riscv64-efi/boot.module
+usr/lib/grub/riscv64-efi/bswap_test.mod
+usr/lib/grub/riscv64-efi/bswap_test.module
+usr/lib/grub/riscv64-efi/btrfs.mod
+usr/lib/grub/riscv64-efi/btrfs.module
+usr/lib/grub/riscv64-efi/bufio.mod
+usr/lib/grub/riscv64-efi/bufio.module
+usr/lib/grub/riscv64-efi/cat.mod
+usr/lib/grub/riscv64-efi/cat.module
+usr/lib/grub/riscv64-efi/cbfs.mod
+usr/lib/grub/riscv64-efi/cbfs.module
+usr/lib/grub/riscv64-efi/chain.mod
+usr/lib/grub/riscv64-efi/chain.module
+usr/lib/grub/riscv64-efi/cmdline_cat_test.mod
+usr/lib/grub/riscv64-efi/cmdline_cat_test.module
+usr/lib/grub/riscv64-efi/cmp.mod
+usr/lib/grub/riscv64-efi/cmp.module
+usr/lib/grub/riscv64-efi/cmp_test.mod
+usr/lib/grub/riscv64-efi/cmp_test.module
+usr/lib/grub/riscv64-efi/command.lst
+usr/lib/grub/riscv64-efi/config.h
+usr/lib/grub/riscv64-efi/configfile.mod
+usr/lib/grub/riscv64-efi/configfile.module
+usr/lib/grub/riscv64-efi/cpio.mod
+usr/lib/grub/riscv64-efi/cpio.module
+usr/lib/grub/riscv64-efi/cpio_be.mod
+usr/lib/grub/riscv64-efi/cpio_be.module
+usr/lib/grub/riscv64-efi/crc64.mod
+usr/lib/grub/riscv64-efi/crc64.module
+usr/lib/grub/riscv64-efi/crypto.lst
+usr/lib/grub/riscv64-efi/crypto.mod
+usr/lib/grub/riscv64-efi/crypto.module
+usr/lib/grub/riscv64-efi/cryptodisk.mod
+usr/lib/grub/riscv64-efi/cryptodisk.module
+usr/lib/grub/riscv64-efi/ctz_test.mod
+usr/lib/grub/riscv64-efi/ctz_test.module
+usr/lib/grub/riscv64-efi/date.mod
+usr/lib/grub/riscv64-efi/date.module
+usr/lib/grub/riscv64-efi/datehook.mod
+usr/lib/grub/riscv64-efi/datehook.module
+usr/lib/grub/riscv64-efi/datetime.mod
+usr/lib/grub/riscv64-efi/datetime.module
+usr/lib/grub/riscv64-efi/disk.mod
+usr/lib/grub/riscv64-efi/disk.module
+usr/lib/grub/riscv64-efi/diskfilter.mod
+usr/lib/grub/riscv64-efi/diskfilter.module
+usr/lib/grub/riscv64-efi/div.mod
+usr/lib/grub/riscv64-efi/div.module
+usr/lib/grub/riscv64-efi/div_test.mod
+usr/lib/grub/riscv64-efi/div_test.module
+usr/lib/grub/riscv64-efi/dm_nv.mod
+usr/lib/grub/riscv64-efi/dm_nv.module
+usr/lib/grub/riscv64-efi/echo.mod
+usr/lib/grub/riscv64-efi/echo.module
+usr/lib/grub/riscv64-efi/efi_gop.mod
+usr/lib/grub/riscv64-efi/efi_gop.module
+usr/lib/grub/riscv64-efi/efifwsetup.mod
+usr/lib/grub/riscv64-efi/efifwsetup.module
+usr/lib/grub/riscv64-efi/efinet.mod
+usr/lib/grub/riscv64-efi/efinet.module
+usr/lib/grub/riscv64-efi/elf.mod
+usr/lib/grub/riscv64-efi/elf.module
+usr/lib/grub/riscv64-efi/eval.mod
+usr/lib/grub/riscv64-efi/eval.module
+usr/lib/grub/riscv64-efi/exfat.mod
+usr/lib/grub/riscv64-efi/exfat.module
+usr/lib/grub/riscv64-efi/exfctest.mod
+usr/lib/grub/riscv64-efi/exfctest.module
+usr/lib/grub/riscv64-efi/ext2.mod
+usr/lib/grub/riscv64-efi/ext2.module
+usr/lib/grub/riscv64-efi/extcmd.mod
+usr/lib/grub/riscv64-efi/extcmd.module
+usr/lib/grub/riscv64-efi/f2fs.mod
+usr/lib/grub/riscv64-efi/f2fs.module
+usr/lib/grub/riscv64-efi/fat.mod
+usr/lib/grub/riscv64-efi/fat.module
+usr/lib/grub/riscv64-efi/fdt.lst
+usr/lib/grub/riscv64-efi/fdt.mod
+usr/lib/grub/riscv64-efi/fdt.module
+usr/lib/grub/riscv64-efi/file.mod
+usr/lib/grub/riscv64-efi/file.module
+usr/lib/grub/riscv64-efi/font.mod
+usr/lib/grub/riscv64-efi/font.module
+usr/lib/grub/riscv64-efi/fs.lst
+usr/lib/grub/riscv64-efi/fshelp.mod
+usr/lib/grub/riscv64-efi/fshelp.module
+usr/lib/grub/riscv64-efi/functional_test.mod
+usr/lib/grub/riscv64-efi/functional_test.module
+usr/lib/grub/riscv64-efi/gcry_arcfour.mod
+usr/lib/grub/riscv64-efi/gcry_arcfour.module
+usr/lib/grub/riscv64-efi/gcry_blowfish.mod
+usr/lib/grub/riscv64-efi/gcry_blowfish.module
+usr/lib/grub/riscv64-efi/gcry_camellia.mod
+usr/lib/grub/riscv64-efi/gcry_camellia.module
+usr/lib/grub/riscv64-efi/gcry_cast5.mod
+usr/lib/grub/riscv64-efi/gcry_cast5.module
+usr/lib/grub/riscv64-efi/gcry_crc.mod
+usr/lib/grub/riscv64-efi/gcry_crc.module
+usr/lib/grub/riscv64-efi/gcry_des.mod
+usr/lib/grub/riscv64-efi/gcry_des.module
+usr/lib/grub/riscv64-efi/gcry_dsa.mod
+usr/lib/grub/riscv64-efi/gcry_dsa.module
+usr/lib/grub/riscv64-efi/gcry_idea.mod
+usr/lib/grub/riscv64-efi/gcry_idea.module
+usr/lib/grub/riscv64-efi/gcry_md4.mod
+usr/lib/grub/riscv64-efi/gcry_md4.module
+usr/lib/grub/riscv64-efi/gcry_md5.mod
+usr/lib/grub/riscv64-efi/gcry_md5.module
+usr/lib/grub/riscv64-efi/gcry_rfc2268.mod
+usr/lib/grub/riscv64-efi/gcry_rfc2268.module
+usr/lib/grub/riscv64-efi/gcry_rijndael.mod
+usr/lib/grub/riscv64-efi/gcry_rijndael.module
+usr/lib/grub/riscv64-efi/gcry_rmd160.mod
+usr/lib/grub/riscv64-efi/gcry_rmd160.module
+usr/lib/grub/riscv64-efi/gcry_rsa.mod
+usr/lib/grub/riscv64-efi/gcry_rsa.module
+usr/lib/grub/riscv64-efi/gcry_seed.mod
+usr/lib/grub/riscv64-efi/gcry_seed.module
+usr/lib/grub/riscv64-efi/gcry_serpent.mod
+usr/lib/grub/riscv64-efi/gcry_serpent.module
+usr/lib/grub/riscv64-efi/gcry_sha1.mod
+usr/lib/grub/riscv64-efi/gcry_sha1.module
+usr/lib/grub/riscv64-efi/gcry_sha256.mod
+usr/lib/grub/riscv64-efi/gcry_sha256.module
+usr/lib/grub/riscv64-efi/gcry_sha512.mod
+usr/lib/grub/riscv64-efi/gcry_sha512.module
+usr/lib/grub/riscv64-efi/gcry_tiger.mod
+usr/lib/grub/riscv64-efi/gcry_tiger.module
+usr/lib/grub/riscv64-efi/gcry_twofish.mod
+usr/lib/grub/riscv64-efi/gcry_twofish.module
+usr/lib/grub/riscv64-efi/gcry_whirlpool.mod
+usr/lib/grub/riscv64-efi/gcry_whirlpool.module
+usr/lib/grub/riscv64-efi/gdb_grub
+usr/lib/grub/riscv64-efi/geli.mod
+usr/lib/grub/riscv64-efi/geli.module
+usr/lib/grub/riscv64-efi/gettext.mod
+usr/lib/grub/riscv64-efi/gettext.module
+usr/lib/grub/riscv64-efi/gfxmenu.mod
+usr/lib/grub/riscv64-efi/gfxmenu.module
+usr/lib/grub/riscv64-efi/gfxterm.mod
+usr/lib/grub/riscv64-efi/gfxterm.module
+usr/lib/grub/riscv64-efi/gfxterm_background.mod
+usr/lib/grub/riscv64-efi/gfxterm_background.module
+usr/lib/grub/riscv64-efi/gfxterm_menu.mod
+usr/lib/grub/riscv64-efi/gfxterm_menu.module
+usr/lib/grub/riscv64-efi/gmodule.pl
+usr/lib/grub/riscv64-efi/gptsync.mod
+usr/lib/grub/riscv64-efi/gptsync.module
+usr/lib/grub/riscv64-efi/gzio.mod
+usr/lib/grub/riscv64-efi/gzio.module
+usr/lib/grub/riscv64-efi/halt.mod
+usr/lib/grub/riscv64-efi/halt.module
+usr/lib/grub/riscv64-efi/hashsum.mod
+usr/lib/grub/riscv64-efi/hashsum.module
+usr/lib/grub/riscv64-efi/hello.mod
+usr/lib/grub/riscv64-efi/hello.module
+usr/lib/grub/riscv64-efi/help.mod
+usr/lib/grub/riscv64-efi/help.module
+usr/lib/grub/riscv64-efi/hexdump.mod
+usr/lib/grub/riscv64-efi/hexdump.module
+usr/lib/grub/riscv64-efi/hfs.mod
+usr/lib/grub/riscv64-efi/hfs.module
+usr/lib/grub/riscv64-efi/hfsplus.mod
+usr/lib/grub/riscv64-efi/hfsplus.module
+usr/lib/grub/riscv64-efi/hfspluscomp.mod
+usr/lib/grub/riscv64-efi/hfspluscomp.module
+usr/lib/grub/riscv64-efi/http.mod
+usr/lib/grub/riscv64-efi/http.module
+usr/lib/grub/riscv64-efi/iso9660.mod
+usr/lib/grub/riscv64-efi/iso9660.module
+usr/lib/grub/riscv64-efi/jfs.mod
+usr/lib/grub/riscv64-efi/jfs.module
+usr/lib/grub/riscv64-efi/jpeg.mod
+usr/lib/grub/riscv64-efi/jpeg.module
+usr/lib/grub/riscv64-efi/json.mod
+usr/lib/grub/riscv64-efi/json.module
+usr/lib/grub/riscv64-efi/kernel.exec
+usr/lib/grub/riscv64-efi/kernel.img
+usr/lib/grub/riscv64-efi/keystatus.mod
+usr/lib/grub/riscv64-efi/keystatus.module
+usr/lib/grub/riscv64-efi/ldm.mod
+usr/lib/grub/riscv64-efi/ldm.module
+usr/lib/grub/riscv64-efi/linux.mod
+usr/lib/grub/riscv64-efi/linux.module
+usr/lib/grub/riscv64-efi/loadenv.mod
+usr/lib/grub/riscv64-efi/loadenv.module
+usr/lib/grub/riscv64-efi/loopback.mod
+usr/lib/grub/riscv64-efi/loopback.module
+usr/lib/grub/riscv64-efi/ls.mod
+usr/lib/grub/riscv64-efi/ls.module
+usr/lib/grub/riscv64-efi/lsacpi.mod
+usr/lib/grub/riscv64-efi/lsacpi.module
+usr/lib/grub/riscv64-efi/lsefi.mod
+usr/lib/grub/riscv64-efi/lsefi.module
+usr/lib/grub/riscv64-efi/lsefimmap.mod
+usr/lib/grub/riscv64-efi/lsefimmap.module
+usr/lib/grub/riscv64-efi/lsefisystab.mod
+usr/lib/grub/riscv64-efi/lsefisystab.module
+usr/lib/grub/riscv64-efi/lsmmap.mod
+usr/lib/grub/riscv64-efi/lsmmap.module
+usr/lib/grub/riscv64-efi/lssal.mod
+usr/lib/grub/riscv64-efi/lssal.module
+usr/lib/grub/riscv64-efi/luks.mod
+usr/lib/grub/riscv64-efi/luks.module
+usr/lib/grub/riscv64-efi/luks2.mod
+usr/lib/grub/riscv64-efi/luks2.module
+usr/lib/grub/riscv64-efi/lvm.mod
+usr/lib/grub/riscv64-efi/lvm.module
+usr/lib/grub/riscv64-efi/lzopio.mod
+usr/lib/grub/riscv64-efi/lzopio.module
+usr/lib/grub/riscv64-efi/macbless.mod
+usr/lib/grub/riscv64-efi/macbless.module
+usr/lib/grub/riscv64-efi/macho.mod
+usr/lib/grub/riscv64-efi/macho.module
+usr/lib/grub/riscv64-efi/mdraid09.mod
+usr/lib/grub/riscv64-efi/mdraid09.module
+usr/lib/grub/riscv64-efi/mdraid09_be.mod
+usr/lib/grub/riscv64-efi/mdraid09_be.module
+usr/lib/grub/riscv64-efi/mdraid1x.mod
+usr/lib/grub/riscv64-efi/mdraid1x.module
+usr/lib/grub/riscv64-efi/memdisk.mod
+usr/lib/grub/riscv64-efi/memdisk.module
+usr/lib/grub/riscv64-efi/memrw.mod
+usr/lib/grub/riscv64-efi/memrw.module
+usr/lib/grub/riscv64-efi/minicmd.mod
+usr/lib/grub/riscv64-efi/minicmd.module
+usr/lib/grub/riscv64-efi/minix.mod
+usr/lib/grub/riscv64-efi/minix.module
+usr/lib/grub/riscv64-efi/minix2.mod
+usr/lib/grub/riscv64-efi/minix2.module
+usr/lib/grub/riscv64-efi/minix2_be.mod
+usr/lib/grub/riscv64-efi/minix2_be.module
+usr/lib/grub/riscv64-efi/minix3.mod
+usr/lib/grub/riscv64-efi/minix3.module
+usr/lib/grub/riscv64-efi/minix3_be.mod
+usr/lib/grub/riscv64-efi/minix3_be.module
+usr/lib/grub/riscv64-efi/minix_be.mod
+usr/lib/grub/riscv64-efi/minix_be.module
+usr/lib/grub/riscv64-efi/mmap.mod
+usr/lib/grub/riscv64-efi/mmap.module
+usr/lib/grub/riscv64-efi/moddep.lst
+usr/lib/grub/riscv64-efi/modinfo.sh
+usr/lib/grub/riscv64-efi/mpi.mod
+usr/lib/grub/riscv64-efi/mpi.module
+usr/lib/grub/riscv64-efi/msdospart.mod
+usr/lib/grub/riscv64-efi/msdospart.module
+usr/lib/grub/riscv64-efi/mul_test.mod
+usr/lib/grub/riscv64-efi/mul_test.module
+usr/lib/grub/riscv64-efi/net.mod
+usr/lib/grub/riscv64-efi/net.module
+usr/lib/grub/riscv64-efi/newc.mod
+usr/lib/grub/riscv64-efi/newc.module
+usr/lib/grub/riscv64-efi/nilfs2.mod
+usr/lib/grub/riscv64-efi/nilfs2.module
+usr/lib/grub/riscv64-efi/normal.mod
+usr/lib/grub/riscv64-efi/normal.module
+usr/lib/grub/riscv64-efi/ntfs.mod
+usr/lib/grub/riscv64-efi/ntfs.module
+usr/lib/grub/riscv64-efi/ntfscomp.mod
+usr/lib/grub/riscv64-efi/ntfscomp.module
+usr/lib/grub/riscv64-efi/odc.mod
+usr/lib/grub/riscv64-efi/odc.module
+usr/lib/grub/riscv64-efi/offsetio.mod
+usr/lib/grub/riscv64-efi/offsetio.module
+usr/lib/grub/riscv64-efi/part_acorn.mod
+usr/lib/grub/riscv64-efi/part_acorn.module
+usr/lib/grub/riscv64-efi/part_amiga.mod
+usr/lib/grub/riscv64-efi/part_amiga.module
+usr/lib/grub/riscv64-efi/part_apple.mod
+usr/lib/grub/riscv64-efi/part_apple.module
+usr/lib/grub/riscv64-efi/part_bsd.mod
+usr/lib/grub/riscv64-efi/part_bsd.module
+usr/lib/grub/riscv64-efi/part_dfly.mod
+usr/lib/grub/riscv64-efi/part_dfly.module
+usr/lib/grub/riscv64-efi/part_dvh.mod
+usr/lib/grub/riscv64-efi/part_dvh.module
+usr/lib/grub/riscv64-efi/part_gpt.mod
+usr/lib/grub/riscv64-efi/part_gpt.module
+usr/lib/grub/riscv64-efi/part_msdos.mod
+usr/lib/grub/riscv64-efi/part_msdos.module
+usr/lib/grub/riscv64-efi/part_plan.mod
+usr/lib/grub/riscv64-efi/part_plan.module
+usr/lib/grub/riscv64-efi/part_sun.mod
+usr/lib/grub/riscv64-efi/part_sun.module
+usr/lib/grub/riscv64-efi/part_sunpc.mod
+usr/lib/grub/riscv64-efi/part_sunpc.module
+usr/lib/grub/riscv64-efi/partmap.lst
+usr/lib/grub/riscv64-efi/parttool.lst
+usr/lib/grub/riscv64-efi/parttool.mod
+usr/lib/grub/riscv64-efi/parttool.module
+usr/lib/grub/riscv64-efi/password.mod
+usr/lib/grub/riscv64-efi/password.module
+usr/lib/grub/riscv64-efi/password_pbkdf2.mod
+usr/lib/grub/riscv64-efi/password_pbkdf2.module
+usr/lib/grub/riscv64-efi/pbkdf2.mod
+usr/lib/grub/riscv64-efi/pbkdf2.module
+usr/lib/grub/riscv64-efi/pbkdf2_test.mod
+usr/lib/grub/riscv64-efi/pbkdf2_test.module
+usr/lib/grub/riscv64-efi/pgp.mod
+usr/lib/grub/riscv64-efi/pgp.module
+usr/lib/grub/riscv64-efi/png.mod
+usr/lib/grub/riscv64-efi/png.module
+usr/lib/grub/riscv64-efi/priority_queue.mod
+usr/lib/grub/riscv64-efi/priority_queue.module
+usr/lib/grub/riscv64-efi/probe.mod
+usr/lib/grub/riscv64-efi/probe.module
+usr/lib/grub/riscv64-efi/procfs.mod
+usr/lib/grub/riscv64-efi/procfs.module
+usr/lib/grub/riscv64-efi/progress.mod
+usr/lib/grub/riscv64-efi/progress.module
+usr/lib/grub/riscv64-efi/raid5rec.mod
+usr/lib/grub/riscv64-efi/raid5rec.module
+usr/lib/grub/riscv64-efi/raid6rec.mod
+usr/lib/grub/riscv64-efi/raid6rec.module
+usr/lib/grub/riscv64-efi/read.mod
+usr/lib/grub/riscv64-efi/read.module
+usr/lib/grub/riscv64-efi/reboot.mod
+usr/lib/grub/riscv64-efi/reboot.module
+usr/lib/grub/riscv64-efi/regexp.mod
+usr/lib/grub/riscv64-efi/regexp.module
+usr/lib/grub/riscv64-efi/reiserfs.mod
+usr/lib/grub/riscv64-efi/reiserfs.module
+usr/lib/grub/riscv64-efi/romfs.mod
+usr/lib/grub/riscv64-efi/romfs.module
+usr/lib/grub/riscv64-efi/scsi.mod
+usr/lib/grub/riscv64-efi/scsi.module
+usr/lib/grub/riscv64-efi/search.mod
+usr/lib/grub/riscv64-efi/search.module
+usr/lib/grub/riscv64-efi/search_fs_file.mod
+usr/lib/grub/riscv64-efi/search_fs_file.module
+usr/lib/grub/riscv64-efi/search_fs_uuid.mod
+usr/lib/grub/riscv64-efi/search_fs_uuid.module
+usr/lib/grub/riscv64-efi/search_label.mod
+usr/lib/grub/riscv64-efi/search_label.module
+usr/lib/grub/riscv64-efi/serial.mod
+usr/lib/grub/riscv64-efi/serial.module
+usr/lib/grub/riscv64-efi/setjmp.mod
+usr/lib/grub/riscv64-efi/setjmp.module
+usr/lib/grub/riscv64-efi/setjmp_test.mod
+usr/lib/grub/riscv64-efi/setjmp_test.module
+usr/lib/grub/riscv64-efi/sfs.mod
+usr/lib/grub/riscv64-efi/sfs.module
+usr/lib/grub/riscv64-efi/shift_test.mod
+usr/lib/grub/riscv64-efi/shift_test.module
+usr/lib/grub/riscv64-efi/signature_test.mod
+usr/lib/grub/riscv64-efi/signature_test.module
+usr/lib/grub/riscv64-efi/sleep.mod
+usr/lib/grub/riscv64-efi/sleep.module
+usr/lib/grub/riscv64-efi/sleep_test.mod
+usr/lib/grub/riscv64-efi/sleep_test.module
+usr/lib/grub/riscv64-efi/smbios.mod
+usr/lib/grub/riscv64-efi/smbios.module
+usr/lib/grub/riscv64-efi/squash4.mod
+usr/lib/grub/riscv64-efi/squash4.module
+usr/lib/grub/riscv64-efi/strtoull_test.mod
+usr/lib/grub/riscv64-efi/strtoull_test.module
+usr/lib/grub/riscv64-efi/syslinuxcfg.mod
+usr/lib/grub/riscv64-efi/syslinuxcfg.module
+usr/lib/grub/riscv64-efi/tar.mod
+usr/lib/grub/riscv64-efi/tar.module
+usr/lib/grub/riscv64-efi/terminal.lst
+usr/lib/grub/riscv64-efi/terminal.mod
+usr/lib/grub/riscv64-efi/terminal.module
+usr/lib/grub/riscv64-efi/terminfo.mod
+usr/lib/grub/riscv64-efi/terminfo.module
+usr/lib/grub/riscv64-efi/test.mod
+usr/lib/grub/riscv64-efi/test.module
+usr/lib/grub/riscv64-efi/test_blockarg.mod
+usr/lib/grub/riscv64-efi/test_blockarg.module
+usr/lib/grub/riscv64-efi/testload.mod
+usr/lib/grub/riscv64-efi/testload.module
+usr/lib/grub/riscv64-efi/testspeed.mod
+usr/lib/grub/riscv64-efi/testspeed.module
+usr/lib/grub/riscv64-efi/tftp.mod
+usr/lib/grub/riscv64-efi/tftp.module
+usr/lib/grub/riscv64-efi/tga.mod
+usr/lib/grub/riscv64-efi/tga.module
+usr/lib/grub/riscv64-efi/time.mod
+usr/lib/grub/riscv64-efi/time.module
+usr/lib/grub/riscv64-efi/tpm.mod
+usr/lib/grub/riscv64-efi/tpm.module
+usr/lib/grub/riscv64-efi/tr.mod
+usr/lib/grub/riscv64-efi/tr.module
+usr/lib/grub/riscv64-efi/trig.mod
+usr/lib/grub/riscv64-efi/trig.module
+usr/lib/grub/riscv64-efi/true.mod
+usr/lib/grub/riscv64-efi/true.module
+usr/lib/grub/riscv64-efi/udf.mod
+usr/lib/grub/riscv64-efi/udf.module
+usr/lib/grub/riscv64-efi/ufs1.mod
+usr/lib/grub/riscv64-efi/ufs1.module
+usr/lib/grub/riscv64-efi/ufs1_be.mod
+usr/lib/grub/riscv64-efi/ufs1_be.module
+usr/lib/grub/riscv64-efi/ufs2.mod
+usr/lib/grub/riscv64-efi/ufs2.module
+usr/lib/grub/riscv64-efi/video.lst
+usr/lib/grub/riscv64-efi/video.mod
+usr/lib/grub/riscv64-efi/video.module
+usr/lib/grub/riscv64-efi/video_colors.mod
+usr/lib/grub/riscv64-efi/video_colors.module
+usr/lib/grub/riscv64-efi/video_fb.mod
+usr/lib/grub/riscv64-efi/video_fb.module
+usr/lib/grub/riscv64-efi/videoinfo.mod
+usr/lib/grub/riscv64-efi/videoinfo.module
+usr/lib/grub/riscv64-efi/videotest.mod
+usr/lib/grub/riscv64-efi/videotest.module
+usr/lib/grub/riscv64-efi/videotest_checksum.mod
+usr/lib/grub/riscv64-efi/videotest_checksum.module
+usr/lib/grub/riscv64-efi/xfs.mod
+usr/lib/grub/riscv64-efi/xfs.module
+usr/lib/grub/riscv64-efi/xnu_uuid.mod
+usr/lib/grub/riscv64-efi/xnu_uuid.module
+usr/lib/grub/riscv64-efi/xnu_uuid_test.mod
+usr/lib/grub/riscv64-efi/xnu_uuid_test.module
+usr/lib/grub/riscv64-efi/xzio.mod
+usr/lib/grub/riscv64-efi/xzio.module
+usr/lib/grub/riscv64-efi/zfs.mod
+usr/lib/grub/riscv64-efi/zfs.module
+usr/lib/grub/riscv64-efi/zfscrypt.mod
+usr/lib/grub/riscv64-efi/zfscrypt.module
+usr/lib/grub/riscv64-efi/zfsinfo.mod
+usr/lib/grub/riscv64-efi/zfsinfo.module
+usr/lib/grub/riscv64-efi/zstd.mod
+usr/lib/grub/riscv64-efi/zstd.module
usr/sbin/grub-bios-setup
usr/sbin/grub-install
usr/sbin/grub-macbless
@@ -1214,8 +541,6 @@ usr/share/grub/unicode.pf2
#usr/share/locale/lt/LC_MESSAGES/grub.mo
#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo
-#usr/share/locale/pa
-#usr/share/locale/pa/LC_MESSAGES
#usr/share/locale/pa/LC_MESSAGES/grub.mo
#usr/share/locale/pl/LC_MESSAGES/grub.mo
#usr/share/locale/pt/LC_MESSAGES/grub.mo
@@ -1230,3 +555,29 @@ usr/share/grub/unicode.pf2
#usr/share/locale/vi/LC_MESSAGES/grub.mo
#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo
+#usr/share/man/man1/grub-editenv.1
+#usr/share/man/man1/grub-file.1
+#usr/share/man/man1/grub-fstest.1
+#usr/share/man/man1/grub-glue-efi.1
+#usr/share/man/man1/grub-kbdcomp.1
+#usr/share/man/man1/grub-menulst2cfg.1
+#usr/share/man/man1/grub-mkfont.1
+#usr/share/man/man1/grub-mkimage.1
+#usr/share/man/man1/grub-mklayout.1
+#usr/share/man/man1/grub-mknetdir.1
+#usr/share/man/man1/grub-mkpasswd-pbkdf2.1
+#usr/share/man/man1/grub-mkrelpath.1
+#usr/share/man/man1/grub-mkrescue.1
+#usr/share/man/man1/grub-mkstandalone.1
+#usr/share/man/man1/grub-render-label.1
+#usr/share/man/man1/grub-script-check.1
+#usr/share/man/man1/grub-syslinux2cfg.1
+#usr/share/man/man8/grub-bios-setup.8
+#usr/share/man/man8/grub-install.8
+#usr/share/man/man8/grub-macbless.8
+#usr/share/man/man8/grub-mkconfig.8
+#usr/share/man/man8/grub-ofpathname.8
+#usr/share/man/man8/grub-probe.8
+#usr/share/man/man8/grub-reboot.8
+#usr/share/man/man8/grub-set-default.8
+#usr/share/man/man8/grub-sparc64-setup.8
diff --git a/config/rootfiles/common/riscv64/hyperscan b/config/rootfiles/common/riscv64/hyperscan
deleted file mode 100644
index 006e0fff9..000000000
--- a/config/rootfiles/common/riscv64/hyperscan
+++ /dev/null
@@ -1,18 +0,0 @@
-#usr/include/hs
-#usr/include/hs/hs.h
-#usr/include/hs/hs_common.h
-#usr/include/hs/hs_compile.h
-#usr/include/hs/hs_runtime.h
-#usr/lib/libhs.so
-usr/lib/libhs.so.5
-usr/lib/libhs.so.5.4.0
-usr/lib/libhs_runtime.so
-usr/lib/libhs_runtime.so.5
-usr/lib/libhs_runtime.so.5.4.0
-#usr/lib/pkgconfig/libhs.pc
-#usr/share/doc/hyperscan
-#usr/share/doc/hyperscan/examples
-#usr/share/doc/hyperscan/examples/README.md
-#usr/share/doc/hyperscan/examples/patbench.cc
-#usr/share/doc/hyperscan/examples/pcapscan.cc
-#usr/share/doc/hyperscan/examples/simplegrep.c
diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts
index 628b59969..1848f8ebc 100644
--- a/config/rootfiles/common/riscv64/initscripts
+++ b/config/rootfiles/common/riscv64/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/config/rootfiles/common/riscv64/intel-microcode b/config/rootfiles/common/riscv64/intel-microcode
deleted file mode 100644
index cb45f6558..000000000
--- a/config/rootfiles/common/riscv64/intel-microcode
+++ /dev/null
@@ -1,139 +0,0 @@
-#lib/firmware/intel-ucode
-lib/firmware/intel-ucode/06-03-02
-lib/firmware/intel-ucode/06-05-00
-lib/firmware/intel-ucode/06-05-01
-lib/firmware/intel-ucode/06-05-02
-lib/firmware/intel-ucode/06-05-03
-lib/firmware/intel-ucode/06-06-00
-lib/firmware/intel-ucode/06-06-05
-lib/firmware/intel-ucode/06-06-0a
-lib/firmware/intel-ucode/06-06-0d
-lib/firmware/intel-ucode/06-07-01
-lib/firmware/intel-ucode/06-07-02
-lib/firmware/intel-ucode/06-07-03
-lib/firmware/intel-ucode/06-08-01
-lib/firmware/intel-ucode/06-08-03
-lib/firmware/intel-ucode/06-08-06
-lib/firmware/intel-ucode/06-08-0a
-lib/firmware/intel-ucode/06-09-05
-lib/firmware/intel-ucode/06-0a-00
-lib/firmware/intel-ucode/06-0a-01
-lib/firmware/intel-ucode/06-0b-01
-lib/firmware/intel-ucode/06-0b-04
-lib/firmware/intel-ucode/06-0d-06
-lib/firmware/intel-ucode/06-0e-08
-lib/firmware/intel-ucode/06-0e-0c
-lib/firmware/intel-ucode/06-0f-02
-lib/firmware/intel-ucode/06-0f-06
-lib/firmware/intel-ucode/06-0f-07
-lib/firmware/intel-ucode/06-0f-0a
-lib/firmware/intel-ucode/06-0f-0b
-lib/firmware/intel-ucode/06-0f-0d
-lib/firmware/intel-ucode/06-16-01
-lib/firmware/intel-ucode/06-17-06
-lib/firmware/intel-ucode/06-17-07
-lib/firmware/intel-ucode/06-17-0a
-lib/firmware/intel-ucode/06-1a-04
-lib/firmware/intel-ucode/06-1a-05
-lib/firmware/intel-ucode/06-1c-02
-lib/firmware/intel-ucode/06-1c-0a
-lib/firmware/intel-ucode/06-1d-01
-lib/firmware/intel-ucode/06-1e-05
-lib/firmware/intel-ucode/06-25-02
-lib/firmware/intel-ucode/06-25-05
-lib/firmware/intel-ucode/06-26-01
-lib/firmware/intel-ucode/06-2a-07
-lib/firmware/intel-ucode/06-2c-02
-lib/firmware/intel-ucode/06-2d-06
-lib/firmware/intel-ucode/06-2d-07
-lib/firmware/intel-ucode/06-2e-06
-lib/firmware/intel-ucode/06-2f-02
-lib/firmware/intel-ucode/06-37-08
-lib/firmware/intel-ucode/06-37-09
-lib/firmware/intel-ucode/06-3a-09
-lib/firmware/intel-ucode/06-3c-03
-lib/firmware/intel-ucode/06-3d-04
-lib/firmware/intel-ucode/06-3e-04
-lib/firmware/intel-ucode/06-3e-06
-lib/firmware/intel-ucode/06-3e-07
-lib/firmware/intel-ucode/06-3f-02
-lib/firmware/intel-ucode/06-3f-04
-lib/firmware/intel-ucode/06-45-01
-lib/firmware/intel-ucode/06-46-01
-lib/firmware/intel-ucode/06-47-01
-lib/firmware/intel-ucode/06-4c-03
-lib/firmware/intel-ucode/06-4c-04
-lib/firmware/intel-ucode/06-4d-08
-lib/firmware/intel-ucode/06-4e-03
-lib/firmware/intel-ucode/06-55-03
-lib/firmware/intel-ucode/06-55-04
-lib/firmware/intel-ucode/06-55-05
-lib/firmware/intel-ucode/06-55-06
-lib/firmware/intel-ucode/06-55-07
-lib/firmware/intel-ucode/06-55-0b
-lib/firmware/intel-ucode/06-56-02
-lib/firmware/intel-ucode/06-56-03
-lib/firmware/intel-ucode/06-56-04
-lib/firmware/intel-ucode/06-56-05
-lib/firmware/intel-ucode/06-5c-02
-lib/firmware/intel-ucode/06-5c-09
-lib/firmware/intel-ucode/06-5c-0a
-lib/firmware/intel-ucode/06-5e-03
-lib/firmware/intel-ucode/06-5f-01
-lib/firmware/intel-ucode/06-66-03
-lib/firmware/intel-ucode/06-6a-05
-lib/firmware/intel-ucode/06-6a-06
-lib/firmware/intel-ucode/06-6c-01
-lib/firmware/intel-ucode/06-7a-01
-lib/firmware/intel-ucode/06-7a-08
-lib/firmware/intel-ucode/06-7e-05
-lib/firmware/intel-ucode/06-8a-01
-lib/firmware/intel-ucode/06-8c-01
-lib/firmware/intel-ucode/06-8c-02
-lib/firmware/intel-ucode/06-8d-01
-lib/firmware/intel-ucode/06-8e-09
-lib/firmware/intel-ucode/06-8e-0a
-lib/firmware/intel-ucode/06-8e-0b
-lib/firmware/intel-ucode/06-8e-0c
-lib/firmware/intel-ucode/06-96-01
-lib/firmware/intel-ucode/06-97-02
-lib/firmware/intel-ucode/06-97-05
-lib/firmware/intel-ucode/06-9a-03
-lib/firmware/intel-ucode/06-9a-04
-lib/firmware/intel-ucode/06-9c-00
-lib/firmware/intel-ucode/06-9e-09
-lib/firmware/intel-ucode/06-9e-0a
-lib/firmware/intel-ucode/06-9e-0b
-lib/firmware/intel-ucode/06-9e-0c
-lib/firmware/intel-ucode/06-9e-0d
-lib/firmware/intel-ucode/06-a5-02
-lib/firmware/intel-ucode/06-a5-03
-lib/firmware/intel-ucode/06-a5-05
-lib/firmware/intel-ucode/06-a6-00
-lib/firmware/intel-ucode/06-a6-01
-lib/firmware/intel-ucode/06-a7-01
-lib/firmware/intel-ucode/06-b7-01
-lib/firmware/intel-ucode/06-bf-02
-lib/firmware/intel-ucode/06-bf-05
-lib/firmware/intel-ucode/0f-00-07
-lib/firmware/intel-ucode/0f-00-0a
-lib/firmware/intel-ucode/0f-01-02
-lib/firmware/intel-ucode/0f-02-04
-lib/firmware/intel-ucode/0f-02-05
-lib/firmware/intel-ucode/0f-02-06
-lib/firmware/intel-ucode/0f-02-07
-lib/firmware/intel-ucode/0f-02-09
-lib/firmware/intel-ucode/0f-03-02
-lib/firmware/intel-ucode/0f-03-03
-lib/firmware/intel-ucode/0f-03-04
-lib/firmware/intel-ucode/0f-04-01
-lib/firmware/intel-ucode/0f-04-03
-lib/firmware/intel-ucode/0f-04-04
-lib/firmware/intel-ucode/0f-04-07
-lib/firmware/intel-ucode/0f-04-08
-lib/firmware/intel-ucode/0f-04-09
-lib/firmware/intel-ucode/0f-04-0a
-lib/firmware/intel-ucode/0f-06-02
-lib/firmware/intel-ucode/0f-06-04
-lib/firmware/intel-ucode/0f-06-05
-lib/firmware/intel-ucode/0f-06-08
diff --git a/config/rootfiles/common/riscv64/ipfire-netboot b/config/rootfiles/common/riscv64/ipfire-netboot
deleted file mode 100644
index 33ec55504..000000000
--- a/config/rootfiles/common/riscv64/ipfire-netboot
+++ /dev/null
@@ -1,3 +0,0 @@
-#usr/share/ipfire-netboot
-#usr/share/ipfire-netboot/ipxe.efi
-#usr/share/ipfire-netboot/ipxe.lkrn
diff --git a/config/rootfiles/common/riscv64/lm_sensors b/config/rootfiles/common/riscv64/lm_sensors
index 0f7461d4c..52514f1ab 100644
--- a/config/rootfiles/common/riscv64/lm_sensors
+++ b/config/rootfiles/common/riscv64/lm_sensors
@@ -20,7 +20,5 @@ usr/lib/libsensors.so.5.0.0
#usr/man/man8/sensors-conf-convert.8
#usr/man/man8/sensors-detect.8
usr/sbin/fancontrol
-usr/sbin/isadump
-usr/sbin/isaset
usr/sbin/pwmconfig
usr/sbin/sensors-detect
diff --git a/config/rootfiles/common/riscv64/syslinux b/config/rootfiles/common/riscv64/syslinux
deleted file mode 100644
index 8bab25a02..000000000
--- a/config/rootfiles/common/riscv64/syslinux
+++ /dev/null
@@ -1,351 +0,0 @@
-#sbin/extlinux
-#usr/bin/gethostip
-usr/bin/isohybrid
-#usr/bin/isohybrid.pl
-#usr/bin/keytab-lilo
-#usr/bin/lss16toppm
-#usr/bin/md5pass
-#usr/bin/memdiskfind
-#usr/bin/mkdiskimage
-#usr/bin/ppmtolss16
-#usr/bin/pxelinux-options
-#usr/bin/sha1pass
-#usr/bin/syslinux
-#usr/bin/syslinux2ansi
-#usr/man/man1/extlinux.1
-#usr/man/man1/gethostip.1
-#usr/man/man1/isohybrid.1
-#usr/man/man1/lss16toppm.1
-#usr/man/man1/memdiskfind.1
-#usr/man/man1/ppmtolss16.1
-#usr/man/man1/syslinux.1
-#usr/man/man1/syslinux2ansi.1
-#usr/share/syslinux
-#usr/share/syslinux/altmbr.bin
-#usr/share/syslinux/altmbr_c.bin
-#usr/share/syslinux/altmbr_f.bin
-#usr/share/syslinux/cat.c32
-#usr/share/syslinux/chain.c32
-#usr/share/syslinux/cmd.c32
-#usr/share/syslinux/cmenu.c32
-#usr/share/syslinux/com32
-#usr/share/syslinux/com32/com32.ld
-#usr/share/syslinux/com32/include
-#usr/share/syslinux/com32/include/alloca.h
-#usr/share/syslinux/com32/include/assert.h
-#usr/share/syslinux/com32/include/bitsize
-#usr/share/syslinux/com32/include/bitsize/limits.h
-#usr/share/syslinux/com32/include/bitsize/stddef.h
-#usr/share/syslinux/com32/include/bitsize/stdint.h
-#usr/share/syslinux/com32/include/bitsize/stdintconst.h
-#usr/share/syslinux/com32/include/bitsize/stdintlimits.h
-#usr/share/syslinux/com32/include/bitsize32
-#usr/share/syslinux/com32/include/bitsize32/limits.h
-#usr/share/syslinux/com32/include/bitsize32/stddef.h
-#usr/share/syslinux/com32/include/bitsize32/stdint.h
-#usr/share/syslinux/com32/include/bitsize32/stdintconst.h
-#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h
-#usr/share/syslinux/com32/include/bitsize64
-#usr/share/syslinux/com32/include/bitsize64/limits.h
-#usr/share/syslinux/com32/include/bitsize64/stddef.h
-#usr/share/syslinux/com32/include/bitsize64/stdint.h
-#usr/share/syslinux/com32/include/bitsize64/stdintconst.h
-#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h
-#usr/share/syslinux/com32/include/bufprintf.h
-#usr/share/syslinux/com32/include/byteswap.h
-#usr/share/syslinux/com32/include/cli.h
-#usr/share/syslinux/com32/include/colortbl.h
-#usr/share/syslinux/com32/include/com32.h
-#usr/share/syslinux/com32/include/console.h
-#usr/share/syslinux/com32/include/cpufeature.h
-#usr/share/syslinux/com32/include/ctime.h
-#usr/share/syslinux/com32/include/ctype.h
-#usr/share/syslinux/com32/include/dev.h
-#usr/share/syslinux/com32/include/dhcp.h
-#usr/share/syslinux/com32/include/dirent.h
-#usr/share/syslinux/com32/include/dprintf.h
-#usr/share/syslinux/com32/include/elf.h
-#usr/share/syslinux/com32/include/endian.h
-#usr/share/syslinux/com32/include/errno.h
-#usr/share/syslinux/com32/include/fcntl.h
-#usr/share/syslinux/com32/include/getopt.h
-#usr/share/syslinux/com32/include/gplinclude
-#usr/share/syslinux/com32/include/gplinclude/README
-#usr/share/syslinux/com32/include/gplinclude/acpi
-#usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/boot.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/facs.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/madt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/slic.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/structs.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h
-#usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h
-#usr/share/syslinux/com32/include/gplinclude/cpuid.h
-#usr/share/syslinux/com32/include/gplinclude/disk
-#usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
-#usr/share/syslinux/com32/include/gplinclude/disk/common.h
-#usr/share/syslinux/com32/include/gplinclude/disk/errno_disk.h
-#usr/share/syslinux/com32/include/gplinclude/disk/error.h
-#usr/share/syslinux/com32/include/gplinclude/disk/geom.h
-#usr/share/syslinux/com32/include/gplinclude/disk/mbrs.h
-#usr/share/syslinux/com32/include/gplinclude/disk/msdos.h
-#usr/share/syslinux/com32/include/gplinclude/disk/partition.h
-#usr/share/syslinux/com32/include/gplinclude/disk/read.h
-#usr/share/syslinux/com32/include/gplinclude/disk/swsusp.h
-#usr/share/syslinux/com32/include/gplinclude/disk/util.h
-#usr/share/syslinux/com32/include/gplinclude/disk/write.h
-#usr/share/syslinux/com32/include/gplinclude/dmi
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_cache.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h
-#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h
-#usr/share/syslinux/com32/include/gplinclude/memory.h
-#usr/share/syslinux/com32/include/gplinclude/vpd
-#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
-#usr/share/syslinux/com32/include/gplinclude/zzjson
-#usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
-#usr/share/syslinux/com32/include/hw
-#usr/share/syslinux/com32/include/hw/vga.h
-#usr/share/syslinux/com32/include/ilog2.h
-#usr/share/syslinux/com32/include/inttypes.h
-#usr/share/syslinux/com32/include/klibc
-#usr/share/syslinux/com32/include/klibc/archsetjmp.h
-#usr/share/syslinux/com32/include/klibc/compiler.h
-#usr/share/syslinux/com32/include/klibc/diverr.h
-#usr/share/syslinux/com32/include/klibc/endian.h
-#usr/share/syslinux/com32/include/klibc/extern.h
-#usr/share/syslinux/com32/include/klibc/i386
-#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h
-#usr/share/syslinux/com32/include/klibc/sysconfig.h
-#usr/share/syslinux/com32/include/klibc/x86_64
-#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h
-#usr/share/syslinux/com32/include/libansi.h
-#usr/share/syslinux/com32/include/limits.h
-#usr/share/syslinux/com32/include/linux
-#usr/share/syslinux/com32/include/linux/list.h
-#usr/share/syslinux/com32/include/math.h
-#usr/share/syslinux/com32/include/menu.h
-#usr/share/syslinux/com32/include/minmax.h
-#usr/share/syslinux/com32/include/netinet
-#usr/share/syslinux/com32/include/netinet/in.h
-#usr/share/syslinux/com32/include/png.h
-#usr/share/syslinux/com32/include/pngconf.h
-#usr/share/syslinux/com32/include/refstr.h
-#usr/share/syslinux/com32/include/serial.h
-#usr/share/syslinux/com32/include/setjmp.h
-#usr/share/syslinux/com32/include/sort.h
-#usr/share/syslinux/com32/include/srecsend.h
-#usr/share/syslinux/com32/include/stdarg.h
-#usr/share/syslinux/com32/include/stdbool.h
-#usr/share/syslinux/com32/include/stddef.h
-#usr/share/syslinux/com32/include/stdint.h
-#usr/share/syslinux/com32/include/stdio.h
-#usr/share/syslinux/com32/include/stdlib.h
-#usr/share/syslinux/com32/include/string.h
-#usr/share/syslinux/com32/include/suffix_number.h
-#usr/share/syslinux/com32/include/sys
-#usr/share/syslinux/com32/include/sys/bitops.h
-#usr/share/syslinux/com32/include/sys/cpu.h
-#usr/share/syslinux/com32/include/sys/dirent.h
-#usr/share/syslinux/com32/include/sys/elf32.h
-#usr/share/syslinux/com32/include/sys/elf64.h
-#usr/share/syslinux/com32/include/sys/elfcommon.h
-#usr/share/syslinux/com32/include/sys/exec.h
-#usr/share/syslinux/com32/include/sys/fpu.h
-#usr/share/syslinux/com32/include/sys/gpxe.h
-#usr/share/syslinux/com32/include/sys/i386
-#usr/share/syslinux/com32/include/sys/i386/bitops.h
-#usr/share/syslinux/com32/include/sys/i386/cpu.h
-#usr/share/syslinux/com32/include/sys/i386/module.h
-#usr/share/syslinux/com32/include/sys/io.h
-#usr/share/syslinux/com32/include/sys/module.h
-#usr/share/syslinux/com32/include/sys/pci.h
-#usr/share/syslinux/com32/include/sys/stat.h
-#usr/share/syslinux/com32/include/sys/time.h
-#usr/share/syslinux/com32/include/sys/times.h
-#usr/share/syslinux/com32/include/sys/types.h
-#usr/share/syslinux/com32/include/sys/x86_64
-#usr/share/syslinux/com32/include/sys/x86_64/bitops.h
-#usr/share/syslinux/com32/include/sys/x86_64/cpu.h
-#usr/share/syslinux/com32/include/sys/x86_64/module.h
-#usr/share/syslinux/com32/include/syslinux
-#usr/share/syslinux/com32/include/syslinux/adv.h
-#usr/share/syslinux/com32/include/syslinux/advconst.h
-#usr/share/syslinux/com32/include/syslinux/align.h
-#usr/share/syslinux/com32/include/syslinux/boot.h
-#usr/share/syslinux/com32/include/syslinux/bootpm.h
-#usr/share/syslinux/com32/include/syslinux/bootrm.h
-#usr/share/syslinux/com32/include/syslinux/config.h
-#usr/share/syslinux/com32/include/syslinux/debug.h
-#usr/share/syslinux/com32/include/syslinux/disk.h
-#usr/share/syslinux/com32/include/syslinux/firmware.h
-#usr/share/syslinux/com32/include/syslinux/idle.h
-#usr/share/syslinux/com32/include/syslinux/io.h
-#usr/share/syslinux/com32/include/syslinux/keyboard.h
-#usr/share/syslinux/com32/include/syslinux/linux.h
-#usr/share/syslinux/com32/include/syslinux/loadfile.h
-#usr/share/syslinux/com32/include/syslinux/memscan.h
-#usr/share/syslinux/com32/include/syslinux/movebits.h
-#usr/share/syslinux/com32/include/syslinux/pmapi.h
-#usr/share/syslinux/com32/include/syslinux/pxe.h
-#usr/share/syslinux/com32/include/syslinux/pxe_api.h
-#usr/share/syslinux/com32/include/syslinux/reboot.h
-#usr/share/syslinux/com32/include/syslinux/resolve.h
-#usr/share/syslinux/com32/include/syslinux/sysappend.h
-#usr/share/syslinux/com32/include/syslinux/version.h
-#usr/share/syslinux/com32/include/syslinux/vesacon.h
-#usr/share/syslinux/com32/include/syslinux/video.h
-#usr/share/syslinux/com32/include/syslinux/zio.h
-#usr/share/syslinux/com32/include/tftp.h
-#usr/share/syslinux/com32/include/time.h
-#usr/share/syslinux/com32/include/tinyjpeg.h
-#usr/share/syslinux/com32/include/unistd.h
-#usr/share/syslinux/com32/include/upload_backend.h
-#usr/share/syslinux/com32/include/zconf.h
-#usr/share/syslinux/com32/include/zlib.h
-#usr/share/syslinux/com32/libcom32upload.a
-#usr/share/syslinux/com32/libgpl.c32
-#usr/share/syslinux/com32/libutil_lnx.a
-#usr/share/syslinux/config.c32
-#usr/share/syslinux/cptime.c32
-#usr/share/syslinux/cpu.c32
-#usr/share/syslinux/cpuid.c32
-#usr/share/syslinux/cpuidtest.c32
-#usr/share/syslinux/debug.c32
-#usr/share/syslinux/dhcp.c32
-#usr/share/syslinux/diag
-#usr/share/syslinux/diag/geodsp1s.img.xz
-#usr/share/syslinux/diag/geodspms.img.xz
-#usr/share/syslinux/diag/handoff.bin
-#usr/share/syslinux/dir.c32
-#usr/share/syslinux/disk.c32
-#usr/share/syslinux/dmi.c32
-#usr/share/syslinux/dmitest.c32
-#usr/share/syslinux/dosutil
-#usr/share/syslinux/dosutil/copybs.com
-#usr/share/syslinux/dosutil/eltorito.sys
-#usr/share/syslinux/dosutil/mdiskchk.com
-#usr/share/syslinux/efi64
-#usr/share/syslinux/efi64/cat.c32
-#usr/share/syslinux/efi64/chain.c32
-#usr/share/syslinux/efi64/cmd.c32
-#usr/share/syslinux/efi64/cmenu.c32
-#usr/share/syslinux/efi64/config.c32
-#usr/share/syslinux/efi64/cptime.c32
-#usr/share/syslinux/efi64/cpu.c32
-#usr/share/syslinux/efi64/cpuid.c32
-#usr/share/syslinux/efi64/cpuidtest.c32
-#usr/share/syslinux/efi64/debug.c32
-#usr/share/syslinux/efi64/dhcp.c32
-#usr/share/syslinux/efi64/dir.c32
-#usr/share/syslinux/efi64/dmi.c32
-#usr/share/syslinux/efi64/dmitest.c32
-#usr/share/syslinux/efi64/gfxboot.c32
-#usr/share/syslinux/efi64/hdt.c32
-#usr/share/syslinux/efi64/hexdump.c32
-#usr/share/syslinux/efi64/host.c32
-#usr/share/syslinux/efi64/ifcpu.c32
-#usr/share/syslinux/efi64/ifcpu64.c32
-#usr/share/syslinux/efi64/ldlinux.e64
-#usr/share/syslinux/efi64/lfs.c32
-#usr/share/syslinux/efi64/libcom32.c32
-#usr/share/syslinux/efi64/libgpl.c32
-#usr/share/syslinux/efi64/liblua.c32
-#usr/share/syslinux/efi64/libmenu.c32
-#usr/share/syslinux/efi64/libutil.c32
-#usr/share/syslinux/efi64/linux.c32
-#usr/share/syslinux/efi64/ls.c32
-#usr/share/syslinux/efi64/lua.c32
-#usr/share/syslinux/efi64/mboot.c32
-#usr/share/syslinux/efi64/meminfo.c32
-#usr/share/syslinux/efi64/menu.c32
-#usr/share/syslinux/efi64/pci.c32
-#usr/share/syslinux/efi64/pwd.c32
-#usr/share/syslinux/efi64/reboot.c32
-#usr/share/syslinux/efi64/rosh.c32
-#usr/share/syslinux/efi64/sysdump.c32
-#usr/share/syslinux/efi64/syslinux.c32
-#usr/share/syslinux/efi64/syslinux.efi
-#usr/share/syslinux/efi64/vesa.c32
-#usr/share/syslinux/efi64/vesamenu.c32
-#usr/share/syslinux/efi64/vpdtest.c32
-#usr/share/syslinux/efi64/whichsys.c32
-#usr/share/syslinux/efi64/zzjson.c32
-#usr/share/syslinux/elf.c32
-#usr/share/syslinux/ethersel.c32
-#usr/share/syslinux/gfxboot.c32
-#usr/share/syslinux/gptmbr.bin
-#usr/share/syslinux/gptmbr_c.bin
-#usr/share/syslinux/gptmbr_f.bin
-#usr/share/syslinux/gpxecmd.c32
-#usr/share/syslinux/hdt.c32
-#usr/share/syslinux/hexdump.c32
-#usr/share/syslinux/host.c32
-#usr/share/syslinux/ifcpu.c32
-#usr/share/syslinux/ifcpu64.c32
-#usr/share/syslinux/ifmemdsk.c32
-#usr/share/syslinux/ifplop.c32
-#usr/share/syslinux/isohdpfx.bin
-#usr/share/syslinux/isohdpfx_c.bin
-#usr/share/syslinux/isohdpfx_f.bin
-#usr/share/syslinux/isohdppx.bin
-#usr/share/syslinux/isohdppx_c.bin
-#usr/share/syslinux/isohdppx_f.bin
-#usr/share/syslinux/isolinux-debug.bin
-#usr/share/syslinux/isolinux.bin
-#usr/share/syslinux/kbdmap.c32
-#usr/share/syslinux/kontron_wdt.c32
-#usr/share/syslinux/ldlinux.c32
-#usr/share/syslinux/lfs.c32
-#usr/share/syslinux/libcom32.c32
-#usr/share/syslinux/libgpl.c32
-#usr/share/syslinux/liblua.c32
-#usr/share/syslinux/libmenu.c32
-#usr/share/syslinux/libutil.c32
-#usr/share/syslinux/linux.c32
-#usr/share/syslinux/lpxelinux.0
-#usr/share/syslinux/ls.c32
-#usr/share/syslinux/lua.c32
-#usr/share/syslinux/mboot.c32
-#usr/share/syslinux/mbr.bin
-#usr/share/syslinux/mbr_c.bin
-#usr/share/syslinux/mbr_f.bin
-#usr/share/syslinux/memdisk
-#usr/share/syslinux/meminfo.c32
-#usr/share/syslinux/menu.c32
-#usr/share/syslinux/pci.c32
-#usr/share/syslinux/pcitest.c32
-#usr/share/syslinux/pmload.c32
-#usr/share/syslinux/poweroff.c32
-#usr/share/syslinux/prdhcp.c32
-#usr/share/syslinux/pwd.c32
-#usr/share/syslinux/pxechn.c32
-#usr/share/syslinux/pxelinux.0
-#usr/share/syslinux/reboot.c32
-#usr/share/syslinux/rosh.c32
-#usr/share/syslinux/sanboot.c32
-#usr/share/syslinux/sdi.c32
-#usr/share/syslinux/sysdump.c32
-#usr/share/syslinux/syslinux.c32
-#usr/share/syslinux/syslinux.com
-#usr/share/syslinux/vesa.c32
-#usr/share/syslinux/vesainfo.c32
-#usr/share/syslinux/vesamenu.c32
-#usr/share/syslinux/vpdtest.c32
-#usr/share/syslinux/whichsys.c32
-#usr/share/syslinux/zzjson.c32
diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata
index b64e19681..75d7c632b 100644
--- a/config/rootfiles/common/tzdata
+++ b/config/rootfiles/common/tzdata
@@ -98,6 +98,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/America/Cayman
#usr/share/zoneinfo/America/Chicago
#usr/share/zoneinfo/America/Chihuahua
+#usr/share/zoneinfo/America/Ciudad_Juarez
#usr/share/zoneinfo/America/Coral_Harbour
#usr/share/zoneinfo/America/Cordoba
#usr/share/zoneinfo/America/Costa_Rica
@@ -716,6 +717,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/posix/America/Cayman
#usr/share/zoneinfo/posix/America/Chicago
#usr/share/zoneinfo/posix/America/Chihuahua
+#usr/share/zoneinfo/posix/America/Ciudad_Juarez
#usr/share/zoneinfo/posix/America/Coral_Harbour
#usr/share/zoneinfo/posix/America/Cordoba
#usr/share/zoneinfo/posix/America/Costa_Rica
@@ -1334,6 +1336,7 @@ usr/share/zoneinfo
#usr/share/zoneinfo/right/America/Cayman
#usr/share/zoneinfo/right/America/Chicago
#usr/share/zoneinfo/right/America/Chihuahua
+#usr/share/zoneinfo/right/America/Ciudad_Juarez
#usr/share/zoneinfo/right/America/Coral_Harbour
#usr/share/zoneinfo/right/America/Cordoba
#usr/share/zoneinfo/right/America/Costa_Rica
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 628b59969..1848f8ebc 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire
etc/rc.d/init.d/partresize
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
-etc/rc.d/init.d/rngd
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/smartenabler
@@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt
etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S65rngd
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust
index 44703b54c..131ae8e28 100644
--- a/config/rootfiles/common/x86_64/rust
+++ b/config/rootfiles/common/x86_64/rust
@@ -6,10 +6,10 @@
#usr/bin/rustdoc
#usr/etc/bash_completion.d
#usr/etc/bash_completion.d/cargo
-#usr/lib/libLLVM-15-rust-1.65.0-stable.so
-#usr/lib/librustc_driver-a21dfa8672cc0cdd.so
-#usr/lib/libstd-05737cf45bd30456.so
-#usr/lib/libtest-b8b77fa76430964e.so
+#usr/lib/libLLVM-15-rust-1.67.0-stable.so
+#usr/lib/librustc_driver-2e8cbd5b30733393.so
+#usr/lib/libstd-2a15b3cd0948397b.so
+#usr/lib/libtest-aa7b246d7b35480c.so
#usr/lib/rustlib
#usr/lib/rustlib/components
#usr/lib/rustlib/etc
@@ -34,38 +34,38 @@
#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/lld-link
#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/wasm-ld
#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-f14b73d282b0245e.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-f156b880fc73e7f0.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-3fb6d8496dc7d6a6.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-a0d9b33b5161957b.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-272ca28f0b8538d5.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-a1f7b8b60464cc57.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-04ef34c95006bbea.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2c5b4433ebc1d822.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-b08a86c6880b47a8.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-04cec55a79224c36.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-098633b847612f3b.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-58adeee671f9ba8e.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-7f13930fcac1846f.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-92361fe3d1d86e03.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9f873b61fdec9b03.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-1cece883813579b0.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3395ed33f8a00dbe.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-5d5a85338b125cfb.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-6c93f515800d4657.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-60668236929c1cf5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-0b6ce813aa5d1704.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-93189d615c3f2d6a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-c888e061ea504c93.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-6095bf995c453e89.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-3cf84ad460df483a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-dac6992ac677a0cb.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f0ffbd64420a69ad.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-431dd9a65eafb1c5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-3cd49acf880d0306.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-e8062a7445a64946.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-008ebe2e17c5f91d.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-8f251cec381c549e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-bfb4a82e06efc4d7.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-9b09c3cec8a5576d.rlib
#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a
#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a
#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a
#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-59591a7b405fe395.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4458c5022988e1ab.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-7d46c016841a97d4.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-4be5790574aecaaa.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.so
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-384947c6d5f697ff.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.so
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-1c81e618a18568a4.rlib
-#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-02e61e5ec4aa9e8b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-5a049915d61fbb5d.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-8a30445cf40d74de.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-2fb2d4481260f706.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-6352d71bf8e7bd57.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-aabc21fad3549c98.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ae66bd5269d6d83c.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-47cbfc4f5b0f6f87.rlib
#usr/libexec/cargo-credential-1password
#usr/libexec/rust-analyzer-proc-macro-srv
#usr/share/cargo
@@ -100,6 +100,7 @@
#usr/share/man/man1/cargo-package.1
#usr/share/man/man1/cargo-pkgid.1
#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-remove.1
#usr/share/man/man1/cargo-report.1
#usr/share/man/man1/cargo-run.1
#usr/share/man/man1/cargo-rustc.1
diff --git a/config/rootfiles/core/174/filelists/aarch64/efivar b/config/rootfiles/core/174/filelists/aarch64/efivar
new file mode 120000
index 000000000..8a3b708b9
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/aarch64/efivar
@@ -0,0 +1 @@
+../../../../common/aarch64/efivar
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files
index e69de29bb..baf9da9a7 100644
--- a/config/rootfiles/core/174/filelists/files
+++ b/config/rootfiles/core/174/filelists/files
@@ -0,0 +1,5 @@
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/mail.cgi
+var/ipfire/header.pl
+var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/174/filelists/lsof b/config/rootfiles/core/174/filelists/lsof
new file mode 120000
index 000000000..1353d33e5
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/lsof
@@ -0,0 +1 @@
+../../../common/lsof
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/squid b/config/rootfiles/core/174/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/tzdata b/config/rootfiles/core/174/filelists/tzdata
new file mode 120000
index 000000000..5a6e3252f
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/174/filelists/x86_64/efivar b/config/rootfiles/core/174/filelists/x86_64/efivar
new file mode 120000
index 000000000..994ea5e1b
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/x86_64/efivar
@@ -0,0 +1 @@
+../../../../common/x86_64/efivar
\ No newline at end of file
diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh
index 614e914f4..49280a89a 100644
--- a/config/rootfiles/core/174/update.sh
+++ b/config/rootfiles/core/174/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2022 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2023 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
done
# Stop services
+/etc/rc.d/init.d/squid stop
# Extract files
extract_files
@@ -51,6 +52,9 @@ ldconfig
# Start services
telinit u
+if [ -f /var/ipfire/proxy/enable ]; then
+ /etc/init.d/squid start
+fi
# This update needs a reboot...
touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/epson-inkjet-printer-escpr b/config/rootfiles/packages/epson-inkjet-printer-escpr
index 0039203d0..11cab72e3 100644
--- a/config/rootfiles/packages/epson-inkjet-printer-escpr
+++ b/config/rootfiles/packages/epson-inkjet-printer-escpr
@@ -38,9 +38,11 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EC-C110_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-10VA_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-30VA_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-315_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-703A-epson-escpr-en.ppd
@@ -50,6 +52,12 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-707A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-708A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-710A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-711A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-713A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-714A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-715A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
@@ -62,6 +70,12 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-806A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-807A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-810A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-811A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-813A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-814A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-815A_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd
@@ -77,39 +91,87 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M552T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M553T_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-1110_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-16500_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-1810_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2400_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2500_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2550_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2600_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2610_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2650_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2700_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2710_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2720_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2750_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2760_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2800_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2810_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2820_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2850_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4700_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4800_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-7700_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-7750_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M1120_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M2120_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-052A_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M5071FT_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M571T_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M770T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M970A3T_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K200-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K300-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L1110_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L1455_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3050_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3060_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3070_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3100_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3110_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3150_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3160_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3250_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3260_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L364_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd
-#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L380_Series-epson-escpr-en.ppd
-#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L382_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L386_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L395_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L396_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L405_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4150_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4160_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4260_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L455_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L475_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L485_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L486_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L495_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L5190_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L5290_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L565_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L575_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L605_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L655_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L7160_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L7180_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L805_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L810_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M1100_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M1120_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M200_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M205_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M2110_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M2120_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-301_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-303_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-400_Series-epson-escpr-en.ppd
@@ -200,9 +262,14 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M860F-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S06_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S155_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S160T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S170T_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S170UT_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S505_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050PS-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050X-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050_Series-epson-escpr-en.ppd
@@ -227,6 +294,8 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_290-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_300-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_310-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ST-2000_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ST-C2100_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2800-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2900-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX3700-epson-escpr-en.ppd
@@ -370,6 +439,7 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX720_Artisan720-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX820_Artisan830-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-100_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-110_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2510_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2520_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2530_Series-epson-escpr-en.ppd
@@ -379,6 +449,15 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2810_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2820_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2830_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2840_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2850_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2870_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2910_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2930_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2950_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3520_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3530_Series-epson-escpr-en.ppd
@@ -392,7 +471,7 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5620_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5690_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6090_Series-epson-escpr-en.ppd
-#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6530-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6530_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6590_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7110_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7510_Series-epson-escpr-en.ppd
@@ -463,43 +542,58 @@ usr/share/ppd/Epson
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-201_204_208_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-202_203_206_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-205_207_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2100_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-211_214_216_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-212_213_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2150_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-215_217_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2200_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-220_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-225_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-235_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-240_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-243_245_247_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-255_257_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3100_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-312_313_315_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3150_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3200_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-322_323_325_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-330_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-332_335_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-340_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-342_343_345_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-352_355_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-400_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-402_403_405_406_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4100_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-410_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-412_413_415_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4150_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4200_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-420_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-422_423_425_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-430_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-432_435_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-440_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-442_445_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-452_455_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-510_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-530_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-55_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-600_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-610_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-620_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-630_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-640_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-700_Series-epson-escpr-en.ppd
+#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-7100_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-710_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-720_Series-epson-escpr-en.ppd
#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-750_Series-epson-escpr-en.ppd
diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools
similarity index 69%
rename from config/rootfiles/common/rng-tools
rename to config/rootfiles/packages/rng-tools
index 596a911c1..fbeda7800 100644
--- a/config/rootfiles/common/rng-tools
+++ b/config/rootfiles/packages/rng-tools
@@ -1,4 +1,6 @@
+usr/bin/randstat
usr/bin/rngtest
usr/sbin/rngd
#usr/share/man/man1/rngtest.1
#usr/share/man/man8/rngd.8
+etc/rc.d/init.d/rngd
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 88c7879be..392416192 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -883,7 +883,7 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
WARNING: untranslated string: desired = Desired
-WARNING: untranslated string: dh parameter = unknown string
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: disable = Disable
WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
WARNING: untranslated string: enable = Enable
diff --git a/doc/language_issues.en b/doc/language_issues.en
index c29e3bed6..08fda35b7 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -574,7 +574,6 @@ WARNING: untranslated string: details = Details
WARNING: untranslated string: device = Device
WARNING: untranslated string: devices on blue = Devices on BLUE
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp advopt add = Add a DHCP option
WARNING: untranslated string: dhcp advopt added = DHCP option added
WARNING: untranslated string: dhcp advopt blank value = DHCP Option value cannot be empty.
@@ -601,6 +600,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: dhcp server = DHCP Server
WARNING: untranslated string: dhcp server disabled = DHCP server disabled. Stopped.
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 0bd390d5d..ffe423bd1 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -228,6 +228,7 @@ WARNING: translation string unused: dh key move failed
WARNING: translation string unused: dh key warn
WARNING: translation string unused: dh key warn1
WARNING: translation string unused: dh name is invalid
+WARNING: translation string unused: dh parameter
WARNING: translation string unused: dhcp base ip fixed lease
WARNING: translation string unused: dhcp create fixed leases
WARNING: translation string unused: dhcp fixed lease err1
@@ -943,6 +944,7 @@ WARNING: untranslated string: access point name is invalid = Access Point Name i
WARNING: untranslated string: access point name is required = Access Point Name is required
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: cpu frequency = CPU frequency
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dns servers = DNS Servers
WARNING: untranslated string: error message = unknown string
WARNING: untranslated string: fwhost cust locationgrp = unknown string
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 56d69d86e..cb06f0ab3 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -392,7 +392,6 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
-WARNING: translation string unused: guaranteed bandwith
WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
@@ -404,6 +403,7 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
+WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -453,6 +453,10 @@ WARNING: translation string unused: ipblocklist category scanner
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
+WARNING: translation string unused: isdn
+WARNING: translation string unused: isdn settings
+WARNING: translation string unused: isdn1
+WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version
@@ -908,15 +912,11 @@ WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: access point name = Access Point Name
WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
WARNING: untranslated string: access point name is required = Access Point Name is required
-WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL
WARNING: untranslated string: core notice 3 = available.
-WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
-WARNING: untranslated string: email recipient invalid = Invalid email recipient
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: error message = unknown string
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
-WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
WARNING: untranslated string: guardian block a host = unknown string
WARNING: untranslated string: guardian block httpd brute-force = unknown string
WARNING: untranslated string: guardian block ssh brute-force = unknown string
@@ -947,9 +947,6 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: pakfire ago = ago.
-WARNING: untranslated string: retbleed = Retbleed
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
-WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
-WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 9999f947c..dd794f57a 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -940,13 +940,13 @@ WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
WARNING: untranslated string: disable = Disable
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 14a7b420e..4f100abd2 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -943,12 +943,12 @@ WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a53a208d9..e91e62c5b 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -915,13 +915,13 @@ WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: details = Details
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
WARNING: untranslated string: disable = Disable
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index c5dc1aa61..7dd1a63d7 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -911,13 +911,13 @@ WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: details = Details
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
WARNING: untranslated string: disable = Disable
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 552082a96..3443b1f1a 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -926,8 +926,8 @@ WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dh = Diffie-Hellman-Parameter
-WARNING: untranslated string: dh parameter = unknown string
WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
+WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
WARNING: untranslated string: disable = Disable
diff --git a/doc/language_missings b/doc/language_missings
index 65d38b422..78b9e8a2d 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -47,6 +47,7 @@
< could not connect to www ipfire org
< cryptographic settings
< desired
+< dhcp fixed ip address in dynamic range
< dhcp server disabled on blue interface
< dhcp server enabled on blue interface
< disable
@@ -102,6 +103,7 @@
< access point name is required
< addon
< cpu frequency
+< dhcp fixed ip address in dynamic range
< dns servers
< hardware vulnerabilities
< invalid ip or hostname
@@ -115,18 +117,12 @@
< access point name
< access point name is invalid
< access point name is required
-< advproxy errmsg invalid url
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
-< dh
-< email recipient invalid
+< dhcp fixed ip address in dynamic range
< g.dtm
< g.lite
-< guaranteed bandwidth
-< retbleed
-< service boot setting unavailable
-< show dh
< upload fcdsl.o
############################################################################
# Checking cgi-bin translations for language: it #
@@ -252,6 +248,7 @@
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
+< dhcp fixed ip address in dynamic range
< dhcp make fixed lease
< dhcp valid range required when deny known clients checked
< disable
@@ -756,6 +753,7 @@
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
+< dhcp fixed ip address in dynamic range
< dhcp make fixed lease
< disable
< Disabled
@@ -1353,6 +1351,7 @@
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
+< dhcp fixed ip address in dynamic range
< dhcp make fixed lease
< dhcp valid range required when deny known clients checked
< disable
@@ -2330,6 +2329,7 @@
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
+< dhcp fixed ip address in dynamic range
< dhcp make fixed lease
< dhcp valid range required when deny known clients checked
< disable
@@ -3173,6 +3173,7 @@
< desired
< dh
< dhcp deny known clients:
+< dhcp fixed ip address in dynamic range
< dhcp make fixed lease
< dhcp valid range required when deny known clients checked
< disable
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 125713285..28b00215c 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -547,7 +547,8 @@ if ($dhcpsettings{'ACTION'} eq '' ) { # First launch from GUI
$dhcpsettings{'ADVOPT_ENABLED'} = 'on';
}
-&Header::openpage($Lang::tr{'dhcp configuration'}, 1, '');
+### START PAGE ###
+&Header::openpage($Lang::tr{'dhcp configuration'}, 1, $Header::extraHead);
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
@@ -843,11 +844,11 @@ foreach my $line (@current1) {
}
if ($dhcpsettings{'KEY1'} eq $key) {
- print "<tr bgcolor='${Header::colouryellow}'>";
+ print "<tr class='row-colouryellow'>";
} elsif ($key % 2) {
- print "<tr bgcolor='$color{'color22'}'>";
+ print "<tr class='row-color22'>";
} else {
- print "<tr bgcolor='$color{'color20'}'>";
+ print "<tr class='row-color20'>";
}
print <<END
@@ -1020,8 +1021,9 @@ my $ipdup = 0;
my %ipinuse = ();
my %macdupl = (); # Duplicate MACs have to be on different subnets
my %ipoutside = ();
+my %ipinrange = ();
-# mark duplicate ip or duplicate MAC
+# mark duplicate IP, duplicate MAC or IP in dynamic range
foreach my $line (@current2) {
my @temp = split(/\,/,$line);
$macdupl{$temp[0]} += 1;
@@ -1032,14 +1034,21 @@ foreach my $line (@current2) {
if ($ipinuse{$temp[1]} > 1) {
$ipdup = 1; # Flag up duplicates for use later
}
- # Mark IP addresses outwith known subnets
$ipoutside{$temp[1]} = 1;
+ $ipinrange{$temp[1]} = 0;
foreach my $itf (@ITFs) {
- if ( &General::IpInSubnet($temp[1],
- $netsettings{"${itf}_NETADDRESS"},
- $netsettings{"${itf}_NETMASK"})) {
- $ipoutside{$temp[1]} = 0;
- }
+ # Mark IP addresses outwith known subnets
+ if ( &General::IpInSubnet($temp[1],
+ $netsettings{"${itf}_NETADDRESS"},
+ $netsettings{"${itf}_NETMASK"})) {
+ $ipoutside{$temp[1]} = 0;
+ }
+ # Mark IP addresses that overlap with dynamic range
+ if (&Network::ip_address_in_range($temp[1],
+ $dhcpsettings{"START_ADDR_${itf}"},
+ $dhcpsettings{"END_ADDR_${itf}"})) {
+ $ipinrange{$temp[1]} = 1;
+ }
}
}
@@ -1069,13 +1078,13 @@ foreach my $line (@current2) {
if ($dhcpsettings{'KEY2'} eq $key) {
print "<tr>";
- $col="bgcolor='${Header::colouryellow}'";
+ $col="class='row-colouryellow'";
} elsif ($key % 2) {
print "<tr>";
- $col="bgcolor='$color{'color20'}'";
+ $col="class='row-color20'";
} else {
print "<tr>";
- $col="bgcolor='$color{'color22'}'";
+ $col="class='row-color22'";
}
my $TAG0 = '';
my $TAG1 = '';
@@ -1091,12 +1100,15 @@ foreach my $line (@current2) {
$TAG3 = '</b>';
}
if ($ipoutside{$temp[1]} > 0) {
- $TAG4 = "bgcolor='orange'" if ($dhcpsettings{'KEY2'} ne $key);
+ $TAG4 = "class='cell-orange'" if ($dhcpsettings{'KEY2'} ne $key);
+ }
+ if ($ipinrange{$temp[1]} > 0) {
+ $TAG4 = "class='cell-red'" if ($dhcpsettings{'KEY2'} ne $key);
}
print <<END
<td align='center' $col>$TAG2$temp[0]$TAG3</td>
-<td align='center' $col $TAG4>$TAG0$temp[1]$TAG1</td>
+<td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
<td align='center' $col>$temp[6] </td>
<td align='center' $col>$temp[3] </td>
<td align='center' $col>$temp[4] </td>
@@ -1153,8 +1165,10 @@ print <<END
</tr>
<tr>
<td> </td>
- <td bgcolor='orange'> </td>
- <td class='base'>$Lang::tr{'ip address outside subnets'}</td>
+ <td> </td>
+ <td class='base cell-orange'>$Lang::tr{'ip address outside subnets'}</td>
+ <td>  </td>
+ <td class='base cell-red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
<td> </td>
<td> </td>
$dup
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 5fb1fcd5d..bf71b3c9f 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -49,6 +49,7 @@ $cgiparams{'ACTION'} = '';
$cgiparams{'SECTION'} = 'ipfire';
my %sections = (
+ 'apcupsd' => '(apcupsd\[.*?\]: )',
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
'wio' => '(wio:|wio\[.*\])',
'captive' => '(Captive:)',
@@ -81,6 +82,7 @@ my %sections = (
# Translations for the %sections array.
my %trsections = (
+ 'apcupsd' => 'APCUPS',
'auth' => "$Lang::tr{'loginlogout'}",
'wio' => 'Who Is Online?',
'captive' => $Lang::tr{'Captive'},
diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index 34f52ae01..0ed3dfeca 100644
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -297,7 +297,7 @@ sub testmail {
To => $mail{'RECIPIENT'},
#Cc => 'some(a)other.com, some(a)more.com',
Subject => 'IPFire Testmail',
- Type => 'multipart/mixed'
+ Type => 'multipart/alternative'
);
### Add parts (each "attach" has same arguments as "new"):
@@ -306,15 +306,6 @@ sub testmail {
Data => "This is the IPFire test mail."
);
- ### Add attachment for testing
- #$msg->attach(
- # Type => 'application/txt',
- # Encoding => 'base64',
- # Path => '/var/ipfire/dma/dma.conf',
- # Filename => 'dma.conf',
- # Disposition => 'attachment'
- #);
-
$msg->send_by_sendmail;
}
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 80753b841..5a72f53b8 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -827,6 +827,7 @@
'dhcp dns update' => 'DNS Update',
'dhcp dns update algo' => 'Algorithm',
'dhcp dns update secret' => 'Secret',
+'dhcp fixed ip address in dynamic range' => 'Fixed IP Address in dynamic range',
'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.',
'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
'dhcp make fixed lease' => 'Add to fix leases',
diff --git a/lfs/Config b/lfs/Config
index 76a3ed485..589bd7195 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -13,7 +13,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -105,13 +105,19 @@ DIR_TMP_PAK = $(DIR_TMP)/package-$(PROG)
# Add the compiler location and version and specs to the ccache hash
CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
-# We support EFI on x86_64 and aarch64
+# We support EFI on x86_64 riscv64 and aarch64
ifeq "$(BUILD_ARCH)" "x86_64"
EFI = 1
EFI_ARCH = x64
GRUB_ARCH = $(BUILD_ARCH)
endif
+ifeq "$(BUILD_ARCH)" "riscv64"
+ EFI = 1
+ EFI_ARCH = $(BUILD_ARCH)
+ GRUB_ARCH = $(BUILD_ARCH)
+endif
+
ifeq "$(BUILD_ARCH)" "aarch64"
EFI = 1
EFI_ARCH = aa64
diff --git a/lfs/efibootmgr b/lfs/efibootmgr
index 9e11b6b0f..b962d6dcc 100644
--- a/lfs/efibootmgr
+++ b/lfs/efibootmgr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH = aarch64 x86_64
###############################################################################
# Top-level Rules
diff --git a/lfs/efivar b/lfs/efivar
index 70ed90170..7bd26fad7 100644
--- a/lfs/efivar
+++ b/lfs/efivar
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH = aarch64 x86_64
###############################################################################
# Top-level Rules
@@ -73,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-3.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-38_remove_march=native.patch
# fix an issue in Makefile causing the package to be rebuilt during installation
# obtained from https://linuxfromscratch.org/blfs/view/11.1/postlfs/efivar.html
diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr
index fe794205c..7b7d1c21c 100644
--- a/lfs/epson-inkjet-printer-escpr
+++ b/lfs/epson-inkjet-printer-escpr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = Epson ESC/P-R Inkjet Printer Driver
-VER = 1.6.12
+VER = 1.7.23
LSB = 1lsb3.2
THISAPP = epson-inkjet-printer-escpr-$(VER)
@@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = epson-inkjet-printer-escpr
-PAK_VER = 2
+PAK_VER = 3
DEPS = cups
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a3e27ad6af938a0f239af6dbd783b20302b3b88b19cb734f1202e0fd1641497db062bb151a3b4915bc2baf2a0d18e725de5ac928f8f8e4bbd0daf52770944aa2
+$(DL_FILE)_BLAKE2 = 037ad4bb838732a658f349506d676585f32fa651bf196387fa9c3d8c57de2c701b5d609908ac7884f8322b26a142f71c9bf41cc054f8a866c0c242cbb71cd5f7
install : $(TARGET)
diff --git a/lfs/fetchmail b/lfs/fetchmail
index e018861f1..539c83287 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = Full-Featured POP and IMAP Mail Retrieval Daemon
-VER = 6.4.34
+VER = 6.4.36
THISAPP = fetchmail-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fetchmail
-PAK_VER = 13
+PAK_VER = 14
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 796972391a0ac2c71382aaaad3d75fd5c10ddcc58807f6c7ef9940907779e0ec0a8403e077b24afd50e1a7df0646e852cba02ba314e99ea423904e9f8288df01
+$(DL_FILE)_BLAKE2 = eb2f68d8e9254bd1cabb20aa8058326ee1c1e6819fc2ce011943708018b455d4259a2cf21d6eec0a4898ee1768c14f32d3617302ad418ccfbf6746c75c92c1fa
install : $(TARGET)
diff --git a/lfs/grub b/lfs/grub
index 621795e7d..c32edb2ef 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH = aarch64 x86_64
+#SUP_ARCH = aarch64 x86_64
ifeq "$(BUILD_ARCH)" "x86_64"
BUILD_PC = 1
@@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-Use-zifencei-on-riscv.patch
cd $(DIR_APP) && autoreconf -vfi
# Install unifont
diff --git a/lfs/htop b/lfs/htop
index 019a844e1..faaf37047 100644
--- a/lfs/htop
+++ b/lfs/htop
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = An Interactive text-mode Process Viewer for Linux
-VER = 3.2.1
+VER = 3.2.2
THISAPP = htop-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = htop
-PAK_VER = 19
+PAK_VER = 20
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7addefca7de8f0867220e6415f4585f7e6ecf655d6245e4a8e120552ac738544fde1c2d8e24ce1139209caad23994316e8be9611f6ed0253d60547158d17ff24
+$(DL_FILE)_BLAKE2 = da3b4aea4e5d32d4b432e0f45089e7795b59d9a947dc4af76cb6b7f9137e6d45901c8169c8d2c796a3f43162c1e3c8f1e18bd17f20750637e06fe4c3ebe22caa
install : $(TARGET)
diff --git a/lfs/initscripts b/lfs/initscripts
index c6a5f3835..55f0066e5 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -170,7 +170,6 @@ $(TARGET) :
ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock
ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock
ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock
- ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd
ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire
ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init
diff --git a/lfs/lsof b/lfs/lsof
index eefaf35f5..2c654dd5b 100644
--- a/lfs/lsof
+++ b/lfs/lsof
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 4.95.0.linux
+VER = 4.98.0
-THISAPP = lsof_$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+THISAPP = lsof-$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6a7d6353ec7f0f1e14416bff98867e64009c3f3901110c947f845bb3dcf9af3d40755c7ac6d586412a61778bc8ac355d2388cf2cfa8a975dbf4870c339c75a8c
+$(DL_FILE)_BLAKE2 = 7ce5576653035bced042b07a946a09cb3c23da57a4f77a9f7bc8b8f86d531d73f0375a03fb0dc9e03f6ac18caa68bbb45144d6da13cee7ba94dfbb913fae9d03
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./Configure linux
cd $(DIR_APP) && make $(MAKETUNING) CC="cc $(CFLAGS) $(LDFLAGS)"
cd $(DIR_APP) && install -m 755 -o root -g root lsof /usr/bin
diff --git a/lfs/rng-tools b/lfs/rng-tools
index cafb1bcda..6a85a8482 100644
--- a/lfs/rng-tools
+++ b/lfs/rng-tools
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -25,12 +25,19 @@
include Config
VER = 6.14
+SUMMARY = This is a random number generator daemon
THISAPP = rng-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = rng-tools
+PAK_VER = 1
+
+DEPS =
+
+SERVICES = rngd
###############################################################################
# Top-level Rules
@@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, b2sum
###############################################################################
@@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-rtlsdr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ #install initscript
+ $(call INSTALL_INITSCRIPTS,$(SERVICES))
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/rust b/lfs/rust
index f14648208..d0a200d57 100644
--- a/lfs/rust
+++ b/lfs/rust
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.65.0
+VER = 1.67.0
# From https://forge.rust-lang.org/infra/other-installation-methods.html#standalon…
@@ -42,10 +42,10 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = db2dd8518571c5d054502820a0f49483a6cf743ac74747cdb6bb2f3d681b2132de0ed2eb2a5228eaaf7fe737e415cb477764d04d29f565e2bf6cecf6109a468b
-$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 73c0c4d995cf6e81b584b078528035d1fedb12e3c0d0435025945e2ba396850676f7f581ad1e627769122bbba5424591fac734520186b704bff7f7a8ca241385
-$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = 9038b158b2590a8a0a25f72f17ff38d88aff1cb210818a150f24d34dbdff9195f156f21ddccaadf9a3ecd3901161e183b5cb0e15e012f4a26be937a9782e0c6c
-$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = 76874cfd1e8235eb6d99f75bd9affafa50d1b824664b2edd35c1a5276f51eabaf3f5d5c408070580bbfbdab862e6fe4186f552427e72ac3afa245b2c41c275ae
+$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = 3409ed876f430ff22eff792fe9f4a4ca8457f26411def368b8d7fa5b854719c4c1feac5e054d7bccbcc3568bd3601a0e579df8b3bcf5b20c660bb7af4dbbb8f8
+$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 82c17813fbb4a48451a207dbc7879bd7239e947e249ad24e6e098bd2e250cd8aae79ab37bbc2549cb9ffc3e24ef6e072380bbcaf8a620b02457db24f328d92ea
+$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = d099645796f46769e15520b15771bb1886ee040bbee9de00f4983e8fe56c945a9afe1bded33f80c9196354d720ef09588d24468a751a8e2512688fef47a33496
+$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = e5b0efa7114840535d5a0934a22510e850b05eb339eab42e561717281da993817df2e0a57082d73ed7898001885e4dbabcce1ebfaec611cf125e51acd5d75e8a
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid
index 7a7b775ff..5d79bf382 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,8 @@
include Config
-VER = 5.7
+VER = 5.8
+LANGPACK = 20230225
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -42,11 +43,14 @@ endif
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+ squid-langpack-$(LANGPACK).tar.gz
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
+squid-langpack-$(LANGPACK).tar.gz = $(URL_IPFIRE)/squid-langpack-$(LANGPACK).tar.gz
-$(DL_FILE)_BLAKE2 = 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299
+$(DL_FILE)_BLAKE2 = c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68
+squid-langpack-$(LANGPACK).tar.gz_BLAKE2 = 169a05d16770f56e515fd633658e8bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af13be9f4e3b8989758250b6
install : $(TARGET)
@@ -76,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP)/errors && tar zxf $(DIR_DL)/squid-langpack-$(LANGPACK).tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
diff --git a/lfs/tzdata b/lfs/tzdata
index 26500bba2..300ed35ad 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2022e
+VER = 2022g
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 0c1aa99ac8c8f1a7a10602132da1e61921053ff7ed87449be73c45d23440457f28a2abe4dffd9775c4764e294dd9f92d15d3d401caf07a9d6d046fa27c4148f2
-tzcode$(TZCODE_VER).tar.gz_BLAKE2 = 874dca6d7f347276a87a055853617c8943b3b297fd89c80a3e8d6318c81df15af88f8c58bc05d5088359c30aba0d496089df4835f888c3f76cb0ecf6cd231d3a
+tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 582b79cc2317d27f3883042cbca25801397d9e2808ad8d3a340017d635372ef20316ce646a25a43b0ea5d4024841b54925ecc4510613295c39c28647989645cb
+tzcode$(TZCODE_VER).tar.gz_BLAKE2 = b67bb2020913c57cc6bc68d231c53ba645b95305256065e2645bce3b0d71adfaea865ed9bf40f1ec3b4a73aad7e6c48f5ecd0895de6e2d69bed6113d6b579e26
install : $(TARGET)
diff --git a/lfs/wio b/lfs/wio
index be80cef22..08bac2e02 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -32,7 +32,7 @@ THISAPP = wio-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wio
-PAK_VER = 15
+PAK_VER = 16
DEPS =
diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd
similarity index 100%
rename from src/initscripts/system/rngd
rename to src/initscripts/packages/rngd
diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh
new file mode 100644
index 000000000..a53ccc43c
--- /dev/null
+++ b/src/paks/rng-tools/install.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+# create startlinks
+ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd
+ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd
+ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd
+start_service --background rngd
diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh
new file mode 100644
index 000000000..cc9fbb355
--- /dev/null
+++ b/src/paks/rng-tools/uninstall.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service rngd
+remove_files
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*rngd
diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh
new file mode 100644
index 000000000..83bd0ad98
--- /dev/null
+++ b/src/paks/rng-tools/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
diff --git a/src/patches/efivar-38_remove_march=native.patch b/src/patches/efivar-38_remove_march=native.patch
new file mode 100644
index 000000000..7c22576e6
--- /dev/null
+++ b/src/patches/efivar-38_remove_march=native.patch
@@ -0,0 +1,18 @@
+diff -Naur efivar-38.org/src/include/defaults.mk efivar-38/src/include/defaults.mk
+--- efivar-38.org/src/include/defaults.mk 2022-01-14 20:29:35.000000000 +0100
++++ efivar-38/src/include/defaults.mk 2023-02-23 19:38:12.493736490 +0100
+@@ -71,12 +71,8 @@
+ -Wl,--version-script=$(MAP) \
+ $(call family,SOFLAGS)
+
+-HOST_ARCH=$(shell uname -m)
+-ifneq ($(HOST_ARCH),ia64)
+- HOST_MARCH=-march=native
+-else
+- HOST_MARCH=
+-endif
++HOST_MARCH=
++
+ HOST_CPPFLAGS ?= $(CPPFLAGS)
+ override _HOST_CPPFLAGS := $(HOST_CPPFLAGS)
+ override HOST_CPPFLAGS = $(_HOST_CPPFLAGS) \
diff --git a/src/patches/grub/grub-Use-zifencei-on-riscv.patch b/src/patches/grub/grub-Use-zifencei-on-riscv.patch
new file mode 100644
index 000000000..c575a3116
--- /dev/null
+++ b/src/patches/grub/grub-Use-zifencei-on-riscv.patch
@@ -0,0 +1,47 @@
+From f1217c803cec90813eb834dde7829f4961b2a2e4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem(a)gmail.com>
+Date: Thu, 17 Feb 2022 15:07:02 -0800
+Subject: [PATCH] configure.ac: Use _zicsr_zifencei extentions on riscv
+
+From version 2.38, binutils defaults to ISA spec version 20191213. This
+means that the csr read/write (csrr*/csrw*) instructions and fence.i
+instruction has separated from the `I` extension, become two standalone
+extensions: Zicsr and Zifencei.
+
+The fix is to specify those extensions explicitely in -march. Since we
+are now using binutils 2.38+ in OE this is ok, a more upstreamable fix for
+grub will be to detect these extentions, however thats not easy to
+implement
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Khem Raj <raj.khem(a)gmail.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c7fc55a..072f2c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -849,14 +849,14 @@ if test x"$platform" != xemu ; then
+ [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], [])
+ fi
+ if test "x$target_cpu" = xriscv32; then
+- CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+- [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
++ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
+ fi
+ if test "x$target_cpu" = xriscv64; then
+- CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+- [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
++ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
+ fi
+ if test "x$target_cpu" = xia64; then
+ CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
+--
+2.35.1
+
diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl
index eb7b33e7d..46de7be2f 100644
--- a/src/wio/wio-lib.pl
+++ b/src/wio/wio-lib.pl
@@ -157,7 +157,7 @@ sub mailsender {
From => $mailsettings{'SENDER'},
To => $mailsettings{'RECIPIENT'},
Subject => $_[0],
- Type => 'multipart/mixed'
+ Type => 'multipart/alternative'
);
$msg->attach(
diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
index a61102894..f31f5d565 100644
--- a/src/wio/wio.cgi
+++ b/src/wio/wio.cgi
@@ -1761,12 +1761,12 @@ print"
<td colspan='4'> </td>
</tr>
<tr>
- <td height='30'>$Lang::tr{'wio ipadress'}:</td>
- <td align='left'><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='25' /></td>
- <td>$Lang::tr{'wio name'}:</td>
- <td align='left'><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='25' /></td>
- <td>$Lang::tr{'remark'}:</td>
- <td align='left'><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='30'></td>
+ <td class='base'>$Lang::tr{'wio ipadress'}:</td>
+ <td><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='18' /></td>
+ <td class='base'>$Lang::tr{'wio name'}:</td>
+ <td><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='18' /></td>
+ <td class='base'>$Lang::tr{'remark'}:</td>
+ <td><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='18' /></td>
</tr>
<tr>
<td height='30'>$Lang::tr{'wio_ping_send'}:</td>
diff --git a/tools/checkrootfiles b/tools/checkrootfiles
index ab27c594b..a2712808b 100755
--- a/tools/checkrootfiles
+++ b/tools/checkrootfiles
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team info(a)ipfire.org #
+# Copyright (C) 2007-2023 IPFire Team info(a)ipfire.org #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -53,3 +53,11 @@ if [ "${?}" == "0" ]; then
--exclude-dir oldcore --exclude-dir aarch64
echo "Replace by xxxMACHINExxx !"
fi
+
+grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir riscv64 >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+ echo "Error! '/riscv64' in rootfiles files found!"
+ grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go \
+ --exclude-dir oldcore --exclude-dir riscv64
+ echo "Replace by xxxMACHINExxx !"
+fi
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 57fb3e8c1a9532f6e883c39415f6feb974511556
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 57fb3e8c1a9532f6e883c39415f6feb974511556 (commit)
via fd30f093b71e245d0b4364c4aa2c20477da44722 (commit)
via 4bc0fa31f26e08920d8a825f2a3079d887abcc02 (commit)
via b581cb223893165efa8a3e0bba5ab076c9b895f1 (commit)
via 92492e8dc8fa16d69102086127f84e695eb8a1c8 (commit)
via e2cff7fa0d27689b6a8b36bff69f80c67fbd3525 (commit)
via ba5912cd1b57ba95d54386bcef02ce97f7b3c307 (commit)
via 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf (commit)
via 81a6680ed88e81525e8904b4262ec2db43277554 (commit)
via bb97a2338a58b9c0ffbb5454f796ad84844efb49 (commit)
via 931f85d65c36a2a547adfb456b65699999e65eab (commit)
via 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92 (commit)
via b059a4e1560349e12b8f50c19133c2aa1354567d (commit)
via b23cda09bed6f5547224ca08297da98165e7dfd5 (commit)
via ecfbf11ab11fddf3f5c053d7c318600e5cefaa35 (commit)
via b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb (commit)
via e002fd196d31f125a155cabb99a96d871a86916e (commit)
via 5fc37d861dc7eb57fc5fb596a24189f149f1acd9 (commit)
via 6876e5d8c274243016f2d27a595628803cb96266 (commit)
from 40a31d41cf79d8baa5c290cf1f179bd8846aac21 (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 57fb3e8c1a9532f6e883c39415f6feb974511556
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:45:41 2023 +0000
kernel: Install intel-microcode only on x86_64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fd30f093b71e245d0b4364c4aa2c20477da44722
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:45:07 2023 +0000
ImageMagick: Disable building documentation
This added some dependencies to Perl modules that we do not build.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4bc0fa31f26e08920d8a825f2a3079d887abcc02
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:43:02 2023 +0000
kernel: Do not depend on net-tools
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b581cb223893165efa8a3e0bba5ab076c9b895f1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:42:09 2023 +0000
grub: Drop dependencies to all fonts and use Python 3
We no longer ship any fonts, but GRUB still depends on them.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92492e8dc8fa16d69102086127f84e695eb8a1c8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:41:45 2023 +0000
hyperscan: Fix resetting LTO flags
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e2cff7fa0d27689b6a8b36bff69f80c67fbd3525
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:41:19 2023 +0000
libmpc: Disable testsuite
The testsuite hangs for forever.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ba5912cd1b57ba95d54386bcef02ce97f7b3c307
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Mar 3 10:45:14 2023 +0000
tcl: Adopt makefile into new format
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Mar 3 10:46:11 2023 +0000
compat-gmp: Update source URL
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 81a6680ed88e81525e8904b4262ec2db43277554
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 13:14:51 2023 +0000
rrdtool: Do not depend on dejavu-fonts
I did not test if graphs can still be generated, but we do not have this
package any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bb97a2338a58b9c0ffbb5454f796ad84844efb49
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Mar 3 11:03:23 2023 +0000
perl: Re-enable file provides
They are required by at least vim
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 931f85d65c36a2a547adfb456b65699999e65eab
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Mar 3 11:00:26 2023 +0000
expect: Fix build on aarch64
Requires autotools to support this architecture.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 12:52:27 2023 +0000
gcc: Create a linker script to ensure correct link against libgcc
On aarch64, GCC builds some emulated functions into the code which come
from libgcc. To ensure that we dynamically link as much as possible,
this script is required so that it will only fall back to pull functions
from the static library if there is no other resort.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b059a4e1560349e12b8f50c19133c2aa1354567d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 12:50:54 2023 +0000
gcc: Drop build dependency to autogen
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b23cda09bed6f5547224ca08297da98165e7dfd5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Mar 4 12:37:07 2023 +0000
gettext: Filter weird perl dependency.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ecfbf11ab11fddf3f5c053d7c318600e5cefaa35
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Mar 3 10:51:18 2023 +0000
kbd: Update to 2.5.1
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 12:50:02 2023 +0000
compat-gnutls: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e002fd196d31f125a155cabb99a96d871a86916e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 12:43:13 2023 +0000
gnutls: Build without net-tools
net-tools has been dropped
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5fc37d861dc7eb57fc5fb596a24189f149f1acd9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 12:34:17 2023 +0000
perl-XML-NamespaceSupport: Fix build requirements
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6876e5d8c274243016f2d27a595628803cb96266
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 4 12:27:19 2023 +0000
curl: Do not depend on net-tools
This package has been dropped
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ImageMagick/ImageMagick.nm | 3 +-
compat-gmp/compat-gmp.nm | 4 +-
compat-gnutls/compat-gnutls.nm | 5 +-
curl/curl.nm | 3 +-
expect/expect.nm | 9 +-
gcc/gcc.nm | 10 +-
gettext/gettext.nm | 10 +-
gnutls/gnutls.nm | 3 +-
grub/grub.nm | 13 +-
hyperscan/hyperscan.nm | 8 +-
kbd/kbd.nm | 27 +--
kbd/patches/kbd-1.15-defkeymap.patch | 12 -
kbd/patches/kbd-1.15-keycodes-man.patch | 52 -----
kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 --
kbd/patches/kbd-1.15-unicode_start.patch | 21 --
kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 --
kbd/patches/kbd-1.15.3-fix-es-translation.patch | 12 -
kbd/patches/kbd-2.5.1-backspace-1.patch | 250 +++++++++++++++++++++
kbd/vlock.pamd | 3 +
kernel/kernel.nm | 7 +-
libmpc/libmpc.nm | 5 +-
.../perl-XML-NamespaceSupport.nm | 4 +-
perl/perl.nm | 75 +++----
rrdtool/rrdtool.nm | 4 +-
tcl/tcl.nm | 15 +-
25 files changed, 358 insertions(+), 230 deletions(-)
delete mode 100644 kbd/patches/kbd-1.15-defkeymap.patch
delete mode 100644 kbd/patches/kbd-1.15-keycodes-man.patch
delete mode 100644 kbd/patches/kbd-1.15-resizecon-x86_64.patch
delete mode 100644 kbd/patches/kbd-1.15-unicode_start.patch
delete mode 100644 kbd/patches/kbd-1.15.3-dumpkeys-man.patch
delete mode 100644 kbd/patches/kbd-1.15.3-fix-es-translation.patch
create mode 100644 kbd/patches/kbd-2.5.1-backspace-1.patch
create mode 100644 kbd/vlock.pamd
Difference in files:
diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm
index f240d11a7..a845e619c 100644
--- a/ImageMagick/ImageMagick.nm
+++ b/ImageMagick/ImageMagick.nm
@@ -6,7 +6,7 @@
name = ImageMagick
version = 7.1.0
patchlevel = 56
-release = 1
+release = 1.1
groups = Application/Multimedia
url = https://www.imagemagick.org/
@@ -45,6 +45,7 @@ build
configure_options += \
--enable-shared \
--disable-static \
+ --disable-docs \
--with-threads \
--with-bzlib=yes \
--with-fontconfig=yes \
diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm
index fc1d9184f..60168433a 100644
--- a/compat-gmp/compat-gmp.nm
+++ b/compat-gmp/compat-gmp.nm
@@ -5,7 +5,7 @@
name = compat-gmp
version = 4.3.2
-release = 1
+release = 1.1
thisapp = gmp-%{version}
groups = System/Libraries
@@ -23,7 +23,7 @@ description
emphasizes speed over simplicity/elegance in its operations.
end
-source_dl += https://gmplib.org/download/gmp/ ftp://ftp.gnu.org/gnu/gmp/
+source_dl += https://gmplib.org/download/gmp/archive/ ftp://ftp.gnu.org/gnu/gmp/
sources = %{thisapp}.tar.xz
build
diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm
index 9711d5034..3ae618164 100644
--- a/compat-gnutls/compat-gnutls.nm
+++ b/compat-gnutls/compat-gnutls.nm
@@ -7,7 +7,7 @@ name = compat-gnutls
version = %{ver_maj}.%{ver_min}
ver_maj = 3.3
ver_min = 25
-release = 3
+release = 3.1
thisapp = gnutls-%{version}
groups = System/Libraries
@@ -22,7 +22,7 @@ description
TLS working group.
end
-source_dl = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/
+source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%{ver_maj}/
sources = %{thisapp}.tar.xz
build
@@ -32,7 +32,6 @@ build
libidn-devel
libtasn1-devel >= 3.2
lzo-devel
- net-tools
nettle-devel >= 3.2
perl
p11-kit-devel >= 0.23.1
diff --git a/curl/curl.nm b/curl/curl.nm
index c0e01165f..7d93a8c07 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -5,7 +5,7 @@
name = curl
version = 7.86.0
-release = 2
+release = 2.1
groups = Application/Internet
url = https://curl.haxx.se/
@@ -28,7 +28,6 @@ build
libidn-devel
libssh2-devel
libtool-devel
- net-tools
nghttp2-devel
openldap-devel
openssl-devel
diff --git a/expect/expect.nm b/expect/expect.nm
index af7658c1d..6ed1625ef 100644
--- a/expect/expect.nm
+++ b/expect/expect.nm
@@ -5,7 +5,7 @@
name = expect
version = 5.45.4
-release = 1
+release = 1.1
thisapp = %{name}%{version}
groups = Development/Languages
@@ -24,7 +24,10 @@ source_dl = https://downloads.sourceforge.net/project/expect/Expect/%{version}/
build
requires
+ autoconf
+ automake
tcl-devel
+ gettext-devel
end
configure_options += \
@@ -32,6 +35,10 @@ build
--with-tclinclude=%{includedir} \
--enable-shared
+ prepare_cmds
+ autoreconf -vfi
+ end
+
test
make test
end
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 4764ec0a5..84243e48e 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_graphite = 1
name = gcc
version = 12.2.0
-release = 2.1
+release = 3
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Compilers
@@ -29,7 +29,6 @@ sources = %{thisapp}.tar.gz
build
requires
- autogen
binutils >= %{binutils_version}
dejagnu
elfutils-devel
@@ -218,7 +217,12 @@ build
# Fix libgcc_s symlinks.
rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}%{libdir}/libgcc_s.so
- ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so
+ echo '/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+
+ OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
+ GROUP ( /%{libdir}/libgcc_s.so.1 libgcc.a )' > ${FULLPATH}/libgcc_s.so
chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1
# Remove some GNU debugger stuff.
diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 1fcb77e6d..264eb2db0 100644
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -5,7 +5,7 @@
name = gettext
version = 0.21.1
-release = 2
+release = 2.1
groups = System/Base
url = https://www.gnu.org/software/gettext/
@@ -67,6 +67,8 @@ packages
bundled(gnulib)
bundled(libcroco) = 0.6.12
end
+
+ filter_requires = (Shell)
end
package %{name}-common-devel
@@ -77,6 +79,8 @@ packages
files
/usr/share/gettext/
end
+
+ filter_requires = (Shell)
end
package %{name}-devel
@@ -88,6 +92,8 @@ packages
git
end
+ filter_requires = (Shell)
+
files += \
/usr/bin/autopoint \
/usr/share/man/man1/autopoint.1
@@ -96,6 +102,8 @@ packages
package %{name}-libs
template LIBS
+ filter_requires = (Shell)
+
files
%{libdir}/libgettextlib-*.so
%{libdir}/libgettextpo.so.*
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 753f632f9..880a356f9 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -7,7 +7,7 @@ name = gnutls
version = %{ver_maj}.%{ver_min}
ver_maj = 3.7
ver_min = 8
-release = 2
+release = 2.1
groups = System/Libraries
url = https://gnutls.org/
@@ -32,7 +32,6 @@ build
libtasn1-devel >= 4.9
libunistring-devel
lzo-devel
- net-tools
nettle-devel >= 3.4.1
perl
p11-kit-devel >= 0.23.1
diff --git a/grub/grub.nm b/grub/grub.nm
index a5deb8e31..e5ad722d0 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
name = grub
version = 2.06
-release = 1
+release = 1.1
sup_arches = aarch64 x86_64
thisapp = %{name}-%{version}
@@ -25,26 +25,20 @@ end
source_dl = https://ftp.gnu.org/gnu/grub/
sources = %{thisapp}.tar.xz
-# Unifont
-unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz
-
build
requires
autoconf
- autogen
automake
bison
bzip2-devel
- debugedit >= 5.3.5-2
- dejavu-fonts-sans-fonts
flex
freetype-devel
gettext
gettext-devel
libdevmapper-devel
ncurses-devel
+ python3
zlib-devel
- %{unifont}
end
# Don't leak our CFLAGS to boot code
@@ -58,8 +52,7 @@ build
end
prepare_cmds
- cp -vf %{unifont} unifont.pcf.gz
- ./autogen.sh
+ PYTHON=%{python3} ./autogen.sh
for platform in %{platforms}; do
cp -r %{DIR_APP} %{DIR_APP}-${platform}
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index 91a7d665d..a0a437e65 100644
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -5,7 +5,7 @@
name = hyperscan
version = 5.4.0
-release = 1
+release = 1.1
# This won't build on any architectures but those
sup_arches = x86_64
@@ -28,9 +28,6 @@ end
source_dl = https://github.com/intel/hyperscan/archive/v%{version}.tar.gz#/
-# Disable LTO
-LTO_CFLAGS =
-
build
requires
boost-devel >= 1.57
@@ -41,6 +38,9 @@ build
sqlite-devel
end
+ # Disable LTO
+ LTO_CFLAGS =
+
build
%{cmake} . \
-DBUILD_SHARED_LIBS:BOOL=ON \
diff --git a/kbd/kbd.nm b/kbd/kbd.nm
index fbc57c7e6..4625a1c65 100644
--- a/kbd/kbd.nm
+++ b/kbd/kbd.nm
@@ -4,11 +4,11 @@
###############################################################################
name = kbd
-version = 1.15.3
-release = 2
+version = 2.5.1
+release = 1
groups = System/Base
-url = http://ftp.altlinux.org/pub/people/legion/kbd
+url = http://www.kbd-project.org/
license = GPLv2+
summary = Tools for configuring the console (keyboard, virtual terminals, etc.).
@@ -18,15 +18,17 @@ description
fonts, the virtual terminals and font files.
end
-source_dl =
-sources += kbd-latarcyrheb-16-fixed.tar.bz2
-sources += kbd-latsun-fonts.tar.bz2
+source_dl = https://github.com/legionus/kbd/archive/refs/tags/v%{version}.tar.gz/#
+sources = %{thisapp}.tar.gz
build
requires
+ autoconf
+ automake
bison
flex
- gettext
+ gettext-devel
+ pam-devel
end
configure_options += \
@@ -35,15 +37,8 @@ build
--enable-nls
prepare_cmds
- # Adding our own fonts.
- cd %{DIR_APP}
- %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2
- %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2
-
# 7-bit maps are obsolete; so are non-euro maps
cd %{DIR_APP}/data/keymaps/i386
- mv qwerty/fi.map qwerty/fi-old.map
- cp qwerty/fi-latin9.map qwerty/fi.map
cp qwerty/pt-latin9.map qwerty/pt.map
cp qwerty/sv-latin1.map qwerty/se-latin1.map
mv azerty/fr.map azerty/fr-old.map
@@ -51,7 +46,6 @@ build
cp azerty/fr-latin9.map azerty/fr-latin0.map
# Rename conflicting keymaps
- mv dvorak/no.map dvorak/no-dvorak.map
mv fgGIod/trf.map fgGIod/trf-fgGIod.map
mv olpc/es.map olpc/es-olpc.map
mv olpc/pt.map olpc/pt-olpc.map
@@ -60,6 +54,9 @@ build
# remove obsolete "gr" translation
cd %{DIR_APP}/po
rm -f gr.po gr.gmo
+
+ # Run autogen
+ cd %{DIR_APP} && ./autogen.sh
end
end
diff --git a/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch
deleted file mode 100644
index 5e604b71e..000000000
--- a/kbd/patches/kbd-1.15-defkeymap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h
---- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200
-+++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200
-@@ -19,7 +19,7 @@
- # define DEFMAP "sunkeymap.kmap"
- # define KERNDIR "/usr/src/linux/drivers/sbus/char"
- #else
--# define DEFMAP "defkeymap.kmap"
-+# define DEFMAP "defkeymap.map"
- # define KERNDIR "/usr/src/linux/drivers/char"
- #endif
-
diff --git a/kbd/patches/kbd-1.15-keycodes-man.patch b/kbd/patches/kbd-1.15-keycodes-man.patch
deleted file mode 100644
index d18a8c8b5..000000000
--- a/kbd/patches/kbd-1.15-keycodes-man.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
---- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100
-+++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100
-@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
- to know the scan codes sent by various keys it is better to boot a
- 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
- that tells the 2.6 kernel to return the actual scan codes.
-+
-+.SH NOTES
-+The raw scan codes are available only on AT and PS/2 keyboards,
-+and even then they are disabled unless the
-+.B atkbd.softraw=0
-+kernel parameter is used.
-+When the raw scan codes are not available, the kernel uses a fixed built-in
-+table to produce scan codes from keycodes. Thus,
-+.BR setkeycodes (8)
-+can affect the output of
-+.B showkey
-+in scan code dump mode.
-+
- .SH "SEE ALSO"
- .BR loadkeys (1),
- .BR dumpkeys (1),
-diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
---- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100
-+++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100
-@@ -41,6 +41,10 @@ to showkey(1), the command
- will assign the keycode 112 to it, and then loadkeys(1) can be used
- to define the function of this key.
-
-+USB keyboards have standardized keycodes and
-+.B setkeycodes
-+doesn't affect them at all.
-+
- .SH "2.6 KERNELS"
- In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
- (It might be best to confine oneself to the range 1-239.)
-@@ -54,6 +58,14 @@ None.
- .SH BUGS
- The keycodes of X have nothing to do with those of Linux.
- Unusual keys can be made visible under Linux, but not under X.
-+
-+.B setkeycodes
-+affects only the "first" input device
-+that has modifiable scancode-to-keycode mapping.
-+If there is more than one such device,
-+.B setkeycodes
-+cannot change the mapping of other devices than the "first" one.
-+
- .SH "SEE ALSO"
- .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
-
diff --git a/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/kbd/patches/kbd-1.15-resizecon-x86_64.patch
deleted file mode 100644
index 5e8350a86..000000000
--- a/kbd/patches/kbd-1.15-resizecon-x86_64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up kbd-1.15/configure_old kbd-1.15/configure
---- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100
-+++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100
-@@ -7637,8 +7637,9 @@ fi
-
-
- case $host_cpu in
-- i?86*) RESIZECONS_PROGS=yes ;;
-- *) RESIZECONS_PROGS=no ;;
-+ i?86*) RESIZECONS_PROGS=yes ;;
-+ x86_64*) RESIZECONS_PROGS=yes ;;
-+ *) RESIZECONS_PROGS=no ;;
- esac
- if test "$RESIZECONS_PROGS" = "yes"; then
- RESIZECONS_PROGS_TRUE=
diff --git a/kbd/patches/kbd-1.15-unicode_start.patch b/kbd/patches/kbd-1.15-unicode_start.patch
deleted file mode 100644
index 41827ccd4..000000000
--- a/kbd/patches/kbd-1.15-unicode_start.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
---- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100
-+++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100
-@@ -72,6 +72,9 @@ stty iutf8
- # have a Unicode map attached, or explicitly specified, e.g.,
- # by giving `def.uni' as a second argument.
-
-+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
-+# Also drdos8x16 is a good candidate.
-+
- case "$#" in
- 2)
- setfont "$1" -u "$2"
-@@ -80,6 +83,7 @@ case "$#" in
- setfont "$1"
- ;;
- 0)
-+ setfont $DEFAULT_UNICODE_FONT
- ;;
- *)
- echo "usage: unicode_start [font [unicode map]]"
diff --git a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch
deleted file mode 100644
index e77718b47..000000000
--- a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in
---- kbd-1.15.3/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200
-+++ kbd-1.15.3/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200
-@@ -156,6 +156,14 @@ output of
- .BR dumpkeys .
- .LP
- .TP
-+.B \-1 \-\-separate-lines
-+This forces
-+.B dumpkeys
-+to write one line per (modifier,keycode) pair. It prefixes the word
-+.I plain
-+for plain keycodes.
-+.LP
-+.TP
- .B \-\-funcs-only
- When this option is given,
- .B dumpkeys
diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch
deleted file mode 100644
index 9d43d8d15..000000000
--- a/kbd/patches/kbd-1.15.3-fix-es-translation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po
---- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200
-+++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200
-@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
-
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/kbd/patches/kbd-2.5.1-backspace-1.patch b/kbd/patches/kbd-2.5.1-backspace-1.patch
new file mode 100644
index 000000000..8fec17180
--- /dev/null
+++ b/kbd/patches/kbd-2.5.1-backspace-1.patch
@@ -0,0 +1,250 @@
+Submitted By: Matt Burgess
+Date: 2008-12-06
+Initial Package Version: 1.15
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Makes the Backspace key send character code 127, and Delete send a well known
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
+
+Original patch for 1.12 by Alexander Patrakov.
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000
+@@ -43,7 +43,7 @@
+ keycode 11 = three numbersign
+ keycode 12 = two at
+ keycode 13 = one exclam
+- keycode 14 = BackSpace Delete
++ keycode 14 = Delete Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ keycode 11 = slash question
+ keycode 12 = bracketleft braceleft
+ keycode 13 = bracketright braceright
+- keycode 14 = BackSpace Delete
++ keycode 14 = Delete Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000
+@@ -51,7 +51,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = minus underscore
+ alt keycode 13 = Meta_equal
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Meta_Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000
+@@ -205,7 +205,7 @@
+ # edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode 14 = \
+- BackSpace BackSpace BackSpace BackSpace \
++ Delete Delete Delete Delete \
+ Delete Delete Delete Delete \
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete
+@@ -506,7 +506,7 @@
+
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete F111 Delete F111 \
++keycode 111 = Remove F111 Remove F111 \
+ Remove Remove Remove Remove \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
+ Boot Boot Boot Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000
+@@ -204,7 +204,7 @@
+ # edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode 14 = \
+- BackSpace BackSpace BackSpace BackSpace \
++ Delete Delete Delete Delete \
+ Delete Delete Delete Delete \
+ Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete
+@@ -505,7 +505,7 @@
+
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete F111 Delete F111 \
++keycode 111 = Remove F111 Remove F111 \
+ Remove Remove Remove Remove \
+ Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
+ Boot Boot Boot Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho(a)ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ plain keycode 83 = KP_Comma
+- plain keycode 111 = Delete # "Remove" originally, weird...
++ plain keycode 111 = Remove
+ strings as usual
+
+ keycode 1 = Escape
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000
+@@ -143,8 +143,8 @@
+
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr keycode 27 = +0xDF
+-# altgr shift keycode 27 = +0xFF
++altgr keycode 27 = +0xDF
++altgr shift keycode 27 = +0xFF
+ control keycode 27 = Control_bracketright
+ altgr control keycode 27 = Control_bracketright
+ alt keycode 27 = Meta_bracketright
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000
+@@ -39,7 +39,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace
++ keycode 14 = Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr alt keycode 13 = Meta_equal
+ shift alt keycode 13 = Meta_plus
+ altgr shift alt keycode 13 = Meta_plus
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
+-# keycode 14 = Delete Delete Delete Delete
++# keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ altgr alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000
+@@ -42,7 +42,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = equal plus equal plus
+ alt keycode 13 = Meta_equal
+- keycode 14 = BackSpace BackSpace BackSpace BackSpace
++ keycode 14 = Delete Delete Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Tab Tab Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000
+@@ -345,7 +345,7 @@
+ keycode 109 = Next Scroll_Forward
+ keycode 110 = Insert
+
+- keycode 111 = Delete # "Remove" originally, weird...
++ keycode 111 = Remove
+ control alt keycode 111 = Boot
+ control altgr keycode 111 = Boot
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000
+@@ -374,6 +374,6 @@
+ keycode 109 = Next Scroll_Forward
+ keycode 110 = Insert
+
+- keycode 111 = Delete # "Remove" originally, weird...
++ keycode 111 = Remove
+ control alt keycode 111 = Boot
+ control altgr keycode 111 = Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000
+@@ -49,7 +49,7 @@
+ alt keycode 12 = Meta_minus
+ keycode 13 = minus underscore
+ alt keycode 13 = Meta_equal
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ alt keycode 14 = Meta_Delete
+ keycode 15 = Tab Meta_Tab
+ alt keycode 15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000
+@@ -249,7 +249,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000
+@@ -250,7 +250,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000
+@@ -260,7 +260,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000
+@@ -260,7 +260,7 @@
+ shift ctrll ctrlr keycode 13 = plus
+ alt ctrll ctrlr keycode 13 = Meta_equal
+ shift alt ctrll ctrlr keycode 13 = Meta_plus
+-keycode 14 = BackSpace Delete
++keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+ ctrlr keycode 14 = BackSpace
diff --git a/kbd/vlock.pamd b/kbd/vlock.pamd
new file mode 100644
index 000000000..d2d47e5b2
--- /dev/null
+++ b/kbd/vlock.pamd
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth include system-auth
+account required pam_permit.so
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 4d90512e2..62c23132b 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 6.2
-release = 1
+release = 1.2
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -43,7 +43,6 @@ build
hostname
libunwind-devel
ncurses-devel
- net-tools
newt-devel
openssl
/usr/bin/openssl
@@ -290,8 +289,10 @@ packages
dracut
kernel-updater
linux-firmware
- intel-microcode
wireless-regdb
+
+ # Install intel-microcode only on x86_64
+ (intel-microcode if arch(x86_64))
end
files
diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm
index fb6aacc44..a9bf379ad 100644
--- a/libmpc/libmpc.nm
+++ b/libmpc/libmpc.nm
@@ -5,7 +5,7 @@
name = libmpc
version = 1.3.1
-release = 1.1
+release = 1.2
thisapp = mpc-%{version}
groups = System/Libraries
@@ -32,7 +32,8 @@ build
--disable-static
test
- make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs"
+ # This testsuite runs forever on x86_64
+ : # make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs"
end
end
diff --git a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
index fd4e8edda..9010e505b 100644
--- a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
+++ b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
@@ -5,7 +5,7 @@
name = perl-XML-NamespaceSupport
version = 1.11
-release = 1
+release = 1.1
arch = noarch
thisapp = XML-NamespaceSupport-%{version}
@@ -28,6 +28,8 @@ build
perl(constant)
perl(Cwd)
perl(ExtUtils::MakeMaker) >= 6.42
+ perl(FindBin)
+ perl(Module::Install)
perl(File::Path)
perl(Test::More) >= 0.47
end
diff --git a/perl/perl.nm b/perl/perl.nm
index 949dc9b31..18c4c65a2 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 = 2
+release = 2.1
thisver = %{version}-%{_release}
@@ -179,43 +179,42 @@ packages
perl(:WITH_PERLIO)
# File provides
- #perl(abbrev.pl)
- #perl(assert.pl)
- #perl(bigfloat.pl)
- #perl(bigint.pl)
- #perl(bigrat.pl)
- #perl(bytes_heavy.pl)
- #perl(cacheout.pl)
- #perl(complete.pl)
- #perl(ctime.pl)
- #perl(dotsh.pl)
- #perl(dumpvar.pl)
- #perl(exceptions.pl)
- #perl(fastcwd.pl)
- #perl(find.pl)
- #perl(finddepth.pl)
- #perl(flush.pl)
- #perl(ftp.pl)
- #perl(getcwd.pl)
- #perl(getopt.pl)
- #perl(getopts.pl)
- #perl(hostname.pl)
- #perl(importenv.pl)
- #perl(look.pl)
- #perl(newgetopt.pl)
- #perl(open2.pl)
- #perl(open3.pl)
- #perl(perl5db.pl)
- #perl(pwd.pl)
- #perl(shellwords.pl)
- #perl(stat.pl)
- #perl(syslog.pl)
- #perl(tainted.pl)
- #perl(termcap.pl)
- #perl(timelocal.pl)
- #perl(utf8_heavy.pl)
- #perl(validate.pl)
- #perl(strict)
+ perl(abbrev.pl)
+ perl(assert.pl)
+ perl(bigfloat.pl)
+ perl(bigint.pl)
+ perl(bigrat.pl)
+ perl(bytes_heavy.pl)
+ perl(cacheout.pl)
+ perl(complete.pl)
+ perl(ctime.pl)
+ perl(dotsh.pl)
+ perl(dumpvar.pl)
+ perl(exceptions.pl)
+ perl(fastcwd.pl)
+ perl(find.pl)
+ perl(finddepth.pl)
+ perl(flush.pl)
+ perl(ftp.pl)
+ perl(getcwd.pl)
+ perl(getopt.pl)
+ perl(getopts.pl)
+ perl(hostname.pl)
+ perl(importenv.pl)
+ perl(look.pl)
+ perl(newgetopt.pl)
+ perl(open2.pl)
+ perl(open3.pl)
+ perl(perl5db.pl)
+ perl(pwd.pl)
+ perl(shellwords.pl)
+ perl(stat.pl)
+ perl(syslog.pl)
+ perl(tainted.pl)
+ perl(termcap.pl)
+ perl(timelocal.pl)
+ perl(utf8_heavy.pl)
+ perl(validate.pl)
end
end
diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm
index c9fa29602..6842ba491 100644
--- a/rrdtool/rrdtool.nm
+++ b/rrdtool/rrdtool.nm
@@ -5,7 +5,7 @@
name = rrdtool
version = 1.8.0
-release = 1
+release = 1.1
groups = Applications/Databases
url = https://oss.oetiker.ch/rrdtool/
@@ -72,8 +72,6 @@ packages
package %{name}-libs
template LIBS
-
- requires += dejavu-fonts-sans-mono-fonts
end
package python3-%{name}
diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index 4adf47524..d0160cad0 100644
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -6,7 +6,7 @@
name = tcl
major_ver = 8.6
version = %{major_ver}.13
-release = 1
+release = 1.1
thisapp = tcl%{version}
groups = Development/Languages
@@ -31,6 +31,8 @@ build
zlib-devel
end
+ DIR_APP = %{DIR_SRC}/%{thisapp}/unix
+
# tcl fails to detect that it needs to link agains libm
LDFLAGS += -lm
@@ -43,15 +45,10 @@ build
--enable-threads \
--enable-64bit
- build
- cd unix && %{configure}
-
- make %{PARALLELISMFLAGS}
- end
-
- install
- cd unix && make install install-private-headers INSTALL_ROOT=%{BUILDROOT}
+ make_install_targets += \
+ install-private-headers INSTALL_ROOT=%{BUILDROOT}
+ install_cmds
ln -svf tclsh%{major_ver} %{BUILDROOT}/usr/bin/tclsh
# for linking with -lib%{name}
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 40a31d41cf79d8baa5c290cf1f179bd8846aac21
by Michael Tremer 04 Mar '23
by Michael Tremer 04 Mar '23
04 Mar '23
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 40a31d41cf79d8baa5c290cf1f179bd8846aac21 (commit)
via 70de0a782bd6e031b1d95c7373826ef9d4a40929 (commit)
via e9679df59217073e4ce41746031e4adae9ec3934 (commit)
via c111f9f2ea9b73f76c972448effb36057f66dc53 (commit)
via 43f93e968680bfafc547eb641edf079fb5775079 (commit)
via 0e2b1240764f560850c706392ded3c27e94e61de (commit)
via f86e11669f58ddfaafc2525b6d30edc074b84105 (commit)
via 9222bda9ac93a9b3d63fdfb06f5db876099a53ad (commit)
via 46e3fda10ee66c8ee3557f975b09893c253c6bb6 (commit)
via f3b6e913bae36610007dcb2175e4a8eb4f7f3a0d (commit)
via 0b26a9c6ea95b2194cd64e152af2c8c1ea49a8ab (commit)
via 6c8cd74e9d5f74591ad627932f0b272baa5dd115 (commit)
via ef30ff5574f55a774ab64ca5184834ae21e78d5f (commit)
via 6d690cfabb3fb871748c66e3d225bcb41410c782 (commit)
via 3d0728d40b72f48845394b7431078cc4aa08b998 (commit)
from fb152933d3ff9a448256309f54cb30ff4193f9d5 (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 40a31d41cf79d8baa5c290cf1f179bd8846aac21
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Mar 3 06:33:56 2023 +0000
pam: Requires libxcrypt-devel to build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 70de0a782bd6e031b1d95c7373826ef9d4a40929
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 2 16:58:55 2023 +0000
netpbm: Update to 10.73.42
* Fix source URL.
* Add some missing perl modules as build dependency.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit e9679df59217073e4ce41746031e4adae9ec3934
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 17:11:27 2023 +0100
gmp: Set ABI to 64 for all architectures.
We only build for architectures which have support for 64 Bit.
Therefore we do not need this check anymore.
This also fixes build for aarch64 which did not got the correct
settings.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit c111f9f2ea9b73f76c972448effb36057f66dc53
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 17:01:11 2023 +0100
perl-File-HomeDir: Drop filter_requires
Not needed anymore.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 43f93e968680bfafc547eb641edf079fb5775079
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 17:00:35 2023 +0100
perl-File-Which: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 0e2b1240764f560850c706392ded3c27e94e61de
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 16:59:57 2023 +0100
perl-File-HomeDir: Add more build dependencies
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit f86e11669f58ddfaafc2525b6d30edc074b84105
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:56:31 2023 +0100
openldap: Requires libxcrypt to build
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 9222bda9ac93a9b3d63fdfb06f5db876099a53ad
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:55:42 2023 +0100
mpfr: Update to 4.1.0
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 46e3fda10ee66c8ee3557f975b09893c253c6bb6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:55:11 2023 +0100
libmpc: Requires latest mpfr to build.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit f3b6e913bae36610007dcb2175e4a8eb4f7f3a0d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:54:13 2023 +0100
gcc: Requires libxcrypt-devel to build.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 0b26a9c6ea95b2194cd64e152af2c8c1ea49a8ab
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:52:37 2023 +0100
fontconfig: Devel package requires libxml2-devel.
Otherwise pkg-config reports the missing libxml2 details.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 6c8cd74e9d5f74591ad627932f0b272baa5dd115
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Mar 2 15:51:14 2023 +0100
compat-openssl: Add more build dependencies.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit ef30ff5574f55a774ab64ca5184834ae21e78d5f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 1 20:28:46 2023 +0100
openssl: Add more build dependencies.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 6d690cfabb3fb871748c66e3d225bcb41410c782
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 1 20:27:40 2023 +0100
perl-WWW-Curl: Add patchset to compile with newer curl.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 3d0728d40b72f48845394b7431078cc4aa08b998
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Mar 1 19:44:07 2023 +0100
dhcpcd: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
compat-openssl/compat-openssl.nm | 6 +-
dhcpcd/dhcpcd.nm | 82 ++++++++++++++++++++++
dhcpcd/dhcpcd.tmpfiles | 1 +
dhcpcd/systemd/dhcpcd@.service | 15 ++++
fontconfig/fontconfig.nm | 6 +-
gcc/gcc.nm | 3 +-
gmp/gmp.nm | 10 ++-
libmpc/libmpc.nm | 4 +-
mpfr/mpfr.nm | 2 +-
netpbm/netpbm.nm | 8 ++-
openldap/openldap.nm | 3 +-
openssl/openssl.nm | 7 +-
pam/pam.nm | 3 +-
perl-File-HomeDir/perl-File-HomeDir.nm | 18 +----
.../perl-File-Which.nm | 26 +++----
...ip-preprocessor-symbol-only-CURL_STRICTER.patch | 34 +++++++++
.../02-WWW-Curl-4.17-define-CURL-as-void.patch | 21 ++++++
...Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch | 41 +++++++++++
perl-WWW-Curl/perl-WWW-Curl.nm | 4 +-
19 files changed, 247 insertions(+), 47 deletions(-)
create mode 100644 dhcpcd/dhcpcd.nm
create mode 100644 dhcpcd/dhcpcd.tmpfiles
create mode 100644 dhcpcd/systemd/dhcpcd@.service
copy perl-File-Remove/perl-File-Remove.nm => perl-File-Which/perl-File-Which.nm (50%)
create mode 100644 perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
create mode 100644 perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch
create mode 100644 perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch
Difference in files:
diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm
index 6f38281f1..ae35bc356 100644
--- a/compat-openssl/compat-openssl.nm
+++ b/compat-openssl/compat-openssl.nm
@@ -5,7 +5,7 @@
name = compat-openssl
version = 1.1.1s
-release = 2
+release = 2.1
thisapp = openssl-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -27,6 +27,9 @@ build
bc
gnutls-devel
perl
+ perl(FindBin)
+ perl(File::Copy)
+ perl(File::Compare)
perl(Test::Harness)
util-linux
zlib-devel
@@ -49,6 +52,7 @@ build
build
./Configure \
--prefix=/usr \
+ --libdir=%{libdir} \
--openssldir=/etc/pki/tls \
shared \
zlib-dynamic \
diff --git a/dhcpcd/dhcpcd.nm b/dhcpcd/dhcpcd.nm
new file mode 100644
index 000000000..99c244498
--- /dev/null
+++ b/dhcpcd/dhcpcd.nm
@@ -0,0 +1,82 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = dhcpcd
+version = 9.4.1
+release = 1
+
+groups = Network/Base
+url = https://roy.marples.name/projects/dhcpcd/
+license = BSD
+summary = A DHCP and DHCPv6 client.
+
+description
+ dhcpcd is a DHCP and DHCPv6 client. It is currently the most feature-rich
+ open source DHCP client.
+end
+
+source_dl = https://roy.marples.name/downloads/dhcpcd/
+sources = %{thisapp}.tar.xz
+
+build
+ configure_options += \
+ --dbdir=%{sharedstatedir}/dhcpcd
+
+ prepare_cmds
+ %{create_user}
+ end
+
+ test
+ make test
+ end
+
+ install_cmds
+ # Assign db directory to the correct user and group.
+ chown dhcpcd:dhcpcd %{BUILDROOT}%{sharedstatedir}/dhcpcd
+ end
+end
+
+create_user
+ getent group dhcpcd >/dev/null || groupadd -r dhcpcd
+ getent passwd dhcpcd >/dev/null || useradd -r -g dhcpcd \
+ -d /var/lib/dhcpcd -s /sbin/nologin -c "DHCP client user" dhcpcd
+end
+
+packages
+ package %{name}
+ prerequires
+ shadow-utils
+ systemd-units
+ end
+
+ configfiles
+ %{sysconfdir}/dhcpcd.conf
+ end
+
+ datafiles
+ %{sharedstatedir}/dhcpcd
+ end
+
+ script prein
+ %{create_user}
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/dhcpcd/dhcpcd.tmpfiles b/dhcpcd/dhcpcd.tmpfiles
new file mode 100644
index 000000000..176366a65
--- /dev/null
+++ b/dhcpcd/dhcpcd.tmpfiles
@@ -0,0 +1 @@
+d /run/dhcpcd 0755 dhcpcd dhcpcd -
diff --git a/dhcpcd/systemd/dhcpcd@.service b/dhcpcd/systemd/dhcpcd@.service
new file mode 100644
index 000000000..3543e6c3d
--- /dev/null
+++ b/dhcpcd/systemd/dhcpcd@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd/%I.pid
+ExecStart=/usr/sbin/dhcpcd -q %I
+ExecStop=/usr/sbin/dhcpcd -x %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm
index 6dcd6dafb..ce9dc7489 100644
--- a/fontconfig/fontconfig.nm
+++ b/fontconfig/fontconfig.nm
@@ -5,7 +5,7 @@
name = fontconfig
version = 2.13.1
-release = 1
+release = 1.1
groups = System/Graphics
url = https://fontconfig.org/
@@ -58,6 +58,10 @@ packages
package %{name}-devel
template DEVEL
+
+ requires
+ libxml2-devel
+ end
end
package %{name}-debuginfo
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 2ac8665a3..4764ec0a5 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_graphite = 1
name = gcc
version = 12.2.0
-release = 2
+release = 2.1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Compilers
@@ -41,6 +41,7 @@ build
isl-devel >= 0.15
libffi-devel
libmpc-devel >= 1.0.1
+ libxcrypt-devel
mpfr-devel >= 3.1.0
perl
texinfo
diff --git a/gmp/gmp.nm b/gmp/gmp.nm
index 4b72d27a0..3e207b558 100644
--- a/gmp/gmp.nm
+++ b/gmp/gmp.nm
@@ -5,7 +5,7 @@
name = gmp
version = 6.2.1
-release = 1
+release = 1.1
groups = System/Libraries
url = https://gmplib.org/
@@ -31,11 +31,9 @@ build
m4
end
- export ABI = standard
-
- if "%{DISTRO_ARCH}" == "x86_64"
- ABI = 64
- end
+ # Set ABI to "64" because we currently only
+ # build for architectures which supports 64 Bits.
+ export ABI = 64
configure_options += \
--enable-cxx \
diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm
index 4e7dcd4f0..fb6aacc44 100644
--- a/libmpc/libmpc.nm
+++ b/libmpc/libmpc.nm
@@ -5,7 +5,7 @@
name = libmpc
version = 1.3.1
-release = 1
+release = 1.1
thisapp = mpc-%{version}
groups = System/Libraries
@@ -24,7 +24,7 @@ source_dl = https://ftp.gnu.org/gnu/mpc/
build
requires
gmp-devel >= 5.0.0
- mpfr-devel >= 4.0.0
+ mpfr-devel >= 4.1.0
end
configure_options += \
diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm
index a2df35ee2..01eb97db8 100644
--- a/mpfr/mpfr.nm
+++ b/mpfr/mpfr.nm
@@ -4,7 +4,7 @@
###############################################################################
name = mpfr
-version = 4.0.2
+version = 4.1.0
release = 1
groups = System/Libraries
diff --git a/netpbm/netpbm.nm b/netpbm/netpbm.nm
index 07c49295c..49488e5fa 100644
--- a/netpbm/netpbm.nm
+++ b/netpbm/netpbm.nm
@@ -4,11 +4,11 @@
###############################################################################
name = netpbm
-version = 10.73.41
+version = 10.73.42
release = 1
groups = System/Libraries
-url = http://netpbm.sourceforge.net/
+url = https://netpbm.sourceforge.net/
license = BSD and GPLv2 and IJG and MIT and Public Domain
summary = A library for handling different graphics file formats.
@@ -19,7 +19,7 @@ description
.ppm (portable pixmaps) and others.
end
-source_dl = https://netcologne.dl.sourceforge.net/project/netpbm/super_stable/%{version…
+source_dl = https://sourceforge.net/projects/netpbm/files/super_stable/%{version}/
sources = %{thisapp}.tgz
build
@@ -33,6 +33,8 @@ build
libtiff-devel
libxml2-devel
zlib-devel
+ perl
+ perl(English)
end
prepare_cmds
diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index 1faf968c1..d00727c8d 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -5,7 +5,7 @@
name = openldap
version = 2.6.3
-release = 1
+release = 1.1
groups = System/Daemons
url = https://www.openldap.org/
@@ -34,6 +34,7 @@ build
libdb-devel < 6
libtool
libtool-devel
+ libxcrypt-devel
openssl-devel
pth-devel
shadow-utils
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 1f3718377..e26aa3fba 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
name = openssl
version = 3.0.7
-release = 1
+release = 1.1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Libraries
@@ -26,9 +26,13 @@ build
ca-certificates
coreutils
perl
+ perl(FindBin)
+ perl(File::Compare)
+ perl(File::Copy)
perl(IPC::Cmd)
perl(Math::BigInt)
perl(Module::Load::Conditional)
+ perl(Pod::Html)
perl(Test::Harness)
perl(Test::More)
sed
@@ -53,6 +57,7 @@ build
build
./Configure \
--prefix=%{prefix} \
+ --libdir=%{libdir} \
--openssldir=%{sysconfdir}/pki/tls \
shared \
zlib \
diff --git a/pam/pam.nm b/pam/pam.nm
index de24a97fb..8a1b6741b 100644
--- a/pam/pam.nm
+++ b/pam/pam.nm
@@ -5,7 +5,7 @@
name = pam
version = 1.5.2
-release = 1
+release = 1.1
thisapp = Linux-PAM-%{version}
groups = System/Base
@@ -27,6 +27,7 @@ build
bison
cracklib-devel
flex
+ libxcrypt-devel
end
export LD_LIBRARY_PATH = %{DIR_APP}/libpam/.libs
diff --git a/perl-File-HomeDir/perl-File-HomeDir.nm b/perl-File-HomeDir/perl-File-HomeDir.nm
index 9045a38e6..406b08538 100644
--- a/perl-File-HomeDir/perl-File-HomeDir.nm
+++ b/perl-File-HomeDir/perl-File-HomeDir.nm
@@ -5,7 +5,7 @@
name = perl-File-HomeDir
version = 1.00
-release = 1
+release = 1.2
arch = noarch
thisapp = File-HomeDir-%{version}
@@ -28,10 +28,12 @@ build
perl
perl(Config)
perl(Cwd) >= 3.12
+ perl(FindBin)
perl(ExtUtils::MakeMaker) >= 6.42
perl(ExtUtils::MM_Unix)
perl(File::Path) >= 2.01
perl(File::Spec) >= 3.12
+ perl(Module::Install)
perl(strict)
perl(vars)
end
@@ -46,18 +48,4 @@ end
packages
package %{name}
- filter_requires
- Cwd
- File::Path
- File::Spec
- File::Temp
- File::Which
- Mac::perl
- Win32
- end
-
- requires
- perl
- end
- end
end
diff --git a/perl-File-Which/perl-File-Which.nm b/perl-File-Which/perl-File-Which.nm
new file mode 100644
index 000000000..76aa89001
--- /dev/null
+++ b/perl-File-Which/perl-File-Which.nm
@@ -0,0 +1,47 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-File-Which
+version = 1.27
+release = 1
+arch = noarch
+thisapp = File-Which-%{version}
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/File-Which/
+license = GPL+
+summary = Perl implementation of the which utility as an API.
+
+description
+ File::Which finds the full or relative paths to executable programs
+ on the system. This is normally the function of which utility.
+
+ which is typically implemented as either a program or a built in shell
+ command.
+end
+
+source_dl = https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/
+
+build
+ requires
+ perl(Env)
+ perl(ExtUtils::MakeMaker) >= 6.42
+ perl(ExtUtils::MM_Unix)
+ 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-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
new file mode 100644
index 000000000..34221c0d2
--- /dev/null
+++ b/perl-WWW-Curl/patches/01-WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
@@ -0,0 +1,34 @@
+From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Mon, 12 Sep 2016 14:40:44 +0200
+Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CURL_STRICTER leaked into curl-constants.c when building against
+curl-7.50.2. This is a preprocessor only macro without a value.
+
+CPAN RT#117793
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index f9170bb..ad2bd3d 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+ close H;
+
+ for my $e (sort @syms) {
+- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
+ next;
+ }
+ my ($group) = $e =~ m/^([^_]+_)/;
+--
+2.7.4
+
diff --git a/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch
new file mode 100644
index 000000000..1fa9b5457
--- /dev/null
+++ b/perl-WWW-Curl/patches/02-WWW-Curl-4.17-define-CURL-as-void.patch
@@ -0,0 +1,21 @@
+diff -up ./Curl.xs.orig ./Curl.xs
+--- ./Curl.xs.orig 2019-10-18 07:45:38.380881448 +0200
++++ ./Curl.xs 2019-10-18 07:46:20.712032844 +0200
+@@ -47,7 +47,7 @@ typedef enum {
+
+ typedef struct {
+ /* The main curl handle */
+- struct CURL *curl;
++ CURL *curl;
+ I32 *y;
+ /* Lists that can be set via curl_easy_setopt() */
+ struct curl_slist *slist[SLIST_LAST];
+@@ -73,7 +73,7 @@ typedef struct {
+ #ifdef __CURL_MULTI_H
+ struct CURLM *curlm;
+ #else
+- struct void *curlm;
++ void *curlm;
+ #endif
+ } perl_curl_multi;
+
diff --git a/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch
new file mode 100644
index 000000000..3d6829b0c
--- /dev/null
+++ b/perl-WWW-Curl/patches/03-WWW-Curl-4.17-Adapt-to-changes-in-cURL-7.69.0.patch
@@ -0,0 +1,41 @@
+From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Thu, 9 Apr 2020 14:31:05 +0200
+Subject: [PATCH] Adapt to changes in cURL 7.69.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and
+then added under a CURL_WIN32 name
+(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor
+macro for driving the C compiler, not a cURL option. Thus this fix
+ignores it.
+
+CURLOPT(na,t,nu) macro was added
+(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT()
+macro. It's not a cURL option. This fix also ignores it.
+
+CPAN RT#132197
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index ad2bd3d..b9e6a46 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
+ close H;
+
+ for my $e (sort @syms) {
+- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) {
+ next;
+ }
+ my ($group) = $e =~ m/^([^_]+_)/;
+--
+2.21.1
+
diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm
index 736a80ede..20619266a 100644
--- a/perl-WWW-Curl/perl-WWW-Curl.nm
+++ b/perl-WWW-Curl/perl-WWW-Curl.nm
@@ -5,7 +5,7 @@
name = perl-WWW-Curl
version = 4.17
-release = 1.1
+release = 1.2
thisapp = WWW-Curl-%{version}
groups = Development/Libraries
@@ -21,8 +21,10 @@ source_dl = http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/
build
requires
+ perl(FindBin)
perl(ExtUtils::MakeMaker)
perl(ExtUtils::ParseXS)
+ perl(Module::Install)
libcurl-devel
pakfire >= 0.9.26-3.1
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fb152933d3ff9a448256309f54cb30ff4193f9d5
by Michael Tremer 28 Feb '23
by Michael Tremer 28 Feb '23
28 Feb '23
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 fb152933d3ff9a448256309f54cb30ff4193f9d5 (commit)
via 862566343aae50782c24459cdb1b6969f2577347 (commit)
via 84bfae6076673e7fa0a52994acf1be1c6d664996 (commit)
via 92f2bdd0ca31f6255178503e9a1e875980afe3f2 (commit)
via 730a2c9082f7f1d60862968a541feadb550a3014 (commit)
via afd1cb3b9d87309929e5d0a8719677fce8d19bb1 (commit)
via 5ded395db0cc16e305a93e0b10f6f6e38a1a2af4 (commit)
from 239611d40f46cf161576bf9a1d1301b3a2909861 (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 fb152933d3ff9a448256309f54cb30ff4193f9d5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 18:06:44 2023 +0000
ca-certificates: Make this all build without Python 2 and Perl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 862566343aae50782c24459cdb1b6969f2577347
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 17:38:30 2023 +0000
dejagnu: Enable testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 84bfae6076673e7fa0a52994acf1be1c6d664996
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 17:37:51 2023 +0000
expect: Update to 5.45.4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92f2bdd0ca31f6255178503e9a1e875980afe3f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 17:25:40 2023 +0000
perl-SGMLSpm: Update to 1.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 730a2c9082f7f1d60862968a541feadb550a3014
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 17:19:29 2023 +0000
ipfire-logos: Fix download URL
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit afd1cb3b9d87309929e5d0a8719677fce8d19bb1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 28 17:19:12 2023 +0000
texinfo: Fix build by adding missing Perl modules
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5ded395db0cc16e305a93e0b10f6f6e38a1a2af4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 28 16:56:42 2023 +0100
perl-libintl-perl: Update to 1.33
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ca-certificates/ca-certificates.nm | 64 ++--
ca-certificates/certdata2pem.py | 355 +++++++++++++++++----
ca-certificates/generate-cacerts.pl | 347 --------------------
dejagnu/dejagnu.nm | 6 +-
expect/expect.nm | 37 +--
expect/patches/expect-5.32.2-random.patch | 19 --
expect/patches/expect-5.43.0-log_file.patch | 12 -
expect/patches/expect-5.43.0-pkgpath.patch | 46 ---
expect/patches/expect-5.45-check-telnet.patch | 29 --
expect/patches/expect-5.45-format-security.patch | 13 +
expect/patches/expect-5.45-man-page.patch | 13 -
.../expect-5.45-match-gt-numchars-segfault.patch | 17 -
expect/patches/expect-5.45-mkpasswd-dash.patch | 13 -
.../expect-5.45-passmass-su-full-path.patch | 12 -
ipfire-logos/ipfire-logos.nm | 2 +-
perl-SGMLSpm/perl-SGMLSpm.nm | 27 +-
perl-libintl-perl/perl-libintl-perl.nm | 6 +-
texinfo/texinfo.nm | 4 +-
18 files changed, 368 insertions(+), 654 deletions(-)
delete mode 100755 ca-certificates/generate-cacerts.pl
delete mode 100644 expect/patches/expect-5.32.2-random.patch
delete mode 100644 expect/patches/expect-5.43.0-log_file.patch
delete mode 100644 expect/patches/expect-5.43.0-pkgpath.patch
delete mode 100644 expect/patches/expect-5.45-check-telnet.patch
create mode 100644 expect/patches/expect-5.45-format-security.patch
delete mode 100644 expect/patches/expect-5.45-man-page.patch
delete mode 100644 expect/patches/expect-5.45-match-gt-numchars-segfault.patch
delete mode 100644 expect/patches/expect-5.45-mkpasswd-dash.patch
delete mode 100644 expect/patches/expect-5.45-passmass-su-full-path.patch
Difference in files:
diff --git a/ca-certificates/ca-certificates.nm b/ca-certificates/ca-certificates.nm
index e9b6d53ba..fadabdce0 100644
--- a/ca-certificates/ca-certificates.nm
+++ b/ca-certificates/ca-certificates.nm
@@ -5,7 +5,7 @@
name = ca-certificates
version = 2022.12
-release = 1
+release = 2
arch = noarch
groups = System/Base
@@ -24,32 +24,29 @@ sources =
build
requires
openssl
- perl
- rcs
+ p11-kit
+ python3
end
DIR_APP = %{DIR_SOURCE}
build
- # Create file layout.
+ # Create file layout
mkdir -pv certs
cp certdata.txt blacklist.txt certs
- cd certs
- python %{DIR_SOURCE}/certdata2pem.py
+ pushd certs
+ python3 %{DIR_SOURCE}/certdata2pem.py
+ popd
- cd ..
(cat <<EOF
# This is a bundle of X.509 certificates of public Certificate
# Authorities. It was generated from the Mozilla root CA list.
#
# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
#
- # Generated from:
EOF
- ident -q certdata.txt | sed '1d;s/^/#/';
-
- echo '#' ) > ca-bundle.crt
+ ) > ca-bundle.crt
(cat <<EOF
# This is a bundle of X.509 certificates of public Certificate
@@ -59,33 +56,30 @@ build
#
# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
#
- # Generated from:
EOF
- ident -q certdata.txt | sed '1d;s/^/#/';
- echo '#' ) > ca-bundle.trust.crt
-
- for f in certs/*.crt; do
- [ -z "${f}" ] && continue
-
- tbits=$(sed -n '/^# openssl-trust/{s/^.*=//;p;}' ${f})
- case "${tbits}" in
- *serverAuth*)
- openssl x509 -text -in "${f}" >> ca-bundle.crt
- ;;
- esac
-
- if [ -n "$tbits" ]; then
- targs=""
- for t in ${tbits}; do
- targs="${targs} -addtrust ${t}"
- done
-
- openssl x509 -text -in "${f}" -trustout $targs >> ca-bundle.trust.crt
- fi
+ ) > ca-bundle.trust.crt
+
+ # Collect all certs for p11-kit
+ for p in certs/*.tmp-p11-kit; do
+ cat "${p}" >> ca-bundle.trust.p11-kit
done
- perl generate-cacerts.pl /usr/bin/keytool ../ca-bundle.crt
- touch -r certdata.txt cacerts
+ trust extract \
+ --overwrite \
+ --comment \
+ --filter=certificates \
+ --format=openssl-bundle \
+ ca-bundle.trust
+ cat ca-bundle.trust >> ca-bundle.trust.crt
+
+ trust extract \
+ --overwrite \
+ --comment \
+ --filter=ca-anchors \
+ --format=pem-bundle \
+ --purpose=server-auth \
+ ca-bundle
+ cat ca-bundle >> ca-bundle.crt
end
install
diff --git a/ca-certificates/certdata2pem.py b/ca-certificates/certdata2pem.py
index c22946d38..a52ce9c74 100644
--- a/ca-certificates/certdata2pem.py
+++ b/ca-certificates/certdata2pem.py
@@ -4,6 +4,7 @@
# certdata2pem.py - splits certdata.txt into multiple files
#
# Copyright (C) 2009 Philipp Kern <pkern(a)debian.org>
+# Copyright (C) 2013 Kai Engert <kaie(a)redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,12 +26,17 @@ import os.path
import re
import sys
import textwrap
+import urllib.request, urllib.parse, urllib.error
+import subprocess
objects = []
+def printable_serial(obj):
+ return ".".join([str(x) for x in obj['CKA_SERIAL_NUMBER']])
+
# Dirty file parser.
in_data, in_multiline, in_obj = False, False, False
-field, type, value, obj = None, None, None, dict()
+field, ftype, value, binval, obj = None, None, None, bytearray(), dict()
for line in open('certdata.txt', 'r'):
# Ignore the file header.
if not in_data:
@@ -50,72 +56,55 @@ for line in open('certdata.txt', 'r'):
continue
if in_multiline:
if not line.startswith('END'):
- if type == 'MULTILINE_OCTAL':
+ if ftype == 'MULTILINE_OCTAL':
line = line.strip()
for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
- value += chr(int(i.group(1), 8))
+ integ = int(i.group(1), 8)
+ binval.extend((integ).to_bytes(1, sys.byteorder))
+ obj[field] = binval
else:
value += line
+ obj[field] = value
continue
- obj[field] = value
in_multiline = False
continue
if line.startswith('CKA_CLASS'):
in_obj = True
line_parts = line.strip().split(' ', 2)
if len(line_parts) > 2:
- field, type = line_parts[0:2]
+ field, ftype = line_parts[0:2]
value = ' '.join(line_parts[2:])
elif len(line_parts) == 2:
- field, type = line_parts
+ field, ftype = line_parts
value = None
else:
- raise NotImplementedError, 'line_parts < 2 not supported.'
- if type == 'MULTILINE_OCTAL':
+ raise NotImplementedError('line_parts < 2 not supported.\n' + line)
+ if ftype == 'MULTILINE_OCTAL':
in_multiline = True
value = ""
+ binval = bytearray()
continue
obj[field] = value
-if len(obj.items()) > 0:
+if len(list(obj.items())) > 0:
objects.append(obj)
-# Read blacklist.
-blacklist = []
-if os.path.exists('blacklist.txt'):
- for line in open('blacklist.txt', 'r'):
- line = line.strip()
- if line.startswith('#') or len(line) == 0:
- continue
- item = line.split('#', 1)[0].strip()
- blacklist.append(item)
-
# Build up trust database.
-trust = dict()
trustmap = dict()
for obj in objects:
-
if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
continue
- if obj['CKA_LABEL'] in blacklist:
- print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']
- elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_TRUSTED_DELEGATOR':
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_UNTRUSTED':
- print '!'*74
- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
- print '!'*74
- sys.exit(1)
- else:
- print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
- (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
- obj['CKA_TRUST_EMAIL_PROTECTION'])
- label = obj['CKA_LABEL']
- trustmap[label] = obj
- print " added cert", label
+ key = obj['CKA_LABEL'] + printable_serial(obj)
+ trustmap[key] = obj
+ print(" added trust", key)
+
+# Build up cert database.
+certmap = dict()
+for obj in objects:
+ if obj['CKA_CLASS'] != 'CKO_CERTIFICATE':
+ continue
+ key = obj['CKA_LABEL'] + printable_serial(obj)
+ certmap[key] = obj
+ print(" added cert", key)
def obj_to_filename(obj):
label = obj['CKA_LABEL'][1:-1]
@@ -124,9 +113,31 @@ def obj_to_filename(obj):
.replace('(', '=')\
.replace(')', '=')\
.replace(',', '_')
- label = re.sub(r'\\x[0-9a-fA-F]{2}', lambda m:chr(int(m.group(0)[2:], 16)), label)
- serial = ".".join(map(lambda x:str(ord(x)), obj['CKA_SERIAL_NUMBER']))
- return label + ":" + serial + ".crt"
+ labelbytes = bytearray()
+ i = 0
+ imax = len(label)
+ while i < imax:
+ if i < imax-3 and label[i] == '\\' and label[i+1] == 'x':
+ labelbytes.extend(bytes.fromhex(label[i+2:i+4]))
+ i += 4
+ continue
+ labelbytes.extend(str.encode(label[i]))
+ i = i+1
+ continue
+ label = labelbytes.decode('utf-8')
+ serial = printable_serial(obj)
+ return label + ":" + serial
+
+def write_cert_ext_to_file(f, oid, value, public_key):
+ f.write("[p11-kit-object-v1]\n")
+ f.write("label: ");
+ f.write(tobj['CKA_LABEL'])
+ f.write("\n")
+ f.write("class: x-certificate-extension\n");
+ f.write("object-id: " + oid + "\n")
+ f.write("value: \"" + value + "\"\n")
+ f.write("modifiable: false\n");
+ f.write(public_key)
trust_types = {
"CKA_TRUST_DIGITAL_SIGNATURE": "digital-signature",
@@ -147,6 +158,18 @@ trust_types = {
"CKA_TRUST_STEP_UP_APPROVED": "step-up-approved",
}
+legacy_trust_types = {
+ "LEGACY_CKA_TRUST_SERVER_AUTH": "server-auth",
+ "LEGACY_CKA_TRUST_CODE_SIGNING": "code-signing",
+ "LEGACY_CKA_TRUST_EMAIL_PROTECTION": "email-protection",
+}
+
+legacy_to_real_trust_types = {
+ "LEGACY_CKA_TRUST_SERVER_AUTH": "CKA_TRUST_SERVER_AUTH",
+ "LEGACY_CKA_TRUST_CODE_SIGNING": "CKA_TRUST_CODE_SIGNING",
+ "LEGACY_CKA_TRUST_EMAIL_PROTECTION": "CKA_TRUST_EMAIL_PROTECTION",
+}
+
openssl_trust = {
"CKA_TRUST_SERVER_AUTH": "serverAuth",
"CKA_TRUST_CLIENT_AUTH": "clientAuth",
@@ -154,29 +177,237 @@ openssl_trust = {
"CKA_TRUST_EMAIL_PROTECTION": "emailProtection",
}
-for obj in objects:
- if obj['CKA_CLASS'] == 'CKO_CERTIFICATE':
- print "producing cert file for " + obj['CKA_LABEL']
- if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
- print " -> untrusted, ignoring"
- continue
- fname = obj_to_filename(obj)
- f = open(fname, 'w')
+cert_distrust_types = {
+ "CKA_NSS_SERVER_DISTRUST_AFTER": "nss-server-distrust-after",
+ "CKA_NSS_EMAIL_DISTRUST_AFTER": "nss-email-distrust-after",
+}
+
+for tobj in objects:
+ if tobj['CKA_CLASS'] == 'CKO_NSS_TRUST':
+ key = tobj['CKA_LABEL'] + printable_serial(tobj)
+ print("producing trust for " + key)
trustbits = []
+ distrustbits = []
openssl_trustflags = []
- tobj = trustmap[obj['CKA_LABEL']]
- for t in trust_types.keys():
- if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ openssl_distrustflags = []
+ legacy_trustbits = []
+ legacy_openssl_trustflags = []
+ for t in list(trust_types.keys()):
+ if t in tobj and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
trustbits.append(t)
if t in openssl_trust:
openssl_trustflags.append(openssl_trust[t])
- f.write("# trust=" + " ".join(trustbits) + "\n")
- if openssl_trustflags:
- f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
- f.write("-----BEGIN CERTIFICATE-----\n")
- f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
- f.write("\n-----END CERTIFICATE-----\n")
- print " -> written as '%s', trust = %s, openssl-trust = %s" % (fname, trustbits, openssl_trustflags)
+ if t in tobj and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
+ distrustbits.append(t)
+ if t in openssl_trust:
+ openssl_distrustflags.append(openssl_trust[t])
+
+ for t in list(legacy_trust_types.keys()):
+ if t in tobj and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ real_t = legacy_to_real_trust_types[t]
+ legacy_trustbits.append(real_t)
+ if real_t in openssl_trust:
+ legacy_openssl_trustflags.append(openssl_trust[real_t])
+ if t in tobj and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
+ raise NotImplementedError('legacy distrust not supported.\n' + line)
+
+ fname = obj_to_filename(tobj)
+ try:
+ obj = certmap[key]
+ except:
+ obj = None
+
+ # optional debug code, that dumps the parsed input to files
+ #fulldump = "dump-" + fname
+ #dumpf = open(fulldump, 'w')
+ #dumpf.write(str(obj));
+ #dumpf.write(str(tobj));
+ #dumpf.close();
+
+ is_legacy = 0
+ if 'LEGACY_CKA_TRUST_SERVER_AUTH' in tobj or 'LEGACY_CKA_TRUST_EMAIL_PROTECTION' in tobj or 'LEGACY_CKA_TRUST_CODE_SIGNING' in tobj:
+ is_legacy = 1
+ if obj == None:
+ raise NotImplementedError('found legacy trust without certificate.\n' + line)
+
+ legacy_fname = "legacy-default/" + fname + ".crt"
+ f = open(legacy_fname, 'w')
+ f.write("# alias=%s\n"%tobj['CKA_LABEL'])
+ f.write("# trust=" + " ".join(legacy_trustbits) + "\n")
+ if legacy_openssl_trustflags:
+ f.write("# openssl-trust=" + " ".join(legacy_openssl_trustflags) + "\n")
+ f.write("-----BEGIN CERTIFICATE-----\n")
+ temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
+ temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
+ f.write("\n".join(temp_wrapped))
+ f.write("\n-----END CERTIFICATE-----\n")
+ f.close()
+
+ if 'CKA_TRUST_SERVER_AUTH' in tobj or 'CKA_TRUST_EMAIL_PROTECTION' in tobj or 'CKA_TRUST_CODE_SIGNING' in tobj:
+ legacy_fname = "legacy-disable/" + fname + ".crt"
+ f = open(legacy_fname, 'w')
+ f.write("# alias=%s\n"%tobj['CKA_LABEL'])
+ f.write("# trust=" + " ".join(trustbits) + "\n")
+ if openssl_trustflags:
+ f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
+ f.write("-----BEGIN CERTIFICATE-----\n")
+ f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
+ f.write("\n-----END CERTIFICATE-----\n")
+ f.close()
+
+ # don't produce p11-kit output for legacy certificates
+ continue
+
+ pk = ''
+ cert_comment = ''
+ if obj != None:
+ # must extract the public key from the cert, let's use openssl
+ cert_fname = "cert-" + fname
+ fc = open(cert_fname, 'w')
+ fc.write("-----BEGIN CERTIFICATE-----\n")
+ temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
+ temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
+ fc.write("\n".join(temp_wrapped))
+ fc.write("\n-----END CERTIFICATE-----\n")
+ fc.close();
+ pk_fname = "pubkey-" + fname
+ fpkout = open(pk_fname, "w")
+ dump_pk_command = ["openssl", "x509", "-in", cert_fname, "-noout", "-pubkey"]
+ subprocess.call(dump_pk_command, stdout=fpkout)
+ fpkout.close()
+ with open (pk_fname, "r") as myfile:
+ pk=myfile.read()
+ # obtain certificate information suitable as a comment
+ comment_fname = "comment-" + fname
+ fcout = open(comment_fname, "w")
+ comment_command = ["openssl", "x509", "-in", cert_fname, "-noout", "-text"]
+ subprocess.call(comment_command, stdout=fcout)
+ fcout.close()
+ sed_command = ["sed", "--in-place", "s/^/#/", comment_fname]
+ subprocess.call(sed_command)
+ with open (comment_fname, "r", errors = 'replace') as myfile:
+ cert_comment=myfile.read()
+
+ fname += ".tmp-p11-kit"
+ f = open(fname, 'w')
+
+ if obj != None:
+ is_distrusted = False
+ has_server_trust = False
+ has_email_trust = False
+ has_code_trust = False
+
+ if 'CKA_TRUST_SERVER_AUTH' in tobj:
+ if tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED':
+ is_distrusted = True
+ elif tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ has_server_trust = True
+
+ if 'CKA_TRUST_EMAIL_PROTECTION' in tobj:
+ if tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED':
+ is_distrusted = True
+ elif tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ has_email_trust = True
+
+ if 'CKA_TRUST_CODE_SIGNING' in tobj:
+ if tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED':
+ is_distrusted = True
+ elif tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ has_code_trust = True
+
+ if is_distrusted:
+ trust_ext_oid = "1.3.6.1.4.1.3319.6.10.1"
+ trust_ext_value = "0.%06%0a%2b%06%01%04%01%99w%06%0a%01%04 0%1e%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
+ write_cert_ext_to_file(f, trust_ext_oid, trust_ext_value, pk)
+
+ trust_ext_oid = "2.5.29.37"
+ if has_server_trust:
+ if has_email_trust:
+ if has_code_trust:
+ # server + email + code
+ trust_ext_value = "0%2a%06%03U%1d%25%01%01%ff%04 0%1e%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
+ else:
+ # server + email
+ trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01"
+ else:
+ if has_code_trust:
+ # server + code
+ trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
+ else:
+ # server
+ trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%01"
+ else:
+ if has_email_trust:
+ if has_code_trust:
+ # email + code
+ trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%03"
+ else:
+ # email
+ trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%04"
+ else:
+ if has_code_trust:
+ # code
+ trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%03"
+ else:
+ # none
+ trust_ext_value = "0%18%06%03U%1d%25%01%01%ff%04%0e0%0c%06%0a%2b%06%01%04%01%99w%06%0a%10"
+
+ # no 2.5.29.37 for neutral certificates
+ if (is_distrusted or has_server_trust or has_email_trust or has_code_trust):
+ write_cert_ext_to_file(f, trust_ext_oid, trust_ext_value, pk)
+
+ pk = ''
+ f.write("\n")
+
+ f.write("[p11-kit-object-v1]\n")
+ f.write("label: ");
+ f.write(tobj['CKA_LABEL'])
+ f.write("\n")
+ if is_distrusted:
+ f.write("x-distrusted: true\n")
+ elif has_server_trust or has_email_trust or has_code_trust:
+ f.write("trusted: true\n")
+ else:
+ f.write("trusted: false\n")
+
+ # requires p11-kit >= 0.23.4
+ f.write("nss-mozilla-ca-policy: true\n")
+ f.write("modifiable: false\n");
+ # requires p11-kit >= 0.23.19
+ for t in list(cert_distrust_types.keys()):
+ if t in obj:
+ value = obj[t]
+ if value == 'CK_FALSE':
+ value = bytearray(1)
+ f.write(cert_distrust_types[t] + ": \"")
+ f.write(urllib.parse.quote(value));
+ f.write("\"\n")
+ f.write("-----BEGIN CERTIFICATE-----\n")
+ temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
+ temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
+ f.write("\n".join(temp_wrapped))
+ f.write("\n-----END CERTIFICATE-----\n")
+ f.write(cert_comment)
+ f.write("\n")
+ else:
+ f.write("[p11-kit-object-v1]\n")
+ f.write("label: ");
+ f.write(tobj['CKA_LABEL']);
+ f.write("\n")
+ f.write("class: certificate\n")
+ f.write("certificate-type: x-509\n")
+ f.write("modifiable: false\n");
+ f.write("issuer: \"");
+ f.write(urllib.parse.quote(tobj['CKA_ISSUER']));
+ f.write("\"\n")
+ f.write("serial-number: \"");
+ f.write(urllib.parse.quote(tobj['CKA_SERIAL_NUMBER']));
+ f.write("\"\n")
+ if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'):
+ f.write("x-distrusted: true\n")
+ f.write("\n\n")
+ f.close()
+ print(" -> written as '%s', trust = %s, openssl-trust = %s, distrust = %s, openssl-distrust = %s" % (fname, trustbits, openssl_trustflags, distrustbits, openssl_distrustflags))
diff --git a/ca-certificates/generate-cacerts.pl b/ca-certificates/generate-cacerts.pl
deleted file mode 100755
index 18602663d..000000000
--- a/ca-certificates/generate-cacerts.pl
+++ /dev/null
@@ -1,347 +0,0 @@
-#!/usr/bin/perl -w
-
-use diagnostics;
-use Fcntl;
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
- if ($cert =~ "Certificate:\n")
- {
- print "New certificate...\n";
- }
- elsif ($cert =~ /Subject: /)
- {
- $_ = $cert;
- if ($cert =~ /personal-freemail/)
- {
- $cert_alias = "thawtepersonalfreemailca";
- }
- elsif ($cert =~ /personal-basic/)
- {
- $cert_alias = "thawtepersonalbasicca";
- }
- elsif ($cert =~ /personal-premium/)
- {
- $cert_alias = "thawtepersonalpremiumca";
- }
- elsif ($cert =~ /server-certs/)
- {
- $cert_alias = "thawteserverca";
- }
- elsif ($cert =~ /premium-server/)
- {
- $cert_alias = "thawtepremiumserverca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass1ca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass1g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 1 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass1g3ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass2ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass2g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 2 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass2g3ca";
- }
- elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass3ca";
- }
- # Version 1 of Class 3 Public Primary Certification Authority
- # - G2 is added. Version 3 is excluded. See below.
- elsif ($cert =~ /Class 3 Public Primary Certification Authority - G2.*1998/)
- {
- $cert_alias = "verisignclass3g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 3 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass3g3ca";
- }
- elsif ($cert =~
- /RSA Data Security.*Secure Server Certification Authority/)
- {
- $cert_alias = "rsaserverca";
- }
- elsif ($cert =~ /GTE CyberTrust Global Root/)
- {
- $cert_alias = "gtecybertrustglobalca";
- }
- elsif ($cert =~ /Baltimore CyberTrust Root/)
- {
- $cert_alias = "baltimorecybertrustca";
- }
- elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
- {
- $cert_alias = "entrustclientca";
- }
- elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
- {
- $cert_alias = "entrustglobalclientca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS_2048/)
- {
- $cert_alias = "entrust2048ca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS incorp /)
- {
- $cert_alias = "entrustsslca";
- }
- elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
- {
- $cert_alias = "entrustgsslca";
- }
- elsif ($cert =~ /The Go Daddy Group/)
- {
- $cert_alias = "godaddyclass2ca";
- }
- elsif ($cert =~ /Starfield Class 2 Certification Authority/)
- {
- $cert_alias = "starfieldclass2ca";
- }
- elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
- {
- $cert_alias = "valicertclass2ca";
- }
- elsif ($cert =~ /GeoTrust Global CA$/)
- {
- $cert_alias = "geotrustglobalca";
- }
- elsif ($cert =~ /Equifax Secure Certificate Authority/)
- {
- $cert_alias = "equifaxsecureca";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureebusinessca1";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
- {
- $cert_alias = "equifaxsecureebusinessca2";
- }
- elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureglobalebusinessca1";
- }
- elsif ($cert =~ /Sonera Class1 CA/)
- {
- $cert_alias = "soneraclass1ca";
- }
- elsif ($cert =~ /Sonera Class2 CA/)
- {
- $cert_alias = "soneraclass2ca";
- }
- elsif ($cert =~ /AAA Certificate Services/)
- {
- $cert_alias = "comodoaaaca";
- }
- elsif ($cert =~ /AddTrust Class 1 CA Root/)
- {
- $cert_alias = "addtrustclass1ca";
- }
- elsif ($cert =~ /AddTrust External CA Root/)
- {
- $cert_alias = "addtrustexternalca";
- }
- elsif ($cert =~ /AddTrust Qualified CA Root/)
- {
- $cert_alias = "addtrustqualifiedca";
- }
- elsif ($cert =~ /UTN-USERFirst-Hardware/)
- {
- $cert_alias = "utnuserfirsthardwareca";
- }
- elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
- {
- $cert_alias = "utnuserfirstclientauthemailca";
- }
- elsif ($cert =~ /UTN - DATACorp SGC/)
- {
- $cert_alias = "utndatacorpsgcca";
- }
- elsif ($cert =~ /UTN-USERFirst-Object/)
- {
- $cert_alias = "utnuserfirstobjectca";
- }
- elsif ($cert =~ /America Online Root Certification Authority 1/)
- {
- $cert_alias = "aolrootca1";
- }
- elsif ($cert =~ /DigiCert Assured ID Root CA/)
- {
- $cert_alias = "digicertassuredidrootca";
- }
- elsif ($cert =~ /DigiCert Global Root CA/)
- {
- $cert_alias = "digicertglobalrootca";
- }
- elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
- {
- $cert_alias = "digicerthighassuranceevrootca";
- }
- elsif ($cert =~ /GlobalSign Root CA$/)
- {
- $cert_alias = "globalsignca";
- }
- elsif ($cert =~ /GlobalSign Root CA - R2/)
- {
- $cert_alias = "globalsignr2ca";
- }
- elsif ($cert =~ /Elektronik.*Kas.*2005/)
- {
- $cert_alias = "extra-elektronikkas2005";
- }
- elsif ($cert =~ /Muntaner 244 Barcelona.*Firmaprofesional/)
- {
- $cert_alias = "extra-oldfirmaprofesional";
- }
- # Mozilla does not provide these certificates:
- # baltimorecodesigningca
- # gtecybertrust5ca
- # trustcenterclass2caii
- # trustcenterclass4caii
- # trustcenteruniversalcai
- else
- {
- # Generate an alias using the OU and CN attributes of the
- # Subject field if both are present, otherwise use only the
- # CN attribute. The Subject field must have either the OU
- # or the CN attribute.
- $_ = $cert;
- if ($cert =~ /OU=/)
- {
- s/Subject:.*?OU=//;
- # Remove other occurrences of OU=.
- s/OU=.*CN=//;
- # Remove CN= if there were not other occurrences of OU=.
- s/CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- elsif ($cert =~ /CN=/)
- {
- s/Subject:.*CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- s/\W//g;
- tr/A-Z/a-z/;
- $cert_alias = "extra-$_";
- }
- print "$cert => alias $cert_alias\n";
- }
- elsif ($cert =~ "Signature Algorithm: ecdsa")
- {
- # Ignore ECC certs since keytool rejects them
- $write_current_cert = 0;
- print " => ignoring ECC certificate\n";
- }
- elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
- {
- if ($in_cert_block != 0)
- {
- die "FAIL: $file is malformed.";
- }
- $in_cert_block = 1;
- if ($write_current_cert == 1)
- {
- $pem_file_count++;
- if (!sysopen(PEM, "$cert_alias.pem", O_WRONLY|O_CREAT|O_EXCL)) {
- $cert_alias = "$cert_alias.1";
- sysopen(PEM, "$cert_alias.1.pem", O_WRONLY|O_CREAT|O_EXCL)
- || die("FAIL: could not open file for $cert_alias.pem: $!");
- }
- print PEM $cert;
- print " => writing $cert_alias.pem...\n";
- }
- }
- elsif ($cert eq "-----END CERTIFICATE-----\n")
- {
- $in_cert_block = 0;
- if ($write_current_cert == 1)
- {
- print PEM $cert;
- close(PEM);
- }
- $write_current_cert = 1
- }
- else
- {
- if ($in_cert_block == 1 && $write_current_cert == 1)
- {
- print PEM $cert;
- }
- }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
- print "$pem_file_count != ".@pem_files."\n";
- die "FAIL: Number of .pem files produced does not match".
- " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
- print "+ Adding $pem_file...\n";
- if (system("$ARGV[0] -import".
- " -alias `basename $pem_file .pem`".
- " -keystore cacerts -noprompt -storepass 'changeit' -file $pem_file") == 0) {
- $certs_written_count++;
- } else {
- print "FAILED\n";
- }
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
- die "FAIL: Number of certs added to keystore does not match".
- " number of certs read from $file.";
-}
diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
index b043d0644..1f95e0104 100644
--- a/dejagnu/dejagnu.nm
+++ b/dejagnu/dejagnu.nm
@@ -5,7 +5,7 @@
name = dejagnu
version = 1.6.3
-release = 1
+release = 1.1
arch = noarch
groups = Development/Tools
@@ -24,6 +24,10 @@ build
bison
expect
end
+
+ test
+ make check
+ end
end
packages
diff --git a/expect/expect.nm b/expect/expect.nm
index 0c098a379..af7658c1d 100644
--- a/expect/expect.nm
+++ b/expect/expect.nm
@@ -4,12 +4,12 @@
###############################################################################
name = expect
-version = 5.45
-release = 2
+version = 5.45.4
+release = 1
thisapp = %{name}%{version}
groups = Development/Languages
-url = http://expect.nist.gov/
+url = https://core.tcl-lang.org/expect/index
license = Public Domain
summary = A program-script interaction and testing utility.
@@ -20,26 +20,14 @@ description
control another program and interact with it.
end
-source_dl = http://downloads.sourceforge.net/project/expect/Expect/%{version}/
+source_dl = https://downloads.sourceforge.net/project/expect/Expect/%{version}/
build
requires
- autoconf
- automake
- chrpath
tcl-devel
end
- prepare_cmds
- aclocal
- autoconf
-
- cd testsuite
- autoconf -I..
- end
-
configure_options += \
- --mandir=%{mandir} \
--with-tcl=%{libdir} \
--with-tclinclude=%{includedir} \
--enable-shared
@@ -49,19 +37,10 @@ build
end
install_cmds
- # Install lib to right location.
- mkdir -pv %{BUILDROOT}%{libdir}
- mv -v %{BUILDROOT}/%{libdir}/tcl*/expect%{version}/libexpect%{version}.so \
- %{BUILDROOT}%{libdir}
- ln -svf libexpect%{version}.so %{BUILDROOT}%{libdir}/libexpect.so
-
- # Remove rpath.
- chrpath --delete %{BUILDROOT}%{libdir}/libexpect%{version}.so
-
- # remove cryptdir/decryptdir, as Linux has no crypt command
- rm -f %{BUILDROOT}/usr/bin/{cryptdir,decryptdir}
- rm -f %{BUILDROOT}/usr/share/man1/{cryptdir,decryptdir}.1*
- rm -f %{BUILDROOT}/usr/bin/autopasswd
+ # Remove cryptdir/decryptdir, as Linux has no crypt command
+ rm -vf %{BUILDROOT}/usr/bin/{cryptdir,decryptdir}
+ rm -vf %{BUILDROOT}/usr/share/man1/{cryptdir,decryptdir}.1*
+ rm -vf %{BUILDROOT}/usr/bin/autopasswd
end
end
diff --git a/expect/patches/expect-5.32.2-random.patch b/expect/patches/expect-5.32.2-random.patch
deleted file mode 100644
index 0cac29449..000000000
--- a/expect/patches/expect-5.32.2-random.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up expect-5.44.1.15/example/mkpasswd.orig expect-5.44.1.15/example/mkpasswd
---- expect-5.44.1.15/example/mkpasswd.orig 2010-03-08 16:01:05.518378075 +0100
-+++ expect-5.44.1.15/example/mkpasswd 2010-03-08 16:01:27.408388162 +0100
-@@ -92,7 +92,14 @@ proc insert {pvar char} {
- }
-
- proc rand {m} {
-- expr {int($m*rand())}
-+ set device /dev/urandom ;# /dev/random can block
-+ set fileId [open $device r]
-+ binary scan [read $fileId 4] i1 number
-+ set clipped [expr $number % $m]
-+# puts "number is $number"
-+# puts "clipped is $clipped"
-+ close $fileId
-+ return $clipped
- }
-
- # choose left or right starting hand
diff --git a/expect/patches/expect-5.43.0-log_file.patch b/expect/patches/expect-5.43.0-log_file.patch
deleted file mode 100644
index 8a2c93dc4..000000000
--- a/expect/patches/expect-5.43.0-log_file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up expect-5.44.1.15/exp_log.c.orig expect-5.44.1.15/exp_log.c
---- expect-5.44.1.15/exp_log.c.orig 2010-03-08 15:45:20.581378309 +0100
-+++ expect-5.44.1.15/exp_log.c 2010-03-08 15:45:38.838398279 +0100
-@@ -374,7 +374,7 @@ expDiagChannelOpen(interp,filename)
- Tcl_DStringAppend(&tsdPtr->diagFilename,filename,-1);
- }
-
-- tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0777);
-+ tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0666);
- if (!tsdPtr->diagChannel) {
- Tcl_DStringFree(&tsdPtr->diagFilename);
- return TCL_ERROR;
diff --git a/expect/patches/expect-5.43.0-pkgpath.patch b/expect/patches/expect-5.43.0-pkgpath.patch
deleted file mode 100644
index 0c32a1f9f..000000000
--- a/expect/patches/expect-5.43.0-pkgpath.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -up expect5.45/configure.in.orig expect5.45/configure.in
---- expect5.45/configure.in.orig 2011-01-18 16:58:14.860806442 +0100
-+++ expect5.45/configure.in 2011-01-18 16:58:30.378753210 +0100
-@@ -977,6 +977,7 @@ AC_SUBST(EXP_CC_SEARCH_FLAGS)
- AC_SUBST(SETUID)
- AC_SUBST(SETPGRP_VOID)
- AC_SUBST(DEFAULT_STTY_ARGS)
-+AC_SUBST(TCL_VERSION)
- # Expect uses these from tclConfig.sh to make the main executable
- AC_SUBST(TCL_DL_LIBS)
- AC_SUBST(TCL_CC_SEARCH_FLAGS)
-diff -up expect5.45/Makefile.in.orig expect5.45/Makefile.in
---- expect5.45/Makefile.in.orig 2011-01-18 16:58:37.787723824 +0100
-+++ expect5.45/Makefile.in 2011-01-18 17:05:10.697636907 +0100
-@@ -121,8 +121,8 @@ includedir = @includedir@
- DESTDIR =
-
- PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
--pkgdatadir = $(datadir)/$(PKG_DIR)
--pkglibdir = $(libdir)/$(PKG_DIR)
-+pkgdatadir = $(datadir)/tcl@TCL_VERSION@/$(PKG_DIR)
-+pkglibdir = $(libdir)/tcl@TCL_VERSION@/$(PKG_DIR)
- pkgincludedir = $(includedir)/$(PKG_DIR)
-
- top_builddir = .
-@@ -263,7 +263,7 @@ install-doc: doc
- else true; fi ; \
- done
-
--test: binaries libraries
-+test: binaries libraries pkgIndex.tcl-test
- $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
-
- shell: binaries libraries
-@@ -331,6 +331,11 @@ pkgIndex.tcl:
- pkgIndex.tcl-hand:
- (echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
- echo 'package ifneeded Expect $(PACKAGE_VERSION) \
-+ [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
-+ ) > pkgIndex.tcl
-+
-+pkgIndex.tcl-test:
-+ (echo 'package ifneeded Expect $(PACKAGE_VERSION) \
- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
- ) > pkgIndex.tcl
-
diff --git a/expect/patches/expect-5.45-check-telnet.patch b/expect/patches/expect-5.45-check-telnet.patch
deleted file mode 100644
index 0b67dc664..000000000
--- a/expect/patches/expect-5.45-check-telnet.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up expect5.45/example/passmass.orig expect5.45/example/passmass
---- expect5.45/example/passmass.orig 2011-07-27 16:09:31.013843393 +0200
-+++ expect5.45/example/passmass 2011-07-27 16:10:55.667843578 +0200
-@@ -107,6 +107,10 @@ for {set i 0} {$i<$argc} {incr i} {
- set login "ssh"
- continue
- } "-telnet" {
-+ if {[file executable /usr/bin/telnet] == 0} {
-+ send_user "It seems that telnet is not installed. Please install telnet in order to use the script with this option.\n"
-+ exit 1
-+ }
- set login "telnet"
- continue
- } "-program" {
-diff -up expect5.45/example/weather.orig expect5.45/example/weather
---- expect5.45/example/weather.orig 2011-07-27 15:49:57.878843862 +0200
-+++ expect5.45/example/weather 2011-07-27 16:08:48.067843491 +0200
-@@ -33,6 +33,11 @@ set timeout 60
-
- set env(TERM) vt100 ;# actual value doesn't matter, just has to be set
-
-+if {[file executable /usr/bin/telnet] == 0} {
-+ send_user "It seems that telnet is not installed. Please install telnet in order to use this script.\n"
-+ exit 1
-+}
-+
- spawn telnet rainmaker.wunderground.com 3000
- while {1} {
- expect timeout {
diff --git a/expect/patches/expect-5.45-format-security.patch b/expect/patches/expect-5.45-format-security.patch
new file mode 100644
index 000000000..5b621ff35
--- /dev/null
+++ b/expect/patches/expect-5.45-format-security.patch
@@ -0,0 +1,13 @@
+--- a/exp_clib.c.orig 2017-03-24 10:34:37.269183513 -0400
++++ b/exp_clib.c 2017-03-24 10:34:41.171117943 -0400
+@@ -1938,8 +1938,8 @@
+ char *str;
+ {
+ if (exp_is_debugging) {
+- fprintf(stderr,str);
+- if (exp_logfile) fprintf(exp_logfile,str);
++ fprintf(stderr, "%s", str);
++ if (exp_logfile) fprintf(exp_logfile, "%s", str);
+ }
+ }
+
diff --git a/expect/patches/expect-5.45-man-page.patch b/expect/patches/expect-5.45-man-page.patch
deleted file mode 100644
index 1a55251e2..000000000
--- a/expect/patches/expect-5.45-man-page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up expect5.45/expect.man.orig expect5.45/expect.man
---- expect5.45/expect.man.orig 2011-09-06 13:15:57.081827720 +0200
-+++ expect5.45/expect.man 2011-09-06 13:16:19.463826364 +0200
-@@ -173,7 +173,8 @@ way, use the
- .B \-b
- flag.
- (When using Expectk, this option is specified as
--.BR \-buffer .) Note that stdio-buffering may still take place however this shouldn't cause problems when reading from a fifo or stdin.
-+.BR \-buffer .)
-+Note that stdio-buffering may still take place however this shouldn't cause problems when reading from a fifo or stdin.
- .PP
- If the string "\-" is supplied as a filename, standard input is read instead.
- (Use "./\-" to read from a file actually named "\-".)
diff --git a/expect/patches/expect-5.45-match-gt-numchars-segfault.patch b/expect/patches/expect-5.45-match-gt-numchars-segfault.patch
deleted file mode 100644
index 1abd42464..000000000
--- a/expect/patches/expect-5.45-match-gt-numchars-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up expect5.45/expect.c.orig expect5.45/expect.c
---- expect5.45/expect.c.orig 2012-02-06 14:15:13.469490744 +0100
-+++ expect5.45/expect.c 2012-02-06 14:16:23.596837896 +0100
-@@ -2363,7 +2363,12 @@ expMatchProcess(
-
- /* "!e" means no case matched - transfer by default */
- if (!e || e->transfer) {
-- int remainder = numchars-match;
-+ int remainder;
-+ if (match > numchars) {
-+ match = numchars;
-+ eo->matchlen = match;
-+ }
-+ remainder = numchars-match;
- /* delete matched chars from input buffer */
- esPtr->printed -= match;
- if (numchars != 0) {
diff --git a/expect/patches/expect-5.45-mkpasswd-dash.patch b/expect/patches/expect-5.45-mkpasswd-dash.patch
deleted file mode 100644
index fbdecde95..000000000
--- a/expect/patches/expect-5.45-mkpasswd-dash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up expect5.45/example/mkpasswd.orig expect5.45/example/mkpasswd
---- expect5.45/example/mkpasswd.orig 2011-03-16 13:23:23.125480017 +0100
-+++ expect5.45/example/mkpasswd 2011-03-16 13:24:08.739353139 +0100
-@@ -202,7 +202,8 @@ if {[info exists user]} {
- expect {
- "assword*:" {
- # some systems say "Password (again):"
-- send "$password\r"
-+ send -- "$password\r"
-+ # "--" because of passwords beginning with dash
- exp_continue
- }
- }
diff --git a/expect/patches/expect-5.45-passmass-su-full-path.patch b/expect/patches/expect-5.45-passmass-su-full-path.patch
deleted file mode 100644
index 6febf944f..000000000
--- a/expect/patches/expect-5.45-passmass-su-full-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up expect5.45/example/passmass.orig expect5.45/example/passmass
---- expect5.45/example/passmass.orig 2011-09-06 13:04:41.439875491 +0200
-+++ expect5.45/example/passmass 2011-09-06 13:04:54.663874571 +0200
-@@ -178,7 +178,7 @@ for {set i 0} {$i<$argc} {incr i} {
- }
-
- if ($su) {
-- send "su -\r"
-+ send "/bin/su -\r"
- expect -nocase "password:"
- send "$password(old)\r"
- expect "# "
diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
index 9c18f2eda..78f4781fa 100644
--- a/ipfire-logos/ipfire-logos.nm
+++ b/ipfire-logos/ipfire-logos.nm
@@ -19,7 +19,7 @@ description
IPFire distribution.
end
-source_dl = http://source.ipfire.org/releases/%{name}/
+source_dl = https://source.ipfire.org/releases/%{name}/
build
requires
diff --git a/perl-SGMLSpm/perl-SGMLSpm.nm b/perl-SGMLSpm/perl-SGMLSpm.nm
index 4590ed9ba..bc03dd3e8 100644
--- a/perl-SGMLSpm/perl-SGMLSpm.nm
+++ b/perl-SGMLSpm/perl-SGMLSpm.nm
@@ -4,8 +4,9 @@
###############################################################################
name = perl-SGMLSpm
-version = 1.03ii
+version = 1.1
release = 1
+thisapp = SGMLSpm-%{version}
arch = noarch
groups = Development/Libraries
@@ -18,24 +19,20 @@ description
documents into new formats.
end
-source_dl = http://www.cpan.org/authors/id/D/DM/DMEGG/
-
-thisapp = SGMLSpm-%{version}
+source_dl = https://cpan.metacpan.org/authors/id/R/RA/RAAB/
build
- DIR_APP = %{DIR_SRC}/SGMLSpm
-
- build = # Nothing to do.
+ requires
+ perl(ExtUtils::MakeMaker)
+ end
- install
- # Create directory layout.
- mkdir -pv %{BUILDROOT}/usr/bin
- mkdir -pv %{BUILDROOT}/usr/share/perl5
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
- # Install the module.
- make install_system \
- BINDIR=%{BUILDROOT}/usr/bin/ \
- PERL5DIR=%{BUILDROOT}/usr/share/perl5/
+ test
+ make test
end
end
diff --git a/perl-libintl-perl/perl-libintl-perl.nm b/perl-libintl-perl/perl-libintl-perl.nm
index e1f5b6790..f7cd25eec 100644
--- a/perl-libintl-perl/perl-libintl-perl.nm
+++ b/perl-libintl-perl/perl-libintl-perl.nm
@@ -4,8 +4,8 @@
###############################################################################
name = perl-libintl-perl
-version = 1.23
-release = 2.1
+version = 1.33
+release = 1
thisapp = libintl-perl-%{version}
groups = Development/Libraries
@@ -24,7 +24,9 @@ source_dl = http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/
build
requires
/usr/bin/xsubpp
+ perl(locale)
perl(ExtUtils::MakeMaker)
+ perl(Test::More)
pakfire >= 0.9.26-3.1
end
diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm
index 166d68e1d..ec54bbe18 100644
--- a/texinfo/texinfo.nm
+++ b/texinfo/texinfo.nm
@@ -5,7 +5,7 @@
name = texinfo
version = 7.0.1
-release = 1
+release = 1.1
groups = Applications/Publishing
url = https://www.gnu.org/software/texinfo/
@@ -25,6 +25,8 @@ build
help2man
ncurses-devel
perl(Data::Dumper)
+ perl(File::Copy)
+ perl(Unicode::Normalize)
perl-libintl-perl
zlib-devel
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 239611d40f46cf161576bf9a1d1301b3a2909861
by Michael Tremer 28 Feb '23
by Michael Tremer 28 Feb '23
28 Feb '23
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 239611d40f46cf161576bf9a1d1301b3a2909861 (commit)
from 829f4ceac2643e59b966d225014d37fe7d46c08c (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 239611d40f46cf161576bf9a1d1301b3a2909861
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 27 17:14:07 2023 +0000
apr-util: Fix download URL
The Apache Foundation seems to take older releases down, so we have to
download them from an archive mirror.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
apr-util/apr-util.nm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm
index 62e95450a..2ec720d16 100644
--- a/apr-util/apr-util.nm
+++ b/apr-util/apr-util.nm
@@ -5,7 +5,7 @@
name = apr-util
version = 1.6.1
-release = 2
+release = 2.1
groups = System/Libraries
url = https://apr.apache.org/
@@ -18,7 +18,7 @@ description
portability layer to as many operating systems as possible.
end
-source_dl = https://www.apache.org/dist/apr/
+source_dl = https://archive.apache.org/dist/apr/
build
requires
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 829f4ceac2643e59b966d225014d37fe7d46c08c
by Michael Tremer 28 Feb '23
by Michael Tremer 28 Feb '23
28 Feb '23
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 829f4ceac2643e59b966d225014d37fe7d46c08c (commit)
via 15f907e92703d0c1ea42b2ad35a506ec157a18a3 (commit)
via 888723e00e0c07dfc7c598743996433807f971b7 (commit)
via 20f53c675b5cbed9fb859dc3bafc295c8e625589 (commit)
via fe9a39f784a19a513a43ba0a026c70b311aece9d (commit)
from 6d8de48dc362c66728983fbdcf837cade512eb81 (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 829f4ceac2643e59b966d225014d37fe7d46c08c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 28 11:23:47 2023 +0100
kea: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 15f907e92703d0c1ea42b2ad35a506ec157a18a3
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 28 11:23:46 2023 +0100
log4cplus: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 888723e00e0c07dfc7c598743996433807f971b7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Feb 27 19:46:09 2023 +0100
compat-icu: Update to 56.1
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20f53c675b5cbed9fb859dc3bafc295c8e625589
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Feb 27 19:03:25 2023 +0100
icu: Update to 72.1
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fe9a39f784a19a513a43ba0a026c70b311aece9d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Feb 27 17:31:47 2023 +0100
python3-sdbus: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
compat-icu/compat-icu.nm | 8 +-
compat-icu/patches/icu-test-twodigityear.patch2 | 13 ---
icu/icu.nm | 4 +-
kea/kea.nm | 113 +++++++++++++++++++++
kea/kea.tmpfiles | 1 +
.../kea-2.2.0-configure-fix-python3-version.patch | 12 +++
kea/systemd/kea-ctrl-agent.service | 13 +++
kea/systemd/kea-dhcp-ddns.service | 13 +++
kea/systemd/kea-dhcp4.service | 13 +++
kea/systemd/kea-dhcp6.service | 13 +++
apr/apr.nm => log4cplus/log4cplus.nm | 22 ++--
.../python3-sdbus.nm | 24 ++---
12 files changed, 205 insertions(+), 44 deletions(-)
delete mode 100644 compat-icu/patches/icu-test-twodigityear.patch2
create mode 100644 kea/kea.nm
create mode 100644 kea/kea.tmpfiles
create mode 100644 kea/patches/kea-2.2.0-configure-fix-python3-version.patch
create mode 100644 kea/systemd/kea-ctrl-agent.service
create mode 100644 kea/systemd/kea-dhcp-ddns.service
create mode 100644 kea/systemd/kea-dhcp4.service
create mode 100644 kea/systemd/kea-dhcp6.service
copy apr/apr.nm => log4cplus/log4cplus.nm (56%)
copy python3-parted/python3-parted.nm => python3-sdbus/python3-sdbus.nm (59%)
Difference in files:
diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm
index 47e24d4f4..8ca0f6ac5 100644
--- a/compat-icu/compat-icu.nm
+++ b/compat-icu/compat-icu.nm
@@ -5,9 +5,9 @@
name = compat-icu
version = %{ver_major}.%{ver_minor}.%{ver_plevel}
-ver_major = 50
+ver_major = 56
ver_minor = 1
-ver_plevel = 2
+ver_plevel =
release = 1
thisapp = icu-%{version}
@@ -20,8 +20,8 @@ description
Tools and utilities for developing with icu.
end
-source_dl = http://download.icu-project.org/files/icu4c/%{version}/
-sources = icu4c-%{ver_major}_%{ver_minor}_%{ver_plevel}-src.tgz
+source_dl = https://github.com/unicode-org/icu/releases/download/release-%{ver_major}-%…
+sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz
build
DIR_APP = %{DIR_SRC}/icu/source
diff --git a/compat-icu/patches/icu-test-twodigityear.patch2 b/compat-icu/patches/icu-test-twodigityear.patch2
deleted file mode 100644
index fba90b5d3..000000000
--- a/compat-icu/patches/icu-test-twodigityear.patch2
+++ /dev/null
@@ -1,13 +0,0 @@
-In the year 2034 ...
-http://sourceforge.net/p/icu/mailman/message/32443311/
---- icu.orig/source/test/intltest/dtfmttst.cpp 2013-10-04 22:48:00.000000000 +0200
-+++ icu/source/test/intltest/dtfmttst.cpp 2014-06-13 19:34:40.611299572 +0200
-@@ -1129,7 +1129,7 @@
- return;
- }
- parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5));
-- parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4));
-+ parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4));
- }
-
- // -------------------------------------
diff --git a/icu/icu.nm b/icu/icu.nm
index 39b7b8339..dea5445b3 100644
--- a/icu/icu.nm
+++ b/icu/icu.nm
@@ -5,7 +5,7 @@
name = icu
version = %{ver_major}.%{ver_minor}
-ver_major = 56
+ver_major = 72
ver_minor = 1
ver_plevel =
release = 1
@@ -19,7 +19,7 @@ description
Tools and utilities for developing with icu.
end
-source_dl = http://download.icu-project.org/files/icu4c/%{version}/
+source_dl = https://github.com/unicode-org/icu/releases/download/release-%{ver_major}-%…
sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz
build
diff --git a/kea/kea.nm b/kea/kea.nm
new file mode 100644
index 000000000..c4e23a23f
--- /dev/null
+++ b/kea/kea.nm
@@ -0,0 +1,113 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = kea
+version = 2.3.5
+release = 1
+
+groups = System/Daemons
+url = http://kea.isc.org
+license = MPLv2.0 and Boost
+summary = DHCPv4, DHCPv6 and DDNS server from ISC
+
+description
+ DHCP implementation from Internet Systems Consortium, Inc. that features
+ fully functional DHCPv4, DHCPv6 and Dynamic DNS servers.
+
+ Both DHCP servers fully support server discovery, address assignment,
+ renewal, rebinding and release. The DHCPv6 server supports prefix delegation.
+ Both servers support DNS Update mechanism, using stand-alone DDNS daemon.
+end
+
+source_dl = https://ftp.isc.org/isc/kea/%{version}/
+sources = %{thisapp}.tar.gz
+
+build
+ requires
+ gcc-c++
+ bison
+ boost-devel
+ flex
+ log4cplus-devel
+ openssl-devel
+ end
+
+ configure_options += \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --disable-silent-rules \
+ --disable-static \
+ --enable-generate-parser \
+ --enable-shell \
+ --with-openssl \
+ --with-log4cplus
+
+ install_cmds
+ # Start empty lease databases
+ mkdir -pv %{BUILDROOT}%{sharedstatedir}/kea/
+ touch %{BUILDROOT}%{sharedstatedir}/kea/kea-leases4.csv
+ touch %{BUILDROOT}%{sharedstatedir}/kea/kea-leases6.csv
+ end
+end
+
+packages
+ package %{name}
+ prerequires
+ systemd
+ end
+
+ configfiles
+ %{sysconfdir}/kea/kea-ctrl-agent.conf
+ %{sysconfdir}/kea/kea-dhcp-ddns.conf
+ %{sysconfdir}/kea/kea-dhcp4.conf
+ %{sysconfdir}//kea/kea-dhcp6.conf
+ %{sysconfdir}/kea/keactrl.conf
+ end
+
+ datafiles
+ %{sharedstatedir}/kea/kea-leases4.csv
+ %{sharedstatedir}/kea/kea-leases6.csv
+ end
+
+ script postin
+ /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script preun
+ /usr/bin/systemctl --no-reload disable kea-ctrl-agent.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl --no-reload disable kea-dhcp4.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl --no-reload disable kea-dhcp6.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl --no-reload disable kea-dhcp-ddns.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl stop kea-ctrl-agent.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl stop kea-dhcp4.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl stop kea-dhcp6.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl stop kea-dhcp-ddns.service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart kea-ctrl-agent.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart kea-dhcp4.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart kea-dhcp6.service >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart kea-dhcp-ddns.service >/dev/null 2>&1 || :
+ end
+ end
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/kea/kea.tmpfiles b/kea/kea.tmpfiles
new file mode 100644
index 000000000..0b3abeb75
--- /dev/null
+++ b/kea/kea.tmpfiles
@@ -0,0 +1 @@
+d /run/kea 0755 root root -
diff --git a/kea/patches/kea-2.2.0-configure-fix-python3-version.patch b/kea/patches/kea-2.2.0-configure-fix-python3-version.patch
new file mode 100644
index 000000000..97a3f3aa1
--- /dev/null
+++ b/kea/patches/kea-2.2.0-configure-fix-python3-version.patch
@@ -0,0 +1,12 @@
+diff -Nur a/configure b/configure
+--- a/configure 2023-02-28 07:56:13.629233758 +0000
++++ b/configure 2023-02-28 07:53:19.994816726 +0000
+@@ -22765,7 +22765,7 @@
+ if ${am_cv_python_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
diff --git a/kea/systemd/kea-ctrl-agent.service b/kea/systemd/kea-ctrl-agent.service
new file mode 100644
index 000000000..b5c860ca7
--- /dev/null
+++ b/kea/systemd/kea-ctrl-agent.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea Control Agent
+Documentation=man:kea-ctrl-agent(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp-ddns.service b/kea/systemd/kea-dhcp-ddns.service
new file mode 100644
index 000000000..5fdbe0bbf
--- /dev/null
+++ b/kea/systemd/kea-dhcp-ddns.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCP-DDNS Server
+Documentation=man:kea-dhcp-ddns(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp-ddns -c /etc/kea/kea-dhcp-ddns.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp4.service b/kea/systemd/kea-dhcp4.service
new file mode 100644
index 000000000..0a72768f3
--- /dev/null
+++ b/kea/systemd/kea-dhcp4.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv4 Server
+Documentation=man:kea-dhcp4(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kea/systemd/kea-dhcp6.service b/kea/systemd/kea-dhcp6.service
new file mode 100644
index 000000000..e1fc05a34
--- /dev/null
+++ b/kea/systemd/kea-dhcp6.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kea DHCPv6 Server
+Documentation=man:kea-dhcp6(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+
+[Service]
+ExecStart=/usr/sbin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf
+Environment=KEA_PIDFILE_DIR=/var/run/kea
+
+[Install]
+WantedBy=multi-user.target
diff --git a/log4cplus/log4cplus.nm b/log4cplus/log4cplus.nm
new file mode 100644
index 000000000..5bcec4f3f
--- /dev/null
+++ b/log4cplus/log4cplus.nm
@@ -0,0 +1,40 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = log4cplus
+version = 2.0.8
+release = 1
+
+groups = System/Libraries
+url = http://sourceforge.net/projects/log4cplus
+license = ASL 2.0
+summary = Logging Framework for C++
+
+description
+ log4cplus is a simple to use C++ logging API providing thread-safe, flexible,
+ and arbitrarily granular control over log management and configuration. It is
+ modeled after the Java log4j API.
+end
+
+source_dl = http://downloads.sourceforge.net/%{name}/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ gcc-c++
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/python3-sdbus/python3-sdbus.nm b/python3-sdbus/python3-sdbus.nm
new file mode 100644
index 000000000..5411a16ea
--- /dev/null
+++ b/python3-sdbus/python3-sdbus.nm
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = python3-sdbus
+version = 0.11.0
+release = 1
+thisapp = python-sdbus-%{version}
+
+groups = System/Libraries
+url = https://github.com/python-sdbus/python-sdbus
+license = LGPL2.1 and GPL2
+summary = Modern Python bindings for D-Bus
+
+description
+ A modern python library for D-Bus, based on the fast sd-bus
+ from systemd.
+end
+
+source_dl = https://github.com/python-sdbus/python-sdbus/archive/refs/tags/%{version}.t…
+
+build
+ requires
+ python3-devel
+ python3-setuptools
+ systemd-devel
+ end
+
+ build
+ %{python3} setup.py build
+ end
+
+ install
+ %{python3} setup.py install --root=%{BUILDROOT}
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6d8de48dc362c66728983fbdcf837cade512eb81
by Michael Tremer 28 Feb '23
by Michael Tremer 28 Feb '23
28 Feb '23
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 6d8de48dc362c66728983fbdcf837cade512eb81 (commit)
via d544855a885c7f6bfb529cbec055f93eed7e6392 (commit)
from c1bf5bac2e923287642e0485c34cd811115047ca (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 6d8de48dc362c66728983fbdcf837cade512eb81
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 20 17:26:08 2023 +0000
u-boot: Drop package
We won't provide any pre-built u-boot images any more and instead
require all ARM systems to support EFI boot.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d544855a885c7f6bfb529cbec055f93eed7e6392
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 20 16:59:06 2023 +0000
cyrus-sasl: Require libxcrypt
Since libcrypt has been removed from glibc, we need to add this extra
dependency.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
cyrus-sasl/cyrus-sasl.nm | 3 +-
u-boot/patches/u-boot-fat.patch | 12 -----
u-boot/patches/uboot-omap-fit.patch | 9 ----
u-boot/targets | 7 ---
u-boot/u-boot.nm | 94 -------------------------------------
5 files changed, 2 insertions(+), 123 deletions(-)
delete mode 100644 u-boot/patches/u-boot-fat.patch
delete mode 100644 u-boot/patches/uboot-omap-fit.patch
delete mode 100644 u-boot/targets
delete mode 100644 u-boot/u-boot.nm
Difference in files:
diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index 004cf213e..1ede85d0a 100644
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -5,7 +5,7 @@
name = cyrus-sasl
version = 2.1.28
-release = 2
+release = 3
groups = System/Libraries
url = https://github.com/cyrusimap/cyrus-sasl
@@ -24,6 +24,7 @@ build
requires
automake
gdbm-devel
+ libxcrypt-devel
openssl-devel
pam-devel
end
diff --git a/u-boot/patches/u-boot-fat.patch b/u-boot/patches/u-boot-fat.patch
deleted file mode 100644
index 1aa90bdb2..000000000
--- a/u-boot/patches/u-boot-fat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr u-boot-2012.04.01.orig/fs/fat/fat.c u-boot-2012.04.01/fs/fat/fat.c
---- u-boot-2012.04.01.orig/fs/fat/fat.c 2012-04-25 08:22:50.000000000 -0500
-+++ u-boot-2012.04.01/fs/fat/fat.c 2012-06-19 14:06:16.605337811 -0500
-@@ -90,7 +90,7 @@
- /* Check for FAT12/FAT16/FAT32 filesystem */
- if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
- return 0;
-- if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5))
-+ if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT", 3))
- return 0;
-
- cur_dev = NULL;
diff --git a/u-boot/patches/uboot-omap-fit.patch b/u-boot/patches/uboot-omap-fit.patch
deleted file mode 100644
index cdcc79bee..000000000
--- a/u-boot/patches/uboot-omap-fit.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- u-boot-2012.07/include/configs/omap4_common.h.orig 2013-01-24 00:20:40.334731642 -0600
-+++ u-boot-2012.07/include/configs/omap4_common.h 2013-01-24 00:21:08.708953803 -0600
-@@ -280,4 +280,6 @@
-
- #define CONFIG_SYS_THUMB_BUILD
-
-+#define CONFIG_FIT
-+
- #endif /* __CONFIG_OMAP4_COMMON_H */
diff --git a/u-boot/targets b/u-boot/targets
deleted file mode 100644
index ce81d234b..000000000
--- a/u-boot/targets
+++ /dev/null
@@ -1,7 +0,0 @@
-# HOST_ARCH platform targets
-# --------------------------------------------
-armv5tel dreamplug u-boot.bin u-boot.kwb
-armv7hl omap4_panda u-boot.bin u-boot.img
-armv7hl wandboard_solo u-boot.imx
-armv7hl wandboard_dl u-boot.imx
-armv7hl wandboard_quad u-boot.imx
diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm
deleted file mode 100644
index 25be430fb..000000000
--- a/u-boot/u-boot.nm
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = u-boot
-version = 2013.07
-release = 1
-sup_arches = armv5tel armv7hl
-
-groups = Development/Tools
-url = http://www.denx.de/wiki/U-Boot
-license = GPLv2+
-summary = U-Boot utilities.
-
-description
- U-Boot is a Boot Loader, i.e. its primary purpose in the shipping
- system is to load some operating system.
-end
-
-source_dl = ftp://ftp.denx.de/pub/u-boot/
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- dtc
- end
-
- build
- while read arch platform targets; do
- # Skip all other architectures.
- [ "${arch}" = "%{DISTRO_ARCH}" ] || continue
-
- make CROSS_COMPILE="" ${platform}_config
- make HOSTCC="gcc %{CFLAGS}" CROSS_COMPILE="" all ${targets}
-
- # install
- installdir="%{BUILDROOT}/usr/lib/%{name}/${platform}"
- mkdir -pv ${installdir}
-
- for target in ${targets}; do
- install -D -m 644 ${target} ${installdir}
- done
- if [ -e "MLO" ]; then
- install -D -m 644 MLO ${installdir}
- fi
- for f in spl/*.bin; do
- [ -e "${f}" ] || continue
- install -D -m 644 ${f} ${installdir}
- done
-
- # Clean out the build environment.
- make distclean
- done < %{DIR_SOURCE}/targets
-
- # Build tools.
- # Need to create a config because the tools won't build without.
- make sheevaplug_config
-
- make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE=""
- make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true"
- end
-
- install
- # Install tools.
- mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1
- install -p -m 0755 tools/mkimage %{BUILDROOT}/usr/bin
- install -p -m 0644 doc/mkimage.1 %{BUILDROOT}/usr/share/man/man1
- install -p -m 0755 tools/env/fw_printenv %{BUILDROOT}/usr/bin
- ln -svf fw_printenv %{BUILDROOT}/usr/bin/fw_setenv
- end
-end
-
-packages
- package %{name}
-
- package %{name}-tools
- summary = U-Boot utilities.
- description
- This package contains a few U-Boot utilities - mkimage
- for creating boot images and fw_printenv/fw_setenv for
- manipulating the boot environment variables.
- end
-
- files
- /usr/bin
- /usr/share/man/man1
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c1bf5bac2e923287642e0485c34cd811115047ca
by Michael Tremer 27 Feb '23
by Michael Tremer 27 Feb '23
27 Feb '23
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 c1bf5bac2e923287642e0485c34cd811115047ca (commit)
from fc6dde1b2688c5c47a192f4b00bb34b753042d6e (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 c1bf5bac2e923287642e0485c34cd811115047ca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 27 13:41:57 2023 +0000
systemd: Require libxcrypt and replace Python 2 dependencies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
systemd/systemd.nm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 5e3d69cb2..9bcefa3a7 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
name = systemd
version = 252
-release = 2
+release = 2.1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = System/Base
@@ -56,6 +56,7 @@ build
libmount-devel >= 2.34-2
libseccomp-devel
libuuid-devel >= 2.34-2
+ libxcrypt-devel
m4
meson >= 0.50.1
ninja >= 1.9.0
@@ -228,11 +229,11 @@ packages
requires
dbus
hwdata
- python-cairo
- python-dbus
- python-gobject3
- %{name}-libs=%{thisver}
- util-linux>=2.19
+ python3-cairo
+ python3-dbus
+ python3-gobject3
+ %{name}-libs = %{thisver}
+ util-linux >= 2.19
end
provides
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fc6dde1b2688c5c47a192f4b00bb34b753042d6e
by Michael Tremer 27 Feb '23
by Michael Tremer 27 Feb '23
27 Feb '23
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(a)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(a)ipfire.org>
commit bec6c06b4292574a0626c0ab9c6970ce4334c0a3
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit faba01b7ec73569ca41cb9ce4e43eeae0d55e1ea
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c07dc4897dc9b9de519a7582ac2f87482fa68e5a
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 64e12cd80f313fee585486ca4eb0a920f2617c91
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 39a49de8176360df8fc3ff60a7b8a38189d93047
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 04548a24a71ed479916d08da80142ad84bbdb52e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 20:19:00 2023 +0100
perl-YAML-Tiny: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 860ec8126e3435a16558bb38ea3cb939de61a17c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 20:18:59 2023 +0100
perl-File-Remove: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3e54c61523254617e41608f2ff903f30d606fbf5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 20:18:58 2023 +0100
perl-Module-Install: New package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6498abdfa9dbea9cdee373c41f5ea01283450499
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e3ecbd961eda5cdbe4cd5626bf68dda4bbf7ffe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 27 12:46:37 2023 +0000
popt: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2d0e2d4408a62c229730263cce04f8ea5336d06d
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 09a15e603ae6d1afb91fcb11e2b0edcfe430b667
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 13:21:41 2023 +0100
popt: Update to 1.19
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e46113aa90d77df1bd44d853cedb4ee2b7634791
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 13:20:57 2023 +0100
tree: Install files into correct location
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e8ddf6762b8deee17f23f5b718f7bbf42147c74e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 13:19:58 2023 +0100
asciidoc: Update to 10.20.0
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fcd6608da254acea34c611e849b25f4e36a84710
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 13:19:05 2023 +0100
linux-atm: Drop package
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 03be1032f1cb4b6b1ce4dfc04dab9472b6aa1f5f
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8ec58cde07d6dadf05a450e184de39ce1c4662f4
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 79c21bd79921dadc81272d09e4db61c0bee40f3f
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cbf71b690198c429ccb7ef4807c8e1e8fb935a2d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 26 10:05:22 2023 +0100
autoconf: Add build and runtime dependencies.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6d3995d101496b2ed934937405808311a7c035e5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 12:52:08 2023 +0000
libxml2: Disable building against Python 2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 28a15510abbe91ea0a6987c2dfd65e5ed259b8d5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 12:43:44 2023 +0000
lzo: Update to 2.10
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c1de5a4b0d736cb1e7e9002ee93e7ac0fae95b65
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5ddd2088820bc389471c65e82410b3fed123976e
Author: Stefan Schantl <stefan.schantl(a)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(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)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/%{name}-py/asciidoc-py/archive/%{version}/
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(a)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(a)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/%{name}/
-
-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(a)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(a)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(a)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(a)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
1
0