Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package html-xml-utils for openSUSE:Factory checked in at 2022-04-08 22:46:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/html-xml-utils (Old) and /work/SRC/openSUSE:Factory/.html-xml-utils.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "html-xml-utils" Fri Apr 8 22:46:30 2022 rev:10 rq:967899 version:8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/html-xml-utils/html-xml-utils.changes 2022-02-18 23:03:57.429408090 +0100 +++ /work/SRC/openSUSE:Factory/.html-xml-utils.new.1900/html-xml-utils.changes 2022-04-08 22:46:58.866298467 +0200 @@ -1,0 +2,11 @@ +Fri Apr 1 18:43:35 UTC 2022 - Sebastian Wagner <sebix+novell....@sebix.at> + +- Update to version 8.4: + * hxselect.c: The :attr() pseudo-element was only matched if it + was on the first selector, not if it was on a subsequent selector + in a comma-separated list of selectors. (Found and fixed by Bas + Ploeger.) + * tests/select33.sh: Added test for multiple :attr() + selectors. (Contributed by Bas Ploeger.) + +------------------------------------------------------------------- Old: ---- html-xml-utils-8.3.tar.gz New: ---- html-xml-utils-8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ html-xml-utils.spec ++++++ --- /var/tmp/diff_new_pack.LHsqfd/_old 2022-04-08 22:46:59.550290876 +0200 +++ /var/tmp/diff_new_pack.LHsqfd/_new 2022-04-08 22:46:59.554290831 +0200 @@ -17,7 +17,7 @@ Name: html-xml-utils -Version: 8.3 +Version: 8.4 Release: 0 Summary: A number of utilities for manipulating HTML and XML files License: W3C ++++++ html-xml-utils-8.3.tar.gz -> html-xml-utils-8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/ChangeLog new/html-xml-utils-8.4/ChangeLog --- old/html-xml-utils-8.3/ChangeLog 2022-02-10 17:46:47.000000000 +0100 +++ new/html-xml-utils-8.4/ChangeLog 2022-04-01 14:17:24.000000000 +0200 @@ -1,5 +1,17 @@ +2022-04-01 Bert Bos <b...@nyx.sophia.w3.org> + + * hxselect.c: The :attr() pseudo-element was only matched if it + was on the first selector, not if it was on a subsequent selector + in a comma-separated list of selectors. (Found and fixed by Bas + Ploeger.) + + * tests/select33.sh: Added test for multiple :attr() + selectors. (Contributed by Bas Ploeger.) + 2022-02-10 Bert Bos <b...@w3.org> + * Rekleased version 8.3. + * dtd.hash: Make <head> rather than <body> the preferred parent for <script>. Allow text in the <body> element, without requiring a <p> or other element around it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/Makefile.am new/html-xml-utils-8.4/Makefile.am --- old/html-xml-utils-8.3/Makefile.am 2022-02-09 22:42:57.000000000 +0100 +++ new/html-xml-utils-8.4/Makefile.am 2022-04-01 14:02:42.000000000 +0200 @@ -202,7 +202,7 @@ tests/select22.sh tests/select23.sh tests/select24.sh\ tests/select25.sh tests/select26.sh tests/select27.sh\ tests/select28.sh tests/select29.sh tests/select30.sh\ - tests/select31.sh tests/select32.sh\ + tests/select31.sh tests/select32.sh tests/select33.sh\ tests/tabletrans1.sh tests/tabletrans2.sh tests/tabletrans3.sh\ tests/tabletrans4.sh tests/tabletrans5.sh\ tests/toc1.sh tests/toc2.sh tests/toc3.sh tests/toc4.sh\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/Makefile.in new/html-xml-utils-8.4/Makefile.in --- old/html-xml-utils-8.3/Makefile.in 2022-02-10 17:47:33.000000000 +0100 +++ new/html-xml-utils-8.4/Makefile.in 2022-04-01 14:21:56.000000000 +0200 @@ -978,7 +978,7 @@ tests/select22.sh tests/select23.sh tests/select24.sh\ tests/select25.sh tests/select26.sh tests/select27.sh\ tests/select28.sh tests/select29.sh tests/select30.sh\ - tests/select31.sh tests/select32.sh\ + tests/select31.sh tests/select32.sh tests/select33.sh\ tests/tabletrans1.sh tests/tabletrans2.sh tests/tabletrans3.sh\ tests/tabletrans4.sh tests/tabletrans5.sh\ tests/toc1.sh tests/toc2.sh tests/toc3.sh tests/toc4.sh\ @@ -2454,6 +2454,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/select33.sh.log: tests/select33.sh + @p='tests/select33.sh'; \ + b='tests/select33.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) tests/tabletrans1.sh.log: tests/tabletrans1.sh @p='tests/tabletrans1.sh'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/configure new/html-xml-utils-8.4/configure --- old/html-xml-utils-8.3/configure 2022-02-10 17:47:32.000000000 +0100 +++ new/html-xml-utils-8.4/configure 2022-04-01 14:21:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for html-xml-utils 8.3. +# Generated by GNU Autoconf 2.69 for html-xml-utils 8.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='html-xml-utils' PACKAGE_TARNAME='html-xml-utils' -PACKAGE_VERSION='8.3' -PACKAGE_STRING='html-xml-utils 8.3' +PACKAGE_VERSION='8.4' +PACKAGE_STRING='html-xml-utils 8.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1303,7 +1303,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures html-xml-utils 8.3 to adapt to many kinds of systems. +\`configure' configures html-xml-utils 8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1374,7 +1374,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of html-xml-utils 8.3:";; + short | recursive ) echo "Configuration of html-xml-utils 8.4:";; esac cat <<\_ACEOF @@ -1484,7 +1484,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -html-xml-utils configure 8.3 +html-xml-utils configure 8.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2079,7 +2079,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by html-xml-utils $as_me 8.3, which was +It was created by html-xml-utils $as_me 8.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2937,7 +2937,7 @@ # Define the identity of the package. PACKAGE='html-xml-utils' - VERSION='8.3' + VERSION='8.4' cat >>confdefs.h <<_ACEOF @@ -8529,7 +8529,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by html-xml-utils $as_me 8.3, which was +This file was extended by html-xml-utils $as_me 8.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8595,7 +8595,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -html-xml-utils config.status 8.3 +html-xml-utils config.status 8.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/configure.ac new/html-xml-utils-8.4/configure.ac --- old/html-xml-utils-8.3/configure.ac 2022-02-10 17:47:12.000000000 +0100 +++ new/html-xml-utils-8.4/configure.ac 2022-04-01 14:21:41.000000000 +0200 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([html-xml-utils],[8.3]) +AC_INIT([html-xml-utils],[8.4]) dnl print all automake warnings with -Wall dnl http://sources.redhat.com/automake/automake.html#Options AM_INIT_AUTOMAKE([-Wall]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/hxselect.c new/html-xml-utils-8.4/hxselect.c --- old/html-xml-utils-8.3/hxselect.c 2018-02-23 15:29:48.000000000 +0100 +++ new/html-xml-utils-8.4/hxselect.c 2022-04-01 14:20:57.000000000 +0200 @@ -42,7 +42,7 @@ * * Author: Bert Bos <b...@w3.org> * Created: 5 Jul 2001 - * Version: $Id: hxselect.c,v 1.10 2017/11/24 09:50:25 bbos Exp $ + * Version: $Id: hxselect.c,v 1.11 2022/04/01 12:20:57 bbos Exp $ * **/ #include "config.h" @@ -156,19 +156,22 @@ static void match_pseudoelts(Tree t) { pairlist p; + Selector s; - assert(selector->pseudoelts); + for (s = selector; s; s = s->next) { + if (!s->pseudoelts) continue; - /* ::attr() is the only pseudo-element we can handle so far */ - if (selector->pseudoelts->type == AttrNode) { - assert(selector->combinator == Child && selector->context); - p = t->attribs; - while (p && !same(p->name, selector->pseudoelts->s)) p = p->next; - if (p && matches_sel(t, selector->context)) { - if (!content_only) printf("%s=\"", p->name); - printf("%s", p->value); - if (!content_only) printf("\""); - printsep(separator); + /* ::attr() is the only pseudo-element we can handle so far */ + if (s->pseudoelts->type == AttrNode) { + assert(s->combinator == Child && s->context); + p = t->attribs; + while (p && !same(p->name, s->pseudoelts->s)) p = p->next; + if (p && matches_sel(t, s->context)) { + if (!content_only) printf("%s=\"", p->name); + printf("%s", p->value); + if (!content_only) printf("\""); + printsep(separator); + } } } } @@ -181,8 +184,8 @@ switch (t->tp) { case Element: - if (selector->pseudoelts) match_pseudoelts(t); - else if (matches_sel(t, selector)) print_tree(t); + if (matches_sel(t, selector)) print_tree(t); + match_pseudoelts(t); walk_tree(t->children); break; case Text: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/selector.c new/html-xml-utils-8.4/selector.c --- old/html-xml-utils-8.3/selector.c 2021-12-17 10:48:26.000000000 +0100 +++ new/html-xml-utils-8.4/selector.c 2022-04-01 14:18:38.000000000 +0200 @@ -10,7 +10,7 @@ * * Author: Bert Bos <b...@w3.org> * Created: 8 July 2001 - * Version: $Id: selector.c,v 1.17 2021/04/15 21:00:55 bbos Exp $ + * Version: $Id: selector.c,v 1.18 2022/04/01 12:18:38 bbos Exp $ **/ #include "config.h" @@ -40,7 +40,7 @@ EXPORT typedef struct _PseudoCond { PseudoType type; int a, b; /* :nth-child(an+b) */ - string s; /* :lang(s) */ + string s; /* :lang(s), attr(s) */ struct _SimpleSelector *sel; /* :not(sel), :is(sel,...) */ struct _PseudoCond *next; } PseudoCond; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-8.3/tests/select33.sh new/html-xml-utils-8.4/tests/select33.sh --- old/html-xml-utils-8.3/tests/select33.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/html-xml-utils-8.4/tests/select33.sh 2022-04-01 14:09:02.000000000 +0200 @@ -0,0 +1,20 @@ +: + +trap 'rm $TMP1 $TMP2' 0 +TMP1=`mktemp /tmp/addidXXXXXXXX` || exit 1 +TMP2=`mktemp /tmp/addidXXXXXXXX` || exit 1 + +./hxselect -s '\n' 'q, p::attr(title), p, span::attr(value)' >$TMP1 <<-EOF + <div> + <p title="Select this.">And this.</p> + <span value="And this.">Not this.</span> + </div> +EOF + +cat >$TMP2 <<-EOF +<p title="Select this.">And this.</p> +title="Select this." +value="And this." +EOF + +diff -u $TMP2 $TMP1