.Xaw3d.metadata

@@ -1,2 +0,0 @@
-dc50029f21d33e0abc167cc884d44d1bd9e6bca5 SOURCES/libXaw3d-1.6.3.tar.bz2
-96be8291305554351a95f401b423f5bba05ce160 SOURCES/mattst88.asc

.gitignore

@@ -1,2 +1,3 @@
-SOURCES/libXaw3d-1.6.3.tar.bz2
-SOURCES/mattst88.asc
+Xaw3d-1.5E.tar.gz
+/libXaw3d-1.6.1.tar.bz2
+/libXaw3d-1.6.2.tar.bz2

Xaw3d-1.5E-secure.patch

@@ -0,0 +1,95 @@
+From 2094de170afa65b057bca4a1e9d38ca7ae656265 Mon Sep 17 00:00:00 2001
+From: Markus Steinborn <gnugv_maintainer@yahoo.de>
+Date: Sat, 24 Apr 2010 17:02:15 +0200
+Subject: [PATCH] Xaw3d-1.5E-secure.patch
+
+---
+ xc/lib/Xaw3d/AsciiSrcP.h  |    6 +++-
+ xc/lib/Xaw3d/Layout.c     |   18 +++++++++--
+ xc/lib/Xaw3d/MenuButton.c |   15 +++++++--
+ xc/lib/Xaw3d/MultiSrcP.h  |    6 +++-
+ xc/lib/Xaw3d/Simple.c     |   18 ++++++++---
+ xc/lib/Xaw3d/SimpleMenu.c |   16 ++++++++--
+ xc/lib/Xaw3d/SmeBSB.c     |   51 +++++++++++++++++++++-----------
+ xc/lib/Xaw3d/Text.c       |   50 +++++++++++++++++++++++--------
+ xc/lib/Xaw3d/TextPop.c    |   71 ++++++++++++++++++++++++++++++++++++++-------
+ xc/lib/Xaw3d/XawAlloc.h   |   10 ++++++
+ xc/lib/Xaw3d/XawI18n.h    |    2 +
+ xc/lib/Xaw3d/XawIm.c      |    4 +-
+ 12 files changed, 206 insertions(+), 61 deletions(-)
+ create mode 100644 xc/lib/Xaw3d/XawAlloc.h
+
+diff --git libXaw3d-1.6.1/src/Layout.c libXaw3d-1.6.1/src/Layout.c
+index 44d391a..dd4b253 100644
+--- libXaw3d-1.6.1/src/Layout.c
++++ libXaw3d-1.6.1/src/Layout.c
+@@ -39,6 +39,8 @@
+ # include <X11/Xaw3d/LayoutP.h>
+ #endif
+ 
++#include "XawAlloc.h"
++
+ #include <ctype.h>
+ #include <stdio.h>
+ 
+@@ -595,10 +597,18 @@ Evaluate (l, box, expr, natural)
+ 	nexpr = LookupVariable (box, expr->u.variable);
+ 	if (!nexpr)
+ 	    {
+-	    char    buf[256];
+-	    (void) sprintf (buf, "Layout: undefined variable %s\n",
+-			    XrmQuarkToString (expr->u.variable));
+-	    XtError (buf);
++	    char *pvar = XrmQuarkToString (expr->u.variable);
++	    char *msg = "Layout: undefined variable ";
++	    int len = strlen(msg) + strlen(pvar) + 2;
++	    char *pbuf, buf[256];
++
++	    pbuf = XtStackAlloc(len, buf);
++	    if (pbuf != NULL)
++		{
++		sprintf(pbuf, "%s%s\n", msg, pvar);
++		XtError (buf);
++		XtStackFree(pbuf, buf);
++		}
+ 	    return 0.0;
+ 	    }
+ 	return Evaluate (l, box, nexpr, natural);
+diff --git libXaw3d-1.6.1/src/XawI18n.h libXaw3d-1.6.1/src/XawI18n.h
+index 1b0ee5d..b0176bf 100644
+--- libXaw3d-1.6.1/src/XawI18n.h
++++ libXaw3d-1.6.1/src/XawI18n.h
+@@ -29,11 +29,13 @@ in this Software without prior written authorization from the X Consortium.
+ 
+ #ifdef HAS_WCTYPE_H
+ #include <wctype.h>
++#ifndef NO_WIDEC_H
+ #include <widec.h>
+ #define wcslen(c) wslen(c)
+ #define wcscpy(d,s) wscpy(d,s)
+ #define wcsncpy(d,s,l) wsncpy(d,s,l)
+ #endif
++#endif
+ 
+ #ifdef HAS_WCHAR_H
+ #include <wchar.h>
+diff --git libXaw3d-1.6.1/src/XawIm.c libXaw3d-1.6.1/src/XawIm.c
+index 730c393..a5d0032 100644
+--- libXaw3d-1.6.1/src/XawIm.c
++++ libXaw3d-1.6.1/src/XawIm.c
+@@ -1644,10 +1644,10 @@ _XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer,
+ 
+     if ((vw = SearchVendorShell(inwidg)) && (ve = GetExtPart(vw)) &&
+ 	ve->im.xim && (p = GetIcTableShared(inwidg, ve)) && p->xic) {
+-	  return(XwcLookupString(p->xic, event, buffer_return, bytes_buffer,
++	  return(XwcLookupString(p->xic, event, buffer_return, bytes_buffer/sizeof(wchar_t),
+ 				 keysym_return, status_return));
+     }
+-    ret = XLookupString( event, tmp_buf, 64, keysym_return,
++    ret = XLookupString( event, tmp_buf, sizeof(tmp_buf), keysym_return,
+ 		         (XComposeStatus*) status_return );
+     for ( i = 0, tmp_p = tmp_buf, buf_p = buffer_return; i < ret; i++ ) {
+ 	*buf_p++ = _Xaw_atowc(*tmp_p++);
+-- 
+1.6.1
+

Xaw3d.spec

@@ -1,19 +1,19 @@
 Summary: A version of the MIT Athena widget set for X
 Name: Xaw3d
-Version: 1.6.3
-Release: 7%{?dist}
-Source0: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
-Source1: https://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2.sig
-Source2: mattst88.asc
+Version: 1.6.2
+Release: 14%{?dist}
+Group: System Environment/Libraries
+Source: http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
 Patch5: Xaw3d-1.5-debian-fixes.patch
 Patch7: Xaw3d-1.6.1-3Dlabel.patch
 Patch10: Xaw3d-1.6.1-fontset.patch
 Patch11: Xaw3d-1.6.1-hsbar.patch
 
-License: MIT
+# src/laygram.{c,h} are licensed under GPLv3+
+License: MIT and GPLv3+
 URL: http://xorg.freedesktop.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: make
 BuildRequires: libXmu-devel
 BuildRequires: libXt-devel
 BuildRequires: libSM-devel
@@ -24,7 +24,6 @@ BuildRequires: xorg-x11-util-macros
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: ed
-BuildRequires: gnupg2
 
 %description
 Xaw3d is an enhanced version of the MIT Athena Widget set for
@@ -37,6 +36,7 @@ those applications.
 
 %package devel
 Summary: Header files and libraries for development using Xaw3d
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libXmu-devel
 Requires: libXt-devel
@@ -58,7 +58,6 @@ package.
 
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q -n libXaw3d-%{version}
 # This doesn't apply cleanly, but has not been applied
 #%patch5 -p1 -b .debian
@@ -72,64 +71,39 @@ package.
   --enable-arrow-scrollbars \
   --enable-gray-stipples \
   --enable-multiplane-bitmaps
-%make_build
+make %{?_smp_mflags}
 
 
 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libXaw3d.la
 rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%ldconfig_scriptlets
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 
 %files
-%license COPYING
-%doc ChangeLog README src/README.XAW3D
+%defattr(-,root,root)
+%doc ChangeLog COPYING README src/README.XAW3D
 %{_libdir}/*.so.*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/xaw3d.pc
 %{_includedir}/X11/Xaw3d
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.3-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.3-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Aug 18 2019 Hans de Goede <hdegoede@redhat.com> - 1.6.3-1
-- Add source tarbal PGP signature verification
-
-* Sun Aug 11 2019 Orion Poplawski <orion@nwra.com>
-- Update to 1.6.3
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jul 24 2018 Jiri Kucera <jkucera@redhat.com> - 1.6.2-14
+- added GPLv3+ to License (src/laygram.{c,h} are licensed under GPLv3+)
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: manual.sst_desktop.Xaw3d.sanity}

sources

@@ -0,0 +1 @@
+SHA512 (libXaw3d-1.6.2.tar.bz2) = 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea