Compare commits

..

2 commits

Author SHA1 Message Date
Parag Nemade
832420b909
Move to use %autosetup macro so that we will not forget to apply patches 2025-10-28 13:39:43 +05:30
Parag Nemade
b887d673c8
Resolves: CVE-2025-50949 and CVE-2025-50951 2025-10-28 08:11:02 +05:30
15 changed files with 67 additions and 82 deletions

View file

@ -1 +0,0 @@
1

1
.gitignore vendored
View file

@ -24,4 +24,3 @@ fontforge_full-20100501.tar.bz2
/fontforge-20200314.tar.gz
/fontforge-20201107.tar.gz
/fontforge-20230101.tar.gz
/fontforge-20251009.tar.gz

View file

@ -0,0 +1,31 @@
From 701e4d7569d6bd777704ab3364d7d1c519d89a91 Mon Sep 17 00:00:00 2001
From: zhailiangliang <zhailiangliang@loongson.cn>
Date: Mon, 4 Nov 2024 08:56:07 +0000
Subject: [PATCH] fix memleak in function DlgCreate8
---
gdraw/gaskdlg.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gdraw/gaskdlg.c b/gdraw/gaskdlg.c
index 3563361796..8178be14c8 100644
--- a/gdraw/gaskdlg.c
+++ b/gdraw/gaskdlg.c
@@ -209,12 +209,13 @@ static GWindow DlgCreate8(const char *title,const char *question,va_list ap,
extern GBox _GGadget_defaultbutton_box;
if ( d!=NULL )
- memset(d,0,sizeof(*d));
+ memset(d,0,sizeof(*d));
buf = vsmprintf(question, ap);
if ( screen_display==NULL ) {
- fprintf(stderr, "%s\n", buf );
- if ( d!=NULL ) d->done = true;
-return( NULL );
+ fprintf(stderr, "%s\n", buf);
+ if ( d!=NULL ) d->done = true;
+ free(buf);
+ return( NULL );
}
ubuf = utf82u_copy(buf);
free(buf);

View file

@ -1,13 +1,21 @@
%global gettext_package FontForge
Name: fontforge
Version: 20251009
Release: 1%{?dist}
Version: 20230101
Release: 17%{?dist}
Summary: Outline and bitmap font editor
License: GPL-3.0-or-later
URL: http://fontforge.github.io/
Source0: https://github.com/fontforge/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Fix translations with gettext-0.22, https://github.com/fontforge/fontforge/pull/5257
Patch0: 0001-Fix-errors-in-French-and-Italian-translations.patch
# https://github.com/fontforge/fontforge/pull/5367
# Fixes CVE-2024-25081 and CVE-2024-25082
Patch1: https://patch-diff.githubusercontent.com/raw/fontforge/fontforge/pull/5367.patch#/Fix_Splinefont_shell_invocation.patch
Patch2: pyconfig.patch
# https://github.com/fontforge/fontforge/pull/5491
Patch3: fix_memleak_in_function_DlgCreate8-5491.patch
Requires: xdg-utils
Requires: (autotrace or potrace)
@ -38,8 +46,6 @@ BuildRequires: shared-mime-info
BuildRequires: gtk3-devel
BuildRequires: python3-sphinx
BuildRequires: make
# 20151009 version requires below
BuildRequires: gtkmm3.0-devel
%py_provides python3-fontforge
%py_provides python3-psMat
@ -68,7 +74,11 @@ This package contains documentation files for %{name}.
%prep
%autosetup
%autosetup -p1
# Remove tests that requires Internet access
sed -i '45d;82d;101d;127d' tests/CMakeLists.txt
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
@ -96,7 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%find_lang %{gettext_package}
%check
%ctest
pushd %{__cmake_builddir}
make check
popd
%files -f %{gettext_package}.lang
%doc AUTHORS
@ -119,19 +131,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%doc %{_pkgdocdir}
%changelog
* Fri Oct 10 2025 Parag Nemade <pnemade AT redhat DOT com> - 20251009-1
- Update to 20251009 version (#2402960)
- Remove upstream released patches
- Add new BR: gtkmm3.0-devel
* Tue Oct 28 2025 Parag Nemade <pnemade AT redhat DOT com> - 20230101-17
- Move to use %%autosetup macro so that we will not forget to apply patches
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jul 17 2025 Parag Nemade <pnemade AT redhat DOT com> - 20230101-17
- Update for https://fedoraproject.org/wiki/Changes/CMake_ninja_default (rh#2381004)
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 20230101-16
- Rebuilt for Python 3.14
* Mon Oct 27 2025 Parag Nemade <pnemade AT redhat DOT com> - 20230101-16
- Resolves: CVE-2025-50949
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

View file

@ -1,5 +0,0 @@
summary: Basic smoke test
discover:
how: fmf
execute:
how: tmt

View file

@ -1,5 +1,5 @@
--- pycontrib/FontCompare/setup.py~ 2022-12-31 23:25:21.000000000 -0600
+++ pycontrib/FontCompare/setup.py 2024-06-14 15:14:14.119920623 -0500
--- fontforge/pycontrib/FontCompare/setup.py~ 2022-12-31 23:25:21.000000000 -0600
+++ fontforge/pycontrib/FontCompare/setup.py 2024-06-14 15:14:14.119920623 -0500
@@ -15,7 +15,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
@ -8,8 +8,8 @@
from setuptools import setup
setup(name='Font Compare',
version='1.0',
--- fontforge/python.c~ 2022-12-31 23:25:21.000000000 -0600
+++ fontforge/python.c 2024-06-14 15:38:41.397897757 -0500
--- fontforge/fontforge/python.c~ 2022-12-31 23:25:21.000000000 -0600
+++ fontforge/fontforge/python.c 2024-06-14 15:38:41.397897757 -0500
@@ -19633,7 +19633,10 @@
if ( saved_progname )
free(saved_progname);

View file

@ -1 +1 @@
SHA512 (fontforge-20251009.tar.gz) = 2923c54e10585551c93102d8b7a389c9de3c629c1676fc8c576c9b9c3f1f6fe28f7a1e39fd5a57ab7eeadf0b17d722bf439ca94f0a788ceab6993e1a93ea7d5f
SHA512 (fontforge-20230101.tar.gz) = 67c21f7e55a78097ef7d7d9abac3add2017400015a6a9dfd56674d933bdba963cb6c4e631ae066026fe1862298d60dd968dec61a9bbee7253dd2f7d105655178

View file

@ -1,5 +0,0 @@
require:
- fontforge
test: bash ./run_tests.sh
framework: shell

View file

@ -1,47 +0,0 @@
#!/bin/bash
. /usr/share/beakerlib/beakerlib.sh || exit 1
NAME=fontforge
rlJournalStart
rlPhaseStartSetup
rlAssertRpm ${NAME}
rlAssertRpm ${NAME}-devel
rlShowPackageVersion ${NAME}
rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
FEDORA_VERSION=$(rlGetDistroRelease)
rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
rlRun "pushd $tmp"
rlFetchSrcForInstalled "${NAME}"
rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
if [ -d BUILD/${NAME}-${VERSION}-build ]; then
rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
else
rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
fi
rlRun "set -o pipefail"
rlRun "NOCONFIGURE=1 ./autogen.sh"
rlRun "./configure --disable-static --with-graphite2 --with-gobject --enable-introspection"
rlRun "make check"
rlRun "retval=$?"
rlRun "echo $retval"
rlPhaseEnd
rlPhaseStartTest
rlRun -t -l "INSTALLED_VERSION=$(hb-info --version|awk 'NR==1 {print $3}')" \
0 "Get installed version"
rlAssertEquals "versions should be equal" "${VERSION}" "${INSTALLED_VERSION}"
rlGetTestState
rlLog "Number of failed asserts so far: ${ECODE}"
rlRun "popd" 0
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $tmp" 0 "Remove tmp directory"
rlPhaseEnd
rlJournalEnd

0
tests/run_tests.sh → tests/scripts/run_tests.sh Executable file → Normal file
View file

9
tests/tests.yml Normal file
View file

@ -0,0 +1,9 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- simple:
dir: scripts/
run: ./run_tests.sh