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@ipfire.org Date: Sat Mar 4 14:42:59 2023 +0000
libtevent: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0897b92ca6b6481155f4e6df8a68d2cb32840630 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:42:45 2023 +0000
libtdb: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 418f550baedc081f04b2668de6b01e8bbed9fa9e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:39:35 2023 +0000
libtalloc: Depend on libxcrypt-devel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4704797f6205f55772f13b792f1ae97192631bee Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:36:55 2023 +0000
libpng: Disable building static libraries
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d0d758e19f54be96d21ed68fa8a57b80708f536c Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:33:09 2023 +0000
liboping: Fix some string formatting errors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f0103f6acb0e4de2202916b74449b30378180445 Author: Michael Tremer michael.tremer@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@ipfire.org
commit 0c361451ca20cc65b60fe9918d71422792e38b05 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:28:09 2023 +0000
libunwind: Disable building static libraries
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e92c488ead69cac605882cdbcfa16c7735a4306b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:27:28 2023 +0000
libnftnl: Drop dependency on autogen
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8d32419ac0bee698f685a08515e32d9803e4893b Author: Michael Tremer michael.tremer@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@ipfire.org
commit af3514d0f7351cb67b30e548dcfa6e540ecde093 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 4 13:59:54 2023 +0000
libunwind: Remove brocken symlink
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0b6ddf60fb16095b3d9ddb3e2d6ef84114c73d86 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:12:30 2023 +0000
ldapvi: Link against libxcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fd83b39371962e1031e6a491ad83eed6abfbd33a Author: Michael Tremer michael.tremer@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@ipfire.org
commit 7aa9388cb06b16bf2733d4681c894e8b3a70c979 Author: Michael Tremer michael.tremer@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@ipfire.org
commit d05006f4a0b4b60b584c603d17ad811be422ebb7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 4 14:11:03 2023 +0000
libxml2: Build Python 3 module
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c57f113c700d412527dfaacfaefb1f7109be8d2a Author: Michael Tremer michael.tremer@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@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@gnome.org. + # Copyright (c) 2009 Claude Paroz claude@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@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@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