More cleanups

.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

libcaca.spec

@@ -1,97 +1,90 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
 %{!?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.26.%{beta}%{?dist}
+Release: 0.40.%{beta}%{?dist}
 License: WTFPL
-Group: System Environment/Libraries
 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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: slang-devel
-BuildRequires: ncurses-devel
-BuildRequires: libX11-devel
-BuildRequires: glut-devel
-BuildRequires: libGLU-devel
-BuildRequires: imlib2-devel
-BuildRequires: pango-devel
-# For the docs
+
 Buildrequires: doxygen
-Buildrequires: tetex-latex
-Buildrequires: tetex-dvips
+BuildRequires: gcc-c++
+BuildRequires: glut-devel
+BuildRequires: make
+BuildRequires: slang-devel
+BuildRequires: libX11-devel
+BuildRequires: libGLU-devel
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig(imlib2)
+BuildRequires: pkgconfig(pangoft2)
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: ruby
+BuildRequires: ruby-devel
+Buildrequires: texlive-dvips
+Buildrequires: texlive-latex
 
 %description
-libcaca is the Colour AsCii Art library. It provides high level functions
-for color text drawing, simple primitives for line, polygon and ellipse
-drawing, as well as powerful image to text conversion routines.
-
+libcaca is the Colour AsCii Art library. It provides high level functions for
+color text drawing, simple primitives for line, polygon and ellipse drawing, as
+well as powerful image to text conversion routines.
 
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: slang-devel
-Requires: ncurses-devel
-Requires: libX11-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glut-devel
-Requires: libGLU-devel
 Requires: imlib2-devel
+Requires: libGLU-devel
+Requires: libX11-devel
+Requires: ncurses-devel
 Requires: pango-devel
+Requires: slang-devel
 
 %description devel
-libcaca is the Colour AsCii Art library. It provides high level functions
-for color text drawing, simple primitives for line, polygon and ellipse
-drawing, as well as powerful image to text conversion routines.
+libcaca is the Colour AsCii Art library. It provides high level functions for
+color text drawing, simple primitives for line, polygon and ellipse drawing, as
+well as powerful image to text conversion routines.
 
-This package contains the header files and static libraries needed to
-compile applications or shared objects that use libcaca.
+This package contains the header files and static libraries needed to compile
+applications or shared objects that use libcaca.
 
 
 %package -n caca-utils
 Summary: Colour AsCii Art Text mode graphics utilities based on libcaca
-Group: Amusements/Graphics
 
 %description -n caca-utils
 This package contains utilities and demonstration programs for libcaca, the
 Colour AsCii Art library.
 
-cacaview is a simple image viewer for the terminal. It opens most image
-formats such as JPEG, PNG, GIF etc. and renders them on the terminal using
-ASCII art. The user can zoom and scroll the image, set the dithering method
-or enable anti-aliasing.
+cacaview is a simple image viewer for the terminal. It opens most image formats
+such as JPEG, PNG, GIF etc. and renders them on the terminal using ASCII art.
+The user can zoom and scroll the image, set the dithering method or enable
+anti-aliasing.
 
-cacaball is a tiny graphic program that renders animated ASCII metaballs on
-the screen, cacafire is a port of AALib's aafire and displays burning ASCII
-art flames, and cacademo is a simple application that shows the libcaca
-rendering features such as line and ellipses drawing, triangle filling and
-sprite blitting.
+cacaball is a tiny graphic program that renders animated ASCII metaballs on the
+screen, cacafire is a port of AALib's aafire and displays burning ASCII art
+flames, and cacademo is a simple application that shows the libcaca rendering
+features such as line and ellipses drawing, triangle filling and sprite
+blitting.
 
 
-%package -n python-caca
+%package -n python2-caca
+%{?python_provide:%python_provide python2-caca}
 Summary: Python bindings for libcaca
-Group: Development/Libraries
-BuildRequires: python2-devel
 
-%description -n python-caca
+%description -n python2-caca
 This package contains the python bindings for using libcaca from python.
 
 
 %package -n ruby-caca
 Summary: Ruby bindings for libcaca
-Group: Development/Libraries
 Requires: ruby(release)
-BuildRequires: ruby, ruby-devel
 Provides: ruby(caca) = %{version}-%{release}
 
 %description -n ruby-caca
@@ -99,65 +92,67 @@ This package contains the ruby bindings for using libcaca from ruby.
 
 
 %prep
-%setup -q -n libcaca-%{version}.%{beta}
-%patch0 -p1 -b .multilib
+%autosetup -p1 -n libcaca-%{version}.%{beta}
 
+for file in python/examples/*.py; do
+  sed -e 's|/usr/bin/env python$|%{__python3}|g' ${file} > ${file}.tmp
+  touch -r ${file} ${file}.tmp
+  mv -f ${file}.tmp ${file}
+done
 
 %build
-sed -i -e 's|Config::CONFIG\["sitearchdir"\]|Config::CONFIG["vendorarchdir"]|' \
-       -e 's|Config::CONFIG\["sitelibdir"\]|Config::CONFIG["vendorlibdir"]|' \
-       -e "s|rbconfig -e 'print Config|rbconfig -e 'print RbConfig|g" \
-  configure
+# This package has a configure test which uses ASMs, but does not link the
+# resultant .o files.  As such the ASM test is always successful, even on
+# architectures were the ASM is not valid when compiling with LTO.
+#
+# -ffat-lto-objects is sufficient to address this issue.  It is the default
+# for F33, but is expected to only be enabled for packages that need it in
+# F34, so we use it here explicitly
+%define _lto_cflags -flto=auto -ffat-lto-objects
+
+export LDFLAGS="$(pkg-config --libs gio-2.0) $LDFLAGS"
+
+sed -i -e 's/sitearchdir/vendorarchdir/g' -e 's/sitelibdir/vendorlibdir/g' configure
+
 %configure \
   --disable-static \
   --disable-csharp \
   --disable-java
-# Remove useless rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
 
+%make_build
 
 %install
-rm -rf %{buildroot} libcaca-dev-docs
-make install DESTDIR=%{buildroot}
+%make_install
+find %{buildroot} -name "*.la" -delete
+
 # We want to include the docs ourselves from the source directory
+rm -rf libcaca-dev-docs
 mv %{buildroot}%{_docdir}/libcaca-dev libcaca-dev-docs
 # Remove symlink to libcaca-dev
 rm -f %{buildroot}%{_docdir}/libcucul-dev
 
 
-%clean
-rm -rf %{buildroot}
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%{?ldconfig_scriptlets}
 
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING
-%{_libdir}/*.so.*
+%license COPYING
+%{_libdir}/*.so.0*
 
 %files devel
-%defattr(-,root,root,-)
-%doc ChangeLog libcaca-dev-docs/html/
+%doc libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
 %{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING* NEWS NOTES README THANKS
+%{_bindir}/cacaclock
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacaclock
 %{_bindir}/cacaplay
 %{_bindir}/cacaserver
 %{_bindir}/cacaview
@@ -170,20 +165,31 @@ rm -rf %{buildroot}
 %{_mandir}/man1/cacaview.1*
 %{_mandir}/man1/img2txt.1*
 
-%files -n python-caca
-%defattr(-,root,root,-)
+%files -n python2-caca
 %doc python/examples
 %{python2_sitelib}/caca/
 
 %files -n ruby-caca
-%defattr(-,root,root,-)
 %doc ruby/README
 %{ruby_vendorlibdir}/caca.rb
-%exclude %{ruby_vendorarchdir}/caca.la
 %{ruby_vendorarchdir}/caca.so
 
 
 %changelog
+* Mon Mar 14 2022 Simone Caronni <negativo17@gmail.com> - 0.99-0.40.beta20
+- More cleanups.
+
+* Mon Mar 14 2022 Simone Caronni <negativo17@gmail.com> - 0.99-0.39.beta20
+- Clean up SPEC file.
+- Update to beta20.
+- CVE-2018-20545, CVE-2018-20546, CVE-2018-20547, CVE-2018-20548, CVE-2018-20549 (#1687860).
+- CVE-2021-30498 (#1948677).
+- CVE-2021-30499 (#1948681).
+- CVE-2021-3410 (#1931971).
+
+* Sun Mar 13 2022 Simone Caronni <negativo17@gmail.com> - 0.99-0.38.beta19
+- Merge changes from master (up to 0.37).
+
 * Mon Nov  9 2015 Matthias Saou <matthias@saou.eu> 0.99-0.26.beta19
 - Update to 0.99.beta19.
 - Remove upstreamed ruby patch, fixed in November 2012 (commit 36990e1).

sources

@@ -1 +1 @@
-a3d4441cdef488099f4a92f4c6c1da00  libcaca-0.99.beta19.tar.gz
+SHA512 (libcaca-0.99.beta20.tar.bz2) = 8cfb84351f9022c62b655822a9558fbe187260fc18ad89ccf99863c499759fba497388066d066fa529f29d6f808be02a6948849ee19617617ade59b3f5c410eb