From e83d551b92476583f177700d3df003089c02d0ae1540f1a548c241d9a68265c0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 24 Jul 2023 19:29:33 +0000
Subject: [PATCH] Accepting request 1100410 from
 home:gkenion:branches:Java:packages

- Update upstream from abandoned sourceforge to actively maintained
  github
- bsc#1212404 (CVE-2023-34623): Prevent crash when parsing
  documents with excessive nesting. (community fix, part of v1.0.4)

OBS-URL: https://build.opensuse.org/request/show/1100410
OBS-URL: https://build.opensuse.org/package/show/Java:packages/jtidy?expand=0&rev=18
---
 jtidy-1.0.4.tar.gz |  3 +++
 jtidy-build.xml    |  2 +-
 jtidy-r813.tar.bz2 |  3 ---
 jtidy.changes      |  8 ++++++++
 jtidy.spec         | 13 +++++--------
 5 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 jtidy-1.0.4.tar.gz
 delete mode 100644 jtidy-r813.tar.bz2

diff --git a/jtidy-1.0.4.tar.gz b/jtidy-1.0.4.tar.gz
new file mode 100644
index 0000000..b374dc3
--- /dev/null
+++ b/jtidy-1.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1df3eca7077a1290f1e9b633422a3d8ac4f2fc5a0f487a129a193d58b039ea45
+size 684942
diff --git a/jtidy-build.xml b/jtidy-build.xml
index 8cfe5b2..aa5c844 100644
--- a/jtidy-build.xml
+++ b/jtidy-build.xml
@@ -6,7 +6,7 @@
   <!-- Build environment properties                                           -->
   <!-- ====================================================================== -->
 
-  <property name="build.finalName" value="jtidy-8.0"/>
+  <property name="build.finalName" value="jtidy-1.0.4"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
diff --git a/jtidy-r813.tar.bz2 b/jtidy-r813.tar.bz2
deleted file mode 100644
index 7ac37a7..0000000
--- a/jtidy-r813.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef3a8d5094281ce419aaabd16474971e8b656c9056dac5d4eedb608fb44d9712
-size 319238
diff --git a/jtidy.changes b/jtidy.changes
index c135f30..1472976 100644
--- a/jtidy.changes
+++ b/jtidy.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 24 14:15:22 UTC 2023 - Gus Kenion <gkenion@suse.com>
+
+- Update upstream from abandoned sourceforge to actively maintained
+  github
+- bsc#1212404 (CVE-2023-34623): Prevent crash when parsing
+  documents with excessive nesting. (community fix, part of v1.0.4)
+
 -------------------------------------------------------------------
 Sun Mar 20 12:39:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jtidy.spec b/jtidy.spec
index 7166132..f3668a8 100644
--- a/jtidy.spec
+++ b/jtidy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jtidy
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,16 +24,13 @@
 %define section free
 %bcond_with             maven
 Name:           jtidy
-Version:        8.0
+Version:        1.0.4
 Release:        0
 Summary:        HTML syntax checker and pretty printer
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-URL:            http://jtidy.sourceforge.net/
-# svn export -r813 http://svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy
-# # bnc#501764
-# rm jtidy/src/config/clover.license
-Source0:        jtidy-r813.tar.bz2
+URL:            https://github.com/jtidy/jtidy
+Source0:        https://github.com/jtidy/jtidy/archive/refs/tags/jtidy-1.0.4.tar.gz
 Source1:        jtidy-build.xml
 BuildRequires:  ant >= 1.6
 BuildRequires:  ant-junit
@@ -74,7 +71,7 @@ cleaning up malformed and faulty HTML. In addition, JTidy provides a
 DOM parser for real-world HTML.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{name}-%{version}
 cp -p %{SOURCE1} build.xml
 
 %build