From 1089111142e7df96e14b2113235860cc4e7fa54e Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Sun, 13 Feb 2022 22:52:53 +0100 Subject: [PATCH] Redirect links to xmlsoft.org Documentation and releases are now available on gitlab.gnome.org. --- CMakeLists.txt | 2 +- NEWS | 9 --------- README | 6 +++--- doc/devhelp/html.xsl | 9 ++------- doc/devhelp/index.html | 9 ++------- doc/docdescr.doc | 2 +- doc/news.xsl | 3 --- doc/tutorial/ar01s02.html | 10 +++++----- doc/tutorial/ar01s04.html | 4 ++-- doc/tutorial/ar01s05.html | 2 +- doc/tutorial/ar01s06.html | 2 +- doc/tutorial/ar01s07.html | 2 +- doc/tutorial/ar01s08.html | 2 +- doc/tutorial/index.html | 2 +- doc/tutorial/xmltutorial.xml | 28 ++++++++++++++-------------- doc/xmlcatalog_man.xml | 4 ++-- doc/xmllint.xml | 6 +----- doc/xsa.xsl | 2 +- libxml.m4 | 3 +-- libxml.spec.in | 6 +++--- libxml2.doap | 1 - python/README | 8 ++++---- python/setup.py.in | 2 +- win32/libxml2.rc | 2 +- xmllint.c | 3 +-- 25 files changed, 50 insertions(+), 79 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e1aa08d..66928673 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ set(PACKAGE_BUGREPORT "xml@gnome.org") set(PACKAGE_NAME "libxml2") set(PACKAGE_STRING "libxml2 ${VERSION}") set(PACKAGE_TARNAME "libxml2") -set(PACKAGE_URL "http://www.xmlsoft.org/") +set(PACKAGE_URL "https://gitlab.gnome.org/GNOME/libxml2") set(PACKAGE_VERSION ${VERSION}) if(LIBLZMA_FOUND) diff --git a/NEWS b/NEWS index b55c63b2..dfd769b4 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,6 @@ NEWS file for libxml2 - Note that this is automatically generated from the news webpage at: - http://xmlsoft.org/news.html - -The change log at -ChangeLog.html - describes the recents commits -to the GIT at -https://gitlab.gnome.org/GNOME/libxml2 - code base.Here is the list of public releases: v2.9.9: Jan 03 2019: - Security: CVE-2018-9251 CVE-2018-14567 Fix infinite loop in LZMA decompression (Nick Wellnhofer), diff --git a/README b/README index 49575178..9bffc5eb 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ XML toolkit from the GNOME project Full documentation is available on-line at - http://xmlsoft.org/ + https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home This code is released under the MIT Licence see the Copyright file. @@ -22,8 +22,8 @@ To assert build quality: the proper functioning of libxml2 main APIs while testapi does a full coverage check. Report failures to the list. -To report bugs, follow the instructions at: - http://xmlsoft.org/bugs.html +Bugs should be reported at: + https://gitlab.gnome.org/GNOME/libxml2/-/issues A mailing-list xml@gnome.org is available, to subscribe: http://mail.gnome.org/mailman/listinfo/xml diff --git a/doc/devhelp/html.xsl b/doc/devhelp/html.xsl index 1720b298..da22621e 100644 --- a/doc/devhelp/html.xsl +++ b/doc/devhelp/html.xsl @@ -561,8 +561,8 @@ under the MIT License. XML itself is a metalanguage to design markup languages, i.e. text language where semantic and structure are added to the content using extra "markup" information enclosed between angle brackets. HTML is the most -well-known markup language. Though the library is written in C a variety of language bindings make it available in -other environments.

+well-known markup language. Though the library is written in C, a variety of +language bindings make it available in other environments.

Libxml2 implements a number of existing standards related to markup languages:

-

As a result the libxml2 API is very - large. If you get lost searching for some specific API use - the online search - engine hosted on xmlsoft.org - the libxml2 and libxslt project page.

diff --git a/doc/devhelp/index.html b/doc/devhelp/index.html index 26c2839b..ae6c49ee 100644 --- a/doc/devhelp/index.html +++ b/doc/devhelp/index.html @@ -31,8 +31,8 @@ under the MIT License. XML itself is a metalanguage to design markup languages, i.e. text language where semantic and structure are added to the content using extra "markup" information enclosed between angle brackets. HTML is the most -well-known markup language. Though the library is written in C a variety of language bindings make it available in -other environments.

+well-known markup language. Though the library is written in C, a variety of +language bindings make it available in other environments.

Libxml2 implements a number of existing standards related to markup languages:

-

As a result the libxml2 API is very - large. If you get lost searching for some specific API use - the online search - engine hosted on xmlsoft.org - the libxml2 and libxslt project page.

diff --git a/doc/docdescr.doc b/doc/docdescr.doc index 3fec94a1..38a65000 100644 --- a/doc/docdescr.doc +++ b/doc/docdescr.doc @@ -47,7 +47,7 @@ libxml-doc.el Control script for displaying docs under emacs Given the above files, the generation of the complete documentation (as -provided on the web by xmlsoft.org) can be created with the following steps: +provided on the web) can be created with the following steps: NOTE: Steps 1 through 7 are performed with the command "make rebuild"; Steps 3 and 5 through 7 are performed with the command "make all" diff --git a/doc/news.xsl b/doc/news.xsl index 50089eb8..97b8e54a 100644 --- a/doc/news.xsl +++ b/doc/news.xsl @@ -8,9 +8,6 @@ NEWS file for libxml2 - Note that this is automatically generated from the news webpage at: - http://xmlsoft.org/news.html - diff --git a/doc/tutorial/ar01s02.html b/doc/tutorial/ar01s02.html index 1e30a98b..8aebcec3 100644 --- a/doc/tutorial/ar01s02.html +++ b/doc/tutorial/ar01s02.html @@ -2,13 +2,13 @@ will encounter repeatedly, hiding the messy stuff so you do not have to deal with it unless you have some specific need.

-xmlChar

A basic replacement for char, a byte in a UTF-8 encoded +xmlChar

A basic replacement for char, a byte in a UTF-8 encoded string. If your data uses another encoding, it must be converted to UTF-8 for use with libxml's - functions. More information on encoding is available on the libxml encoding support web page.

- xmlDoc

A structure containing the tree created by a parsed doc. xmlDocPtr + functions. More information on encoding is available on the libxml encoding support web page.

+ xmlDoc

A structure containing the tree created by a parsed doc. xmlDocPtr is a pointer to the structure.

-xmlNodePtr - and xmlNode

A structure containing a single node. xmlNodePtr +xmlNodePtr + and xmlNode

A structure containing a single node. xmlNodePtr is a pointer to the structure, and is used in traversing the document tree.

Prev Up Next
Libxml Tutorial Home Parsing the file
diff --git a/doc/tutorial/ar01s04.html b/doc/tutorial/ar01s04.html index 11492ebf..1acad38e 100644 --- a/doc/tutorial/ar01s04.html +++ b/doc/tutorial/ar01s04.html @@ -23,7 +23,7 @@ Retrieving the content of an element involves traversing the document is the element that will contain the "keywords" we are looking for. It uses the libxml string comparison - function, xmlStrcmp. If there is a match, it calls the function parseStory.

+ function, xmlStrcmp. If there is a match, it calls the function parseStory.

 void
@@ -48,7 +48,7 @@ parseStory (xmlDocPtr doc, xmlNodePtr cur) {
 	    its contents. Remember that in XML, the text
 	    contained within an element is a child node of that element, so we
 	    turn to cur->xmlChildrenNode. To retrieve it, we
-	    use the function xmlNodeListGetString, which also takes the doc pointer as an argument. In this case, we just print it out.
[Note]Note
Because xmlNodeListGetString allocates
+	    use the function xmlNodeListGetString, which also takes the doc pointer as an argument. In this case, we just print it out.
[Note]Note
Because xmlNodeListGetString allocates
 	      memory for the string it returns, you must use
 	      xmlFree to free it.

     
Prev Up Next
Parsing the file Home Using XPath to Retrieve Element Content

diff --git a/doc/tutorial/ar01s05.html b/doc/tutorial/ar01s05.html
index 1c409252..919d4544 100644
--- a/doc/tutorial/ar01s05.html
+++ b/doc/tutorial/ar01s05.html
@@ -2,7 +2,7 @@
     Libxml2 includes support for
       use of XPath expressions to retrieve sets of
       nodes that match a specified criteria. Full documentation of the
-      XPath API is here.
+      XPath API is here.
     
XPath allows searching through a document
     for nodes that match specified criteria. In the example below we search
       through a document for the contents of all keyword
diff --git a/doc/tutorial/ar01s06.html b/doc/tutorial/ar01s06.html
index c09e6efb..c710b98a 100644
--- a/doc/tutorial/ar01s06.html
+++ b/doc/tutorial/ar01s06.html
@@ -16,7 +16,7 @@ parseStory (xmlDocPtr doc, xmlNodePtr cur, char *keyword) {
     return;
 }

-

1

The xmlNewTextChild +

1

The xmlNewTextChild function adds a new child element at the current node pointer's location in the tree, specified by cur.

diff --git a/doc/tutorial/ar01s07.html b/doc/tutorial/ar01s07.html index fd5c4dd9..89e0bdbd 100644 --- a/doc/tutorial/ar01s07.html +++ b/doc/tutorial/ar01s07.html @@ -25,6 +25,6 @@ Writing an attribute is similar to writing text to a new element. In 2 newattr = xmlNewProp (newnode, "uri", uri);

1

First we add a new node at the location of the current node - pointer, cur. using the xmlNewTextChild function.

+ pointer, cur. using the xmlNewTextChild function.

Once the node is added, the file is written to disk just as in the previous example in which we added an element with text content.

Prev Up Next
Writing element content Home Retrieving Attributes
diff --git a/doc/tutorial/ar01s08.html b/doc/tutorial/ar01s08.html index 758f8116..d0f227e5 100644 --- a/doc/tutorial/ar01s08.html +++ b/doc/tutorial/ar01s08.html @@ -26,7 +26,7 @@ getReference (xmlDocPtr doc, xmlNodePtr cur) {

1

- The key function is xmlGetProp, which returns an + The key function is xmlGetProp, which returns an xmlChar containing the attribute's value. In this case, we just print it out.

[Note]Note

diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html index 51fd4818..8fb5897d 100644 --- a/doc/tutorial/index.html +++ b/doc/tutorial/index.html @@ -2,7 +2,7 @@ XML, portable across a large number of platforms. This tutorial provides examples of its basic functions.

Introduction

Libxml is a C language library implementing functions for reading, creating and manipulating XML data. This tutorial - provides example code and explanations of its basic functionality.

Libxml and more details about its use are available on the project home page. Included there is complete + provides example code and explanations of its basic functionality.

Libxml and more details about its use are available on the project home page. Included there is complete API documentation. This tutorial is not meant to substitute for that complete documentation, but to illustrate the functions needed to use the library to perform basic operations. diff --git a/doc/tutorial/xmltutorial.xml b/doc/tutorial/xmltutorial.xml index c8edecb9..08bcd5be 100644 --- a/doc/tutorial/xmltutorial.xml +++ b/doc/tutorial/xmltutorial.xml @@ -85,7 +85,7 @@ creating and manipulating XML data. This tutorial provides example code and explanations of its basic functionality. Libxml and more details about its use are available on the project home page. Included there is complete + url="https://gitlab.gnome.org/GNOME/libxml2">the project home page. Included there is complete API documentation. This tutorial is not meant to substitute for that complete documentation, but to illustrate the functions needed to use the library to perform basic operations. @@ -132,23 +132,23 @@ xmlChar xmlChar + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLCHAR">xmlChar A basic replacement for char, a byte in a UTF-8 encoded string. If your data uses another encoding, it must be converted to UTF-8 for use with libxml's functions. More information on encoding is available on the libxml encoding support web page. + url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/Encodings-support">libxml encoding support web page. xmlDoc - xmlDoc + xmlDoc A structure containing the tree created by a parsed doc. xmlDocPtr + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLDOCPTR">xmlDocPtr is a pointer to the structure. @@ -157,11 +157,11 @@ xmlNodePtr xmlNodePtr - and xmlNode + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLNODEPTR">xmlNodePtr + and xmlNode A structure containing a single node. xmlNodePtr + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLNODEPTR">xmlNodePtr is a pointer to the structure, and is used in traversing the document tree. @@ -288,7 +288,7 @@ Retrieving the content of an element involves traversing the document looking for. It uses the libxml string comparison function, xmlStrcmp. If there is a match, it calls the function parseStory. + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-parser.html#XMLSTRCMP">xmlStrcmp. If there is a match, it calls the function parseStory. @@ -326,7 +326,7 @@ parseStory (xmlDocPtr doc, xmlNodePtr cur) { contained within an element is a child node of that element, so we turn to cur->xmlChildrenNode. To retrieve it, we use the function xmlNodeListGetString, which also takes the doc pointer as an argument. In this case, we just print it out. + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLNODELISTGETSTRING">xmlNodeListGetString, which also takes the doc pointer as an argument. In this case, we just print it out. Because xmlNodeListGetString allocates memory for the string it returns, you must use @@ -344,7 +344,7 @@ parseStory (xmlDocPtr doc, xmlNodePtr cur) { use of XPath expressions to retrieve sets of nodes that match a specified criteria. Full documentation of the XPath API is here. + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-xpath.html">here. XPath allows searching through a document for nodes that match specified criteria. In the example below we search @@ -452,7 +452,7 @@ parseStory (xmlDocPtr doc, xmlNodePtr cur, char *keyword) { The xmlNewTextChild + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLNEWTEXTCHILD">xmlNewTextChild function adds a new child element at the current node pointer's location in the tree, specified by cur. @@ -515,7 +515,7 @@ Writing an attribute is similar to writing text to a new element. In First we add a new node at the location of the current node pointer, cur. using the xmlNewTextChild function. + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLNEWTEXTCHILD">xmlNewTextChild function. @@ -562,7 +562,7 @@ getReference (xmlDocPtr doc, xmlNodePtr cur) { The key function is xmlGetProp, which returns an + url="https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#XMLGETPROP">xmlGetProp, which returns an xmlChar containing the attribute's value. In this case, we just print it out. diff --git a/doc/xmlcatalog_man.xml b/doc/xmlcatalog_man.xml index ec9b190c..54d2dcfc 100644 --- a/doc/xmlcatalog_man.xml +++ b/doc/xmlcatalog_man.xml @@ -437,7 +437,7 @@ libxml 3 - web page + web page @@ -445,7 +445,7 @@ libxml 3 catalog support web page - at + at diff --git a/doc/xmllint.xml b/doc/xmllint.xml index 7d83827c..de2d91bf 100644 --- a/doc/xmllint.xml +++ b/doc/xmllint.xml @@ -923,11 +923,7 @@ libxml 3 - web page - - - - W3C XSLT page + web page diff --git a/doc/xsa.xsl b/doc/xsa.xsl index 30151d46..05d64de8 100644 --- a/doc/xsa.xsl +++ b/doc/xsa.xsl @@ -22,7 +22,7 @@ libxml2 - http://xmlsoft.org/ + https://gitlab.gnome.org/GNOME/libxml2 diff --git a/libxml.m4 b/libxml.m4 index 09de9fe2..fc7790c3 100644 --- a/libxml.m4 +++ b/libxml.m4 @@ -122,9 +122,8 @@ main() { printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", xml_major_version, xml_minor_version, xml_micro_version); - printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", + printf("*** You need a version of libxml newer than %d.%d.%d.\n", major, minor, micro); - printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** probably means that the wrong copy of the xml2-config shell script is\n"); diff --git a/libxml.spec.in b/libxml.spec.in index 11c29ea4..4fd7bd4f 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -6,7 +6,7 @@ Version: @VERSION@ Release: 1%{?dist}%{?extra_release} License: MIT Group: Development/Libraries -Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz +Source: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v%{version}/downloads/libxml2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python-devel %if 0%{?with_python3} @@ -15,7 +15,7 @@ BuildRequires: python3-devel BuildRequires: zlib-devel BuildRequires: pkgconfig BuildRequires: xz-devel -URL: http://xmlsoft.org/ +URL: https://gitlab.gnome.org/GNOME/libxml2 %description This library allows to manipulate XML files. It includes support @@ -205,5 +205,5 @@ rm -fr %{buildroot} %changelog * @RELDATE@ Daniel Veillard -- upstream release @VERSION@ see http://xmlsoft.org/news.html +- upstream release @VERSION@ diff --git a/libxml2.doap b/libxml2.doap index 32ac7dbe..14a653d5 100644 --- a/libxml2.doap +++ b/libxml2.doap @@ -18,7 +18,6 @@ Libxml2 is known to be very portable, the library should build and work without serious troubles on a variety of systems (Linux, Unix, Windows, CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, VxWorks, ...) - C diff --git a/python/README b/python/README index b46eee40..7e4329a5 100644 --- a/python/README +++ b/python/README @@ -4,14 +4,14 @@ This is the libxml2 python module, providing access to the libxml2 and libxslt (if available) libraries. For general informationss on those XML and XSLT libraries check their -web pages at : - http://xmlsoft.org/ +web pages at: + https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home and - http://xmlsoft.org/XSLT/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home The latest version of the sources for this module and the associated libraries can be found at: - ftp://xmlsoft.org/ + https://gitlab.gnome.org/GNOME/libxml2/-/releases Binaries packages of the libxml2 and libxslt libraries can be found either on the FTP site for Linux, from external diff --git a/python/setup.py.in b/python/setup.py.in index 012eb59a..4a997b4e 100755 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -258,7 +258,7 @@ setup (name = "libxml2-python", description = descr, author = "Daniel Veillard", author_email = "veillard@redhat.com", - url = "http://xmlsoft.org/python.html", + url = "https://gitlab.gnome.org/GNOME/libxml2", licence="MIT Licence", py_modules=modules, ext_modules=extens, diff --git a/win32/libxml2.rc b/win32/libxml2.rc index c774a5ee..39480f47 100644 --- a/win32/libxml2.rc +++ b/win32/libxml2.rc @@ -26,7 +26,7 @@ BEGIN VALUE "OriginalFilename", "libxml2.dll\0" VALUE "ProductName", "libxml2\0" VALUE "ProductVersion", LIBXML_DOTTED_VERSION "\0" - VALUE "Comments", "For more information visit http://xmlsoft.org/\0" + VALUE "Comments", "For more information visit https://gitlab.gnome.org/GNOME/libxml2\0" END END BLOCK "VarFileInfo" diff --git a/xmllint.c b/xmllint.c index f24aa0e9..ee6bfdc5 100644 --- a/xmllint.c +++ b/xmllint.c @@ -3144,8 +3144,7 @@ static void usage(FILE *f, const char *name) { fprintf(f, "\t--xpath expr: evaluate the XPath expression, imply --noout\n"); #endif - fprintf(f, "\nLibxml project home page: http://xmlsoft.org/\n"); - fprintf(f, "To report bugs or get some help check: http://xmlsoft.org/bugs.html\n"); + fprintf(f, "\nLibxml project home page: https://gitlab.gnome.org/GNOME/libxml2\n"); } static void registerNode(xmlNodePtr node)