deleted file mode 100644

@@ -1,51 +0,0 @@

-There were two issues when reading note data from a core file.

-We didn't check if the data we already had in a buffer was big

-enough. And if we did get the data, we should check if we got

-everything, or just a part of the data.

-

-https://sourceware.org/bugzilla/show_bug.cgi?id=23752

-

-Signed-off-by: Mark Wielaard <mark@klomp.org>

- libdwfl/ChangeLog                    |  7 +++++++

- libdwfl/dwfl_segment_report_module.c | 13 +++++++++++--

- 2 files changed, 18 insertions(+), 2 deletions(-)

-

-diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c

-index 36e5c82..8749884 100644

-+++ b/libdwfl/dwfl_segment_report_module.c

-@@ -1,5 +1,5 @@

- /* Sniff out modules from ELF headers visible in memory segments.

--   Copyright (C) 2008-2012, 2014, 2015 Red Hat, Inc.

-+   Copyright (C) 2008-2012, 2014, 2015, 2018 Red Hat, Inc.

-    This file is part of elfutils.

- 

-    This file is free software; you can redistribute it and/or modify

-@@ -301,7 +301,10 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,

-   inline bool read_portion (void **data, size_t *data_size,

- 			    GElf_Addr vaddr, size_t filesz)

-   {

--    if (vaddr - start + filesz > buffer_available

-+    /* Check whether we will have to read the segment data, or if it

-+       can be returned from the existing buffer.  */

-+    if (filesz > buffer_available

-+	|| vaddr - start > buffer_available - filesz

- 	/* If we're in string mode, then don't consider the buffer we have

- 	   sufficient unless it contains the terminator of the string.  */

- 	|| (filesz == 0 && memchr (vaddr - start + buffer, '\0',

-@@ -459,6 +462,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,

-     if (read_portion (&data, &data_size, vaddr, filesz))

-       return;

- 

-+    /* data_size will be zero if we got everything from the initial

-+       buffer, otherwise it will be the size of the new buffer that

-+       could be read.  */

-+    if (data_size != 0)

-+      filesz = data_size;

-+

-     assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr));

- 

-     void *notes;

-1.8.3.1

deleted file mode 100644

@@ -1,34 +0,0 @@

-diff --git a/elfutils-0.158-CVE-2014-0172.patch b/elfutils-0.158-CVE-2014-0172.patch

-new file mode 100644

-index 0000000..3b76360

-+++ b/elfutils-0.158-CVE-2014-0172.patch

-@@ -0,0 +1,28 @@

-+commit 7f1eec317db79627b473c5b149a22a1b20d1f68f

-+Author: Mark Wielaard <mjw@redhat.com>

-+Date:   Wed Apr 9 11:33:23 2014 +0200

-+

-+    CVE-2014-0172 Check for overflow before calling malloc to uncompress data.

-+    

-+    https://bugzilla.redhat.com/show_bug.cgi?id=1085663

-+    

-+    Reported-by: Florian Weimer <fweimer@redhat.com>

-+    Signed-off-by: Mark Wielaard <mjw@redhat.com>

-+

-+diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c

-+index 79daeac..34ea373 100644

-+--- a/libdw/dwarf_begin_elf.c

-++++ b/libdw/dwarf_begin_elf.c

-+@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)

-+ 	    memcpy (&size, data->d_buf + 4, sizeof size);

-+ 	    size = be64toh (size);

-+ 

-++	    /* Check for unsigned overflow so malloc always allocated

-++	       enough memory for both the Elf_Data header and the

-++	       uncompressed section data.  */

-++	    if (unlikely (sizeof (Elf_Data) + size < size))

-++	      break;

-++

-+ 	    Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);

-+ 	    if (unlikely (zdata == NULL))

-+ 	      break;

new file mode 100644

@@ -0,0 +1,67 @@

+commit acb453851c9e6c46531b70fda7396885c0e7e1db

+Author: Frank Ch. Eigler <fche@redhat.com>

+Date:   Thu Jul 2 14:52:48 2020 +0000

+

+    PR26195: adapt debuginfod to API change in libmicrohttpd-0.9.71

+    

+    To make our code build with -Werror as well as against older libmicrohttpd,

+    we must conditionalize the data type (int vs. enum) returned by callbacks

+    and some mhd functions.

+    

+    Signed-off-by: Frank Ch. Eigler <fche@redhat.com>

+

+diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx

+index 76f1fa52..56210302 100644

+--- a/debuginfod/debuginfod.cxx

+@@ -92,6 +92,14 @@ using namespace std;

+ #include <libdwelf.h>

+ 

+ #include <microhttpd.h>

++

++#if MHD_VERSION >= 0x00097002

++// libmicrohttpd 0.9.71 broke API

++#define MHD_RESULT enum MHD_Result

++#else

++#define MHD_RESULT int

++#endif

++

+ #include <curl/curl.h>

+ #include <archive.h>

+ #include <archive_entry.h>

+@@ -519,12 +527,12 @@ struct reportable_exception

+ 

+   void report(ostream& o) const; // defined under obatched() class below

+ 

+-  int mhd_send_response(MHD_Connection* c) const {

++  MHD_RESULT mhd_send_response(MHD_Connection* c) const {

+     MHD_Response* r = MHD_create_response_from_buffer (message.size(),

+                                                        (void*) message.c_str(),

+                                                        MHD_RESPMEM_MUST_COPY);

+     MHD_add_response_header (r, "Content-Type", "text/plain");

+-    int rc = MHD_queue_response (c, code, r);

++    MHD_RESULT rc = MHD_queue_response (c, code, r);

+     MHD_destroy_response (r);

+     return rc;

+   }

+@@ -1723,7 +1731,7 @@ handle_metrics (off_t* size)

+ 

+ 

+ /* libmicrohttpd callback */

+-static int

++static MHD_RESULT

+ handler_cb (void * /*cls*/,

+             struct MHD_Connection *connection,

+             const char *url,

+@@ -1736,7 +1744,11 @@ handler_cb (void * /*cls*/,

+   struct MHD_Response *r = NULL;

+   string url_copy = url;

+ 

++#if MHD_VERSION >= 0x00097002

++  enum MHD_Result rc;

++#else

+   int rc = MHD_NO; // mhd

++#endif

+   int http_code = 500;

+   off_t http_size = -1;

+   struct timeval tv_start, tv_end;

@@ -1,22 +1,23 @@

 # -*- rpm-spec-*-

 Summary:	A collection of utilities and DSOs to handle compiled objects

 Name:		elfutils

-Version:	0.174

-Release:	3%{?dist}

+Version:	0.180

+Release:	1%{?dist}

 License:	GPLv3+ and (GPLv2+ or LGPLv3+)

 Group:		Development/Tools

 URL:    	https://sourceware.org/elfutils

 Source0:	https://sourceware.org/elfutils/ftp/%{version}/%{name}-%{version}.tar.bz2

-%define sha1 elfutils=95899ce5fa55002e46bf4e02d01a249516e296fd

-Patch0:         CVE-2018-18310.patch

-Patch1:         remove-unused-internal-__elf64_msize-functions.patch

+%define sha1 elfutils=c1ed871515b0f7fcdf2d94fea23e4b8ba67e8fe3

 Vendor:		VMware, Inc.

 Distribution:	Photon

+Patch0:         elfutils-adapt-debuginfod-to-API-change.patch

 Obsoletes:	libelf libelf-devel

 Requires:	elfutils-libelf = %{version}-%{release}

 Requires:	glibc >= 2.7

 Requires:	bzip2-libs

+Requires:	libmicrohttpd

+Requires:	curl

 # ExcludeArch: xxx

 BuildRequires:	gcc >= 4.1.2-33

@@ -26,6 +27,10 @@ BuildRequires:	flex >= 2.5.4a

 BuildRequires:	m4

 BuildRequires:	gettext

 BuildRequires:	bzip2-devel

+BuildRequires:	libmicrohttpd-devel

+BuildRequires:	curl-devel

+BuildRequires:	libarchive-devel

+BuildRequires:	sqlite-devel

 %define _gnu %{nil}

 %define _programprefix eu-

@@ -108,7 +113,7 @@ These are the additional language files of elfutils.

 %prep

 %setup -q

 %patch0 -p1

-%patch1 -p1

+

 %build

 %configure --program-prefix=%{_programprefix}

 make %{?_smp_mflags}

@@ -120,7 +125,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}

 %makeinstall

 chmod +x ${RPM_BUILD_ROOT}/usr/lib/lib*.so*

-chmod +x ${RPM_BUILD_ROOT}/usr/lib/elfutils/lib*.so*

 # XXX Nuke unpackaged files

 { pushd ${RPM_BUILD_ROOT}

@@ -151,33 +155,36 @@ rm -rf ${RPM_BUILD_ROOT}

 %defattr(-,root,root)

 %doc COPYING COPYING-GPLV2 COPYING-LGPLV3 README TODO CONTRIBUTING

 %{_bindir}/eu-*

-%exclude %{_bindir}/eu-ld

+%{_bindir}/debuginfod

+%{_bindir}/debuginfod-find

 %{_libdir}/libasm-%{version}.so

 %{_libdir}/libdw-%{version}.so

 %{_libdir}/libasm.so.*

 %{_libdir}/libdw.so.*

-%dir %{_libdir}/elfutils

-%{_libdir}/elfutils/lib*.so

+%{_libdir}/libdebuginfod.so.*

+%{_mandir}/man1/eu-*.1*

+%{_mandir}/man1/debuginfod*.1*

 %files devel

 %defattr(-,root,root)

 %{_includedir}/dwarf.h

 %dir %{_includedir}/elfutils

 %{_includedir}/elfutils/elf-knowledge.h

-#%{_includedir}/elfutils/libasm.h

-%{_includedir}/elfutils/libebl.h

 %{_includedir}/elfutils/libdw.h

 %{_includedir}/elfutils/libdwfl.h

 %{_includedir}/elfutils/known-dwarf.h

 %{_includedir}/elfutils/libdwelf.h

-%{_libdir}/libebl.a

-#%{_libdir}/libasm.so

+%{_includedir}/elfutils/debuginfod.h

 %{_libdir}/libdw.so

+%{_libdir}/libdebuginfod.so

+%{_libdir}/libdebuginfod-%{version}.so

 %{_libdir}/pkgconfig/*.pc

+%{_mandir}/man3/elf_*.3*

+%{_mandir}/man3/debuginfod*.3*

+%{_mandir}/man8/debuginfod.8*

 %files devel-static

 %{_libdir}/libdw.a

-#%{_libdir}/libasm.a

 %files libelf

 %defattr(-,root,root)

@@ -199,6 +206,11 @@ rm -rf ${RPM_BUILD_ROOT}

 %defattr(-,root,root)

 %changelog

+* Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 0.180-1

+- Automatic Version Bump

+- Updated to 0.180

+- libdir/elfutils is removed

+- libebl.h and libebl.a is removed

 * Tue Mar 31 2020 Alexey Makhalov <amakhalov@vmware.com> 0.174-3

 - Fix compilation issue with gcc-8.4.0

 * Thu Jan 24 2019 Keerthana K <keerthanak@vmware.com> 0.174-2

deleted file mode 100644

@@ -1,47 +0,0 @@

-From: Mark Wielaard <mark@klomp.org>

-Date: Thu, 21 Feb 2019 23:28:01 +0000 (+0100)

-Subject: libelf: Remove unused internal __elf[32|64]_msize functions.

-X-Git-Tag: elfutils-0.177~43

-X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=be8080bdd746ac2b07fb0bcad23a9677844bb200

-

-libelf: Remove unused internal __elf[32|64]_msize functions.

-

-Those functions were intended for ELF versions where the memory and

-file sizes of data structures are different. They were never used

-because libelf depends on the file and memory sizes being equal

-(otherwise using mmap wouldn't work).

-

-Signed-off-by: Mark Wielaard <mark@klomp.org>

-

-diff --git a/libelf/elf32_fsize.c b/libelf/elf32_fsize.c

-index 0f468de5..139f4a91 100644

-+++ b/libelf/elf32_fsize.c

-@@ -58,5 +58,3 @@ elfw2(LIBELFBITS, fsize) (Elf_Type type, size_t count, unsigned int version)

- 	  * __libelf_type_sizes[0][ELFW(ELFCLASS,LIBELFBITS) - 1][type]);

- #endif

- }

--#define local_strong_alias(n1, n2) strong_alias (n1, n2)

--local_strong_alias (elfw2(LIBELFBITS, fsize), __elfw2(LIBELFBITS, msize))

-diff --git a/libelf/libelfP.h b/libelf/libelfP.h

-index bc9a404d..3a96a3b0 100644

-+++ b/libelf/libelfP.h

-@@ -444,16 +444,6 @@ extern const uint_fast8_t __libelf_type_aligns[ELFCLASSNUM - 1][ELF_T_NUM]

-    be ELF_T_BYTE.  */

- extern Elf_Type __libelf_data_type (Elf *elf, int sh_type) internal_function;

- 

--/* The libelf API does not have such a function but it is still useful.

--   Get the memory size for the given type.

--

--   These functions cannot be marked internal since they are aliases

--   of the export elfXX_fsize functions.*/

--extern size_t __elf32_msize (Elf_Type __type, size_t __count,

--			     unsigned int __version);

--extern size_t __elf64_msize (Elf_Type __type, size_t __count,

--			     unsigned int __version);

--

- 

- /* Create Elf descriptor from memory image.  */

- extern Elf *__libelf_read_mmaped_file (int fildes, void *map_address,

@@ -1,7 +1,7 @@

 Name:           libmicrohttpd

 Summary:        Lightweight library for embedding a webserver in applications

 Version:        0.9.71

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 URL:            http://www.gnu.org/software/libmicrohttpd/

 Source0:        https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz

@@ -22,12 +22,12 @@ Key features that distinguish libmicrohttpd from other projects are:

 %package devel

 Summary:        Development files for libmicrohttpd

 Requires:       %{name} = %{version}-%{release}

-

+Requires:       gnutls-devel

 %description devel

 Development files for libmicrohttpd

 %prep

-%autosetup -p1

+%setup -q

 %build

 autoreconf --install

@@ -58,6 +58,8 @@ rm -f %{buildroot}%{_bindir}/demo

 %{_datadir}/man/man3/libmicrohttpd.3.gz

 %changelog

+* Tue Aug 25 2020 Ankit Jain <ankitja@vmware.com> 0.9.71-2

+- Requires gnutls-devel for installation

 * Fri Aug 21 2020 Gerrit Photon <photon-checkins@vmware.com> 0.9.71-1

 - Automatic Version Bump

 * Wed Aug 12 2020 Susant Sahani <ssahani@vmware.com> 0.9.70-1

@@ -1,7 +1,7 @@

 Summary:        Ruby

 Name:           ruby

 Version:        2.5.8

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        BSDL

 URL:            https://www.ruby-lang.org/en/

 Group:          System Environment/Security

@@ -26,7 +26,8 @@ This is useful for object-oriented scripting.

 %build

 %configure \

         --enable-shared \

-        --docdir=%{_docdir}/%{name}-%{version}

+        --docdir=%{_docdir}/%{name}-%{version} \

+	--with-compress-debug-sections=no

 make %{?_smp_mflags} COPY="cp -p"

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

@@ -51,7 +52,10 @@ rm -rf %{buildroot}/*

 %{_datadir}/ri/*

 %{_docdir}/%{name}-%{version}

 %{_mandir}/man1/*

+

 %changelog

+*   Fri Jul 17 2020 Ankit Jain <ankitja@vmware.com> 2.5.8-2

+-   Added --with-compress-debug-sections=no to fix build issue

 *   Wed May 13 2020 Sujay G <gsujay@vmware.com> 2.5.8-1

 -   Bump version to 2.5.8

 *   Tue Jan 01 2019 Sujay G <gsujay@vmware.com> 2.5.3-1

@@ -9,7 +9,7 @@

 Name:          systemtap

 Version:       4.3

-Release:       2%{?dist}

+Release:       3%{?dist}

 Summary:       Programmable system-wide instrumentation system

 Group:         Development/System

 Vendor:	       VMware, Inc.

@@ -33,6 +33,7 @@ BuildRequires: perl

 BuildRequires: python3-setuptools

 BuildRequires: nss

 BuildRequires: shadow

+BuildRequires: curl-devel

 BuildRequires: python3-devel

 %if %with_boost

 BuildRequires: boost-devel

@@ -345,6 +346,8 @@ fi

 %{_mandir}/man8/systemtap-service.8*

 %changelog

+*   Wed Aug 19 2020 Ankit Jain <ankitja@vmware.com> 4.3-3

+-   BuildRequires curl-devel, required by libdebuginfod.so

 *   Fri Jul 17 2020 Tapas Kundu <tkundu@vmware.com> 4.3-2

 -   Mass removal python2

 *   Thu Jun 25 2020 Gerrit Photon <photon-checkins@vmware.com> 4.3-1