From root@hilbert.suse.de Tue Jun  5 10:49:50 2018
From: root <root@hilbert.suse.de>
To: commit@lists.opensuse.org
Subject: commit tidy for openSUSE:Factory
Date: Tue, 05 Jun 2018 12:49:50 +0200
Message-ID: <20180605104950.822C810D4F@hilbert.suse.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3099056199304459387=="

--===============3099056199304459387==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello community,

here is the log from the commit of package tidy for openSUSE:Factory checked =
in at 2018-06-05 12:49:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tidy (Old)
 and      /work/SRC/openSUSE:Factory/.tidy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "tidy"

Tue Jun  5 12:49:46 2018 rev:23 rq:613466 version:5.6.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/tidy/tidy.changes	2017-05-18 20:42:03.49628297=
3 +0200
+++ /work/SRC/openSUSE:Factory/.tidy.new/tidy.changes	2018-06-05 12:49:48.968=
441228 +0200
@@ -1,0 +2,12 @@
+Thu May 31 21:50:49 UTC 2018 - jengelh(a)inai.de
+
+- Drop unmaintained Debian files
+- Update to new upstream release 5.6.0
+  * handle <table> in <table>
+  * Add support for <link>'s "as" attribute
+  * Add support for the "integrity" attribute (on
+    <link> and <script>)
+- Add 0001-Issue-656-protect-against-NULL-node-set-in-loop.diff
+- dynamic_library_build.diff: refreshed
+
+-------------------------------------------------------------------

Old:
----
  5.4.0.tar.gz
  debian.changelog
  debian.compat
  debian.control
  debian.libtidy-dev.install
  debian.libtidy5.install
  debian.rules
  debian.series
  debian.tidy.install
  tidy_5.2.0-1.dsc
  tidy_5.2.0.orig.tar.xz

New:
----
  0001-Issue-656-protect-against-NULL-node-set-in-loop.diff
  5.6.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tidy.spec ++++++
--- /var/tmp/diff_new_pack.6o5nmv/_old	2018-06-05 12:49:49.912406639 +0200
+++ /var/tmp/diff_new_pack.6o5nmv/_new	2018-06-05 12:49:49.916406492 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tidy
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define documentation    c0d1cd1
=20
 Name:           tidy
-Version:        5.4.0
+Version:        5.6.0
 Release:        0
 Summary:        Utility to Clean Up and Pretty-print HTML, XHTML or XML Mark=
up
 License:        W3C
@@ -37,11 +37,13 @@
 Patch0:         dynamic_library_build.diff
 Patch1:         test_fixes.diff
 Patch2:         fix_doxygen_paths.diff
+Patch3:         0001-Issue-656-protect-against-NULL-node-set-in-loop.diff
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  libxslt
+BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
=20
 %description
@@ -55,7 +57,7 @@
=20
 %package doc
 Summary:        Documentation for tidy and libtidy5
-Group:          Productivity/Publishing/HTML/Tools
+Group:          Documentation/HTML
 %if 0%{?suse_version} >=3D 1120
 BuildArch:      noarch
 %endif
@@ -65,7 +67,7 @@
=20
 %package -n libtidy5
 Summary:        Library to Clean Up and Pretty-print HTML, XHTML or XML Mark=
up
-Group:          Productivity/Publishing/HTML/Tools
+Group:          System/Libraries
 Provides:       libtidy =3D %{version}
 Obsoletes:      libtidy <=3D 1.0
=20
@@ -82,7 +84,7 @@
 "tidy".
=20
 %package -n libtidy-devel
-Summary:        Include Files and Libraries for Development
+Summary:        Development files for libtidy
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libtidy5 =3D %{version}
@@ -100,13 +102,14 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
=20
 %build
 %cmake \
     -DCMAKE_SKIP_RPATH:BOOL=3DOFF \
     -DINCLUDE_INSTALL_DIR:PATH=3Dinclude/%{name} \
-    -DTIDY_COMPAT_HEADERS:BOOL=3DON
-make %{?_smp_mflags}
+    -DTIDY_COMPAT_HEADERS:BOOL=3DON -DCMAKE_C_FLAGS_RELWITHDEBINFO=3D"-O0 -g=
gdb3"
+make %{?_smp_mflags} VERBOSE=3D1
 ../tidy-html5-doxygen/build_docs.sh
=20
 %install
@@ -139,5 +142,6 @@
 %{_includedir}/%{name}/buffio.h
 %{_includedir}/%{name}/platform.h
 %{_libdir}/libtidy.so
+%{_libdir}/pkgconfig/*.pc
=20
 %changelog

++++++ 0001-Issue-656-protect-against-NULL-node-set-in-loop.diff ++++++
>From a0414d65a69927808240e41c1235145413978c43 Mon Sep 17 00:00:00 2001
From: Geoff McLane <ubuntu(a)geoffair.info>
Date: Sat, 16 Dec 2017 20:54:29 +0100
Subject: [PATCH] Issue #656 - protect against NULL node set in loop

---
 src/clean.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/clean.c b/src/clean.c
index de4caf5..e96dd3f 100644
--- a/src/clean.c
+++ b/src/clean.c
@@ -2211,8 +2211,10 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
     tidyBufAppend(&charsetString, "charset=3D", 8);
     tidyBufAppend(&charsetString, (char*)enc, TY_(tmbstrlen)(enc));
     tidyBufAppend(&charsetString, "\0", 1); /* zero terminate the buffer */
-                                            /* process the children of the h=
ead */
-    for (currentNode =3D head->content; currentNode; currentNode =3D current=
Node->next)
+    /* process the children of the head */
+    /* Issue #656 - guard against 'currentNode' being set NULL in loop */
+    for (currentNode =3D head->content; currentNode;=20
+        currentNode =3D (currentNode ? currentNode->next : NULL))
     {
         if (!nodeIsMETA(currentNode))
             continue;   /* not a meta node */
--=20
2.16.3

++++++ 5.4.0.tar.gz -> 5.6.0.tar.gz ++++++
++++ 73560 lines of diff (skipped)

++++++ dynamic_library_build.diff ++++++
--- /var/tmp/diff_new_pack.6o5nmv/_old	2018-06-05 12:49:50.444387146 +0200
+++ /var/tmp/diff_new_pack.6o5nmv/_new	2018-06-05 12:49:50.444387146 +0200
@@ -1,80 +1,73 @@
-Index: tidy-html5-5.2.0/CMakeLists.txt
+---
+ CMakeLists.txt |   22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+Index: tidy-html5-5.6.0/CMakeLists.txt
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- tidy-html5-5.2.0.orig/CMakeLists.txt
-+++ tidy-html5-5.2.0/CMakeLists.txt
-@@ -37,17 +37,17 @@ else ()
- endif ()
-=20
- # By default, BOTH library types built, Allow turning OFF shared if not nee=
ded
+--- tidy-html5-5.6.0.orig/CMakeLists.txt
++++ tidy-html5-5.6.0/CMakeLists.txt
+@@ -75,15 +75,15 @@ endif ()
+ #   shared library can be turned off if not needed. The console program
+ #   can be configured for static linking or dynamic linking.
+ #------------------------------------------------------------------------
 -set( LIB_TYPE STATIC )  # set default message
--option( BUILD_SHARED_LIB "Set OFF to NOT build shared library"    ON  )
 +option( BUILD_STATIC_LIBS "Set ON to build static library"         ON )
-+option( BUILD_SHARED_LIBS "Set OFF to NOT build shared library"    ON  )
- option( BUILD_TAB2SPACE  "Set ON to build utility app, tab2space" OFF )
- option( BUILD_SAMPLE_CODE "Set ON to build the sample code"       OFF )
- if (NOT MAN_INSTALL_DIR)
-     set(MAN_INSTALL_DIR share/man/man1)
- endif ()
+=20
+-option( BUILD_SHARED_LIB "Set OFF to NOT build shared library"     ON  )
++option( BUILD_SHARED_LIBS "Set OFF to NOT build shared library"     ON  )
+=20
  # Issue #326 - Allow linkage choice of console app tidy
 -option( TIDY_CONSOLE_SHARED "Set ON to link with shared(DLL) lib." OFF )
 +option( TIDY_CONSOLE_SHARED "Set OFF to link with static lib." ON )
+=20
  if (TIDY_CONSOLE_SHARED)
 -    if (NOT BUILD_SHARED_LIB)
 +    if (NOT BUILD_SHARED_LIBS)
          message(FATAL_ERROR "Enable shared build for this tidy linkage!")
      endif ()
  endif ()
-@@ -112,7 +112,7 @@ if (SUPPORT_GETPWNAM)
-     add_definitions( -DSUPPORT_GETPWNAM=3D1 )
- endif ()
-=20
+@@ -310,7 +310,7 @@ endif ()
+ # Shared Library
+ #   Setup whether or not we will build the shared library.
+ #------------------------------------------------------------------------
 -if(BUILD_SHARED_LIB)
 +if(BUILD_SHARED_LIBS)
     set(LIB_TYPE SHARED)
     message(STATUS "*** Also building DLL library ${LIB_TYPE}, version ${LIB=
TIDY_VERSION}, date ${LIBTIDY_DATE}")
  else()
-@@ -167,28 +167,28 @@ if (NOT INCLUDE_INSTALL_DIR)
-     set(INCLUDE_INSTALL_DIR include)
- endif ()
+@@ -379,28 +379,30 @@ endif ()
 =20
--# Always build the STATIC library
--set(name tidy-static)
--add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
--set_target_properties( ${name} PROPERTIES=20
--    OUTPUT_NAME ${LIB_NAME}s
--    )
+ #------------------------------------------------------------------------
+ # Static Library
+-#   The static library always builds.
+ #------------------------------------------------------------------------
++if (BUILD_STATIC_LIBS)
+ set(name tidy-static)
+ add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
+ set_target_properties( ${name} PROPERTIES=20
+                        OUTPUT_NAME ${LIB_NAME}s )
 -if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage
--    list ( APPEND add_LIBS ${name} )
--endif ()   =20
--install(TARGETS ${name}
++if (NOT TIDY_CONSOLE_SHARED) # user wants static linkage
+     list ( APPEND add_LIBS ${name} )
+ endif ()   =20
+ install(TARGETS ${name}
 -        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
--        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+if (BUILD_STATIC_LIBS)
-+    set(name tidy-static)
-+    add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
-+    set_target_properties( ${name} PROPERTIES
-+        OUTPUT_NAME ${LIB_NAME}
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+         LIBRARY DESTINATION ${LIB_INSTALL_DIR}
          )
-+    if (NOT TIDY_CONSOLE_SHARED) # user wants static linkage
-+        list ( APPEND add_LIBS ${name} )
-+    endif ()
-+    install(TARGETS ${name}
-+            ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+            )
-+endif ()
-+
++endif()
++install(TARGETS ${name}
++        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++        )
  install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} )
- ########################################
--# if user option still on
+=20
+=20
+ #------------------------------------------------------------------------
+ # Dynamic Library
+-#   If the user option is still on.
+ #------------------------------------------------------------------------
 -if (BUILD_SHARED_LIB)
 +if (BUILD_SHARED_LIBS)
      set(name tidy-share)
-     add_library ( ${name} SHARED ${CFILES} ${HFILES} ${LIBHFILES} )
-     set_target_properties( ${name} PROPERTIES=20
--                                    OUTPUT_NAME ${LIB_NAME} )
-+                                   OUTPUT_NAME ${LIB_NAME} )
-     set_target_properties( ${name} PROPERTIES
-                                    VERSION   ${LIBTIDY_VERSION}
-                                    SOVERSION ${TIDY_MAJOR_VERSION} )
+     if (UNIX AND APPLE)
+         set(CMAKE_MACOSX_RPATH 1)


--===============3099056199304459387==--