From nobody Fri Mar 25 17:15:03 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 880431A2DB91; Fri, 25 Mar 2022 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ7xz3CXLz3mc9; Fri, 25 Mar 2022 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olLsPYe/KEKgpSQdc3t7wvOYBcL8lFHejN18wmhO3Ho=; b=LD7EGp2QU1mPzqGF1gJRdwwpKqsyGpQbe5IHEDr1whNxFRyhpz810jwwCWhzqYKabNT/I+ YJ+Lgtf0fH8JCg/9Ti04TUxoCWKVeXjBXE9X+fhkCJpr0o6SmvPasILrHsJVnb0M5yoj0I yHbAZz1RT/MMw5FYQBE6bhfsK3W4+gTQlEfE9lebZI9EjaTwU0Xk1M7SrJxUPaGQBO7ZpA hQaICvQJ0GWY6HVGi3dM+rd5MFUF1Sv0dpC1grFRInrMqhCjG9C/h2lHS/EFR89cnIkK/E EdYLOF5ss0c/ukzGNov3iLpJcBlchfd2h1T+NarRY9LhznW7ES9/5/4Va86U5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 391E810968; Fri, 25 Mar 2022 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PHF3NB016678; Fri, 25 Mar 2022 17:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PHF3f1016677; Fri, 25 Mar 2022 17:15:03 GMT (envelope-from git) Date: Fri, 25 Mar 2022 17:15:03 GMT Message-Id: <202203251715.22PHF3f1016677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8c8cb32a53d3 - main - textproc/libxslt: Update to 1.1.35 and migrate to CMake List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c8cb32a53d3fd85f39dcb75c331d63a8d4219b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olLsPYe/KEKgpSQdc3t7wvOYBcL8lFHejN18wmhO3Ho=; b=X7Lj0+eJVaS5n9MWAjEh5hhfACooEd+4CqOoOnK1tsiD//mu5x1S+T08+E1TewFlkeHcft E2/zeQWA1ixG4eFq+N2AEh/NtLC2tEPx0lUt9c0MOBHpzEc9ZPDINtz4FXAtX7NbHxZh9Y PoS5M5R4hOfxhAHH6wQe1ZSXACtPQiwf3mbQVV5g2lKbHZffAnnOcPoF024HnHfkhtokJG Dtfw/kKguha5lAqOtlDLNklF3Ym0t+q/rHLjDbNrGZUh0xFNln26IWs0O9HjRufOzgsiCn iDqw5xa+gAf9ahQ5pz056lIblL/tQZHLNSwy5mGe72A3r2Z7SQPDPvVSaMIMKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648228503; a=rsa-sha256; cv=none; b=FtPrjB5F7ph1umMNYb1MWqQcyqU3iykcSwYHUbn3seHAsqSiPRSrQmylUt6KG/RXW1MZGJ tEe7HuFS2p3zxTtZglXaA0XODXzxtCrC5ls0vMJ+K/4epF/1SqymQu+i0Zdt5v0LWqxYm1 ZJAmdIRouT4CLM0MBVUbdEi786jDvdItCplOdisMAdjMAT1qb4AgyHVXMTzB0oI/S2GKlB hQ5Pcm2jyUyi6lDoOczYDmT2gwOoIuHmj3IAgZy1077D4vci6x/xv5wVzYWUgDg4Z6iSVg D781PPqyjbuLM/b7YcSc+Un22t5yJ/pVAKtQX09MEOrx+7O6yH4rdngzSdHCaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c8cb32a53d3fd85f39dcb75c331d63a8d4219b8 commit 8c8cb32a53d3fd85f39dcb75c331d63a8d4219b8 Author: Daniel Engberg AuthorDate: 2022-03-25 17:09:55 +0000 Commit: Daniel Engberg CommitDate: 2022-03-25 17:14:39 +0000 textproc/libxslt: Update to 1.1.35 and migrate to CMake Changelog: https://gitlab.gnome.org/GNOME/libxslt/-/releases#v1.1.35 I'd like to thank both tcberner and mandree for reviewing, suggesting improvements and helping out in general. I'd also like thank antoine for doing exp-runs. PR: 262288 Reviewed by: tcberner, mandree Approved by: desktop (tcberner) Differential Revision: https://reviews.freebsd.org/D34384 Exp-run by: antoine --- textproc/libxslt/Makefile | 43 +- textproc/libxslt/distinfo | 6 +- textproc/libxslt/files/extra-patch-docs | 11 + textproc/libxslt/files/patch-CMakeLists.txt | 20 + ...git-01-9ae2f94df1721e002941b40665efb762aefcea1a | 37 - ...git-02-824657768aea2cce9c23e72ba8085cb5e44350c7 | 42 - ...git-03-77c26bad0433541f486b1e7ced44ca9979376908 | 70 -- textproc/libxslt/files/patch-man-xsltproc | 921 --------------------- textproc/libxslt/files/patch-python__Makefile.in | 22 - .../libxslt/files/patch-python__tests__Makefile.in | 11 - textproc/libxslt/pkg-descr | 2 +- textproc/libxslt/pkg-plist | 182 +++- 12 files changed, 234 insertions(+), 1133 deletions(-) diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index e1f2325119e1..f5286cc9c39e 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,11 +1,9 @@ # Created by: Ade Lovett PORTNAME= libxslt -DISTVERSION= 1.1.34 -PORTREVISION= 2 +DISTVERSION= 1.1.35 CATEGORIES= textproc gnome -MASTER_SITES= http://xmlsoft.org/sources/ \ - https://mirror.umd.edu/xbmc/build-deps/sources/ +MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/ DIST_SUBDIR= gnome2 MAINTAINER= desktop@FreeBSD.org @@ -14,31 +12,32 @@ COMMENT= XML stylesheet transformation library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe gmake gnome localbase libtool pathfix pkgconfig +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error + +USES= cmake cpe gnome localbase:ldflags pathfix pkgconfig tar:xz CPE_VENDOR= xmlsoft -GNU_CONFIGURE= yes USE_GNOME= libxml2 USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --without-python - -INSTALL_TARGET= install-strip -TEST_TARGET= check +CMAKE_OFF= LIBXSLT_WITH_PYTHON +CMAKE_ON= LIBXSLT_WITH_CRYPTO -OPTIONS_DEFINE= CRYPTO MEM_DEBUG -OPTIONS_DEFAULT=CRYPTO +OPTIONS_DEFINE= DOCS DEBUG MEM_DEBUG TEST +OPTIONS_SUB= yes -CRYPTO_DESC= Enable crypto support MEM_DEBUG_DESC= Enable memory debugging -CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error -CRYPTO_CONFIGURE_WITH= crypto -MEM_DEBUG_CONFIGURE_ON= --with-mem-debug - -post-patch: - @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ - ${WRKSRC}/doc/Makefile.in +DEBUG_CMAKE_BOOL= LIBXSLT_WITH_XSLT_DEBUG +DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-docs +MEM_DEBUG_CMAKE_BOOL= LIBXSLT_WITH_MEM_DEBUG +TEST_CMAKE_BOOL= LIBXSLT_WITH_TESTS +TEST_TEST_TARGET= test + +post-install: + ${RLN} ${STAGEDIR}${PREFIX}/lib/libexslt.so.0.8.20 ${STAGEDIR}${PREFIX}/lib/libexslt.so.0 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libxslt.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxslt.so.1 + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/libxslt-plugins + ${INSTALL_DATA} ${WRKSRC}/libxslt.m4 ${STAGEDIR}${PREFIX}/share/aclocal/libxslt.m4 .include diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index ecbdb8727118..76801005fb3f 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572803425 -SHA256 (gnome2/libxslt-1.1.34.tar.gz) = 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f -SIZE (gnome2/libxslt-1.1.34.tar.gz) = 3552258 +TIMESTAMP = 1645748296 +SHA256 (gnome2/libxslt-1.1.35.tar.xz) = 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 +SIZE (gnome2/libxslt-1.1.35.tar.xz) = 1827548 diff --git a/textproc/libxslt/files/extra-patch-docs b/textproc/libxslt/files/extra-patch-docs new file mode 100644 index 000000000000..2d6c0ccae644 --- /dev/null +++ b/textproc/libxslt/files/extra-patch-docs @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-02-26 05:49:51 UTC ++++ CMakeLists.txt +@@ -430,7 +430,7 @@ endif() + install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) ++#install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) + + if(LIBXSLT_WITH_CRYPTO) + install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/textproc/libxslt/files/patch-CMakeLists.txt b/textproc/libxslt/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b1fcf447093d --- /dev/null +++ b/textproc/libxslt/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2022-02-16 16:27:55 UTC ++++ CMakeLists.txt +@@ -480,7 +480,7 @@ set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRY + file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}") + string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}") + +-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}") ++set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +@@ -489,7 +489,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxslt.pc D + configure_file(libexslt.pc.in libexslt.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libexslt.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development) + +-set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..") ++set(XSLT_INCLUDEDIR "-I\${includedir}/libxml2 -I\${includedir}") + configure_file(xslt-config.in xslt-config @ONLY) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xslt-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development) + diff --git a/textproc/libxslt/files/patch-git-01-9ae2f94df1721e002941b40665efb762aefcea1a b/textproc/libxslt/files/patch-git-01-9ae2f94df1721e002941b40665efb762aefcea1a deleted file mode 100644 index eca5e6ee4e3b..000000000000 --- a/textproc/libxslt/files/patch-git-01-9ae2f94df1721e002941b40665efb762aefcea1a +++ /dev/null @@ -1,37 +0,0 @@ -From 9ae2f94df1721e002941b40665efb762aefcea1a Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 17 Aug 2020 03:42:11 +0200 -Subject: [PATCH] Stop using maxParserDepth XPath limit - -This will be removed again from libxml2. ---- - tests/fuzz/fuzz.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c -index f502ca2c..75234ad6 100644 ---- tests/fuzz/fuzz.c -+++ tests/fuzz/fuzz.c -@@ -183,8 +183,7 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, - xpctxt = tctxt->xpathCtxt; - - /* Resource limits to avoid timeouts and call stack overflows */ -- xpctxt->maxParserDepth = 15; -- xpctxt->maxDepth = 100; -+ xpctxt->maxDepth = 500; - xpctxt->opLimit = 500000; - - /* Test namespaces used in xpath.xml */ -@@ -317,8 +316,7 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, - - static void - xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) { -- ctxt->maxParserDepth = 15; -- ctxt->maxDepth = 100; -+ ctxt->maxDepth = 200; - ctxt->opLimit = 100000; - } - --- -GitLab - diff --git a/textproc/libxslt/files/patch-git-02-824657768aea2cce9c23e72ba8085cb5e44350c7 b/textproc/libxslt/files/patch-git-02-824657768aea2cce9c23e72ba8085cb5e44350c7 deleted file mode 100644 index 77ee92c51427..000000000000 --- a/textproc/libxslt/files/patch-git-02-824657768aea2cce9c23e72ba8085cb5e44350c7 +++ /dev/null @@ -1,42 +0,0 @@ -From 824657768aea2cce9c23e72ba8085cb5e44350c7 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 17 Aug 2020 04:27:13 +0200 -Subject: [PATCH] Transfer XPath limits to XPtr context - -Expressions like document('doc.xml#xpointer(evil_expr)') ignored the -XPath limits. ---- - libxslt/functions.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/libxslt/functions.c b/libxslt/functions.c -index b350545a..975ea790 100644 ---- libxslt/functions.c -+++ libxslt/functions.c -@@ -178,10 +178,22 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) - goto out_fragment; - } - -+#if LIBXML_VERSION >= 20911 || \ -+ defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) -+ xptrctxt->opLimit = ctxt->context->opLimit; -+ xptrctxt->opCount = ctxt->context->opCount; -+ xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth; -+ -+ resObj = xmlXPtrEval(fragment, xptrctxt); -+ -+ ctxt->context->opCount = xptrctxt->opCount; -+#else - resObj = xmlXPtrEval(fragment, xptrctxt); -- xmlXPathFreeContext(xptrctxt); - #endif - -+ xmlXPathFreeContext(xptrctxt); -+#endif /* LIBXML_XPTR_ENABLED */ -+ - if (resObj == NULL) - goto out_fragment; - --- -GitLab - diff --git a/textproc/libxslt/files/patch-git-03-77c26bad0433541f486b1e7ced44ca9979376908 b/textproc/libxslt/files/patch-git-03-77c26bad0433541f486b1e7ced44ca9979376908 deleted file mode 100644 index 157dd444ba89..000000000000 --- a/textproc/libxslt/files/patch-git-03-77c26bad0433541f486b1e7ced44ca9979376908 +++ /dev/null @@ -1,70 +0,0 @@ -From 77c26bad0433541f486b1e7ced44ca9979376908 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Wed, 26 Aug 2020 00:34:38 +0200 -Subject: [PATCH] Don't set maxDepth in XPath contexts - -The maximum recursion depth is hardcoded in libxml2 now. ---- - libxslt/functions.c | 2 +- - tests/fuzz/fuzz.c | 11 ++--------- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/libxslt/functions.c b/libxslt/functions.c -index 975ea790..7887dda7 100644 ---- libxslt/functions.c -+++ libxslt/functions.c -@@ -182,7 +182,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) - defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) - xptrctxt->opLimit = ctxt->context->opLimit; - xptrctxt->opCount = ctxt->context->opCount; -- xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth; -+ xptrctxt->depth = ctxt->context->depth; - - resObj = xmlXPtrEval(fragment, xptrctxt); - -diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c -index 75234ad6..780c2d41 100644 ---- tests/fuzz/fuzz.c -+++ tests/fuzz/fuzz.c -@@ -183,7 +183,6 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, - xpctxt = tctxt->xpathCtxt; - - /* Resource limits to avoid timeouts and call stack overflows */ -- xpctxt->maxDepth = 500; - xpctxt->opLimit = 500000; - - /* Test namespaces used in xpath.xml */ -@@ -314,12 +313,6 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, - return 0; - } - --static void --xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) { -- ctxt->maxDepth = 200; -- ctxt->opLimit = 100000; --} -- - xmlChar * - xsltFuzzXslt(const char *data, size_t size) { - xmlDocPtr xsltDoc; -@@ -349,7 +342,7 @@ xsltFuzzXslt(const char *data, size_t size) { - xmlFreeDoc(xsltDoc); - return NULL; - } -- xsltSetXPathResourceLimits(sheet->xpathCtxt); -+ sheet->xpathCtxt->opLimit = 100000; - sheet->xpathCtxt->opCount = 0; - if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) { - xsltFreeStylesheet(sheet); -@@ -361,7 +354,7 @@ xsltFuzzXslt(const char *data, size_t size) { - xsltSetCtxtSecurityPrefs(sec, ctxt); - ctxt->maxTemplateDepth = 100; - ctxt->opLimit = 20000; -- xsltSetXPathResourceLimits(ctxt->xpathCtxt); -+ ctxt->xpathCtxt->opLimit = 100000; - ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount; - - result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt); --- -GitLab - diff --git a/textproc/libxslt/files/patch-man-xsltproc b/textproc/libxslt/files/patch-man-xsltproc deleted file mode 100644 index e4f431dbeb80..000000000000 --- a/textproc/libxslt/files/patch-man-xsltproc +++ /dev/null @@ -1,921 +0,0 @@ ---- doc/xsltproc.1.orig 2020-01-14 06:28:43 UTC -+++ doc/xsltproc.1 -@@ -1,736 +1,358 @@ --'\" t - .\" Title: xsltproc - .\" Author: John Fleck --.\" Generator: DocBook XSL Stylesheets vsnapshot --.\" Date: $Date$ -+.\" Generator: DocBook XSL Stylesheets v1.73.2 -+.\" Date: $Date: 2008-04-21 16:28:56 +0200 (Mon, 21 Apr 2008) $ - .\" Manual: xsltproc Manual - .\" Source: libxslt --.\" Language: English - .\" --.TH "XSLTPROC" "1" "$Date$" "libxslt" "xsltproc Manual" --.\" ----------------------------------------------------------------- --.\" * Define some portability stuff --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" http://bugs.debian.org/507673 --.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.ie \n(.g .ds Aq \(aq --.el .ds Aq ' --.\" ----------------------------------------------------------------- --.\" * set default formatting --.\" ----------------------------------------------------------------- -+.TH "XSLTPROC" "1" "$Date: 2008\-04\-21 16:28:56 +0200 (Mon, 21 Apr 2008) $" "libxslt" "xsltproc Manual" - .\" disable hyphenation - .nh - .\" disable justification (adjust text to left margin only) - .ad l --.\" ----------------------------------------------------------------- --.\" * MAIN CONTENT STARTS HERE * --.\" ----------------------------------------------------------------- -- -- -- -- -- - .SH "NAME" --xsltproc \- command line XSLT processor -- -+xsltproc - command line XSLT processor - .SH "SYNOPSIS" -- -- .HP \w'\fBxsltproc\fR\ 'u -- -- \fBxsltproc\fR -- [ -- [ -- | \fB\-V\fR -- | \fB\-\-version\fR -- ] -- [ -- | \fB\-v\fR -- | \fB\-\-verbose\fR -- ] -- [ -- { -- | \fB\-o\fR -- | \fB\-\-output\fR -- } -- { -- | \fIFILE\fR -- | \fIDIRECTORY\fR -- } -- ] -- | \fB\-\-timing\fR -- | \fB\-\-repeat\fR -- | \fB\-\-debug\fR -- | \fB\-\-novalid\fR -- | \fB\-\-noout\fR -- | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR -- | \fB\-\-html\fR -- | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR -- | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR -- | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR -- | \fB\-\-nonet\fR -- | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR -- | \fB\-\-load\-trace\fR -- | \fB\-\-catalogs\fR -- | \fB\-\-xinclude\fR -- | [\ |\ \fB\-\-profile\fR\ |\ \fB\-\-norman\fR\ ] -- | \fB\-\-dumpextensions\fR -- | \fB\-\-nowrite\fR -- | \fB\-\-nomkdir\fR -- | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR -- | \fB\-\-nodtdattr\fR -- ] -- [\fISTYLESHEET\fR] -- { -- | \fIXML\-FILE\fR... -- | \- -- } -- -- -- -+.HP 9 -+\fBxsltproc\fR [[\fB\-V\fR | \fB\-\-version\fR] [\fB\-v\fR | \fB\-\-verbose\fR] [{\fB\-o\fR | \fB\-\-output\fR} {\fIFILE\fR | \fIDIRECTORY\fR}] | \fB\-\-timing\fR | \fB\-\-repeat\fR | \fB\-\-debug\fR | \fB\-\-novalid\fR | \fB\-\-noout\fR | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR | \fB\-\-html\fR | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-catalogs\fR | \fB\-\-xinclude\fR | [\fB\-\-profile\fR\ |\ \fB\-\-norman\fR] | \fB\-\-dumpextensions\fR | \fB\-\-nowrite\fR | \fB\-\-nomkdir\fR | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR | \fB\-\-nodtdattr\fR] [\fISTYLESHEET\fR] {\fIXML\-FILE\fR | \-} - .SH "DESCRIPTION" -+.PP - -- -- .PP - \fBxsltproc\fR - is a command line tool for applying - XSLT - stylesheets to - XML --documents\&. It is part of --\fBlibxslt\fR(3), the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&. -+documents\. It is part of -+\fBlibxslt\fR(3), the XSLT C library for GNOME\. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\. -+.PP - -- .PP - \fBxsltproc\fR --is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is --\fB\-\fR --\&. -- -- .PP -+is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\. It will use the standard input if a filename provided is -+\fB\-\fR\. -+.PP - If a stylesheet is included in an - XML --document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\&. --\fBxsltproc\fR --will automatically detect the included stylesheet and use it\&. -- -- .PP -+document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\. \fBxsltproc\fR will automatically detect the included stylesheet and use it\. -+.PP - By default, output is to --stdout\&. You can specify a file for output using the -+\fIstdout\fR\. You can specify a file for output using the - \fB\-o\fR - or - \fB\-\-output\fR --option\&. -- -- -+option\. - .SH "OPTIONS" -+.PP - -- -- .PP - \fBxsltproc\fR - accepts the following options (in alphabetical order): -- -- -- -- -- .PP -+.PP - \fB\-\-catalogs\fR - .RS 4 -- -- -- -- Use the -+Use the - SGML - catalog specified in - \fBSGML_CATALOG_FILES\fR --to resolve the location of external entities\&. By default, -+to resolve the location of external entities\. By default, - \fBxsltproc\fR - looks for the catalog specified in --\fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses --/etc/xml/catalog\&. -- -- -- .RE -- -- .PP -+\fBXML_CATALOG_FILES\fR\. If that is not specified, it uses -+\fI/etc/xml/catalog\fR\. -+.RE -+.PP - \fB\-\-debug\fR - .RS 4 -- -- -- -- Output an -+Output an - XML --tree of the transformed document for debugging purposes\&. -- -- -- .RE -- -- .PP -+tree of the transformed document for debugging purposes\. -+.RE -+.PP - \fB\-\-dumpextensions\fR - .RS 4 -- -- -- -- Dumps the list of all registered extensions on --stdout\&. -- -- -- .RE -- -- .PP -+Dumps the list of all registered extensions on -+\fIstdout\fR\. -+.RE -+.PP - \fB\-\-html\fR - .RS 4 -- -- -- -- The input document is an -+The input document is an - HTML --file\&. -- -- -- .RE -- -- .PP -+file\. -+.RE -+.PP - \fB\-\-load\-trace\fR - .RS 4 -- -- -- -- Display all the documents loaded during the processing to --stderr\&. -- -- -- .RE -- -- .PP -+Display all the documents loaded during the processing to -+\fIstderr\fR\. -+.RE -+.PP - \fB\-\-maxdepth \fR\fB\fIVALUE\fR\fR - .RS 4 -- -- -- -- Adjust the maximum depth of the template stack before -+Adjust the maximum depth of the template stack before - \fBlibxslt\fR(3) --concludes it is in an infinite loop\&. The default is 3000\&. -- -- -- .RE -- -- .PP -+concludes it is in an infinite loop\. The default is 3000\. -+.RE -+.PP - \fB\-\-nodtdattr\fR - .RS 4 -- -- -- -- Do not apply default attributes from the document\*(Aqs --DTD\&. -- -- -- .RE -- -- .PP -+Do not apply default attributes from the document\'s -+DTD\. -+.RE -+.PP - \fB\-\-nomkdir\fR - .RS 4 -- -- -- -- Refuses to create directories\&. -- -- -- .RE -- -- .PP -+Refuses to create directories\. -+.RE -+.PP - \fB\-\-nonet\fR - .RS 4 -- -- -- -- Do not use the Internet to fetch --DTDs, entities or documents\&. -- -- -- .RE -- -- .PP -+Do not use the Internet to fetch -+DTDs, entities or documents\. -+.RE -+.PP - \fB\-\-noout\fR - .RS 4 -- -- -- -- Do not output the result\&. -- -- -- .RE -- -- .PP -+Do not output the result\. -+.RE -+.PP - \fB\-\-novalid\fR - .RS 4 -- -- -- -- Skip loading the document\*(Aqs --DTD\&. -- -- -- .RE -- -- .PP -+Skip loading the document\'s -+DTD\. -+.RE -+.PP - \fB\-\-nowrite\fR - .RS 4 -- -- -- -- Refuses to write to any file or resource\&. -- -- -- .RE -- -- .PP -+Refuses to write to any file or resource\. -+.RE -+.PP - \fB\-o\fR or \fB\-\-output\fR \fIFILE\fR | \fIDIRECTORY\fR - .RS 4 -- -- -- -- Direct output to the given --\fIFILE\fR\&. Using the option with a -+Direct output to the given -+\fIFILE\fR\. Using the option with a - \fIDIRECTORY\fR --directs the output files to the specified directory\&. This can be useful for multiple outputs (also known as "chunking") or manpage processing\&. -- -- .if n \{\ -+directs the output files to the specified directory\. This can be useful for multiple outputs (also known as "chunking") or manpage processing\. - .sp --.\} --.RS 4 - .it 1 an-trap - .nr an-no-space-flag 1 - .nr an-break-flag 1 - .br --.ps +1 --\fBImportant\fR --.ps -1 --.br -- -- The given directory -+Important -+The given directory - \fBmust\fR --already exist\&. -- -- .sp .5v --.RE -- .if n \{\ -+already exist\. - .sp --.\} --.RS 4 - .it 1 an-trap - .nr an-no-space-flag 1 - .nr an-break-flag 1 - .br --.ps +1 --\fBNote\fR --.ps -1 --.br -- -- Make sure that -+Note -+Make sure that - \fIFILE\fR - and - \fIDIRECTORY\fR - follow the - \(lqURI reference computation\(rq --as described in RFC 2396 and laters\&. This means, that e\&.g\&. -+as described in RFC 2396 and laters\. This means, that e\.g\. - \fB\-o directory\fR - will maybe not work, but - \fB\-o directory/\fR --will\&. -- -- .sp .5v -+will\. - .RE -- -- .RE -- -- .PP -+.PP - \fB\-\-encoding \fR\fB\fIENCODING\fR\fR - .RS 4 -- -- -- -- Allow to specify the encoding for the input\&. -- -- -- .RE -- .PP -+Allow to specify the encoding for the input\. -+.RE -+.PP - \fB\-\-param \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR - .RS 4 -- -- -- -- Pass a parameter of name -+Pass a parameter of name - \fIPARAMNAME\fR - and value - \fIPARAMVALUE\fR --to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string, you can use -+to the stylesheet\. You may pass multiple name/value pairs up to a maximum of 32\. If the value being passed is a string, you can use - \fB\-\-stringparam\fR --instead, to avoid additional quote characters that appear in string expressions\&. Note: the XPath expression must be UTF\-8 encoded\&. -- -- -- .RE -- -- .PP -+instead, to avoid additional quote characters that appear in string expressions\. Note: the XPath expression must be UTF\-8 encoded\. -+.RE -+.PP - \fB\-\-path "\fR\fB\fIPATH(S)\fR\fR\fB"\fR - .RS 4 -- -- -- -- Use the (space\- or colon\-separated) list of filesystem paths specified by -+Use the (space\- or colon\-separated) list of filesystem paths specified by - \fIPATHS\fR - to load --DTDs, entities or documents\&. Enclose space\-separated lists by quotation marks\&. -- -- -- .RE -- -- .PP -+DTDs, entities or documents\. Enclose space\-separated lists by quotation marks\. -+.RE -+.PP - \fB\-\-profile\fR or \fB\-\-norman\fR - .RS 4 -- -- -- -- Output profiling information detailing the amount of time spent in each part of the stylesheet\&. This is useful in optimizing stylesheet performance\&. -- -- -- .RE -- -- .PP -+Output profiling information detailing the amount of time spent in each part of the stylesheet\. This is useful in optimizing stylesheet performance\. -+.RE -+.PP - \fB\-\-repeat\fR - .RS 4 -- -- -- -- Run the transformation 20 times\&. Used for timing tests\&. -- -- -- .RE -- -- .PP -+Run the transformation 20 times\. Used for timing tests\. -+.RE -+.PP - \fB\-\-stringparam \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR - .RS 4 -- -- -- -- Pass a parameter of name -+Pass a parameter of name - \fIPARAMNAME\fR - and value - \fIPARAMVALUE\fR - where - \fIPARAMVALUE\fR --is a string rather than a node identifier\&. -+is a string rather than a node identifier\. - \fBNote:\fR --The string must be UTF\-8 encoded\&. -- -- -- .RE -- -- .PP -+The string must be UTF\-8 encoded\. -+.RE -+.PP - \fB\-\-timing\fR - .RS 4 -- -- -- -- Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\&. Displayed in milliseconds\&. -- -- -- .RE -- -- .PP -+Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\. Displayed in milliseconds\. -+.RE -+.PP - \fB\-v\fR or \fB\-\-verbose\fR - .RS 4 -- -- -- -- Output each step taken by -+Output each step taken by - \fBxsltproc\fR --in processing the stylesheet and the document\&. -- -- -- .RE -- -- .PP -+in processing the stylesheet and the document\. -+.RE -+.PP - \fB\-V\fR or \fB\-\-version\fR - .RS 4 -- -- -- -- Show the version of -+Show the version of - \fBlibxml\fR(3) - and - \fBlibxslt\fR(3) --used\&. -- -- -- .RE -- -- .PP -+used\. -+.RE -+.PP - \fB\-\-writesubtree \fR\fB\fIPATH\fR\fR - .RS 4 -- -- -- -- Allow file write only within the -+Allow file write only within the - \fIPATH\fR --subtree\&. -- -- -- .RE -- -- .PP -+subtree\. -+.RE -+.PP - \fB\-\-xinclude\fR - .RS 4 -- -- -- -- Process the input document using the XInclude specification\&. More details on this can be found in the XInclude specification: --\m[blue]\fB\%http://www.w3.org/TR/xinclude/\fR\m[] -- -- -- .RE -- -- -- -+Process the input document using the XInclude specification\. More details on this can be found in the XInclude specification: -+\fI\%http://www.w3.org/TR/xinclude/\fR -+.RE - .SH "ENVIRONMENT" -- -- -- -- -- -- .PP -+.PP - \fBSGML_CATALOG_FILES\fR - .RS 4 -- -- -- -- SGML --catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the -+SGML -+catalog behavior can be changed by redirecting queries to the user\'s own set of catalogs\. This can be done by setting the - \fBSGML_CATALOG_FILES\fR --environment variable to a list of catalogs\&. An empty one should deactivate loading the default --/etc/sgml/catalog --catalog\&. -- -- -- .RE -- -- .PP -+environment variable to a list of catalogs\. An empty one should deactivate loading the default -+\fI/etc/sgml/catalog\fR -+catalog\. -+.RE -+.PP - \fBXML_CATALOG_FILES\fR - .RS 4 -- -- -- -- XML --catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the *** 525 LINES SKIPPED ***