Merge branch 'wip-testing' of https://github.com/sgidevnet/sgug-rse i…

…nto mach/revisit-tdnf
sgidevnet · Nov 22, 2021 · 7106473 · 7106473
2 parents 71c012f + f0efabe
commit 7106473
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 4 deletions.
diff --git a/packages/gdb/SOURCES/gdb.elfirix.patch b/packages/gdb/SOURCES/gdb.elfirix.patch
@@ -0,0 +1,23 @@
+--- /usr/people/vladimir/tmp/mips-irix-tdep.c	2021-11-18 15:21:59.857384191 +0000
++++ gdb-7.6.2/gdb/mips-irix-tdep.c	2021-11-18 15:06:29.784909361 +0000
+@@ -28,6 +28,10 @@
+ #include "trad-frame.h"
+ #include "tramp-frame.h"
+
++#ifndef ELFOSABI_IRIX
++#define ELFOSABI_IRIX 8
++#endif
++
+ static void
+ mips_irix_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect,
+                                             void *obj)
+@@ -63,6 +67,9 @@
+
+   elfosabi = elf_elfheader (abfd)->e_ident[EI_OSABI];
+
++  if (elfosabi == ELFOSABI_IRIX)
++    return GDB_OSABI_IRIX;
++
+   if (elfosabi == ELFOSABI_NONE)
+     {
+       /* When elfosabi is ELFOSABI_NONE (0), then the ELF structures in the
diff --git a/packages/gdb/SPECS/gdb.spec b/packages/gdb/SPECS/gdb.spec
@@ -11,12 +11,13 @@
 Summary: The GNU Debugger
 Name: gdb
 Version: 7.6.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 URL: http://ftp.gnu.org/gnu/gdb/
 Source: http://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.gz
 
 Patch0: gdb762.sgifixups.patch
+Patch1: gdb.elfirix.patch
 
 BuildRequires: gcc, binutils
 BuildRequires: automake, autoconf, libtool, pkgconfig
@@ -33,6 +34,7 @@ The gnu debugger.
 %setup
 
 %patch0 -p1 -b .sgifixups
+%patch1 -p1 -b .elfirix
 
 # A place to generate our patch
 #exit 1

diff --git a/packages/tdnf/SOURCES/tdnf-no-dlclose-plugins.patch b/packages/tdnf/SOURCES/tdnf-no-dlclose-plugins.patch
@@ -0,0 +1,11 @@
+--- tdnf-3.0.0-beta/client/plugins.c.orig	2021-11-19 14:57:30.307988836 +0000
++++ tdnf-3.0.0-beta/client/plugins.c	2021-11-19 14:57:15.299176437 +0000
+@@ -197,7 +197,7 @@
+     }
+     if (pPlugin->pModule)
+     {
+-        dlclose(pPlugin->pModule);
++        //dlclose(pPlugin->pModule);
+     }
+ }
+
diff --git a/packages/tdnf/SPECS/tdnf.spec b/packages/tdnf/SPECS/tdnf.spec
@@ -3,7 +3,7 @@
 Summary:        dnf/yum equivalent using C libs
 Name:           tdnf
 Version:        3.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Vendor:         VMware, Inc.
 Distribution:   Photon
 License:        LGPLv2.1,GPLv2
@@ -23,6 +23,7 @@ Patch106:       cli-termios.sgifixes.patch
 # mach's crappy interpolation patch
 # Patch106:		tdnf-client-rpmtrans.sgifixes.patch
 # Patch107:		tdnf-printfprecision.sgifixes.patch
+Patch108:		tdnf-no-dlclose-plugins.patch
 
 Requires:       rpm-libs
 Requires:       libcurl
@@ -116,7 +117,7 @@ rm cmake/FindOpenSSL.cmake
 
 %build
 mkdir build && cd build
-export CFLAGS="-I%{_includedir}/libdicl-0.1 -DLIBDICL_NEED_GETOPT $RPM_OPT_FLAGS"
+export CFLAGS="-I%{_includedir}/libdicl-0.1 -DLIBDICL_NEED_GETOPT $RPM_OPT_FLAGS -g"
 export LDFLAGS="-ldicl-0.1 $RPM_LD_FLAGS"
 cmake \
 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -190,7 +191,7 @@ find %{buildroot} -name '*.pyc' -delete
     %config(noreplace) %{_sysconfdir}/%{name}/automatic.conf
 
 %changelog
-*   Wed Nov 17 2021 David Stancu <[email protected]> - 3.1.5-2
+*   Wed Nov 17 2021 David Stancu <[email protected]> - 3.1.5-3
 -   rse update to 3.1.5
 *   Wed Oct 06 2021 Oliver Kurth <[email protected]> 3.1.5-1
 -   update to 3.1.5