[pkgsrc/trunk]: pkgsrc/textproc textproc/libxml2: Update to 2.9.13

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc textproc/libxml2: Update to 2.9.13
From: kim <kim%pkgsrc.org@localhost>
Date: Sat, 12 Mar 2022 08:58:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1594aa3d228
branches:  trunk
changeset: 375318:c1594aa3d228
user:      kim <kim%pkgsrc.org@localhost>
date:      Sat Mar 12 07:33:22 2022 +0000

description:
textproc/libxml2: Update to 2.9.13

NEWS:

v2.9.13: Feb 19 2022:
   - Security:
  [CVE-2022-23308] Use-after-free of ID and IDREF attributes
  (Thanks to Shinji Sato for the report)
  Use-after-free in xmlXIncludeCopyRange (David Kilzer)
  Fix Null-deref-in-xmlSchemaGetComponentTargetNs (huangduirong)
  Fix memory leak in xmlXPathCompNodeTest
  Fix null pointer deref in xmlStringGetNodeList
  Fix several memory leaks found by Coverity (David King)

   - Fixed regressions:
  Fix regression in RelaxNG pattern matching
  Properly handle nested documents in xmlFreeNode
  Fix regression with PEs in external DTD
  Fix random dropping of characters on dumping ASCII encoded XML (Mohammad Razavi)
  Revert "Make schema validation fail with multiple top-level elements"
  Fix regression when parsing invalid HTML tags in push mode
  Fix regression parsing public IDs literals in HTML
  Fix buffering in xmlOutputBufferWrite
  Fix whitespace when serializing empty HTML documents
  Fix XPath recursion limit
  Fix regression in xmlNodeDumpOutputInternal
  Work around lxml API abuse

   - Bug fixes:
  Fix xmlSetTreeDoc with entity references
  Fix double counting of CRLF in comments
  Make sure to grow input buffer in xmlParseMisc
  Don't ignore xmllint options after "-"
  Don't normalize namespace URIs in XPointer xmlns() scheme
  Fix handling of XSD with empty namespace
  Also register HTML document nodes
  Make xmllint return an error if arguments are missing
  Fix handling of ctxt->base in xmlXPtrEvalXPtrPart
  Fix xmllint --maxmem
  Fix htmlReadFd, which was using a mix of xml and html context functions (Finn Barber)
  Move current position before possible calling of ctxt->sax->characters (Yulin Li)
  Fix parse failure when 4-byte character in UTF-16 BE is split across a chunk (David Kilzer)
  Patch to forbid epsilon-reduction of final states (Arne Becker)
  Avoid segfault at exit when using custom memory functions (Mike Dalessio)

   - Tests, code quality, fuzzing:
  Remove .travis.yml
  Make xmlFuzzReadString return a zero size in error case
  Fix unused function warning in testapi.c
  Update NewsML DTD in test suite
  Add more checks for malloc failures in xmllint.c
  Avoid potential integer overflow in xmlstring.c
  Run CI tests with UBSan implicit-conversion checks
  Fix casting of line numbers in SAX2.c
  Fix integer conversion warnings in hash.c
  Add explicit casts in runtest.c
  Fix integer conversion warning in xmlIconvWrapper
  Add suffix to unsigned constant in xmlmemory.c
  Add explicit casts in testchar.c
  Fix integer conversion warnings in xmlstring.c
  Add explicit cast in xmlURIUnescapeString
  Remove unused variable in xmlCharEncOutFunc (David King)

   - Build system, portability:
  Remove xmlwin32version.h
  Fix fuzzer test with VPATH build
  Support custom prefix when installing Python module
  Remove Makefile.win
  Remove CVS and SVN-related code
  Port python 3.x module to Windows and improve distutils (Chun-wei Fan)
  Correctly install the HTML examples into their subdirectory (Mattia Rizzolo)
  Refactor the settings of $docdir (Mattia Rizzolo)
  Remove unused configure checks (Ben Boeckel)
  python/Makefile.am: use *_LIBADD, not *_LDFLAGS for LIBS (Sam James)
  Fix check for libtool in autogen.sh
  Use version in configure.ac for CMake (Timothy Lyanguzov)
  Add CMake alias targets for embedded projects (Markus Rickert)

   - Documentation:
  Remove SVN keyword anchors
  Rework README
  Remove README.cvs-commits
  Remove old ChangeLog
  Update hyperlinks
  Remove README.docs
  Remove MAINTAINERS
  Remove xmltutorial.pdf
  Upload documentation to GitLab pages
  Document how to escape XML_CATALOG_FILES
  Fix libxml2.doap
  Update URL for libxml++ C++ binding (Kjell Ahlstedt)
  Generate devhelp2 index file (Emmanuele Bassi)
  Mention XML_CATALOG_FILES is space-separated (Jan Tojnar)
  Add documentaiton for xmllint exit code 10 (Rainer Canavan)
  Fix some validation errors in the FAQ (David King)
  Add instructions on how to use CMake to compile libxml (Markus Rickert)

diffstat:

 textproc/libxml2/Makefile                               |   8 +++--
 textproc/libxml2/Makefile.common                        |   7 ++--
 textproc/libxml2/PLIST                                  |   7 ++--
 textproc/libxml2/distinfo                               |  16 +++++-----
 textproc/libxml2/patches/patch-Makefile.in              |  14 +++++-----
 textproc/libxml2/patches/patch-configure                |  22 ++++++++--------
 textproc/libxml2/patches/patch-doc_examples_Makefile.in |  16 ++++++-----
 textproc/libxml2/patches/patch-python_setup.py          |  23 +++-------------
 textproc/py-libxml2/Makefile                            |   5 +--
 9 files changed, 54 insertions(+), 64 deletions(-)

diffs (truncated from 304 to 300 lines):

diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/Makefile
--- a/textproc/libxml2/Makefile Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/Makefile Sat Mar 12 07:33:22 2022 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.161 2021/12/08 16:02:43 adam Exp $
+# $NetBSD: Makefile,v 1.162 2022/03/12 07:33:22 kim Exp $
 
-PKGREVISION=   2
 .include "../../textproc/libxml2/Makefile.common"
 
 COMMENT=       XML parser library from the GNOME project
@@ -10,7 +9,7 @@
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-html-subdir=libxml2
+CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc/libxml2
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --with-lzma=${BUILDLINK_PREFIX.xz}
@@ -41,6 +40,9 @@
 
 LDFLAGS.SCO_SV+=       -lm
 
+post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/share/examples/libxml2/README
+
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/Makefile.common
--- a/textproc/libxml2/Makefile.common  Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/Makefile.common  Sat Mar 12 07:33:22 2022 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.14 2021/05/23 19:31:47 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2022/03/12 07:33:22 kim Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
-DISTNAME=      libxml2-2.9.12
+DISTNAME=      libxml2-2.9.13
 CATEGORIES=    textproc
-MASTER_SITES=  http://xmlsoft.org/sources/
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libxml2/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmlsoft.org/
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/PLIST
--- a/textproc/libxml2/PLIST    Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/PLIST    Sat Mar 12 07:33:22 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2019/11/06 13:19:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.47 2022/03/12 07:33:22 kim Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -58,7 +58,7 @@
 man/man1/xmllint.1
 man/man3/libxml.3
 share/aclocal/libxml.m4
-share/doc/${PKGNAME}/Copyright
+share/doc/libxml2/Copyright
 share/doc/libxml2/DOM.gif
 share/doc/libxml2/FAQ.html
 share/doc/libxml2/Libxml2-Logo-180x168.gif
@@ -197,7 +197,6 @@
 share/doc/libxml2/tutorial/includexpath.c
 share/doc/libxml2/tutorial/index.html
 share/doc/libxml2/tutorial/ix01.html
-share/doc/libxml2/tutorial/xmltutorial.pdf
 share/doc/libxml2/w3c.png
 share/doc/libxml2/writer.xml
 share/doc/libxml2/xml.html
@@ -260,7 +259,7 @@
 share/gtk-doc/html/libxml2/libxml2-xpath.html
 share/gtk-doc/html/libxml2/libxml2-xpathInternals.html
 share/gtk-doc/html/libxml2/libxml2-xpointer.html
-share/gtk-doc/html/libxml2/libxml2.devhelp
+share/gtk-doc/html/libxml2/libxml2.devhelp2
 share/gtk-doc/html/libxml2/right.png
 share/gtk-doc/html/libxml2/style.css
 share/gtk-doc/html/libxml2/up.png
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/distinfo Sat Mar 12 07:33:22 2022 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.139 2021/10/26 11:22:18 nia Exp $
+$NetBSD: distinfo,v 1.140 2022/03/12 07:33:22 kim Exp $
 
-BLAKE2s (libxml2-2.9.12.tar.gz) = 5981ff71b585818844b511e55f7236daa81a2503b9705a29fd1a5af5141a56c4
-SHA512 (libxml2-2.9.12.tar.gz) = df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
-Size (libxml2-2.9.12.tar.gz) = 5681632 bytes
-SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
+BLAKE2s (libxml2-2.9.13.tar.xz) = 9732a7ca21df7ae1ee823ea08f182c0f1e2e52c5019fc0900eff925d2101d761
+SHA512 (libxml2-2.9.13.tar.xz) = fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5
+Size (libxml2-2.9.13.tar.xz) = 3243336 bytes
+SHA1 (patch-Makefile.in) = 4e3a3c20ce388de040b865dab73b0190ed6bdf0a
 SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
-SHA1 (patch-configure) = 313d8067c8ff76472cc834af4e54a992bb377f01
-SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
+SHA1 (patch-configure) = 3b4cbb36602c11fe73ba1a6e327fd4810b835380
+SHA1 (patch-doc_examples_Makefile.in) = d81b7b9285e207fc53acc6981c67768b686ff5fb
 SHA1 (patch-encoding.c) = 62b3343f0a0ea51e3fb8eb693e495520eefb6ffd
 SHA1 (patch-python_libxml.c) = a8d89922589f51db99c2b8960b32d37ddda8a7a9
 SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
 SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
-SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
+SHA1 (patch-python_setup.py) = 2e712778a35cad9a167eeec7884748cf3f2090a9
 SHA1 (patch-xmlcatalog.c) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/patches/patch-Makefile.in
--- a/textproc/libxml2/patches/patch-Makefile.in        Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/patches/patch-Makefile.in        Sat Mar 12 07:33:22 2022 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2022/03/12 07:33:22 kim Exp $
 
 Move EXAMPLES_DIR to fit pkgsrc.
 
---- Makefile.in.orig   2014-10-16 07:35:13.000000000 +0000
-+++ Makefile.in
-@@ -835,7 +835,7 @@ cmake_DATA = libxml2-config.cmake
+--- Makefile.in.orig   2022-02-20 12:11:09.000000000 +0000
++++ Makefile.in        2022-03-12 06:35:56.019772087 +0000
+@@ -877,7 +877,7 @@
  #
- BASE_DIR = $(datadir)/doc
- DOC_MODULE = libxml2-$(VERSION)
--EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
+ # Install the tests program sources as examples 
+ #
+-EXAMPLES_DIR = $(docdir)/examples
 +EXAMPLES_DIR = $(datadir)/examples/libxml2
  
  #
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/patches/patch-configure
--- a/textproc/libxml2/patches/patch-configure  Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/patches/patch-configure  Sat Mar 12 07:33:22 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2021/07/21 13:55:07 tnn Exp $
+$NetBSD: patch-configure,v 1.4 2022/03/12 07:33:22 kim Exp $
 
 Various configure fixes:
  * Don't leak non-existent include directories to xml2-config.
@@ -9,9 +9,9 @@
  * Fix test for SAX
    Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
 
---- configure.orig     2021-05-13 18:54:55.000000000 +0000
-+++ configure
-@@ -15005,7 +15005,7 @@ fi
+--- configure.orig     2022-02-20 12:11:10.000000000 +0000
++++ configure  2022-03-12 06:29:48.961424860 +0000
+@@ -14898,7 +14898,7 @@
  fi
  
  
@@ -20,7 +20,7 @@
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
-@@ -15478,13 +15478,13 @@ else
+@@ -15371,13 +15371,13 @@
          if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
              ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
  if test "x$ac_cv_header_pthread_h" = xyes; then :
@@ -37,16 +37,16 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -15516,7 +15516,7 @@ fi
+@@ -15409,7 +15409,7 @@
  $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
  
 -                THREAD_LIBS="-lpthread"
 +                THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  
- $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
+ $as_echo "#define HAVE_PTHREAD_H /**/" >>confdefs.h
  
-@@ -15538,12 +15538,12 @@ fi
+@@ -15428,12 +15428,12 @@
         *beos*) WITH_THREADS="1"
           THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
         ;;
@@ -61,7 +61,7 @@
                   if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
                   then
                       THREAD_LIBS=""
-@@ -15560,6 +15560,10 @@ fi
+@@ -15450,6 +15450,10 @@
               fi
           fi
         ;;
@@ -72,7 +72,7 @@
      esac
      if test "$WITH_THREADS" = "1" ; then
        THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -15830,7 +15834,7 @@ else
+@@ -15720,7 +15724,7 @@
      TEST_SAX=SAXtests
  fi
  
@@ -81,7 +81,7 @@
    WITH_SAX1_SOURCES_TRUE=
    WITH_SAX1_SOURCES_FALSE='#'
  else
-@@ -16015,7 +16019,7 @@ WITH_ICONV=0
+@@ -15905,7 +15909,7 @@
  if test "$with_iconv" = "no" ; then
      echo Disabling ICONV support
  else
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/patches/patch-doc_examples_Makefile.in
--- a/textproc/libxml2/patches/patch-doc_examples_Makefile.in   Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/patches/patch-doc_examples_Makefile.in   Sat Mar 12 07:33:22 2022 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-doc_examples_Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
+$NetBSD: patch-doc_examples_Makefile.in,v 1.2 2022/03/12 07:33:22 kim Exp $
 
 Don't install html files.
 
---- doc/examples/Makefile.in.orig      2014-10-16 07:35:13.000000000 +0000
-+++ doc/examples/Makefile.in
-@@ -916,7 +916,7 @@ uninstall-am:
+--- doc/examples/Makefile.in.orig      2022-02-20 12:11:09.000000000 +0000
++++ doc/examples/Makefile.in   2022-03-12 06:46:08.723880132 +0000
+@@ -974,8 +974,8 @@
+ @REBUILD_DOCS_TRUE@   -cd $(srcdir) && xmllint --valid --noout index.html
  
  install-data-local: 
-       $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
--      -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
-+      -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+-      $(MKDIR_P) $(DESTDIR)$(HTML_DIR)/examples
+-      -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples/
++      $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
++      -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/
  
  clean-local:
        test -f Makefile.am || rm -f test?.xml
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/libxml2/patches/patch-python_setup.py
--- a/textproc/libxml2/patches/patch-python_setup.py    Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/libxml2/patches/patch-python_setup.py    Sat Mar 12 07:33:22 2022 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-python_setup.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $
+$NetBSD: patch-python_setup.py,v 1.2 2022/03/12 07:33:22 kim Exp $
 
 Trust pkgsrc to know which iconv to use.
 It will be either in the buildlink directory, or in the compiler's
 default search path.
 
---- python/setup.py.orig       2014-10-16 07:35:21.000000000 +0000
-+++ python/setup.py
-@@ -56,11 +56,7 @@ else:
- # - iconv.h
+--- python/setup.py.orig       2022-02-20 12:11:17.000000000 +0000
++++ python/setup.py    2022-03-12 06:40:36.426429987 +0000
+@@ -66,11 +66,7 @@
+ # - libxml2/libxml/tree.h
  # - libxslt/xsltconfig.h
  includes_dir = [
 -"/usr/include",
@@ -19,16 +19,3 @@
  ];
  
  xml_includes=""
-@@ -73,11 +69,7 @@ if xml_includes == "":
-     print("failed to find headers for libxml2: update includes_dir")
-     sys.exit(1)
- 
--iconv_includes=""
--for dir in includes_dir:
--    if not missing(dir + "/iconv.h"):
--        iconv_includes=dir
--        break;
-+iconv_includes=os.path.join(ROOT,'include')
- 
- if iconv_includes == "":
-     print("failed to find headers for libiconv: update includes_dir")
diff -r f9d8cf811be9 -r c1594aa3d228 textproc/py-libxml2/Makefile
--- a/textproc/py-libxml2/Makefile      Sat Mar 12 07:28:19 2022 +0000
+++ b/textproc/py-libxml2/Makefile      Sat Mar 12 07:33:22 2022 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2022/01/14 14:12:03 tnn Exp $
+# $NetBSD: Makefile,v 1.78 2022/03/12 07:33:22 kim Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   5
 
 COMMENT=       Python wrapper for libxml2
 LICENSE=       modified-bsd
@@ -17,7 +16,7 @@
 SUBST_MESSAGE.setup=   Fixing hardcoded paths.
 SUBST_STAGE.setup=     pre-build
 SUBST_FILES.setup=     python/setup.py
-SUBST_SED.setup=       -e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/py-libxml2 to 2.9.13
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils sysutils: Use hacks.mk to avoid NetBSD msgfmt...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/py-libxml2 to 2.9.13
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils sysutils: Use hacks.mk to avoid NetBSD msgfmt...
Indexes:
Home | Main Index | Thread Index | Old Index