diff options
author | adam <adam> | 2012-09-15 10:27:00 +0000 |
---|---|---|
committer | adam <adam> | 2012-09-15 10:27:00 +0000 |
commit | 957d9b411fdc792cbc1362f642ace1df12d7d5c6 (patch) | |
tree | 34cdcb268fbd29d4b4a4bba3dd55f3f194495d90 /textproc | |
parent | bbefecd4a5db862d2447cf4ff1198f0f4f6e112c (diff) | |
download | pkgsrc-957d9b411fdc792cbc1362f642ace1df12d7d5c6.tar.gz |
Also remove some patches
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/libxslt/patches/patch-aa | 120 | ||||
-rw-r--r-- | textproc/libxslt/patches/patch-ag | 13 | ||||
-rw-r--r-- | textproc/libxslt/patches/patch-libxslt_pattern.c | 17 |
3 files changed, 0 insertions, 150 deletions
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa deleted file mode 100644 index 2ca802abab0..00000000000 --- a/textproc/libxslt/patches/patch-aa +++ /dev/null @@ -1,120 +0,0 @@ -$NetBSD: patch-aa,v 1.20 2010/04/13 16:14:03 drochner Exp $ - ---- doc/Makefile.in.orig 2009-09-24 14:43:14.000000000 +0000 -+++ doc/Makefile.in -@@ -546,9 +546,9 @@ eapi: EXSLT/libexslt-api.xml EXSLT/libex - web: $(PAGES) $(EPAGES) - - $(PAGES): xslt.html $(srcdir)/site.xsl -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML Web pages from xslt.html" ; \ -- $(bindir)/xsltproc --nonet --html $(srcdir)/site.xsl \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet --html $(srcdir)/site.xsl \ - xslt.html > index.html ; fi ) - -@(if [ -x $(bindir)/xmllint ] ; then \ - echo "Validating the HTML Web pages" ; \ -@@ -557,9 +557,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl - $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl - -@(if [ ! -d EXSLT/html ] ; then \ - mkdir -p EXSLT/html ; fi ) -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML Web pages from exslt.html" ; \ -- $(bindir)/xsltproc --nonet --html \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet --html \ - --stringparam dirname EXSLT/ \ - --stringparam libname libexslt \ - --stringparam logo_base ../ \ -@@ -570,20 +570,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si - $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi ); - - ../NEWS: $(srcdir)/news.xsl news.html -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -- $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/news.xsl \ - news.html > ../NEWS ; fi ); - - libxslt.xsa: $(srcdir)/xsa.xsl news.html -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -- $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/xsa.xsl \ - news.html > libxslt.xsa ; fi ); - - $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \ - $(srcdir)/api.xsl -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \ -- $(bindir)/xsltproc --nonet --html \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet --html \ - $(srcdir)/api.xsl \ - xslt.html ; fi ); - -@(if [ -x $(bindir)/xmllint ] ; then \ -@@ -591,9 +591,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a - $(bindir)/xmllint --nonet --valid --noout API*.html; fi ); - - $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \ -- $(bindir)/xsltproc --nonet --html --output EXSLT/ \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet --html --output EXSLT/ \ - --stringparam libname libexslt \ - --stringparam dirname EXSLT/ \ - --stringparam logo_base ../ \ -@@ -601,9 +601,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si - EXSLT/exslt.html ; fi ); - - html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML pages from the XSLT API" ; \ -- $(bindir)/xsltproc --nonet \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet \ - $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); - -@(if [ -x $(bindir)/xmllint ] ; then \ - echo "Validating the resulting XHTML pages" ; \ -@@ -616,9 +616,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl - - EXSLT/html/index.html: EXSLT/libexslt-api.xml \ - $(srcdir)/newapi.xsl -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ - echo "Rebuilding the HTML pages from the EXSLT API" ; \ -- $(bindir)/xsltproc --nonet --output EXSLT/ \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \ - --stringparam libname libexslt \ - --stringparam dirname EXSLT/ \ - --stringparam logo_base ../../ \ -@@ -642,22 +642,22 @@ xsltproc.1: xsltproc.xml - # Note that in the following, xmllint output is piped to xsltproc - search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \ - $(srcdir)/search.xml $(srcdir)/search.php.inc -- -@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \ -+ -@(if test -x $(bindir)/xmllint -a -x $(top_srcdir)/xsltproc/xsltproc; then \ - echo "Rebuilding search.php" ; \ - $(bindir)/xmllint --xinclude --nonet \ - $(srcdir)/search.xml | \ -- $(bindir)/xsltproc --nonet - search.templ \ -+ $(top_srcdir)/xsltproc/xsltproc --nonet - search.templ \ - > search.php ; else \ - echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi) - - $(WIN32_DIR)/libxslt.def.src: libxslt-api.xml -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -- $(bindir)/xsltproc -o $(WIN32_DIR)/libxslt.def.src \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ -+ $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libxslt.def.src \ - --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml ; fi ) - - $(WIN32_DIR)/libexslt.def.src: EXSLT/libexslt-api.xml -- -@(if [ -x $(bindir)/xsltproc ] ; then \ -- $(bindir)/xsltproc -o $(WIN32_DIR)/libexslt.def.src \ -+ -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \ -+ $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libexslt.def.src \ - --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml ; fi ) - - clean-local: diff --git a/textproc/libxslt/patches/patch-ag b/textproc/libxslt/patches/patch-ag deleted file mode 100644 index 5df4831fa42..00000000000 --- a/textproc/libxslt/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2010/04/13 16:14:03 drochner Exp $ - ---- configure.orig 2010-04-08 21:24:55.000000000 +0000 -+++ configure -@@ -13401,7 +13401,7 @@ done - VERSION_SCRIPT_FLAGS= - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= --test "`uname`" == "SunOS" && \ -+test "`uname`" = "SunOS" && \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," - - if test -n "$VERSION_SCRIPT_FLAGS"; then diff --git a/textproc/libxslt/patches/patch-libxslt_pattern.c b/textproc/libxslt/patches/patch-libxslt_pattern.c deleted file mode 100644 index da94c5469a8..00000000000 --- a/textproc/libxslt/patches/patch-libxslt_pattern.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-libxslt_pattern.c,v 1.1 2012/03/12 18:26:35 tez Exp $ - -Fix for CVE-2011-3970 from: - http://git.gnome.org/browse/libxslt/commit/?id=fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b -per https://bugzilla.redhat.com/show_bug.cgi?id=788826 - ---- libxslt/pattern.c.orig 2012-03-12 18:04:37.642761400 +0000 -+++ libxslt/pattern.c -@@ -1864,6 +1864,8 @@ xsltCompilePatternInternal(const xmlChar - while ((pattern[end] != 0) && (pattern[end] != '"')) - end++; - } -+ if (pattern[end] == 0) -+ break; - end++; - } - if (current == end) { |