.gitignore

@@ -1,3 +1,2 @@
-/libGLU-20120904.tar.xz
+SOURCES/glu-9.0.0.tar.bz2
 /glu-9.0.0.tar.bz2
-/glu-9.0.1.tar.xz

0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch

@@ -0,0 +1,33 @@
+From bfdf99d6ff64b9c2d840e8a5767eaa57e4363c79 Mon Sep 17 00:00:00 2001
+From: Mike Gorchak <mike.gorchak.qnx@gmail.com>
+Date: Wed, 2 Jan 2013 13:39:50 -0700
+Subject: [PATCH 1/2] glu: initialize PriorityQ::order field to NULL in
+ pqNewPriorityQ()
+
+pqNewPriorityQ() function creates and setups PriorityQ structure, all
+except for the field "order". It is filled later in function
+pqInit(). Depending on vertices of polygon which must be tesselated
+there possible following situation, pqDeletePriorityQ() is called
+right after pqNewPriorityQ() function. pqNewPriorityQ() tries to free
+memory using pq->order as pointer, which is unitialized at this point.
+
+Signed-off-by: Brian Paul <brianp@vmware.com>
+---
+ src/libtess/priorityq.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libtess/priorityq.c b/src/libtess/priorityq.c
+index c6b99cc..db7cd59 100644
+--- a/src/libtess/priorityq.c
++++ b/src/libtess/priorityq.c
+@@ -65,6 +65,7 @@ PriorityQ *pqNewPriorityQ( int (*leq)(PQkey key1, PQkey key2) )
+      return NULL;
+   }
+ 
++  pq->order = NULL;
+   pq->size = 0;
+   pq->max = INIT_SIZE;
+   pq->initialized = FALSE;
+-- 
+1.8.3.1
+

0001-libutil-Include-stddef.h-for-NULL.patch

@@ -0,0 +1,27 @@
+From b293e7e843cff28c4b925fb0db988395c040d0ef Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 23 Jul 2019 10:42:41 -0700
+Subject: [PATCH] libutil: Include stddef.h for NULL
+
+Fixes: #5
+
+Reviewed-by: Eric Engestrom <eric@engestrom.ch>
+---
+ src/libutil/error.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libutil/error.c b/src/libutil/error.c
+index 7212748..d3b2666 100644
+--- a/src/libutil/error.c
++++ b/src/libutil/error.c
+@@ -30,6 +30,7 @@
+ 
+ #include "gluos.h"
+ #include "gluint.h"
++#include <stddef.h>
+ #include <GL/glu.h>
+ 
+ 
+-- 
+2.45.2
+

0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch

@@ -0,0 +1,35 @@
+From 069211570c32a8d5848e127975a2943e9d8fc6b9 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 21 Feb 2013 20:40:31 -0800
+Subject: [PATCH 2/2] Add -D(N)DEBUG to CFLAGS dependent on --enable-debug
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tested-by: Blaž Hrastnik <speed.the.bboy@gmail.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61003
+---
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cbfd047..45abf17 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,9 +42,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_ARG_ENABLE(debug,
+               AS_HELP_STRING([--enable-debug],
+                 [Enable debugging information]),
+-              [CFLAGS="$CFLAGS -g -O0"
+-               CXXFLAGS="$CXXFLAGS -g -O0"],
+-              [])
++              [CFLAGS="$CFLAGS -g -O0 -DDEBUG"
++               CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"],
++              [CFLAGS="$CFLAGS -DNDEBUG"
++               CXXFLAGS="$CXXFLAGS -DNDEBUG"])
+ 
+ dnl Make sure the pkg-config macros are defined
+ m4_ifndef([PKG_PROG_PKG_CONFIG],
+-- 
+1.8.3.1
+

gating.yaml

@@ -1,6 +1,8 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
+    #- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
+  - !PassingTestCaseRule {test_case_name: manual.sst_graphics_infrastructure.mesa.sanity}
+

mesa-libGLU.spec

@@ -1,17 +1,19 @@
 #define gitdate 20120904
 
 Name:           mesa-libGLU
-Version:        9.0.1
-Release:        6%{?dist}
+Version:        9.0.0
+Release:        15%{?dist}
 Summary:        Mesa libGLU library
 
 License:        MIT
 URL:            http://mesa3d.org/
-Source0:        https://ftp.freedesktop.org/pub/mesa/glu/glu-%{version}.tar.xz
+Source0:        ftp://ftp.freedesktop.org/pub/mesa/glu/glu-%{version}.tar.bz2
 Source2:        make-git-snapshot.sh
 
-BuildRequires: make
-BuildRequires:  gcc-c++
+Patch1: 0001-glu-initialize-PriorityQ-order-field-to-NULL-in-pqNe.patch
+Patch2: 0002-Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch
+Patch3: 0001-libutil-Include-stddef.h-for-NULL.patch
+
 BuildRequires:  autoconf automake libtool
 BuildRequires:  mesa-libGL-devel
 #Requires:       
@@ -32,16 +34,19 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n glu-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -v -i -f
 %configure --disable-static
-%make_build
 make %{?_smp_mflags}
 
 %install
-%make_install
-find $RPM_BUILD_ROOT -name '*.la' -delete
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
 
 %ldconfig_post
@@ -58,31 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/man/man3/gl[A-Z]*
 %{_libdir}/pkgconfig/glu.pc
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.0.1-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 9.0.1-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Peter Robinson <pbrobinson@fedoraproject.org> 9.0.1-1
-- libGLU 9.0.1
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 9.0.0-15
 - Use ldconfig scriptlet macros
 

sources

@@ -1 +1 @@
-SHA512 (glu-9.0.1.tar.xz) = 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
+SHA512 (glu-9.0.0.tar.bz2) = ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8