.gitignore

@@ -1,4 +1,8 @@
-SOURCES/freeglut-3.0.0.tar.gz
-SOURCES/openglut-0.6.3-doc.tar.gz
+freeglut-2.6.0.tar.gz
+openglut-0.6.3-doc.tar.gz
+/freeglut-2.8.0.tar.gz
+/freeglut-2.8.1.tar.gz
 /freeglut-3.0.0.tar.gz
-/openglut-0.6.3-doc.tar.gz
+/freeglut-3.2.1.tar.gz
+/freeglut-3.2.2.tar.gz
+/freeglut-3.4.0.tar.gz

155.patch

@@ -1,4 +1,4 @@
-From e9caa2e14eda732d718691a6c4e61d2623adc068 Mon Sep 17 00:00:00 2001
+From a3810f4e9540286e2d4b8cc97c82ec484de45b9e Mon Sep 17 00:00:00 2001
 From: Sebastian Rasmussen <sebras@gmail.com>
 Date: Mon, 12 Feb 2024 14:46:22 +0800
 Subject: [PATCH] Plug memory leak that happens upon error.
@@ -14,10 +14,10 @@ This fixes CVE-2024-24258 and CVE-2024-24259.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/fg_menu.c b/src/fg_menu.c
-index 36b24ce6..da7d9010 100644
+index 53112dc21..0da88901d 100644
 --- a/src/fg_menu.c
 +++ b/src/fg_menu.c
-@@ -843,12 +843,12 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value )
+@@ -864,12 +864,12 @@ void FGAPIENTRY glutAddMenuEntry( const char* label, int value )
  {
      SFG_MenuEntry* menuEntry;
      FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutAddMenuEntry" );
@@ -31,7 +31,7 @@ index 36b24ce6..da7d9010 100644
      menuEntry->Text = strdup( label );
      menuEntry->ID   = value;
  
-@@ -867,7 +867,6 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID )
+@@ -888,7 +888,6 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID )
      SFG_Menu *subMenu;
  
      FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutAddSubMenu" );
@@ -39,7 +39,7 @@ index 36b24ce6..da7d9010 100644
      subMenu = fgMenuByID( subMenuID );
  
      freeglut_return_if_fail( fgStructure.CurrentMenu );
-@@ -876,6 +875,7 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID )
+@@ -897,6 +896,7 @@ void FGAPIENTRY glutAddSubMenu( const char *label, int subMenuID )
  
      freeglut_return_if_fail( subMenu );
  
@@ -47,6 +47,3 @@ index 36b24ce6..da7d9010 100644
      menuEntry->Text    = strdup( label );
      menuEntry->SubMenu = subMenu;
      menuEntry->ID      = -1;
--- 
-2.43.1
-

common.patch

@@ -0,0 +1,11 @@
+--- CMakeLists.txt~	2019-09-25 15:43:34.000000000 -0500
++++ CMakeLists.txt	2020-01-31 09:26:24.104743210 -0600
+@@ -302,7 +302,7 @@
+ ENDIF()
+ 
+ IF(CMAKE_COMPILER_IS_GNUCC)
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
++  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fcommon")
+   IF(NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
+     # not setting -ansi as EGL/KHR headers doesn't support it
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")

freeglut.spec

@@ -1,18 +1,23 @@
+%global __cmake_in_source_build 1
 Summary:        A freely licensed alternative to the GLUT library
 Name:           freeglut
-Version:        3.0.0
+Version:        3.4.0
 Release:        9%{?dist}
 URL:            http://freeglut.sourceforge.net
 Source0:        https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For the manpages
 Source1:        https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz
-Patch0:         0001-Plug-memory-leak-that-happens-upon-error.patch
+Patch0:         common.patch
+# Patch for CVE-2024-24258 and CVE-2024-24259
+Patch1:         155.patch
 License:        MIT
-Group:          System Environment/Libraries
 
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  pkgconfig libGLU-devel libXext-devel libXxf86vm-devel
+BuildRequires:  pkgconfig libGLU-devel libXext-devel
 BuildRequires:  libXi-devel libICE-devel
+BuildRequires: make
 # The virtual Provides below is present so that this freeglut package is a
 # drop in binary replacement for "glut" which will satisfy rpm dependancies
 # properly.  The Obsoletes tag is required in order for any pre-existing
@@ -35,7 +40,6 @@ joystick functions.
 
 %package devel
 Summary:        Freeglut developmental libraries and header files
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libGL-devel libGLU-devel
 Provides:       glut-devel = 3.7
@@ -50,43 +54,118 @@ license.
 
 %prep
 %setup -q -a 1
-%patch -P 0 -p1
+%patch -P 0 -p0
+%patch -P 1 -p1
 
 %build
 %{cmake} -DFREEGLUT_BUILD_STATIC_LIBS=OFF .
-make %{?_smp_mflags}
+%{cmake_build}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
 install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README doc/*.png doc/*.html
+%license COPYING
+%doc AUTHORS ChangeLog README.md
 # don't include contents of doc/ directory as it is mostly obsolete
 %{_libdir}/libglut.so.3*
 
 %files devel
-%defattr(-,root,root,-)
+%doc doc/html/*.png doc/html/*.html
 %{_includedir}/GL/*.h
 %{_libdir}/libglut.so
-%{_libdir}/pkgconfig/freeglut.pc
+%{_libdir}/pkgconfig/glut.pc
 %{_mandir}/man3/*
-
+%{_libdir}/cmake/FreeGLUT/*
 
 %changelog
-* Thu Feb 15 2024 José Expósito <jexposit@redhat.com> - 3.0.0-9
-- Fix CVE-2024-24258 and CVE-2024-24259
-  Resolves: https://issues.redhat.com/browse/RHEL-25175
-  Resolves: https://issues.redhat.com/browse/RHEL-25177
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.4.0-9
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.4.0-8
+- Bump release for June 2024 mass rebuild
+
+* Mon Feb 12 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.4.0-7
+- Patch for CVE-2024-24258 and CVE-2024-24259
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 03 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.4.0-3
+- migrated to SPDX license
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Oct 07 2022 Gwyn Ciesla <gwync@protonmail.com> - 3.4.0-1
+- 3.4.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Feb 06 2022 Gwyn Ciesla <gwync@protonmail.com> - 3.2.2-1
+- 3.2.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+- Mon Mar 15 2021 Timm Bäder <tbaeder@redhat.com> - 3.2.1-9
+- Use cmake_build and make_install macros
+
+* Fri Mar 12 2021 Adam Jackson <ajax@redhat.com> - 3.2.1-8
+- Drop legacy BuildRequires: libXxf86vm-devel
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 04 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.2.1-6
+- Fix FTBFS.
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.2.1-3
+- Fix FTBFS
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Sep 30 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.2.1-1
+- 3.2.1
+
+* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.2.0-1
+- 3.2.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue May 01 2018 Adam Jackson <ajax@redhat.com> - 3.0.0-8
 - HTTPS URLs

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

sources

@@ -1,2 +1,2 @@
-SHA512 (freeglut-3.0.0.tar.gz) = 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
+SHA512 (freeglut-3.4.0.tar.gz) = 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
 SHA512 (openglut-0.6.3-doc.tar.gz) = 6330515038662b465eee159e1c573c86cea3cff213abe0174949c6fcd49c3798787ab5883eec2eee69e2cba47e32f924b9bb3100f444e7dbade2cf9c123562cb