From 56b9dd7c0563f762a7aef14fdb607cee4fb85748 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 3 Mar 2024 22:16:23 +0000 Subject: [PATCH] core/elfutils to 0.191-1 --- core/elfutils/.SRCINFO | 46 +++++----- core/elfutils/.nvchecker.toml | 5 ++ core/elfutils/PKGBUILD | 155 ++++++++++++++++------------------ 3 files changed, 100 insertions(+), 106 deletions(-) create mode 100644 core/elfutils/.nvchecker.toml diff --git a/core/elfutils/.SRCINFO b/core/elfutils/.SRCINFO index adb0ea8c3..26691a52c 100644 --- a/core/elfutils/.SRCINFO +++ b/core/elfutils/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = elfutils pkgdesc = Handle ELF object files and DWARF debugging information - pkgver = 0.190 - pkgrel = 2 + pkgver = 0.191 + pkgrel = 1 url = https://sourceware.org/elfutils/ arch = x86_64 makedepends = bzip2 @@ -14,35 +14,23 @@ pkgbase = elfutils makedepends = zlib makedepends = zstd options = staticlibs - source = https://sourceware.org/elfutils/ftp/0.190/elfutils-0.190.tar.bz2 - source = https://sourceware.org/elfutils/ftp/0.190/elfutils-0.190.tar.bz2.sig - validpgpkeys = 47CC0331081B8BC6D0FD4DA08370665B57816A6A + source = https://sourceware.org/elfutils/ftp/0.191/elfutils-0.191.tar.bz2 + source = https://sourceware.org/elfutils/ftp/0.191/elfutils-0.191.tar.bz2.sig validpgpkeys = EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A - sha512sums = 9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102 + validpgpkeys = 6C2B631563B8D330578D3CB474FD3FA2779E7073 + sha512sums = e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04 sha512sums = SKIP - b2sums = 9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513 + b2sums = 2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca b2sums = SKIP -pkgname = debuginfod - pkgdesc = Handle ELF object files and DWARF debugging information (debuginfod) - license = GPL-3.0-or-later - depends = gcc-libs - depends = glibc - depends = libarchive - depends = libarchive.so - depends = libelf=0.190 - depends = libmicrohttpd - depends = libmicrohttpd.so - depends = sqlite - depends = libsqlite3.so - optdepends = elfutils=0.190: for translations - pkgname = elfutils pkgdesc = Handle ELF object files and DWARF debugging information (utilities) license = GPL-3.0-or-later depends = gcc-libs depends = glibc - depends = libelf=0.190 + depends = libarchive + depends = libarchive.so + depends = libelf=0.191 depends = sh pkgname = libelf @@ -59,3 +47,17 @@ pkgname = libelf depends = zlib depends = zstd depends = libzstd.so + +pkgname = debuginfod + pkgdesc = Handle ELF object files and DWARF debugging information (debuginfod) + license = GPL-3.0-or-later + depends = gcc-libs + depends = glibc + depends = libarchive + depends = libarchive.so + depends = libelf=0.191 + depends = libmicrohttpd + depends = libmicrohttpd.so + depends = sqlite + depends = libsqlite3.so + optdepends = elfutils=0.191: for translations diff --git a/core/elfutils/.nvchecker.toml b/core/elfutils/.nvchecker.toml new file mode 100644 index 000000000..93e08ae5c --- /dev/null +++ b/core/elfutils/.nvchecker.toml @@ -0,0 +1,5 @@ +[elfutils] +source = "git" +git = "https://sourceware.org/git/elfutils.git" +prefix = "elfutils-" +use_max_tag = true diff --git a/core/elfutils/PKGBUILD b/core/elfutils/PKGBUILD index 806c3c127..34196545a 100644 --- a/core/elfutils/PKGBUILD +++ b/core/elfutils/PKGBUILD @@ -8,12 +8,12 @@ pkgbase=elfutils pkgname=( - debuginfod elfutils libelf + debuginfod ) -pkgver=0.190 -pkgrel=2 +pkgver=0.191 +pkgrel=1 pkgdesc="Handle ELF object files and DWARF debugging information" arch=(x86_64) url="https://sourceware.org/elfutils/" @@ -30,15 +30,46 @@ makedepends=( ) options=(staticlibs) source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig}) -sha512sums=('9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102' +sha512sums=('e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04' 'SKIP') -b2sums=('9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513' +b2sums=('2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca' 'SKIP') validpgpkeys=( - '47CC0331081B8BC6D0FD4DA08370665B57816A6A' # Mark J. Wielaard 'EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A' # Mark Wielaard + '6C2B631563B8D330578D3CB474FD3FA2779E7073' # Aaron Merey ) +prepare() { + # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875 + sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am + + cd $pkgbase-$pkgver + autoreconf -fiv +} + +build() { + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --program-prefix="eu-" + --enable-deterministic-archives + ) + + # fat-lto-objects is required for non-mangled .a files in libelf + CFLAGS+=" -ffat-lto-objects" + + # debugging information is required for test-suite + CFLAGS+=" -g" + + cd $pkgbase-$pkgver + ./configure "${configure_options[@]}" + make +} + +check() { + make -C $pkgbase-$pkgver check +} + _pick() { local p="$1" f d; shift for f; do @@ -49,83 +80,6 @@ _pick() { done } -prepare() { - # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875 - sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am - ( - cd $pkgbase-$pkgver - autoreconf -fiv - ) - - cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver -} - - -build() { - local configure_options=( - --prefix=/usr - --sysconfdir=/etc - --program-prefix="eu-" - --enable-deterministic-archives - ) - - ( - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - cd $pkgbase-$pkgver - ./configure "${configure_options[@]}" - make - ) - ( - cd $pkgbase-test-$pkgver - # debugging information is required for test-suite - CFLAGS+=" -g" - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - ./configure "${configure_options[@]}" - make - ) -} - -check() { - make check -C $pkgbase-test-$pkgver -} - -package_debuginfod() { - pkgdesc+=" (debuginfod)" - license=( - GPL-3.0-or-later - ) - depends=( - gcc-libs - glibc - libarchive libarchive.so - libelf=$pkgver - libmicrohttpd libmicrohttpd.so - sqlite libsqlite3.so - ) - optdepends=("elfutils=$pkgver: for translations") - - make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver - install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" - - # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL - #printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls" - - ( - cd "$pkgdir" - - #_pick libelf etc/debuginfod/* - _pick libelf etc/profile.d/* - _pick libelf usr/{include,lib} - _pick elfutils usr/bin/eu-* - _pick elfutils usr/share/locale - _pick elfutils usr/share/man/man1/eu-* - _pick elfutils usr/share/man/man3/elf_* - ) - -} - package_elfutils() { pkgdesc+=" (utilities)" license=( @@ -134,11 +88,23 @@ package_elfutils() { depends=( gcc-libs glibc + libarchive libarchive.so libelf=$pkgver sh ) - mv -v elfutils/* "$pkgdir" + make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver + + ( + cd "$pkgdir" + + _pick libelf etc/debuginfod + _pick libelf etc/profile.d/* + _pick libelf usr/{include,lib} + _pick debuginfod usr/bin/debuginfod* + _pick debuginfod usr/share/man/*/debuginfod* + ) + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" } @@ -161,3 +127,24 @@ package_libelf() { mv -v libelf/* "$pkgdir" install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" } + +package_debuginfod() { + pkgdesc+=" (debuginfod)" + license=( + GPL-3.0-or-later + ) + depends=( + gcc-libs + glibc + libarchive libarchive.so + libelf=$pkgver + libmicrohttpd libmicrohttpd.so + sqlite libsqlite3.so + ) + optdepends=("elfutils=$pkgver: for translations") + + mv -v debuginfod/* "$pkgdir" + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" +} + +# vim:set sw=2 sts=-1 et: