CVS commit: pkgsrc/pkgtools/pkg

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb 15 15:49:45 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkg: distinfo
        pkgsrc/pkgtools/pkg/patches: patch-libpkg_pkg__elf.c

Log Message:
pkg: trust gelf.h to provide all the elf definitions we need


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/pkgtools/pkg/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg/distinfo
diff -u pkgsrc/pkgtools/pkg/distinfo:1.19 pkgsrc/pkgtools/pkg/distinfo:1.20
--- pkgsrc/pkgtools/pkg/distinfo:1.19   Mon Feb 10 13:13:26 2025
+++ pkgsrc/pkgtools/pkg/distinfo        Sat Feb 15 15:49:45 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2025/02/10 13:13:26 wiz Exp $
+$NetBSD: distinfo,v 1.20 2025/02/15 15:49:45 wiz Exp $
 
 BLAKE2s (pkg-1.10.99.7.tar.xz) = 61884e04f4a8283925b53d388d19e3e56a0744459230f8d2c66ccd31e1b78ffb
 SHA512 (pkg-1.10.99.7.tar.xz) = 32bfb919da140bb7b75427ea6351aee3a4a297a0e13b5c722bdd5a0b8f488085883df36929fb97ff6fd944b901fa0fc95174b1474a9a4422047ffc626869e43b
 Size (pkg-1.10.99.7.tar.xz) = 2217824 bytes
 SHA1 (patch-configure) = b9897af770d89b07652d5a2fbc7116b758b5e80c
-SHA1 (patch-libpkg_pkg__elf.c) = a73e90e8a5048b5327a1192d066852ad63c0e094
+SHA1 (patch-libpkg_pkg__elf.c) = 4cff6afe164502f49abb11a7a2a1936331eeaf7c
 SHA1 (patch-scripts_periodic_411.pkg-backup) = cba8a752c07616e7efa2b775363f91446b570ff3
 SHA1 (patch-scripts_periodic_411.pkg-backup.in) = 4dbeee9b07d7a7795a02219f4d2f12a039c58aaa
 SHA1 (patch-src_main.c) = c161270714a62110f9a42585ff960a2c5f5b4157

Index: pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c
diff -u pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c:1.3 pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c:1.4
--- pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c:1.3     Mon Feb 10 13:13:27 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c Sat Feb 15 15:49:45 2025
@@ -1,15 +1,23 @@
-$NetBSD: patch-libpkg_pkg__elf.c,v 1.3 2025/02/10 13:13:27 wiz Exp $
+$NetBSD: patch-libpkg_pkg__elf.c,v 1.4 2025/02/15 15:49:45 wiz Exp $
 
 Avoid symbol conflicts on NetBSD due to libelf.h vs. exec_elf.h.
 
 --- libpkg/pkg_elf.c.orig      2018-01-06 22:53:49.000000000 +0000
 +++ libpkg/pkg_elf.c
-@@ -48,7 +48,7 @@
+@@ -48,16 +48,10 @@
  #include <fcntl.h>
  #include <gelf.h>
  #include <libgen.h>
 -#if defined(HAVE_LINK_H) && !defined(__DragonFly__) && defined(HAVE_LIBELF)
-+#if defined(HAVE_LINK_H) && !defined(__DragonFly__) && !defined(HAVE_LIBELF)
- #include <link.h>
- #endif
+-#include <link.h>
+-#endif
  #include <paths.h>
+ #include <stdbool.h>
+ #include <string.h>
+ #include <unistd.h>
+-#ifdef HAVE_LIBELF
+-#include <libelf.h>
+-#endif
+ 
+ #include <bsd_compat.h>
+