From b35ca95fd4f6935b42b1b39f989d102d1972df27 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Wed, 10 Jun 2015 12:05:28 +0300 Subject: [PATCH 01/38] Initial import --- .AURINFO | 24 ++++++++++++++++++++++++ .SRCINFO | 24 ++++++++++++++++++++++++ PKGBUILD | 28 ++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 .AURINFO create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.AURINFO b/.AURINFO new file mode 100644 index 0000000..f603bdb --- /dev/null +++ b/.AURINFO @@ -0,0 +1,24 @@ +# Generated by makepkg 4.2.1 +# Wed Jun 10 09:04:23 UTC 2015 +pkgbase = systemtap + pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. + pkgver = 2.7 + pkgrel = 3 + url = http://sourceware.org/systemtap/ + arch = i686 + arch = x86_64 + arch = armv7h + license = GPL + makedepends = gcc + depends = elfutils + depends = nss + depends = python2 + optdepends = sqlite3 + optdepends = linux-fedora + source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.7.tar.gz + source = .AURINFO + sha1sums = 5562d16446434e1a9a377697c45eb0852303ae41 + sha1sums = SKIP + +pkgname = systemtap + diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..f603bdb --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,24 @@ +# Generated by makepkg 4.2.1 +# Wed Jun 10 09:04:23 UTC 2015 +pkgbase = systemtap + pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. + pkgver = 2.7 + pkgrel = 3 + url = http://sourceware.org/systemtap/ + arch = i686 + arch = x86_64 + arch = armv7h + license = GPL + makedepends = gcc + depends = elfutils + depends = nss + depends = python2 + optdepends = sqlite3 + optdepends = linux-fedora + source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.7.tar.gz + source = .AURINFO + sha1sums = 5562d16446434e1a9a377697c45eb0852303ae41 + sha1sums = SKIP + +pkgname = systemtap + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..a4f1a0a --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,28 @@ +pkgname=systemtap +pkgver=2.7 +pkgrel=3 +pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." +url="http://sourceware.org/systemtap/" +arch=('i686' 'x86_64' 'armv7h') +license=('GPL') +depends=('elfutils' 'nss' 'python2') +makedepends=('gcc') +optdepends=('sqlite3' 'linux-fedora') +source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz .AURINFO) +sha1sums=('5562d16446434e1a9a377697c45eb0852303ae41' + 'SKIP') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + echo enable python2... + sed -i 's/python/python2/g' ${pkgdir}/usr/bin/dtrace +} + +# vim:set ts=2 sw=2 et: From 590933edeeeebb6dc9c7c38ff433154172aedf4c Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Thu, 13 Aug 2015 14:19:07 +0300 Subject: [PATCH 02/38] systemtap v2.8 --- .AURINFO | 24 ------------------------ .SRCINFO | 8 +++----- PKGBUILD | 9 ++++----- 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 .AURINFO diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index f603bdb..0000000 --- a/.AURINFO +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by makepkg 4.2.1 -# Wed Jun 10 09:04:23 UTC 2015 -pkgbase = systemtap - pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 2.7 - pkgrel = 3 - url = http://sourceware.org/systemtap/ - arch = i686 - arch = x86_64 - arch = armv7h - license = GPL - makedepends = gcc - depends = elfutils - depends = nss - depends = python2 - optdepends = sqlite3 - optdepends = linux-fedora - source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.7.tar.gz - source = .AURINFO - sha1sums = 5562d16446434e1a9a377697c45eb0852303ae41 - sha1sums = SKIP - -pkgname = systemtap - diff --git a/.SRCINFO b/.SRCINFO index f603bdb..7073594 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -2,8 +2,8 @@ # Wed Jun 10 09:04:23 UTC 2015 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 2.7 - pkgrel = 3 + pkgver = 2.8 + pkgrel = 1 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 @@ -16,9 +16,7 @@ pkgbase = systemtap optdepends = sqlite3 optdepends = linux-fedora source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.7.tar.gz - source = .AURINFO - sha1sums = 5562d16446434e1a9a377697c45eb0852303ae41 - sha1sums = SKIP + sha1sums = 95034e8243e1f9fd33b765afda06546083df1b7f pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index a4f1a0a..3840175 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=systemtap -pkgver=2.7 -pkgrel=3 +pkgver=2.8 +pkgrel=1 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h') @@ -8,9 +8,8 @@ license=('GPL') depends=('elfutils' 'nss' 'python2') makedepends=('gcc') optdepends=('sqlite3' 'linux-fedora') -source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz .AURINFO) -sha1sums=('5562d16446434e1a9a377697c45eb0852303ae41' - 'SKIP') +source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('95034e8243e1f9fd33b765afda06546083df1b7f') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 7401ef4d0e69214323f41f495306b65e7d2408c3 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Thu, 13 Aug 2015 14:19:51 +0300 Subject: [PATCH 03/38] systemtap v2.8 p2 --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 7073594..02c248f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -15,7 +15,7 @@ pkgbase = systemtap depends = python2 optdepends = sqlite3 optdepends = linux-fedora - source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.7.tar.gz + source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.8.tar.gz sha1sums = 95034e8243e1f9fd33b765afda06546083df1b7f pkgname = systemtap From b20665c2a932a5d3e8ec57b4812dd7a03ea4988d Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 10 Oct 2015 11:05:12 +0300 Subject: [PATCH 04/38] 2.9 --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 3840175..72070f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=systemtap -pkgver=2.8 +pkgver=2.9 pkgrel=1 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" @@ -9,7 +9,7 @@ depends=('elfutils' 'nss' 'python2') makedepends=('gcc') optdepends=('sqlite3' 'linux-fedora') source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('95034e8243e1f9fd33b765afda06546083df1b7f') +sha1sums=('37ecbc7445ff34db3c8204b1541f25524a0e8024') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 1130736383c917004c87cc1c99cd8d35905ff3a0 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 10 Oct 2015 11:09:18 +0300 Subject: [PATCH 05/38] 2.9 --- .SRCINFO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 02c248f..6753607 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -2,7 +2,7 @@ # Wed Jun 10 09:04:23 UTC 2015 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 2.8 + pkgver = 2.9 pkgrel = 1 url = http://sourceware.org/systemtap/ arch = i686 @@ -16,7 +16,7 @@ pkgbase = systemtap optdepends = sqlite3 optdepends = linux-fedora source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.8.tar.gz - sha1sums = 95034e8243e1f9fd33b765afda06546083df1b7f + sha1sums = 37ecbc7445ff34db3c8204b1541f25524a0e8024 pkgname = systemtap From d7a259767bee6660b16c2b4d426e4df8d1094cc2 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 24 Oct 2015 12:28:00 +0300 Subject: [PATCH 06/38] fix srcinfo --- .SRCINFO | 4 +--- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6753607..3179abf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,3 @@ -# Generated by makepkg 4.2.1 -# Wed Jun 10 09:04:23 UTC 2015 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 2.9 @@ -15,7 +13,7 @@ pkgbase = systemtap depends = python2 optdepends = sqlite3 optdepends = linux-fedora - source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.8.tar.gz + source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.9.tar.gz sha1sums = 37ecbc7445ff34db3c8204b1541f25524a0e8024 pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 72070f4..81a955c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=systemtap pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h') From a655ab75d2476964b1d614ffd8fa22933abb83fd Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 24 Oct 2015 12:28:45 +0300 Subject: [PATCH 07/38] fix srcinfo --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 3179abf..c659980 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 2.9 - pkgrel = 1 + pkgrel = 2 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 From 61aa95a135cd5b2987a2898f7ae779959e973348 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Wed, 30 Mar 2016 19:04:53 +0300 Subject: [PATCH 08/38] updated to 3.0 --- .SRCINFO | 12 ++++++++---- PKGBUILD | 10 +++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c659980..f4e3d69 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,20 +1,24 @@ +# Generated by mksrcinfo v8 +# Wed Mar 30 16:04:32 UTC 2016 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 2.9 - pkgrel = 2 + pkgver = 3.0 + pkgrel = 1 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 arch = armv7h + arch = armv6h license = GPL makedepends = gcc depends = elfutils depends = nss depends = python2 + depends = latex2html optdepends = sqlite3 optdepends = linux-fedora - source = http://sourceware.org/systemtap/ftp/releases/systemtap-2.9.tar.gz - sha1sums = 37ecbc7445ff34db3c8204b1541f25524a0e8024 + source = http://sourceware.org/systemtap/ftp/releases/systemtap-3.0.tar.gz + sha1sums = 5ef3a2d9945b0f6bae0061e33811e25e5138f5b7 pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 81a955c..0644992 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,15 +1,15 @@ pkgname=systemtap -pkgver=2.9 -pkgrel=2 +pkgver=3.0 +pkgrel=1 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" -arch=('i686' 'x86_64' 'armv7h') +arch=('i686' 'x86_64' 'armv7h' 'armv6h') license=('GPL') -depends=('elfutils' 'nss' 'python2') +depends=('elfutils' 'nss' 'python2' 'latex2html') makedepends=('gcc') optdepends=('sqlite3' 'linux-fedora') source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('37ecbc7445ff34db3c8204b1541f25524a0e8024') +sha1sums=('5ef3a2d9945b0f6bae0061e33811e25e5138f5b7') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 4849189ad8a7249a334542565c54a0e86c5a479b Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 2 Apr 2016 12:47:47 +0300 Subject: [PATCH 09/38] depends update --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f4e3d69..d5fc81f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Mar 30 16:04:32 UTC 2016 +# Sat Apr 2 09:47:29 UTC 2016 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 3.0 - pkgrel = 1 + pkgrel = 2 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 @@ -14,6 +14,7 @@ pkgbase = systemtap depends = elfutils depends = nss depends = python2 + depends = texlive-latexextra depends = latex2html optdepends = sqlite3 optdepends = linux-fedora diff --git a/PKGBUILD b/PKGBUILD index 0644992..cd13927 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,11 @@ pkgname=systemtap pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h' 'armv6h') license=('GPL') -depends=('elfutils' 'nss' 'python2' 'latex2html') +depends=('elfutils' 'nss' 'python2' 'texlive-latexextra' 'latex2html') makedepends=('gcc') optdepends=('sqlite3' 'linux-fedora') source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) From 50d15a59a5f2ad547952999ef909ea744c3903ff Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Mon, 16 Jan 2017 09:23:11 +0300 Subject: [PATCH 10/38] deps updated --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d5fc81f..fc1607c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Apr 2 09:47:29 UTC 2016 +# Mon Jan 16 06:22:48 UTC 2017 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 3.0 - pkgrel = 2 + pkgrel = 3 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 @@ -14,10 +14,10 @@ pkgbase = systemtap depends = elfutils depends = nss depends = python2 + depends = texlive-fontsextra depends = texlive-latexextra depends = latex2html optdepends = sqlite3 - optdepends = linux-fedora source = http://sourceware.org/systemtap/ftp/releases/systemtap-3.0.tar.gz sha1sums = 5ef3a2d9945b0f6bae0061e33811e25e5138f5b7 diff --git a/PKGBUILD b/PKGBUILD index cd13927..89da25a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,13 @@ pkgname=systemtap pkgver=3.0 -pkgrel=2 +pkgrel=3 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h' 'armv6h') license=('GPL') -depends=('elfutils' 'nss' 'python2' 'texlive-latexextra' 'latex2html') +depends=('elfutils' 'nss' 'python2' 'texlive-fontsextra' 'texlive-latexextra' 'latex2html') makedepends=('gcc') -optdepends=('sqlite3' 'linux-fedora') +optdepends=('sqlite3') source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) sha1sums=('5ef3a2d9945b0f6bae0061e33811e25e5138f5b7') From 504a01b4e8e872446d74469cca88f9fbf38e199e Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sat, 18 Feb 2017 15:51:28 +0300 Subject: [PATCH 11/38] version 3.1 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fc1607c..5d88835 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Jan 16 06:22:48 UTC 2017 +# Sat Feb 18 12:51:09 UTC 2017 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 3.0 - pkgrel = 3 + pkgver = 3.1 + pkgrel = 1 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 @@ -18,8 +18,8 @@ pkgbase = systemtap depends = texlive-latexextra depends = latex2html optdepends = sqlite3 - source = http://sourceware.org/systemtap/ftp/releases/systemtap-3.0.tar.gz - sha1sums = 5ef3a2d9945b0f6bae0061e33811e25e5138f5b7 + source = http://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz + sha1sums = 2927ee7e780b45e47d770798f80dfd5be62e095d pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 89da25a..2ad34d3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=systemtap -pkgver=3.0 -pkgrel=3 +pkgver=3.1 +pkgrel=1 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h' 'armv6h') @@ -9,7 +9,7 @@ depends=('elfutils' 'nss' 'python2' 'texlive-fontsextra' 'texlive-latexextra' 'l makedepends=('gcc') optdepends=('sqlite3') source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('5ef3a2d9945b0f6bae0061e33811e25e5138f5b7') +sha1sums=('2927ee7e780b45e47d770798f80dfd5be62e095d') build() { cd "${srcdir}/${pkgname}-${pkgver}" From cf13ef22d0679eae5588652782a00d16e0f8d645 Mon Sep 17 00:00:00 2001 From: Ivan Lyapunov Date: Sun, 5 Mar 2017 12:28:44 +0300 Subject: [PATCH 12/38] swicth to upstream python handling --- .SRCINFO | 4 ++-- PKGBUILD | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5d88835..fa4ed7c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Feb 18 12:51:09 UTC 2017 +# Sun Mar 5 09:28:04 UTC 2017 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 3.1 - pkgrel = 1 + pkgrel = 2 url = http://sourceware.org/systemtap/ arch = i686 arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 2ad34d3..6a4f9d5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=systemtap pkgver=3.1 -pkgrel=1 +pkgrel=2 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64' 'armv7h' 'armv6h') @@ -20,8 +20,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - echo enable python2... - sed -i 's/python/python2/g' ${pkgdir}/usr/bin/dtrace } # vim:set ts=2 sw=2 et: From 12037b90a40fdbcf86b3adfe9ff6b2747d12a49c Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Mon, 27 Mar 2017 21:15:49 +0200 Subject: [PATCH 13/38] moved from AUR to community --- .SRCINFO | 12 ++++-------- PKGBUILD | 16 +++++++++------- systemtap.install | 4 ++++ 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 systemtap.install diff --git a/.SRCINFO b/.SRCINFO index fa4ed7c..8ddfd4d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,12 @@ -# Generated by mksrcinfo v8 -# Sun Mar 5 09:28:04 UTC 2017 pkgbase = systemtap pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. pkgver = 3.1 - pkgrel = 2 + pkgrel = 3 url = http://sourceware.org/systemtap/ + install = systemtap.install arch = i686 arch = x86_64 - arch = armv7h - arch = armv6h license = GPL - makedepends = gcc depends = elfutils depends = nss depends = python2 @@ -18,8 +14,8 @@ pkgbase = systemtap depends = texlive-latexextra depends = latex2html optdepends = sqlite3 - source = http://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz - sha1sums = 2927ee7e780b45e47d770798f80dfd5be62e095d + source = systemtap-3.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz + sha512sums = 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 6a4f9d5..752ed5a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,22 @@ +# $Id$ +# Maintainer : Christian Rebischke +# Contributor:dront78 pkgname=systemtap pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." url="http://sourceware.org/systemtap/" -arch=('i686' 'x86_64' 'armv7h' 'armv6h') +arch=('i686' 'x86_64') license=('GPL') depends=('elfutils' 'nss' 'python2' 'texlive-fontsextra' 'texlive-latexextra' 'latex2html') -makedepends=('gcc') optdepends=('sqlite3') -source=(http://sourceware.org/systemtap/ftp/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('2927ee7e780b45e47d770798f80dfd5be62e095d') +source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz") +sha512sums=('07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d') +install='systemtap.install' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 + ./configure --prefix=/usr --sysconfdir=/etc make } @@ -22,4 +25,3 @@ package() { make DESTDIR="${pkgdir}" install } -# vim:set ts=2 sw=2 et: diff --git a/systemtap.install b/systemtap.install new file mode 100644 index 0000000..d168c58 --- /dev/null +++ b/systemtap.install @@ -0,0 +1,4 @@ +post_install() { + echo "CONFIG_DEBUG_INFO is disabled on default. You need to recompile" + echo "the kernel with CONFIG_DEBUG_INFO enabled." +} From 5a3ef0f5d1ea3cec5a87c563792d0f9af4f95df2 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Fri, 7 Apr 2017 01:56:20 +0200 Subject: [PATCH 14/38] changed PKGBUILD --- .SRCINFO | 6 ++---- PKGBUILD | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8ddfd4d..cb1003b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -7,15 +7,13 @@ pkgbase = systemtap arch = i686 arch = x86_64 license = GPL + makedepends = python2-setuptools depends = elfutils depends = nss depends = python2 - depends = texlive-fontsextra - depends = texlive-latexextra - depends = latex2html optdepends = sqlite3 source = systemtap-3.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz - sha512sums = 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d + sha512sums = 10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 752ed5a..bc32126 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 219416 2017-03-27 19:17:50Z shibumi $ # Maintainer : Christian Rebischke # Contributor:dront78 pkgname=systemtap @@ -8,15 +8,24 @@ pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the g url="http://sourceware.org/systemtap/" arch=('i686' 'x86_64') license=('GPL') -depends=('elfutils' 'nss' 'python2' 'texlive-fontsextra' 'texlive-latexextra' 'latex2html') +depends=('elfutils' 'nss' 'python2') +makedepends=('python2-setuptools') optdepends=('sqlite3') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz") -sha512sums=('07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d') +sha512sums=('10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d') install='systemtap.install' build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + cd "${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/"${pkgname}" \ + --libdir=/usr/lib/"${pkgname}" \ + --mandir=/usr/share/man/ \ + --localstatedir=/var/run/"${pkgname}" \ + --enable-pie \ + --disable-docs make } From 68ebb460827c10678fcf49dbddaf03c101dc4fb9 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Wed, 14 Feb 2018 12:31:23 +0100 Subject: [PATCH 15/38] moved to AUR --- .SRCINFO | 20 +++++++++++++------- PKGBUILD | 33 ++++++++++++++++++++++----------- access_process_vm_h.patch | 10 ++++++++++ stp_utrace_c.patch | 11 +++++++++++ 4 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 access_process_vm_h.patch create mode 100644 stp_utrace_c.patch diff --git a/.SRCINFO b/.SRCINFO index cb1003b..e3d9a1c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,25 @@ pkgbase = systemtap - pkgdesc = SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system. - pkgver = 3.1 - pkgrel = 3 + pkgdesc = provides infrastructure to simplify the gathering of information about the running system. + pkgver = 3.2 + pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install - arch = i686 arch = x86_64 + arch = i686 license = GPL makedepends = python2-setuptools + makedepends = xmlto depends = elfutils depends = nss depends = python2 - optdepends = sqlite3 - source = systemtap-3.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz - sha512sums = 10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d + optdepends = sqlite3: for storing results in a database + source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz + source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc + source = access_process_vm_h.patch + validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 + sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 + sha512sums = SKIP + sha512sums = f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index bc32126..3988fea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 219416 2017-03-27 19:17:50Z shibumi $ # Maintainer : Christian Rebischke # Contributor:dront78 pkgname=systemtap -pkgver=3.1 -pkgrel=3 -pkgdesc="SystemTap provides free software (GPL) infrastructure to simplify the gathering of information about the running Linux system." +pkgver=3.2 +pkgrel=1 +pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') license=('GPL') depends=('elfutils' 'nss' 'python2') -makedepends=('python2-setuptools') -optdepends=('sqlite3') -source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz") -sha512sums=('10019b9c2d66f3f8d6e6ce3d1f3dfe99c9e5bda9f220eb2aa885643235c270c2004528cded0e94370cc0fc0c62d8fbe96cafa7609c619a8ee498335ecd0aa41d') +makedepends=('python2-setuptools' 'xmlto') +optdepends=('sqlite3: for storing results in a database') +source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" + "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" + 'access_process_vm_h.patch') +sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' + 'SKIP' + 'f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b') install='systemtap.install' +validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') +prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/access_process_vm_h.patch" +} build() { cd "${pkgname}-${pkgver}" ./configure \ @@ -23,14 +31,17 @@ build() { --libexecdir=/usr/lib/"${pkgname}" \ --libdir=/usr/lib/"${pkgname}" \ --mandir=/usr/share/man/ \ - --localstatedir=/var/run/"${pkgname}" \ + --localstatedir=/var \ --enable-pie \ - --disable-docs + --disable-docs \ + --enable-htmldocs make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rmdir "${pkgdir}/var/run/stap-server/" + rmdir "${pkgdir}/var/run/" } diff --git a/access_process_vm_h.patch b/access_process_vm_h.patch new file mode 100644 index 0000000..7eb0fd6 --- /dev/null +++ b/access_process_vm_h.patch @@ -0,0 +1,10 @@ +--- ./runtime/linux/access_process_vm.h 2017-02-17 18:37:01.000000000 +0100 ++++ /usr/share/systemtap/runtime/linux/access_process_vm.h 2017-08-09 11:47:50.332532411 +0200 +@@ -4,6 +4,7 @@ + * we copied and pasted it here. Fortunately, everything it calls is exported. + */ + #include ++#include + #include + + static int diff --git a/stp_utrace_c.patch b/stp_utrace_c.patch new file mode 100644 index 0000000..987d7f6 --- /dev/null +++ b/stp_utrace_c.patch @@ -0,0 +1,11 @@ +--- ./runtime/stp_utrace.c 2017-02-17 18:37:01.000000000 +0100 ++++ /usr/share/systemtap/runtime/stp_utrace.c 2017-08-09 11:59:21.542501780 +0200 +@@ -1105,7 +1105,7 @@ + */ + spin_lock_irq(&target->sighand->siglock); + if (likely(task_is_stopped(target))) +- __set_task_state(target, TASK_TRACED); ++ set_current_state(TASK_TRACED); + spin_unlock_irq(&target->sighand->siglock); + } else if (utrace->resume > UTRACE_REPORT) { + utrace->resume = UTRACE_REPORT; From c012fdf64ef3a3a105a239574e241e8cbefb29ea Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Sat, 24 Feb 2018 20:28:27 +0100 Subject: [PATCH 16/38] removed the install hooks See also: https://bugs.archlinux.org/task/56853 --- PKGBUILD | 3 ++- stp_remove_install_hooks.patch | 37 ++++++++++++++++++++++++++++++++++ systemtap.install | 14 +++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 stp_remove_install_hooks.patch diff --git a/PKGBUILD b/PKGBUILD index 3988fea..71d0173 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,7 +21,8 @@ validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') prepare() { cd "${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/access_process_vm_h.patch" + patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch" + autoreconf -i } build() { cd "${pkgname}-${pkgver}" diff --git a/stp_remove_install_hooks.patch b/stp_remove_install_hooks.patch new file mode 100644 index 0000000..244ac83 --- /dev/null +++ b/stp_remove_install_hooks.patch @@ -0,0 +1,37 @@ +diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am +index a303d25f6..703668362 100644 +--- a/stapbpf/Makefile.am ++++ b/stapbpf/Makefile.am +@@ -38,14 +38,4 @@ CLEANFILES = + BUILT_SOURCES += git_version.stamp + git_version.stamp ../git_version.h: + $(MAKE) -C .. $(notdir $@) +- +-# Why the "id -u" condition? This way, an unprivileged user can run +-# make install, and have "sudo stap ...." or "sudo stapbpf ...." work later. +-install-exec-hook: +- if [ `id -u` -eq 0 ]; then \ +- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ +- getent group stapusr >/dev/null \ +- && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \ +- && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ +- fi + endif +diff --git a/staprun/Makefile.am b/staprun/Makefile.am +index 4073aa01c..978d115f9 100644 +--- a/staprun/Makefile.am ++++ b/staprun/Makefile.am +@@ -68,13 +68,3 @@ CLEANFILES = + BUILT_SOURCES += git_version.stamp + git_version.stamp ../git_version.h: + $(MAKE) -C .. $(notdir $@) +- +- +-# Why the "id -u" condition? This way, an unprivileged user can run +-# make install, and have "sudo stap ...." or "sudo staprun ...." work later. +-install-exec-hook: +- if [ `id -u` -eq 0 ]; then \ +- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ +- getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \ +- chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \ +- fi diff --git a/systemtap.install b/systemtap.install index d168c58..bde565f 100644 --- a/systemtap.install +++ b/systemtap.install @@ -1,4 +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 && 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 + 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 +} From fd091df49191c820a85c9b0696e1243b91d8cf60 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Tue, 27 Feb 2018 18:28:45 +0100 Subject: [PATCH 17/38] added the correct patch --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e3d9a1c..f0c5f95 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 - pkgrel = 1 + pkgrel = 2 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -15,7 +15,7 @@ pkgbase = systemtap optdepends = sqlite3: for storing results in a database source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc - source = access_process_vm_h.patch + source = stp_remove_install_hooks.patch validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 71d0173..7d8e28c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor:dront78 pkgname=systemtap pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ makedepends=('python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" - 'access_process_vm_h.patch') + 'stp_remove_install_hooks.patch') sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' 'SKIP' 'f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b') From dda4d2e8984e62619e278b196fcd150efb8d485f Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Wed, 28 Feb 2018 14:13:07 +0100 Subject: [PATCH 18/38] new hashes --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f0c5f95..6761d2f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -19,7 +19,7 @@ pkgbase = systemtap validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 sha512sums = SKIP - sha512sums = f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b + sha512sums = 1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537 pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 7d8e28c..1757e2c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/relea 'stp_remove_install_hooks.patch') sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' 'SKIP' - 'f33d81d2e4d0892cb248e89eb11b76d390f78ef7e50dca8d15e0a868c1a42fb0fc40ea69d6d967ebd65dd7d7a910bf8b2faf31378dc744ef1e13aeb423a2572b') + '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537') install='systemtap.install' validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') From a2db70026d5b044f8110c7b39591cca716ba536a Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sun, 3 Jun 2018 16:35:39 +0200 Subject: [PATCH 19/38] backport gcc8 fix to 3.2 --- .SRCINFO | 7 +- PKGBUILD | 9 +- fixes-for-gcc-8.patch | 193 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+), 5 deletions(-) create mode 100644 fixes-for-gcc-8.patch diff --git a/.SRCINFO b/.SRCINFO index 6761d2f..c5151c6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Jun 3 14:33:59 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 - pkgrel = 2 + pkgrel = 3 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -16,10 +18,11 @@ pkgbase = systemtap source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc source = stp_remove_install_hooks.patch - validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 + source = fixes-for-gcc-8.patch sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 sha512sums = SKIP sha512sums = 1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537 + sha512sums = 970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 1757e2c..77ca142 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor:dront78 pkgname=systemtap pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') @@ -12,16 +12,19 @@ makedepends=('python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" - 'stp_remove_install_hooks.patch') + 'stp_remove_install_hooks.patch' + 'fixes-for-gcc-8.patch') sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' 'SKIP' - '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537') + '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537' + '970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a') install='systemtap.install' validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') prepare() { cd "${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch" + patch -Np1 -i "${srcdir}/fixes-for-gcc-8.patch" autoreconf -i } build() { diff --git a/fixes-for-gcc-8.patch b/fixes-for-gcc-8.patch new file mode 100644 index 0000000..464be3f --- /dev/null +++ b/fixes-for-gcc-8.patch @@ -0,0 +1,193 @@ +diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h +index 940f74483..c0c5a492c 100644 +--- a/includes/sys/sdt.h ++++ b/includes/sys/sdt.h +@@ -119,8 +119,8 @@ struct __sdt_type + + #define __SDT_ALWAYS_SIGNED(T) \ + template<> struct __sdt_type { static const bool __sdt_signed = true; }; +-#define __SDT_COND_SIGNED(T) \ +-template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 1); }; ++#define __SDT_COND_SIGNED(T,CT) \ ++template<> struct __sdt_type { static const bool __sdt_signed = ((CT)(-1) < 1); }; + __SDT_ALWAYS_SIGNED(signed char) + __SDT_ALWAYS_SIGNED(short) + __SDT_ALWAYS_SIGNED(int) +@@ -141,14 +141,14 @@ __SDT_ALWAYS_SIGNED(const volatile short) + __SDT_ALWAYS_SIGNED(const volatile int) + __SDT_ALWAYS_SIGNED(const volatile long) + __SDT_ALWAYS_SIGNED(const volatile long long) +-__SDT_COND_SIGNED(char) +-__SDT_COND_SIGNED(wchar_t) +-__SDT_COND_SIGNED(volatile char) +-__SDT_COND_SIGNED(volatile wchar_t) +-__SDT_COND_SIGNED(const char) +-__SDT_COND_SIGNED(const wchar_t) +-__SDT_COND_SIGNED(const volatile char) +-__SDT_COND_SIGNED(const volatile wchar_t) ++__SDT_COND_SIGNED(char, char) ++__SDT_COND_SIGNED(wchar_t, wchar_t) ++__SDT_COND_SIGNED(volatile char, char) ++__SDT_COND_SIGNED(volatile wchar_t, wchar_t) ++__SDT_COND_SIGNED(const char, char) ++__SDT_COND_SIGNED(const wchar_t, wchar_t) ++__SDT_COND_SIGNED(const volatile char, char) ++__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) + #if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + /* __SDT_COND_SIGNED(char16_t) */ + /* __SDT_COND_SIGNED(char32_t) */ +diff --git a/stap-serverd.cxx b/stap-serverd.cxx +index b8f70114c..063c3c587 100644 +--- a/stap-serverd.cxx ++++ b/stap-serverd.cxx +@@ -1607,6 +1607,7 @@ generate_mok(string &mok_fingerprint) + char tmpdir[PATH_MAX] = { '\0' }; + string public_cert_path, private_cert_path, destdir; + mode_t old_umask; ++ int retlen; + + mok_fingerprint.clear (); + +@@ -1631,7 +1632,14 @@ generate_mok(string &mok_fingerprint) + } + + // Make a temporary directory to store results in. +- snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); ++ retlen = snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Could not create %s name", "temporary directory")); ++ tmpdir[0] = '\0'; ++ goto cleanup; ++ } ++ + if (mkdtemp (tmpdir) == NULL) + { + server_error (_F("Could not create temporary directory %s: %s", tmpdir, +@@ -1704,6 +1712,7 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + unsigned u; + unsigned i; + FILE* f; ++ int retlen; + + // Save the server version. Do this early, so the client knows what version of the server + // it is dealing with, even if the request is not fully completed. +@@ -1782,7 +1791,12 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + struct stat st; + char *arg; + +- snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); ++ retlen = snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "path")); ++ return; ++ } + + rc = stat(stapargfile, & st); + if (rc) break; +@@ -1888,7 +1902,15 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri + { + glob_t globber; + char pattern[PATH_MAX]; +- snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); ++ int retlen; ++ ++ retlen = snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "pattern")); ++ return; ++ } ++ + rc = glob (pattern, GLOB_ERR, NULL, &globber); + if (rc) + server_error (_F("Unable to find a module in %s", new_staptmpdir.c_str())); +@@ -2164,6 +2186,7 @@ handle_connection (void *arg) + copy for each connection.*/ + vector argv; + PRInt32 bytesRead; ++ int retlen; + + /* Detatch to avoid a memory leak */ + if(max_threads > 0) +@@ -2213,7 +2236,13 @@ handle_connection (void *arg) + #endif + + secStatus = SECFailure; +- snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); ++ retlen = snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "temporary directory")); ++ tmpdir[0]=0; /* prevent /bin/rm */ ++ goto cleanup; ++ } + rc1 = mkdtemp(tmpdir); + if (! rc1) + { +@@ -2223,9 +2252,20 @@ handle_connection (void *arg) + } + + /* Create a temporary files names and directories. */ +- snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); ++ retlen = snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "request.zip path")); ++ goto cleanup; ++ } ++ ++ retlen = snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "request directory path")); ++ goto cleanup; ++ } + +- snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); + rc = mkdir(requestDirName, 0700); + if (rc) + { +@@ -2233,7 +2273,13 @@ handle_connection (void *arg) + goto cleanup; + } + +- snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); ++ retlen = snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "response directory path")); ++ goto cleanup; ++ } ++ + rc = mkdir(responseDirName, 0700); + if (rc) + { +@@ -2243,7 +2289,12 @@ handle_connection (void *arg) + // Set this early, since it gets used for errors to be returned to the client. + stapstderr = string(responseDirName) + "/stderr"; + +- snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); ++ retlen = snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); ++ if (retlen < 0 || retlen >= PATH_MAX) ++ { ++ server_error (_F("Error creating %s name", "response.zip path")); ++ goto cleanup; ++ } + + /* Read data from the socket. + * If the user is requesting/requiring authentication, authenticate +diff --git a/translate.cxx b/translate.cxx +index 1240a80ec..4ade06fdd 100644 +--- a/translate.cxx ++++ b/translate.cxx +@@ -7860,7 +7860,7 @@ translate_pass (systemtap_session& s) + if (versions.size() >= 3 && s.verbose > 1) + clog << _F("ignoring extra parts of compat version: %s", s.compatible.c_str()) << endl; + } +- catch (const runtime_error) ++ catch (const runtime_error&) + { + throw SEMANTIC_ERROR(_F("parse error in compatibility version: %s", s.compatible.c_str())); + } From 0512430e396ae40b3289c43ee75b86910fd4b050 Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sun, 3 Jun 2018 19:06:43 +0200 Subject: [PATCH 20/38] backport timer fix for >=4.15 kernels --- .SRCINFO | 6 +- PKGBUILD | 11 +- fix-timers-for-4.15-kernel.patch | 243 +++++++++++++++++++++++++++++++ 3 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 fix-timers-for-4.15-kernel.patch diff --git a/.SRCINFO b/.SRCINFO index c5151c6..3ef0e36 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Jun 3 14:33:59 UTC 2018 +# Sun Jun 3 17:06:32 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 - pkgrel = 3 + pkgrel = 4 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -19,10 +19,12 @@ pkgbase = systemtap source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc source = stp_remove_install_hooks.patch source = fixes-for-gcc-8.patch + source = fix-timers-for-4.15-kernel.patch sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 sha512sums = SKIP sha512sums = 1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537 sha512sums = 970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a + sha512sums = 3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 77ca142..5af4523 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor:dront78 pkgname=systemtap pkgver=3.2 -pkgrel=3 +pkgrel=4 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') @@ -13,11 +13,15 @@ optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" 'stp_remove_install_hooks.patch' - 'fixes-for-gcc-8.patch') + 'fixes-for-gcc-8.patch' + 'fix-timers-for-4.15-kernel.patch' + ) sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' 'SKIP' '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537' - '970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a') + '970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a' + '3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d' + ) install='systemtap.install' validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') @@ -25,6 +29,7 @@ prepare() { cd "${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch" patch -Np1 -i "${srcdir}/fixes-for-gcc-8.patch" + patch -Np1 -i "${srcdir}/fix-timers-for-4.15-kernel.patch" autoreconf -i } build() { diff --git a/fix-timers-for-4.15-kernel.patch b/fix-timers-for-4.15-kernel.patch new file mode 100644 index 0000000..3ca7c40 --- /dev/null +++ b/fix-timers-for-4.15-kernel.patch @@ -0,0 +1,243 @@ +diff --git a/runtime/linux/runtime.h b/runtime/linux/runtime.h +index 9c585a20d..df9b74c5c 100644 +--- a/runtime/linux/runtime.h ++++ b/runtime/linux/runtime.h +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include "timer_compatibility.h" + #include + #include + #include +diff --git a/runtime/linux/timer_compatibility.h b/runtime/linux/timer_compatibility.h +new file mode 100644 +index 000000000..ac03de998 +--- /dev/null ++++ b/runtime/linux/timer_compatibility.h +@@ -0,0 +1,76 @@ ++/* ++ * linux/timer.h compatibility defines and inlines ++ * Copyright (C) 2017 Red Hat Inc. ++ * ++ * This file is part of systemtap, and is free software. You can ++ * redistribute it and/or modify it under the terms of the GNU General ++ * Public License (GPL); either version 2, or (at your option) any ++ * later version. ++ */ ++ ++#ifndef _TIMER_COMPATIBILITY_H_ ++#define _TIMER_COMPATIBILITY_H_ ++ ++#include ++ ++/* ++ * Starting with the 4.15 kernel, the timer interface ++ * changed. Originally, you'd do something like: ++ * ++ * static void timer_func(unsigned long val); ++ * ++ * init_timer(&timer); ++ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; ++ * timer.function = timer_func; ++ * timer.data = 0; ++ * add_timer(&timer); ++ * ++ * The 'data' parameter would get passed to the callback ++ * function. Starting with 4.15, you'd do something like this: ++ * ++ * static void timer_func(struct timer_list *val); ++ * ++ * timer_setup(&timer, timer_func, 0); ++ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; ++ * add_timer(&timer); ++ * ++ * With the new code, the timer that caused the callback gets passed ++ * to the timer callback function. The 'data' field has been removed. ++ * ++ * So, we're going to use the new interface. To hide the differences ++ * between the callback function parameter type, we'll define a new ++ * type, 'stp_timer_callback_parameter_t'. ++ * ++ * If code needs to figure out the difference between the old and new ++ * interface, it should test the TIMER_TRACE_FLAGMASK define (which ++ * only exists in the new interface). ++ */ ++ ++#if defined(TIMER_TRACE_FLAGMASK) ++/* This is the >= 4.15 kernel interface. */ ++ ++typedef struct timer_list * stp_timer_callback_parameter_t; ++ ++#else ++/* This is the < 4.15 kernel interface. */ ++ ++typedef unsigned long stp_timer_callback_parameter_t; ++ ++/** ++ * timer_setup - prepare a timer for first use ++ * @timer: the timer in question ++ * @callback: the function to call when timer expires ++ * @flags: any TIMER_* flags (note that anything other than 0 is an ++ * error, since this compatibility function can't support any ++ * of the TIMER_* flags) ++ */ ++#define timer_setup(timer, callback, flags) \ ++ { \ ++ init_timer((timer)); \ ++ (timer)->function = callback; \ ++ (timer)->data = 0; \ ++ BUILD_BUG_ON_ZERO((flags) != 0); \ ++ } ++#endif ++ ++#endif /* _TIMER_COMPATIBILITY_H_ */ +diff --git a/runtime/time.c b/runtime/time.c +index 2e666d54c..91ceafa6a 100644 +--- a/runtime/time.c ++++ b/runtime/time.c +@@ -168,10 +168,10 @@ __stp_time_smp_callback(void *val) + + /* The timer callback is in a softIRQ -- interrupts enabled. */ + static void +-__stp_time_timer_callback(unsigned long val) ++__stp_time_timer_callback(stp_timer_callback_parameter_t unused) + { + stp_time_t *time =__stp_time_local_update(); +- (void) val; ++ (void) unused; + + /* PR6481: make sure IRQs are enabled before resetting the timer + (IRQs are disabled and then reenabled in +@@ -200,9 +200,8 @@ __stp_init_time(void *info) + time->freq = __stp_get_freq(); + __stp_time_local_update(); + +- init_timer(&time->timer); ++ timer_setup(&time->timer, __stp_time_timer_callback, 0); + time->timer.expires = jiffies + STP_TIME_SYNC_INTERVAL; +- time->timer.function = __stp_time_timer_callback; + + #ifndef STAPCONF_ADD_TIMER_ON + add_timer(&time->timer); +diff --git a/runtime/transport/relay_v2.c b/runtime/transport/relay_v2.c +index f81d75dfa..135951a8e 100644 +--- a/runtime/transport/relay_v2.c ++++ b/runtime/transport/relay_v2.c +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include "../linux/timer_compatibility.h" + #include "../uidgid_compatibility.h" + #include "relay_compat.h" + +@@ -120,7 +120,7 @@ static void __stp_relay_wakeup_readers(struct rchan_buf *buf) + wake_up_interruptible(&buf->read_wait); + } + +-static void __stp_relay_wakeup_timer(unsigned long val) ++static void __stp_relay_wakeup_timer(stp_timer_callback_parameter_t unused) + { + #ifdef STP_BULKMODE + int i; +@@ -151,10 +151,8 @@ static void __stp_relay_wakeup_timer(unsigned long val) + static void __stp_relay_timer_init(void) + { + atomic_set(&_stp_relay_data.wakeup, 0); +- init_timer(&_stp_relay_data.timer); ++ timer_setup(&_stp_relay_data.timer, __stp_relay_wakeup_timer, 0); + _stp_relay_data.timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; +- _stp_relay_data.timer.function = __stp_relay_wakeup_timer; +- _stp_relay_data.timer.data = 0; + add_timer(&_stp_relay_data.timer); + smp_mb(); + } +diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c +index 3400f220a..320fd187e 100644 +--- a/runtime/transport/transport.c ++++ b/runtime/transport/transport.c +@@ -311,7 +311,7 @@ static void _stp_detach(void) + } + + +-static void _stp_ctl_work_callback(unsigned long val); ++static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused); + + /* + * Called when stapio opens the control channel. +@@ -320,13 +320,12 @@ static void _stp_attach(void) + { + dbug_trans(1, "attach\n"); + _stp_pid = current->pid; +- if (_stp_namespaces_pid < 1) +- _stp_namespaces_pid = _stp_pid; ++ if (_stp_namespaces_pid < 1) ++ _stp_namespaces_pid = _stp_pid; + _stp_transport_data_fs_overwrite(0); +- init_timer(&_stp_ctl_work_timer); ++ ++ timer_setup(&_stp_ctl_work_timer, _stp_ctl_work_callback, 0); + _stp_ctl_work_timer.expires = jiffies + STP_CTL_TIMER_INTERVAL; +- _stp_ctl_work_timer.function = _stp_ctl_work_callback; +- _stp_ctl_work_timer.data= 0; + add_timer(&_stp_ctl_work_timer); + } + +@@ -341,7 +340,7 @@ static void _stp_attach(void) + * notified. Reschedules itself if someone is still attached + * to the cmd channel. + */ +-static void _stp_ctl_work_callback(unsigned long val) ++static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused) + { + int do_io = 0; + unsigned long flags; +diff --git a/tapset-timers.cxx b/tapset-timers.cxx +index 1a40bcda0..0ab4d69cd 100644 +--- a/tapset-timers.cxx ++++ b/tapset-timers.cxx +@@ -122,9 +122,13 @@ timer_derived_probe_group::emit_module_decls (systemtap_session& s) + s.op->newline(-1) << "};"; + s.op->newline(); + +- s.op->newline() << "static void enter_timer_probe (unsigned long val) {"; ++ s.op->newline() << "static void enter_timer_probe (stp_timer_callback_parameter_t val) {"; ++ s.op->newline() << "#if defined(TIMER_TRACE_FLAGMASK)"; ++ s.op->newline(1) << "struct stap_timer_probe* stp = container_of(val, struct stap_timer_probe, timer_list);"; ++ s.op->newline(-1) << "#else"; + s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [val];"; +- s.op->newline() << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||"; ++ s.op->newline(-1) << "#endif"; ++ s.op->newline(1) << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||"; + s.op->newline() << " (atomic_read (session_state()) == STAP_SESSION_RUNNING))"; + s.op->newline(1) << "mod_timer (& stp->timer_list, jiffies + "; + emit_interval (s.op); +@@ -148,9 +152,11 @@ timer_derived_probe_group::emit_module_init (systemtap_session& s) + s.op->newline() << "for (i=0; i<" << probes.size() << "; i++) {"; + s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [i];"; + s.op->newline() << "probe_point = stp->probe->pp;"; +- s.op->newline() << "init_timer (& stp->timer_list);"; +- s.op->newline() << "stp->timer_list.function = & enter_timer_probe;"; ++ ++ s.op->newline() << "timer_setup (& stp->timer_list, enter_timer_probe, 0);"; ++ s.op->newline() << "#if !defined(TIMER_TRACE_FLAGMASK)"; + s.op->newline() << "stp->timer_list.data = i;"; // NB: important! ++ s.op->newline() << "#endif"; + // copy timer renew calculations from above :-( + s.op->newline() << "stp->timer_list.expires = jiffies + "; + emit_interval (s.op); +diff --git a/tapset/linux/scsi.stp b/tapset/linux/scsi.stp +index 44f686c2a..35779421b 100644 +--- a/tapset/linux/scsi.stp ++++ b/tapset/linux/scsi.stp +@@ -14,7 +14,7 @@ + #include + #include + #include +-#include ++#include "linux/timer_compatibility.h" + #include + %} From cbf19e9238af61008d5df19d0d3cd7ddee2d767d Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sun, 3 Jun 2018 22:01:59 +0200 Subject: [PATCH 21/38] add gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e93be39 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.tar.xz +*.tar.gz +*.asc +pkg +src From 8266ddd4f8e48800a7d3e03ec5905bfc2a66d44e Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sun, 3 Jun 2018 22:09:40 +0200 Subject: [PATCH 22/38] remove unused patches These were not used in the PKGBUILD when I adopted the package. I'm removing them. --- access_process_vm_h.patch | 10 ---------- stp_utrace_c.patch | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 access_process_vm_h.patch delete mode 100644 stp_utrace_c.patch diff --git a/access_process_vm_h.patch b/access_process_vm_h.patch deleted file mode 100644 index 7eb0fd6..0000000 --- a/access_process_vm_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./runtime/linux/access_process_vm.h 2017-02-17 18:37:01.000000000 +0100 -+++ /usr/share/systemtap/runtime/linux/access_process_vm.h 2017-08-09 11:47:50.332532411 +0200 -@@ -4,6 +4,7 @@ - * we copied and pasted it here. Fortunately, everything it calls is exported. - */ - #include -+#include - #include - - static int diff --git a/stp_utrace_c.patch b/stp_utrace_c.patch deleted file mode 100644 index 987d7f6..0000000 --- a/stp_utrace_c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./runtime/stp_utrace.c 2017-02-17 18:37:01.000000000 +0100 -+++ /usr/share/systemtap/runtime/stp_utrace.c 2017-08-09 11:59:21.542501780 +0200 -@@ -1105,7 +1105,7 @@ - */ - spin_lock_irq(&target->sighand->siglock); - if (likely(task_is_stopped(target))) -- __set_task_state(target, TASK_TRACED); -+ set_current_state(TASK_TRACED); - spin_unlock_irq(&target->sighand->siglock); - } else if (utrace->resume > UTRACE_REPORT) { - utrace->resume = UTRACE_REPORT; From 487ece75ebda37992529c3bd653e7b140f45780c Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sat, 16 Jun 2018 09:46:51 +0200 Subject: [PATCH 23/38] update makedepends --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3ef0e36..36d6b31 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun Jun 3 17:06:32 UTC 2018 +# Sat Jun 16 07:46:23 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 @@ -9,7 +9,7 @@ pkgbase = systemtap arch = x86_64 arch = i686 license = GPL - makedepends = python2-setuptools + makedepends = python-setuptools makedepends = xmlto depends = elfutils depends = nss diff --git a/PKGBUILD b/PKGBUILD index 5af4523..5060c0b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') depends=('elfutils' 'nss' 'python2') -makedepends=('python2-setuptools' 'xmlto') +makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" From c3d5d8188c0dfaae616bf39f08b57fdc5f666440 Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sat, 16 Jun 2018 09:59:08 +0200 Subject: [PATCH 24/38] update depends --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 36d6b31..60159fe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sat Jun 16 07:46:23 UTC 2018 +# Sat Jun 16 07:53:10 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 @@ -13,7 +13,7 @@ pkgbase = systemtap makedepends = xmlto depends = elfutils depends = nss - depends = python2 + depends = python optdepends = sqlite3: for storing results in a database source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc diff --git a/PKGBUILD b/PKGBUILD index 5060c0b..2f35006 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="provides infrastructure to simplify the gathering of information about url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') -depends=('elfutils' 'nss' 'python2') +depends=('elfutils' 'nss' 'python') makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" From 559c72395d3bf5b9f757cb65e358f4705c759308 Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sat, 16 Jun 2018 10:52:25 +0200 Subject: [PATCH 25/38] Revert "update depends" This reverts commit c3d5d8188c0dfaae616bf39f08b57fdc5f666440. --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 60159fe..36d6b31 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sat Jun 16 07:53:10 UTC 2018 +# Sat Jun 16 07:46:23 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 @@ -13,7 +13,7 @@ pkgbase = systemtap makedepends = xmlto depends = elfutils depends = nss - depends = python + depends = python2 optdepends = sqlite3: for storing results in a database source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc diff --git a/PKGBUILD b/PKGBUILD index 2f35006..5060c0b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="provides infrastructure to simplify the gathering of information about url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') -depends=('elfutils' 'nss' 'python') +depends=('elfutils' 'nss' 'python2') makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" From 422e628c9fbcc9e805ce9e9afbff481194a30f0b Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Sat, 16 Jun 2018 11:12:35 +0200 Subject: [PATCH 26/38] Revert "update makedepends" This reverts commit 487ece75ebda37992529c3bd653e7b140f45780c. --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 36d6b31..3ef0e36 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sat Jun 16 07:46:23 UTC 2018 +# Sun Jun 3 17:06:32 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 3.2 @@ -9,7 +9,7 @@ pkgbase = systemtap arch = x86_64 arch = i686 license = GPL - makedepends = python-setuptools + makedepends = python2-setuptools makedepends = xmlto depends = elfutils depends = nss diff --git a/PKGBUILD b/PKGBUILD index 5060c0b..5af4523 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') depends=('elfutils' 'nss' 'python2') -makedepends=('python-setuptools' 'xmlto') +makedepends=('python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" From 69c45dce7d4436d65b89b8d37c6ba1e445f7c41c Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Mon, 20 Aug 2018 11:45:16 +0200 Subject: [PATCH 27/38] version 3.3 --- .SRCINFO | 18 +-- PKGBUILD | 25 +--- fix-timers-for-4.15-kernel.patch | 243 ------------------------------- fixes-for-gcc-8.patch | 193 ------------------------ stp_remove_install_hooks.patch | 37 ----- 5 files changed, 12 insertions(+), 504 deletions(-) delete mode 100644 fix-timers-for-4.15-kernel.patch delete mode 100644 fixes-for-gcc-8.patch delete mode 100644 stp_remove_install_hooks.patch diff --git a/.SRCINFO b/.SRCINFO index 3ef0e36..a07cea7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Jun 3 17:06:32 UTC 2018 +# Mon Aug 20 09:44:39 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. - pkgver = 3.2 - pkgrel = 4 + pkgver = 3.3 + pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -15,16 +15,10 @@ pkgbase = systemtap depends = nss depends = python2 optdepends = sqlite3: for storing results in a database - source = systemtap-3.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz - source = systemtap-3.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.2.tar.gz.asc - source = stp_remove_install_hooks.patch - source = fixes-for-gcc-8.patch - source = fix-timers-for-4.15-kernel.patch - sha512sums = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94 + source = systemtap-3.3.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz + source = systemtap-3.3.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz.asc + sha512sums = b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e sha512sums = SKIP - sha512sums = 1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537 - sha512sums = 970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a - sha512sums = 3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 5af4523..6a3583f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer : Christian Rebischke # Contributor:dront78 pkgname=systemtap -pkgver=3.2 -pkgrel=4 +pkgver=3.3 +pkgrel=1 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') @@ -12,26 +12,13 @@ makedepends=('python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" - 'stp_remove_install_hooks.patch' - 'fixes-for-gcc-8.patch' - 'fix-timers-for-4.15-kernel.patch' ) -sha512sums=('6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94' - 'SKIP' - '1d2758e9f875e06d08d37679587454fb43e025aa83ceeb405b1bc8d3277476502f2d67cf9e8383cc4c63ae545d7d0e9ebaab814f880b2f53bba47bef4afcd537' - '970d83ace43909e5a1bfc4112d78dd913af6d59e4b8dc8c4461370b022092b0cdb6830427b52bcf5b7409ff6d7c79dab778e53398ba65de71bd4a270c66a2d3a' - '3cbf261cf34df23454e0a9aa4566664241b8bcf4b44a28617cce483d0f24632b9fcd4ac8b37f488e736d0ce02308fb67e7b4dd52f6349a9010e2390d8c94190d' - ) +sha512sums=('b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e' + 'SKIP') install='systemtap.install' -validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') +validpgpkeys=('41A0C11274B1E87FE28E4C53E3D77E1F95161991') + -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/stp_remove_install_hooks.patch" - patch -Np1 -i "${srcdir}/fixes-for-gcc-8.patch" - patch -Np1 -i "${srcdir}/fix-timers-for-4.15-kernel.patch" - autoreconf -i -} build() { cd "${pkgname}-${pkgver}" ./configure \ diff --git a/fix-timers-for-4.15-kernel.patch b/fix-timers-for-4.15-kernel.patch deleted file mode 100644 index 3ca7c40..0000000 --- a/fix-timers-for-4.15-kernel.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff --git a/runtime/linux/runtime.h b/runtime/linux/runtime.h -index 9c585a20d..df9b74c5c 100644 ---- a/runtime/linux/runtime.h -+++ b/runtime/linux/runtime.h -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include "timer_compatibility.h" - #include - #include - #include -diff --git a/runtime/linux/timer_compatibility.h b/runtime/linux/timer_compatibility.h -new file mode 100644 -index 000000000..ac03de998 ---- /dev/null -+++ b/runtime/linux/timer_compatibility.h -@@ -0,0 +1,76 @@ -+/* -+ * linux/timer.h compatibility defines and inlines -+ * Copyright (C) 2017 Red Hat Inc. -+ * -+ * This file is part of systemtap, and is free software. You can -+ * redistribute it and/or modify it under the terms of the GNU General -+ * Public License (GPL); either version 2, or (at your option) any -+ * later version. -+ */ -+ -+#ifndef _TIMER_COMPATIBILITY_H_ -+#define _TIMER_COMPATIBILITY_H_ -+ -+#include -+ -+/* -+ * Starting with the 4.15 kernel, the timer interface -+ * changed. Originally, you'd do something like: -+ * -+ * static void timer_func(unsigned long val); -+ * -+ * init_timer(&timer); -+ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; -+ * timer.function = timer_func; -+ * timer.data = 0; -+ * add_timer(&timer); -+ * -+ * The 'data' parameter would get passed to the callback -+ * function. Starting with 4.15, you'd do something like this: -+ * -+ * static void timer_func(struct timer_list *val); -+ * -+ * timer_setup(&timer, timer_func, 0); -+ * timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; -+ * add_timer(&timer); -+ * -+ * With the new code, the timer that caused the callback gets passed -+ * to the timer callback function. The 'data' field has been removed. -+ * -+ * So, we're going to use the new interface. To hide the differences -+ * between the callback function parameter type, we'll define a new -+ * type, 'stp_timer_callback_parameter_t'. -+ * -+ * If code needs to figure out the difference between the old and new -+ * interface, it should test the TIMER_TRACE_FLAGMASK define (which -+ * only exists in the new interface). -+ */ -+ -+#if defined(TIMER_TRACE_FLAGMASK) -+/* This is the >= 4.15 kernel interface. */ -+ -+typedef struct timer_list * stp_timer_callback_parameter_t; -+ -+#else -+/* This is the < 4.15 kernel interface. */ -+ -+typedef unsigned long stp_timer_callback_parameter_t; -+ -+/** -+ * timer_setup - prepare a timer for first use -+ * @timer: the timer in question -+ * @callback: the function to call when timer expires -+ * @flags: any TIMER_* flags (note that anything other than 0 is an -+ * error, since this compatibility function can't support any -+ * of the TIMER_* flags) -+ */ -+#define timer_setup(timer, callback, flags) \ -+ { \ -+ init_timer((timer)); \ -+ (timer)->function = callback; \ -+ (timer)->data = 0; \ -+ BUILD_BUG_ON_ZERO((flags) != 0); \ -+ } -+#endif -+ -+#endif /* _TIMER_COMPATIBILITY_H_ */ -diff --git a/runtime/time.c b/runtime/time.c -index 2e666d54c..91ceafa6a 100644 ---- a/runtime/time.c -+++ b/runtime/time.c -@@ -168,10 +168,10 @@ __stp_time_smp_callback(void *val) - - /* The timer callback is in a softIRQ -- interrupts enabled. */ - static void --__stp_time_timer_callback(unsigned long val) -+__stp_time_timer_callback(stp_timer_callback_parameter_t unused) - { - stp_time_t *time =__stp_time_local_update(); -- (void) val; -+ (void) unused; - - /* PR6481: make sure IRQs are enabled before resetting the timer - (IRQs are disabled and then reenabled in -@@ -200,9 +200,8 @@ __stp_init_time(void *info) - time->freq = __stp_get_freq(); - __stp_time_local_update(); - -- init_timer(&time->timer); -+ timer_setup(&time->timer, __stp_time_timer_callback, 0); - time->timer.expires = jiffies + STP_TIME_SYNC_INTERVAL; -- time->timer.function = __stp_time_timer_callback; - - #ifndef STAPCONF_ADD_TIMER_ON - add_timer(&time->timer); -diff --git a/runtime/transport/relay_v2.c b/runtime/transport/relay_v2.c -index f81d75dfa..135951a8e 100644 ---- a/runtime/transport/relay_v2.c -+++ b/runtime/transport/relay_v2.c -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include "../linux/timer_compatibility.h" - #include "../uidgid_compatibility.h" - #include "relay_compat.h" - -@@ -120,7 +120,7 @@ static void __stp_relay_wakeup_readers(struct rchan_buf *buf) - wake_up_interruptible(&buf->read_wait); - } - --static void __stp_relay_wakeup_timer(unsigned long val) -+static void __stp_relay_wakeup_timer(stp_timer_callback_parameter_t unused) - { - #ifdef STP_BULKMODE - int i; -@@ -151,10 +151,8 @@ static void __stp_relay_wakeup_timer(unsigned long val) - static void __stp_relay_timer_init(void) - { - atomic_set(&_stp_relay_data.wakeup, 0); -- init_timer(&_stp_relay_data.timer); -+ timer_setup(&_stp_relay_data.timer, __stp_relay_wakeup_timer, 0); - _stp_relay_data.timer.expires = jiffies + STP_RELAY_TIMER_INTERVAL; -- _stp_relay_data.timer.function = __stp_relay_wakeup_timer; -- _stp_relay_data.timer.data = 0; - add_timer(&_stp_relay_data.timer); - smp_mb(); - } -diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c -index 3400f220a..320fd187e 100644 ---- a/runtime/transport/transport.c -+++ b/runtime/transport/transport.c -@@ -311,7 +311,7 @@ static void _stp_detach(void) - } - - --static void _stp_ctl_work_callback(unsigned long val); -+static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused); - - /* - * Called when stapio opens the control channel. -@@ -320,13 +320,12 @@ static void _stp_attach(void) - { - dbug_trans(1, "attach\n"); - _stp_pid = current->pid; -- if (_stp_namespaces_pid < 1) -- _stp_namespaces_pid = _stp_pid; -+ if (_stp_namespaces_pid < 1) -+ _stp_namespaces_pid = _stp_pid; - _stp_transport_data_fs_overwrite(0); -- init_timer(&_stp_ctl_work_timer); -+ -+ timer_setup(&_stp_ctl_work_timer, _stp_ctl_work_callback, 0); - _stp_ctl_work_timer.expires = jiffies + STP_CTL_TIMER_INTERVAL; -- _stp_ctl_work_timer.function = _stp_ctl_work_callback; -- _stp_ctl_work_timer.data= 0; - add_timer(&_stp_ctl_work_timer); - } - -@@ -341,7 +340,7 @@ static void _stp_attach(void) - * notified. Reschedules itself if someone is still attached - * to the cmd channel. - */ --static void _stp_ctl_work_callback(unsigned long val) -+static void _stp_ctl_work_callback(stp_timer_callback_parameter_t unused) - { - int do_io = 0; - unsigned long flags; -diff --git a/tapset-timers.cxx b/tapset-timers.cxx -index 1a40bcda0..0ab4d69cd 100644 ---- a/tapset-timers.cxx -+++ b/tapset-timers.cxx -@@ -122,9 +122,13 @@ timer_derived_probe_group::emit_module_decls (systemtap_session& s) - s.op->newline(-1) << "};"; - s.op->newline(); - -- s.op->newline() << "static void enter_timer_probe (unsigned long val) {"; -+ s.op->newline() << "static void enter_timer_probe (stp_timer_callback_parameter_t val) {"; -+ s.op->newline() << "#if defined(TIMER_TRACE_FLAGMASK)"; -+ s.op->newline(1) << "struct stap_timer_probe* stp = container_of(val, struct stap_timer_probe, timer_list);"; -+ s.op->newline(-1) << "#else"; - s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [val];"; -- s.op->newline() << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||"; -+ s.op->newline(-1) << "#endif"; -+ s.op->newline(1) << "if ((atomic_read (session_state()) == STAP_SESSION_STARTING) ||"; - s.op->newline() << " (atomic_read (session_state()) == STAP_SESSION_RUNNING))"; - s.op->newline(1) << "mod_timer (& stp->timer_list, jiffies + "; - emit_interval (s.op); -@@ -148,9 +152,11 @@ timer_derived_probe_group::emit_module_init (systemtap_session& s) - s.op->newline() << "for (i=0; i<" << probes.size() << "; i++) {"; - s.op->newline(1) << "struct stap_timer_probe* stp = & stap_timer_probes [i];"; - s.op->newline() << "probe_point = stp->probe->pp;"; -- s.op->newline() << "init_timer (& stp->timer_list);"; -- s.op->newline() << "stp->timer_list.function = & enter_timer_probe;"; -+ -+ s.op->newline() << "timer_setup (& stp->timer_list, enter_timer_probe, 0);"; -+ s.op->newline() << "#if !defined(TIMER_TRACE_FLAGMASK)"; - s.op->newline() << "stp->timer_list.data = i;"; // NB: important! -+ s.op->newline() << "#endif"; - // copy timer renew calculations from above :-( - s.op->newline() << "stp->timer_list.expires = jiffies + "; - emit_interval (s.op); -diff --git a/tapset/linux/scsi.stp b/tapset/linux/scsi.stp -index 44f686c2a..35779421b 100644 ---- a/tapset/linux/scsi.stp -+++ b/tapset/linux/scsi.stp -@@ -14,7 +14,7 @@ - #include - #include - #include --#include -+#include "linux/timer_compatibility.h" - #include - %} diff --git a/fixes-for-gcc-8.patch b/fixes-for-gcc-8.patch deleted file mode 100644 index 464be3f..0000000 --- a/fixes-for-gcc-8.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h -index 940f74483..c0c5a492c 100644 ---- a/includes/sys/sdt.h -+++ b/includes/sys/sdt.h -@@ -119,8 +119,8 @@ struct __sdt_type - - #define __SDT_ALWAYS_SIGNED(T) \ - template<> struct __sdt_type { static const bool __sdt_signed = true; }; --#define __SDT_COND_SIGNED(T) \ --template<> struct __sdt_type { static const bool __sdt_signed = ((T)(-1) < 1); }; -+#define __SDT_COND_SIGNED(T,CT) \ -+template<> struct __sdt_type { static const bool __sdt_signed = ((CT)(-1) < 1); }; - __SDT_ALWAYS_SIGNED(signed char) - __SDT_ALWAYS_SIGNED(short) - __SDT_ALWAYS_SIGNED(int) -@@ -141,14 +141,14 @@ __SDT_ALWAYS_SIGNED(const volatile short) - __SDT_ALWAYS_SIGNED(const volatile int) - __SDT_ALWAYS_SIGNED(const volatile long) - __SDT_ALWAYS_SIGNED(const volatile long long) --__SDT_COND_SIGNED(char) --__SDT_COND_SIGNED(wchar_t) --__SDT_COND_SIGNED(volatile char) --__SDT_COND_SIGNED(volatile wchar_t) --__SDT_COND_SIGNED(const char) --__SDT_COND_SIGNED(const wchar_t) --__SDT_COND_SIGNED(const volatile char) --__SDT_COND_SIGNED(const volatile wchar_t) -+__SDT_COND_SIGNED(char, char) -+__SDT_COND_SIGNED(wchar_t, wchar_t) -+__SDT_COND_SIGNED(volatile char, char) -+__SDT_COND_SIGNED(volatile wchar_t, wchar_t) -+__SDT_COND_SIGNED(const char, char) -+__SDT_COND_SIGNED(const wchar_t, wchar_t) -+__SDT_COND_SIGNED(const volatile char, char) -+__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) - #if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) - /* __SDT_COND_SIGNED(char16_t) */ - /* __SDT_COND_SIGNED(char32_t) */ -diff --git a/stap-serverd.cxx b/stap-serverd.cxx -index b8f70114c..063c3c587 100644 ---- a/stap-serverd.cxx -+++ b/stap-serverd.cxx -@@ -1607,6 +1607,7 @@ generate_mok(string &mok_fingerprint) - char tmpdir[PATH_MAX] = { '\0' }; - string public_cert_path, private_cert_path, destdir; - mode_t old_umask; -+ int retlen; - - mok_fingerprint.clear (); - -@@ -1631,7 +1632,14 @@ generate_mok(string &mok_fingerprint) - } - - // Make a temporary directory to store results in. -- snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); -+ retlen = snprintf (tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", mok_path.c_str ()); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Could not create %s name", "temporary directory")); -+ tmpdir[0] = '\0'; -+ goto cleanup; -+ } -+ - if (mkdtemp (tmpdir) == NULL) - { - server_error (_F("Could not create temporary directory %s: %s", tmpdir, -@@ -1704,6 +1712,7 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - unsigned u; - unsigned i; - FILE* f; -+ int retlen; - - // Save the server version. Do this early, so the client knows what version of the server - // it is dealing with, even if the request is not fully completed. -@@ -1782,7 +1791,12 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - struct stat st; - char *arg; - -- snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); -+ retlen = snprintf (stapargfile, PATH_MAX, "%s/argv%d", requestDirName.c_str (), i); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "path")); -+ return; -+ } - - rc = stat(stapargfile, & st); - if (rc) break; -@@ -1888,7 +1902,15 @@ handleRequest (const string &requestDirName, const string &responseDirName, stri - { - glob_t globber; - char pattern[PATH_MAX]; -- snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); -+ int retlen; -+ -+ retlen = snprintf (pattern, PATH_MAX, "%s/*.ko", new_staptmpdir.c_str()); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "pattern")); -+ return; -+ } -+ - rc = glob (pattern, GLOB_ERR, NULL, &globber); - if (rc) - server_error (_F("Unable to find a module in %s", new_staptmpdir.c_str())); -@@ -2164,6 +2186,7 @@ handle_connection (void *arg) - copy for each connection.*/ - vector argv; - PRInt32 bytesRead; -+ int retlen; - - /* Detatch to avoid a memory leak */ - if(max_threads > 0) -@@ -2213,7 +2236,13 @@ handle_connection (void *arg) - #endif - - secStatus = SECFailure; -- snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); -+ retlen = snprintf(tmpdir, PATH_MAX, "%s/stap-server.XXXXXX", getenv("TMPDIR") ?: "/tmp"); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "temporary directory")); -+ tmpdir[0]=0; /* prevent /bin/rm */ -+ goto cleanup; -+ } - rc1 = mkdtemp(tmpdir); - if (! rc1) - { -@@ -2223,9 +2252,20 @@ handle_connection (void *arg) - } - - /* Create a temporary files names and directories. */ -- snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); -+ retlen = snprintf (requestFileName, PATH_MAX, "%s/request.zip", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "request.zip path")); -+ goto cleanup; -+ } -+ -+ retlen = snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "request directory path")); -+ goto cleanup; -+ } - -- snprintf (requestDirName, PATH_MAX, "%s/request", tmpdir); - rc = mkdir(requestDirName, 0700); - if (rc) - { -@@ -2233,7 +2273,13 @@ handle_connection (void *arg) - goto cleanup; - } - -- snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); -+ retlen = snprintf (responseDirName, PATH_MAX, "%s/response", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "response directory path")); -+ goto cleanup; -+ } -+ - rc = mkdir(responseDirName, 0700); - if (rc) - { -@@ -2243,7 +2289,12 @@ handle_connection (void *arg) - // Set this early, since it gets used for errors to be returned to the client. - stapstderr = string(responseDirName) + "/stderr"; - -- snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); -+ retlen = snprintf (responseFileName, PATH_MAX, "%s/response.zip", tmpdir); -+ if (retlen < 0 || retlen >= PATH_MAX) -+ { -+ server_error (_F("Error creating %s name", "response.zip path")); -+ goto cleanup; -+ } - - /* Read data from the socket. - * If the user is requesting/requiring authentication, authenticate -diff --git a/translate.cxx b/translate.cxx -index 1240a80ec..4ade06fdd 100644 ---- a/translate.cxx -+++ b/translate.cxx -@@ -7860,7 +7860,7 @@ translate_pass (systemtap_session& s) - if (versions.size() >= 3 && s.verbose > 1) - clog << _F("ignoring extra parts of compat version: %s", s.compatible.c_str()) << endl; - } -- catch (const runtime_error) -+ catch (const runtime_error&) - { - throw SEMANTIC_ERROR(_F("parse error in compatibility version: %s", s.compatible.c_str())); - } diff --git a/stp_remove_install_hooks.patch b/stp_remove_install_hooks.patch deleted file mode 100644 index 244ac83..0000000 --- a/stp_remove_install_hooks.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am -index a303d25f6..703668362 100644 ---- a/stapbpf/Makefile.am -+++ b/stapbpf/Makefile.am -@@ -38,14 +38,4 @@ CLEANFILES = - BUILT_SOURCES += git_version.stamp - git_version.stamp ../git_version.h: - $(MAKE) -C .. $(notdir $@) -- --# Why the "id -u" condition? This way, an unprivileged user can run --# make install, and have "sudo stap ...." or "sudo stapbpf ...." work later. --install-exec-hook: -- if [ `id -u` -eq 0 ]; then \ -- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ -- getent group stapusr >/dev/null \ -- && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \ -- && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ -- fi - endif -diff --git a/staprun/Makefile.am b/staprun/Makefile.am -index 4073aa01c..978d115f9 100644 ---- a/staprun/Makefile.am -+++ b/staprun/Makefile.am -@@ -68,13 +68,3 @@ CLEANFILES = - BUILT_SOURCES += git_version.stamp - git_version.stamp ../git_version.h: - $(MAKE) -C .. $(notdir $@) -- -- --# Why the "id -u" condition? This way, an unprivileged user can run --# make install, and have "sudo stap ...." or "sudo staprun ...." work later. --install-exec-hook: -- if [ `id -u` -eq 0 ]; then \ -- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ -- getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \ -- chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \ -- fi From 576926108eccd406ec16e498899ac1a39f22bed1 Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Mon, 3 Sep 2018 12:27:33 +0200 Subject: [PATCH 28/38] update maintainer --- PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 6a3583f..12d1c67 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer : Christian Rebischke -# Contributor:dront78 +# Maintainer : George Angelopoulos +# Contributor : Christian Rebischke +# Contributor : dront78 pkgname=systemtap pkgver=3.3 pkgrel=1 From 59033bcbc4643668b3fb9bcd8ba4d8769b829cf3 Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Mon, 5 Nov 2018 16:08:53 +0100 Subject: [PATCH 29/38] version 4.0 --- .SRCINFO | 10 +++++----- PKGBUILD | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a07cea7..565f178 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Aug 20 09:44:39 UTC 2018 +# Mon Nov 5 15:08:18 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. - pkgver = 3.3 + pkgver = 4.0 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install @@ -15,9 +15,9 @@ pkgbase = systemtap depends = nss depends = python2 optdepends = sqlite3: for storing results in a database - source = systemtap-3.3.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz - source = systemtap-3.3.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-3.3.tar.gz.asc - sha512sums = b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e + source = systemtap-4.0.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz + source = systemtap-4.0.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz.asc + sha512sums = 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79 sha512sums = SKIP pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 12d1c67..f8ddaad 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor : Christian Rebischke # Contributor : dront78 pkgname=systemtap -pkgver=3.3 +pkgver=4.0 pkgrel=1 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" @@ -14,10 +14,10 @@ optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" ) -sha512sums=('b75a4591bdc021645c15cb8f2b8991f46fdffb29b1d132745bafe4291aee5e1892ea9a63c8e98f011a4fee68decd99aa4401dc2f70e163e801cd140ad4cd6b6e' +sha512sums=('66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79' 'SKIP') install='systemtap.install' -validpgpkeys=('41A0C11274B1E87FE28E4C53E3D77E1F95161991') +validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') build() { @@ -28,6 +28,7 @@ build() { --libexecdir=/usr/lib/"${pkgname}" \ --libdir=/usr/lib/"${pkgname}" \ --mandir=/usr/share/man/ \ + --sbindir=/usr/bin \ --localstatedir=/var \ --enable-pie \ --disable-docs \ From dce23c79e4e394109b335e98cced4bbbfac05b8a Mon Sep 17 00:00:00 2001 From: George Angelopoulos Date: Fri, 16 Nov 2018 19:28:43 +0100 Subject: [PATCH 30/38] add cpio dependency --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 565f178..5ad7df1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Nov 5 15:08:18 UTC 2018 +# Fri Nov 16 18:28:31 UTC 2018 pkgbase = systemtap pkgdesc = provides infrastructure to simplify the gathering of information about the running system. pkgver = 4.0 - pkgrel = 1 + pkgrel = 2 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -14,6 +14,7 @@ pkgbase = systemtap depends = elfutils depends = nss depends = python2 + depends = cpio optdepends = sqlite3: for storing results in a database source = systemtap-4.0.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz source = systemtap-4.0.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz.asc diff --git a/PKGBUILD b/PKGBUILD index f8ddaad..ce76710 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,12 +3,12 @@ # Contributor : dront78 pkgname=systemtap pkgver=4.0 -pkgrel=1 +pkgrel=2 pkgdesc="provides infrastructure to simplify the gathering of information about the running system." url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') -depends=('elfutils' 'nss' 'python2') +depends=('elfutils' 'nss' 'python2' 'cpio') makedepends=('python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" From 98c14eecc21e56214d6944449d9bbf2cc92254f4 Mon Sep 17 00:00:00 2001 From: annguyenfoss Date: Mon, 28 Oct 2019 20:09:31 +0700 Subject: [PATCH 31/38] Updated to 4.1. Updated GPG keys and SHA512SUM. --- .SRCINFO | 17 ++++++++--------- PKGBUILD | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5ad7df1..796db52 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Fri Nov 16 18:28:31 UTC 2018 pkgbase = systemtap - pkgdesc = provides infrastructure to simplify the gathering of information about the running system. - pkgver = 4.0 - pkgrel = 2 + pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system + pkgver = 4.1 + pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 @@ -16,10 +14,11 @@ pkgbase = systemtap depends = python2 depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.0.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz - source = systemtap-4.0.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz.asc - sha512sums = 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79 - sha512sums = SKIP + source = systemtap-4.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz + source = systemtap-4.1.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz.asc + validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 + sha512sums = fbd606d9842ac63af6e607613a112b08d7593da74ad0398716cdc46f74a977a8e6b9fae92e1f63779ccfc94cffa25f29dee2ae44f67ecc4cedae630e50a2e7b6 + sha512sums = 755a11b6024bb15c6415532352fd62a824266edeb5ab3e1ef6cfa31259f8bf7d9a92fcf7476c307cd7d4188ff20cefe86558b2a6e4c099987e1041bd1f98031e pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index ce76710..816495e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,11 @@ -# Maintainer : George Angelopoulos -# Contributor : Christian Rebischke -# Contributor : dront78 +# Maintainer: An Nguyen (stk) +# Original Maintainer: George Angelopoulos +# Original Maintainer: Christian Rebischke +# Original Maintainer: dront78 pkgname=systemtap -pkgver=4.0 -pkgrel=2 -pkgdesc="provides infrastructure to simplify the gathering of information about the running system." +pkgver=4.1 +pkgrel=1 +pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') @@ -14,11 +15,10 @@ optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" ) -sha512sums=('66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79' - 'SKIP') +sha512sums=('fbd606d9842ac63af6e607613a112b08d7593da74ad0398716cdc46f74a977a8e6b9fae92e1f63779ccfc94cffa25f29dee2ae44f67ecc4cedae630e50a2e7b6' + '755a11b6024bb15c6415532352fd62a824266edeb5ab3e1ef6cfa31259f8bf7d9a92fcf7476c307cd7d4188ff20cefe86558b2a6e4c099987e1041bd1f98031e') install='systemtap.install' -validpgpkeys=('5D38116FA4D3A7CC77E378D37E83610126DCC2E8') - +validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8') # "Serhei Makarov (for Red Hat 2018..onwards) " build() { cd "${pkgname}-${pkgver}" @@ -41,5 +41,5 @@ package() { make DESTDIR="${pkgdir}" install rmdir "${pkgdir}/var/run/stap-server/" rmdir "${pkgdir}/var/run/" + rm -r "${pkgdir}/usr/include" } - From 235267cff6eb4feb6dcd835ec04ddf927b796526 Mon Sep 17 00:00:00 2001 From: annguyenfoss Date: Tue, 3 Dec 2019 15:28:08 +0700 Subject: [PATCH 32/38] released 4.2 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 796db52..a276744 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.1 + pkgver = 4.2 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install @@ -14,11 +14,11 @@ pkgbase = systemtap depends = python2 depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.1.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz - source = systemtap-4.1.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.1.tar.gz.asc + source = systemtap-4.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz + source = systemtap-4.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz.asc validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 - sha512sums = fbd606d9842ac63af6e607613a112b08d7593da74ad0398716cdc46f74a977a8e6b9fae92e1f63779ccfc94cffa25f29dee2ae44f67ecc4cedae630e50a2e7b6 - sha512sums = 755a11b6024bb15c6415532352fd62a824266edeb5ab3e1ef6cfa31259f8bf7d9a92fcf7476c307cd7d4188ff20cefe86558b2a6e4c099987e1041bd1f98031e + sha512sums = 50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6 + sha512sums = ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4 pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 816495e..d9093cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Original Maintainer: Christian Rebischke # Original Maintainer: dront78 pkgname=systemtap -pkgver=4.1 +pkgver=4.2 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" @@ -15,8 +15,8 @@ optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" ) -sha512sums=('fbd606d9842ac63af6e607613a112b08d7593da74ad0398716cdc46f74a977a8e6b9fae92e1f63779ccfc94cffa25f29dee2ae44f67ecc4cedae630e50a2e7b6' - '755a11b6024bb15c6415532352fd62a824266edeb5ab3e1ef6cfa31259f8bf7d9a92fcf7476c307cd7d4188ff20cefe86558b2a6e4c099987e1041bd1f98031e') +sha512sums=('50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6' + 'ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4') install='systemtap.install' validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8') # "Serhei Makarov (for Red Hat 2018..onwards) " From 6b093b9789774551664c01a0fb69dc0215bcf194 Mon Sep 17 00:00:00 2001 From: annguyenfoss Date: Tue, 3 Dec 2019 16:24:41 +0700 Subject: [PATCH 33/38] Added a valid PGP key 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 --- .SRCINFO | 1 + PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a276744..ae2282f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -17,6 +17,7 @@ pkgbase = systemtap source = systemtap-4.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz source = systemtap-4.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz.asc validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 + validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 sha512sums = 50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6 sha512sums = ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4 diff --git a/PKGBUILD b/PKGBUILD index d9093cd..7f29799 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,8 +18,8 @@ source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/relea sha512sums=('50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6' 'ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4') install='systemtap.install' -validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8') # "Serhei Makarov (for Red Hat 2018..onwards) " - +validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8' # "Serhei Makarov (for Red Hat 2018..onwards) " + '5D38116FA4D3A7CC77E378D37E83610126DCC2E8') build() { cd "${pkgname}-${pkgver}" ./configure \ From 9108e8dc18c9f22294d67665bf293ab9a8a0ff91 Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Tue, 6 Jul 2021 08:15:18 +0100 Subject: [PATCH 34/38] upgpkg: systemtap 4.5-1 upstream release --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ae2282f..ff0273a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,25 +1,25 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.2 + pkgver = 4.5 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install arch = x86_64 arch = i686 license = GPL - makedepends = python2-setuptools + makedepends = python-setuptools makedepends = xmlto depends = elfutils depends = nss - depends = python2 + depends = python depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.2.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz - source = systemtap-4.2.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz.asc + source = systemtap-4.5.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz + source = systemtap-4.5.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz.asc validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 - sha512sums = 50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6 - sha512sums = ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4 + validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA + sha512sums = 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3 + sha512sums = SKIP pkgname = systemtap - diff --git a/PKGBUILD b/PKGBUILD index 7f29799..18acbe7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,25 +1,30 @@ -# Maintainer: An Nguyen (stk) +# Maintainer: Christian Pellegrin (chripell) +# Original Maintainer: An Nguyen (stk) # Original Maintainer: George Angelopoulos # Original Maintainer: Christian Rebischke # Original Maintainer: dront78 pkgname=systemtap -pkgver=4.2 +pkgver=4.5 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') -depends=('elfutils' 'nss' 'python2' 'cpio') -makedepends=('python2-setuptools' 'xmlto') +depends=('elfutils' 'nss' 'python' 'cpio') +makedepends=('python-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" ) -sha512sums=('50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6' - 'ddb3217d9bbe7b9531b3d7ce24d88766e65629bd720228c0f8f96edc82216e13e5f0d0f30c8012cb85bf5ac7401f5a551aa69fc0505a29475ed61c548b4cdcf4') +sha512sums=('8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3' + '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') + '5D38116FA4D3A7CC77E378D37E83610126DCC2E8' + '159B0DF71150B8A8539A8802D7C256443CC637CA') build() { cd "${pkgname}-${pkgver}" ./configure \ From c044ef597395464e9e4e96289acd7a1ab380516b Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Sun, 21 Nov 2021 21:14:49 +0000 Subject: [PATCH 35/38] upgpkg: systemtap 4.6-1 upstream release --- .SRCINFO | 13 ++- ...error-for-wrong-type-of-printf-width.patch | 60 ++++++++++ 0002-configury-let-python3-be-python3.patch | 103 ++++++++++++++++++ PKGBUILD | 25 ++++- 4 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 0001-Fix-Werror-for-wrong-type-of-printf-width.patch create mode 100644 0002-configury-let-python3-be-python3.patch diff --git a/.SRCINFO b/.SRCINFO index ff0273a..28e4073 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.5 + pkgver = 4.6 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install @@ -8,18 +8,23 @@ pkgbase = systemtap 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.5.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz - source = systemtap-4.5.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz.asc + source = systemtap-4.6.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz + source = systemtap-4.6.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz.asc + source = 0001-Fix-Werror-for-wrong-type-of-printf-width.patch + source = 0002-configury-let-python3-be-python3.patch validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA - sha512sums = 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3 + sha512sums = 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402 sha512sums = SKIP + sha512sums = da1b3d2319bfd711ba7e2e436cd476cbc7a63d442d8ad26fc010c219b9ca2343054a061767f0acc624620dc1eb3ca5a70ab130895181ed8e00c05b51ac651568 + sha512sums = 26dc15751040ac444a74046cdb2f5cad456752f06d0916ef3f97e5faf98e1f382b638adb850ed98b287b72dea63c7a16c5ad98b9ad452da4042a1ae36260a54e pkgname = systemtap diff --git a/0001-Fix-Werror-for-wrong-type-of-printf-width.patch b/0001-Fix-Werror-for-wrong-type-of-printf-width.patch new file mode 100644 index 0000000..168dee0 --- /dev/null +++ b/0001-Fix-Werror-for-wrong-type-of-printf-width.patch @@ -0,0 +1,60 @@ +From bd29667acb81d237261b035ed5cab8173dddf9a8 Mon Sep 17 00:00:00 2001 +From: Christian Pellegrin +Date: Sun, 21 Nov 2021 14:46:29 +0000 +Subject: [PATCH 1/2] Fix -Werror for wrong type of printf width. + +Signed-off-by: Christian Pellegrin +--- + staprun/monitor.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/staprun/monitor.c b/staprun/monitor.c +index 478634c09..848bd7ea9 100644 +--- a/staprun/monitor.c ++++ b/staprun/monitor.c +@@ -448,12 +448,12 @@ void monitor_render(void) + if (active_window == 0) + wattron(status, A_BOLD); + wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", +- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), +- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), +- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), +- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), +- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), +- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), ++ (int) width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), ++ (int) width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), ++ (int) width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), ++ (int) width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), ++ (int) width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), ++ (int) width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), + HIGHLIGHT("name", p_name, comp_fn_index)); + if (active_window == 0) + wattroff(status, A_BOLD); +@@ -466,17 +466,17 @@ void monitor_render(void) + json_object *probe, *field; + probe = json_object_array_get_idx(jso_probe_list, i); + json_object_object_get_ex(probe, "index", &field); +- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_index], json_object_get_string(field)); + json_object_object_get_ex(probe, "state", &field); +- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_state], json_object_get_string(field)); + json_object_object_get_ex(probe, "hits", &field); +- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_hits], json_object_get_string(field)); + json_object_object_get_ex(probe, "min", &field); +- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_min], json_object_get_string(field)); + json_object_object_get_ex(probe, "avg", &field); +- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_avg], json_object_get_string(field)); + json_object_object_get_ex(probe, "max", &field); +- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int) width[p_max], json_object_get_string(field)); + getyx(status, discard, cur_x); + json_object_object_get_ex(probe, "name", &field); + wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); +-- +2.34.0 + diff --git a/0002-configury-let-python3-be-python3.patch b/0002-configury-let-python3-be-python3.patch new file mode 100644 index 0000000..421ec4c --- /dev/null +++ b/0002-configury-let-python3-be-python3.patch @@ -0,0 +1,103 @@ +From 6803c3b91f423c0aa2b4fbc1e5081ac7fb216e2f Mon Sep 17 00:00:00 2001 +From: "Frank Ch. Eigler" +Date: Fri, 19 Nov 2021 22:22:45 -0500 +Subject: [PATCH 2/2] configury: let python3 be python3 + +Our baroque heuristics for identifying python2/3 under their various +historical aliases is showing its age. On some modern distros, +/usr/bin/python is to be positively NOT used. Fixing configure.ac +$PYTHON3 search to only look for python3, and not even consider +$PYTHON_UNKNOWN. At some point we'll want to simplify further, and +get rid of python2 remnants. + +Signed-off-by: Christian Pellegrin +--- + configure | 45 +-------------------------------------------- + configure.ac | 8 ++------ + 2 files changed, 3 insertions(+), 50 deletions(-) + +diff --git a/configure b/configure +index 6d0d53992..962323156 100755 +--- a/configure ++++ b/configure +@@ -9350,49 +9350,7 @@ fi + as_fn_append ac_configure_args " python='$PYTHON' pyexecdir='$pyexecdir'" + + # Now let's try to find python version 3. +-if test "x$PYTHON_UNKNOWN" != "xno" -a "x$ac_cv_python_unknown_version" = "x3"; then +- # Extract the first word of "python", so it can be a program name with args. +-set dummy python; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PYTHON3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PYTHON3 in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PYTHON3="$PYTHON3" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PYTHON3="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PYTHON3=$ac_cv_path_PYTHON3 +-if test -n "$PYTHON3"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON3" >&5 +-$as_echo "$PYTHON3" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-else +- for ac_prog in python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 ++for ac_prog in python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -9438,7 +9396,6 @@ fi + done + test -n "$PYTHON3" || PYTHON3=":" + +-fi + python3_basename=$(basename "$PYTHON3") + + cat >>confdefs.h <<_ACEOF +diff --git a/configure.ac b/configure.ac +index b0a823604..d1b124763 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,12 +88,8 @@ fi + AS_VAR_APPEND([ac_configure_args], [" python='$PYTHON' pyexecdir='$pyexecdir'"]) + + # Now let's try to find python version 3. +-if test "x$PYTHON_UNKNOWN" != "xno" -a "x$ac_cv_python_unknown_version" = "x3"; then +- AC_PATH_PROG([PYTHON3], [python]) +-else +- AC_PATH_PROGS([PYTHON3], +- [python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0], [:]) +-fi ++AC_PATH_PROGS([PYTHON3], ++ [python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0], [:]) + python3_basename=$(basename "$PYTHON3") + AC_DEFINE_UNQUOTED([PYTHON3_BASENAME], "${python3_basename}", + [Base name of the python3 interpreter binary.]) +-- +2.34.0 + diff --git a/PKGBUILD b/PKGBUILD index 18acbe7..e85d853 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,20 +4,24 @@ # Original Maintainer: Christian Rebischke # Original Maintainer: dront78 pkgname=systemtap -pkgver=4.5 +pkgver=4.6 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" arch=('x86_64' 'i686') license=('GPL') depends=('elfutils' 'nss' 'python' 'cpio') -makedepends=('python-setuptools' 'xmlto') +makedepends=('python-setuptools' 'python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" + "0001-Fix-Werror-for-wrong-type-of-printf-width.patch" + "0002-configury-let-python3-be-python3.patch" ) -sha512sums=('8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3' - 'SKIP') +sha512sums=('835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402' + 'SKIP' + 'da1b3d2319bfd711ba7e2e436cd476cbc7a63d442d8ad26fc010c219b9ca2343054a061767f0acc624620dc1eb3ca5a70ab130895181ed8e00c05b51ac651568' + '26dc15751040ac444a74046cdb2f5cad456752f06d0916ef3f97e5faf98e1f382b638adb850ed98b287b72dea63c7a16c5ad98b9ad452da4042a1ae36260a54e') install='systemtap.install' # Note, you need to run: # gpg --recv-keys --keyserver hkps://keys.openpgp.org/ 0xD7C256443CC637CA @@ -25,8 +29,16 @@ install='systemtap.install' validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8' # "Serhei Makarov (for Red Hat 2018..onwards) " '5D38116FA4D3A7CC77E378D37E83610126DCC2E8' '159B0DF71150B8A8539A8802D7C256443CC637CA') -build() { + +prepare() { cd "${pkgname}-${pkgver}" + for i in "${srcdir}"/*.patch; do + patch -Np1 -i "$i" + done +} + +build() { + cd "${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -37,7 +49,8 @@ build() { --localstatedir=/var \ --enable-pie \ --disable-docs \ - --enable-htmldocs + --enable-htmldocs \ + --with-python3 make } From 6e6e2b0358d07bc717fae7b278edbe9f9b36ab57 Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Mon, 11 Jul 2022 20:25:36 +0100 Subject: [PATCH 36/38] upgpkg: systemtap 4.7-1 upstream release --- .SRCINFO | 12 +- ...error-for-wrong-type-of-printf-width.patch | 60 ---------- 0002-configury-let-python3-be-python3.patch | 103 ------------------ PKGBUILD | 15 +-- 4 files changed, 8 insertions(+), 182 deletions(-) delete mode 100644 0001-Fix-Werror-for-wrong-type-of-printf-width.patch delete mode 100644 0002-configury-let-python3-be-python3.patch diff --git a/.SRCINFO b/.SRCINFO index 28e4073..dbdde16 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.6 + pkgver = 4.7 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install @@ -15,16 +15,12 @@ pkgbase = systemtap depends = python depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.6.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz - source = systemtap-4.6.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz.asc - source = 0001-Fix-Werror-for-wrong-type-of-printf-width.patch - source = 0002-configury-let-python3-be-python3.patch + source = systemtap-4.7.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.7.tar.gz + source = systemtap-4.7.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.7.tar.gz.sig validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA - sha512sums = 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402 + sha512sums = 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831 sha512sums = SKIP - sha512sums = da1b3d2319bfd711ba7e2e436cd476cbc7a63d442d8ad26fc010c219b9ca2343054a061767f0acc624620dc1eb3ca5a70ab130895181ed8e00c05b51ac651568 - sha512sums = 26dc15751040ac444a74046cdb2f5cad456752f06d0916ef3f97e5faf98e1f382b638adb850ed98b287b72dea63c7a16c5ad98b9ad452da4042a1ae36260a54e pkgname = systemtap diff --git a/0001-Fix-Werror-for-wrong-type-of-printf-width.patch b/0001-Fix-Werror-for-wrong-type-of-printf-width.patch deleted file mode 100644 index 168dee0..0000000 --- a/0001-Fix-Werror-for-wrong-type-of-printf-width.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bd29667acb81d237261b035ed5cab8173dddf9a8 Mon Sep 17 00:00:00 2001 -From: Christian Pellegrin -Date: Sun, 21 Nov 2021 14:46:29 +0000 -Subject: [PATCH 1/2] Fix -Werror for wrong type of printf width. - -Signed-off-by: Christian Pellegrin ---- - staprun/monitor.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/staprun/monitor.c b/staprun/monitor.c -index 478634c09..848bd7ea9 100644 ---- a/staprun/monitor.c -+++ b/staprun/monitor.c -@@ -448,12 +448,12 @@ void monitor_render(void) - if (active_window == 0) - wattron(status, A_BOLD); - wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", -- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), -+ (int) width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -+ (int) width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -+ (int) width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -+ (int) width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -+ (int) width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -+ (int) width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), - HIGHLIGHT("name", p_name, comp_fn_index)); - if (active_window == 0) - wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ void monitor_render(void) - json_object *probe, *field; - probe = json_object_array_get_idx(jso_probe_list, i); - json_object_object_get_ex(probe, "index", &field); -- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_index], json_object_get_string(field)); - json_object_object_get_ex(probe, "state", &field); -- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_state], json_object_get_string(field)); - json_object_object_get_ex(probe, "hits", &field); -- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_hits], json_object_get_string(field)); - json_object_object_get_ex(probe, "min", &field); -- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_min], json_object_get_string(field)); - json_object_object_get_ex(probe, "avg", &field); -- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_avg], json_object_get_string(field)); - json_object_object_get_ex(probe, "max", &field); -- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int) width[p_max], json_object_get_string(field)); - getyx(status, discard, cur_x); - json_object_object_get_ex(probe, "name", &field); - wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); --- -2.34.0 - diff --git a/0002-configury-let-python3-be-python3.patch b/0002-configury-let-python3-be-python3.patch deleted file mode 100644 index 421ec4c..0000000 --- a/0002-configury-let-python3-be-python3.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 6803c3b91f423c0aa2b4fbc1e5081ac7fb216e2f Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" -Date: Fri, 19 Nov 2021 22:22:45 -0500 -Subject: [PATCH 2/2] configury: let python3 be python3 - -Our baroque heuristics for identifying python2/3 under their various -historical aliases is showing its age. On some modern distros, -/usr/bin/python is to be positively NOT used. Fixing configure.ac -$PYTHON3 search to only look for python3, and not even consider -$PYTHON_UNKNOWN. At some point we'll want to simplify further, and -get rid of python2 remnants. - -Signed-off-by: Christian Pellegrin ---- - configure | 45 +-------------------------------------------- - configure.ac | 8 ++------ - 2 files changed, 3 insertions(+), 50 deletions(-) - -diff --git a/configure b/configure -index 6d0d53992..962323156 100755 ---- a/configure -+++ b/configure -@@ -9350,49 +9350,7 @@ fi - as_fn_append ac_configure_args " python='$PYTHON' pyexecdir='$pyexecdir'" - - # Now let's try to find python version 3. --if test "x$PYTHON_UNKNOWN" != "xno" -a "x$ac_cv_python_unknown_version" = "x3"; then -- # Extract the first word of "python", so it can be a program name with args. --set dummy python; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PYTHON3+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PYTHON3 in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PYTHON3="$PYTHON3" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PYTHON3="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- ;; --esac --fi --PYTHON3=$ac_cv_path_PYTHON3 --if test -n "$PYTHON3"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON3" >&5 --$as_echo "$PYTHON3" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --else -- for ac_prog in python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 -+for ac_prog in python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -9438,7 +9396,6 @@ fi - done - test -n "$PYTHON3" || PYTHON3=":" - --fi - python3_basename=$(basename "$PYTHON3") - - cat >>confdefs.h <<_ACEOF -diff --git a/configure.ac b/configure.ac -index b0a823604..d1b124763 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,12 +88,8 @@ fi - AS_VAR_APPEND([ac_configure_args], [" python='$PYTHON' pyexecdir='$pyexecdir'"]) - - # Now let's try to find python version 3. --if test "x$PYTHON_UNKNOWN" != "xno" -a "x$ac_cv_python_unknown_version" = "x3"; then -- AC_PATH_PROG([PYTHON3], [python]) --else -- AC_PATH_PROGS([PYTHON3], -- [python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0], [:]) --fi -+AC_PATH_PROGS([PYTHON3], -+ [python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0], [:]) - python3_basename=$(basename "$PYTHON3") - AC_DEFINE_UNQUOTED([PYTHON3_BASENAME], "${python3_basename}", - [Base name of the python3 interpreter binary.]) --- -2.34.0 - diff --git a/PKGBUILD b/PKGBUILD index e85d853..50d6398 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Original Maintainer: Christian Rebischke # Original Maintainer: dront78 pkgname=systemtap -pkgver=4.6 +pkgver=4.7 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" @@ -14,14 +14,10 @@ depends=('elfutils' 'nss' 'python' 'cpio') makedepends=('python-setuptools' 'python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.asc" - "0001-Fix-Werror-for-wrong-type-of-printf-width.patch" - "0002-configury-let-python3-be-python3.patch" + "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.sig" ) -sha512sums=('835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402' - 'SKIP' - 'da1b3d2319bfd711ba7e2e436cd476cbc7a63d442d8ad26fc010c219b9ca2343054a061767f0acc624620dc1eb3ca5a70ab130895181ed8e00c05b51ac651568' - '26dc15751040ac444a74046cdb2f5cad456752f06d0916ef3f97e5faf98e1f382b638adb850ed98b287b72dea63c7a16c5ad98b9ad452da4042a1ae36260a54e') +sha512sums=('7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831' + 'SKIP') install='systemtap.install' # Note, you need to run: # gpg --recv-keys --keyserver hkps://keys.openpgp.org/ 0xD7C256443CC637CA @@ -32,9 +28,6 @@ validpgpkeys=('F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8' # "Serhei Makarov (fo prepare() { cd "${pkgname}-${pkgver}" - for i in "${srcdir}"/*.patch; do - patch -Np1 -i "$i" - done } build() { From b60360437fc7674fcf7faccd73aff4a47cd9b8dc Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Sat, 12 Nov 2022 21:32:48 +0100 Subject: [PATCH 37/38] upgpkg: systemtap 4.8-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dbdde16..1b651cb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = systemtap pkgdesc = Infrastructure to simplify the gathering of information about the running Linux system - pkgver = 4.7 + pkgver = 4.8 pkgrel = 1 url = http://sourceware.org/systemtap/ install = systemtap.install @@ -15,12 +15,12 @@ pkgbase = systemtap depends = python depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.7.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.7.tar.gz - source = systemtap-4.7.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.7.tar.gz.sig + source = systemtap-4.8.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.8.tar.gz + source = systemtap-4.8.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.8.tar.gz.sig validpgpkeys = F75E6545B9F8AA15AA932A444DE16D68FDBFFFB8 validpgpkeys = 5D38116FA4D3A7CC77E378D37E83610126DCC2E8 validpgpkeys = 159B0DF71150B8A8539A8802D7C256443CC637CA - sha512sums = 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831 + sha512sums = fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2 sha512sums = SKIP pkgname = systemtap diff --git a/PKGBUILD b/PKGBUILD index 50d6398..6ac031d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Original Maintainer: Christian Rebischke # Original Maintainer: dront78 pkgname=systemtap -pkgver=4.7 +pkgver=4.8 pkgrel=1 pkgdesc="Infrastructure to simplify the gathering of information about the running Linux system" url="http://sourceware.org/systemtap/" @@ -16,7 +16,7 @@ optdepends=('sqlite3: for storing results in a database') source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.sig" ) -sha512sums=('7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831' +sha512sums=('fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2' 'SKIP') install='systemtap.install' # Note, you need to run: From 3995c198a8f8d57a162ee02e7910e4c0229e1c17 Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Sun, 29 Jan 2023 15:08:17 +0100 Subject: [PATCH 38/38] upgpkg: systemtap 4.8-1 updated repository location --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1b651cb..5a1318a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -15,8 +15,8 @@ pkgbase = systemtap depends = python depends = cpio optdepends = sqlite3: for storing results in a database - source = systemtap-4.8.tar.gz::https://sourceware.org/systemtap/ftp/releases/systemtap-4.8.tar.gz - source = systemtap-4.8.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/systemtap-4.8.tar.gz.sig + 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 diff --git a/PKGBUILD b/PKGBUILD index 6ac031d..bfdbabb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ license=('GPL') depends=('elfutils' 'nss' 'python' 'cpio') makedepends=('python-setuptools' 'python2-setuptools' 'xmlto') optdepends=('sqlite3: for storing results in a database') -source=("${pkgname}-${pkgver}.tar.gz::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-${pkgver}.tar.gz.asc::https://sourceware.org/systemtap/ftp/releases/${pkgname}-${pkgver}.tar.gz.sig" +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' 'SKIP')