Compare commits

..

No commits in common. "rawhide" and "f18" have entirely different histories.

3 changed files with 13 additions and 169 deletions

View file

@ -1,29 +0,0 @@
Include <unistd.h> for the read and write functions, to avoid implicit
function declarations and build failures with future compilers.
diff --git a/cmain.c b/cmain.c
index ec0558d11cdd325d..aced8300d55d17fd 100644
--- a/cmain.c
+++ b/cmain.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#include <unistd.h>
+
#include "compface.h"
/* the buffer is longer than needed to handle sparse input formats */
diff --git a/uncmain.c b/uncmain.c
index a94279df1ff73223..e52831d0c0f117e1 100644
--- a/uncmain.c
+++ b/uncmain.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#include <unistd.h>
+
#include "compface.h"
/* the buffer is longer than needed to handle sparse input formats */

View file

@ -1,27 +0,0 @@
Fix historic C99 incompatibilites that would go away if autoconf is
re-run.
diff --git a/configure b/configure
index 5b6327937cb0aa69..4183e8677260324f 100755
--- a/configure
+++ b/configure
@@ -2128,7 +2128,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ '#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2821,8 +2821,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext

View file

@ -1,25 +1,19 @@
Name: compface
Version: 1.5.2
Release: 46%{?dist}
Release: 14%{?dist}
Summary: Library and tools for handling X-Face data
License: LicenseRef-compface
Group: System Environment/Libraries
License: MIT
URL: http://ftp.xemacs.org/pub/xemacs/aux/
Source0: http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz
Source1: compface-test.xbm
Source2: compface-README.copyright
# originally from http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-4.diff.gz
# libcompface_1.5.2-5.diff.gz adds a different fix for the stack-smashing
Patch0: libcompface_1.5.2-4.diff.gz
# originally sent upstream
Patch1: compface-1.5.2-stack-smashing.patch
#
Patch2: compface-1.5.2-build.patch
Patch3: compface-configure-c99.patch
Patch4: compface-c99.patch
BuildRequires: diffutils
BuildRequires: gcc
BuildRequires: make
%description
This is the Compface image compression and decompression library and its
@ -29,6 +23,7 @@ programs are able to display such images when opening messages.
%package devel
Summary: Library and development files for handling X-Face data
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -38,11 +33,9 @@ library.
%prep
%setup -q
%patch -P0 -p1
%patch -P1 -p1 -b .stack-smashing
%patch -P2 -p0
%patch -P3 -p1
%patch -P4 -p1
%patch0 -p1
%patch1 -p1 -b .stack-smashing
%patch2 -p0
%build
@ -61,9 +54,14 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH
cmp %{SOURCE1} __test.xbm
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc ChangeLog README xbm2xface.pl
%license _extdoc/README.copyright
%doc _extdoc/README.copyright
%{_bindir}/compface
%{_bindir}/uncompface
%{_libdir}/libcompface.so.*
@ -78,104 +76,6 @@ cmp %{SOURCE1} __test.xbm
%changelog
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Aug 7 2024 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5.2-41
- migrated to SPDX license based on license review ticket #555
- include README.copyright file as license
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 06 2023 Florian Weimer <fweimer@redhat.com> - 1.5.2-36
- Fix C99 compatibility issues (#2167369)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.5.2-19
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild