From 1ebdb388c1f5686038db2dfd4f19b8489954f282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Apr 2024 21:54:49 +0200 Subject: [PATCH 1/5] upgpkg: systemtap 5.0-1 upstream release --- .SRCINFO | 17 +++++------ PKGBUILD | 74 ++++++++++++++++++++--------------------------- systemtap.install | 20 ++++++------- 3 files changed, 49 insertions(+), 62 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5a1318a..5e93981 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,26 +1,23 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.8 + pkgver = 5.0 pkgrel = 1 - url = http://sourceware.org/systemtap/ + url = https://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 - arch = i686 license = GPL makedepends = python-setuptools - makedepends = python2-setuptools makedepends = xmlto depends = elfutils depends = nss depends = python depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.8.tar.gz::https://sourceware.org/ftp/systemtap/releases/systemtap-4.8.tar.gz - source = systemtap-4.8.tar.gz.asc::https://sourceware.org/ftp/systemtap/releases/systemtap-4.8.tar.gz.sig - validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 - validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 - validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA - sha512sums = fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2 + options = !emptydirs + source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.0.tar.gz + source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.0.tar.gz.asc + validpgpkeys = 41A0C11274B1E87FE28E4C53E3D77E1F95161991 + sha512sums = dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c sha512sums = SKIP pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index bfdbabb..a899440 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,56 +1,46 @@ -# Maintainer: Christian Pellegrin (chripell) -# Original Maintainer: An Nguyen (stk) -# Original Maintainer: George Angelopoulos -# Original Maintainer: Christian Rebischke -# Original Maintainer: dront78 +# Maintainer: Manuel Hüsers +# Contributor: Christian Pellegrin (chripell) +# Contributor: An Nguyen (stk) +# Contributor: George Angelopoulos +# Contributor: Christian Rebischke +# Contributor: dront78 + pkgname=systemtap -pkgver=4.8 +pkgver=5.0 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" -url="http://sourceware.org/systemtap/" -arch=('x86_64' 'i686') +url="https://sourceware.org/systemtap/" +arch=('x86_64') license=('GPL') depends=('elfutils' 'nss' 'python' 'cpio') -makedepends=('python-setuptools' 'python2-setuptools' 'xmlto') +makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') -source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/ftp/systemtap/releases/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/ftp/systemtap/releases/${pkgname}-${pkgver}.tar.gz.sig" - ) -sha512sums=('fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2' +options=('!emptydirs') +install="${pkgname}.install" +source=("https://sourceware.org/ftp/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha512sums=('dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c' 'SKIP') -install='systemtap.install' -# Note, you need to run: -# gpg --recv-keys --keyserver hkps://keys.openpgp.org/ 0xD7C256443CC637CA -# unless /etc/pacman.d/gnupg/gpg.conf is updated. -validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8' # "Serhei Makarov (for Red Hat 2018..onwards) " - '5D38116FA4D3A7CC77E378D37E83610126DCC2E8' - '159B0DF71150B8A8539A8802D7C256443CC637CA') -prepare() { - cd "${pkgname}-${pkgver}" -} +validpgpkeys=('41A0C11274B1E87FE28E4C53E3D77E1F95161991') build() { - cd "${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/"${pkgname}" \ - --libdir=/usr/lib/"${pkgname}" \ - --mandir=/usr/share/man/ \ - --sbindir=/usr/bin \ - --localstatedir=/var \ - --enable-pie \ - --disable-docs \ - --enable-htmldocs \ - --with-python3 - make + cd "${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/"${pkgname}" \ + --libdir=/usr/lib/"${pkgname}" \ + --mandir=/usr/share/man/ \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --enable-pie \ + --disable-docs \ + --enable-htmldocs \ + --with-python3 + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rmdir "${pkgdir}/var/run/stap-server/" - rmdir "${pkgdir}/var/run/" - rm -r "${pkgdir}/usr/include" + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/systemtap.install b/systemtap.install index bde565f..f39e7c3 100644 --- a/systemtap.install +++ b/systemtap.install @@ -1,18 +1,18 @@ post_install() { - getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr - getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys - getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev + getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr + getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys + getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev - getent group stapusr >/dev/null && chgrp stapusr /usr/bin/stapbpf - chmod 04110 /usr/bin/stapbpf + getent group stapusr >/dev/null && chgrp stapusr /usr/bin/stapbpf + chmod 04110 /usr/bin/stapbpf - getent group stapusr >/dev/null && chgrp stapusr /usr/bin/staprun - chmod 04110 /usr/bin/staprun + getent group stapusr >/dev/null && chgrp stapusr /usr/bin/staprun + chmod 04110 /usr/bin/staprun - echo "CONFIG_DEBUG_INFO is disabled on default. You need to recompile" - echo "the kernel with CONFIG_DEBUG_INFO enabled." + echo "CONFIG_DEBUG_INFO is disabled on default. You need to recompile" + echo "the kernel with CONFIG_DEBUG_INFO enabled." } post_upgrade() { - post_install $1 + post_install $1 } From bce4538d219b18197cb4ced535859c5dcfde61eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Apr 2024 22:53:57 +0200 Subject: [PATCH 2/5] systemtap: Remove redundant .gitignore --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e93be39..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.tar.xz -*.tar.gz -*.asc -pkg -src From 15c42590fdd33c5f8e897bf342ece950ff6b724b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 24 Apr 2024 07:19:24 +0200 Subject: [PATCH 3/5] upgpkg: systemtap 5.0-2: fix conflict, add check * Fix filesystem conflict by excluding include files already provided by glibc * Add make check target --- .SRCINFO | 2 +- PKGBUILD | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5e93981..2b9c955 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system pkgver = 5.0 - pkgrel = 1 + pkgrel = 2 url = https://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index a899440..36a3f5e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=systemtap pkgver=5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="https://sourceware.org/systemtap/" arch=('x86_64') @@ -40,7 +40,13 @@ build() { make } +check() { + cd "${pkgname}-${pkgver}" + make check +} + package() { cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}/usr/include/sys" } From 585bfb8ee61e17448727dd23e8c0028c0839cfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 13 May 2024 06:56:52 +0200 Subject: [PATCH 4/5] upgpkg: systemtap 5.1-1 upstream release --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2b9c955..710496c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 5.0 - pkgrel = 2 + pkgver = 5.1 + pkgrel = 1 url = https://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -14,10 +14,10 @@ pkgbase = systemtap depends = cpio optdepends = sqlite3: for storing results in a database options = !emptydirs - source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.0.tar.gz - source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.0.tar.gz.asc + source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.1.tar.gz + source = https://sourceware.org/ftp/systemtap/releases/systemtap-5.1.tar.gz.asc validpgpkeys = 41A0C11274B1E87FE28E4C53E3D77E1F95161991 - sha512sums = dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c + sha512sums = da0fe237d2124031a5786d1221dbb420d90da5497376715fd43a7a9f61a354a229c1128e67ce6becbc012aa3796dc5d337149e239e3c1def0651b179e5bf199f sha512sums = SKIP pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 36a3f5e..c6dab89 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: dront78 pkgname=systemtap -pkgver=5.0 -pkgrel=2 +pkgver=5.1 +pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="https://sourceware.org/systemtap/" arch=('x86_64') @@ -18,7 +18,7 @@ optdepends=('sqlite3: for storing results in a database') options=('!emptydirs') install="${pkgname}.install" source=("https://sourceware.org/ftp/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz"{,.asc}) -sha512sums=('dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c' +sha512sums=('da0fe237d2124031a5786d1221dbb420d90da5497376715fd43a7a9f61a354a229c1128e67ce6becbc012aa3796dc5d337149e239e3c1def0651b179e5bf199f' 'SKIP') validpgpkeys=('41A0C11274B1E87FE28E4C53E3D77E1F95161991') From cb7eee5c92973a6ab1bf320c1be9681f14c6ac8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 21 Jul 2024 07:32:40 +0200 Subject: [PATCH 5/5] Adopt SPDX identifiers for license fields --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 710496c..e200204 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,7 +5,7 @@ pkgbase = systemtap url = https://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 - license = GPL + license = GPL-2.0-or-later makedepends = python-setuptools makedepends = xmlto depends = elfutils diff --git a/PKGBUILD b/PKGBUILD index c6dab89..f7222fe 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="https://sourceware.org/systemtap/" arch=('x86_64') -license=('GPL') +license=('GPL-2.0-or-later') depends=('elfutils' 'nss' 'python' 'cpio') makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database')