From ac8f9a7430f3ba5bd19ad98d72e342ed8745edd2 Mon Sep 17 00:00:00 2001
From: Xavier Bachelot <xavier@bachelot.org>
Date: Mon, 8 Nov 2021 18:50:27 +0100
Subject: [PATCH] Update to 0.99.beta20

---
 .gitignore   |  1 +
 libcaca.spec | 23 +++++++++++++++++------
 sources      |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07a0d9e..d2c01d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libcaca-0.99.beta17.tar.gz
 /libcaca-0.99.beta18.tar.gz
 /libcaca-0.99.beta19.tar.gz
+/libcaca-0.99.beta20.tar.bz2
diff --git a/libcaca.spec b/libcaca.spec
index 8ebbd11..6842e68 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -1,15 +1,15 @@
 %{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]')}
 %{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]')}
 
-%define beta beta19
+%define beta beta20
 
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.55.%{beta}%{?dist}
+Release: 0.56.%{beta}%{?dist}
 License: WTFPL
 URL: http://caca.zoy.org/wiki/libcaca
-Source: http://caca.zoy.org/files/libcaca/libcaca-%{version}.%{beta}.tar.gz
+Source0: https://github.com/cacalabs/libcaca/releases/download/v%{version}.%{beta}/%{name}-%{version}.%{beta}.tar.bz2
 Patch0: libcaca-0.99.beta16-multilib.patch
 BuildRequires: gcc-c++
 BuildRequires: slang-devel
@@ -139,10 +139,10 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev
 
 %files
 %doc COPYING
-%{_libdir}/*.so.*
+%{_libdir}/*.so.0*
 
 %files devel
-%doc ChangeLog libcaca-dev-docs/html/
+%doc libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -180,6 +180,17 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev
 
 
 %changelog
+* Mon Nov 08 2021 Xavier Bachelot <xaver@bachelot.org> - 0.99-0.56.beta20
+- Update to 0.99.beta20. Fixes :
+  - CVE-2018-20544, CVE-2018-20545, CVE-2018-20546, CVE-2018-20547,
+    CVE-2018-20548, CVE-2018-20549 (RHBZ#1687860)
+  - CVE-2021-3410 (RHBZ#1928437)
+  - CVE-2021-30498 (RHBZ#1948676, RHBZ#1948677)
+  - CVE-2021-30499 (RHBZ#1948680, RHBZ#1948681)
+- Update Source0 to github
+- Don't glob soname to avoid spurious bump
+- Fix bogus date in changelog
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99-0.55.beta19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
@@ -198,7 +209,7 @@ rm -f %{buildroot}%{_docdir}/libcucul-dev
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99-0.50.beta19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Jul 13 2020 Jeff Law <aw@redhat.com> - 0.99-0.49.beta19
+* Tue Jul 14 2020 Jeff Law <aw@redhat.com> - 0.99-0.49.beta19
 - Disable LTO
 
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.99-0.48.beta19
diff --git a/sources b/sources
index edc3de8..a54b4e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3d4441cdef488099f4a92f4c6c1da00  libcaca-0.99.beta19.tar.gz
+SHA512 (libcaca-0.99.beta20.tar.bz2) = 8cfb84351f9022c62b655822a9558fbe187260fc18ad89ccf99863c499759fba497388066d066fa529f29d6f808be02a6948849ee19617617ade59b3f5c410eb