Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ actions:
# No create-archive needed: packit uses a raw git archive, and autoreconf -fi
# in the spec's %prep generates the required autotools files during the RPM build.

# autoconf is needed in the SRPM build environment for the get-current-version action.
# (BuildRequires in the spec covers the RPM build environment, not the SRPM build.)
srpm_build_deps:
- autoconf

jobs:
- job: copr_build
trigger: pull_request
Expand Down
15 changes: 13 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,25 @@ INSTALLING catdoc
Starting with patchlevel alpha 3 version 0.90, catdoc uses Unix
autotools. Thanks for Stephen Farell to convince Victor Wagner.

Typically you should run
If you're building from git, you need the `autoreconf` package installed.
Typically you should run:
autoreconf -fiv
./configure
make
make -j 4 check
make install

to compile and install catdoc.
to compile and install catdoc. You may need to run `make install` as the
super-user (root), thus e.g. run `sudo make install` if you get permission
errors.

You can also build from the distribution tarball for a particular release,
which requires only `make` and a C compiler. The steps are the same except
you don't run `autoreconf`:
./configure
make
make -j 4 check
make install

NOTE for HPUX users. If you want to compile catdoc with aCC,
use CC="aCC -Ae" ./configure
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.97.1 in development
0.97.1 March 21 2026
Clean up address sanitizer tests.
Simplify RPM package builds triggered by Packit.

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ vulnerabilities
[CVE-2024-52035](https://nvd.nist.gov/vuln/detail/CVE-2024-52035),
and
[CVE-2024-48877](https://nvd.nist.gov/vuln/detail/CVE-2024-48877)
identified and addressed by the Cisco Talos team.
identified and addressed by the Cisco Talos team, and several other memory
access vulnerabilities reported over the years.
See [NEWS](NEWS) and the commit history (search history for "CVE") for other
fixes made. Some were detected by Address Sanitizer tools, see
[tests/asan_failures](tests/asan_failures) for more details.
[tests/asan_failures/README.md](tests/asan_failures/README.md) for more details.

## Documentation, bugs, more information

Expand Down
9 changes: 0 additions & 9 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@
happening in a different code path. The leaks are small and occur at program exit, so this
may be "won't fix".

## Prepare 0.97.1 release

- [ ] Update configure.ac, catdoc.spec, README.md, NEWS to version 0.97.1 (drop `_devel`)
- [ ] Run `make distcheck` to produce `catdoc-0.97.1.tar.gz`
- [ ] Tag `v0.97.1` and create a GitHub Release
- [ ] Upload `catdoc-0.97.1.tar.gz` (from `make distcheck`) as a release asset
- [ ] Verify packit `trigger: release` fires off a Copr build and succeeds,
see https://dashboard.packit.dev/projects/github.com/skierpage/catdoc

## Research: find more Office 2007 test files

- [ ] Do the Gnome LocalSearch (formerly Tracker), KFileMetadata, and LibreOffice projects have test
Expand Down
4 changes: 2 additions & 2 deletions catdoc.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: catdoc
Version: 0.97.1_devel
Release: 1.20260320162811988977.master.2.gbb7d4c7%{?dist}
Version: 0.97.1
Release: %autorelease
Summary: programs which extract text from Microsoft Office 97-2004 files
License: GPL-2.0-or-later
URL: https://github.com/skierpage/catdoc
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([catdoc],[0.97.1_devel])
AC_INIT([catdoc],[0.97.1])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall foreign])

Expand Down
3 changes: 3 additions & 0 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ The subdirectory [tests/asan_failures](asan_failures) contains various test
cases that trigger memory access errors. These may trigger crashes in the
normal binaries, but if you configure catdoc with `--enable-asan`, the test
cases that remain unfixed will print detailed Address Sanitizer diagnostics.
The address sanitizer tests use the `ldd` tool to check if the binary was
compiled with Address Sanitizer support.

## Expected failing files
XFAIL_TESTS in tests/Makefile lists test files that are expected to not
succesfully convert or cause other errors due to known bugs.

## Command-line tests

Some command lines demonstrate failures, e.g. [petewarden issue #10](https://github.com/petewarden/catdoc/issues/10) - global-buffer-overflow on reader.c:177:20

% catdoc / /-v -wbawdd
Expand Down
Loading